From 7719b464e9923cb8ae9deb0e4e6ed08561f24568 Mon Sep 17 00:00:00 2001 From: Fahim Date: Sun, 8 Aug 2021 13:22:03 +0600 Subject: [PATCH] Added: Purchase Module & Purchase Payments --- Modules/Purchase/Config/.gitkeep | 0 Modules/Purchase/Config/config.php | 5 + Modules/Purchase/Console/.gitkeep | 0 Modules/Purchase/Database/Migrations/.gitkeep | 0 ...21_08_08_021108_create_purchases_table.php | 48 ++++ ..._021131_create_purchase_payments_table.php | 38 +++ ...8_021713_create_purchase_details_table.php | 46 ++++ Modules/Purchase/Database/Seeders/.gitkeep | 0 .../Seeders/PurchaseDatabaseSeeder.php | 21 ++ Modules/Purchase/Database/factories/.gitkeep | 0 Modules/Purchase/Entities/.gitkeep | 0 Modules/Purchase/Entities/Purchase.php | 49 ++++ Modules/Purchase/Entities/PurchaseDetail.php | 44 ++++ Modules/Purchase/Entities/PurchasePayment.php | 34 +++ Modules/Purchase/Http/Controllers/.gitkeep | 0 .../Http/Controllers/PurchaseController.php | 231 ++++++++++++++++++ .../PurchasePaymentsController.php | 147 +++++++++++ Modules/Purchase/Http/Middleware/.gitkeep | 0 Modules/Purchase/Http/Requests/.gitkeep | 0 .../Http/Requests/StorePurchaseRequest.php | 40 +++ .../Http/Requests/UpdatePurchaseRequest.php | 40 +++ Modules/Purchase/Providers/.gitkeep | 0 .../Providers/PurchaseServiceProvider.php | 112 +++++++++ .../Providers/RouteServiceProvider.php | 69 ++++++ Modules/Purchase/Resources/assets/.gitkeep | 0 Modules/Purchase/Resources/assets/js/app.js | 0 .../Purchase/Resources/assets/sass/app.scss | 0 Modules/Purchase/Resources/lang/.gitkeep | 0 Modules/Purchase/Resources/views/.gitkeep | 0 .../Purchase/Resources/views/create.blade.php | 139 +++++++++++ .../Purchase/Resources/views/edit.blade.php | 124 ++++++++++ .../Purchase/Resources/views/index.blade.php | 40 +++ .../views/partials/actions.blade.php | 42 ++++ .../views/partials/payment-status.blade.php | 13 + .../Resources/views/partials/status.blade.php | 13 + .../Resources/views/payments/create.blade.php | 114 +++++++++ .../Resources/views/payments/edit.blade.php | 117 +++++++++ .../Resources/views/payments/index.blade.php | 37 +++ .../views/payments/partials/actions.blade.php | 19 ++ .../Purchase/Resources/views/print.blade.php | 138 +++++++++++ .../Purchase/Resources/views/show.blade.php | 140 +++++++++++ Modules/Purchase/Routes/.gitkeep | 0 Modules/Purchase/Routes/api.php | 18 ++ Modules/Purchase/Routes/web.php | 40 +++ Modules/Purchase/Tests/Feature/.gitkeep | 0 Modules/Purchase/Tests/Unit/.gitkeep | 0 Modules/Purchase/composer.json | 23 ++ Modules/Purchase/module.json | 13 + Modules/Purchase/package.json | 17 ++ Modules/Purchase/webpack.mix.js | 14 ++ .../views/partials/actions.blade.php | 2 +- .../Resources/views/partials/status.blade.php | 2 +- .../Resources/views/payments/index.blade.php | 2 +- .../Seeders/PermissionsTableSeeder.php | 2 + app/DataTables/PurchaseDataTable.php | 100 ++++++++ app/DataTables/PurchasePaymentsDataTable.php | 77 ++++++ modules_statuses.json | 3 +- resources/views/layouts/menu.blade.php | 24 ++ .../views/livewire/product-cart.blade.php | 6 +- 59 files changed, 2196 insertions(+), 7 deletions(-) create mode 100644 Modules/Purchase/Config/.gitkeep create mode 100644 Modules/Purchase/Config/config.php create mode 100644 Modules/Purchase/Console/.gitkeep create mode 100644 Modules/Purchase/Database/Migrations/.gitkeep create mode 100644 Modules/Purchase/Database/Migrations/2021_08_08_021108_create_purchases_table.php create mode 100644 Modules/Purchase/Database/Migrations/2021_08_08_021131_create_purchase_payments_table.php create mode 100644 Modules/Purchase/Database/Migrations/2021_08_08_021713_create_purchase_details_table.php create mode 100644 Modules/Purchase/Database/Seeders/.gitkeep create mode 100644 Modules/Purchase/Database/Seeders/PurchaseDatabaseSeeder.php create mode 100644 Modules/Purchase/Database/factories/.gitkeep create mode 100644 Modules/Purchase/Entities/.gitkeep create mode 100644 Modules/Purchase/Entities/Purchase.php create mode 100644 Modules/Purchase/Entities/PurchaseDetail.php create mode 100644 Modules/Purchase/Entities/PurchasePayment.php create mode 100644 Modules/Purchase/Http/Controllers/.gitkeep create mode 100644 Modules/Purchase/Http/Controllers/PurchaseController.php create mode 100644 Modules/Purchase/Http/Controllers/PurchasePaymentsController.php create mode 100644 Modules/Purchase/Http/Middleware/.gitkeep create mode 100644 Modules/Purchase/Http/Requests/.gitkeep create mode 100644 Modules/Purchase/Http/Requests/StorePurchaseRequest.php create mode 100644 Modules/Purchase/Http/Requests/UpdatePurchaseRequest.php create mode 100644 Modules/Purchase/Providers/.gitkeep create mode 100644 Modules/Purchase/Providers/PurchaseServiceProvider.php create mode 100644 Modules/Purchase/Providers/RouteServiceProvider.php create mode 100644 Modules/Purchase/Resources/assets/.gitkeep create mode 100644 Modules/Purchase/Resources/assets/js/app.js create mode 100644 Modules/Purchase/Resources/assets/sass/app.scss create mode 100644 Modules/Purchase/Resources/lang/.gitkeep create mode 100644 Modules/Purchase/Resources/views/.gitkeep create mode 100644 Modules/Purchase/Resources/views/create.blade.php create mode 100644 Modules/Purchase/Resources/views/edit.blade.php create mode 100644 Modules/Purchase/Resources/views/index.blade.php create mode 100644 Modules/Purchase/Resources/views/partials/actions.blade.php create mode 100644 Modules/Purchase/Resources/views/partials/payment-status.blade.php create mode 100644 Modules/Purchase/Resources/views/partials/status.blade.php create mode 100644 Modules/Purchase/Resources/views/payments/create.blade.php create mode 100644 Modules/Purchase/Resources/views/payments/edit.blade.php create mode 100644 Modules/Purchase/Resources/views/payments/index.blade.php create mode 100644 Modules/Purchase/Resources/views/payments/partials/actions.blade.php create mode 100644 Modules/Purchase/Resources/views/print.blade.php create mode 100644 Modules/Purchase/Resources/views/show.blade.php create mode 100644 Modules/Purchase/Routes/.gitkeep create mode 100644 Modules/Purchase/Routes/api.php create mode 100644 Modules/Purchase/Routes/web.php create mode 100644 Modules/Purchase/Tests/Feature/.gitkeep create mode 100644 Modules/Purchase/Tests/Unit/.gitkeep create mode 100644 Modules/Purchase/composer.json create mode 100644 Modules/Purchase/module.json create mode 100644 Modules/Purchase/package.json create mode 100644 Modules/Purchase/webpack.mix.js create mode 100644 app/DataTables/PurchaseDataTable.php create mode 100644 app/DataTables/PurchasePaymentsDataTable.php diff --git a/Modules/Purchase/Config/.gitkeep b/Modules/Purchase/Config/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Purchase/Config/config.php b/Modules/Purchase/Config/config.php new file mode 100644 index 00000000..b636464f --- /dev/null +++ b/Modules/Purchase/Config/config.php @@ -0,0 +1,5 @@ + 'Purchase' +]; diff --git a/Modules/Purchase/Console/.gitkeep b/Modules/Purchase/Console/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Purchase/Database/Migrations/.gitkeep b/Modules/Purchase/Database/Migrations/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Purchase/Database/Migrations/2021_08_08_021108_create_purchases_table.php b/Modules/Purchase/Database/Migrations/2021_08_08_021108_create_purchases_table.php new file mode 100644 index 00000000..055f2912 --- /dev/null +++ b/Modules/Purchase/Database/Migrations/2021_08_08_021108_create_purchases_table.php @@ -0,0 +1,48 @@ +id(); + $table->date('date'); + $table->string('reference'); + $table->unsignedBigInteger('supplier_id')->nullable(); + $table->string('supplier_name'); + $table->integer('tax_percentage')->default(0); + $table->integer('tax_amount')->default(0); + $table->integer('discount_percentage')->default(0); + $table->integer('discount_amount')->default(0); + $table->integer('shipping_amount')->default(0); + $table->integer('total_amount'); + $table->integer('paid_amount'); + $table->integer('due_amount'); + $table->string('status'); + $table->string('payment_status'); + $table->string('payment_method'); + $table->text('note')->nullable(); + $table->foreign('supplier_id')->references('id')->on('suppliers')->nullOnDelete(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('purchases'); + } +} diff --git a/Modules/Purchase/Database/Migrations/2021_08_08_021131_create_purchase_payments_table.php b/Modules/Purchase/Database/Migrations/2021_08_08_021131_create_purchase_payments_table.php new file mode 100644 index 00000000..da8b2258 --- /dev/null +++ b/Modules/Purchase/Database/Migrations/2021_08_08_021131_create_purchase_payments_table.php @@ -0,0 +1,38 @@ +id(); + $table->unsignedBigInteger('purchase_id'); + $table->integer('amount'); + $table->date('date'); + $table->string('reference'); + $table->string('payment_method'); + $table->text('note')->nullable(); + $table->foreign('purchase_id')->references('id')->on('purchase_payments')->cascadeOnDelete(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('purchase_payments'); + } +} diff --git a/Modules/Purchase/Database/Migrations/2021_08_08_021713_create_purchase_details_table.php b/Modules/Purchase/Database/Migrations/2021_08_08_021713_create_purchase_details_table.php new file mode 100644 index 00000000..e5cb67de --- /dev/null +++ b/Modules/Purchase/Database/Migrations/2021_08_08_021713_create_purchase_details_table.php @@ -0,0 +1,46 @@ +id(); + $table->unsignedBigInteger('purchase_id'); + $table->unsignedBigInteger('product_id')->nullable(); + $table->string('product_name'); + $table->string('product_code'); + $table->integer('quantity'); + $table->integer('price'); + $table->integer('unit_price'); + $table->integer('sub_total'); + $table->integer('product_discount_amount'); + $table->string('product_discount_type')->default('fixed'); + $table->integer('product_tax_amount'); + $table->foreign('purchase_id')->references('id') + ->on('purchases')->cascadeOnDelete(); + $table->foreign('product_id')->references('id') + ->on('products')->nullOnDelete(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('purchase_details'); + } +} diff --git a/Modules/Purchase/Database/Seeders/.gitkeep b/Modules/Purchase/Database/Seeders/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Purchase/Database/Seeders/PurchaseDatabaseSeeder.php b/Modules/Purchase/Database/Seeders/PurchaseDatabaseSeeder.php new file mode 100644 index 00000000..4d7060db --- /dev/null +++ b/Modules/Purchase/Database/Seeders/PurchaseDatabaseSeeder.php @@ -0,0 +1,21 @@ +call("OthersTableSeeder"); + } +} diff --git a/Modules/Purchase/Database/factories/.gitkeep b/Modules/Purchase/Database/factories/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Purchase/Entities/.gitkeep b/Modules/Purchase/Entities/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Purchase/Entities/Purchase.php b/Modules/Purchase/Entities/Purchase.php new file mode 100644 index 00000000..c397e533 --- /dev/null +++ b/Modules/Purchase/Entities/Purchase.php @@ -0,0 +1,49 @@ +hasMany(PurchaseDetail::class, 'purchase_id', 'id'); + } + + public function purchasePayments() { + return $this->hasMany(PurchasePayment::class, 'purchase_id', 'id'); + } + + public function getReferenceAttribute($value) { + return strtoupper($value) . '_' . str_pad($this->attributes['id'], 6, '0', STR_PAD_LEFT); + } + + public function getShippingAmountAttribute($value) { + return $value / 100; + } + + public function getPaidAmountAttribute($value) { + return $value / 100; + } + + public function getTotalAmountAttribute($value) { + return $value / 100; + } + + public function getDueAmountAttribute($value) { + return $value / 100; + } + + public function getTaxAmountAttribute($value) { + return $value / 100; + } + + public function getDiscountAmountAttribute($value) { + return $value / 100; + } +} diff --git a/Modules/Purchase/Entities/PurchaseDetail.php b/Modules/Purchase/Entities/PurchaseDetail.php new file mode 100644 index 00000000..7beadeda --- /dev/null +++ b/Modules/Purchase/Entities/PurchaseDetail.php @@ -0,0 +1,44 @@ +belongsTo(Product::class, 'product_id', 'id'); + } + + public function purchase() { + return $this->belongsTo(Purchase::class, 'purchase_id', 'id'); + } + + public function getPriceAttribute($value) { + return $value / 100; + } + + public function getUnitPriceAttribute($value) { + return $value / 100; + } + + public function getSubTotalAttribute($value) { + return $value / 100; + } + + public function getProductDiscountAmountAttribute($value) { + return $value / 100; + } + + public function getProductTaxAmountAttribute($value) { + return $value / 100; + } +} diff --git a/Modules/Purchase/Entities/PurchasePayment.php b/Modules/Purchase/Entities/PurchasePayment.php new file mode 100644 index 00000000..04ddea66 --- /dev/null +++ b/Modules/Purchase/Entities/PurchasePayment.php @@ -0,0 +1,34 @@ +belongsTo(Purchase::class, 'purchase_id', 'id'); + } + + public function setAmountAttribute($value) { + $this->attributes['amount'] = $value * 100; + } + + public function getAmountAttribute($value) { + return $value / 100; + } + + public function getDateAttribute($value) { + return Carbon::parse($value)->format('d M, Y'); + } + + public function scopeByPurchase($query) { + return $query->where('purchase_id', request()->route('purchase_id')); + } +} diff --git a/Modules/Purchase/Http/Controllers/.gitkeep b/Modules/Purchase/Http/Controllers/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Purchase/Http/Controllers/PurchaseController.php b/Modules/Purchase/Http/Controllers/PurchaseController.php new file mode 100644 index 00000000..6e9305d2 --- /dev/null +++ b/Modules/Purchase/Http/Controllers/PurchaseController.php @@ -0,0 +1,231 @@ +render('purchase::index'); + } + + + public function create() { + abort_if(Gate::denies('create_purchases'), 403); + + Cart::instance('purchase')->destroy(); + + return view('purchase::create'); + } + + + public function store(StorePurchaseRequest $request) { + DB::transaction(function () use ($request) { + $due_amount = $request->total_amount - $request->paid_amount; + if ($due_amount == $request->total_amount) { + $payment_status = 'Unpaid'; + } elseif ($due_amount > 0) { + $payment_status = 'Partial'; + } else { + $payment_status = 'Paid'; + } + + $purchase = Purchase::create([ + 'date' => $request->date, + 'reference' => $request->reference, + 'supplier_id' => $request->supplier_id, + 'supplier_name' => Supplier::findOrFail($request->supplier_id)->supplier_name, + 'tax_percentage' => $request->tax_percentage, + 'discount_percentage' => $request->discount_percentage, + 'shipping_amount' => $request->shipping_amount * 100, + 'paid_amount' => $request->paid_amount * 100, + 'total_amount' => $request->total_amount * 100, + 'due_amount' => $due_amount * 100, + 'status' => $request->status, + 'payment_status' => $payment_status, + 'payment_method' => $request->payment_method, + 'note' => $request->note, + 'tax_amount' => Cart::instance('purchase')->tax() * 100, + 'discount_amount' => Cart::instance('purchase')->discount() * 100, + ]); + + foreach (Cart::instance('purchase')->content() as $cart_item) { + PurchaseDetail::create([ + 'purchase_id' => $purchase->id, + 'product_id' => $cart_item->id, + 'product_name' => $cart_item->name, + 'product_code' => $cart_item->options->code, + 'quantity' => $cart_item->qty, + 'price' => $cart_item->price * 100, + 'unit_price' => $cart_item->options->unit_price * 100, + 'sub_total' => $cart_item->options->sub_total * 100, + 'product_discount_amount' => $cart_item->options->product_discount * 100, + 'product_discount_type' => $cart_item->options->product_discount_type, + 'product_tax_amount' => $cart_item->options->product_tax * 100, + ]); + + if ($request->status == 'Completed') { + $product = Product::findOrFail($cart_item->id); + $product->update([ + 'product_quantity' => $product->product_quantity + $cart_item->qty + ]); + } + } + + Cart::instance('purchase')->destroy(); + + PurchasePayment::create([ + 'date' => $request->date, + 'reference' => 'INV/'.$purchase->reference, + 'amount' => $purchase->paid_amount, + 'purchase_id' => $purchase->id, + 'payment_method' => $request->payment_method + ]); + }); + + toast('Purchase Created!', 'success'); + + return redirect()->route('purchases.index'); + } + + + public function show(Purchase $purchase) { + abort_if(Gate::denies('show_purchases'), 403); + + $supplier = Supplier::findOrFail($purchase->supplier_id); + + return view('purchase::show', compact('purchase', 'supplier')); + } + + + public function edit(Purchase $purchase) { + abort_if(Gate::denies('edit_purchases'), 403); + + $purchase_details = $purchase->purchaseDetails; + + Cart::instance('purchase')->destroy(); + + $cart = Cart::instance('purchase'); + + foreach ($purchase_details as $purchase_detail) { + $cart->add([ + 'id' => $purchase_detail->product_id, + 'name' => $purchase_detail->product_name, + 'qty' => $purchase_detail->quantity, + 'price' => $purchase_detail->price, + 'weight' => 1, + 'options' => [ + 'product_discount' => $purchase_detail->product_discount_amount, + 'product_discount_type' => $purchase_detail->product_discount_type, + 'sub_total' => $purchase_detail->sub_total, + 'code' => $purchase_detail->product_code, + 'stock' => Product::findOrFail($purchase_detail->product_id)->product_quantity, + 'product_tax' => $purchase_detail->product_tax_amount, + 'unit_price' => $purchase_detail->unit_price + ] + ]); + } + + return view('purchase::edit', compact('purchase')); + } + + + public function update(UpdatePurchaseRequest $request, Purchase $purchase) { + DB::transaction(function () use ($request, $purchase) { + $due_amount = $request->total_amount - $request->paid_amount; + if ($due_amount == $request->total_amount) { + $payment_status = 'Unpaid'; + } elseif ($due_amount > 0) { + $payment_status = 'Partial'; + } else { + $payment_status = 'Paid'; + } + + foreach ($purchase->purchaseDetails as $purchase_detail) { + if ($purchase->status == 'Completed') { + $product = Product::findOrFail($purchase_detail->product_id); + $product->update([ + 'product_quantity' => $product->product_quantity - $purchase_detail->quantity + ]); + } + $purchase_detail->delete(); + } + + $purchase->update([ + 'date' => $request->date, + 'reference' => $request->reference, + 'supplier_id' => $request->supplier_id, + 'supplier_name' => Supplier::findOrFail($request->supplier_id)->supplier_name, + 'tax_percentage' => $request->tax_percentage, + 'discount_percentage' => $request->discount_percentage, + 'shipping_amount' => $request->shipping_amount * 100, + 'paid_amount' => $request->paid_amount * 100, + 'total_amount' => $request->total_amount * 100, + 'due_amount' => $due_amount * 100, + 'status' => $request->status, + 'payment_status' => $payment_status, + 'payment_method' => $request->payment_method, + 'note' => $request->note, + 'tax_amount' => Cart::instance('purchase')->tax() * 100, + 'discount_amount' => Cart::instance('purchase')->discount() * 100, + ]); + + foreach (Cart::instance('purchase')->content() as $cart_item) { + PurchaseDetail::create([ + 'purchase_id' => $purchase->id, + 'product_id' => $cart_item->id, + 'product_name' => $cart_item->name, + 'product_code' => $cart_item->options->code, + 'quantity' => $cart_item->qty, + 'price' => $cart_item->price * 100, + 'unit_price' => $cart_item->options->unit_price * 100, + 'sub_total' => $cart_item->options->sub_total * 100, + 'product_discount_amount' => $cart_item->options->product_discount * 100, + 'product_discount_type' => $cart_item->options->product_discount_type, + 'product_tax_amount' => $cart_item->options->product_tax * 100, + ]); + + if ($request->status == 'Completed') { + $product = Product::findOrFail($cart_item->id); + $product->update([ + 'product_quantity' => $product->product_quantity + $cart_item->qty + ]); + } + } + + Cart::instance('purchase')->destroy(); + }); + + toast('Purchase Updated!', 'info'); + + return redirect()->route('purchases.index'); + } + + + public function destroy(Purchase $purchase) { + abort_if(Gate::denies('delete_purchases'), 403); + + $purchase->delete(); + + toast('Purchase Deleted!', 'warning'); + + return redirect()->route('purchases.index'); + } +} diff --git a/Modules/Purchase/Http/Controllers/PurchasePaymentsController.php b/Modules/Purchase/Http/Controllers/PurchasePaymentsController.php new file mode 100644 index 00000000..6d17c15f --- /dev/null +++ b/Modules/Purchase/Http/Controllers/PurchasePaymentsController.php @@ -0,0 +1,147 @@ +render('purchase::payments.index', compact('purchase')); + } + + + public function create($purchase_id) { + abort_if(Gate::denies('access_purchase_payments'), 403); + + $purchase = Purchase::findOrFail($purchase_id); + + return view('purchase::payments.create', compact('purchase')); + } + + + public function store(Request $request) { + abort_if(Gate::denies('access_purchase_payments'), 403); + + $request->validate([ + 'date' => 'required|date', + 'reference' => 'required|string|max:255', + 'amount' => 'required|numeric', + 'note' => 'nullable|string|max:1000', + 'purchase_id' => 'required', + 'payment_method' => 'required|string|max:255' + ]); + + DB::transaction(function () use ($request) { + PurchasePayment::create([ + 'date' => $request->date, + 'reference' => $request->reference, + 'amount' => $request->amount, + 'note' => $request->note, + 'purchase_id' => $request->purchase_id, + 'payment_method' => $request->payment_method + ]); + + $purchase = Purchase::findOrFail($request->purchase_id); + + $due_amount = $purchase->due_amount - $request->amount; + + if ($due_amount == $purchase->total_amount) { + $payment_status = 'Unpaid'; + } elseif ($due_amount > 0) { + $payment_status = 'Partial'; + } else { + $payment_status = 'Paid'; + } + + $purchase->update([ + 'paid_amount' => ($purchase->paid_amount + $request->amount) * 100, + 'due_amount' => $due_amount * 100, + 'payment_status' => $payment_status + ]); + }); + + toast('Purchase Payment Created!', 'success'); + + return redirect()->route('purchases.index'); + } + + + public function edit($purchase_id, PurchasePayment $purchasePayment) { + abort_if(Gate::denies('access_purchase_payments'), 403); + + $purchase = Purchase::findOrFail($purchase_id); + + return view('purchase::payments.edit', compact('purchasePayment', 'purchase')); + } + + + public function update(Request $request, PurchasePayment $purchasePayment) { + abort_if(Gate::denies('access_purchase_payments'), 403); + + $request->validate([ + 'date' => 'required|date', + 'reference' => 'required|string|max:255', + 'amount' => 'required|numeric', + 'note' => 'nullable|string|max:1000', + 'purchase_id' => 'required', + 'payment_method' => 'required|string|max:255' + ]); + + DB::transaction(function () use ($request, $purchasePayment) { + $purchase = $purchasePayment->purchase; + + $due_amount = ($purchase->due_amount + $purchasePayment->amount) - $request->amount; + + if ($due_amount == $purchase->total_amount) { + $payment_status = 'Unpaid'; + } elseif ($due_amount > 0) { + $payment_status = 'Partial'; + } else { + $payment_status = 'Paid'; + } + + $purchase->update([ + 'paid_amount' => (($purchase->paid_amount - $purchasePayment->amount) + $request->amount) * 100, + 'due_amount' => $due_amount * 100, + 'payment_status' => $payment_status + ]); + + $purchasePayment->update([ + 'date' => $request->date, + 'reference' => $request->reference, + 'amount' => $request->amount, + 'note' => $request->note, + 'purchase_id' => $request->purchase_id, + 'payment_method' => $request->payment_method + ]); + }); + + toast('Purchase Payment Updated!', 'info'); + + return redirect()->route('purchases.index'); + } + + + public function destroy(PurchasePayment $purchasePayment) { + abort_if(Gate::denies('access_purchase_payments'), 403); + + $purchasePayment->delete(); + + toast('Purchase Payment Deleted!', 'warning'); + + return redirect()->route('purchases.index'); + } +} diff --git a/Modules/Purchase/Http/Middleware/.gitkeep b/Modules/Purchase/Http/Middleware/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Purchase/Http/Requests/.gitkeep b/Modules/Purchase/Http/Requests/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Purchase/Http/Requests/StorePurchaseRequest.php b/Modules/Purchase/Http/Requests/StorePurchaseRequest.php new file mode 100644 index 00000000..8650cdf9 --- /dev/null +++ b/Modules/Purchase/Http/Requests/StorePurchaseRequest.php @@ -0,0 +1,40 @@ + 'required|numeric', + 'reference' => 'required|string|max:255', + 'tax_percentage' => 'required|integer|min:0|max:100', + 'discount_percentage' => 'required|integer|min:0|max:100', + 'shipping_amount' => 'required|numeric', + 'total_amount' => 'required|numeric', + 'paid_amount' => 'required|numeric', + 'status' => 'required|string|max:255', + 'payment_method' => 'required|string|max:255', + 'note' => 'nullable|string|max:1000' + ]; + } + + /** + * Determine if the user is authorized to make this request. + * + * @return bool + */ + public function authorize() + { + return Gate::allows('create_sales'); + } +} diff --git a/Modules/Purchase/Http/Requests/UpdatePurchaseRequest.php b/Modules/Purchase/Http/Requests/UpdatePurchaseRequest.php new file mode 100644 index 00000000..626dc3b6 --- /dev/null +++ b/Modules/Purchase/Http/Requests/UpdatePurchaseRequest.php @@ -0,0 +1,40 @@ + 'required|numeric', + 'reference' => 'required|string|max:255', + 'tax_percentage' => 'required|integer|min:0|max:100', + 'discount_percentage' => 'required|integer|min:0|max:100', + 'shipping_amount' => 'required|numeric', + 'total_amount' => 'required|numeric', + 'paid_amount' => 'required|numeric|max:' . $this->purchase->total_amount, + 'status' => 'required|string|max:255', + 'payment_method' => 'required|string|max:255', + 'note' => 'nullable|string|max:1000' + ]; + } + + /** + * Determine if the user is authorized to make this request. + * + * @return bool + */ + public function authorize() + { + return Gate::allows('edit_purchases'); + } +} diff --git a/Modules/Purchase/Providers/.gitkeep b/Modules/Purchase/Providers/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Purchase/Providers/PurchaseServiceProvider.php b/Modules/Purchase/Providers/PurchaseServiceProvider.php new file mode 100644 index 00000000..397fdb9f --- /dev/null +++ b/Modules/Purchase/Providers/PurchaseServiceProvider.php @@ -0,0 +1,112 @@ +registerTranslations(); + $this->registerConfig(); + $this->registerViews(); + $this->loadMigrationsFrom(module_path($this->moduleName, 'Database/Migrations')); + } + + /** + * Register the service provider. + * + * @return void + */ + public function register() + { + $this->app->register(RouteServiceProvider::class); + } + + /** + * Register config. + * + * @return void + */ + protected function registerConfig() + { + $this->publishes([ + module_path($this->moduleName, 'Config/config.php') => config_path($this->moduleNameLower . '.php'), + ], 'config'); + $this->mergeConfigFrom( + module_path($this->moduleName, 'Config/config.php'), $this->moduleNameLower + ); + } + + /** + * Register views. + * + * @return void + */ + public function registerViews() + { + $viewPath = resource_path('views/modules/' . $this->moduleNameLower); + + $sourcePath = module_path($this->moduleName, 'Resources/views'); + + $this->publishes([ + $sourcePath => $viewPath + ], ['views', $this->moduleNameLower . '-module-views']); + + $this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->moduleNameLower); + } + + /** + * Register translations. + * + * @return void + */ + public function registerTranslations() + { + $langPath = resource_path('lang/modules/' . $this->moduleNameLower); + + if (is_dir($langPath)) { + $this->loadTranslationsFrom($langPath, $this->moduleNameLower); + } else { + $this->loadTranslationsFrom(module_path($this->moduleName, 'Resources/lang'), $this->moduleNameLower); + } + } + + /** + * Get the services provided by the provider. + * + * @return array + */ + public function provides() + { + return []; + } + + private function getPublishableViewPaths(): array + { + $paths = []; + foreach (\Config::get('view.paths') as $path) { + if (is_dir($path . '/modules/' . $this->moduleNameLower)) { + $paths[] = $path . '/modules/' . $this->moduleNameLower; + } + } + return $paths; + } +} diff --git a/Modules/Purchase/Providers/RouteServiceProvider.php b/Modules/Purchase/Providers/RouteServiceProvider.php new file mode 100644 index 00000000..55cea7a2 --- /dev/null +++ b/Modules/Purchase/Providers/RouteServiceProvider.php @@ -0,0 +1,69 @@ +mapApiRoutes(); + + $this->mapWebRoutes(); + } + + /** + * Define the "web" routes for the application. + * + * These routes all receive session state, CSRF protection, etc. + * + * @return void + */ + protected function mapWebRoutes() + { + Route::middleware('web') + ->namespace($this->moduleNamespace) + ->group(module_path('Purchase', '/Routes/web.php')); + } + + /** + * Define the "api" routes for the application. + * + * These routes are typically stateless. + * + * @return void + */ + protected function mapApiRoutes() + { + Route::prefix('api') + ->middleware('api') + ->namespace($this->moduleNamespace) + ->group(module_path('Purchase', '/Routes/api.php')); + } +} diff --git a/Modules/Purchase/Resources/assets/.gitkeep b/Modules/Purchase/Resources/assets/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Purchase/Resources/assets/js/app.js b/Modules/Purchase/Resources/assets/js/app.js new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Purchase/Resources/assets/sass/app.scss b/Modules/Purchase/Resources/assets/sass/app.scss new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Purchase/Resources/lang/.gitkeep b/Modules/Purchase/Resources/lang/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Purchase/Resources/views/.gitkeep b/Modules/Purchase/Resources/views/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Purchase/Resources/views/create.blade.php b/Modules/Purchase/Resources/views/create.blade.php new file mode 100644 index 00000000..73b924b4 --- /dev/null +++ b/Modules/Purchase/Resources/views/create.blade.php @@ -0,0 +1,139 @@ +@extends('layouts.app') + +@section('title', 'Create Purchase') + +@section('breadcrumb') +
    +
  1. Home
    2. +
  2. Purchases
    3. +
  3. Add
    4. +
+@endsection + +@section('content') +
+
+
+ +
+
+ +
+
+
+
+ @include('utils.alerts') +
+ @csrf + +
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + + +
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+ +
+ +
+ +
+
+
+
+
+ +
+ + +
+ +
+ +
+ +
+
+
+
+
+@endsection + +@push('page_scripts') + + +@endpush diff --git a/Modules/Purchase/Resources/views/edit.blade.php b/Modules/Purchase/Resources/views/edit.blade.php new file mode 100644 index 00000000..d3dc3dd3 --- /dev/null +++ b/Modules/Purchase/Resources/views/edit.blade.php @@ -0,0 +1,124 @@ +@extends('layouts.app') + +@section('title', 'Edit Purchase') + +@section('breadcrumb') +
    +
  1. Home
    2. +
  2. Purchases
    3. +
  3. Edit
    4. +
+@endsection + +@section('content') +
+
+
+ +
+
+ +
+
+
+
+ @include('utils.alerts') +
+ @csrf + @method('patch') +
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + + +
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+ + +
+
+
+ +
+ + +
+ +
+ +
+ +
+
+
+
+
+@endsection + +@push('page_scripts') + + +@endpush diff --git a/Modules/Purchase/Resources/views/index.blade.php b/Modules/Purchase/Resources/views/index.blade.php new file mode 100644 index 00000000..5f9f3478 --- /dev/null +++ b/Modules/Purchase/Resources/views/index.blade.php @@ -0,0 +1,40 @@ +@extends('layouts.app') + +@section('title', 'Purchases') + +@section('third_party_stylesheets') + +@endsection + +@section('breadcrumb') +
    +
  1. Home
    2. +
  2. Purchases
    3. +
+@endsection + +@section('content') +
+
+
+
+
+ + Add Purchase + + +
+ +
+ {!! $dataTable->table() !!} +
+
+
+
+
+
+@endsection + +@push('page_scripts') + {!! $dataTable->scripts() !!} +@endpush diff --git a/Modules/Purchase/Resources/views/partials/actions.blade.php b/Modules/Purchase/Resources/views/partials/actions.blade.php new file mode 100644 index 00000000..e01e8a7f --- /dev/null +++ b/Modules/Purchase/Resources/views/partials/actions.blade.php @@ -0,0 +1,42 @@ +
+ +
+ @can('access_purchase_payments') + + Show Payments + + @endcan + @can('access_purchase_payments') + @if($data->due_amount > 0) + + Add Payment + + @endif + @endcan + @can('edit_purchases') + + Edit + + @endcan + @can('show_purchases') + + Details + + @endcan + @can('delete_purchases') + + @endcan +
+
diff --git a/Modules/Purchase/Resources/views/partials/payment-status.blade.php b/Modules/Purchase/Resources/views/partials/payment-status.blade.php new file mode 100644 index 00000000..7ac6bf4c --- /dev/null +++ b/Modules/Purchase/Resources/views/partials/payment-status.blade.php @@ -0,0 +1,13 @@ +@if ($data->payment_status == 'Partial') + + {{ $data->payment_status }} + +@elseif ($data->payment_status == 'Paid') + + {{ $data->payment_status }} + +@else + + {{ $data->payment_status }} + +@endif diff --git a/Modules/Purchase/Resources/views/partials/status.blade.php b/Modules/Purchase/Resources/views/partials/status.blade.php new file mode 100644 index 00000000..aef6ab10 --- /dev/null +++ b/Modules/Purchase/Resources/views/partials/status.blade.php @@ -0,0 +1,13 @@ +@if ($data->status == 'Pending') + + {{ $data->status }} + +@elseif ($data->status == 'Ordered') + + {{ $data->status }} + +@else + + {{ $data->status }} + +@endif diff --git a/Modules/Purchase/Resources/views/payments/create.blade.php b/Modules/Purchase/Resources/views/payments/create.blade.php new file mode 100644 index 00000000..0140b55c --- /dev/null +++ b/Modules/Purchase/Resources/views/payments/create.blade.php @@ -0,0 +1,114 @@ +@extends('layouts.app') + +@section('title', 'Create Payment') + +@section('breadcrumb') +
    +
  1. Home
    2. +
  2. Purchase
    3. +
  3. {{ $purchase->reference }}
    4. +
  4. Add Payment
    5. +
+@endsection + +@section('content') +
+
+ @csrf +
+
+ @include('utils.alerts') +
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+ +
+
+
+ + +
+
+
+
+ +
+ +
+ +
+
+
+
+
+
+
+ + +
+
+
+
+ +
+ + +
+ + +
+
+
+
+
+
+@endsection + +@push('page_scripts') + + +@endpush + diff --git a/Modules/Purchase/Resources/views/payments/edit.blade.php b/Modules/Purchase/Resources/views/payments/edit.blade.php new file mode 100644 index 00000000..f07d16ec --- /dev/null +++ b/Modules/Purchase/Resources/views/payments/edit.blade.php @@ -0,0 +1,117 @@ +@extends('layouts.app') + +@section('title', 'Edit Payment') + +@section('breadcrumb') +
    +
  1. Home
    2. +
  2. Purchases
    3. +
  3. {{ $purchase->reference }}
    4. +
  4. Edit Payment
    5. +
+@endsection + +@section('content') +
+
+ @csrf + @method('patch') +
+
+ @include('utils.alerts') +
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+ +
+
+
+ + +
+
+
+
+ +
+ +
+ +
+
+
+
+
+
+
+ + +
+
+
+
+ +
+ + +
+ + +
+
+
+
+
+
+@endsection + +@push('page_scripts') + + +@endpush + diff --git a/Modules/Purchase/Resources/views/payments/index.blade.php b/Modules/Purchase/Resources/views/payments/index.blade.php new file mode 100644 index 00000000..1b46844d --- /dev/null +++ b/Modules/Purchase/Resources/views/payments/index.blade.php @@ -0,0 +1,37 @@ +@extends('layouts.app') + +@section('title', 'Purchase Payments') + +@section('third_party_stylesheets') + +@endsection + +@section('breadcrumb') +
    +
  1. Home
    2. +
  2. Purchases
    3. +
  3. {{ $purchase->reference }}
    4. +
  4. Payments
    5. +
+@endsection + +@section('content') +
+
+
+ @include('utils.alerts') +
+
+
+ {!! $dataTable->table() !!} +
+
+
+
+
+
+@endsection + +@push('page_scripts') + {!! $dataTable->scripts() !!} +@endpush diff --git a/Modules/Purchase/Resources/views/payments/partials/actions.blade.php b/Modules/Purchase/Resources/views/payments/partials/actions.blade.php new file mode 100644 index 00000000..8b7501ba --- /dev/null +++ b/Modules/Purchase/Resources/views/payments/partials/actions.blade.php @@ -0,0 +1,19 @@ +@can('access_sale_payments') + + + +@endcan +@can('access_sale_payments') + +@endcan diff --git a/Modules/Purchase/Resources/views/print.blade.php b/Modules/Purchase/Resources/views/print.blade.php new file mode 100644 index 00000000..2b8db84c --- /dev/null +++ b/Modules/Purchase/Resources/views/print.blade.php @@ -0,0 +1,138 @@ + + + + + + + Purchase Details + + + +
+
+
+
+ Logo +

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

+
+
+
+
+
+

Company Info:

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

Supplier Info:

+
{{ $supplier->supplier_name }}
+
{{ $supplier->address }}
+
Email: {{ $supplier->supplier_email }}
+
Phone: {{ $supplier->supplier_phone }}
+
+ +
+

Invoice Info:

+
Invoice: INV/{{ $purchase->reference }}
+
Date: {{ \Carbon\Carbon::parse($purchase->date)->format('d M, Y') }}
+
+ Status: {{ $purchase->status }} +
+
+ Payment Status: {{ $purchase->payment_status }} +
+
+ +
+ +
+ + + + + + + + + + + + + + @foreach($purchase->purchaseDetails 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 ({{ $purchase->discount_percentage }}%){{ format_currency($purchase->discount_amount) }}
Tax ({{ $purchase->tax_percentage }}%){{ format_currency($purchase->tax_amount) }}
Shipping){{ format_currency($purchase->shipping_amount) }}
Grand Total{{ format_currency($purchase->total_amount) }}
+
+
+
+
+

Computer generated invoice. {{ settings()->company_name }} © {{ date('Y') }}.

+
+
+
+
+
+
+
+ + diff --git a/Modules/Purchase/Resources/views/show.blade.php b/Modules/Purchase/Resources/views/show.blade.php new file mode 100644 index 00000000..38a4bc2e --- /dev/null +++ b/Modules/Purchase/Resources/views/show.blade.php @@ -0,0 +1,140 @@ +@extends('layouts.app') + +@section('title', 'Purchases Details') + +@section('breadcrumb') +
    +
  1. Home
    2. +
  2. Purchases
    3. +
  3. Details
    4. +
+@endsection + +@section('content') +
+
+
+
+
+
+ Reference: {{ $purchase->reference }} +
+ + Print + + + Save + +
+
+
+
+
Company Info:
+
{{ settings()->company_name }}
+
{{ settings()->company_address }}
+
Email: {{ settings()->company_email }}
+
Phone: {{ settings()->company_phone }}
+
+ +
+
Supplier Info:
+
{{ $supplier->supplier_name }}
+
{{ $supplier->address }}
+
Email: {{ $supplier->supplier_email }}
+
Phone: {{ $supplier->supplier_phone }}
+
+ +
+
Invoice Info:
+
Invoice: INV/{{ $purchase->reference }}
+
Date: {{ \Carbon\Carbon::parse($purchase->date)->format('d M, Y') }}
+
+ Status: {{ $purchase->status }} +
+
+ Payment Status: {{ $purchase->payment_status }} +
+
+ +
+ +
+ + + + + + + + + + + + + + @foreach($purchase->purchaseDetails 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 ({{ $purchase->discount_percentage }}%){{ format_currency($purchase->discount_amount) }}
Tax ({{ $purchase->tax_percentage }}%){{ format_currency($purchase->tax_amount) }}
Shipping){{ format_currency($purchase->shipping_amount) }}
Grand Total{{ format_currency($purchase->total_amount) }}
+
+
+
+
+
+
+
+@endsection + diff --git a/Modules/Purchase/Routes/.gitkeep b/Modules/Purchase/Routes/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Purchase/Routes/api.php b/Modules/Purchase/Routes/api.php new file mode 100644 index 00000000..cf063a27 --- /dev/null +++ b/Modules/Purchase/Routes/api.php @@ -0,0 +1,18 @@ +get('/purchase', function (Request $request) { + return $request->user(); +}); \ No newline at end of file diff --git a/Modules/Purchase/Routes/web.php b/Modules/Purchase/Routes/web.php new file mode 100644 index 00000000..079b2300 --- /dev/null +++ b/Modules/Purchase/Routes/web.php @@ -0,0 +1,40 @@ + 'auth'], function () { + + //Generate PDF + Route::get('/purchases/pdf/{id}', function ($id) { + $purchase = \Modules\Purchase\Entities\Purchase::findOrFail($id); + $supplier = \Modules\People\Entities\Supplier::findOrFail($purchase->supplier_id); + + $pdf = \PDF::loadView('purchase::print', [ + 'purchase' => $purchase, + 'supplier' => $supplier, + ])->setPaper('a4'); + + return $pdf->stream('purchase-'. $purchase->reference .'.pdf'); + })->name('purchases.pdf'); + + //Sales + Route::resource('purchases', 'PurchaseController'); + + //Payments + Route::get('/purchase-payments/{purchase_id}', 'PurchasePaymentsController@index')->name('purchase-payments.index'); + Route::get('/purchase-payments/{purchase_id}/create', 'PurchasePaymentsController@create')->name('purchase-payments.create'); + Route::post('/purchase-payments/store', 'PurchasePaymentsController@store')->name('purchase-payments.store'); + Route::get('/purchase-payments/{purchase_id}/edit/{purchasePayment}', 'PurchasePaymentsController@edit')->name('purchase-payments.edit'); + Route::patch('/purchase-payments/update/{purchasePayment}', 'PurchasePaymentsController@update')->name('purchase-payments.update'); + Route::delete('/purchase-payments/destroy/{purchasePayment}', 'PurchasePaymentsController@destroy')->name('purchase-payments.destroy'); + +}); diff --git a/Modules/Purchase/Tests/Feature/.gitkeep b/Modules/Purchase/Tests/Feature/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Purchase/Tests/Unit/.gitkeep b/Modules/Purchase/Tests/Unit/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/Purchase/composer.json b/Modules/Purchase/composer.json new file mode 100644 index 00000000..8de2a200 --- /dev/null +++ b/Modules/Purchase/composer.json @@ -0,0 +1,23 @@ +{ + "name": "nwidart/purchase", + "description": "", + "authors": [ + { + "name": "Nicolas Widart", + "email": "n.widart@gmail.com" + } + ], + "extra": { + "laravel": { + "providers": [], + "aliases": { + + } + } + }, + "autoload": { + "psr-4": { + "Modules\\Purchase\\": "" + } + } +} diff --git a/Modules/Purchase/module.json b/Modules/Purchase/module.json new file mode 100644 index 00000000..2f8807fa --- /dev/null +++ b/Modules/Purchase/module.json @@ -0,0 +1,13 @@ +{ + "name": "Purchase", + "alias": "purchase", + "description": "", + "keywords": [], + "priority": 0, + "providers": [ + "Modules\\Purchase\\Providers\\PurchaseServiceProvider" + ], + "aliases": {}, + "files": [], + "requires": [] +} diff --git a/Modules/Purchase/package.json b/Modules/Purchase/package.json new file mode 100644 index 00000000..4599509f --- /dev/null +++ b/Modules/Purchase/package.json @@ -0,0 +1,17 @@ +{ + "private": true, + "scripts": { + "dev": "npm run development", + "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch-poll": "npm run watch -- --watch-poll", + "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", + "prod": "npm run production", + "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" + }, + "devDependencies": { + "cross-env": "^7.0", + "laravel-mix": "^5.0.1", + "laravel-mix-merge-manifest": "^0.1.2" + } +} diff --git a/Modules/Purchase/webpack.mix.js b/Modules/Purchase/webpack.mix.js new file mode 100644 index 00000000..45b977b3 --- /dev/null +++ b/Modules/Purchase/webpack.mix.js @@ -0,0 +1,14 @@ +const dotenvExpand = require('dotenv-expand'); +dotenvExpand(require('dotenv').config({ path: '../../.env'/*, debug: true*/})); + +const mix = require('laravel-mix'); +require('laravel-mix-merge-manifest'); + +mix.setPublicPath('../../public').mergeManifest(); + +mix.js(__dirname + '/Resources/assets/js/app.js', 'js/purchase.js') + .sass( __dirname + '/Resources/assets/sass/app.scss', 'css/purchase.css'); + +if (mix.inProduction()) { + mix.version(); +} diff --git a/Modules/Sale/Resources/views/partials/actions.blade.php b/Modules/Sale/Resources/views/partials/actions.blade.php index 71650fc8..c48eaf0a 100644 --- a/Modules/Sale/Resources/views/partials/actions.blade.php +++ b/Modules/Sale/Resources/views/partials/actions.blade.php @@ -28,7 +28,7 @@ @can('delete_sales')