Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

2017-11-16 20:48:58 +06:30
parent 384c0f2dd2 c0733d7c48
commit f18947789c
23 changed files with 772 additions and 87 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -28,6 +28,7 @@ en:
  hourly: "Hourly"
  top: "Top"
  orders: "Orders"
+  shiftsale: "ShiftSale"
  credit: "Credit"
  bookings: "Booking"
  home: "Home"
@@ -90,6 +91,7 @@ en:
      filter: "Filter"
      del: "DEL"
      clr: "CLR"
+      assign: "ASSIGN"

      print_order_summary: "Print Order Summary"
      memeber_card: "Member Card"