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

Edit reprint

Browse Source
This commit is contained in:
San Wai Lwin
2018-06-08 11:28:01 +06:30
parent ce3ab0b0eb
commit 9bae3445d3
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -418,7 +418,7 @@ class Origami::PaymentsController < BaseOrigamiController
cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id) cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id)
end end
if ENV["SERVER_MODE"] != "cloud" #no print in cloud server # if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
unique_code = "ReceiptBillPdf" unique_code = "ReceiptBillPdf"
customer= Customer.find(saleObj.customer_id) customer= Customer.find(saleObj.customer_id)
@@ -462,7 +462,7 @@ class Origami::PaymentsController < BaseOrigamiController
# Mobile Print # Mobile Print
render :json => result.to_json render :json => result.to_json
end # end
end end
def foc def foc

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

@@ -790,7 +790,6 @@
// For Server Print - from jade // For Server Print - from jade
if ($("#server_mode").val() == "cloud") { if ($("#server_mode").val() == "cloud") {
alert("Hello");
code2lab.printFile(result.filepath.substr(6), result.printer_url); code2lab.printFile(result.filepath.substr(6), result.printer_url);
} }
location.reload(); location.reload();

2
app/views/origami/sales/show.html.erb
View File

@@ -424,7 +424,7 @@ $(document).on('click', '.access_modal', function(event){
$('#re-print').click(function() { $('#re-print').click(function() {
var sale_id = $('#sale_id').val(); var sale_id = $('#sale_id').val();
var ajax_url = '/origami/'+ sale_id + "/reprint" var ajax_url = "/origami/"+ sale_id + "/reprint"
// return false; // return false;
$.ajax({ $.ajax({
type: "GET", type: "GET",