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

Add validation to service cancellation, and displaying cancellation costs if any

Browse Source
This commit is contained in:
Deon George
2024-08-17 10:33:56 +10:00
parent 7a41dd803f
commit 6ac1b11864
9 changed files with 142 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/Http/Controllers/ServiceController.php
View File

@@ -17,7 +17,7 @@ use Illuminate\Validation\ValidationException;
use Illuminate\View\View;
use Symfony\Component\HttpKernel\Exception\HttpException;
use App\Http\Requests\ServiceChangeRequest;
use App\Http\Requests\{ServiceCancel,ServiceChangeRequest};
use App\Mail\{CancelRequest,ChangeRequest};
use App\Models\{Charge,Invoice,Product,Service};
@@ -124,34 +124,29 @@ class ServiceController extends Controller
/**
* Process a request to cancel a service
*
* @param Request $request
* @param ServiceCancel $request
* @param Service $o
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View|RedirectResponse|\Illuminate\Routing\Redirector
*/
public function cancel_request(Request $request,Service $o)
public function cancel_request(ServiceCancel $request,Service $o)
{
if ($request->post()) {
$request->validate([
'stop_at'=>'required|date',
]);
if (! $o->order_info)
$o->order_info = collect();
if (! $o->order_info)
$o->order_info = collect();
$o->stop_at = $request->stop_at;
$o->order_info->put('cancel_note',$request->validated('notes'));
$o->stop_at = $request->stop_at;
$o->order_info->put('cancel_note',$request->notes);
$o->order_status = 'CANCEL-REQUEST';
$o->save();
if ($request->validated('extra_charges'))
$o->order_info->put('cancel_extra_charges_accepted',$request->extra_charges_amount);
//@todo Get email from DB.
Mail::to('help@graytech.net.au')
->queue((new CancelRequest($o,$request->notes))->onQueue('email'));
$o->order_status = 'CANCEL-REQUEST';
$o->save();
return redirect('u/service/'.$o->id)->with('success','Cancellation lodged');
}
Mail::to(config('osb.ticket_admin'))
->queue((new CancelRequest($o,$request->notes))->onQueue('email'));
return view('theme.backend.adminlte.service.cancel_request')
->with('o',$o);
return redirect('u/service/'.$o->id)
->with('success','Cancellation lodged');
}
/**