From d8b9bb9188522d01e06ea808c00723ef67e693aa Mon Sep 17 00:00:00 2001 From: Deon George Date: Fri, 7 Jun 2019 23:47:37 +1000 Subject: [PATCH] Minor fix for invoice --- app/Console/Commands/EzypayImport.php | 3 +- .../backend/adminlte/u/invoice.blade.php | 127 ++++++------------ 2 files changed, 45 insertions(+), 85 deletions(-) diff --git a/app/Console/Commands/EzypayImport.php b/app/Console/Commands/EzypayImport.php index 1e38740..8710214 100644 --- a/app/Console/Commands/EzypayImport.php +++ b/app/Console/Commands/EzypayImport.php @@ -60,7 +60,6 @@ class EzypayImport extends Command { $this->info(sprintf('Ignoring INACTIVE: [%s] %s %s',$c->EzypayReferenceNumber,$c->Firstname,$c->Surname)); continue; - } // Load Account Details from ReferenceId @@ -114,4 +113,4 @@ class EzypayImport extends Command } } -} +} \ No newline at end of file diff --git a/resources/theme/backend/adminlte/u/invoice.blade.php b/resources/theme/backend/adminlte/u/invoice.blade.php index 1592c7d..65704e0 100644 --- a/resources/theme/backend/adminlte/u/invoice.blade.php +++ b/resources/theme/backend/adminlte/u/invoice.blade.php @@ -5,7 +5,7 @@ @endsection @section('contentheader_title') - Invoice # + Invoice #{{ $o->id }} @endsection @section('contentheader_description') {{ $o->invoice_account_id }} @@ -13,112 +13,75 @@ @section('main-content') -
+
-
-

+
+

{{ $so->site_name }} Date: {{ $o->invoice_date}} -

+

-
- - - - - - - - - - - - - - - - - -
FROM:{{ $so->site_name }}
 {!! $so->address('html') !!}
Phone{{ $so->site_phone }}
Email{{ $so->site_email }}
+
+ FROM: +
+ {{ $so->site_name }}
+ {!! $so->address('html') !!}
+ Email: {{ $so->site_email }}
+ Phone: {{ $so->site_phone }} +
-
- - - - - - - - - - - @if ($o->account->phone) - - - @else - - @endif - - - - - - - - - -
TO:{{ $o->account->company }}
 {!! $o->account->address('html') !!}
Phone{{ $so->site_phone }} 
Email{{ $o->account->email }}
Account{{ $o->account->account_id }}
+
+ TO: +
+ {{ $o->account->company }}
+ {!! $o->account->address('html') !!}
+ Email: {{ $o->account->email }}
+ @if ($o->account->phone) + Phone: {{ $o->account->phone }}
+ @endif + Account: {{ $o->account->account_id }} +
-
- - - - - - - - - - - - - -
Invoice #{{ $o->invoice_id }}
Payment Due{{ $o->due_date->format('Y-m-d') }}
Total${{ number_format($o->total,$o->currency()->rounding) }}
+
+ Invoice {{ $o->invoice_id }}
+
+ Payment Due: {{ $o->due_date->format('Y-m-d') }}
+ Total: ${{ number_format($o->total,$o->currency()->rounding) }}
-
- +
+
- - - - + + + + @foreach ($o->products() as $po) - + @foreach ($o->product_services($po) as $so) - + @@ -126,7 +89,7 @@ @foreach ($o->product_service_items($po,$so) as $io) - + @@ -145,7 +108,7 @@
-
+

Payment Methods:

{{-- Visa @@ -160,7 +123,7 @@
-
+
QtyProductDescriptionSubtotalQtyProductDescriptionSubtotal
{{ $po->count }}{{ $po->count }} {{ $po->product_id }} {{ $po->name($o->account->user->language) }}   ${{ number_format($o->items->filter(function($item) use ($po) {return $item->product_id == $po->id; })->sum('total'),$o->currency()->rounding) }}
  Service: {{ $so->service_id }}: {{ $so->name }}   
    {{ $io->item_type_name }}
@@ -199,7 +162,7 @@
-
+
Print @@ -207,10 +170,8 @@
- +
- -
@endsection @section('page-scripts') @@ -232,11 +193,11 @@ }); $('tr[id="invoice-services"]').click(function() { - $(".invoice-services").toggleClass("visible-print"); + $(".invoice-services").toggleClass("d-none"); }); $('tr[id="invoice-service-items"]').click(function() { - $(".invoice-service-items").toggleClass("visible-print"); + $(".invoice-service-items").toggleClass("d-none"); }); })