Change ScopeServiceUserAuthorised to ScopeAccountUserAuthorised. Scope payments to AccountUserAuthorised, and added PaymentPolicy
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 55s
Create Docker Image / Final Docker Image Manifest (push) Successful in 12s

This commit is contained in:
2024-08-10 23:53:13 +10:00
parent f60727f5fb
commit ef0d4dc773
11 changed files with 150 additions and 56 deletions

View File

@@ -82,7 +82,6 @@ Route::group(['middleware'=>['auth','role:wholesaler'],'prefix'=>'a'],function()
Route::post('setup',[AdminController::class,'setup']);
// Checkout Setup (Payments)
Route::model('co',\App\Models\Checkout::class);
Route::view('checkout','theme.backend.adminlte.checkout.choose');
Route::view('checkout/new','theme.backend.adminlte.checkout.view');
Route::view('checkout/{co}','theme.backend.adminlte.checkout.view')
@@ -144,6 +143,7 @@ Route::group(['middleware'=>['auth','role:reseller'],'prefix'=>'r'],function() {
// Reseller Reports
Route::group(['prefix'=>'report'],function() {
Route::view('charge/pending','theme.backend.adminlte.charge.pending');
Route::get('domain',[ServiceController::class,'domain_list']);
Route::get('email',[ServiceController::class,'email_list']);
Route::get('hosting',[ServiceController::class,'hosting_list']);
@@ -158,9 +158,9 @@ Route::group(['middleware'=>['auth','role:reseller'],'prefix'=>'r'],function() {
Route::post('charge/edit',[ChargeController::class,'edit']);
// Payments
Route::model('po',\App\Models\Payment::class);
Route::view('payment/new','theme.backend.adminlte.payment.view');
Route::view('payment/{po}','theme.backend.adminlte.payment.view')
->middleware('can:update,po')
->where('po','[0-9]+');
Route::post('payment/{o?}',[PaymentController::class,'addedit'])
->where('o','[0-9]+');
@@ -169,49 +169,46 @@ Route::group(['middleware'=>['auth','role:reseller'],'prefix'=>'r'],function() {
// Reseller API calls
Route::post('service_change_charges/{o}',[ServiceController::class,'service_change_charges_display'])
->where('o','[0-9]+');
// Charges
Route::view('report/charge/pending','theme.backend.adminlte.charge.pending');
});
// Our User Routes
Route::group(['middleware'=>['auth'],'prefix'=>'u'],function() {
Route::get('home',[HomeController::class,'home']);
Route::get('home/{o}',[HomeController::class,'home'])
->where('o','[0-9]+')
->middleware('can:view,o');
->middleware('can:view,o')
->where('o','[0-9]+');
Route::view('checkout/cart','theme.backend.adminlte.checkout.cart');
Route::get('checkout/cart/{o}',[CheckoutController::class,'cart_invoice'])
->where('o','[0-9]+')
->middleware('can:view,o');
->middleware('can:view,o')
->where('o','[0-9]+');
Route::post('checkout/cart/remove',[CheckoutController::class,'cart_remove']);
Route::post('checkout/fee',[CheckoutController::class,'fee']);
Route::post('checkout/pay',[CheckoutController::class,'pay']);
Route::get('invoice/{o}',[InvoiceController::class,'view'])
->where('o','[0-9]+')
->middleware('can:view,o');
->middleware('can:view,o')
->where('o','[0-9]+');
Route::get('invoice/{o}/pdf',[InvoiceController::class,'pdf'])
->where('o','[0-9]+')
->middleware('can:view,o');
->middleware('can:view,o')
->where('o','[0-9]+');
Route::get('service/{o}',[ServiceController::class,'home'])
->where('o','[0-9]+')
->middleware('can:view,o');
->middleware('can:view,o')
->where('o','[0-9]+');
Route::match(['get','post'],'service/{o}/cancel-request',[ServiceController::class,'cancel_request'])
->where('o','[0-9]+')
->middleware('can:progress,o,"cancel-request"');
->middleware('can:progress,o,"cancel-request"')
->where('o','[0-9]+');
Route::match(['get','post'],'service/{o}/change-request',[ServiceController::class,'change_request'])
->where('o','[0-9]+')
->middleware('can:progress,o,"change-request"');
->middleware('can:progress,o,"change-request"')
->where('o','[0-9]+');
// @todo This shouldnt be a user privilege.
Route::match(['get','post'],'service/{o}/change-pending',[ServiceController::class,'change_pending'])
->where('o','[0-9]+')
->middleware('can:progress,o,"change-pending"');
->middleware('can:progress,o,"change-pending"')
->where('o','[0-9]+');
Route::get('service/{o}/change/{status}',[ServiceController::class,'change'])
->where('o','[0-9]+')
->middleware('can:progress,o,status');
->middleware('can:progress,o,status')
->where('o','[0-9]+');
// User settings
Route::view('settings','theme.backend.adminlte.user.settings');