app/Http/Controllers/ServiceController.php

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

app/Http/Requests/ServiceCancel.php

@@ -1,54 +0,0 @@
-<?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',
-		];
-	}
-}

app/Models/Service.php

@@ -14,9 +14,8 @@ use Illuminate\Support\Facades\Log;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Leenooks\Casts\LeenooksCarbon;
 
-use App\Interfaces\IDs;
 use App\Models\Product\Type;
-use App\Models\Service\Broadband;
+use App\Interfaces\IDs;
 use App\Traits\{ScopeAccountUserAuthorised,ScopeServiceActive,SiteID};
 
 /**
@@ -566,26 +565,6 @@ 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
 	 *
@@ -603,7 +582,7 @@ class Service extends Model implements IDs
 		if (! $this->start_at)
 			return $this->type->expire_at;
 
-		$end = $this->start_at->clone()->addMonths($this->getContractTermAttribute());
+		$end = $this->start_at->addMonths($this->getContractTermAttribute());
 
 		// If we dont have an expire date, use the start date + contract_term
 		if (! $this->type->expire_at)
@@ -913,27 +892,6 @@ 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
 	 *

app/Providers/AppServiceProvider.php

@@ -36,6 +36,5 @@ 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);
     }
 }

composer.lock

@@ -2222,16 +2222,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.5.3",
+            "version": "2.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "b650144166dfa7703e62a22e493b853b58d874b0"
+                "reference": "df09d5b6a4188f8f3c3ab2e43a109076a5eeb767"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/b650144166dfa7703e62a22e493b853b58d874b0",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/df09d5b6a4188f8f3c3ab2e43a109076a5eeb767",
-                "reference": "b650144166dfa7703e62a22e493b853b58d874b0",
+                "reference": "df09d5b6a4188f8f3c3ab2e43a109076a5eeb767",
                 "shasum": ""
             },
             "require": {
@@ -2244,8 +2244,8 @@
             },
             "require-dev": {
                 "cebe/markdown": "^1.0",
-                "commonmark/cmark": "0.31.1",
+                "commonmark/cmark": "0.31.0",
-                "commonmark/commonmark.js": "0.31.1",
+                "commonmark/commonmark.js": "0.31.0",
                 "composer/package-versions-deprecated": "^1.8",
                 "embed/embed": "^4.4",
                 "erusev/parsedown": "^1.0",
@@ -2324,7 +2324,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-16T11:46:16+00:00"
+            "time": "2024-08-14T10:56:57+00:00"
         },
         {
             "name": "league/config",
@@ -3059,11 +3059,11 @@
         },
         {
             "name": "leenooks/laravel",
-            "version": "11.1.12",
+            "version": "11.1.11",
             "source": {
                 "type": "git",
                 "url": "https://gitea.dege.au/laravel/leenooks.git",
-                "reference": "ba18a2a21c0bf98c3825d53f93ed620d6a3e4423"
+                "reference": "83470c3ff575e62a3e7b66f07177ef9c95c8a54d"
             },
             "type": "library",
             "extra": {
@@ -3096,7 +3096,7 @@
                 "laravel",
                 "leenooks"
             ],
-            "time": "2024-08-17T00:36:07+00:00"
+            "time": "2024-08-14T12:19:53+00:00"
         },
         {
             "name": "leenooks/passkey",

config/osb.php

@@ -6,5 +6,4 @@ return [
 	'invoice_days' => 30,		// Days in Advance to invoice
 	'invoice_review' => 3,		// Days to review an invoice before it is emailed
 	'admin' => env('APP_ADMIN'),
-	'ticket_admin' => env('APP_TICKET_ADMIN',env('APP_ADMIN')),
 ];

resources/views/mail/admin/service/cancel.blade.php

@@ -7,7 +7,6 @@ Please cancel the following...
 | Logged User | {{ Auth::user()->id ?? 'System' }} |
 | Account     | {{ $service->account->name }} |
 | Service ID  | {{ $service->sid }} |
-| Cancel Date | {{ $service->stop_at->format('Y-m-d') }} |
 | Product     | {{ $service->product->name }} |
 @switch($service->product->category)
 @case('broadband')

resources/views/theme/backend/adminlte/service/cancel_request.blade.php

@@ -1,19 +1,17 @@
-@use(Carbon\Carbon)
-
 @extends('adminlte::layouts.app')
 
 @section('htmlheader_title')
-	{{ $so->sid }}
+	{{ $o->sid }}
 @endsection
 @section('page_title')
-	{{ $so->sid }}
+	{{ $o->sid }}
 @endsection
 
 @section('contentheader_title')
-	Service: {{ $so->sid }} <strong>{{ $so->product->name }}</strong>
+	Service: {{ $o->sid }} <strong>{{ $o->product->name }}</strong>
 @endsection
 @section('contentheader_description')
-	{{ $so->name }}
+	{{ $o->name }}
 @endsection
 
 @section('main-content')
@@ -29,27 +27,14 @@
 
 					<div class="card-body">
 						<div class="row">
-							<div class="col-8 col-sm-6 col-md-12 col-lg-6">
+							<div class="col-8 col-sm-5 col-md-12 col-lg-6">
-								<x-leenooks::form.date name="stop_at" icon="fa-calendar" label="Cancel Date" :helper="sprintf('After %s',$so->cancel_date->format('Y-m-d'))" :value="($x=$so->stop_at) ? $x->format('Y-m-d') : ''"/>
+								<x-leenooks::form.date name="stop_at" icon="fa-calendar" label="Cancel Date" :value="($x=$o->stop_at) ? $x->format('Y-m-d') : '' "/>
-							</div>
-							<div class="col-8 col-sm-6 col-md-12 col-lg-6">
-								<x-leenooks::form.date name="paid_to" icon="fa-money" label="Paid To" :value="$so->invoiced_to->format('Y-m-d')" readonly/>
 							</div>
 						</div>
 
-						@if(old('stop_at') && Carbon::now()->lessThan(old('stop_at')))
-							<div class="row">
-								<div class="col-5 col-md-10 col-lg-6 col-xl-5">
-									<x-leenooks::form.text class="text-right" name="extra_charges_amount" icon="fa-dollar-sign" label="Estimated Extra Charges" :value="number_format($so->billing_charge_to(Carbon::create(old('stop_at'))),2)" :old="false" readonly/>
-								</div>
-								<div class="col-1">
-									<x-leenooks::form.checkbox name="extra_charges" label="Accept" value="1"/>
-								</div>
-							</div>
-						@endif
 						<div class="row">
 							<div class="col">
-								<x-leenooks::form.textarea name="notes" label="Notes" placeholder="Please let us know why you are cancelling" :value="$so->order_info_notes ?? ''"/>
+								<x-leenooks::form.textarea name="notes" label="Notes" placeholder="Please let us know why you are cancelling" :value="$o->order_info_notes ?? ''"/>
 							</div>
 						</div>
 					</div>

resources/views/theme/backend/adminlte/service/home.blade.php

@@ -64,7 +64,7 @@
 
 				<div class="card-body p-2">
 					<div class="tab-content">
-						@if(($x=! ($o->suspend_billing || $o->external_billing)) && $o->invoice_next)
+						@if($x=! ($o->suspend_billing || $o->external_billing) && $o->next_invoice)
 							<div @class(['tab-pane','fade','show active'=>! (session()->has('service_update') || session()->has('charge_add'))]) id="pending_items">
 								@include('theme.backend.adminlte.service.widget.invoice')
 							</div>

routes/web.php

@@ -193,9 +193,7 @@ Route::group(['middleware'=>['auth'],'prefix'=>'u'],function() {
 	Route::get('service/{o}',[ServiceController::class,'home'])
 		->middleware('can:view,o')
 		->where('o','[0-9]+');
-	Route::view('service/{so}/cancel-request','theme.backend.adminlte.service.cancel_request')
+	Route::match(['get','post'],'service/{o}/cancel-request',[ServiceController::class,'cancel_request'])
-		->where('so','[0-9]+');
-	Route::post('service/{o}/cancel-request',[ServiceController::class,'cancel_request'])
 		->middleware('can:progress,o,"cancel-request"')
 		->where('o','[0-9]+');
 	Route::match(['get','post'],'service/{o}/change-request',[ServiceController::class,'change_request'])