The-Mechanic/the_mechanic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX_service_form_issue:ss

Browse Source
This commit is contained in:
sriramv 2024-05-11 15:34:00 +05:30
parent 0ecf7897b6
commit 33f453adf5
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/Jobcard.php
View File

@ -108,7 +108,6 @@ class Jobcard extends BaseController
$totalAmount += $product["labour_amount"]; $totalAmount += $product["labour_amount"];
$totalTax = $product["tax"]; $totalTax = $product["tax"];
} }
// Calculate total // Calculate total
$total = $totalAmount + $totalTax; $total = $totalAmount + $totalTax;
@ -370,7 +369,6 @@ class Jobcard extends BaseController
public function add_jobs() public function add_jobs()
{ {
// echo json_encode($this->request->getPost());die;
// echo $this->request->getPost('products');die; // echo $this->request->getPost('products');die;
// echo $this->request->getPost('delete_items');die; // echo $this->request->getPost('delete_items');die;
// echo $this->request->getPost('issued_items');die; // echo $this->request->getPost('issued_items');die;

5
app/Views/invoice_pdf_template_jobcard.php
View File

@ -272,6 +272,11 @@ p {
<td colspan="3" style="text-align:center;border: 0.5px solid black;">Estimate</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;"><?= $job_card[0]['total'] ?></td>
</tr> </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> <tr>
<td colspan="10" style="border: 0.5px solid black;">Amount Chargeable (in words)</td> <td colspan="10" style="border: 0.5px solid black;">Amount Chargeable (in words)</td>
</tr> </tr>

5
app/Views/job_card_form.php
View File

@ -195,7 +195,7 @@
<div class="form-group"> <div class="form-group">
<label for="grandtotal">Discount</label> <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($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"> <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="applyDiscountBtn">Apply</button>
<button class="btn btn-outline-secondary" type="button" id="refreshDiscountBtn"> <button class="btn btn-outline-secondary" type="button" id="refreshDiscountBtn">
@ -742,6 +742,9 @@ $(window).on('load', function() {
$('#dt_amount').val(0); $('#dt_amount').val(0);
$('#dt_amount').prop('disabled', false); $('#dt_amount').prop('disabled', false);
$('#applyDiscountBtn').prop('disabled', false); $('#applyDiscountBtn').prop('disabled', false);
// Calculate amount and update amount input field
updateCalculations();
}); });
$(document).on('keyup change', '#discout_amount', function() { $(document).on('keyup change', '#discout_amount', function() {