From f65d180d5e41023ef8b2ac764b6bde9e9d0ed0c6 Mon Sep 17 00:00:00 2001 From: Fahim Date: Mon, 9 Aug 2021 03:22:06 +0600 Subject: [PATCH] Added: Purchases Return Module --- Modules/PurchasesReturn/Config/.gitkeep | 0 Modules/PurchasesReturn/Config/config.php | 5 + Modules/PurchasesReturn/Console/.gitkeep | 0 .../Database/Migrations/.gitkeep | 0 ...8_222603_create_purchase_returns_table.php | 48 ++++ ...2_create_purchase_return_details_table.php | 46 ++++ ..._create_purchase_return_payments_table.php | 38 +++ .../PurchasesReturn/Database/Seeders/.gitkeep | 0 .../Seeders/PurchasesReturnDatabaseSeeder.php | 21 ++ .../Database/factories/.gitkeep | 0 Modules/PurchasesReturn/Entities/.gitkeep | 0 .../Entities/PurchaseReturn.php | 49 ++++ .../Entities/PurchaseReturnDetail.php | 44 ++++ .../Entities/PurchaseReturnPayment.php | 34 +++ .../PurchasesReturn/Http/Controllers/.gitkeep | 0 .../PurchaseReturnPaymentsController.php | 52 ++++ .../Controllers/PurchasesReturnController.php | 233 ++++++++++++++++++ .../PurchasesReturn/Http/Middleware/.gitkeep | 0 .../PurchasesReturn/Http/Requests/.gitkeep | 0 .../Requests/StorePurchaseReturnRequest.php | 40 +++ .../Requests/UpdatePurchaseReturnRequest.php | 40 +++ Modules/PurchasesReturn/Providers/.gitkeep | 0 .../PurchasesReturnServiceProvider.php | 112 +++++++++ .../Providers/RouteServiceProvider.php | 69 ++++++ .../PurchasesReturn/Resources/assets/.gitkeep | 0 .../Resources/assets/js/app.js | 0 .../Resources/assets/sass/app.scss | 0 .../PurchasesReturn/Resources/lang/.gitkeep | 0 .../PurchasesReturn/Resources/views/.gitkeep | 0 .../Resources/views/create.blade.php | 138 +++++++++++ .../Resources/views/edit.blade.php | 124 ++++++++++ .../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 | 0 .../Resources/views/payments/edit.blade.php | 0 .../Resources/views/payments/index.blade.php | 0 .../views/payments/partials/actions.blade.php | 19 ++ .../Resources/views/print.blade.php | 138 +++++++++++ .../Resources/views/show.blade.php | 140 +++++++++++ Modules/PurchasesReturn/Routes/.gitkeep | 0 Modules/PurchasesReturn/Routes/api.php | 18 ++ Modules/PurchasesReturn/Routes/web.php | 46 ++++ .../PurchasesReturn/Tests/Feature/.gitkeep | 0 Modules/PurchasesReturn/Tests/Unit/.gitkeep | 0 Modules/PurchasesReturn/composer.json | 23 ++ Modules/PurchasesReturn/module.json | 13 + Modules/PurchasesReturn/package.json | 17 ++ Modules/PurchasesReturn/webpack.mix.js | 14 ++ .../Sale/Http/Controllers/SaleController.php | 1 + .../Controllers/SalesReturnController.php | 2 +- .../Http/Requests/StoreSaleReturnRequest.php | 2 +- .../Seeders/PermissionsTableSeeder.php | 16 ++ .../PurchaseReturnPaymentsDataTable.php | 78 ++++++ app/DataTables/PurchaseReturnsDataTable.php | 99 ++++++++ modules_statuses.json | 3 +- resources/views/layouts/menu.blade.php | 26 +- 58 files changed, 1852 insertions(+), 4 deletions(-) create mode 100644 Modules/PurchasesReturn/Config/.gitkeep create mode 100644 Modules/PurchasesReturn/Config/config.php create mode 100644 Modules/PurchasesReturn/Console/.gitkeep create mode 100644 Modules/PurchasesReturn/Database/Migrations/.gitkeep create mode 100644 Modules/PurchasesReturn/Database/Migrations/2021_08_08_222603_create_purchase_returns_table.php create mode 100644 Modules/PurchasesReturn/Database/Migrations/2021_08_08_222612_create_purchase_return_details_table.php create mode 100644 Modules/PurchasesReturn/Database/Migrations/2021_08_08_222646_create_purchase_return_payments_table.php create mode 100644 Modules/PurchasesReturn/Database/Seeders/.gitkeep create mode 100644 Modules/PurchasesReturn/Database/Seeders/PurchasesReturnDatabaseSeeder.php create mode 100644 Modules/PurchasesReturn/Database/factories/.gitkeep create mode 100644 Modules/PurchasesReturn/Entities/.gitkeep create mode 100644 Modules/PurchasesReturn/Entities/PurchaseReturn.php create mode 100644 Modules/PurchasesReturn/Entities/PurchaseReturnDetail.php create mode 100644 Modules/PurchasesReturn/Entities/PurchaseReturnPayment.php create mode 100644 Modules/PurchasesReturn/Http/Controllers/.gitkeep create mode 100644 Modules/PurchasesReturn/Http/Controllers/PurchaseReturnPaymentsController.php create mode 100644 Modules/PurchasesReturn/Http/Controllers/PurchasesReturnController.php create mode 100644 Modules/PurchasesReturn/Http/Middleware/.gitkeep create mode 100644 Modules/PurchasesReturn/Http/Requests/.gitkeep create mode 100644 Modules/PurchasesReturn/Http/Requests/StorePurchaseReturnRequest.php create mode 100644 Modules/PurchasesReturn/Http/Requests/UpdatePurchaseReturnRequest.php create mode 100644 Modules/PurchasesReturn/Providers/.gitkeep create mode 100644 Modules/PurchasesReturn/Providers/PurchasesReturnServiceProvider.php create mode 100644 Modules/PurchasesReturn/Providers/RouteServiceProvider.php create mode 100644 Modules/PurchasesReturn/Resources/assets/.gitkeep create mode 100644 Modules/PurchasesReturn/Resources/assets/js/app.js create mode 100644 Modules/PurchasesReturn/Resources/assets/sass/app.scss create mode 100644 Modules/PurchasesReturn/Resources/lang/.gitkeep create mode 100644 Modules/PurchasesReturn/Resources/views/.gitkeep create mode 100644 Modules/PurchasesReturn/Resources/views/create.blade.php create mode 100644 Modules/PurchasesReturn/Resources/views/edit.blade.php create mode 100644 Modules/PurchasesReturn/Resources/views/index.blade.php create mode 100644 Modules/PurchasesReturn/Resources/views/partials/actions.blade.php create mode 100644 Modules/PurchasesReturn/Resources/views/partials/payment-status.blade.php create mode 100644 Modules/PurchasesReturn/Resources/views/partials/status.blade.php create mode 100644 Modules/PurchasesReturn/Resources/views/payments/create.blade.php create mode 100644 Modules/PurchasesReturn/Resources/views/payments/edit.blade.php create mode 100644 Modules/PurchasesReturn/Resources/views/payments/index.blade.php create mode 100644 Modules/PurchasesReturn/Resources/views/payments/partials/actions.blade.php create mode 100644 Modules/PurchasesReturn/Resources/views/print.blade.php create mode 100644 Modules/PurchasesReturn/Resources/views/show.blade.php create mode 100644 Modules/PurchasesReturn/Routes/.gitkeep create mode 100644 Modules/PurchasesReturn/Routes/api.php create mode 100644 Modules/PurchasesReturn/Routes/web.php create mode 100644 Modules/PurchasesReturn/Tests/Feature/.gitkeep create mode 100644 Modules/PurchasesReturn/Tests/Unit/.gitkeep create mode 100644 Modules/PurchasesReturn/composer.json create mode 100644 Modules/PurchasesReturn/module.json create mode 100644 Modules/PurchasesReturn/package.json create mode 100644 Modules/PurchasesReturn/webpack.mix.js create mode 100644 app/DataTables/PurchaseReturnPaymentsDataTable.php create mode 100644 app/DataTables/PurchaseReturnsDataTable.php diff --git a/Modules/PurchasesReturn/Config/.gitkeep b/Modules/PurchasesReturn/Config/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/PurchasesReturn/Config/config.php b/Modules/PurchasesReturn/Config/config.php new file mode 100644 index 00000000..cc177b93 --- /dev/null +++ b/Modules/PurchasesReturn/Config/config.php @@ -0,0 +1,5 @@ + 'PurchasesReturn' +]; diff --git a/Modules/PurchasesReturn/Console/.gitkeep b/Modules/PurchasesReturn/Console/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/PurchasesReturn/Database/Migrations/.gitkeep b/Modules/PurchasesReturn/Database/Migrations/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/PurchasesReturn/Database/Migrations/2021_08_08_222603_create_purchase_returns_table.php b/Modules/PurchasesReturn/Database/Migrations/2021_08_08_222603_create_purchase_returns_table.php new file mode 100644 index 00000000..a70879cf --- /dev/null +++ b/Modules/PurchasesReturn/Database/Migrations/2021_08_08_222603_create_purchase_returns_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('purchase_returns'); + } +} diff --git a/Modules/PurchasesReturn/Database/Migrations/2021_08_08_222612_create_purchase_return_details_table.php b/Modules/PurchasesReturn/Database/Migrations/2021_08_08_222612_create_purchase_return_details_table.php new file mode 100644 index 00000000..dd5227a5 --- /dev/null +++ b/Modules/PurchasesReturn/Database/Migrations/2021_08_08_222612_create_purchase_return_details_table.php @@ -0,0 +1,46 @@ +id(); + $table->unsignedBigInteger('purchase_return_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_return_id')->references('id') + ->on('purchase_returns')->cascadeOnDelete(); + $table->foreign('product_id')->references('id') + ->on('products')->nullOnDelete(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('purchase_return_details'); + } +} diff --git a/Modules/PurchasesReturn/Database/Migrations/2021_08_08_222646_create_purchase_return_payments_table.php b/Modules/PurchasesReturn/Database/Migrations/2021_08_08_222646_create_purchase_return_payments_table.php new file mode 100644 index 00000000..0763b37d --- /dev/null +++ b/Modules/PurchasesReturn/Database/Migrations/2021_08_08_222646_create_purchase_return_payments_table.php @@ -0,0 +1,38 @@ +id(); + $table->unsignedBigInteger('purchase_return_id'); + $table->integer('amount'); + $table->date('date'); + $table->string('reference'); + $table->string('payment_method'); + $table->text('note')->nullable(); + $table->foreign('purchase_return_id')->references('id')->on('purchase_returns')->cascadeOnDelete(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('purchase_return_payments'); + } +} diff --git a/Modules/PurchasesReturn/Database/Seeders/.gitkeep b/Modules/PurchasesReturn/Database/Seeders/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/PurchasesReturn/Database/Seeders/PurchasesReturnDatabaseSeeder.php b/Modules/PurchasesReturn/Database/Seeders/PurchasesReturnDatabaseSeeder.php new file mode 100644 index 00000000..205c622e --- /dev/null +++ b/Modules/PurchasesReturn/Database/Seeders/PurchasesReturnDatabaseSeeder.php @@ -0,0 +1,21 @@ +call("OthersTableSeeder"); + } +} diff --git a/Modules/PurchasesReturn/Database/factories/.gitkeep b/Modules/PurchasesReturn/Database/factories/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/PurchasesReturn/Entities/.gitkeep b/Modules/PurchasesReturn/Entities/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/PurchasesReturn/Entities/PurchaseReturn.php b/Modules/PurchasesReturn/Entities/PurchaseReturn.php new file mode 100644 index 00000000..f38a7708 --- /dev/null +++ b/Modules/PurchasesReturn/Entities/PurchaseReturn.php @@ -0,0 +1,49 @@ +hasMany(PurchaseReturnDetail::class, 'purchase_return_id', 'id'); + } + + public function purchaseReturnPayments() { + return $this->hasMany(PurchaseReturnPayment::class, 'purchase_return_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/PurchasesReturn/Entities/PurchaseReturnDetail.php b/Modules/PurchasesReturn/Entities/PurchaseReturnDetail.php new file mode 100644 index 00000000..651289cd --- /dev/null +++ b/Modules/PurchasesReturn/Entities/PurchaseReturnDetail.php @@ -0,0 +1,44 @@ +belongsTo(Product::class, 'product_id', 'id'); + } + + public function purchaseReturn() { + return $this->belongsTo(PurchaseReturn::class, 'purchase_return_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/PurchasesReturn/Entities/PurchaseReturnPayment.php b/Modules/PurchasesReturn/Entities/PurchaseReturnPayment.php new file mode 100644 index 00000000..8880c2a1 --- /dev/null +++ b/Modules/PurchasesReturn/Entities/PurchaseReturnPayment.php @@ -0,0 +1,34 @@ +belongsTo(PurchaseReturn::class, 'purchase_return_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 scopeByPurchaseReturn($query) { + return $query->where('purchase_return_id', request()->route('purchase_return_id')); + } +} diff --git a/Modules/PurchasesReturn/Http/Controllers/.gitkeep b/Modules/PurchasesReturn/Http/Controllers/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/PurchasesReturn/Http/Controllers/PurchaseReturnPaymentsController.php b/Modules/PurchasesReturn/Http/Controllers/PurchaseReturnPaymentsController.php new file mode 100644 index 00000000..b3feaeb6 --- /dev/null +++ b/Modules/PurchasesReturn/Http/Controllers/PurchaseReturnPaymentsController.php @@ -0,0 +1,52 @@ +render('purchasesreturn::index'); + } + + + public function create() { + abort_if(Gate::denies('create_purchase_returns'), 403); + + Cart::instance('purchase_return')->destroy(); + + return view('purchasesreturn::create'); + } + + + public function store(StorePurchaseReturnRequest $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_return = PurchaseReturn::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_return')->tax() * 100, + 'discount_amount' => Cart::instance('purchase_return')->discount() * 100, + ]); + + foreach (Cart::instance('purchase_return')->content() as $cart_item) { + PurchaseReturnDetail::create([ + 'purchase_return_id' => $purchase_return->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 == 'Shipped' || $request->status == 'Completed') { + $product = Product::findOrFail($cart_item->id); + $product->update([ + 'product_quantity' => $product->product_quantity - $cart_item->qty + ]); + } + } + + Cart::instance('purchase_return')->destroy(); + + PurchaseReturnPayment::create([ + 'date' => $request->date, + 'reference' => 'INV/'.$purchase_return->reference, + 'amount' => $purchase_return->paid_amount, + 'purchase_return_id' => $purchase_return->id, + 'payment_method' => $request->payment_method + ]); + }); + + toast('Purchase Return Created!', 'success'); + + return redirect()->route('purchase-returns.index'); + } + + + public function show(PurchaseReturn $purchase_return) { + abort_if(Gate::denies('show_purchase_returns'), 403); + + $supplier = Supplier::findOrFail($purchase_return->supplier_id); + + return view('purchasesreturn::show', compact('purchase_return', 'supplier')); + } + + + public function edit(PurchaseReturn $purchase_return) { + abort_if(Gate::denies('edit_purchase_returns'), 403); + + $purchase_return_details = $purchase_return->purchaseReturnDetails; + + Cart::instance('purchase_return')->destroy(); + + $cart = Cart::instance('purchase_return'); + + foreach ($purchase_return_details as $purchase_return_detail) { + $cart->add([ + 'id' => $purchase_return_detail->product_id, + 'name' => $purchase_return_detail->product_name, + 'qty' => $purchase_return_detail->quantity, + 'price' => $purchase_return_detail->price, + 'weight' => 1, + 'options' => [ + 'product_discount' => $purchase_return_detail->product_discount_amount, + 'product_discount_type' => $purchase_return_detail->product_discount_type, + 'sub_total' => $purchase_return_detail->sub_total, + 'code' => $purchase_return_detail->product_code, + 'stock' => Product::findOrFail($purchase_return_detail->product_id)->product_quantity, + 'product_tax' => $purchase_return_detail->product_tax_amount, + 'unit_price' => $purchase_return_detail->unit_price + ] + ]); + } + + return view('purchasesreturn::edit', compact('purchase_return')); + } + + + public function update(UpdatePurchaseReturnRequest $request, PurchaseReturn $purchase_return) { + DB::transaction(function () use ($request, $purchase_return) { + $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_return->purchaseReturnDetails as $purchase_return_detail) { + if ($purchase_return->status == 'Shipped' || $purchase_return->status == 'Completed') { + $product = Product::findOrFail($purchase_return_detail->product_id); + $product->update([ + 'product_quantity' => $product->product_quantity + $purchase_return_detail->quantity + ]); + } + $purchase_return_detail->delete(); + } + + $purchase_return->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_return')->tax() * 100, + 'discount_amount' => Cart::instance('purchase_return')->discount() * 100, + ]); + + foreach (Cart::instance('purchase_return')->content() as $cart_item) { + PurchaseReturnDetail::create([ + 'purchase_return_id' => $purchase_return->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 == 'Shipped' || $request->status == 'Completed') { + $product = Product::findOrFail($cart_item->id); + $product->update([ + 'product_quantity' => $product->product_quantity - $cart_item->qty + ]); + } + } + + Cart::instance('purchase_return')->destroy(); + }); + + toast('Purchase Return Updated!', 'info'); + + return redirect()->route('purchase-returns.index'); + } + + + public function destroy(PurchaseReturn $purchase_return) { + abort_if(Gate::denies('delete_purchase_returns'), 403); + + $purchase_return->delete(); + + toast('Purchase Return Deleted!', 'warning'); + + return redirect()->route('purchase-returns.index'); + } +} diff --git a/Modules/PurchasesReturn/Http/Middleware/.gitkeep b/Modules/PurchasesReturn/Http/Middleware/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/PurchasesReturn/Http/Requests/.gitkeep b/Modules/PurchasesReturn/Http/Requests/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/PurchasesReturn/Http/Requests/StorePurchaseReturnRequest.php b/Modules/PurchasesReturn/Http/Requests/StorePurchaseReturnRequest.php new file mode 100644 index 00000000..d8bd9671 --- /dev/null +++ b/Modules/PurchasesReturn/Http/Requests/StorePurchaseReturnRequest.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_purchase_returns'); + } +} diff --git a/Modules/PurchasesReturn/Http/Requests/UpdatePurchaseReturnRequest.php b/Modules/PurchasesReturn/Http/Requests/UpdatePurchaseReturnRequest.php new file mode 100644 index 00000000..7b8ea1c8 --- /dev/null +++ b/Modules/PurchasesReturn/Http/Requests/UpdatePurchaseReturnRequest.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_return->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_purchase_returns'); + } +} diff --git a/Modules/PurchasesReturn/Providers/.gitkeep b/Modules/PurchasesReturn/Providers/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/PurchasesReturn/Providers/PurchasesReturnServiceProvider.php b/Modules/PurchasesReturn/Providers/PurchasesReturnServiceProvider.php new file mode 100644 index 00000000..07269253 --- /dev/null +++ b/Modules/PurchasesReturn/Providers/PurchasesReturnServiceProvider.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/PurchasesReturn/Providers/RouteServiceProvider.php b/Modules/PurchasesReturn/Providers/RouteServiceProvider.php new file mode 100644 index 00000000..c82f8c19 --- /dev/null +++ b/Modules/PurchasesReturn/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('PurchasesReturn', '/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('PurchasesReturn', '/Routes/api.php')); + } +} diff --git a/Modules/PurchasesReturn/Resources/assets/.gitkeep b/Modules/PurchasesReturn/Resources/assets/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/PurchasesReturn/Resources/assets/js/app.js b/Modules/PurchasesReturn/Resources/assets/js/app.js new file mode 100644 index 00000000..e69de29b diff --git a/Modules/PurchasesReturn/Resources/assets/sass/app.scss b/Modules/PurchasesReturn/Resources/assets/sass/app.scss new file mode 100644 index 00000000..e69de29b diff --git a/Modules/PurchasesReturn/Resources/lang/.gitkeep b/Modules/PurchasesReturn/Resources/lang/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/PurchasesReturn/Resources/views/.gitkeep b/Modules/PurchasesReturn/Resources/views/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/PurchasesReturn/Resources/views/create.blade.php b/Modules/PurchasesReturn/Resources/views/create.blade.php new file mode 100644 index 00000000..0e039a9a --- /dev/null +++ b/Modules/PurchasesReturn/Resources/views/create.blade.php @@ -0,0 +1,138 @@ +@extends('layouts.app') + +@section('title', 'Create Purchase Return') + +@section('breadcrumb') +
    +
  1. Home
    2. +
  2. Purchase Returns
    3. +
  3. Add
    4. +
+@endsection + +@section('content') +
+
+
+ +
+
+ +
+
+
+
+ @include('utils.alerts') +
+ @csrf +
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + + +
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+ +
+ +
+ +
+
+
+
+
+ +
+ + +
+ +
+ +
+ +
+
+
+
+
+@endsection + +@push('page_scripts') + + +@endpush diff --git a/Modules/PurchasesReturn/Resources/views/edit.blade.php b/Modules/PurchasesReturn/Resources/views/edit.blade.php new file mode 100644 index 00000000..d8f927cb --- /dev/null +++ b/Modules/PurchasesReturn/Resources/views/edit.blade.php @@ -0,0 +1,124 @@ +@extends('layouts.app') + +@section('title', 'Edit Purchase Return') + +@section('breadcrumb') +
    +
  1. Home
    2. +
  2. Purchase Returns
    3. +
  3. Edit
    4. +
+@endsection + +@section('content') +
+
+
+ +
+
+ +
+
+
+
+ @include('utils.alerts') +
+ @csrf + @method('patch') +
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + + +
+
+
+ + +
+
+
+
+
+ + +
+
+
+
+
+ + +
+
+
+ +
+ + +
+ +
+ +
+ +
+
+
+
+
+@endsection + +@push('page_scripts') + + +@endpush diff --git a/Modules/PurchasesReturn/Resources/views/index.blade.php b/Modules/PurchasesReturn/Resources/views/index.blade.php new file mode 100644 index 00000000..004208f3 --- /dev/null +++ b/Modules/PurchasesReturn/Resources/views/index.blade.php @@ -0,0 +1,40 @@ +@extends('layouts.app') + +@section('title', 'Purchase Returns') + +@section('third_party_stylesheets') + +@endsection + +@section('breadcrumb') +
    +
  1. Home
    2. +
  2. Purchase Returns
    3. +
+@endsection + +@section('content') +
+
+
+
+
+ + Add Purchase Return + + +
+ +
+ {!! $dataTable->table() !!} +
+
+
+
+
+
+@endsection + +@push('page_scripts') + {!! $dataTable->scripts() !!} +@endpush diff --git a/Modules/PurchasesReturn/Resources/views/partials/actions.blade.php b/Modules/PurchasesReturn/Resources/views/partials/actions.blade.php new file mode 100644 index 00000000..16c4027d --- /dev/null +++ b/Modules/PurchasesReturn/Resources/views/partials/actions.blade.php @@ -0,0 +1,42 @@ +
+ +
+ @can('access_purchase_return_payments') + + Show Payments + + @endcan + @can('access_purchase_return_payments') + @if($data->due_amount > 0) + + Add Payment + + @endif + @endcan + @can('edit_purchase_returns') + + Edit + + @endcan + @can('show_purchase_returns') + + Details + + @endcan + @can('delete_purchase_return') + + @endcan +
+
diff --git a/Modules/PurchasesReturn/Resources/views/partials/payment-status.blade.php b/Modules/PurchasesReturn/Resources/views/partials/payment-status.blade.php new file mode 100644 index 00000000..7ac6bf4c --- /dev/null +++ b/Modules/PurchasesReturn/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/PurchasesReturn/Resources/views/partials/status.blade.php b/Modules/PurchasesReturn/Resources/views/partials/status.blade.php new file mode 100644 index 00000000..e6f2dfe7 --- /dev/null +++ b/Modules/PurchasesReturn/Resources/views/partials/status.blade.php @@ -0,0 +1,13 @@ +@if ($data->status == 'Pending') + + {{ $data->status }} + +@elseif ($data->status == 'Shipped') + + {{ $data->status }} + +@else + + {{ $data->status }} + +@endif diff --git a/Modules/PurchasesReturn/Resources/views/payments/create.blade.php b/Modules/PurchasesReturn/Resources/views/payments/create.blade.php new file mode 100644 index 00000000..e69de29b diff --git a/Modules/PurchasesReturn/Resources/views/payments/edit.blade.php b/Modules/PurchasesReturn/Resources/views/payments/edit.blade.php new file mode 100644 index 00000000..e69de29b diff --git a/Modules/PurchasesReturn/Resources/views/payments/index.blade.php b/Modules/PurchasesReturn/Resources/views/payments/index.blade.php new file mode 100644 index 00000000..e69de29b diff --git a/Modules/PurchasesReturn/Resources/views/payments/partials/actions.blade.php b/Modules/PurchasesReturn/Resources/views/payments/partials/actions.blade.php new file mode 100644 index 00000000..19c19a53 --- /dev/null +++ b/Modules/PurchasesReturn/Resources/views/payments/partials/actions.blade.php @@ -0,0 +1,19 @@ +@can('access_purchase_return_payments') + + + +@endcan +@can('access_purchase_return_payments') + +@endcan diff --git a/Modules/PurchasesReturn/Resources/views/print.blade.php b/Modules/PurchasesReturn/Resources/views/print.blade.php new file mode 100644 index 00000000..76746898 --- /dev/null +++ b/Modules/PurchasesReturn/Resources/views/print.blade.php @@ -0,0 +1,138 @@ + + + + + + + Purchase Return Details + + + +
+
+
+
+ Logo +

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

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

+
+
+
+
+
+
+
+ + diff --git a/Modules/PurchasesReturn/Resources/views/show.blade.php b/Modules/PurchasesReturn/Resources/views/show.blade.php new file mode 100644 index 00000000..18f3ef15 --- /dev/null +++ b/Modules/PurchasesReturn/Resources/views/show.blade.php @@ -0,0 +1,140 @@ +@extends('layouts.app') + +@section('title', 'Purchase Details') + +@section('breadcrumb') +
    +
  1. Home
    2. +
  2. Purchase Returns
    3. +
  3. Details
    4. +
+@endsection + +@section('content') +
+
+
+
+
+
+ Reference: {{ $purchase_return->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_return->reference }}
+
Date: {{ \Carbon\Carbon::parse($purchase_return->date)->format('d M, Y') }}
+
+ Status: {{ $purchase_return->status }} +
+
+ Payment Status: {{ $purchase_return->payment_status }} +
+
+ +
+ +
+ + + + + + + + + + + + + + @foreach($purchase_return->purchaseReturnDetails 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_return->discount_percentage }}%){{ format_currency($purchase_return->discount_amount) }}
Tax ({{ $purchase_return->tax_percentage }}%){{ format_currency($purchase_return->tax_amount) }}
Shipping){{ format_currency($purchase_return->shipping_amount) }}
Grand Total{{ format_currency($purchase_return->total_amount) }}
+
+
+
+
+
+
+
+@endsection + diff --git a/Modules/PurchasesReturn/Routes/.gitkeep b/Modules/PurchasesReturn/Routes/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/PurchasesReturn/Routes/api.php b/Modules/PurchasesReturn/Routes/api.php new file mode 100644 index 00000000..9465203e --- /dev/null +++ b/Modules/PurchasesReturn/Routes/api.php @@ -0,0 +1,18 @@ +get('/purchasesreturn', function (Request $request) { + return $request->user(); +}); \ No newline at end of file diff --git a/Modules/PurchasesReturn/Routes/web.php b/Modules/PurchasesReturn/Routes/web.php new file mode 100644 index 00000000..950e5d06 --- /dev/null +++ b/Modules/PurchasesReturn/Routes/web.php @@ -0,0 +1,46 @@ + 'auth'], function() { + + //Generate PDF + Route::get('/purchase-returns/pdf/{id}', function ($id) { + $purchaseReturn = \Modules\PurchasesReturn\Entities\PurchaseReturn::findOrFail($id); + $supplier = \Modules\People\Entities\Supplier::findOrFail($purchaseReturn->supplier_id); + + $pdf = \PDF::loadView('purchasesreturn::print', [ + 'purchase_return' => $purchaseReturn, + 'supplier' => $supplier, + ])->setPaper('a4'); + + return $pdf->stream('purchase-return-'. $purchaseReturn->reference .'.pdf'); + })->name('purchase-returns.pdf'); + + //Purchase Returns + Route::resource('purchase-returns', 'PurchasesReturnController'); + + //Payments + Route::get('/purchase-return-payments/{purchase_return_id}', 'PurchaseReturnPaymentsController@index') + ->name('purchase-return-payments.index'); + Route::get('/purchase-return-payments/{purchase_return_id}/create', 'PurchaseReturnPaymentsController@create') + ->name('purchase-return-payments.create'); + Route::post('/purchase-return-payments/store', 'PurchaseReturnPaymentsController@store') + ->name('purchase-return-payments.store'); + Route::get('/purchase-return-payments/{purchase_return_id}/edit/{purchaseReturnPayment}', 'PurchaseReturnPaymentsController@edit') + ->name('purchase-return-payments.edit'); + Route::patch('/purchase-return-payments/update/{purchaseReturnPayment}', 'PurchaseReturnPaymentsController@update') + ->name('purchase-return-payments.update'); + Route::delete('/purchase-return-payments/destroy/{purchaseReturnPayment}', 'PurchaseReturnPaymentsController@destroy') + ->name('purchase-return-payments.destroy'); + +}); diff --git a/Modules/PurchasesReturn/Tests/Feature/.gitkeep b/Modules/PurchasesReturn/Tests/Feature/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/PurchasesReturn/Tests/Unit/.gitkeep b/Modules/PurchasesReturn/Tests/Unit/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/PurchasesReturn/composer.json b/Modules/PurchasesReturn/composer.json new file mode 100644 index 00000000..cc90950a --- /dev/null +++ b/Modules/PurchasesReturn/composer.json @@ -0,0 +1,23 @@ +{ + "name": "nwidart/purchasesreturn", + "description": "", + "authors": [ + { + "name": "Nicolas Widart", + "email": "n.widart@gmail.com" + } + ], + "extra": { + "laravel": { + "providers": [], + "aliases": { + + } + } + }, + "autoload": { + "psr-4": { + "Modules\\PurchasesReturn\\": "" + } + } +} diff --git a/Modules/PurchasesReturn/module.json b/Modules/PurchasesReturn/module.json new file mode 100644 index 00000000..84634475 --- /dev/null +++ b/Modules/PurchasesReturn/module.json @@ -0,0 +1,13 @@ +{ + "name": "PurchasesReturn", + "alias": "purchasesreturn", + "description": "", + "keywords": [], + "priority": 0, + "providers": [ + "Modules\\PurchasesReturn\\Providers\\PurchasesReturnServiceProvider" + ], + "aliases": {}, + "files": [], + "requires": [] +} diff --git a/Modules/PurchasesReturn/package.json b/Modules/PurchasesReturn/package.json new file mode 100644 index 00000000..4599509f --- /dev/null +++ b/Modules/PurchasesReturn/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/PurchasesReturn/webpack.mix.js b/Modules/PurchasesReturn/webpack.mix.js new file mode 100644 index 00000000..9b6f74a2 --- /dev/null +++ b/Modules/PurchasesReturn/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/purchasesreturn.js') + .sass( __dirname + '/Resources/assets/sass/app.scss', 'css/purchasesreturn.css'); + +if (mix.inProduction()) { + mix.version(); +} diff --git a/Modules/Sale/Http/Controllers/SaleController.php b/Modules/Sale/Http/Controllers/SaleController.php index ff0f3302..1a356b65 100644 --- a/Modules/Sale/Http/Controllers/SaleController.php +++ b/Modules/Sale/Http/Controllers/SaleController.php @@ -152,6 +152,7 @@ class SaleController extends Controller DB::transaction(function () use ($request, $sale) { $due_amount = $request->total_amount - $request->paid_amount; + if ($due_amount == $request->total_amount) { $payment_status = 'Unpaid'; } elseif ($due_amount > 0) { diff --git a/Modules/SalesReturn/Http/Controllers/SalesReturnController.php b/Modules/SalesReturn/Http/Controllers/SalesReturnController.php index 0613248d..97a340a8 100644 --- a/Modules/SalesReturn/Http/Controllers/SalesReturnController.php +++ b/Modules/SalesReturn/Http/Controllers/SalesReturnController.php @@ -117,7 +117,7 @@ class SalesReturnController extends Controller public function edit(SaleReturn $sale_return) { - abort_if(Gate::denies('edit_sales'), 403); + abort_if(Gate::denies('edit_sale_returns'), 403); $sale_return_details = $sale_return->saleReturnDetails; diff --git a/Modules/SalesReturn/Http/Requests/StoreSaleReturnRequest.php b/Modules/SalesReturn/Http/Requests/StoreSaleReturnRequest.php index a0aa186f..15e292c1 100644 --- a/Modules/SalesReturn/Http/Requests/StoreSaleReturnRequest.php +++ b/Modules/SalesReturn/Http/Requests/StoreSaleReturnRequest.php @@ -35,6 +35,6 @@ class StoreSaleReturnRequest extends FormRequest */ public function authorize() { - return Gate::allows('create_sales'); + return Gate::allows('create_sale_returns'); } } diff --git a/Modules/User/Database/Seeders/PermissionsTableSeeder.php b/Modules/User/Database/Seeders/PermissionsTableSeeder.php index 71fa7932..86870557 100644 --- a/Modules/User/Database/Seeders/PermissionsTableSeeder.php +++ b/Modules/User/Database/Seeders/PermissionsTableSeeder.php @@ -60,6 +60,14 @@ class PermissionsTableSeeder extends Seeder 'delete_sales', //Sale Payments 'access_sale_payments', + //Sale Returns + 'access_sale_returns', + 'create_sale_returns', + 'show_sale_returns', + 'edit_sale_returns', + 'delete_sale_returns', + //Sale Return Payments + 'access_sale_return_payments', //Purchases 'access_purchases', 'create_purchases', @@ -68,6 +76,14 @@ class PermissionsTableSeeder extends Seeder 'delete_purchases', //Purchase Payments 'access_purchase_payments', + //Sale Returns + 'access_purchase_returns', + 'create_purchase_returns', + 'show_purchase_returns', + 'edit_purchase_returns', + 'delete_purchase_returns', + //Sale Return Payments + 'access_purchase_return_payments', //Currencies 'access_currencies', 'create_currencies', diff --git a/app/DataTables/PurchaseReturnPaymentsDataTable.php b/app/DataTables/PurchaseReturnPaymentsDataTable.php new file mode 100644 index 00000000..36d9f70e --- /dev/null +++ b/app/DataTables/PurchaseReturnPaymentsDataTable.php @@ -0,0 +1,78 @@ +eloquent($query) + ->addColumn('amount', function ($data) { + return format_currency($data->amount); + }) + ->addColumn('action', function ($data) { + return view('purchasesreturn::payments.partials.actions', compact('data')); + }); + } + + public function query(PurchaseReturnPayment $model) { + return $model->newQuery()->byPurchaseReturn()->with('purchaseReturn'); + } + + public function html() { + return $this->builder() + ->setTableId('purchase-payments-table') + ->columns($this->getColumns()) + ->minifiedAjax() + ->dom("<'row'<'col-md-3'l><'col-md-5 mb-2'B><'col-md-4'f>> . + 'tr' . + <'row'<'col-md-5'i><'col-md-7 mt-2'p>>") + ->orderBy(5) + ->buttons( + Button::make('excel') + ->text(' Excel'), + Button::make('print') + ->text(' Print'), + Button::make('reset') + ->text(' Reset'), + Button::make('reload') + ->text(' Reload') + ); + } + + protected function getColumns() { + return [ + Column::make('date') + ->className('align-middle text-center'), + + Column::make('reference') + ->className('align-middle text-center'), + + Column::computed('amount') + ->className('align-middle text-center'), + + Column::make('payment_method') + ->className('align-middle text-center'), + + Column::computed('action') + ->exportable(false) + ->printable(false) + ->className('align-middle text-center'), + + Column::make('created_at') + ->visible(false), + ]; + } + + protected function filename() + { + return 'PurchaseReturnPayments_' . date('YmdHis'); + } +} diff --git a/app/DataTables/PurchaseReturnsDataTable.php b/app/DataTables/PurchaseReturnsDataTable.php new file mode 100644 index 00000000..62de3b6f --- /dev/null +++ b/app/DataTables/PurchaseReturnsDataTable.php @@ -0,0 +1,99 @@ +eloquent($query) + ->addColumn('total_amount', function ($data) { + return format_currency($data->total_amount); + }) + ->addColumn('paid_amount', function ($data) { + return format_currency($data->paid_amount); + }) + ->addColumn('due_amount', function ($data) { + return format_currency($data->due_amount); + }) + ->addColumn('status', function ($data) { + return view('purchasesreturn::partials.status', compact('data')); + }) + ->addColumn('payment_status', function ($data) { + return view('purchasesreturn::partials.payment-status', compact('data')); + }) + ->addColumn('action', function ($data) { + return view('purchasesreturn::partials.actions', compact('data')); + }); + } + + public function query(PurchaseReturn $model) { + return $model->newQuery(); + } + + public function html() { + return $this->builder() + ->setTableId('purchase-returns-table') + ->columns($this->getColumns()) + ->minifiedAjax() + ->dom("<'row'<'col-md-3'l><'col-md-5 mb-2'B><'col-md-4'f>> . + 'tr' . + <'row'<'col-md-5'i><'col-md-7 mt-2'p>>") + ->orderBy(8) + ->buttons( + Button::make('excel') + ->text(' Excel'), + Button::make('print') + ->text(' Print'), + Button::make('reset') + ->text(' Reset'), + Button::make('reload') + ->text(' Reload') + ); + } + + protected function getColumns() { + return [ + Column::make('reference') + ->className('text-center align-middle'), + + Column::make('supplier_name') + ->title('Supplier') + ->className('text-center align-middle'), + + Column::computed('status') + ->className('text-center align-middle'), + + Column::computed('total_amount') + ->className('text-center align-middle'), + + Column::computed('paid_amount') + ->className('text-center align-middle'), + + Column::computed('due_amount') + ->className('text-center align-middle'), + + Column::computed('payment_status') + ->className('text-center align-middle'), + + Column::computed('action') + ->exportable(false) + ->printable(false) + ->className('text-center align-middle'), + + Column::make('created_at') + ->visible(false) + ]; + } + protected function filename() + { + return 'PurchaseReturns_' . date('YmdHis'); + } +} diff --git a/modules_statuses.json b/modules_statuses.json index ab1a1793..24448aa9 100644 --- a/modules_statuses.json +++ b/modules_statuses.json @@ -10,5 +10,6 @@ "Sale": true, "Purchase": true, "SaleReturn": true, - "SalesReturn": true + "SalesReturn": true, + "PurchasesReturn": true } \ No newline at end of file diff --git a/resources/views/layouts/menu.blade.php b/resources/views/layouts/menu.blade.php index aa6bf313..7d866120 100644 --- a/resources/views/layouts/menu.blade.php +++ b/resources/views/layouts/menu.blade.php @@ -43,7 +43,7 @@ @can('access_adjustments')
  • - Adjustments + Adjustments