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

2018-04-12 16:25:36 +06:30
parent d800a5d28d de5bbb27f7
commit 4d95ceed75
8 changed files with 336 additions and 136 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -75,6 +75,10 @@ en:
  dine_in_cashier: "Dine-in Cashier"
  quick_service: "Quick Service"
  order_reservation: "Order & Reservation"
+  pending: "Pending"
+  processing: "Processing"
+  delivering: "Delivering"
+  completed: "Completed"

  views:
    btn:
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -70,6 +70,10 @@ mm:
  dine_in_cashier: "Dine-in Cashier"
  quick_service: "Quick Service"
  order_reservation: "Order & Reservation"
+  pending: "Pending"
+  processing: "Processing"
+  delivering: "Delivering"
+  completed: "Completed"
  
  views:
    btn: