From 208f909824889dfeaee097a86e3fdde478549943 Mon Sep 17 00:00:00 2001 From: Fahim Date: Thu, 5 Aug 2021 22:33:55 +0600 Subject: [PATCH] Updated: Sales Module --- .../Sale/Http/Controllers/SaleController.php | 4 +- Modules/Sale/Resources/views/create.blade.php | 15 +- Modules/Sale/Resources/views/edit.blade.php | 18 ++- .../views/partials/actions.blade.php | 10 +- Modules/Sale/Resources/views/print.blade.php | 133 +++++++++++++++++ Modules/Sale/Resources/views/show.blade.php | 140 ++++++++++++++++++ Modules/Sale/Routes/web.php | 12 ++ ...021_07_31_140531_create_settings_table.php | 2 +- .../Seeders/SettingDatabaseSeeder.php | 2 +- .../Setting/Resources/views/index.blade.php | 2 +- resources/views/layouts/footer.blade.php | 2 +- resources/views/layouts/header.blade.php | 13 ++ .../views/livewire/product-cart.blade.php | 2 +- 13 files changed, 336 insertions(+), 19 deletions(-) create mode 100644 Modules/Sale/Resources/views/print.blade.php diff --git a/Modules/Sale/Http/Controllers/SaleController.php b/Modules/Sale/Http/Controllers/SaleController.php index a62477dd..bf469992 100644 --- a/Modules/Sale/Http/Controllers/SaleController.php +++ b/Modules/Sale/Http/Controllers/SaleController.php @@ -100,7 +100,9 @@ class SaleController extends Controller public function show(Sale $sale) { abort_if(Gate::denies('show_sales'), 403); - return view('sale::show', compact('sale')); + $customer = Customer::findOrFail($sale->customer_id); + + return view('sale::show', compact('sale', 'customer')); } diff --git a/Modules/Sale/Resources/views/create.blade.php b/Modules/Sale/Resources/views/create.blade.php index c5f1f440..a7d6753d 100644 --- a/Modules/Sale/Resources/views/create.blade.php +++ b/Modules/Sale/Resources/views/create.blade.php @@ -83,10 +83,15 @@
-
-
- +
+ +
+
+ +
@@ -121,6 +126,10 @@ allowZero: true, }); + $('#getTotalAmount').click(function () { + $('#paid_amount').maskMoney('mask', {{ Cart::instance('sale')->total() }}); + }); + $('#sale-form').submit(function () { var paid_amount = $('#paid_amount').maskMoney('unmasked')[0]; $('#paid_amount').val(paid_amount); diff --git a/Modules/Sale/Resources/views/edit.blade.php b/Modules/Sale/Resources/views/edit.blade.php index 51b7b69b..8f1c4c6d 100644 --- a/Modules/Sale/Resources/views/edit.blade.php +++ b/Modules/Sale/Resources/views/edit.blade.php @@ -83,10 +83,15 @@
-
-
- - +
+ +
+ +
+ +
@@ -122,7 +127,10 @@ }); $('#paid_amount').maskMoney('mask'); - $('#paid_amount').maskMoney('mask'); + + $('#getTotalAmount').click(function () { + $('#paid_amount').maskMoney('mask', {{ \Gloudemans\Shoppingcart\Facades\Cart::instance('sale')->total() }}); + }); $('#sale-form').submit(function () { var paid_amount = $('#paid_amount').maskMoney('unmasked')[0]; diff --git a/Modules/Sale/Resources/views/partials/actions.blade.php b/Modules/Sale/Resources/views/partials/actions.blade.php index 34c55d1a..f45d03f9 100644 --- a/Modules/Sale/Resources/views/partials/actions.blade.php +++ b/Modules/Sale/Resources/views/partials/actions.blade.php @@ -1,16 +1,16 @@
-
@can('edit_sales') - Edit + Edit @endcan @can('show_sales') - Details + Details @endcan @can('delete_sales') @@ -19,7 +19,7 @@ if (confirm('Are you sure? It will delete the dNPata permanently!')) { document.getElementById('destroy{{ $data->id }}').submit() }"> - Delete + Delete
@csrf @method('delete') diff --git a/Modules/Sale/Resources/views/print.blade.php b/Modules/Sale/Resources/views/print.blade.php new file mode 100644 index 00000000..4ccff96c --- /dev/null +++ b/Modules/Sale/Resources/views/print.blade.php @@ -0,0 +1,133 @@ + + + + + + + Sale Details + + + +
+
+
+
+ Logo +

+ Reference:: {{ $sale->reference }} +

+
+
+
+
+
+

Company Info:

+
{{ settings()->company_name }}
+
{{ settings()->company_address }}
+
Email: {{ settings()->company_email }}
+
Phone: {{ settings()->company_phone }}
+
+ +
+

Customer Info:

+
{{ $customer->customer_name }}
+
{{ $customer->address }}
+
Email: {{ $customer->customer_email }}
+
Phone: {{ $customer->customer_phone }}
+
+ +
+

Invoice Info:

+
Invoice: #90-98792
+
Date: {{ \Carbon\Carbon::parse($sale->date)->format('d M, Y') }}
+
+ Status: {{ $sale->status }} +
+
+ Payment Status: {{ $sale->payment_status }} +
+
+ +
+ +
+ + + + + + + + + + + + + + @foreach($sale->saleDetails as $item) + + + + + + + + + + + + + + + + @endforeach + +
ProductNet Unit PriceStockQuantityDiscountTaxSub Total
+ {{ $item->product_name }}
+ + {{ $item->product_code }} + + 		{{ format_currency($item->unit_price) }} + {{ $item->product->product_quantity }} + + {{ $item->quantity }} + + {{ format_currency($item->product_discount_amount) }} + + {{ format_currency($item->product_tax_amount) }} + + {{ format_currency($item->sub_total) }} +
+
+
+
+ + + + + + + + + + + + + + + + + + + +
Discount ({{ $sale->discount_percentage }}%){{ format_currency($sale->discount_amount) }}
Tax ({{ $sale->tax_percentage }}%){{ format_currency($sale->tax_amount) }}
Shipping){{ format_currency($sale->shipping_amount) }}
Grand Total{{ format_currency($sale->total_amount) }}
+
+
+
+
+
+
+
+ + diff --git a/Modules/Sale/Resources/views/show.blade.php b/Modules/Sale/Resources/views/show.blade.php index e69de29b..a17bcf0c 100644 --- a/Modules/Sale/Resources/views/show.blade.php +++ b/Modules/Sale/Resources/views/show.blade.php @@ -0,0 +1,140 @@ +@extends('layouts.app') + +@section('title', 'Sales Details') + +@section('breadcrumb') +
    +
  1. Home
    2. +
  2. Sales
    3. +
  3. Details
    4. +
+@endsection + +@section('content') +
+
+
+
+
+
+ Reference: {{ $sale->reference }} +
+ + Print + + + Save + +
+
+
+
+
Company Info:
+
{{ settings()->company_name }}
+
{{ settings()->company_address }}
+
Email: {{ settings()->company_email }}
+
Phone: {{ settings()->company_phone }}
+
+ +
+
Customer Info:
+
{{ $customer->customer_name }}
+
{{ $customer->address }}
+
Email: {{ $customer->customer_email }}
+
Phone: {{ $customer->customer_phone }}
+
+ +
+
Invoice Info:
+
Invoice: #90-98792
+
Date: {{ \Carbon\Carbon::parse($sale->date)->format('d M, Y') }}
+
+ Status: {{ $sale->status }} +
+
+ Payment Status: {{ $sale->payment_status }} +
+
+ +
+ +
+ + + + + + + + + + + + + + @foreach($sale->saleDetails as $item) + + + + + + + + + + + + + + + + @endforeach + +
ProductNet Unit PriceStockQuantityDiscountTaxSub Total
+ {{ $item->product_name }}
+ + {{ $item->product_code }} + + 		{{ format_currency($item->unit_price) }} + {{ $item->product->product_quantity }} + + {{ $item->quantity }} + + {{ format_currency($item->product_discount_amount) }} + + {{ format_currency($item->product_tax_amount) }} + + {{ format_currency($item->sub_total) }} +
+
+
+
+ + + + + + + + + + + + + + + + + + + +
Discount ({{ $sale->discount_percentage }}%){{ format_currency($sale->discount_amount) }}
Tax ({{ $sale->tax_percentage }}%){{ format_currency($sale->tax_amount) }}
Shipping){{ format_currency($sale->shipping_amount) }}
Grand Total{{ format_currency($sale->total_amount) }}
+
+
+
+
+
+
+
+@endsection + diff --git a/Modules/Sale/Routes/web.php b/Modules/Sale/Routes/web.php index 3e6207cd..2ef7a016 100644 --- a/Modules/Sale/Routes/web.php +++ b/Modules/Sale/Routes/web.php @@ -13,6 +13,18 @@ Route::group(['middleware' => 'auth'], function () { + Route::get('/sales/pdf/{id}', function ($id) { + $sale = \Modules\Sale\Entities\Sale::findOrFail($id); + $customer = \Modules\People\Entities\Customer::findOrFail($sale->customer_id); + + $pdf = \PDF::loadView('sale::print', [ + 'sale' => $sale, + 'customer' => $customer, + ])->setPaper('a4'); + + return $pdf->stream('sale-'. $sale->reference .'.pdf'); + })->name('sales.pdf'); + Route::resource('sales', 'SaleController'); }); diff --git a/Modules/Setting/Database/Migrations/2021_07_31_140531_create_settings_table.php b/Modules/Setting/Database/Migrations/2021_07_31_140531_create_settings_table.php index a70adde5..b0e472f4 100644 --- a/Modules/Setting/Database/Migrations/2021_07_31_140531_create_settings_table.php +++ b/Modules/Setting/Database/Migrations/2021_07_31_140531_create_settings_table.php @@ -22,7 +22,7 @@ class CreateSettingsTable extends Migration $table->integer('default_currency_id'); $table->string('default_currency_position'); $table->string('notification_email'); - $table->string('footer_text'); + $table->text('footer_text'); $table->text('company_address'); $table->timestamps(); }); diff --git a/Modules/Setting/Database/Seeders/SettingDatabaseSeeder.php b/Modules/Setting/Database/Seeders/SettingDatabaseSeeder.php index ec8b172e..4aebba92 100644 --- a/Modules/Setting/Database/Seeders/SettingDatabaseSeeder.php +++ b/Modules/Setting/Database/Seeders/SettingDatabaseSeeder.php @@ -22,7 +22,7 @@ class SettingDatabaseSeeder extends Seeder 'notification_email' => 'notification@test.com', 'default_currency_id' => 1, 'default_currency_position' => 'prefix', - 'footer_text' => 'Triangle Pos © 2021', + 'footer_text' => 'Triangle Pos © 2021 || Developed by Fahim Anzam', 'company_address' => 'Tangail, Bangladesh' ]); } diff --git a/Modules/Setting/Resources/views/index.blade.php b/Modules/Setting/Resources/views/index.blade.php index 0c08b12f..78691238 100644 --- a/Modules/Setting/Resources/views/index.blade.php +++ b/Modules/Setting/Resources/views/index.blade.php @@ -81,7 +81,7 @@
- +
diff --git a/resources/views/layouts/footer.blade.php b/resources/views/layouts/footer.blade.php index 38c77f55..0ddcf30a 100644 --- a/resources/views/layouts/footer.blade.php +++ b/resources/views/layouts/footer.blade.php @@ -1,5 +1,5 @@
-
{!! settings()->footer_text !!} || Developed by Fahim Anzam
+
{!! settings()->footer_text !!}
Powered by Laravel
diff --git a/resources/views/layouts/header.blade.php b/resources/views/layouts/header.blade.php index eb3035dc..b55598b7 100644 --- a/resources/views/layouts/header.blade.php +++ b/resources/views/layouts/header.blade.php @@ -16,6 +16,19 @@ +
  • + +
    +
    You have 0 notification!
    + + No Notification... + +
    +
    • +