From 337beee7bfcdb64048a67869f4ace9c654a56864 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Fri, 10 Jul 2020 17:20:22 +1000
Subject: [PATCH] Fix account access for resellers, added invoices to user home

---
 app/Policies/UserPolicy.php                   |  2 +-
 .../common/invoice/widget/history.blade.php   | 59 +++++++++++++++++++
 .../theme/backend/adminlte/u/home.blade.php   |  1 +
 .../layouts/partials/sidebarmenu.blade.php    | 12 ++--
 4 files changed, 67 insertions(+), 7 deletions(-)
 create mode 100644 resources/views/theme/backend/adminlte/common/invoice/widget/history.blade.php

diff --git a/app/Policies/UserPolicy.php b/app/Policies/UserPolicy.php
index cc9a4fd..d2aaf13 100644
--- a/app/Policies/UserPolicy.php
+++ b/app/Policies/UserPolicy.php
@@ -26,7 +26,7 @@ class UserPolicy
 			OR $user->isWholesaler()
 
 			// The user is the reseller
-			OR $user->all_accounts()->pluck('id')->search($o->id);
+			OR $user->all_clients()->pluck('id')->search($o->id);
 	}
 
 	/**
diff --git a/resources/views/theme/backend/adminlte/common/invoice/widget/history.blade.php b/resources/views/theme/backend/adminlte/common/invoice/widget/history.blade.php
new file mode 100644
index 0000000..7e26cca
--- /dev/null
+++ b/resources/views/theme/backend/adminlte/common/invoice/widget/history.blade.php
@@ -0,0 +1,59 @@
+<div class="card card-primary card-outline">
+	<div class="card-header">
+		<h4 class="card-title">Invoice History</h4>
+
+		<div class="card-tools">
+			<button type="button" class="btn btn-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
+			<button type="button" class="btn btn-tool" data-widget="remove"><i class="fa fa-remove"></i></button>
+		</div>
+	</div>
+
+	<div class="card-body">
+		@if ($o->invoices->count())
+			<table class="table table-bordered table-striped table-hover" id="invoice_history" style="width: 100%;">
+				<thead>
+					<tr>
+						<th>ID</th>
+						<th>Date</th>
+						<th>Amount</th>
+					</tr>
+				</thead>
+
+				<tbody>
+				@foreach ($o->invoices as $io)
+					<tr>
+						<td><a href="{{ url ('u/invoice',$io->id) }}">{{ $io->id }}</a></td>
+						<td>{{ $io->due_date ? $io->due_date->format('Y-m-d') : '&nbsp;' }}</td>
+						<td class="text-right">{{ number_format($io->total,2) }}</td>
+					</tr>
+				@endforeach
+
+				</tbody>
+			</table>
+		@else
+			<p>No payments recorded</p>
+		@endif
+	</div>
+</div>
+
+@section('page-scripts')
+	@css('//cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css','jq-dt-css','jquery')
+	@js('//cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js','jq-dt-js','jquery')
+	@css('//cdn.datatables.net/responsive/2.2.1/css/responsive.dataTables.min.css','dt-responsive-css','jq-dt-css')
+	@js('//cdn.datatables.net/responsive/2.2.1/js/dataTables.responsive.min.js','dt-responsive-js','jq-dt-js')
+	@css('/plugin/dataTables/dataTables.bootstrap4.css','dt-bootstrap4-css','jq-dt-css')
+	@js('/plugin/dataTables/dataTables.bootstrap4.js','dt-bootstrap4-js','jq-dt-js')
+
+	<script type="text/javascript">
+		$(document).ready(function() {
+			$('#invoice_history').DataTable( {
+				responsive: true,
+				order: [1, 'desc']
+			});
+
+			$('#invoices tbody').on('click','tr', function () {
+				$(this).toggleClass('selected');
+			});
+		});
+	</script>
+@append
\ No newline at end of file
diff --git a/resources/views/theme/backend/adminlte/u/home.blade.php b/resources/views/theme/backend/adminlte/u/home.blade.php
index f3d37e9..619e982 100644
--- a/resources/views/theme/backend/adminlte/u/home.blade.php
+++ b/resources/views/theme/backend/adminlte/u/home.blade.php
@@ -40,6 +40,7 @@
 
 								<div class="col-5">
 									@include('common.invoice.widget.due')
+									@include('common.invoice.widget.history')
 									@include('common.payment.widget.history')
 								</div>
 							</div>
diff --git a/resources/views/vendor/adminlte/layouts/partials/sidebarmenu.blade.php b/resources/views/vendor/adminlte/layouts/partials/sidebarmenu.blade.php
index c1f484a..c947757 100644
--- a/resources/views/vendor/adminlte/layouts/partials/sidebarmenu.blade.php
+++ b/resources/views/vendor/adminlte/layouts/partials/sidebarmenu.blade.php
@@ -2,7 +2,7 @@
 
 <li class="nav-item">
 	<a href="{{ url('home') }}" class="nav-link @if(preg_match('#^event/summary#',Route::current()->uri())) active @endif">
-		<i class="nav-icon fa fa-link"></i>
+		<i class="nav-icon fas fa-home"></i>
 		<p>
 			{{ trans('adminlte_lang::message.home') }}
 		</p>
@@ -11,17 +11,17 @@
 
 <li class="nav-item has-treeview @if(preg_match('#^order/#',Route::current()->uri())) menu-open @endif">
 	<a href="#" class="nav-link @if(preg_match('#^order/#',Route::current()->uri())) active @endif">
-		<i class="nav-icon fa fa-tree"></i>
+		<i class="nav-icon fas fa-cash-register"></i>
 		<p>
 			Orders
-			<i class="fa fa-angle-left right"></i>
+			<i class="fas fa-angle-left right"></i>
 		</p>
 	</a>
 
 	<ul class="nav nav-treeview">
 		<li class="nav-item">
 			<a href="{{ url('order') }}" class="nav-link @if(Route::current()->uri() == 'group/add') active @endif">
-				<i class="fa fa-circle-o nav-icon"></i>
+				<i class="fas fa-tag nav-icon"></i>
 				<p>New Order</p>
 			</a>
 		</li>
@@ -33,13 +33,13 @@
 
 	<li class="nav-item has-treeview @if(preg_match('#^a/report/(products)#',request()->path()))menu-open @else menu-closed @endif">
 		<a href="#" class="nav-link @if(preg_match('#^a/report/(products)#',request()->path())) active @endif">
-			<i class="nav-icon fa fa-list"></i> <p>REPORT<i class="fa fa-angle-left right"></i></p>
+			<i class="nav-icon fas fa-list"></i> <p>REPORT<i class="fas fa-angle-left right"></i></p>
 		</a>
 
 		<ul class="nav nav-treeview">
 			<li class="nav-item">
 				<a href="{{ url('a/report/products') }}" class="nav-link @if(preg_match('#^a/report/products$#',request()->path()))active @endif">
-					<i class="nav-icon fa fa-shopping-cart"></i> <p>Products</p>
+					<i class="nav-icon fas fa-barcode"></i> <p>Products</p>
 				</a>
 			</li>
 		</ul>