From 7c58a5a662067ab16c644c654800f202830189b2 Mon Sep 17 00:00:00 2001 From: Zoey Date: Mon, 20 May 2019 14:50:01 +0630 Subject: [PATCH] update --- 10 | 0 Can't open membership server } | 0 app/pdf/close_cashier_pdf.rb | 1 + app/pdf/crm_order_pdf.rb | 2 +- config/initializers/action_controller.rb | 10 +++++----- config/puma.rb | 20 ++++++++++---------- dump.rdb | Bin 1084 -> 810 bytes false, | 0 member_params, | 0 { | 0 10 files changed, 17 insertions(+), 16 deletions(-) delete mode 100644 10 delete mode 100644 Can't open membership server } delete mode 100644 false, delete mode 100644 member_params, delete mode 100644 { diff --git a/10 b/10 deleted file mode 100644 index e69de29b..00000000 diff --git a/Can't open membership server } b/Can't open membership server } deleted file mode 100644 index e69de29b..00000000 diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index 2a42a98d..541c6df4 100755 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -175,6 +175,7 @@ class CloseCashierPdf < Prawn::Document bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do text "#{number_with_precision(shift_sale.credit_sales, :precision => precision.to_i, :delimiter => delimiter) }", :size => self.item_font_size, :align => :right end + #start other payment details if shift_sale.other_sales > 0 other_payment.each do |other| diff --git a/app/pdf/crm_order_pdf.rb b/app/pdf/crm_order_pdf.rb index f9367907..978f7137 100755 --- a/app/pdf/crm_order_pdf.rb +++ b/app/pdf/crm_order_pdf.rb @@ -35,7 +35,7 @@ class CrmOrderPdf < Prawn::Document end header( printer_settings.printer_name, printer_settings.name) - stroke_horizontal_rule + stroke_horizontal_rule cashier_info(booking) line_items(order_items) diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb index cab8fe5d..fb212f13 100644 --- a/config/initializers/action_controller.rb +++ b/config/initializers/action_controller.rb @@ -20,11 +20,11 @@ class ActionController::Base end else # check for license file - # if check_license - # current_license(ENV["SX_PROVISION_URL"]) - # else - # redirect_to activate_path - # end + if check_license + current_license(ENV["SX_PROVISION_URL"]) + else + redirect_to activate_path + end end end diff --git a/config/puma.rb b/config/puma.rb index fbe48c81..6f7c4941 100755 --- a/config/puma.rb +++ b/config/puma.rb @@ -1,10 +1,10 @@ -#application_path="#{File.expand_path("../..", __FILE__)}" -#directory application_path -#environment ENV.fetch("RAILS_ENV") { "production" } -#environment "production" -#pidfile "#{application_path}/tmp/puma/pid" -#state_path "#{application_path}/tmp/puma/state" -#stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log" -#port ENV.fetch("PORT") { 62158 } -#workers 2 -#preload_app! +application_path="#{File.expand_path("../..", __FILE__)}" +directory application_path +# environment ENV.fetch("RAILS_ENV") { "production" } +environment "production" +pidfile "#{application_path}/tmp/puma/pid" +state_path "#{application_path}/tmp/puma/state" +stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log" +port ENV.fetch("PORT") { 62158 } +workers 2 +preload_app! diff --git a/dump.rdb b/dump.rdb index 87e22f1d49653abdc6c0f99faa01b9c718bc686f..3ad69d64503187cb2dcd180818e6aa49d528061d 100644 GIT binary patch delta 258 zcmdnPv5IYip+@+;dojN_N{drdbaPX44=J$lF#O_4%umxTC`wJtP0C3G6IcD<%sgnbk#3e0sjVuqaG4K_aB$ike6y+zU z76Tn}@H8VxcJe$XHV_RnOmeaT6Whcbjmde8QY^DxZT6kq!zj&YG4Z3=#0zY!f4=eU vFPvB?D`IGR@B{+`H`vIu#LS%3lmkp)<32FUOg_NK!ukKA9dmq+_18@R*PvJS delta 529 zcmY+9Pm9w)7>8#{n(ne|@o&4WtSy5GEA5(0nr0?m;!Oq59#m@5Ot+DwNt20CWZ9!P zG0Z{q=GBXW7eT?)y$F5*!HZ`V;Du9U{tSS% zBVc5EK6A6fnz#Zhq6E*0Hzg@c>cWG~ENDrX=CXJV>ypt`iFgdR3g(P#ba6ii*-N^r zDLGjFtbUvphc|1gKK~3#@-$^BOJK!iBRlnZ(QiO4i<&|y$pXT&674E#Hf_j%XAX+! ze8xBS6r985?aiC-A3y-4<}h>__HD=12&QJwQFPL$u7i7qRGy|D;}VZkCV7)lxNp6) z_FIq8I86A&4j3}g|2FENLNw;g9kgtYOjXwnLX}>hY->G*VAAWL$a9gY?Gaq29mMUO z_SF+^kPKY*&<~@4O?dlSYZy+3X&kf3aE45*chEmcWZpqXn!vX%o*a8S<3SXAVeIi4 zy4OMNUC4?>dkuPS`-WBj4xitTtH)%}uH-PApH^$dXA~=#8rz0SDAtJNq{&RArArxa Thz(fJzHY4^YHD(Dxg3B$uAHa^ diff --git a/false, b/false, deleted file mode 100644 index e69de29b..00000000 diff --git a/member_params, b/member_params, deleted file mode 100644 index e69de29b..00000000 diff --git a/{ b/{ deleted file mode 100644 index e69de29b..00000000