fixed minor issuse

This commit is contained in:
Aung Myo
2018-02-20 16:09:11 +06:30
parent 9ae1fb1084
commit 98c4737a2a
3 changed files with 5 additions and 7 deletions

View File

@@ -102,7 +102,7 @@ $(function() {
instances = menu_items[field].instances ;
if (!instances.length > 0) {
swal("Hello Please Check!","doesn't not have instance item in this menu items ("+ menu_items[field].name+")","warning");
swal("Hello Please Check!","Does not have instance item in this menu items ("+ menu_items[field].name+")","warning");
}
if (instances.length > 0) {
qty = 1;

View File

@@ -5,9 +5,7 @@ class Origami::RequestBillsController < ApplicationController
@sale = Sale.new
sale_order=SaleOrder.new
# if shift = ShiftSale.current_open_shift(current_user.id)
puts ShiftSale.current_shift
puts "sssssssssss"
# if shift = ShiftSale.current_open_shift(current_user.id)SSS
if !ShiftSale.current_shift.nil?
order_id = params[:id] # order_id
bk_order = BookingOrder.find_by_order_id(order_id)

View File

@@ -396,7 +396,7 @@
var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1);
var total = $('#amount_due').text();
var amt = parseFloat(total) - parseFloat(othertotal);
$('#cash').text(parseFloat(amt).toFixed(2));
$('#cash').text(parseFloat(amt).toFixed(1));
update_balance();
break;
}
@@ -485,7 +485,7 @@
$( "#loading_wrapper" ).hide();
if($('#balance').text() < 0){
swal({
title: "Information!",
title: "Payment Successful!",
text: 'Changed amount ' + $('#balance').text() * (-1),
html: true,
closeOnConfirm: false,
@@ -497,7 +497,7 @@
}else{
$('#pay').text("Pay");
swal({
title: "Information!",
title: "Payment Successful!",
text: 'Thank You !',
html: true,
closeOnConfirm: false,