reprint for cloud

This commit is contained in:
phyusin
2018-06-29 14:36:52 +06:30
parent ecfecf2e6f
commit 6fd337a8e0
3 changed files with 20 additions and 7 deletions

View File

@@ -419,7 +419,19 @@ class Origami::PaymentsController < BaseOrigamiController
end end
# if ENV["SERVER_MODE"] != "cloud" #no print in cloud server # if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf
unique_code = "ReceiptBillPdf" unique_code = "ReceiptBillPdf"
if !receipt_bill_a5_pdf.empty?
receipt_bill_a5_pdf.each do |receipt_bilA5|
if receipt_bilA5[0] == 'ReceiptBillA5Pdf'
if receipt_bilA5[1] == '1'
unique_code = "ReceiptBillA5Pdf"
else
unique_code = "ReceiptBillPdf"
end
end
end
end
customer= Customer.find(saleObj.customer_id) customer= Customer.find(saleObj.customer_id)
#shop detail #shop detail
@@ -455,6 +467,7 @@ class Origami::PaymentsController < BaseOrigamiController
filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Re-print",current_balance,card_data) filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Re-print",current_balance,card_data)
result = { result = {
:status => true,
:filepath => filename, :filepath => filename,
:printer_model => print_settings.brand_name, :printer_model => print_settings.brand_name,
:printer_url => print_settings.api_settings :printer_url => print_settings.api_settings

View File

@@ -1,5 +1,6 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
<!-- Column One --> <!-- Column One -->
<div class="col-lg-5 col-md-5 col-sm-5"> <div class="col-lg-5 col-md-5 col-sm-5">
<ul class="nav nav-tabs tab-col-teal" role="tablist"> <ul class="nav nav-tabs tab-col-teal" role="tablist">
@@ -261,7 +262,7 @@ $(document).ready(function(){
}) })
$('#reprint').on('click', function () { $('#reprint').on('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";
$.ajax({ $.ajax({
type: "GET", type: "GET",
@@ -341,7 +342,6 @@ function check_emp_access_code(access_code,type) {
url: url, url: url,
data: {}, data: {},
success: function (result) { success: function (result) {
// console.log(result);
if (result.status == true) { if (result.status == true) {
createAccessCode(code); createAccessCode(code);
$('#AccessCodeModal').modal('hide'); $('#AccessCodeModal').modal('hide');

View File

@@ -373,7 +373,7 @@ $(document).ready(function(){
$('#reprint').on('click', function () { $('#reprint').on('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";
$.ajax({ $.ajax({
type: "GET", type: "GET",