From 460ed991af0008b6fafcd7c390ec785226b73a87 Mon Sep 17 00:00:00 2001 From: San Wai Lwin Date: Fri, 6 Apr 2018 18:16:20 +0630 Subject: [PATCH 1/2] Edit Addorder.js and Shop name --- app/assets/javascripts/addorder.js | 4 ---- app/assets/stylesheets/login.scss | 4 ++-- app/views/layouts/login.html.erb | 7 +++++++ app/views/layouts/login_dashboard.html.erb | 4 ++-- config/secrets.yml | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 9563131d..e49f7446 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -409,11 +409,7 @@ $(function() { +'' $(".selected-set-list").append(set); }else{ -<<<<<<< HEAD - swal("Alert !", 'Maximum Qty is ' + max_qty + " items", "warning"); -======= swal("Alert !", 'Maximum Select is ' + max_qty + " items", "warning"); ->>>>>>> 8217b7c2f27f5b38b27425929d01b789da0583fd } // } $('#set_unit_price').text(price); diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss index aa743e4b..a1058d25 100755 --- a/app/assets/stylesheets/login.scss +++ b/app/assets/stylesheets/login.scss @@ -105,7 +105,7 @@ /* Shop Name in Login Page */ .current-shop-name{ color : #FFFFFF; - font-size: 25px; + font-size: 21px; font-weight: bold; - margin : 0 0 25px 0; + margin : 0 0 20px 0; } \ No newline at end of file diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index e83a11d0..d6c6c955 100755 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -79,6 +79,13 @@ Version - 1.0.1

+
+
+
+ <%= shop_detail.name %> +
+
+
<%= simple_form_for(@login_form, url: login_path, method: "post") do |f| %>
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb index c660d906..5db72f79 100755 --- a/app/views/layouts/login_dashboard.html.erb +++ b/app/views/layouts/login_dashboard.html.erb @@ -67,8 +67,8 @@
-
- <%= shop_detail.name %> +
+ <%= shop_detail.name %>
diff --git a/config/secrets.yml b/config/secrets.yml index 111e1843..076b6691 100755 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -13,7 +13,7 @@ development: secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61 sx_provision_url: connect.smartsales.dev/api #connect.smartsales.dev/api #connect.smartsales.asia/api #provision.zsai.ws/api - server_mode: cloud + server_mode: application cipher_type: AES-256-CBC sx_key: Wh@t1$C2L From 74aa6caaab0d11b21b88350d8dd5e319d9d8b679 Mon Sep 17 00:00:00 2001 From: San Wai Lwin Date: Fri, 6 Apr 2018 18:19:47 +0630 Subject: [PATCH 2/2] For pull --- app/controllers/base_origami_controller.rb | 25 ++++--- app/controllers/origami/home_controller.rb | 11 +-- app/models/printer/cashier_station_printer.rb | 10 ++- app/models/printer/order_queue_printer.rb | 56 ++++++++++---- app/models/printer/receipt_printer.rb | 75 ++++++++++++++----- app/views/origami/home/index.html.erb | 4 + ...0180406080240_create_order_reservations.rb | 26 +++++++ ...06080359_create_order_reservation_items.rb | 25 +++++++ .../20180406080436_create_deliveries.rb | 18 +++++ 9 files changed, 197 insertions(+), 53 deletions(-) create mode 100644 db/migrate/20180406080240_create_order_reservations.rb create mode 100644 db/migrate/20180406080359_create_order_reservation_items.rb create mode 100644 db/migrate/20180406080436_create_deliveries.rb diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb index b627ae01..86fb4ec3 100755 --- a/app/controllers/base_origami_controller.rb +++ b/app/controllers/base_origami_controller.rb @@ -16,8 +16,19 @@ class BaseOrigamiController < ActionController::Base end def check_user - if current_user.nil? - redirect_to root_path + token_status = false + authenticate_with_http_token do |token, options| + if token + token_status = true + session[:webview] = true + session[:session_token] = token + end + end + + if !token_status + if current_user.nil? + redirect_to root_path + end end end @@ -38,13 +49,9 @@ class BaseOrigamiController < ActionController::Base #check webview def check_mobile status = false - authenticate_with_http_token do |token, options| - if token - session[:webview] = true - end - session[:session_token] = token - end - + puts "check mobile" + puts session[:session_token] + puts session[:webview] if session[:webview] && request.user_agent =~ /android|blackberry|iphone|ipad|ipod|iemobile|mobile|webos/i status = true end diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 5ed006a1..8e00ef80 100755 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -3,11 +3,7 @@ class Origami::HomeController < BaseOrigamiController before_action :set_dining, only: [:show] def index - @webview = false - if check_mobile - @webview = true - end - + @webview = check_mobile @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d')) @@ -19,10 +15,7 @@ class Origami::HomeController < BaseOrigamiController # origami table detail def show - @webview = false - if check_mobile - @webview = true - end + @webview = check_mobile @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb index d4817346..63239cdc 100755 --- a/app/models/printer/cashier_station_printer.rb +++ b/app/models/printer/cashier_station_printer.rb @@ -8,7 +8,10 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker #Print pdf = CashierStationOpening.new pdf.render_file "tmp/cashier_station_#{order_id}_closing_#{time}.pdf" - self.print("tmp/cashier_station_#{order_id}_closing_#{time}.pdf") + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print("tmp/cashier_station_#{order_id}_closing_#{time}.pdf") + end end # def print_close_cashier(receipt_no) @@ -59,7 +62,10 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker end pdf.render_file filename - self.print(filename, cashier_terminal.printer_name) + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(filename, cashier_terminal.printer_name) + end end #sqa end diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index 4a8b1653..62e6f0a7 100755 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -39,14 +39,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker pdf.render_file filename if oqs.print_copy - self.print(filename, oqs.printer_name) + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(filename, oqs.printer_name) + end #For print copy # pdf.render_file filename.gsub(".","-copy.") # self.print(filename.gsub(".","-copy."), oqs.printer_name) else print_settings.print_copies = 1 print_settings.save! - self.print(filename, oqs.printer_name) + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(filename, oqs.printer_name) + end end # end end @@ -96,13 +102,19 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker end # pdf.render_file "tmp/order_item.pdf" pdf.render_file filename - if oqs.print_copy - self.print(filename, oqs.printer_name) - # self.print(filename.gsub(".","-copy."), oqs.printer_name) + if oqs.print_copy + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(filename, oqs.printer_name) + # self.print(filename.gsub(".","-copy."), oqs.printer_name) + end else print_settings.print_copies = 1 print_settings.save! - self.print(filename, oqs.printer_name) + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(filename, oqs.printer_name) + end end #end end @@ -130,14 +142,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker pdf.render_file filename if oqs.print_copy - self.print(filename, oqs.printer_name) + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(filename, oqs.printer_name) + end #For print copy # pdf.render_file filename.gsub(".","-copy.") # self.print(filename.gsub(".","-copy."), oqs.printer_name) else print_settings.print_copies = 1 print_settings.save! - self.print(filename, oqs.printer_name) + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(filename, oqs.printer_name) + end end end end @@ -183,15 +201,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker pdf.render_file filename if oqs.print_copy - self.print(filename, oqs.printer_name) - + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(filename, oqs.printer_name) + end #For print copy # pdf.render_file filename.gsub(".","-copy.") # self.print(filename.gsub(".","-copy."), oqs.printer_name) else print_settings.print_copies = 1 print_settings.save! - self.print(filename, oqs.printer_name) + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(filename, oqs.printer_name) + end end #end end @@ -219,15 +242,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker pdf.render_file filename if oqs.print_copy - self.print(filename, oqs.printer_name) - + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(filename, oqs.printer_name) + end #For print copy # pdf.render_file filename.gsub(".","-copy.") # self.print(filename.gsub(".","-copy."), oqs.printer_name) else print_settings.print_copies = 1 print_settings.save! - self.print(filename, oqs.printer_name) + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(filename, oqs.printer_name) + end end end end diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb index 26c31c6f..8562fca6 100755 --- a/app/models/printer/receipt_printer.rb +++ b/app/models/printer/receipt_printer.rb @@ -24,7 +24,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker end end pdf.render_file "tmp/order_item_queue_#{order_id}_#{order_item_id}" + ".pdf" - self.print("tmp/receipt.pdf") + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print("tmp/receipt.pdf") + end end def print_receipt_payment_by_card(booking_id) @@ -52,8 +55,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker end end pdf.render_file filename - - self.print(filename) + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(filename) + end end def print_receipt_payment_by_account(sale_id) @@ -81,8 +86,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker end end pdf.render_file filename - - self.print(filename) + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(filename) + end end def print_receipt_payment_by_vochure(sale_id) @@ -110,8 +117,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker end end pdf.render_file filename - - self.print(filename) + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(filename) + end end def print_receipt_payment_by_giftcard(sale_id) @@ -139,8 +148,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker end end pdf.render_file filename - - self.print(filename) + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(filename) + end end def print_receipt_payment_by_foc(sale_id) @@ -168,8 +179,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker end end pdf.render_file filename - - self.print(filename) + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(filename) + end end #Bill Receipt Print @@ -205,13 +218,19 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker filename = directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf" pdf.render_file filename if printed_status != 'Paid' - self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf", cashier_terminal.printer_name) + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}.pdf", cashier_terminal.printer_name) + end end else filename = directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf" pdf.render_file filename if printed_status != 'Paid' - self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf", cashier_terminal.printer_name) + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(directory_name + "/receipt_bill_#{sale_data.receipt_no}_#{count}.pdf", cashier_terminal.printer_name) + end end end @@ -225,7 +244,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker def print_stock_check_result(print_settings,stockcheck, stockcheck_items,checker_name, shop_details) pdf = StockResultPdf.new(print_settings,stockcheck, stockcheck_items,checker_name, shop_details) pdf.render_file "tmp/print_stock_check_result.pdf" - self.print("tmp/print_stock_check_result.pdf") + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print("tmp/print_stock_check_result.pdf") + end end #Queue No Print @@ -235,7 +257,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker #Print pdf = QueueNoPdf.new(printer_settings,queue) pdf.render_file "tmp/print_queue_no.pdf" - self.print("tmp/print_queue_no.pdf") + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print("tmp/print_queue_no.pdf") + end end #Move Table Print @@ -255,7 +280,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker #Print pdf = CrmOrderPdf.new(booking,order_items,setting) pdf.render_file "tmp/print_crm_order.pdf" - self.print("tmp/print_crm_order.pdf") + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print("tmp/print_crm_order.pdf") + end end #Queue No Print @@ -265,7 +293,10 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker #Print pdf = CallWaiterPdf.new(printer_settings,table,time,shop_detail) pdf.render_file "tmp/print_call_waiter.pdf" - self.print("tmp/print_call_waiter.pdf") + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print("tmp/print_call_waiter.pdf") + end end #print receipt pdf from js @@ -276,10 +307,16 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker # else begin if count == 1 - self.print(filename, printer_name) + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(filename, printer_name) + end else filename = "public/receipts/receipt_bill_#{receipt_no}_#{count}.pdf" - self.print(filename, printer_name) + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(filename, printer_name) + end end count -= 1 diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 38f0cc79..5e280697 100755 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -140,7 +140,11 @@