Update laravel framework from 9 to 11, removed some old packages

This commit is contained in:
2024-07-04 15:03:11 +10:00
parent 1b4504cee2
commit 59dc825bf7
101 changed files with 1656 additions and 4062 deletions

View File

@@ -13,9 +13,7 @@ use App\Models\{Account,
Payment,
PaymentItem,
Service,
SiteDetail,
Supplier,
SupplierDetail};
SiteDetail};
/**
* The AdminController governs all routes that are prefixed with 'a/'.
@@ -27,7 +25,8 @@ class AdminController extends Controller
// @todo Move to reseller
public function service(Service $o)
{
return View('a.service',['o'=>$o]);
return view('theme.backend.adminlte.a.service')
->with('o',$o);
}
// @todo Move to reseller
@@ -55,18 +54,19 @@ class AdminController extends Controller
$o->forceFill($request->only(['account_id','charge_at','service_id','quantity','amount','sweep_type','type','taxable','description']));
$o->save();
return redirect()->back()
return redirect()
->back()
->with('success','Charge recorded: '.$o->id);
}
return view('a.charge.addedit')
return view('theme.backend.adminlte.a.charge.addedit')
->with('o',$o);
}
// @todo Move to reseller
public function charge_pending_account(Request $request,Account $o)
{
return view('a.charge.widgets.pending')
return view('theme.backend.adminlte.a.charge.widgets.pending')
->with('list',$o->charges->where('active',TRUE)->where('processed',NULL)->except($request->exclude));
}
@@ -78,7 +78,7 @@ class AdminController extends Controller
// @todo Move to reseller
public function charge_unprocessed()
{
return view('a.charge.unprocessed');
return view('theme.backend.adminlte.a.charge.unprocessed');
}
/**
@@ -148,11 +148,12 @@ class AdminController extends Controller
$o->items()->save($oo);
}
return redirect()->back()
return redirect()
->back()
->with('success','Payment recorded: '.$o->id);
}
return view('a.payment.addedit')
return view('theme.backend.adminlte.a.payment.addedit')
->with('o',$o);
}
@@ -164,7 +165,7 @@ class AdminController extends Controller
// @todo Move to reseller
public function pay_unapplied()
{
return view('a.payment.unapplied');
return view('theme.backend.adminlte.a.payment.unapplied');
}
/**
@@ -177,7 +178,7 @@ class AdminController extends Controller
// @todo Move to reseller
public function pay_invoices(Request $request,Account $o)
{
return view('a.payment.widgets.invoices')
return view('theme.backend.adminlte.a.payment.widgets.invoices')
->with('pid',$request->pid)
->with('o',$o);
}
@@ -238,10 +239,11 @@ class AdminController extends Controller
$site->details()->save($oo);
}
return redirect()->back()
return redirect()
->back()
->with('success','Settings saved');
}
return view('a.setup');
return view('theme.backend.adminlte.theme.backend.adminlte.a.setup');
}
}