Framework update

composer.json

@@ -21,15 +21,16 @@
         "laravel/passport": "^10.1",
         "laravel/socialite": "^5.2",
         "laravel/ui": "^3.2",
-        "leenooks/dreamscape": "^0.1.0",
+        "laravel/dreamscape": "^0.1.0",
-        "leenooks/intuit": "^0.1.2",
+        "laravel/intuit": "^0.1.7",
-        "leenooks/laravel": "^9.2.6",
+        "laravel/leenooks": "^9.2.6",
         "leenooks/laravel-theme": "^v2.0.18",
         "nunomaduro/laravel-console-summary": "^1.8",
         "paypal/paypal-checkout-sdk": "^1.0",
         "rennokki/laravel-eloquent-query-cache": "^3.3",
         "repat/laravel-job-models": "^0.7",
-        "romanzipp/laravel-queue-monitor": "^2.0"
+        "romanzipp/laravel-queue-monitor": "^2.0",
+        "web-auth/webauthn-lib": "^4.4"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.6",
@@ -57,15 +58,15 @@
     "repositories": {
         "intuit": {
             "type": "vcs",
-            "url": "https://dev.dege.au/leenooks/intuit"
+            "url": "https://gitea.dege.au/laravel/intuit.git"
         },
-        "laravel": {
+        "leenooks": {
             "type": "vcs",
-            "url": "https://dev.dege.au/leenooks/laravel"
+            "url": "https://gitea.dege.au/laravel/leenooks.git"
         },
         "dreamscape": {
             "type": "vcs",
-            "url": "https://dev.dege.au/leenooks/dreamscape"
+            "url": "https://gitea.dege.au/laravel/dreamscape.git"
         },
         "laravel-theme": {
             "type": "vcs",

docker/Dockerfile

@@ -6,7 +6,9 @@ RUN mkdir -p ${COMPOSER_HOME} \
 	&& ([ -r auth.json ] && mv auth.json ${COMPOSER_HOME}) || true \
 	&& touch .composer.refresh \
 	&& mv .env.example .env \
+	&& apk add --no-cache git \
 	&& FORCE_PERMS=1 NGINX_START=FALSE /sbin/init \
+	&& apk del --no-cache git \
 	&& chmod +x /var/www/html/artisan \
 	&& /var/www/html/artisan storage:link \
 	&& rm -rf ${COMPOSER_HOME}/* .git* composer.lock

resources/views/theme/backend/adminlte/service/home.blade.php

@@ -88,9 +88,6 @@
 							Email.
 						</div>
 						@can('wholesaler')
-							<div class="tab-pane fade" id="billing" role="tabpanel">
-								@include('service.widget.billinghistory',['o'=>$o])
-							</div>
 							<div class="tab-pane fade" id="internal" role="tabpanel">
 								@if(($x=$o->changes()->where('service__change.active',TRUE)->where('complete',FALSE)->get()->pop()))
 									@include('service.widget.internal',['o'=>$o,'p'=>$x])

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

@@ -1,51 +0,0 @@
-<table class="table table-sm" id="svc_bill_hist">
-	<thead>
-		<tr>
-			<th>Invoice</th>
-			<th>Due</th>
-			{{--
-			<th>Start</th>
-			<th>Stop</th>
-			--}}
-			<th class="text-right">Total</th>
-			<th class="text-right">Balance</th>
-		</tr>
-	</thead>
-
-	<tbody>
-	@foreach($o->account->invoiceSummary($o->invoices->pluck('id')) as $oo)
-		<tr>
-			<td><a href="{{ url('u/invoice',$oo->id) }}">{{ $oo->id }}</a></td>
-			<td>{{ $oo->due_at->format('Y-m-d') }}</td>
-			{{--
-			<td>{{ $oo->_start_at->format('Y-m-d') }}</td>
-			<td>{{ $oo->_stop_at->format('Y-m-d') }}</td>
-			--}}
-			<td class="text-right">{{ number_format($oo->_xtotal,2) }}</td>
-			<th class="text-right">{{ number_format($oo->_xbalance,2) }}</th>
-		</tr>
-	@endforeach
-	</tbody>
-
-	{{--
-	@dump($oo->getAttributes())
-	@dump($o->invoices()->get())
-	--}}
-</table>
-
-@section('page-scripts')
-	@css(datatables,bootstrap4)
-	@js(datatables,bootstrap4)
-
-	<script type="text/javascript">
-		$(document).ready(function() {
-			$('#svc_bill_hist').DataTable({
-				language: {
-					emptyTable: "No Invoices"
-				},
-				order: [1,'desc'],
-				pageLength: 10
-			});
-		});
-	</script>
-@append