From c45f5136fefc3eabf9a3c7ebfe2816c664ed71ee Mon Sep 17 00:00:00 2001 From: Deon George Date: Sat, 8 Jun 2019 22:33:03 +1000 Subject: [PATCH] Updates to invoice --- composer.json | 2 +- composer.lock | 2 +- .../backend/adminlte/u/invoice.blade.php | 97 ++++++++++--------- .../theme/frontend/metronic/order.blade.php | 4 +- .../metronic/widgets/product/ADSL.blade.php | 9 +- 5 files changed, 63 insertions(+), 51 deletions(-) diff --git a/composer.json b/composer.json index 669cd9e..52278e2 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "php": "^7.1.3", "acacha/user": "^0.2.2", "barryvdh/laravel-debugbar": "^3.2", - "barryvdh/laravel-snappy": "^0.4.1", + "barryvdh/laravel-snappy": "^0.4.4", "clarkeash/doorman": "^2.0", "creativeorange/gravatar": "^1.0", "doctrine/dbal": "^2.9", diff --git a/composer.lock b/composer.lock index 75d3269..fa8fdb7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8825756d6702446213ff7c7dd0beee21", + "content-hash": "811c846e37c98427b477d58a8e8ded48", "packages": [ { "name": "acacha/user", diff --git a/resources/theme/backend/adminlte/u/invoice.blade.php b/resources/theme/backend/adminlte/u/invoice.blade.php index 65704e0..8c6007c 100644 --- a/resources/theme/backend/adminlte/u/invoice.blade.php +++ b/resources/theme/backend/adminlte/u/invoice.blade.php @@ -49,12 +49,22 @@ Account: {{ $o->account->account_id }} + {{-- col-sm-offset-2 not working here --}} +
-
- 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) }}
@@ -62,7 +72,7 @@
- +
@@ -77,11 +87,10 @@ - - + @foreach ($o->product_services($po) as $so) - + @@ -89,7 +98,7 @@ @foreach ($o->product_service_items($po,$so) as $io) - + @@ -123,45 +132,43 @@ -
-
-
Qty{{ $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) }}${{ 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 }}
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Subtotal:${{ number_format($o->sub_total,$o->currency()->rounding) }}
 Tax (GST 10%)${{ number_format($o->tax_total,$o->currency()->rounding) }}
 Other Charges:$0.00
Total:${{ number_format($o->total,$o->currency()->rounding) }}
 Payments:${{ number_format($o->paid,$o->currency()->rounding) }}
Account Due:${{ number_format($o->due,$o->currency()->rounding) }}
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Subtotal:${{ number_format($o->sub_total,$o->currency()->rounding) }}
 Tax (GST 10%)${{ number_format($o->tax_total,$o->currency()->rounding) }}
 Other Charges:$0.00
Total:${{ number_format($o->total,$o->currency()->rounding) }}
 Payments:${{ number_format($o->paid,$o->currency()->rounding) }}
Account Due:${{ number_format($o->due,$o->currency()->rounding) }}
-
+
Print @@ -172,6 +179,8 @@
+ +
@endsection @section('page-scripts') @@ -187,7 +196,7 @@ $(document).ready(function() { $("table#restripe").removeClass("table-striped"); - $("table#restripe tr:not(.visible-print)").each(function (index) { + $("table#restripe tr:not(.d-print-table-row)").each(function (index) { $(this).toggleClass("stripe-odd", (index & 1)); $(this).toggleClass("stripe-even", !!(index & 1)); }); diff --git a/resources/theme/frontend/metronic/order.blade.php b/resources/theme/frontend/metronic/order.blade.php index feae8fb..f09770b 100644 --- a/resources/theme/frontend/metronic/order.blade.php +++ b/resources/theme/frontend/metronic/order.blade.php @@ -303,7 +303,7 @@ dataType: "html", cache: true, url: '{{ url('product_info') }}'+'/'+$(this).val(), - timeout: 3000, + timeout: 5000, error: function(x) { alert("Failed to submit"); }, @@ -318,7 +318,7 @@ dataType: "html", cache: true, url: '{{ url('product_order') }}'+'/'+$(this).val(), - timeout: 3000, + timeout: 5000, error: function(x) { alert("Failed to submit"); }, diff --git a/resources/theme/frontend/metronic/widgets/product/ADSL.blade.php b/resources/theme/frontend/metronic/widgets/product/ADSL.blade.php index 6ad88d6..8855275 100644 --- a/resources/theme/frontend/metronic/widgets/product/ADSL.blade.php +++ b/resources/theme/frontend/metronic/widgets/product/ADSL.blade.php @@ -12,7 +12,7 @@ ${{ is_numeric($o->setup_cost) ? number_format($o->setup_cost,2) : $o->setup_cost }} - Cost + Cost + ${{ is_numeric($o->default_cost) ? number_format($o->default_cost,2) : $o->default_cost }} @@ -24,11 +24,14 @@ {{ $o->contract_term }} mths - Minimum Costs * + Minimum Costs +* ${{ is_numeric($o->minimum_cost) ? number_format($o->minimum_cost,2) : $o->minimum_cost }} - * Additional setup charges may apply for complex installations. + + * Additional setup charges may apply for complex installations.
+ + Additional charges may apply for regional installations. + \ No newline at end of file