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 index da8b2258..6f525ea6 100644 --- 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 @@ -21,7 +21,7 @@ class CreatePurchasePaymentsTable extends Migration $table->string('reference'); $table->string('payment_method'); $table->text('note')->nullable(); - $table->foreign('purchase_id')->references('id')->on('purchase_payments')->cascadeOnDelete(); + $table->foreign('purchase_id')->references('id')->on('purchases')->cascadeOnDelete(); $table->timestamps(); }); } diff --git a/Modules/Sale/Database/Migrations/2021_08_07_192203_create_sale_payments_table.php b/Modules/Sale/Database/Migrations/2021_08_07_192203_create_sale_payments_table.php index 6323eef7..ed6cae77 100644 --- a/Modules/Sale/Database/Migrations/2021_08_07_192203_create_sale_payments_table.php +++ b/Modules/Sale/Database/Migrations/2021_08_07_192203_create_sale_payments_table.php @@ -21,7 +21,7 @@ class CreateSalePaymentsTable extends Migration $table->string('reference'); $table->string('payment_method'); $table->text('note')->nullable(); - $table->foreign('sale_id')->references('id')->on('sale_payments')->cascadeOnDelete(); + $table->foreign('sale_id')->references('id')->on('sales')->cascadeOnDelete(); $table->timestamps(); }); } diff --git a/Modules/Sale/Http/Controllers/SaleController.php b/Modules/Sale/Http/Controllers/SaleController.php index 03f97235..ff0f3302 100644 --- a/Modules/Sale/Http/Controllers/SaleController.php +++ b/Modules/Sale/Http/Controllers/SaleController.php @@ -39,6 +39,7 @@ class SaleController extends Controller public function store(StoreSaleRequest $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) { @@ -149,6 +150,7 @@ class SaleController extends Controller public function update(UpdateSaleRequest $request, Sale $sale) { DB::transaction(function () use ($request, $sale) { + $due_amount = $request->total_amount - $request->paid_amount; if ($due_amount == $request->total_amount) { $payment_status = 'Unpaid'; diff --git a/Modules/Sale/Http/Controllers/SalePaymentsController.php b/Modules/Sale/Http/Controllers/SalePaymentsController.php index bce4dc27..91ad1d9b 100644 --- a/Modules/Sale/Http/Controllers/SalePaymentsController.php +++ b/Modules/Sale/Http/Controllers/SalePaymentsController.php @@ -57,6 +57,7 @@ class SalePaymentsController extends Controller $sale = Sale::findOrFail($request->sale_id); $due_amount = $sale->due_amount - $request->amount; + if ($due_amount == $sale->total_amount) { $payment_status = 'Unpaid'; } elseif ($due_amount > 0) { diff --git a/Modules/Sale/Resources/views/partials/status.blade.php b/Modules/Sale/Resources/views/partials/status.blade.php index 1960520b..e6f2dfe7 100644 --- a/Modules/Sale/Resources/views/partials/status.blade.php +++ b/Modules/Sale/Resources/views/partials/status.blade.php @@ -1,4 +1,4 @@ -d@if ($data->status == 'Pending') +@if ($data->status == 'Pending') {{ $data->status }} diff --git a/Modules/SalesReturn/Config/.gitkeep b/Modules/SalesReturn/Config/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/SalesReturn/Config/config.php b/Modules/SalesReturn/Config/config.php new file mode 100644 index 00000000..bb1b255d --- /dev/null +++ b/Modules/SalesReturn/Config/config.php @@ -0,0 +1,5 @@ + 'SalesReturn' +]; diff --git a/Modules/SalesReturn/Console/.gitkeep b/Modules/SalesReturn/Console/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/SalesReturn/Database/Migrations/.gitkeep b/Modules/SalesReturn/Database/Migrations/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/SalesReturn/Database/Migrations/2021_08_08_175345_create_sale_returns_table.php b/Modules/SalesReturn/Database/Migrations/2021_08_08_175345_create_sale_returns_table.php new file mode 100644 index 00000000..a42661af --- /dev/null +++ b/Modules/SalesReturn/Database/Migrations/2021_08_08_175345_create_sale_returns_table.php @@ -0,0 +1,48 @@ +id(); + $table->date('date'); + $table->string('reference'); + $table->unsignedBigInteger('customer_id')->nullable(); + $table->string('customer_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('customer_id')->references('id')->on('customers')->nullOnDelete(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('sale_returns'); + } +} diff --git a/Modules/SalesReturn/Database/Migrations/2021_08_08_175358_create_sale_return_details_table.php b/Modules/SalesReturn/Database/Migrations/2021_08_08_175358_create_sale_return_details_table.php new file mode 100644 index 00000000..b2ab2cfa --- /dev/null +++ b/Modules/SalesReturn/Database/Migrations/2021_08_08_175358_create_sale_return_details_table.php @@ -0,0 +1,46 @@ +id(); + $table->unsignedBigInteger('sale_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('sale_return_id')->references('id') + ->on('sale_returns')->cascadeOnDelete(); + $table->foreign('product_id')->references('id') + ->on('products')->nullOnDelete(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('sale_return_details'); + } +} diff --git a/Modules/SalesReturn/Database/Migrations/2021_08_08_175406_create_sale_return_payments_table.php b/Modules/SalesReturn/Database/Migrations/2021_08_08_175406_create_sale_return_payments_table.php new file mode 100644 index 00000000..0a020875 --- /dev/null +++ b/Modules/SalesReturn/Database/Migrations/2021_08_08_175406_create_sale_return_payments_table.php @@ -0,0 +1,38 @@ +id(); + $table->unsignedBigInteger('sale_return_id'); + $table->integer('amount'); + $table->date('date'); + $table->string('reference'); + $table->string('payment_method'); + $table->text('note')->nullable(); + $table->foreign('sale_return_id')->references('id')->on('sale_returns')->cascadeOnDelete(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('sale_return_payments'); + } +} diff --git a/Modules/SalesReturn/Database/Seeders/.gitkeep b/Modules/SalesReturn/Database/Seeders/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/SalesReturn/Database/Seeders/SalesReturnDatabaseSeeder.php b/Modules/SalesReturn/Database/Seeders/SalesReturnDatabaseSeeder.php new file mode 100644 index 00000000..bdf64a6e --- /dev/null +++ b/Modules/SalesReturn/Database/Seeders/SalesReturnDatabaseSeeder.php @@ -0,0 +1,21 @@ +call("OthersTableSeeder"); + } +} diff --git a/Modules/SalesReturn/Database/factories/.gitkeep b/Modules/SalesReturn/Database/factories/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/SalesReturn/Entities/.gitkeep b/Modules/SalesReturn/Entities/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/SalesReturn/Entities/SaleReturn.php b/Modules/SalesReturn/Entities/SaleReturn.php new file mode 100644 index 00000000..96a55376 --- /dev/null +++ b/Modules/SalesReturn/Entities/SaleReturn.php @@ -0,0 +1,49 @@ +hasMany(SaleReturnDetail::class, 'sale_return_id', 'id'); + } + + public function saleReturnPayments() { + return $this->hasMany(SaleReturnPayment::class, 'sale_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/SalesReturn/Entities/SaleReturnDetail.php b/Modules/SalesReturn/Entities/SaleReturnDetail.php new file mode 100644 index 00000000..9f7b5000 --- /dev/null +++ b/Modules/SalesReturn/Entities/SaleReturnDetail.php @@ -0,0 +1,44 @@ +belongsTo(Product::class, 'product_id', 'id'); + } + + public function saleReturn() { + return $this->belongsTo(SaleReturnPayment::class, 'sale_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/SalesReturn/Entities/SaleReturnPayment.php b/Modules/SalesReturn/Entities/SaleReturnPayment.php new file mode 100644 index 00000000..eda96ee8 --- /dev/null +++ b/Modules/SalesReturn/Entities/SaleReturnPayment.php @@ -0,0 +1,34 @@ +belongsTo(SaleReturn::class, 'sale_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 scopeBySaleReturn($query) { + return $query->where('sale_return_id', request()->route('sale_return_id')); + } +} diff --git a/Modules/SalesReturn/Http/Controllers/.gitkeep b/Modules/SalesReturn/Http/Controllers/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/SalesReturn/Http/Controllers/SaleReturnPaymentsController.php b/Modules/SalesReturn/Http/Controllers/SaleReturnPaymentsController.php new file mode 100644 index 00000000..c54192ce --- /dev/null +++ b/Modules/SalesReturn/Http/Controllers/SaleReturnPaymentsController.php @@ -0,0 +1,147 @@ +render('salesreturn::payments.index', compact('sale_return')); + } + + + public function create($sale_return_id) { + abort_if(Gate::denies('access_sale_payments'), 403); + + $sale_return = SaleReturn::findOrFail($sale_return_id); + + return view('salesreturn::payments.create', compact('sale_return')); + } + + + public function store(Request $request) { + abort_if(Gate::denies('access_sale_payments'), 403); + + $request->validate([ + 'date' => 'required|date', + 'reference' => 'required|string|max:255', + 'amount' => 'required|numeric', + 'note' => 'nullable|string|max:1000', + 'sale_return_id' => 'required', + 'payment_method' => 'required|string|max:255' + ]); + + DB::transaction(function () use ($request) { + SaleReturnPayment::create([ + 'date' => $request->date, + 'reference' => $request->reference, + 'amount' => $request->amount, + 'note' => $request->note, + 'sale_return_id' => $request->sale_return_id, + 'payment_method' => $request->payment_method + ]); + + $sale_return = SaleReturn::findOrFail($request->sale_return_id); + + $due_amount = $sale_return->due_amount - $request->amount; + + if ($due_amount == $sale_return->total_amount) { + $payment_status = 'Unpaid'; + } elseif ($due_amount > 0) { + $payment_status = 'Partial'; + } else { + $payment_status = 'Paid'; + } + + $sale_return->update([ + 'paid_amount' => ($sale_return->paid_amount + $request->amount) * 100, + 'due_amount' => $due_amount * 100, + 'payment_status' => $payment_status + ]); + }); + + toast('Sale Return Payment Created!', 'success'); + + return redirect()->route('sale-returns.index'); + } + + + public function edit($sale_return_id, SaleReturnPayment $saleReturnPayment) { + abort_if(Gate::denies('access_sale_return_payments'), 403); + + $sale_return = SaleReturn::findOrFail($sale_return_id); + + return view('salesreturn::payments.edit', compact('saleReturnPayment', 'sale_return')); + } + + + public function update(Request $request, SaleReturnPayment $saleReturnPayment) { + abort_if(Gate::denies('access_sale_return_payments'), 403); + + $request->validate([ + 'date' => 'required|date', + 'reference' => 'required|string|max:255', + 'amount' => 'required|numeric', + 'note' => 'nullable|string|max:1000', + 'sale_return_id' => 'required', + 'payment_method' => 'required|string|max:255' + ]); + + DB::transaction(function () use ($request, $saleReturnPayment) { + $sale_return = $saleReturnPayment->saleReturn; + + $due_amount = ($sale_return->due_amount + $saleReturnPayment->amount) - $request->amount; + + if ($due_amount == $sale_return->total_amount) { + $payment_status = 'Unpaid'; + } elseif ($due_amount > 0) { + $payment_status = 'Partial'; + } else { + $payment_status = 'Paid'; + } + + $sale_return->update([ + 'paid_amount' => (($sale_return->paid_amount - $saleReturnPayment->amount) + $request->amount) * 100, + 'due_amount' => $due_amount * 100, + 'payment_status' => $payment_status + ]); + + $saleReturnPayment->update([ + 'date' => $request->date, + 'reference' => $request->reference, + 'amount' => $request->amount, + 'note' => $request->note, + 'sale_return_id' => $request->sale_return_id, + 'payment_method' => $request->payment_method + ]); + }); + + toast('Sale Return Payment Updated!', 'info'); + + return redirect()->route('sale-returns.index'); + } + + + public function destroy(SaleReturnPayment $saleReturnPayment) { + abort_if(Gate::denies('access_sale_return_payments'), 403); + + $saleReturnPayment->delete(); + + toast('Sale Return Payment Deleted!', 'warning'); + + return redirect()->route('sale-returns.index'); + } +} diff --git a/Modules/SalesReturn/Http/Controllers/SalesReturnController.php b/Modules/SalesReturn/Http/Controllers/SalesReturnController.php new file mode 100644 index 00000000..0613248d --- /dev/null +++ b/Modules/SalesReturn/Http/Controllers/SalesReturnController.php @@ -0,0 +1,233 @@ +render('salesreturn::index'); + } + + + public function create() { + abort_if(Gate::denies('create_sale_returns'), 403); + + Cart::instance('sale_return')->destroy(); + + return view('salesreturn::create'); + } + + + public function store(StoreSaleReturnRequest $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'; + } + + $sale_return = SaleReturn::create([ + 'date' => $request->date, + 'reference' => $request->reference, + 'customer_id' => $request->customer_id, + 'customer_name' => Customer::findOrFail($request->customer_id)->customer_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('sale_return')->tax() * 100, + 'discount_amount' => Cart::instance('sale_return')->discount() * 100, + ]); + + foreach (Cart::instance('sale_return')->content() as $cart_item) { + SaleReturnDetail::create([ + 'sale_return_id' => $sale_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 == 'Completed') { + $product = Product::findOrFail($cart_item->id); + $product->update([ + 'product_quantity' => $product->product_quantity + $cart_item->qty + ]); + } + } + + Cart::instance('sale_return')->destroy(); + + SaleReturnPayment::create([ + 'date' => $request->date, + 'reference' => 'INV/'.$sale_return->reference, + 'amount' => $sale_return->paid_amount, + 'sale_return_id' => $sale_return->id, + 'payment_method' => $request->payment_method + ]); + }); + + toast('Sale Return Created!', 'success'); + + return redirect()->route('sale-returns.index'); + } + + + public function show(SaleReturn $sale_return) { + abort_if(Gate::denies('show_sale_returns'), 403); + + $customer = Customer::findOrFail($sale_return->customer_id); + + return view('salesreturn::show', compact('sale_return', 'customer')); + } + + + public function edit(SaleReturn $sale_return) { + abort_if(Gate::denies('edit_sales'), 403); + + $sale_return_details = $sale_return->saleReturnDetails; + + Cart::instance('sale_return')->destroy(); + + $cart = Cart::instance('sale_return'); + + foreach ($sale_return_details as $sale_return_detail) { + $cart->add([ + 'id' => $sale_return_detail->product_id, + 'name' => $sale_return_detail->product_name, + 'qty' => $sale_return_detail->quantity, + 'price' => $sale_return_detail->price, + 'weight' => 1, + 'options' => [ + 'product_discount' => $sale_return_detail->product_discount_amount, + 'product_discount_type' => $sale_return_detail->product_discount_type, + 'sub_total' => $sale_return_detail->sub_total, + 'code' => $sale_return_detail->product_code, + 'stock' => Product::findOrFail($sale_return_detail->product_id)->product_quantity, + 'product_tax' => $sale_return_detail->product_tax_amount, + 'unit_price' => $sale_return_detail->unit_price + ] + ]); + } + + return view('salesreturn::edit', compact('sale_return')); + } + + + public function update(UpdateSaleReturnRequest $request, SaleReturn $sale_return) { + DB::transaction(function () use ($request, $sale_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 ($sale_return->saleReturnDetails as $sale_return_detail) { + if ($sale_return->status == 'Completed') { + $product = Product::findOrFail($sale_return_detail->product_id); + $product->update([ + 'product_quantity' => $product->product_quantity - $sale_return_detail->quantity + ]); + } + $sale_return_detail->delete(); + } + + $sale_return->update([ + 'date' => $request->date, + 'reference' => $request->reference, + 'customer_id' => $request->customer_id, + 'customer_name' => Customer::findOrFail($request->customer_id)->customer_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('sale_return')->tax() * 100, + 'discount_amount' => Cart::instance('sale_return')->discount() * 100, + ]); + + foreach (Cart::instance('sale_return')->content() as $cart_item) { + SaleReturnDetail::create([ + 'sale_return_id' => $sale_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 == 'Completed') { + $product = Product::findOrFail($cart_item->id); + $product->update([ + 'product_quantity' => $product->product_quantity + $cart_item->qty + ]); + } + } + + Cart::instance('sale_return')->destroy(); + }); + + toast('Sale Return Updated!', 'info'); + + return redirect()->route('sale-returns.index'); + } + + + public function destroy(SaleReturn $sale_return) { + abort_if(Gate::denies('delete_sale_returns'), 403); + + $sale_return->delete(); + + toast('Sale Return Deleted!', 'warning'); + + return redirect()->route('sale-returns.index'); + } +} diff --git a/Modules/SalesReturn/Http/Middleware/.gitkeep b/Modules/SalesReturn/Http/Middleware/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/SalesReturn/Http/Requests/.gitkeep b/Modules/SalesReturn/Http/Requests/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/SalesReturn/Http/Requests/StoreSaleReturnRequest.php b/Modules/SalesReturn/Http/Requests/StoreSaleReturnRequest.php new file mode 100644 index 00000000..a0aa186f --- /dev/null +++ b/Modules/SalesReturn/Http/Requests/StoreSaleReturnRequest.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/SalesReturn/Http/Requests/UpdateSaleReturnRequest.php b/Modules/SalesReturn/Http/Requests/UpdateSaleReturnRequest.php new file mode 100644 index 00000000..50004f6a --- /dev/null +++ b/Modules/SalesReturn/Http/Requests/UpdateSaleReturnRequest.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->sale_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_sale_returns'); + } +} diff --git a/Modules/SalesReturn/Providers/.gitkeep b/Modules/SalesReturn/Providers/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/SalesReturn/Providers/RouteServiceProvider.php b/Modules/SalesReturn/Providers/RouteServiceProvider.php new file mode 100644 index 00000000..e4864eb1 --- /dev/null +++ b/Modules/SalesReturn/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('SalesReturn', '/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('SalesReturn', '/Routes/api.php')); + } +} diff --git a/Modules/SalesReturn/Providers/SalesReturnServiceProvider.php b/Modules/SalesReturn/Providers/SalesReturnServiceProvider.php new file mode 100644 index 00000000..288795cd --- /dev/null +++ b/Modules/SalesReturn/Providers/SalesReturnServiceProvider.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/SalesReturn/Resources/assets/.gitkeep b/Modules/SalesReturn/Resources/assets/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/SalesReturn/Resources/assets/js/app.js b/Modules/SalesReturn/Resources/assets/js/app.js new file mode 100644 index 00000000..e69de29b diff --git a/Modules/SalesReturn/Resources/assets/sass/app.scss b/Modules/SalesReturn/Resources/assets/sass/app.scss new file mode 100644 index 00000000..e69de29b diff --git a/Modules/SalesReturn/Resources/lang/.gitkeep b/Modules/SalesReturn/Resources/lang/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/SalesReturn/Resources/views/.gitkeep b/Modules/SalesReturn/Resources/views/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/Modules/SalesReturn/Resources/views/create.blade.php b/Modules/SalesReturn/Resources/views/create.blade.php new file mode 100644 index 00000000..0a16503a --- /dev/null +++ b/Modules/SalesReturn/Resources/views/create.blade.php @@ -0,0 +1,139 @@ +@extends('layouts.app') + +@section('title', 'Create Sale Return') + +@section('breadcrumb') +
+@endsection + +@section('content') +
+ | Product | +Net Unit Price | +Stock | +Quantity | +Discount | +Tax | +Sub Total | +
|---|---|---|---|---|---|---|
|
+ {{ $item->product_name }} + + {{ $item->product_code }} + + |
+
+ {{ format_currency($item->unit_price) }} | + ++ {{ $item->product->product_quantity }} + | + ++ {{ $item->quantity }} + | + ++ {{ format_currency($item->product_discount_amount) }} + | + ++ {{ format_currency($item->product_tax_amount) }} + | + ++ {{ format_currency($item->sub_total) }} + | +
| Discount ({{ $sale_return->discount_percentage }}%) | +{{ format_currency($sale_return->discount_amount) }} | +
| Tax ({{ $sale_return->tax_percentage }}%) | +{{ format_currency($sale_return->tax_amount) }} | +
| Shipping) | +{{ format_currency($sale_return->shipping_amount) }} | +
| Grand Total | +{{ format_currency($sale_return->total_amount) }} | +
Computer generated invoice. {{ settings()->company_name }} © {{ date('Y') }}.
+| Product | +Net Unit Price | +Stock | +Quantity | +Discount | +Tax | +Sub Total | +
|---|---|---|---|---|---|---|
|
+ {{ $item->product_name }} + + {{ $item->product_code }} + + |
+
+ {{ format_currency($item->unit_price) }} | + ++ {{ $item->product->product_quantity }} + | + ++ {{ $item->quantity }} + | + ++ {{ format_currency($item->product_discount_amount) }} + | + ++ {{ format_currency($item->product_tax_amount) }} + | + ++ {{ format_currency($item->sub_total) }} + | +
| Discount ({{ $sale_return->discount_percentage }}%) | +{{ format_currency($sale_return->discount_amount) }} | +
| Tax ({{ $sale_return->tax_percentage }}%) | +{{ format_currency($sale_return->tax_amount) }} | +
| Shipping) | +{{ format_currency($sale_return->shipping_amount) }} | +
| Grand Total | +{{ format_currency($sale_return->total_amount) }} | +