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 87e22f1d..3ad69d64 100644 Binary files a/dump.rdb and b/dump.rdb differ 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