Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001

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,6 +88,7 @@ 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
 
@@ -238,7 +239,7 @@ scope "(:locale)", locale: /en|mm/ do
     get '/addorders/get_menu_sub_category/:id' => "addorders#get_menu_sub_category",:as => "get_menu_sub_category", :defaults => { :format => 'json' }
     get '/addorders/products/list' => "addorders#get_all_product",:as => "get_all_product", :defaults => { :format => 'json' }
 
-    get '/:addorders/:id' => "addorders#detail"
+    # match '/:addorders/:id' => "addorders#detail", via: [:post, :get]
     post '/:addorders/create' => "addorders#create",:as => "addorder_create", :defaults => { :format => 'json' }
     
 
@@ -446,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