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

update check server mode

Browse Source
This commit is contained in:
Aung Myo
2018-01-12 15:46:40 +06:30
parent 6ff3b04454
commit 0b517807f9
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/origami/payments_controller.rb
View File

@@ -20,7 +20,8 @@ class Origami::PaymentsController < BaseOrigamiController
cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id) cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
puts ENV["SERVER_MODE"]
puts "DDDDDDDDDDDDDDDDD"
# Print for First Bill to Customer # Print for First Bill to Customer
unique_code = "ReceiptBillPdf" unique_code = "ReceiptBillPdf"
#shop detail #shop detail

24
app/views/origami/home/show.html.erb
View File

@@ -396,7 +396,7 @@
<button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button> <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
<button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button> <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
<!-- <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button> --> <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
<button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button> <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
<button type="button" id="void" class="btn btn-block bg-blue waves-effect" active="<%= can? :overall_void, :void %>"> Void</button> <button type="button" id="void" class="btn btn-block bg-blue waves-effect" active="<%= can? :overall_void, :void %>"> Void</button>
@@ -571,18 +571,18 @@
}); });
}); });
// Print for first bill // Print for first bill
// $("#first_bill").on('click', function () { $("#first_bill").on('click', function () {
// var sale_id = $('#sale_id').val(); var sale_id = $('#sale_id').val();
// var ajax_url = "/origami/sale/" + sale_id + "/first_bill"; var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
// $.ajax({ $.ajax({
// type: "GET", type: "GET",
// url: ajax_url, url: ajax_url,
// success: function (result) { success: function (result) {
// location.reload(); location.reload();
// } }
// }); });
// }); });
// $('#pay').on('click', function () { // $('#pay').on('click', function () {
// var sale_id = $('#sale_id').val(); // var sale_id = $('#sale_id').val();

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

@@ -311,8 +311,7 @@
} }
payment_type = checkReceiptNoInFirstBillData(receipt_no,"payment") payment_type = checkReceiptNoInFirstBillData(receipt_no,"payment")
// console.log(jQuery.inArray("Credit", payment_type))
// console.log(payment_type)
if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){ if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
$("#credit_payment").hide(); $("#credit_payment").hide();
} else{ } else{