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

FIX_discount_calculation_method2:ss

Browse Source
This commit is contained in:
sriramv 2024-05-11 16:08:50 +05:30
parent 33f453adf5
commit 900dfdd4ad
3 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controllers/Jobcard.php
View File

@ -111,6 +111,9 @@ class Jobcard extends BaseController
// Calculate total // Calculate total
$total = $totalAmount + $totalTax; $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 // Create single output array
$labour_data[0] = [ $labour_data[0] = [
"product_name" => "Labour Cost", "product_name" => "Labour Cost",

45
app/Views/invoice_pdf_template_jobcard.php
View File

@ -232,7 +232,13 @@ p {
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php $serialNumber = 1; ?> <?php
$serialNumber = 1;
$sub_tot = 0;
$tax = 0;
$tot = 0;
?>
<?php foreach ($job_card_products as $item) : $totalamount = 0; ?> <?php foreach ($job_card_products as $item) : $totalamount = 0; ?>
<tr> <tr>
@ -241,36 +247,53 @@ p {
</td> </td>
<td style="border: 0.5px solid black;"><?= $item['product_name'] ?></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;"><?= $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;"><?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;"><?= round($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']) ? 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']) ? $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_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_amount'] * $item['tax'] / 100)) : ($item['amount'] * $item['tax'] / 100) ?></td> <td style="border: 0.5px solid black;">
<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> <?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> </tr>
<?php endforeach; ?> <?php endforeach; ?>
<tr> <tr>
<td colspan="6" style="border-top: 0.5px solid black;border-left: 0.5px solid black;"></td> <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 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>
<tr> <tr>
<td colspan="6" style="border-left: 0.5px solid black;"></td> <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 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>
<tr> <tr>
<td colspan="6" style="border-left: 0.5px solid black;"></td> <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 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>
<tr> <tr>
<td colspan="6" style="border-left: 0.5px solid black;"></td> <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 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>
<tr> <tr>
<td colspan="6" style="border-left: 0.5px solid black;"></td> <td colspan="6" style="border-left: 0.5px solid black;"></td>

6
app/Views/job_card_form.php
View File

@ -194,15 +194,15 @@
</div> </div>
<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($jobs['discount']) ? $jobs['discount'] : '' ?>"> <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">
<span class="fas fa-sync-alt"></span> <span class="fas fa-sync-alt"></span>
</button> </button>
</div> </div>
</div> </div> -->
</div> </div>
</div> </div>