remove confilct data

config/initializers/action_controller.rb

@@ -8,7 +8,7 @@ class ActionController::Base
       from = request.subdomain.downcase  + "." + request.domain.downcase    
       @license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase
       if (!@license.nil?)
-        logger.info "Location - " + @license.dbhost        
+        logger.info "Location - " + @license.dbschema        
         ActiveRecord::Base.establish_connection(website_connection(@license))    
         # authenticate_session_token    
         # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
@@ -97,7 +97,7 @@ class ActionController::API
       from = request.subdomain.downcase  + "." + request.domain.downcase    
       @license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase
       if (!@license.nil?)
-        # logger.info "Location - " + @license.dbhost     
+        logger.info "Location - " + @license.dbschema       
         ActiveRecord::Base.establish_connection(website_connection(@license))    
         # authenticate_session_token    
         # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema

config/locales/en.yml

@@ -79,6 +79,7 @@ en:
   processing: "Processing"
   delivering: "Delivering"
   completed: "Completed"
+  processed: "Processed"
 
   views:
     btn:
@@ -435,7 +436,7 @@ en:
         item: "Item"
         revenue: "Revenue"
         total_price_by: "Total Price By"
-        sub_total: "Sub Total"
+        sub_totalိိ: "Sub Total"
         cash_received: "Cash Received"
         card_sales: "Card Sales"
         select_payments: "Select Payments"
@@ -470,6 +471,15 @@ en:
         adult: "Adult"
         foreigner: "Foreigner"
         local: "Local"
+        order_reservation_report: "Order Reservation"
+        requested_time: "Requested Time"
+        provider: "Provider"
+        delivery_fee: "Delivery Fee"
+        delivery_tax: "Delivery Tax"
+        convenience_charge: "Convenience Charge"
+        convenience_tax: "Convenience Tax"
+        commercial_tax: "Commercial Tax"
+        select_providers: "Select Providers"
         
         code_txt: "code "
         charge_txt: "charge"

config/locales/mm.yml

@@ -74,6 +74,7 @@ mm:
   processing: "Processing"
   delivering: "Delivering"
   completed: "Completed"
+  processed: "Processed"
   
   views:
     btn:       
@@ -464,6 +465,15 @@ mm:
         adult: "လူကြီး"
         foreigner: "နိုင်ငံခြားသား"
         local: "နိုင်ငံသား"
+        order_reservation_report: "ၾကိဳတင္ order မွာယူျခင္း"
+        requested_time: "Requested Time"
+        provider: "Provider"
+        delivery_fee: "Delivery Fee"
+        delivery_tax: "Delivery Tax"
+        convenience_charge: "Convenience Charge"
+        convenience_tax: "Convenience Tax"
+        commercial_tax: "Commercial Tax"
+        select_providers: "Select Providers"
         
         code_txt: "ကုတ်ဒ် "
         charge_txt: "ကောက်ခံသည်"

config/routes.rb

@@ -88,18 +88,23 @@ scope "(:locale)", locale: /en|mm/ do
     namespace :order_reserve do
       post "customer" => "order_reservation#check_customer"
       post "order" => "order_reservation#create"
+      post "callback/:id" => "order_reservation#update_status"
     end
   end
 
   #--------- Cashier ------------#
   namespace :origami do    
 
+    post '/check_emp_access_code/:code' => 'home#check_emp_access_code', :defaults => { :format => 'json' }
+
     get "dashboard" => "dashboard#index" 
+    get "get_all_menu" => "dashboard#get_all_menu" 
 
     get "quick_service" => "quick_service#index"
     
     get "quick_service/pending_order" => "pending_order#index"
     get "quick_service/pending_order/:sale_id" => "pending_order#show"
+    get "quick_service/completed_sale/:sale_id" => "pending_order#completed_sale"
 
     get "quick_service/modify_order/:id/:sale_id" => "quick_service#modify_order"
     get "quick_service/modify_order/:sale_id" => "quick_service#modify_order"
@@ -274,6 +279,9 @@ scope "(:locale)", locale: /en|mm/ do
     get 'order_reservation/get_order/:id' => "order_reservation#get_order",:as => "get_order", :defaults => { :format => 'json' }
     post 'order_reservation/update', to: "order_reservation#update" , :defaults => { :format => 'json' }
     post 'order_reservation/send_status', to: "order_reservation#send_status", :defaults => { :format => 'json' }
+
+    
+
   end
 
   #--------- Waiter/Ordering Station ------------#
@@ -439,6 +447,7 @@ scope "(:locale)", locale: /en|mm/ do
     resources :order_reservation, :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"
+    get "order_reservation/get_shift_by_date", to: "order_reservation#show", as: "get_shift_by_order_reservation"
 
   end
 

config/schedule.rb

@@ -12,4 +12,16 @@ end
 
 every 1.minutes do
   runner "DiningFacility.checkin_time"
+end
+
+every 10.minutes do
+  runner "OrderReservation.check_new_order"
+end
+
+every 10.minutes do
+  runner "OrderReservation.check_order_send_to_kitchen"
+end
+
+every 10.minutes do
+  runner "OrderReservation.check_order_ready_to_delivery"
 end

config/shops.json

@@ -13,6 +13,20 @@
         "key": "634W2ioj6QA88vafKamHBRu5aKX/BLIPdTWuuXGFBsA=\n",
         "iv": "QqpO/h7o60dYTbNETRbZ4g==\n"
       }
+    },
+    {
+      "lookup": "order-111.pos-myanmar.test",
+      "value": {
+        "key": "7NA6WkE58MZ56w6CUPEyUN5ZlWzuidRDkc2ao6LeHTs=\n",
+        "iv": "B94kSYIdH6ff8s1ltQzB1Q==\n"
+      }
+    },
+    {
+      "lookup": "aungcafe-212.pos-myanmar.test",
+      "value": {
+        "key": "DvPxzB6QjHNnfuxBz6rdOuSn0/5TkckwCu3jNv0geHY=\n",
+        "iv": "pJ5k8JKbfti70KQoLZCm/Q==\n"
+      }
     }
   ]
 }