deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Deon George
2024-07-04 15:03:11 +10:00
parent 1b4504cee2
commit 59dc825bf7
101 changed files with 1656 additions and 4062 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resources/views/theme/backend/adminlte/a/service.blade.php
View File

@@ -25,23 +25,23 @@
<div class="col-md-3">
@switch($o->order_status)
@case('ORDER-SUBMIT')
@include('a.widgets.service.order.submit')
@include('theme.backend.adminlte.a.widgets.service.order.submit')
@break
@case('ORDER-HOLD')
@case('ORDER-SENT')
@case('ORDERED')
@include('a.widgets.service.order.sent')
@include('theme.backend.adminlte.a.widgets.service.order.sent')
@break
@default
@include('u.widgets.service.info')
@include('theme.backend.adminlte.u.widgets.service.info')
@endswitch
</div>
@if($o->order_status == 'ORDER-REQUEST')
<div class="col-md-3">
@include('a.widgets.service_order-request')
@include('theme.backend.adminlte.a.widgets.service_order-request')
</div>
@endif
</div>

20
resources/views/theme/backend/adminlte/home.blade.php
View File

@@ -17,7 +17,7 @@
@section('main-content')
<!-- Our Summary Home Page Boxes -->
<div class="row">
@include('common.account.widget.summary')
@include('theme.backend.adminlte.common.account.widget.summary')
</div>
<div class="card card-light card-tabs">
@@ -54,9 +54,11 @@
<li class="nav-item"><a class="nav-link" href="#tab-nextinvoice" data-toggle="tab">Next Invoice</a></li>
--}}
<li class="nav-item"><a class="nav-link" href="#tab-futureinvoice" data-toggle="tab">Future Invoice</a></li>
@canany('reseller','wholesaler')
<li class="nav-item ml-auto">
<a class="nav-link {{ session()->has('supplier_update') ? 'active' : '' }}" href="#tab-supplier" data-toggle="tab">Supplier</a>
</li>
@endcanany
</ul>
</div>
@@ -65,15 +67,15 @@
<div class="tab-pane {{ (! session()->has('supplier_update')) ? 'active' : '' }}" id="tab-services">
<div class="row">
<div class="col-12 col-xl-7">
@include('service.widget.active',['o'=>$ao])
@include('theme.backend.adminlte.service.widget.active',['o'=>$ao])
</div>
<div class="col-12 col-xl-5">
@include('invoice.widget.due',['o'=>$ao])
@include('theme.backend.adminlte.invoice.widget.due',['o'=>$ao])
@include('invoice.widget.list',['o'=>$ao])
@include('theme.backend.adminlte.invoice.widget.list',['o'=>$ao])
@include('payment.widget.list',['o'=>$ao])
@include('theme.backend.adminlte.payment.widget.list',['o'=>$ao])
</div>
</div>
</div>
@@ -83,7 +85,7 @@
<div class="tab-pane" id="tab-nextinvoice">
<div class="row">
<div class="col-12">
@include('u.invoice.widgets.next',['future'=>FALSE])
@include('theme.backend.adminlte.u.invoice.widgets.next',['future'=>FALSE])
</div>
</div>
</div>
@@ -92,14 +94,14 @@
<div class="tab-pane" id="tab-futureinvoice">
<div class="row">
<div class="col-12 col-xl-9">
@include('invoice.widget.next',['future'=>TRUE])
@include('theme.backend.adminlte.invoice.widget.next',['future'=>TRUE])
</div>
</div>
</div>
@canany('reseller','wholesaler')
<div class="tab-pane {{ session()->pull('supplier_update') ? 'active' : '' }}" id="tab-supplier" role="tabpanel">
@include('user.widget.supplier')
@include('theme.backend.adminlte.user.widget.supplier')
</div>
@endcanany
</div>
@@ -112,7 +114,7 @@
@if ($o == $user)
@canany('reseller','wholesaler')
<div class="tab-pane" id="tab-reseller" role="tabpanel">
@include('r.home.widgets.home')
@include('theme.backend.adminlte.r.home.widgets.home')
</div>
@endcanany
@endif

2
resources/views/theme/backend/adminlte/invoice/view.blade.php
View File

@@ -148,7 +148,7 @@
<td style="width: 50px;"><i class="fa-2x fa-fw {{ $cho->icon }}"></i></td>
<td>{{ $cho->name }}</td>
<td>{{ $cho->description }}</td>
<td class="w-25">@includeIf('payment.widget.plugin.'.strtolower($cho->plugin),['o'=>$cho])</td>
<td class="w-25">@includeIf('theme.backend.adminlte.payment.widget.plugin.'.strtolower($cho->plugin),['o'=>$cho])</td>
</tr>
@endforeach
</table>

2
resources/views/theme/backend/adminlte/payment/view.blade.php
View File

@@ -28,7 +28,7 @@
<div class="card-body">
<div class="tab-content">
<div class="tab-pane fade active show" id="details" role="tabpanel">
@include('payment.widget.detail')
@include('theme.backend.adminlte.payment.widget.detail')
</div>
</div>
</div>

6
resources/views/theme/backend/adminlte/product/details.blade.php
View File

@@ -16,7 +16,7 @@
@section('main-content')
<div class="row">
<div class="col-12">
@include('product.widget.selector')
@include('theme.backend.adminlte.product.widget.selector')
</div>
</div>
@@ -33,11 +33,11 @@
<div class="card-body">
<div class="tab-content">
<div class="tab-pane fade active show" id="details" role="tabpanel">
@include('product.widget.detail')
@include('theme.backend.adminlte.product.widget.detail')
</div>
<div class="tab-pane fade" id="services" role="tabpanel">
@include('product.widget.services')
@include('theme.backend.adminlte.product.widget.services')
</div>
</div>
</div>

2
resources/views/theme/backend/adminlte/product/home.blade.php
View File

@@ -16,7 +16,7 @@
@section('main-content')
<div class="row">
<div class="col-12">
@include('product.widget.selector')
@include('theme.backend.adminlte.product.widget.selector')
</div>
</div>
@endsection

6
resources/views/theme/backend/adminlte/r/home/widgets/home.blade.php
View File

@@ -1,10 +1,10 @@
<div class="row">
<div class="col-4">
@include('r.account.widgets.list')
@include('theme.backend.adminlte.r.account.widgets.list')
</div>
<div class="col-8">
@include('service.widget.movement')
@include('theme.backend.adminlte.service.widget.movement')
@include('r.invoice.widgets.due')
@include('theme.backend.adminlte.r.invoice.widgets.due')
</div>
</div>

2
resources/views/theme/backend/adminlte/service/cancel_request.blade.php
View File

@@ -45,7 +45,7 @@
</div>
{{--
@includeIf('service.widget.'.$o->product->category.'.order',['o'=>$o->type])
@includeIf('theme.backend.adminlte.service.widget.'.$o->product->category.'.order',['o'=>$o->type])
--}}
<div class="form-group row">

2
resources/views/theme/backend/adminlte/service/change_pending.blade.php
View File

@@ -153,7 +153,7 @@
</div>
<div class="card-body">
@include('service.widget.internal',['o'=>$o,'p'=>$np])
@include('theme.backend.adminlte.service.widget.internal',['o'=>$o,'p'=>$np])
</div>
</div>
</div>

2
resources/views/theme/backend/adminlte/service/change_request.blade.php
View File

@@ -44,7 +44,7 @@
</div>
</div>
@includeIf('service.widget.'.$o->product->category.'.change',['o'=>$o->type])
@includeIf('theme.backend.adminlte.service.widget.'.$o->product->category.'.change',['o'=>$o->type])
<div class="form-group row">
<label for="notes" class="col-2 col-form-label text-right">Notes</label>

17
resources/views/theme/backend/adminlte/service/home.blade.php
View File

@@ -18,8 +18,8 @@
<div class="row">
<!-- Service Details -->
<div class="col-12 col-md-5">
@includeIf('service.widget.'.$o->product->category.'.details',['o'=>$o->type])
@include('service.widget.information')
@includeIf('theme.backend.adminlte.service.widget.'.$o->product->category.'.details',['o'=>$o->type])
@include('theme.backend.adminlte.service.widget.information')
</div>
<div class="col-12 col-md-7">
@@ -71,13 +71,13 @@
</div>
@if (! $o->suspend_billing AND ! $o->external_billing)
<div class="tab-pane fade {{ (! session()->has('service_update')) ? 'active show' : '' }}" id="pending_items" role="tabpanel">
@include('service.widget.invoice')
@include('theme.backend.adminlte.service.widget.invoice')
</div>
@endif
@if ($o->hasUsage())
<div class="tab-pane fade {{ (! $o->isBilled() && (! session()->has('service_update'))) ? 'active show' : '' }}" id="traffic" role="tabpanel">
@if ($o->type->usage(30)->count())
@include('service.widget.'.$o->product->category.'.usagegraph',['o'=>$o->type])
@include('theme.backend.adminlte.service.widget.'.$o->product->category.'.usagegraph',['o'=>$o->type])
@endif
</div>
@endif
@@ -88,16 +88,19 @@
Email.
</div>
@can('wholesaler')
<div class="tab-pane fade" id="billing" role="tabpanel">
@include('theme.backend.adminlte.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])
@include('theme.backend.adminlte.service.widget.internal',['o'=>$o,'p'=>$x])
@else
@include('service.widget.internal',['o'=>$o,'p'=>new \App\Models\Product()])
@include('theme.backend.adminlte.service.widget.internal',['o'=>$o,'p'=>new \App\Models\Product()])
@endif
</div>
<div class="tab-pane fade {{ session()->pull('service_update') ? 'active show' : '' }}" id="update" role="tabpanel">
@include('service.widget.update')
@include('theme.backend.adminlte.service.widget.update')
</div>
@endcan
</div>

2
resources/views/theme/backend/adminlte/service/order/provision_plan.blade.php
View File

@@ -38,7 +38,7 @@
</div>
</div>
@includeIf('service.widget.'.$o->product->category.'.order',['o'=>$o->type])
@includeIf('theme.backend.adminlte.service.widget.'.$o->product->category.'.order',['o'=>$o->type])
<div class="form-group row">
<label for="notes" class="col-sm-2 col-form-label text-right">Notes</label>

2
resources/views/theme/backend/adminlte/service/order/sent.blade.php
View File

@@ -38,7 +38,7 @@
</div>
</div>
@includeIf('service.widget.'.$o->product->category.'.order',['o'=>$o->type])
@includeIf('theme.backend.adminlte.service.widget.'.$o->product->category.'.order',['o'=>$o->type])
<div class="form-group row">
<label for="notes" class="col-sm-2 col-form-label text-right">Notes</label>

2
resources/views/theme/backend/adminlte/service/widget/update.blade.php
View File

@@ -72,7 +72,7 @@
<hr>
@includeIf('service.widget.'.$o->product->category.'.update',['o'=>$o->type])
@includeIf('theme.backend.adminlte.service.widget.'.$o->product->category.'.update',['o'=>$o->type])
<div class="row">
<div class="col-12">

10
resources/views/theme/backend/adminlte/supplier/details.blade.php
View File

@@ -32,24 +32,24 @@
<div class="card-body">
<div class="tab-content">
<div class="tab-pane fade active show" id="details" role="tabpanel">
@include('supplier.widget.detail')
@include('theme.backend.adminlte.supplier.widget.detail')
</div>
@if($o->exists)
<div class="tab-pane fade" id="products" role="tabpanel">
@include('supplier.widget.products')
@include('theme.backend.adminlte.supplier.widget.products')
</div>
<div class="tab-pane fade" id="offerings" role="tabpanel">
@include('supplier.widget.offerings')
@include('theme.backend.adminlte.supplier.widget.offerings')
</div>
<div class="tab-pane fade" id="connections" role="tabpanel">
@include('supplier.widget.connections')
@include('theme.backend.adminlte.supplier.widget.connections')
</div>
<div class="tab-pane fade" id="costs" role="tabpanel">
@include('supplier.widget.costs')
@include('theme.backend.adminlte.supplier.widget.costs')
</div>
@endif
</div>

4
resources/views/theme/frontend/metronic/order/home.blade.php
View File

@@ -202,7 +202,7 @@
<div class="col-sm-6" id="product_info">
@if (old('product_id'))
@include('order.widget.info',['o'=>$po])
@include('theme.frontend.metronic.order.widget.info',['o'=>$po])
@endif
</div>
</div>
@@ -210,7 +210,7 @@
<div class="row">
<div class="col-sm-12" id="product_order">
@if (old('product_id'))
@include('order.widget.order',['o'=>$po])
@include('theme.frontend.metronic.order.widget.order',['o'=>$po])
@endif
</div>
</div>

2
resources/views/theme/frontend/metronic/order/widget/info.blade.php
View File

@@ -3,7 +3,7 @@
<div class="box box-primary">
<div class="box-body">
{{-- Return Category Requirements --}}
@include('order.widget.info.'.$o->category)
@include('theme.frontend.metronic.order.widget.info.'.$o->category)
{{-- Return Supplier Requirements --}}
{{-- Return Product Requirements --}}

2
resources/views/theme/frontend/metronic/order/widget/info/broadband.blade.php
View File

@@ -1,5 +1,5 @@
<!-- $o = Product::class -->
@include('order.widget.info.base',['footer'=>'
@include('theme.frontend.metronic.order.widget.info.base',['footer'=>'
<sup>
* Additional setup charges may apply for complex installations.<br>
+ Additional charges may apply for regional installations.

2
resources/views/theme/frontend/metronic/order/widget/info/domain.blade.php
View File

@@ -1,5 +1,5 @@
<!-- $o = Product::class -->
@include('order.widget.info.base',['footer'=>'
@include('theme.frontend.metronic.order.widget.info.base',['footer'=>'
<sup>
* Depends on domain availability.<br>
+ Domain availability may change the initial cost.

2
resources/views/theme/frontend/metronic/order/widget/info/email.blade.php
View File

@@ -1,5 +1,5 @@
<!-- $o = Product::class -->
@include('order.widget.info.base',['footer'=>'
@include('theme.frontend.metronic.order.widget.info.base',['footer'=>'
<sup>
* Depends on domain availability.<br>
+ Domain availability may change the initial cost.

2
resources/views/theme/frontend/metronic/order/widget/info/hosting.blade.php
View File

@@ -1,5 +1,5 @@
<!-- $o = Product::class -->
@include('order.widget.info.base',['footer'=>'
@include('theme.frontend.metronic.order.widget.info.base',['footer'=>'
<sup>
* Depends on domain availability.<br>
+ Domain availability may change the initial cost.

2
resources/views/theme/frontend/metronic/order/widget/info/phone.blade.php
View File

@@ -1,5 +1,5 @@
<!-- $o = Product::class -->
@include('order.widget.info.base',['footer'=>'
@include('theme.frontend.metronic.order.widget.info.base',['footer'=>'
<sup>
* Depends on complex porting.<br>
+ Complex porting involves additional charges.

2
resources/views/theme/frontend/metronic/order/widget/order.blade.php
View File

@@ -7,7 +7,7 @@
<div class="box-body">
{{-- Return Category Requirements --}}
@include('order.widget.order.'.$o->category)
@include('theme.frontend.metronic.order.widget.order.'.$o->category)
{{-- Return Supplier Requirements --}}
{{-- Return Product Requirements --}}

42
resources/views/theme/frontend/metronic/welcome/home.blade.php
View File

@@ -6,55 +6,53 @@
@section('main-content')
{{-- SLIDER --}}
@includeIf('welcome.widgets.slider')
@includeIf('theme.frontend.metronic.welcome.widgets.slider')
{{-- END SLIDER --}}
<div class="main">
<div class="container">
{{-- SERVICE BOX --}}
@includeIf('welcome.widgets.servicebox')
@includeIf('theme.frontend.metronic.welcome.widgets.servicebox')
{{-- END SERVICE BOX --}}
{{-- TESTIMONIALS --}}
@includeIf('welcome.widgets.blockquote')
@includeIf('theme.frontend.metronic.welcome.widgets.blockquote')
{{-- END TESTIMONIALS --}}
{{-- ACTIVITY --}}
@includeIf('welcome.widgets.activity')
@includeIf('theme.frontend.metronic.welcome.widgets.activity')
{{-- END ACTIVITY --}}
@if (isset($show_page_tabs) OR isset($show_testimonials))
{{--
<!-- BEGIN TABS AND TESTIMONIALS -->
<div class="row mix-block margin-bottom-40">
{{-- TABS --}}
@includeIf('welcome.widgets.tabs')
{{-- END TABS --}}
{{-- TABS --}
@includeIf('theme.frontend.metronic.welcome.widgets.tabs')
{{-- END TABS --}
{{-- TESTIMONIALS --}}
@includeIf('welcome.widgets.testimonials')
{{-- END TESTIMONIALS --}}
{{-- TESTIMONIALS --}
@includeIf('theme.frontend.metronic.welcome.widgets.testimonials')
{{-- END TESTIMONIALS --}
</div>
<!-- END TABS AND TESTIMONIALS -->
@endif
--}}
{{-- STEPS --}}
@includeIf('welcome.widgets.steps')
@includeIf('theme.frontend.metronic.welcome.widgets.steps')
{{-- END STEPS --}}
{{-- CLIENTS --}}
@isset($show_clients))
@includeIf('welcome.widgets.clients')
@endisset
{{-- END CLIENTS --}}
{{--
{{-- CLIENTS --}
@includeIf('theme.frontend.metronic.welcome.widgets.clients')
{{-- END CLIENTS --}
--}}
</div>
</div>
@themejs('js/layout.js','layout','jquery')
@endsection
@section('page-scripts')
<script type="text/javascript" src="{{ asset('theme/frontend/metronic/js/layout.js') }}"></script>
<!-- PAGE LEVEL JAVASCRIPT -->
<script type="text/javascript">
$(document).ready(function() {
Layout.init();
@@ -62,6 +60,4 @@
Layout.initNavScrolling();
});
</script>
<!-- END PAGE LEVEL JAVASCRIPTS -->
@append

4
resources/views/theme/frontend/metronic/welcome/widgets/activity.blade.php
View File

@@ -132,7 +132,7 @@
autoplay: true,
});
Fancybox.bind("[data-fancybox]", {});
Fancybox.bind("[data-fancybox]",{});
});
</script>
@append
@append

13
resources/views/theme/frontend/metronic/welcome/widgets/blockquote.blade.php
View File

@@ -1,10 +1,11 @@
<!-- BEGIN BLOCKQUOTE BLOCK -->
<div class="row quote-v1 margin-bottom-30" style="background: #002090;">
<div class="col-md-9">
<span class="text-uppercase"><strong>Get in contact today</strong></span>
</div>
<div class="col-md-3 text-right">
<a class="btn-transparent" href="mailto:help@graytech.net.au" target="_blank"><i class="fas fa-pencil-alt margin-right-10"></i><email>help</email>@<domain>graytech.net.au</domain></a>
</div>
<div class="col-md-9">
<span class="text-uppercase"><strong>Get in contact today</strong></span>
</div>
<div class="col-md-3 text-right">
<a class="btn-transparent" href="mailto:help@graytech.net.au" target="_blank"><i class="fas fa-pencil-alt margin-right-10"></i><email>help</email>@<domain>graytech.net.au</domain></a>
</div>
</div>
<!-- END BLOCKQUOTE BLOCK -->

6
resources/views/theme/frontend/metronic/welcome/widgets/slider.blade.php
View File

@@ -10,13 +10,13 @@
<!-- Wrapper for slides -->
<div class="carousel-inner" role="listbox">
<div class="item carousel-item active" style="background-image: url( {{ asset('pages/welcome/img/slider/mobile-phone-426559_1920.jpg') }} ); background-size: cover; background-position: center center; opacity: 0.8;">
<div class="container">
<div class="carousel-position-six text-uppercase text-center" style="background: rgba(100,100,100, 0.7); color: #000;padding: 20px;">
<h2 class="margin-bottom-20 animate-delay carousel-title-v2" data-animation="animated fadeInDown">
Internet confusing?
</h2>
<p class="carousel-subtitle-v5 border-top-bottom margin-bottom-30" data-animation="animated fadeInDown">We can help you with your Internet journey.</p>
{{--
@@ -32,9 +32,11 @@
<h2 class="animate-delay carousel-title-v6 text-uppercase" data-animation="animated fadeInDown">
Web hosting a challenge?
</h2>
<p class="carousel-subtitle-v6 text-uppercase" data-animation="animated fadeInDown">
Graytech Hosting can take away the complexity of getting a web presence.
</p>
<p class="carousel-subtitle-v7 margin-bottom-30" data-animation="animated fadeInDown" style="color: #fff;">
We can host your website, all you need is to provide the content.
</p>
@@ -52,10 +54,12 @@
<h2 class="margin-bottom-20 animate-delay carousel-title-v2" data-animation="animated fadeInDown">
Not sure where to begin?
</h2>
<p class="carousel-subtitle-v5 text-uppercase" data-animation="animated fadeInDown">
We can manage everything from the link to the internet, your email,<br>
your website and a firewall to keep the bad folks out.
</p>
<p class="carousel-subtitle-v7 margin-bottom-30" data-animation="animated fadeInDown" style="color: #fff;">
Get in touch.
</p>

3
resources/views/theme/frontend/metronic/welcome/widgets/tabs.blade.php
View File

@@ -25,5 +25,4 @@
@endforeach
</div>
</div>
<!-- END TABS -->
<!-- END TABS -->