git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some changes for order reservation

Browse Source
This commit is contained in:
phyusin
2018-09-06 11:45:24 +06:30
parent 6af0c40456
commit 1f03a19d5b
12 changed files with 216 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/locales/en.yml
View File

@@ -76,7 +76,7 @@ en:
date_time: "DateTime"
dine_in_cashier: "Dine-in Cashier"
quick_service: "Quick Service"
order_reservation: "Order & Reservation"
order_reservation: "Online Order"
pending: "Pending"
processing: "Processing"
delivering: "Delivering"
@@ -479,7 +479,7 @@ en:
adult: "Adult"
foreigner: "Foreigner"
local: "Local"
order_reservation_report: "Order Reservation"
order_reservation_report: "Online Order"
requested_time: "Requested Time"
provider: "Provider"
delivery_fee: "Delivery Fee"
@@ -489,7 +489,7 @@ en:
convenience_tax: "Convenience Tax"
commercial_tax: "Commercial Tax"
select_providers: "Select Providers"
order_reservation: "Order Reservation"
order_reservation: "Online Order"
cooking_time: "Cooking Time"
township: "Township"
induty_report: "Induty Report"

6
config/locales/mm.yml
View File

@@ -71,7 +71,7 @@ mm:
date_time: "ရက်စွဲအချိန်"
dine_in_cashier: "Dine-in Cashier"
quick_service: "Quick Service"
order_reservation: "Order & Reservation"
order_reservation: "Online Order မွာယူျခင္း"
pending: "Pending"
processing: "Processing"
delivering: "Delivering"
@@ -473,7 +473,7 @@ mm:
adult: "လူကြီး"
foreigner: "နိုင်ငံခြားသား"
local: "နိုင်ငံသား"
order_reservation_report: "ၾကိဳတင္ order မွာယူျခင္း"
order_reservation_report: "online order မွာယူျခင္း"
requested_time: "Requested Time"
provider: "Provider"
delivery_fee: "Delivery Fee"
@@ -483,7 +483,7 @@ mm:
convenience_tax: "Convenience Tax"
commercial_tax: "Commercial Tax"
select_providers: "Select Providers"
order_reservation: "Order Reservation"
order_reservation: "online order မွာယူျခင္း"
cooking_time: "Cooking Time"
township: "Township"
induty_report: "Induty Report"

1
config/routes.rb
View File

@@ -288,6 +288,7 @@ 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' }
get 'get_order_info', to: "order_reservation#get_order_info", :as => "get_order_info", :defaults => { :format => 'json' }
#credit payment routes
post '/:type/credit_sales' => "dashboard#get_credit_sales", :as => "get_credit_sales", :defaults => { :format => 'json' }