app/Http/Controllers/ChargeController.php

@@ -1,69 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Http\Requests\ChargeAdd;
-use App\Models\Charge;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Gate;
-use Illuminate\View\View;
-
-class ChargeController extends Controller
-{
-	/**
-	 * Add a charge to a service/account
-	 *
-	 * @param ChargeAdd $request
-	 * @return RedirectResponse
-	 */
-	public function addedit(ChargeAdd $request): RedirectResponse
-	{
-		$o = Charge::findOrNew(Arr::get($request->validated(),'id'));
-
-		// Dont update processed charges
-		if ($o->processed)
-			abort(403);
-
-		$o->forceFill(array_merge(Arr::except($request->validated(),['id']),['active'=>TRUE]));
-		$o->save();
-
-		return redirect()
-			->back()
-			->with('success',sprintf('Charge %s #%d',$o->wasRecentlyCreated ? 'Created' : 'Updated',$o->id));
-	}
-
-	public function delete(Charge $o): array
-	{
-		if (Gate::allows('delete',$o)) {
-			$o->delete();
-
-			return ['ok'];
-
-		} else {
-			abort(401,'Not Allowed');
-		}
-	}
-
-	/**
-	 * Add a charge to a service/account
-	 *
-	 * @param Request $request
-	 * @return View
-	 */
-	public function edit(Request $request): View
-	{
-		$o = Charge::where('processed',FALSE)
-			->where('id',$request->id)
-			->firstOrFail();
-
-		if (Gate::allows('update',$o)) {
-			return view('theme.backend.adminlte.charge.widget.addedit')
-				->with('o',$o)
-				->with('so',$o->service);
-		}
-
-		abort(403);
-	}
-}

app/Http/Controllers/ServiceController.php

@@ -266,6 +266,49 @@ class ServiceController extends Controller
 		}
 	}
 
+	/**
+	 * Add a charge to a service/account
+	 *
+	 * @param ChargeAdd $request
+	 * @return RedirectResponse
+	 */
+	public function charge_addedit(ChargeAdd $request): RedirectResponse
+	{
+		$o = Charge::findOrNew(Arr::get($request->validated(),'id'));
+
+		// Dont update processed charges
+		if ($o->processed)
+			abort(403);
+
+		$o->forceFill(array_merge(Arr::except($request->validated(),['id']),['active'=>TRUE]));
+		$o->save();
+
+		return redirect()
+			->back()
+			->with('success',sprintf('Charge %s #%d',$o->wasRecentlyCreated ? 'Created' : 'Updated',$o->id));
+	}
+
+	/**
+	 * Add a charge to a service/account
+	 *
+	 * @param Request $request
+	 * @return View
+	 */
+	public function charge_edit(Request $request): View
+	{
+		$o = Charge::where('processed',FALSE)
+			->where('id',$request->id)
+			->firstOrFail();
+
+		if (Gate::allows('update',$o)) {
+			return view('theme.backend.adminlte.charge.widget.addedit')
+				->with('o',$o)
+				->with('so',$o->service);
+		}
+
+		abort(403);
+	}
+
 	/**
 	 * List all the domains managed by the user
 	 *

app/Models/Charge.php

@@ -70,7 +70,7 @@ class Charge extends Model
 
 	/* ATTRIBUTES */
 
-	public function getNameAttribute(): string
+	public function getNameAttribute()
 	{
 		return sprintf('%s %s',
 			$this->description,
@@ -93,14 +93,4 @@ class Charge extends Model
 	{
 		return Arr::get(InvoiceItem::type,$this->type);
 	}
-
-	/**
-	 * Is this charge processable
-	 *
-	 * @return bool
-	 */
-	public function getUnprocessedAttribute(): bool
-	{
-		return $this->active && (! $this->processed);
-	}
 }

app/Models/Service.php

@@ -1275,7 +1275,7 @@ class Service extends Model implements IDs
 		if ((($future == TRUE) OR (($future == FALSE) AND ($this->invoice_to >= $billdate)))
 			AND ! $this->invoice_items->filter(function($item) { return $item->module_id == 30 AND ! $item->exists; })->count())
 		{
-			foreach ($this->charges->filter(function($item) { return $item->unprocessed; }) as $oo) {
+			foreach ($this->charges->filter(function($item) { return ! $item->processed; }) as $oo) {
 				$o = new InvoiceItem;
 				$o->active = TRUE;
 				$o->service_id = $oo->service_id;

bootstrap/app.php

@@ -10,7 +10,6 @@ use App\Http\Middleware\{Role,SetSite};
 return Application::configure(basePath: dirname(__DIR__))
 	->withRouting(
 		web: __DIR__.'/../routes/web.php',
-		//api: __DIR__.'/../routes/api.php',
 		commands: __DIR__.'/../routes/console.php',
 		health: '/up',
 	)

composer.lock

@@ -3056,11 +3056,11 @@
         },
         {
             "name": "leenooks/laravel",
-            "version": "11.1.6",
+            "version": "11.1.5",
             "source": {
                 "type": "git",
                 "url": "https://gitea.dege.au/laravel/leenooks.git",
-                "reference": "628fbac8f9ce60c5124ee83b288733ae24e48b63"
+                "reference": "4a4cf3c5bf32f50dcdc8fdc6c3ff680d7f15d90d"
             },
             "type": "library",
             "extra": {
@@ -3093,7 +3093,7 @@
                 "laravel",
                 "leenooks"
             ],
-            "time": "2024-07-26T02:26:31+00:00"
+            "time": "2024-07-25T03:52:29+00:00"
         },
         {
             "name": "leenooks/passkey",
@@ -9995,16 +9995,16 @@
         },
         {
             "name": "spatie/error-solutions",
-            "version": "1.1.1",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/error-solutions.git",
-                "reference": "ae7393122eda72eed7cc4f176d1e96ea444f2d67"
+                "reference": "a014da18f2675ea15af0ba97f7e9aee59e13964f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/error-solutions/zipball/ae7393122eda72eed7cc4f176d1e96ea444f2d67",
+                "url": "https://api.github.com/repos/spatie/error-solutions/zipball/a014da18f2675ea15af0ba97f7e9aee59e13964f",
-                "reference": "ae7393122eda72eed7cc4f176d1e96ea444f2d67",
+                "reference": "a014da18f2675ea15af0ba97f7e9aee59e13964f",
                 "shasum": ""
             },
             "require": {
@@ -10057,7 +10057,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/error-solutions/issues",
-                "source": "https://github.com/spatie/error-solutions/tree/1.1.1"
+                "source": "https://github.com/spatie/error-solutions/tree/1.1.0"
             },
             "funding": [
                 {
@@ -10065,7 +10065,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-07-25T11:06:04+00:00"
+            "time": "2024-07-22T08:18:22+00:00"
         },
         {
             "name": "spatie/flare-client-php",

config/auth.php

@@ -40,12 +40,6 @@ return [
             'driver' => 'session',
             'provider' => 'users',
         ],
-
-        'api' => [
-            'driver' => 'passport',
-            'provider' => 'users',
-        ],
-
     ],
 
     /*

resources/views/theme/backend/adminlte/account/widget/admin/list.blade.php

@@ -43,6 +43,7 @@
 @section('page-styles')
 	@css(datatables,bootstrap4)
 @append
+
 @section('page-scripts')
 	@js(datatables,bootstrap4)
 

resources/views/theme/backend/adminlte/account/widget/invoice_past.blade.php

@@ -40,6 +40,7 @@
 @section('page-styles')
 	@css(datatables,bootstrap4|rowgroup)
 @append
+
 @section('page-scripts')
 	@js(datatables,bootstrap4|rowgroup)
 

resources/views/theme/backend/adminlte/account/widget/service_active.blade.php

@@ -50,6 +50,7 @@
 @section('page-styles')
 	@css(datatables,bootstrap4|rowgroup)
 @append
+
 @section('page-scripts')
 	@js(datatables,bootstrap4|rowgroup)
 

resources/views/theme/backend/adminlte/account/widget/summary_boxes.blade.php

@@ -1,8 +1,7 @@
-<!-- $o=User::class -->
+@php
-@php($acts=$o->accounts_all->pluck('id'))
+	use App\Models\{Account,Service};
-
+	$acts = $o->accounts_all->pluck('id');
-@use(App\Models\Account)
+@endphp
-@use(App\Models\Service)
 
 @if($user->isReseller() && ($o->accounts->count() <= 2) && ($x=$o->accounts->pluck('providers')->flatten())->count())
 	<div class="col-12 col-sm-4 col-md-2">

resources/views/theme/backend/adminlte/charge/pending.blade.php

@@ -57,10 +57,8 @@
 	</div>
 @endsection
 
-@section('page-styles')
-	@css(datatables,bootstrap4)
-@append
 @section('page-scripts')
+	@css(datatables,bootstrap4)
 	@js(datatables,bootstrap4)
 
 	<script type="text/javascript">

resources/views/theme/backend/adminlte/invoice/view.blade.php

@@ -1,7 +1,8 @@
-<!-- $o=Invoice::class -->
+@php
-@use(App\Models\Checkout)
+	use App\Models\{Checkout,Service};
-@use(App\Models\Service)
+@endphp
 
+<!-- $o = Invoice::class -->
 @extends('adminlte::layouts.app')
 
 @section('htmlheader_title')

resources/views/theme/backend/adminlte/invoice/widget/admin/credit.blade.php

@@ -32,6 +32,7 @@
 @section('page-styles')
 	@css(datatables,bootstrap4|rowgroup)
 @append
+
 @section('page-scripts')
 	@js(datatables,bootstrap4|rowgroup)
 

resources/views/theme/backend/adminlte/invoice/widget/due.blade.php

@@ -27,6 +27,7 @@
 @section('page-styles')
 	@css(datatables,bootstrap4|rowgroup)
 @append
+
 @section('page-scripts')
 	@js(datatables,bootstrap4|rowgroup)
 

resources/views/theme/backend/adminlte/service/widget/admin/movement.blade.php

@@ -1,4 +1,7 @@
-@use(App\Models\Service)
+@php
+use App\Models\Service;
+@endphp
+
 <!-- Show client movements -->
 <div class="card card-dark">
 	<div class="card-header">
@@ -59,6 +62,7 @@
 @section('page-styles')
 	@css(datatables,bootstrap4|rowgroup)
 @append
+
 @section('page-scripts')
 	@js(datatables,bootstrap4|rowgroup)
 

resources/views/theme/backend/adminlte/service/widget/billinghistory.blade.php

@@ -28,6 +28,7 @@
 @section('page-styles')
 	@css(datatables,bootstrap4)
 @append
+
 @section('page-scripts')
 	@js(datatables,bootstrap4)
 

resources/views/theme/backend/adminlte/service/widget/charge.blade.php

@@ -41,8 +41,8 @@
 								{{ $oo->processed ? 'YES' : 'NO' }}
 								@if(! $oo->processed)
 									<span class="float-right">
-										<a class="charge_edit" data-id="{{ $oo->id }}" href="#"><i class="fas fa-fw fa-edit"></i></a>
+										<a class="charge_edit" id="{{ $oo->id }}" href="#"><i class="fas fa-fw fa-edit"></i></a>
-										<a class="charge_delete" data-id="{{ $oo->id }}" href="{{ url('/r/charge/delete',$oo->id) }}"><i class="fas fa-fw fa-trash"></i></a>
+										<a class="charge_delete" id="{{ $oo->id }}" href="#"><i class="fas fa-fw fa-trash"></i></a>
 									</span>
 								@endif
 							</td>
@@ -59,7 +59,7 @@
 	</div>
 </div>
 
-<x-leenooks::modal.delete hide="row" trigger="charge_delete"/>
+<x-leenooks::modal.delete trigger="charge_delete"/>
 
 @section('page-scripts')
 	<script type="text/javascript">
@@ -70,31 +70,33 @@
 		$(document).ready(function() {
 			var loaded = [];
 
-			$('.charge_edit').on('click',function() {
+			$('.charge_edit').on('click',function(item) {
-				var that = $(this);
+				// Open our charge add tab automatically
+				$('.nav-item a[href="#charge_add"]').tab('show');
 
-				if (loaded[that.data('id')])
+				if (loaded[item.currentTarget.id])
 					return false;
 
+				console.log(item.currentTarget.id);
 				// Prepopulate with the details of the charge
 				$.ajax({
 					url: '{{ url('r/charge/edit') }}',
 					method: 'POST',
-					data: { id: that.data('id') },
+					data: { id: item.currentTarget.id },
 					dataType: 'html',
 
 				}).done(function(html) {
-					// Open our charge add tab aut1omatically
-					$('.nav-item a[href="#charge_add"]').tab('show');
 					$('div[id="charge_add"]').empty().append(html);
-					loaded[that.data('id')] = true;
+					loaded[item.currentTarget.id] = true;
 
 				}).fail(function() {
-					alert('Hmm, that didnt work?');
+					alert('Failed');
 				});
 
 				return false;
 			});
 		});
+
+		//<a href="{{ url('/api/charge/delete',$o->id) }}">
 	</script>
 @append

routes/api.php

@@ -1,12 +1,12 @@
 <?php
 
-use Illuminate\Support\Facades\Route;
 use Intuit\Controllers\Webhook;
 
 use App\Http\Controllers\{AccountingController,
 	AdminController,
 	CheckoutController,
-	ProductController};
+	ProductController,
+	ResellerServicesController};
 
 /*
 |--------------------------------------------------------------------------

routes/web.php

@@ -7,7 +7,6 @@ use Leenooks\Controllers\SwitchUserController;
 use App\Http\Controllers\{AdminController,
 	Auth\LoginController,
 	Auth\SocialLoginController,
-	ChargeController,
 	CheckoutController,
 	HomeController,
 	InvoiceController,
@@ -146,17 +145,15 @@ Route::group(['middleware'=>['auth','role:reseller'],'prefix'=>'r'],function() {
 		->name('switch.start');
 
 	// Reseller Reports
-	Route::group(['prefix'=>'report'],function() {
+	Route::group(['middleware'=>['auth','role:reseller'],'prefix'=>'report'],function() {
 		Route::get('domain',[ServiceController::class,'domain_list']);
 		Route::get('email',[ServiceController::class,'email_list']);
 		Route::get('hosting',[ServiceController::class,'hosting_list']);
 	});
 
 	// Charges
-	Route::post('charge/addedit',[ChargeController::class,'addedit']);
+	Route::post('charge/addedit',[ServiceController::class,'charge_addedit']);
-	Route::post('charge/delete/{o}',[ChargeController::class,'delete'])
+	Route::post('charge/edit',[ServiceController::class,'charge_edit']);
-		->where('o','[0-9]+');
-	Route::post('charge/edit',[ChargeController::class,'edit']);
 
 	// Reseller API calls
 	Route::post('service_change_charges/{o}',[ServiceController::class,'service_change_charges_display'])