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');
}
/**

54
app/Http/Requests/ServiceCancel.php Normal file
View File

@@ -0,0 +1,54 @@
<?php
namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Gate;
/**
* Editing Suppliers
*/
class ServiceCancel extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return Gate::allows('view',$this->route('o'));
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, mixed>
*/
public function rules()
{
//dd(request()->post());
return [
'stop_at'=> [
'required',
'date',
'after:today',
'exclude_unless:extra_charges,null',
function($attribute,$value,$fail) {
if ($this->route('o')->cancel_date->greaterThan($value))
$fail(sprintf('Service cannot be cancelled before: %s',$this->route('o')->cancel_date->format('Y-m-d')));
}
],
'extra_charges_amount' => [
'nullable',
'exclude_unless:extra_charges,null',
function($attribute,$value,$fail) {
if ($this->route('o')->cancel_date->greaterThan(request('stop_at')) && (request('extra_charges') !== 1))
$fail('Extra charges must be accepted if cancelling before contract end');
},
],
'extra_charges' => 'sometimes|required|accepted',
'notes' => 'nullable|min:5',
];
}
}

46
app/Models/Service.php
View File

@@ -14,8 +14,9 @@ use Illuminate\Support\Facades\Log;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Leenooks\Casts\LeenooksCarbon;
use App\Models\Product\Type;
use App\Interfaces\IDs;
use App\Models\Product\Type;
use App\Models\Service\Broadband;
use App\Traits\{ScopeAccountUserAuthorised,ScopeServiceActive,SiteID};
/**
@@ -565,6 +566,26 @@ class Service extends Model implements IDs
return Invoice::billing_name($this->getBillingIntervalAttribute());
}
/**
* Return the earliest date that the service can be cancelled
*
* @return Carbon
*/
public function getCancelDateAttribute(): Carbon
{
switch (get_class($this->type)) {
// Broadband needs 30 days notice
case Broadband::class:
$date = Carbon::now()->addMonth();
break;
default:
$date = Carbon::now()->addDay();
}
return $this->getContractEndAttribute()->lessThan($date) ? $date : $this->getContractEndAttribute();
}
/**
* The date the contract ends
*
@@ -582,7 +603,7 @@ class Service extends Model implements IDs
if (! $this->start_at)
return $this->type->expire_at;
$end = $this->start_at->addMonths($this->getContractTermAttribute());
$end = $this->start_at->clone()->addMonths($this->getContractTermAttribute());
// If we dont have an expire date, use the start date + contract_term
if (! $this->type->expire_at)
@@ -892,6 +913,27 @@ class Service extends Model implements IDs
: $this->price;
}
/**
* Provide billing charge to a future date
*
* @param Carbon $date
* @return float
* @throws Exception
*/
public function billing_charge_to(Carbon $date): float
{
// if the date is less than the paid to, but less than the cancel date to, return cancel-paid to charge
// If the date is greater than the paid to, and less than the cancel date to, return cancel-paid to charge
if ($this->getPaidToAttribute()->lessThan($this->getCancelDateAttribute())) {
$max = max($date,$this->getPaidToAttribute())->clone();
$d = $max->diffInDays($this->getCancelDateAttribute());
return $this->account->taxed($d/30*$this->getBillingChargeNormalisedAttribute());
}
return 0;
}
/**
* Get the stage parameters
*

1
app/Providers/AppServiceProvider.php
View File

@@ -36,5 +36,6 @@ class AppServiceProvider extends ServiceProvider
Route::model('co',\App\Models\Checkout::class);
Route::model('po',\App\Models\Payment::class);
Route::model('pdo',\App\Models\Product::class);
Route::model('so',\App\Models\Service::class);
}
}