From 900dfdd4ad3952ca086519cfcb923a9658ff12d0 Mon Sep 17 00:00:00 2001
From: sriramv <sriram.v@venbainfotech.com>
Date: Sat, 11 May 2024 16:08:50 +0530
Subject: [PATCH] FIX_discount_calculation_method2:ss

---
 app/Controllers/Jobcard.php                |  3 ++
 app/Views/invoice_pdf_template_jobcard.php | 47 ++++++++++++++++------
 app/Views/job_card_form.php                |  6 +--
 3 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/app/Controllers/Jobcard.php b/app/Controllers/Jobcard.php
index 9c669c5..8e6fe52 100644
--- a/app/Controllers/Jobcard.php
+++ b/app/Controllers/Jobcard.php
@@ -111,6 +111,9 @@ class Jobcard extends BaseController
                // Calculate total
                $total = $totalAmount + $totalTax;
        
+
+               $amt_with_tax = $totalAmount + ($totalAmount * $totalTax / 100);
+               $totalAmount = ($amt_with_tax - $data['job_card'][0]['discount']) / (1 + ($totalTax/100));
                // Create single output array
                $labour_data[0] = [
                    "product_name" => "Labour Cost",
diff --git a/app/Views/invoice_pdf_template_jobcard.php b/app/Views/invoice_pdf_template_jobcard.php
index 3a73168..b86d7e8 100644
--- a/app/Views/invoice_pdf_template_jobcard.php
+++ b/app/Views/invoice_pdf_template_jobcard.php
@@ -232,45 +232,68 @@ p {
         </tr>
     </thead>
     <tbody>
-        <?php $serialNumber = 1; ?>
+        <?php 
+            $serialNumber = 1; 
+            $sub_tot = 0;
+            $tax = 0;
+            $tot = 0;
+        ?>
+
         <?php foreach ($job_card_products as $item) : $totalamount = 0; ?>
             <tr>
                 
                 <td style="border: 1px solid black;">
                     <?= $serialNumber++; ?>
                 </td>
-
+                 
                 <td style="border: 0.5px solid black;"><?= $item['product_name'] ?></td>
-                <td style="border: 0.5px solid black;"><?php echo isset($item['custom_amount']) ? round($item['custom_amount']) : $item['amount']  ?></td>
+                <td style="border: 0.5px solid black;"><?php 
+                if(isset($item['custom_amount'])) 
+                { 
+                    echo round($item['custom_amount']) ;
+                    $sub_tot += round($item['custom_amount']); 
+                } 
+                else 
+                {
+                    echo round($item['amount']);
+                    $sub_tot += round($item['amount']); 
+                } ?></td>
                 <td style="border: 0.5px solid black;"><?= $item['qty'] ?></td>
                 <td style="border: 0.5px solid black;"><?php echo isset($item['custom_amount']) ? '-' : $item['per']  ?></td>
-                <td style="border: 0.5px solid black;"><?= $item['tax'] ?>%</td>
-                <td style="border: 0.5px solid black;"><?php echo isset($item['custom_tax']) ? $item['custom_tax'] / 2: ($item['amount'] * ($item['tax'] / 2) / 100)   ?></td>
-                <td style="border: 0.5px solid black;"><?php echo isset($item['custom_tax']) ? $item['custom_tax'] / 2: ($item['amount'] * ($item['tax'] / 2) / 100)   ?></td>
-                <td style="border: 0.5px solid black;"><?php echo isset($item['custom_tax']) ? round(($item['custom_amount'] * $item['tax'] / 100)) : ($item['amount'] * $item['tax'] / 100) ?></td>
-                <td style="border: 0.5px solid black;"><?php echo isset($item['custom_total']) ? round($item['custom_amount'] + ($item['custom_amount'] * $item['tax'] / 100)) : ($item['amount'] + ($item['amount'] * $item['tax'] / 100) ) ?></td>
+                <td style="border: 0.5px solid black;"><?= round($item['tax']) ?>%</td>
+                <td style="border: 0.5px solid black;"><?php echo isset($item['custom_tax']) ? round($item['custom_tax'] / 2) : round($item['amount'] * ($item['tax'] / 2) / 100)   ?></td>
+                <td style="border: 0.5px solid black;"><?php echo isset($item['custom_tax']) ? round($item['custom_tax'] / 2) : round($item['amount'] * ($item['tax'] / 2) / 100)   ?></td>
+                <td style="border: 0.5px solid black;">
+                <?php if(isset($item['custom_tax'])) {
+                    echo round(($item['custom_amount'] * $item['tax'] / 100));
+                    $tax+= round(($item['custom_amount'] * $item['tax'] / 100)); 
+                 } else {
+                    echo round($item['amount'] * $item['tax'] / 100);
+                    $tax+= ($item['amount'] * $item['tax'] / 100); 
+                  } ?></td>
+                <td style="border: 0.5px solid black;"><?php echo isset($item['custom_total']) ? round($item['custom_amount'] + ($item['custom_amount'] * $item['tax'] / 100)) : round($item['amount'] + ($item['amount'] * $item['tax'] / 100) ) ?></td>
 
             </tr>
         <?php endforeach; ?>
         <tr>
             <td colspan="6" style="border-top: 0.5px solid black;border-left: 0.5px solid black;"></td>
             <td colspan="3" style="text-align:center;border: 0.5px solid black;">Subtotal</td>
-            <td style="border: 0.5px solid black;"><?= $job_card[0]['subtotal'] ?></td>
+            <td style="border: 0.5px solid black;"><?= $sub_tot ?></td>
         </tr>
         <tr>
             <td colspan="6" style="border-left: 0.5px solid black;"></td>
             <td colspan="3" style="text-align:center;border: 0.5px solid black;">CGST</td>
-            <td style="border: 0.5px solid black;"><?= $job_card[0]['tax'] / 2 ?></td>
+            <td style="border: 0.5px solid black;"><?= round($tax) / 2 ?></td>
         </tr>
         <tr>
             <td colspan="6" style="border-left: 0.5px solid black;"></td>
             <td colspan="3" style="text-align:center;border: 0.5px solid black;">SGST</td>
-            <td style="border: 0.5px solid black;"><?= $job_card[0]['tax'] / 2 ?></td>
+            <td style="border: 0.5px solid black;"><?= round($tax) / 2 ?></td>
         </tr>
         <tr>
             <td colspan="6" style="border-left: 0.5px solid black;"></td>
             <td colspan="3" style="text-align:center;border: 0.5px solid black;">Estimate</td>
-            <td style="border: 0.5px solid black;"><?= $job_card[0]['total'] ?></td>
+            <td style="border: 0.5px solid black;"><?= $sub_tot + round($tax) ?></td>
         </tr>
         <tr>
             <td colspan="6" style="border-left: 0.5px solid black;"></td>
diff --git a/app/Views/job_card_form.php b/app/Views/job_card_form.php
index 0de94fa..bfce79f 100644
--- a/app/Views/job_card_form.php
+++ b/app/Views/job_card_form.php
@@ -194,15 +194,15 @@
                                     </div>   
                                     <div class="form-group">
                                         <label for="grandtotal">Discount</label>
-                                        <div class="input-group">
+                                        <!-- <div class="input-group"> -->
                                             <input type="text" class="form-control" id="dt_amount" name="discount" value="<?= isset($jobs['discount']) ? $jobs['discount'] : '' ?>">
-                                            <div class="input-group-append">
+                                            <!-- <div class="input-group-append">
                                                 <button class="btn btn-outline-secondary" type="button" id="applyDiscountBtn">Apply</button>
                                                 <button class="btn btn-outline-secondary" type="button" id="refreshDiscountBtn">
                                                     <span class="fas fa-sync-alt"></span>
                                                 </button>
                                             </div>
-                                        </div>
+                                        </div> -->
                                     </div>
                              
                                 </div>