diff --git a/Modules/Product/Http/Requests/ProductCreateRequest.php b/Modules/Product/Http/Requests/ProductCreateRequest.php
index c65e3f12..865721f8 100644
--- a/Modules/Product/Http/Requests/ProductCreateRequest.php
+++ b/Modules/Product/Http/Requests/ProductCreateRequest.php
@@ -22,7 +22,7 @@ class ProductCreateRequest extends FormRequest
'product_cost' => ['required', 'numeric', 'max:2147483647'],
'product_price' => ['required', 'numeric', 'max:2147483647'],
'product_stock_alert' => ['required', 'integer', 'min:0'],
- 'product_order_tax' => ['nullable', 'integer', 'min:1'],
+ 'product_order_tax' => ['nullable', 'integer', 'min:0', 'max:100'],
'product_tax_type' => ['nullable', 'integer'],
'product_note' => ['nullable', 'string', 'max:1000'],
'category_id' => ['required', 'integer']
diff --git a/Modules/Product/Http/Requests/ProductUpdateRequest.php b/Modules/Product/Http/Requests/ProductUpdateRequest.php
index 65287dd0..fd4d5377 100644
--- a/Modules/Product/Http/Requests/ProductUpdateRequest.php
+++ b/Modules/Product/Http/Requests/ProductUpdateRequest.php
@@ -23,7 +23,7 @@ class ProductUpdateRequest extends FormRequest
'product_cost' => ['required', 'numeric', 'max:2147483647'],
'product_price' => ['required', 'numeric', 'max:2147483647'],
'product_stock_alert' => ['required', 'integer', 'min:0'],
- 'product_order_tax' => ['nullable', 'integer', 'min:1'],
+ 'product_order_tax' => ['nullable', 'integer', 'min:0', 'max:100'],
'product_tax_type' => ['nullable', 'integer'],
'product_note' => ['nullable', 'string', 'max:1000'],
'category_id' => ['required', 'integer']
diff --git a/Modules/Product/Resources/views/products/create.blade.php b/Modules/Product/Resources/views/products/create.blade.php
index c07f72d4..193beaed 100644
--- a/Modules/Product/Resources/views/products/create.blade.php
+++ b/Modules/Product/Resources/views/products/create.blade.php
@@ -95,7 +95,7 @@
diff --git a/Modules/Product/Resources/views/products/edit.blade.php b/Modules/Product/Resources/views/products/edit.blade.php
index 307c17c7..920911d5 100644
--- a/Modules/Product/Resources/views/products/edit.blade.php
+++ b/Modules/Product/Resources/views/products/edit.blade.php
@@ -104,14 +104,14 @@
diff --git a/Modules/Sale/Http/Controllers/SaleController.php b/Modules/Sale/Http/Controllers/SaleController.php
index 0f1ff2d4..a62477dd 100644
--- a/Modules/Sale/Http/Controllers/SaleController.php
+++ b/Modules/Sale/Http/Controllers/SaleController.php
@@ -76,6 +76,7 @@ class SaleController extends Controller
'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,
]);
@@ -121,6 +122,7 @@ class SaleController extends Controller
'weight' => 1,
'options' => [
'product_discount' => $sale_detail->product_discount_amount,
+ 'product_discount_type' => $sale_detail->product_discount_type,
'sub_total' => $sale_detail->sub_total,
'code' => $sale_detail->product_code,
'stock' => Product::findOrFail($sale_detail->product_id)->product_quantity,
@@ -185,6 +187,7 @@ class SaleController extends Controller
'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,
]);
@@ -207,5 +210,11 @@ class SaleController extends Controller
public function destroy(Sale $sale) {
abort_if(Gate::denies('delete_sales'), 403);
+
+ $sale->delete();
+
+ toast('Sale Deleted!', 'warning');
+
+ return redirect()->route('sales.index');
}
}
diff --git a/Modules/Sale/Resources/views/edit.blade.php b/Modules/Sale/Resources/views/edit.blade.php
index 08d0b2bd..51b7b69b 100644
--- a/Modules/Sale/Resources/views/edit.blade.php
+++ b/Modules/Sale/Resources/views/edit.blade.php
@@ -55,7 +55,7 @@
-
+