git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update conflix for request bill

Browse Source
This commit is contained in:
Aung Myo
2018-02-20 16:24:06 +06:30
parent b0cc934625 98c4737a2a
commit 4ebe353182
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/addorder.js
View File

@@ -113,7 +113,7 @@ $(function() {
instances = menu_items[field].instances ; instances = menu_items[field].instances ;
if (!instances.length > 0) { 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) { if (instances.length > 0) {
qty = 1; qty = 1;

1
app/controllers/origami/request_bills_controller.rb
View File

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

6
app/views/origami/payments/show.html.erb
View File

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