merge master

config/initializers/action_controller.rb

@@ -12,7 +12,7 @@ class ActionController::Base
         ActiveRecord::Base.establish_connection(website_connection(@license))    
         # authenticate_session_token    
         # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
-      else
+      else8
         # reconnect_default_db
         logger.info 'License is nil'
         # redirect_to root_url(:host => request.domain) + "store_error"

config/license.yml

@@ -0,0 +1,15 @@
+iv_key: rwOZKWcQho6fE4V+A2zFuQ==
+shop_name: AMZ_Test
+email: aungmyo.zaw@code2lab.com
+telephone: 
+fax: 
+address: 
+dbhost: dNzh66R80remB694OEds96OpuyZ4wmHeHFdQh0KwjYFvTInK6+pCN/y6HdbyIlqqjcBHkqPjkjzw45PznLn7hA==
+dbschema: 4vooJDxgWdFv/8V7Qx8tzR/8B8T2c5U4XvYcF+2KOoA=
+dbusername: Xc8ELRsW7N/f8KsVikMBlg==
+dbpassword: HMg+TbLxmfYrDFI4IIAd4g==
+api_token: bisryXiEnbTJlZwghAnIByQpiRUMouu
+app_token: LycQXJYBZGeCygjIEKdlBXnjIGMiMzgmt
+plan_sku: 84hdnSCgkfhvItY7uB/pPQ==
+renewable_date: 8E6Ecz8QXAMSlKZnIzn0pQ==
+plan_name: 4cMIO0n/JzGFPIccXM6u5A==

config/locales/en.yml

@@ -72,7 +72,7 @@ en:
   payment: "Payment"
   backend: "Backend"
   date_time: "DateTime"
-  dine_in_order: "Dine In Order"
+  dine_in_cashier: "Dine-in Cashier"
   quick_service: "Quick Service"
 
   views:

config/locales/mm.yml

@@ -67,7 +67,7 @@ mm:
   payment: "ငွေပေးချေမှု"
   backend: "နောက်ကွယ်"
   date_time: "ရက်စွဲအချိန်"
-  dine_in_order: "Dine In Order"
+  dine_in_cashier: "Dine-in Cashier"
   quick_service: "Quick Service"
   
   views:

config/routes.rb

@@ -78,6 +78,8 @@ scope "(:locale)", locale: /en|mm/ do
       post "check_in" => "check_in_process#check_in_process"
       post "request_time" => "check_in_process#request_time"
       post "call_waiter" => "call_waiters#index"
+      get "survey/:id" => "survey#index"
+      post "survey/:id" => "survey#create"
     end
 
     
@@ -417,8 +419,9 @@ scope "(:locale)", locale: /en|mm/ do
     resources :stock_check, :only => [:index, :show]
     resources :payment_method
     resources :product_sale, :only => [:index, :show]
-
+    get "saleitem/get_shift_by_date", to: "saleitem#show", as: "get_shift_by_sale_item"
     get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date"
+
   end
 
   # ----------- Inventory ---------------------------

config/secrets.yml

@@ -12,8 +12,13 @@
 
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
+<<<<<<< HEAD
   sx_provision_url: connect.smartsales.dev/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
   server_mode: cloud
+=======
+  sx_provision_url: connect.smartsales.asia/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
+  server_mode: application
+>>>>>>> fe01948dd322688f7d59acd0d002b569dbbd40e2
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L