From 835dcd6b9812855a831cefcfb6ce325dd98769d0 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Wed, 30 Jun 2021 15:50:33 +1000
Subject: [PATCH] Change some widget title colors, added in Paypal payment
 routes

---
 .../r/service/widgets/movement.blade.php      |  2 +-
 .../backend/adminlte/u/invoice/cart.blade.php | 21 +++++++------------
 .../adminlte/u/invoice/widgets/list.blade.php |  2 +-
 .../adminlte/u/payment/widgets/list.blade.php |  2 +-
 .../u/service/widgets/active.blade.php        |  2 +-
 routes/api.php                                |  4 ++--
 routes/web.php                                | 17 ++++++++-------
 7 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/resources/views/theme/backend/adminlte/r/service/widgets/movement.blade.php b/resources/views/theme/backend/adminlte/r/service/widgets/movement.blade.php
index f69f97b..fc1daec 100644
--- a/resources/views/theme/backend/adminlte/r/service/widgets/movement.blade.php
+++ b/resources/views/theme/backend/adminlte/r/service/widgets/movement.blade.php
@@ -1,5 +1,5 @@
 <!-- Show client movements -->
-<div class="card card-danger">
+<div class="card card-dark">
 	<div class="card-header">
 		<h3 class="card-title">Service Movements</h3>
 	</div>
diff --git a/resources/views/theme/backend/adminlte/u/invoice/cart.blade.php b/resources/views/theme/backend/adminlte/u/invoice/cart.blade.php
index 5ad3ba4..ec3ab60 100644
--- a/resources/views/theme/backend/adminlte/u/invoice/cart.blade.php
+++ b/resources/views/theme/backend/adminlte/u/invoice/cart.blade.php
@@ -16,17 +16,18 @@
 @section('main-content')
 	<div class="row">
 		<div class="col-4">
-			<div class="card">
+			<div class="card card-dark">
 				<div class="card-header">
 					<span class="card-title">Invoices to Pay</span>
 				</div>
 
 				<div class="card-body">
 					<form method="POST" action="{{ url('u/checkout/pay') }}">
-						{{ csrf_field() }}
+						@csrf
+
 						<input type="hidden" name="type" value="invoice">
 
-						<div class="input-group flex-nowrap mb-5">
+						<div class="input-group mb-5">
 							<div class="input-group-prepend">
 								<span class="input-group-text">Payment Method</span>
 							</div>
@@ -48,8 +49,8 @@
 							@foreach ($invoices as $io)
 								<input type="hidden" name="invoice_id[]" value="{{ $io->id }}">
 								<tr>
-									<td>{{ $io->id }}</td>
-									<td class="text-right">{{ $io->due }}</td>
+									<td>{{ $io->sid }}</td>
+									<td class="text-right">{{ number_format($io->due,2) }}</td>
 								</tr>
 							@endforeach
 
@@ -70,28 +71,22 @@
 								<th colspan="2">
 									<input type="submit" class="btn btn-dark mt-2" name="pay" value="Cancel">
 									<input type="submit" class="btn btn-success mt-2 float-right" name="pay" value="Submit" disabled>
+									<a href="{{ url('/home') }}" class="btn btn-danger mt-2 float-right mr-2">Add Invoice</a>
 								</th>
 							</tr>
 							</tfoot>
 						</table>
 					</form>
 				</div>
-
 			</div>
 		</div>
 	</div>
 @endsection
 
 @section('page-scripts')
-	@css('//cdnjs.cloudflare.com/ajax/libs/select2/4.0.12/css/select2.min.css','select-css')
-	@js('//cdnjs.cloudflare.com/ajax/libs/select2/4.0.12/js/select2.min.js','select-js')
-
 	<script>
 		$(document).ready(function() {
-			$('#paymethod').select2({
-				placeholder: 'Payment method...',
-
-			}).on('change',function(item) {
+			$('#paymethod').on('change',function(item) {
 				$.ajax({
 					type: "POST",
 					data: {total: {{ $invoices->sum('due') }},count: {{ $invoices->count() }} },
diff --git a/resources/views/theme/backend/adminlte/u/invoice/widgets/list.blade.php b/resources/views/theme/backend/adminlte/u/invoice/widgets/list.blade.php
index bb3fc76..549998c 100644
--- a/resources/views/theme/backend/adminlte/u/invoice/widgets/list.blade.php
+++ b/resources/views/theme/backend/adminlte/u/invoice/widgets/list.blade.php
@@ -1,5 +1,5 @@
 <!-- Show past 12 months invoices -->
-<div class="card card-success">
+<div class="card card-dark">
 	<div class="card-header">
 		<h3 class="card-title">Past Invoices</h3>
 	</div>
diff --git a/resources/views/theme/backend/adminlte/u/payment/widgets/list.blade.php b/resources/views/theme/backend/adminlte/u/payment/widgets/list.blade.php
index c4b0e1a..531ce57 100644
--- a/resources/views/theme/backend/adminlte/u/payment/widgets/list.blade.php
+++ b/resources/views/theme/backend/adminlte/u/payment/widgets/list.blade.php
@@ -1,5 +1,5 @@
 <!-- Show past 12 months payments -->
-<div class="card card-success">
+<div class="card card-dark">
 	<div class="card-header">
 		<h3 class="card-title">Past Payments</h3>
 	</div>
diff --git a/resources/views/theme/backend/adminlte/u/service/widgets/active.blade.php b/resources/views/theme/backend/adminlte/u/service/widgets/active.blade.php
index f8c8922..756576b 100644
--- a/resources/views/theme/backend/adminlte/u/service/widgets/active.blade.php
+++ b/resources/views/theme/backend/adminlte/u/service/widgets/active.blade.php
@@ -1,5 +1,5 @@
 <!-- Show active services -->
-<div class="card card-primary">
+<div class="card card-dark">
 	<div class="card-header">
 		<h3 class="card-title">Active Services</h3>
 	</div>
diff --git a/routes/api.php b/routes/api.php
index 29d1f50..c9a7ab1 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Http\Controllers\ResellerServicesController;
+use App\Http\Controllers\{CheckoutController,ResellerServicesController};
 
 /*
 |--------------------------------------------------------------------------
@@ -21,6 +21,6 @@ Route::group(['middleware'=>['auth:api','role:reseller']], function() {
 });
 
 Route::group(['middleware'=>'auth:api'], function() {
-	Route::post('/u/checkout/fee/{o}','CheckoutController@fee')
+	Route::post('/u/checkout/fee/{o}',[CheckoutController::class,'fee'])
 		->where('o','[0-9]+');
 });
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 60a0364..0c3087e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,6 +1,9 @@
 <?php
 
-use App\Http\Controllers\{HomeController,WelcomeController};
+use App\Http\Controllers\{CheckoutController,
+	HomeController,
+	PaypalController,
+	WelcomeController};
 
 /*
 |--------------------------------------------------------------------------
@@ -60,15 +63,15 @@ Route::group(['middleware'=>['theme:adminlte-be','auth'],'prefix'=>'u'],function
 	Route::get('account/{o}/invoice','User\AccountController@view_invoice_next')
 		->where('o','[0-9]+')
 		->middleware('can:view,o');
-	Route::post('checkout/pay','CheckoutController@pay');
+	Route::post('checkout/pay',[CheckoutController::class,'pay']);
 	Route::get('invoice/{o}',[HomeController::class,'invoice'])
 		->where('o','[0-9]+')
 		->middleware('can:view,o');
 	Route::get('invoice/{o}/pdf',[HomeController::class,'invoice_pdf'])
 		->where('o','[0-9]+')
 		->middleware('can:view,o');
-	Route::get('invoice/cart','CheckoutController@cart_invoice');
-	Route::get('invoice/cart/{o}','CheckoutController@cart_invoice')
+	Route::get('invoice/cart',[CheckoutController::class,'cart_invoice']);
+	Route::get('invoice/cart/{o}',[CheckoutController::class,'cart_invoice'])
 		->where('o','[0-9]+')
 		->middleware('can:view,o');
 	Route::get('service/{o}',[HomeController::class,'service'])
@@ -102,8 +105,8 @@ Route::redirect('home','u/home');
 
 Route::get('search','SearchController@search');
 
-Route::get('pay/paypal/authorise','PaypalController@authorise');
-Route::get('pay/paypal/cancel','PaypalController@cancel');
-Route::get('pay/paypal/capture','PaypalController@capture');
+Route::get('pay/paypal/authorise',[PaypalController::class,'authorise']);
+Route::get('pay/paypal/cancel',[PaypalController::class,'cancel']);
+Route::get('pay/paypal/capture',[PaypalController::class,'capture']);
 // To access any routes protected by demo-mode.
 Route::demoAccess('uc-access');