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

config/locales/en.yml

@@ -71,6 +71,7 @@ en:
   bottom: "Bottom"
   payment: "Payment"
   backend: "Backend"
+  date_time: "DateTime"
 
   views:
     btn:

config/locales/mm.yml

@@ -66,6 +66,7 @@ mm:
   bottom: "အရောင်းအနဲဆုံး"
   payment: "ငွေပေးချေမှု"
   backend: "Backend"
+  date_time: "DateTime"
   
   views:
     btn:       

config/puma.rb.production

@@ -1,7 +1,6 @@
-application_path = '/home/superuser/Application/production/sxrestaurant'
+application_path = '/home/superuser/Application/sxrestaurant'
 directory application_path
-environment ENV.fetch("RAILS_ENV") { "development" }
-daemonize true
+environment ENV.fetch("RAILS_ENV") { "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"

config/routes.rb

@@ -373,6 +373,7 @@ scope "(:locale)", locale: /en|mm/ do
     resources :commission, :only => [:index, :show]
     resources :stock_check, :only => [:index, :show]
     resources :payment_method
+    resources :product_sale, :only => [:index, :show]
 
     get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date"
   end

config/secrets.yml

@@ -13,7 +13,7 @@
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
   sx_provision_url: 192.168.1.125:3002/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
 
@@ -25,7 +25,7 @@ test:
 production:
   secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
   sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api
-  server_mode: application
+  server_mode: cloud
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L