deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Telephone is now phone

Browse Source
This commit is contained in:
Deon George 2023-06-16 15:10:36 +10:00
parent 8f283f83f2
commit 27720ee882
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Console/Commands/ImportCosts.php
View File

@ -31,8 +31,8 @@ class ImportCosts extends Command
*/ */
public function handle() public function handle()
{ {
if (! str_starts_with($this->argument('file'),'storage/app/')) if (! str_starts_with($this->argument('file'),'files/'))
throw new \Exception('Filename must start with storage/app/'); throw new \Exception('Filename must start with files/');
Job::dispatchSync( Job::dispatchSync(
Site::findOrFail($this->argument('siteid')), Site::findOrFail($this->argument('siteid')),

4
app/Jobs/ImportCosts.php
View File

@ -161,7 +161,7 @@ class ImportCosts implements ShouldQueue
break; break;
case 'telephone': case 'phone':
$to = Cost\Phone::where('site_id',$this->co->site_id) $to = Cost\Phone::where('site_id',$this->co->site_id)
->where('cost_id',$this->co->id) ->where('cost_id',$this->co->id)
->where('service_phone_id',$so->type->id) ->where('service_phone_id',$so->type->id)
@ -192,7 +192,7 @@ class ImportCosts implements ShouldQueue
break; break;
default: default:
dump(['so'=>$so,'line'=>$line]); dump(['so'=>$so,'category'=>$so->category,'line'=>$line,'m'=>$m,'r'=>$r]);
throw new \Exception(sprintf('ERROR: Service type not handled for service [%s] (%s) on line [%d]',$m[1],$so->category,$c)); throw new \Exception(sprintf('ERROR: Service type not handled for service [%s] (%s) on line [%d]',$m[1],$so->category,$c));
} }

2
app/Mail/OrderRequestApprove.php
View File

@ -43,7 +43,7 @@ class OrderRequestApprove extends Mailable
case 'broadband': $subject = sprintf('%s: %s',$this->service->category,$this->service->type->service_address); case 'broadband': $subject = sprintf('%s: %s',$this->service->category,$this->service->type->service_address);
break; break;
case 'telephone': $subject = sprintf('%s: %s',$this->service->category,$this->service->type->service_number); case 'phone': $subject = sprintf('%s: %s',$this->service->category,$this->service->type->service_number);
break; break;
default: default:

2
resources/views/email/admin/order/approve.blade.php
View File

@ -12,7 +12,7 @@ Please order the following...
@case('broadband') @case('broadband')
| Address | {{ $service->type->service_address }} | | Address | {{ $service->type->service_address }} |
@break; @break;
@case('telephone') @case('phone')
| Number | {{ $service->type->service_number }} | | Number | {{ $service->type->service_number }} |
| Supplier Details | {{ $service->order_info->join(':') }} | | Supplier Details | {{ $service->order_info->join(':') }} |
@break; @break;

2
resources/views/email/admin/order/reject.blade.php
View File

@ -13,7 +13,7 @@
@case('broadband') @case('broadband')
| Address | {{ is_object($service->type) ? $service->type->service_address : 'Not Supplied' }} | | Address | {{ is_object($service->type) ? $service->type->service_address : 'Not Supplied' }} |
@break; @break;
@case('telephone') @case('phone')
| Address | {{ is_object($service->type) ? $service->type->service_address : 'Not Supplied' }} | | Address | {{ is_object($service->type) ? $service->type->service_address : 'Not Supplied' }} |
| Supplier Details | {{ join(':',$service->order_info) }} | | Supplier Details | {{ join(':',$service->order_info) }} |
@break; @break;

2
resources/views/email/admin/service/cancel.blade.php
View File

@ -12,7 +12,7 @@ Please cancel the following...
@case('broadband') @case('broadband')
| Address | {{ $service->type->service_address }} | | Address | {{ $service->type->service_address }} |
@break; @break;
@case('telephone') @case('phone')
| Number | {{ $service->type->service_number }} | | Number | {{ $service->type->service_number }} |
| Supplier Details | {{ $service->order_info->join(':') }} | | Supplier Details | {{ $service->order_info->join(':') }} |
@break; @break;

2
resources/views/email/admin/service/change.blade.php
View File

@ -12,7 +12,7 @@ Please change the following...
@case('broadband') @case('broadband')
| Address | {{ $service->type->service_address }} | | Address | {{ $service->type->service_address }} |
@break; @break;
@case('telephone') @case('phone')
| Number | {{ $service->type->service_number }} | | Number | {{ $service->type->service_number }} |
| Supplier Details | {{ $service->order_info->join(':') }} | | Supplier Details | {{ $service->order_info->join(':') }} |
@break; @break;