Merge branch 'r-1902001-01' into foodcourt

This commit is contained in:
Thein Lin Kyaw
2020-07-11 04:00:55 +06:30
99 changed files with 2085 additions and 1781 deletions

View File

@@ -1,4 +1,4 @@
<div class="container-fluid">
<div class="container-fluid m-top-100">
<div id="loading_wrapper" style="display:none;">
<div id="loading"></div>
</div>
@@ -300,12 +300,14 @@ var originalDiscount = totalDiscount;
switch (input_type) {
case 'num':
var input_value = $(this).attr("data-value");
if (parseFloat(original_value) == 0){
$('#discount-amount').val(input_value);
}
else{
$('#discount-amount').val(original_value + '' + input_value);
}
if (input_value == "." && original_value.includes(".")) {
break;
}
if (parseFloat(input_value) >= 0 && !original_value.includes(".") && (parseFloat(original_value) == 0)) {
$('#discount-amount').val(parseFloat(input_value));
} else {
$('#discount-amount').val(original_value + input_value);
}
break;
case 'add':
var input_value = $(this).attr("data-value");