From 8e7e58f8ac5a3e12cfa63b2d4aad15591190e6d6 Mon Sep 17 00:00:00 2001 From: Aung Kyaw Phyoe Date: Thu, 7 Feb 2019 11:55:55 +0630 Subject: [PATCH 1/3] printer issue for CheckInOutPdf and header css --- app/assets/stylesheets/reset.css | 8 -------- app/models/printer/order_queue_printer.rb | 2 +- app/views/layouts/_header.html.erb | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css index 5a65a5ae..c82d7cf7 100644 --- a/app/assets/stylesheets/reset.css +++ b/app/assets/stylesheets/reset.css @@ -284,14 +284,6 @@ section.content { } /* End Reset Theme */ -/* shop name margin */ -.shop-name-margin { - text-align: center; - width: 50%; - margin: auto; -} -/* shop name margin */ - /* online order margin */ /*.online-order-margin { margin: auto; diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index b50d83f9..87f2ba1f 100755 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -352,7 +352,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker #no print in cloud server if ENV["SERVER_MODE"] != "cloud" - self.print(filename, cashier_terminal.printer_name) + self.print(filename, print_settings.printer_name) end end end diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index fbcbece1..164b6c4f 100755 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -36,7 +36,7 @@ -
+
<%= shop_detail.name %>
From 7ded9a904507a980faa5c18fb2c8ff57eea73f5a Mon Sep 17 00:00:00 2001 From: Aung Kyaw Phyoe Date: Thu, 7 Feb 2019 13:18:36 +0630 Subject: [PATCH 2/3] payment btn --- app/views/origami/payments/show.html.erb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index cde5e3d0..29d93ca7 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -721,7 +721,6 @@ $(document).ready(function(){ var sale_id = $('#sale_id').text(); window.location.replace('/origami/sale/'+sale_id+'/cashier/payment'); } - /* replace url type*/ /* start check first bill or not*/ var member_id = $('#membership_id').text(); @@ -1125,6 +1124,8 @@ $(document).ready(function(){ <% else %> $('#balance').text(parseFloat(result)); <% end %> + + show_hide_btn($('#balance').text()); } function customer_display_view(data,status) { @@ -1831,4 +1832,15 @@ $(document).ready(function(){ } },100); }); + + function show_hide_btn(balance) { + // show discount when balance is greater than 0 + // if(parseFloat(balance) > 0){ + // $("#discount").show(); + // $("#edit").show(); + // }else{ + // $("#discount").hide(); + // $("#edit").hide(); + // } + } From 3f4b09aebcdbd7f20617d08cf7ffdb60e785e3cd Mon Sep 17 00:00:00 2001 From: Aung Kyaw Phyoe Date: Fri, 8 Feb 2019 14:12:25 +0630 Subject: [PATCH 3/3] membership setting --- .../settings/promotions_controller.rb | 7 +-- app/models/customer.rb | 51 ++++++++++--------- app/models/membership_action.rb | 1 + app/models/membership_setting.rb | 2 + app/views/settings/promotions/_form.html.erb | 18 ++++--- 5 files changed, 45 insertions(+), 34 deletions(-) diff --git a/app/controllers/settings/promotions_controller.rb b/app/controllers/settings/promotions_controller.rb index 7272ab0c..123f01d8 100755 --- a/app/controllers/settings/promotions_controller.rb +++ b/app/controllers/settings/promotions_controller.rb @@ -103,9 +103,10 @@ class Settings::PromotionsController < ApplicationController arr_inst = [] item_inst = MenuItemInstance.find_by_item_instance_code(params[:item_instance_code]) if item_inst.nil? - product = Product.where("item_code = ?",params[:item_instance_code]).pluck(:name,:item_code) - res.push(product.name) - res.push(product.item_code) + product = Product.where("item_code = ?",params[:item_instance_code]) + product.each do |pdt| + res.push({pdt.item_code => pdt.name}) + end else # menu_item = item_inst.menu_item.pluck(:name,:item_code) # res.push(item_inst.item_instance_name) diff --git a/app/models/customer.rb b/app/models/customer.rb index 3c72d3bb..d5646ddd 100755 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -18,36 +18,39 @@ class Customer < ApplicationRecord paginates_per 50 def self.get_member_account(customer) - membership = MembershipSetting.find_by_membership_type("paypar_url") - memberaction = MembershipAction.find_by_membership_type("get_all_member_account") + membership = MembershipSetting.active.find_by_membership_type("paypar_url") + memberaction = MembershipAction.active.find_by_membership_type("get_all_member_account") merchant_uid = memberaction.merchant_account_id.to_s auth_token = memberaction.auth_token.to_s url = membership.gateway_url.to_s + memberaction.gateway_url.to_s # urltest =self.url_exist?(url) + if !membership.nil? && !memberaction.nil? + begin + response = HTTParty.get(url, :body => { + membership_id: customer.membership_id, + merchant_uid:merchant_uid, + type: "summary", + auth_token:auth_token + }.to_json, + :headers => { + 'Content-Type' => 'application/json', + 'Accept' => 'application/json; version=3' + }, + :timeout => 10) + rescue HTTParty::Error + response = {status: false, message: "Server Error"} + + rescue Net::OpenTimeout + response = { status: false , message: "Server Time out"} - begin - response = HTTParty.get(url, :body => { - membership_id: customer.membership_id, - merchant_uid:merchant_uid, - type: "summary", - auth_token:auth_token - }.to_json, - :headers => { - 'Content-Type' => 'application/json', - 'Accept' => 'application/json; version=3' - }, - :timeout => 10) - rescue HTTParty::Error - response = {status: false, message: "Server Error"} - - rescue Net::OpenTimeout - response = { status: false , message: "Server Time out"} + rescue OpenURI::HTTPError + response = { status: false, message: "Can't connect server"} - rescue OpenURI::HTTPError - response = { status: false, message: "Can't connect server"} - - rescue SocketError - response = { status: false, message: "Can't connect server"} + rescue SocketError + response = { status: false, message: "Can't connect server"} + end + else + response = {status: false, message: "There is no membership setting."} end Rails.logger.debug "--------Get Member Account response -------" Rails.logger.debug response.to_json diff --git a/app/models/membership_action.rb b/app/models/membership_action.rb index 93a4b3d8..dbf7c51c 100755 --- a/app/models/membership_action.rb +++ b/app/models/membership_action.rb @@ -1,2 +1,3 @@ class MembershipAction < ApplicationRecord + scope :active, -> { where(is_active: true) } end diff --git a/app/models/membership_setting.rb b/app/models/membership_setting.rb index 3b60c781..2553885d 100755 --- a/app/models/membership_setting.rb +++ b/app/models/membership_setting.rb @@ -1,3 +1,5 @@ class MembershipSetting < ApplicationRecord + scope :active, -> { where(is_active: true) } + MembershipSetting = MembershipSetting.find_by_id(1) end diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb index dc018ce3..c5b0a931 100755 --- a/app/views/settings/promotions/_form.html.erb +++ b/app/views/settings/promotions/_form.html.erb @@ -385,14 +385,18 @@ if(result.length > 0){ var iteminstlists; - $.each(arr_item_inst,function(k2,v2al){ - $("select#"+select_id).empty(); - var selected = ""; - $.each(v2al,function(k3,v3al){ - if(k3 == item_code) selected = "selected"; - iteminstlists += ""; + if(arr_item_inst instanceof Array){ + $.each(arr_item_inst,function(k2,v2al){ + $("select#"+select_id).empty(); + var selected = ""; + $.each(v2al,function(k3,v3al){ + if(k3 == item_code) selected = "selected"; + iteminstlists += ""; + }); }); - }); + }else if(arr_item_inst != ""){ + iteminstlists += ""; + } $("select#"+select_id).append(iteminstlists); $("select#"+select_id).parent().parent().siblings("div.menu_item_choose").find("select").find("option[value='"+par_item_code+"']").attr("selected","true")