CHANGE_discount_calculation_method2:ss
This commit is contained in:
parent
900dfdd4ad
commit
eea6d7795c
@ -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($jobs['discount']) ? $jobs['discount'] : '' ?>">
|
<input type="number" 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">
|
||||||
@ -485,12 +485,12 @@ $(document).ready(async function() {
|
|||||||
|
|
||||||
newRow += '<option value="' + product.product_id + '" selected>' + product.pname + '</option>';
|
newRow += '<option value="' + product.product_id + '" selected>' + product.pname + '</option>';
|
||||||
newRow += '</select></td>' +
|
newRow += '</select></td>' +
|
||||||
'<td><input type="text" class="form-control rate-d-only" value="'+product.amount+'" readonly /></td>' +
|
'<td><input type="text" class="form-control rate-d-only" value="'+Math.round(product.amount)+'" readonly /></td>' +
|
||||||
'<td hidden><input hidden type="text" class="form-control item-rate" name="unit-price[]" value="' + product.amount * product.qty + '" readonly /></td>' +
|
'<td hidden><input hidden type="text" class="form-control item-rate" name="unit-price[]" value="' + Math.round(product.amount * product.qty) + '" readonly /></td>' +
|
||||||
'<td><input type="number" class="form-control item-quantity" min="0" max="'+Number(product.qty_stock)+'" value="' + product.qty + '" name="quantity[]"/></td>' +
|
'<td><input type="number" class="form-control item-quantity" min="0" max="'+Number(product.qty_stock)+'" value="' + product.qty + '" name="quantity[]"/></td>' +
|
||||||
'<td> <input type="text" class="form-control taxable-value item-tax" name="item-tax[]" value="' + product.tax + '" readonly /></td>' +
|
'<td> <input type="text" class="form-control taxable-value item-tax" name="item-tax[]" value="' + Math.round(product.tax) + '" readonly /></td>' +
|
||||||
'<td><input type="text" class="form-control total-tax-amount" value="'+total_tax_amt+'" readonly /></td>' +
|
'<td><input type="text" class="form-control total-tax-amount" value="'+Math.round(total_tax_amt)+'" readonly /></td>' +
|
||||||
'<td><input type="text" class="form-control item-amount" name="amount[]" value="' + total_wih_tax + '" readonly/></center></td>' +
|
'<td><input type="text" class="form-control item-amount" name="amount[]" value="' + Math.round(total_wih_tax) + '" readonly/></center></td>' +
|
||||||
'<td>'+
|
'<td>'+
|
||||||
action+
|
action+
|
||||||
'<input value="product" name="item_type" hidden>'+
|
'<input value="product" name="item_type" hidden>'+
|
||||||
@ -1207,6 +1207,12 @@ $(window).on('load', function() {
|
|||||||
|
|
||||||
// Update subtotal, tax, and total
|
// Update subtotal, tax, and total
|
||||||
function updateCalculations() {
|
function updateCalculations() {
|
||||||
|
maxValue = 0;
|
||||||
|
$('.lab_amt').each(function() {
|
||||||
|
maxValue += parseFloat($(this).val()) || 0;
|
||||||
|
});
|
||||||
|
$('#dt_amount').attr('max', maxValue);
|
||||||
|
|
||||||
if($('#discount_amt').val())
|
if($('#discount_amt').val())
|
||||||
{
|
{
|
||||||
discount_amt = Number($('#discount_amt').val());
|
discount_amt = Number($('#discount_amt').val());
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user