From 33f453adf5c7ebf3fc9cdf873a7547670f4b647c Mon Sep 17 00:00:00 2001
From: sriramv <sriram.v@venbainfotech.com>
Date: Sat, 11 May 2024 15:34:00 +0530
Subject: [PATCH] FIX_service_form_issue:ss

---
 app/Controllers/Jobcard.php                | 2 --
 app/Views/invoice_pdf_template_jobcard.php | 5 +++++
 app/Views/job_card_form.php                | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/Jobcard.php b/app/Controllers/Jobcard.php
index 2290b1e..9c669c5 100644
--- a/app/Controllers/Jobcard.php
+++ b/app/Controllers/Jobcard.php
@@ -108,7 +108,6 @@ class Jobcard extends BaseController
                    $totalAmount += $product["labour_amount"];
                    $totalTax = $product["tax"];
                }
-       
                // Calculate total
                $total = $totalAmount + $totalTax;
        
@@ -370,7 +369,6 @@ class Jobcard extends BaseController
     
     public function add_jobs()
     {
-        // echo json_encode($this->request->getPost());die;
         // echo $this->request->getPost('products');die;
         // echo $this->request->getPost('delete_items');die;
         // echo $this->request->getPost('issued_items');die;
diff --git a/app/Views/invoice_pdf_template_jobcard.php b/app/Views/invoice_pdf_template_jobcard.php
index 4d0daef..3a73168 100644
--- a/app/Views/invoice_pdf_template_jobcard.php
+++ b/app/Views/invoice_pdf_template_jobcard.php
@@ -272,6 +272,11 @@ p {
             <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>
         </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;">Discount</td>
+            <td style="border: 0.5px solid black;"><?= $job_card[0]['discount'] ?></td>
+        </tr>
         <tr>
             <td colspan="10" style="border: 0.5px solid black;">Amount Chargeable (in words)</td>
         </tr>
diff --git a/app/Views/job_card_form.php b/app/Views/job_card_form.php
index 7088e27..0de94fa 100644
--- a/app/Views/job_card_form.php
+++ b/app/Views/job_card_form.php
@@ -195,7 +195,7 @@
                                     <div class="form-group">
                                         <label for="grandtotal">Discount</label>
                                         <div class="input-group">
-                                            <input type="text" class="form-control" id="dt_amount" name="discount" value="<?= isset($sales['dt_amount']) ? $sales['dt_amount'] : '' ?>">
+                                            <input type="text" class="form-control" id="dt_amount" name="discount" value="<?= isset($jobs['discount']) ? $jobs['discount'] : '' ?>">
                                             <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">
@@ -742,6 +742,9 @@ $(window).on('load', function() {
             $('#dt_amount').val(0);
             $('#dt_amount').prop('disabled', false);
             $('#applyDiscountBtn').prop('disabled', false);
+
+                // Calculate amount and update amount input field
+                updateCalculations();
         });
 
         $(document).on('keyup change', '#discout_amount', function() {