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

Fixes for service change, validation added for date and product_id
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 32s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 9s
Details

Browse Source
This commit is contained in:
Deon George
2024-08-17 15:10:50 +10:00
parent 23f23dfe40
commit 283ae06a5c
6 changed files with 85 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
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\{ServiceCancel,ServiceChangeRequest};
use App\Http\Requests\{ServiceCancel,ServiceChange,ServiceChangeRequest};
use App\Mail\{CancelRequest,ChangeRequest};
use App\Models\{Charge,Invoice,Product,Service};
@@ -219,45 +219,31 @@ class ServiceController extends Controller
/**
* Process a request to cancel a service
*
* @param Request $request
* @param ServiceChange $request
* @param Service $o
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View|RedirectResponse|\Illuminate\Routing\Redirector
*/
public function change_request(Request $request,Service $o)
public function change_request(ServiceChange $request,Service $o)
{
if ($request->post()) {
$request->validate([
'product_id'=>'required|exists:products,id',
'change_date'=>'required|date',
'notes'=>'nullable|min:10',
]);
$o->changes()->attach([$o->id=>[
'site_id'=> $o->site_id,
'ordered_by' => Auth::id(),
'ordered_at' => Carbon::now(),
'effective_at' => $request->validated('change_date'),
'product_id' => $request->validated('product_id'),
'notes' => $request->validated('notes'),
'active' => TRUE,
'complete' => FALSE,
]]);
$o->changes()->attach([$o->id=>[
'site_id'=> $o->site_id,
'ordered_by' => Auth::id(),
'ordered_at' => Carbon::now(),
'effective_at' => $request->change_date,
'product_id' => $request->product_id,
'notes' => $request->notes,
'active' => TRUE,
'complete' => FALSE,
]]);
$o->order_status = 'CHANGE-REQUEST';
$o->save();
$o->order_status = 'CHANGE-REQUEST';
$o->save();
Mail::to(config('osb.ticket_admin'))
->queue((new ChangeRequest($o,$request->validated('notes')))->onQueue('email'));
Mail::to(config('osb.ticket_admin'))
->queue((new ChangeRequest($o,$request->notes))->onQueue('email'));
return redirect('u/service/'.$o->id)->with('success','Upgrade requested');
}
switch (get_class($o->type)) {
default:
return view('theme.backend.adminlte.service.change_request')
->with('breadcrumb',collect()->merge($o->account->breadcrumb))
->with('o',$o);
}
return redirect('u/service/'.$o->id)
->with('success','Upgrade requested');
}
/**