From 1667722bb39593bb94848d6bacbda29c6da5ab3c Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Tue, 28 May 2024 12:37:56 +0000
Subject: [PATCH] CHANGE_calculaton : ps

---
 app/Controllers/ApiIntegration.php |  5 ++++-
 app/Views/invoice_form.php         | 28 ++++++++++++++--------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/Controllers/ApiIntegration.php b/app/Controllers/ApiIntegration.php
index 1faa7b55..c2faab9f 100644
--- a/app/Controllers/ApiIntegration.php
+++ b/app/Controllers/ApiIntegration.php
@@ -953,8 +953,10 @@ class ApiIntegration extends ResourceController
                     });
                     $fromDate = NULL;
                     $toDate = NULL;
+                    $duration = 0;
                     for ($x = 0; $x < count($result_book_category); $x++) {
-                        $duration = $result_book_category[$x]['duration'] * 12;
+                        $duration = isset($result_book_category[$x]['duration']) && $result_book_category[$x]['duration'] != '' && (int)$result_book_category[$x]['duration'] > 0 ? $result_book_category[$x]['duration'] * 12 : 1 * 12;
+                        $this->logger->info("Api SaveSalesDetails : Duration - Given : " .$result_book_category[$x]['duration']." Final : ".$duration);
                         $fromDateTimestamp = strtotime($records['date_created']);
                         $toDateTimestamp = strtotime("+$duration months", $fromDateTimestamp);
                         $fromDate = date("Y-m-d", strtotime($records['date_created']));
@@ -963,6 +965,7 @@ class ApiIntegration extends ResourceController
                         $scheme_id = $result_book_category[$x]['book_id'];
                         $dataToCheck = ['scheme_id'=>$scheme_id,'customer_id' => $local_customer_id,'invoice_id' => $invoice_id ];
                         $existing_subscription = $api_model->getData('subscription', $dataToCheck);
+                        
                         if (count($existing_subscription) > 0) {
                             $this->logger->info("Api SaveSalesDetails : Subscription ".count($existing_subscription)." data already exists = ".json_encode($dataToCheck));
                         } else {
diff --git a/app/Views/invoice_form.php b/app/Views/invoice_form.php
index ccb40aeb..ff51cccf 100644
--- a/app/Views/invoice_form.php
+++ b/app/Views/invoice_form.php
@@ -173,7 +173,7 @@
                                                     </td>
                                                     <td style="width:10%;"><input type="number" class="form-control item-amount" id="<?= "amount" . $inx; ?>" name="amount[]" value="<?= isset($ii_details['subtotal'])  ? $ii_details['subtotal'] : '' ?>" readonly />
                                                     </td>
-                                                    <td style="width:10%;"><input type="number" class="form-control item-discount-amount" id="<?= "item_discount_amount" . $inx; ?>" name="discount_amount[]" oninput="calculateInvoice(this,<?= $inx; ?>)" value="<?= isset($ii_details['discount_amount']) ? $ii_details['discount_amount'] : '' ?>" min="0" step="1" />
+                                                    <td style="width:10%;"><input type="number" class="form-control item-discount-amount" id="<?= "item_discount_amount" . $inx; ?>" name="discount_amount[]" oninput="calculateInvoice(this,<?= $inx; ?>)" value="<?= isset($ii_details['discount_amount']) ? $ii_details['discount_amount'] : '' ?>" min="0" step="0.001" />
 
                                                     </td>
                                                     <td style="width:7%;">
@@ -216,7 +216,7 @@
                                                 <td style="width:8%;display:none"><input type="text" class="form-control item-tax" id="tax0" name="tax[]" /></td>
                                                 <td style="width:12%;"><input type="text" class="form-control item-amount" id="amount0" name="amount[]" />
                                                 </td>
-                                                <td class="discount-cell" style="width:10%;"><input type="number" class="form-control item-discount-amount" id="item_discount_amount0" name="discount_amount[]" oninput="calculateInvoice(this,0)" min="0" step="1" />
+                                                <td class="discount-cell" style="width:10%;"><input type="number" class="form-control item-discount-amount" id="item_discount_amount0" name="discount_amount[]" oninput="calculateInvoice(this,0)"  min="0" step="0.001" />
 
                                                 </td>
                                                 <td style="width:7%;">
@@ -255,16 +255,16 @@
                                     <div class="form-row">
                                     <div class="form-group col-md-6">
                                         <label for="subtotal">Subtotal</label>
-                                        <input type="number" class="form-control" id="subtotal" name="sub_total" readonly value="<?= isset($invoice_details['subtotal']) ? (float)$invoice_details['subtotal'] : 0 ?>">
+                                        <input type="number" class="form-control" id="subtotal" name="sub_total" readonly value="<?= isset($invoice_details['subtotal']) ? (float)$invoice_details['subtotal'] : 0 ?>" min="0" step="0.001">
                                     </div>
                                     <div class="form-group" style="display: none;">
                                         <label for="invoicetax">Tax Amount</label>
-                                        <input type="hidden" class="form-control" id="invoicetax" name="invoice_tax" readonly value="<?= isset($invoice_details['tax']) ? (float)$invoice_details['tax'] : 0 ?>">
+                                        <input type="hidden" class="form-control" id="invoicetax" name="invoice_tax" readonly value="<?= isset($invoice_details['tax']) ? (float)$invoice_details['tax'] : 0 ?>" min="0" step="0.001">
                                     </div>
                                     <div class="form-group col-md-6">
                                         <label for="discount">Discount</label>
                                         <div class="input-group">
-                                            <input type="number" style="width: 60%;" class="form-control" id="discount" name="discount" value="<?= isset($invoice_details['discount']) ? $invoice_details['discount'] : 0 ?>"  onchange=" discountTypeKeyup(this)" value="0" min="0" step="1">
+                                            <input type="number" style="width: 60%;" class="form-control" id="discount" name="discount" value="<?= isset($invoice_details['discount']) ? $invoice_details['discount'] : 0 ?>"  onchange="discountTypeKeyup(this)" value="0" min="0" step="0.001">
                                             <?php
                                             $disType = isset($invoice_details['dis_type']) ? $invoice_details['dis_type'] : '';
 
@@ -302,7 +302,7 @@
                                     <div class="form-group col-md-6">
                                         <span style="<?= $shippingChargesStyle ?>">
                                             <label for="shippingCharges">Charge Amount </label>
-                                            <input type="number" class="form-control" id="shippingCharges" name="shippingCharges" placeholder="Charges Amount" value="<?= isset($invoice_details['shipping_charge']) ? $invoice_details['shipping_charge'] : 0 ?>" oninput="calculateOverallTotals()" <?= $shippingChargesHidden ?> >
+                                            <input type="number" class="form-control" id="shippingCharges" name="shippingCharges" placeholder="Charges Amount" value="<?= isset($invoice_details['shipping_charge']) ? $invoice_details['shipping_charge'] : 0 ?>" oninput="calculateOverallTotals()" <?= $shippingChargesHidden ?> min="0" step="0.001" >
                                         </span>
                                     </div>
                                     </div>
@@ -311,22 +311,22 @@
                                     <div class="form-row">
                                     <div class="form-group col-md-6">
                                             <label for="exacttotal">Total</label>
-                                            <input type="number" class="form-control" id="exacttotal" name="exact_total_amount" value="<?= isset($invoice_details['total_amount']) ? (float)$invoice_details['exact_total_amount'] : 0 ?>" readonly>
+                                            <input type="number" class="form-control" id="exacttotal" name="exact_total_amount" value="<?= isset($invoice_details['total_amount']) ? (float)$invoice_details['exact_total_amount'] : 0 ?>" readonly min="0" step="0.001">
                                     </div>
                                     <div class="form-group col-md-6">
                                         <label for="grandtotal">Total (Round-off)</label>
-                                        <input type="number" class="form-control" id="grandtotal" name="grand_total" readonly value="<?= isset($invoice_details['total_amount']) ? (int)$invoice_details['total_amount'] : 0 ?>">
+                                        <input type="number" class="form-control" id="grandtotal" name="grand_total" readonly value="<?= isset($invoice_details['total_amount']) ? (int)round($invoice_details['total_amount']) : 0 ?>">
                                     </div>
                                     </div>
                                     <div class="form-row">
                                     <div class="form-group col-md-6">
                                         <label for="balanceAmount">Balance Amount</label>
-                                        <input type="number" class="form-control" id="balanceAmount" name="balanceAmount" value="<?= (isset($invoice_details['status']) && $invoice_details['status'] === 'Draft') ? (isset($invoice_details['total_amount']) ? $invoice_details['total_amount'] : '') : '0' ?>" oninput="calculateOverallTotals()" readonly>
+                                        <input type="number" class="form-control" id="balanceAmount" name="balanceAmount" value="<?= (isset($invoice_details['status']) && $invoice_details['status'] === 'Draft') ? (isset($invoice_details['total_amount']) ? (int)round($invoice_details['total_amount']) : '') : '0' ?>" oninput="calculateOverallTotals()" readonly min="0" step="0.001">
                                     </div>
 
                                     <div class="form-group col-md-6">
                                         <label for="paidAmount">Paid Amount</label>
-                                        <input type="number" class="form-control" id="paidAmount" name="paidAmount" value="<?= (isset($invoice_details['status']) && $invoice_details['status'] === 'Approved') ? (isset($invoice_details['total_amount']) ? $invoice_details['total_amount'] : '') : '0' ?>" oninput="calculateOverallTotals()" readonly>
+                                        <input type="number" class="form-control" id="paidAmount" name="paidAmount" value="<?= (isset($invoice_details['status']) && $invoice_details['status'] === 'Approved') ? (isset($invoice_details['total_amount']) ? (int)round($invoice_details['total_amount']) : '') : '0' ?>" oninput="calculateOverallTotals()" readonly min="0" step="0.001">
                                     </div>
                                     </div>
                                 </div>
@@ -779,10 +779,10 @@
         // cell1.innerHTML = '<input type="text" class="form-control" name="item_details[]">';
         cell1.innerHTML += '<textarea name="description[]" class="form-control" placeholder="Enter Description" id="description'+counter+'" cols="26" rows="2"  style="margin-top: 16px;border-color: lightgray;width:247px;"></textarea>';
         cell2.innerHTML = '<input type="number" class="form-control item-quantity" id="quantity' + counter + '" name="quantity[]" oninput="calculateInvoice(this,' + counter + ')" min="1">';
-        cell3.innerHTML = '<input type="number" class="form-control item-rate" id="rate' + counter + '" name="rate[]" oninput="calculateInvoice(this,' + counter + ')" min="0" step="1">';
-        cell4.innerHTML = '<input type="hidden" type="number" class="form-control item-tax" id="tax' + counter + '" name="tax[]" min="0" step="1">';
-        cell5.innerHTML = '<input type="number" class="form-control item-amount" id="amount' + counter + '" name="amount[]" min="0" step="1">';
-        cell6.innerHTML = '<input type="number" class="form-control item-discount-amount" id="item_discount_amount' + counter + '" name="discount_amount[]" oninput="calculateInvoice(this,' + counter + ')" min="0" step="1">';
+        cell3.innerHTML = '<input type="number" class="form-control item-rate" id="rate' + counter + '" name="rate[]" oninput="calculateInvoice(this,' + counter + ')" min="0" step="0.001">';
+        cell4.innerHTML = '<input type="hidden" type="number" class="form-control item-tax" id="tax' + counter + '" name="tax[]" min="0" step="0.001">';
+        cell5.innerHTML = '<input type="number" class="form-control item-amount" id="amount' + counter + '" name="amount[]" min="0" step="0.001">';
+        cell6.innerHTML = '<input type="number" class="form-control item-discount-amount" id="item_discount_amount' + counter + '" name="discount_amount[]" oninput="calculateInvoice(this,' + counter + ')" min="0" step="0.001">';
         cell7.innerHTML = '<select class="form-control item-discount-type" style=""width:12%;" id="item_discount_type' + counter + '" name="discount_type[]" oninput="calculateInvoice(this,' + counter + ')"><option value="%">%</option><option value="₹">₹</option></select>';
         cell8.innerHTML = '<input type="hidden" class="form-control" id="hiddenInvoiceChildId' + counter + '" placeholder="hidden for invoice child/item id" name="invoice_child_id[]" value=""><center><i class="fa fa-trash remove-item "></center>';
         $(newRow.querySelector('.book-select')).select2();