Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

app/assets/javascripts/CRM.js

@@ -18,4 +18,5 @@
 //= require cable
 //= require jquery-ui
 //= require bootstrap-datepicker
-//= require bootstrap/modal
+//= require bootstrap/modal
+

app/assets/javascripts/OQS.js

@@ -11,6 +11,7 @@
 // about supported directives.
 //
 //= require jquery
+//= require tether
 //= require bootstrap
 //= require jquery_ujs
 //= require turbolinks

app/controllers/api/bill_controller.rb

@@ -28,6 +28,10 @@ class Api::BillController < Api::ApiController
       @status = false
       @error_message = "No Current Open Shift"
     end
+
+    #@sale_data = Sale.find_by_sale_id(@sale_id)
+    #@sale_items = SaleItem.where("sale_id=?",@sale_id)
+
 # Not Use for these printed bill cannot give customer
     # @sale_data = Sale.find_by_sale_id(@sale_id)
     # @sale_items = SaleItem.where("sale_id=?",@sale_id)
@@ -47,11 +51,12 @@ class Api::BillController < Api::ApiController
     # # Calculate Price by accounts
     # item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items)
 
+    #customer= Customer.find(@sale_data.customer_id)
+    # get member information
+    #member_info = Customer.get_member_account(customer)
 
     # printer = Printer::ReceiptPrinter.new(print_settings)
     # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts, member_info, shop_details)
-
-
   end
 
 

config/environments/production.rb

@@ -17,7 +17,7 @@ Rails.application.configure do
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
-  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
+  #config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

config/puma.rb

@@ -1,47 +1,9 @@
-# Puma can serve each request in a thread from an internal thread pool.
-# The `threads` method setting takes two numbers a minimum and maximum.
-# Any libraries that use thread pools should be configured to match
-# the maximum value specified for Puma. Default is set to 5 threads for minimum
-# and maximum, this matches the default thread size of Active Record.
-#
-threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i
-threads threads_count, threads_count
-
-# Specifies the `port` that Puma will listen on to receive requests, default is 3000.
-#
-port        ENV.fetch("PORT") { 3000 }
-
-# Specifies the `environment` that Puma will run in.
-#
-environment ENV.fetch("RAILS_ENV") { "development" }
-
-# Specifies the number of `workers` to boot in clustered mode.
-# Workers are forked webserver processes. If using threads and workers together
-# the concurrency of the application would be max `threads` * `workers`.
-# Workers do not work on JRuby or Windows (both of which do not support
-# processes).
-#
-# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
-
-# Use the `preload_app!` method when specifying a `workers` number.
-# This directive tells Puma to first boot the application and load code
-# before forking the application. This takes advantage of Copy On Write
-# process behavior so workers use less memory. If you use this option
-# you need to make sure to reconnect any threads in the `on_worker_boot`
-# block.
-#
-# preload_app!
-
-# The code in the `on_worker_boot` will be called if you are using
-# clustered mode by specifying a number of `workers`. After each worker
-# process is booted this block will be run, if you are using `preload_app!`
-# option you will want to use this block to reconnect to any threads
-# or connections that may have been created at application boot, Ruby
-# cannot share connections between processes.
-#
-# on_worker_boot do
-#   ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
-# end
-
-# Allow puma to be restarted by `rails restart` command.
-plugin :tmp_restart
+application_path = '/home/superuser/Application/production/sxrestaurant'
+directory application_path
+environment 'production'
+daemonize true
+pidfile "#{application_path}/tmp/pids/puma.pid"
+state_path "#{application_path}/tmp/pids/puma.state"
+stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
+bind 'tcp://0.0.0.0:9292'
+workers 2

config/puma.rb.save

@@ -0,0 +1,9 @@
+lapplication_path = '/home/superuser/Application/production/sxrestaurant'
+directory application_path
+environment 'production'
+daemonize true
+pidfile "#{application_path}/tmp/pids/puma.pid"
+state_path "#{application_path}/tmp/pids/puma.state"
+stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
+bind 'tcp://0.0.0.0:9292'
+workers 2

config/secrets.yml

@@ -19,4 +19,5 @@ test:
 # Do not keep production secrets in the repository,
 # instead read values from the environment.
 production:
-  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
+  secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22
+

config/sidekiq.yml

@@ -1,7 +1,6 @@
----
 :concurrency: 25
-:pidfile: ./tmp/pids/sidekiq.pid
-:logfile: ./log/sidekiq.log
+:pidfile: /home/superuser/Application/production/sxrestaurant/tmp/pids/sidekiq.pid
+:logfile: /home/superuser/Application/production/sxrestaurant/log/sidekiq.log
 :queues:
   - default
   - [high_priority, 2]