From a63c86f031f7ae5dff30f39ef1d4f276cd79d070 Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Tue, 12 Nov 2024 12:10:48 +0530 Subject: [PATCH] CHANGE_ tracker issue : GWM --- app/Controllers/Sales.php | 2 +- app/Views/layout/footer.php | 63 ++-------------------------------- app/Views/product_form.php | 40 ++++++++++----------- app/Views/product_list.php | 2 +- app/Views/sales_order_form.php | 28 ++++++++------- app/Views/vehicle_form.php | 11 ++++-- 6 files changed, 48 insertions(+), 98 deletions(-) diff --git a/app/Controllers/Sales.php b/app/Controllers/Sales.php index 4ae3f5a..1cce0dd 100755 --- a/app/Controllers/Sales.php +++ b/app/Controllers/Sales.php @@ -223,7 +223,7 @@ class Sales extends BaseController if ($status == 'Approved') { $this->subractProductQuantity($ProductModel, $product_id, $qty); }elseif ($status == 'Cancelled'){ - $this->addBackProductQuantity($ProductModel, $product_id, $qty); + // $this->addBackProductQuantity($ProductModel, $product_id, $qty); } $discount = isset($discounts[$key]) ? $discounts[$key] : 0; $discount_type = isset($discount_types[$key]) ? $discount_types[$key] : ''; diff --git a/app/Views/layout/footer.php b/app/Views/layout/footer.php index 714ab93..46ebf1a 100755 --- a/app/Views/layout/footer.php +++ b/app/Views/layout/footer.php @@ -1,31 +1,5 @@ - - - - - + @@ -132,8 +74,7 @@ - - + diff --git a/app/Views/product_form.php b/app/Views/product_form.php index 596c75e..e5672a5 100755 --- a/app/Views/product_form.php +++ b/app/Views/product_form.php @@ -145,12 +145,12 @@

Pricing Information :


- +
- +
- +

Stock Information :


- +
> - + > + + >
> - - > + + >
> - - > + + >
> - - > + + >
- - + +
- - + +
- - + +

Description Details :


diff --git a/app/Views/product_list.php b/app/Views/product_list.php index e4d223a..2d4433a 100755 --- a/app/Views/product_list.php +++ b/app/Views/product_list.php @@ -103,7 +103,7 @@
-
+
" class="dropdown-item edit-button" onclick="setSessionPagination('product_tr_')">Edit diff --git a/app/Views/sales_order_form.php b/app/Views/sales_order_form.php index ee5ab01..c92210a 100755 --- a/app/Views/sales_order_form.php +++ b/app/Views/sales_order_form.php @@ -33,7 +33,9 @@
-
" method="post" style="line-height:0.5;"> + " method="post" style="line-height:0.5;" id="salesForm"> + +
@@ -311,7 +313,7 @@
- + @@ -547,23 +549,18 @@ $(document).ready(function() { var product = products.find(function(item) { return item.product_id == productId; }); + var cgst = parseFloat(product.cgst); var sgst = parseFloat(product.sgst); - - // Calculate total tax by adding CGST and SGST var tax = cgst + sgst; - // console.log("tax"); - // console.log(tax); + $(row).find('.item-tax').val(tax); var rate = $(row).find('.item-rate').val(); var quantity = $(row).find('.item-quantity').val(); - // var amount = rate * quantity; - var amount = product.total_amount *quantity; - // console.log(amount); - // var taxamount = amount * tax / 100; - // var finalamt = amount + taxamount; - var finalamt = amount; + var amount = rate * quantity; + var taxamount = amount * tax / 100; + var finalamt = amount + taxamount; $(row).find('.item-amount').val(parseFloat(finalamt).toFixed(2)); } @@ -1130,5 +1127,12 @@ function addProductNamesId(selectElement) { console.log('product_names_id', product_names_id); } + // Prevent multiple submissions by disabling the button on first click + document.querySelector('#salesForm').addEventListener('submit', function (e) { + const submitButton = this.querySelector('button[type="submit"]'); + submitButton.disabled = true; // Disable the button + submitButton.textContent = 'Processing...'; // Optional: Show loading text + }); + \ No newline at end of file diff --git a/app/Views/vehicle_form.php b/app/Views/vehicle_form.php index 47f8454..ac00167 100755 --- a/app/Views/vehicle_form.php +++ b/app/Views/vehicle_form.php @@ -18,7 +18,7 @@
-
" method="post"> + " method="post" id="vehicleForm">

Vehicle Details :

@@ -120,7 +120,7 @@
- +
@@ -502,7 +502,12 @@ $('#saveModelBtn').click(function() { }); - + // Prevent multiple submissions by disabling the button on first click + document.querySelector('#vehicleForm').addEventListener('submit', function (e) { + const submitButton = this.querySelector('button[type="submit"]'); + submitButton.disabled = true; // Disable the button + submitButton.textContent = 'Processing...'; // Optional: Show loading text + });