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

This commit is contained in:
Yan
2017-11-16 20:48:58 +06:30
23 changed files with 772 additions and 87 deletions

View File

@@ -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"

View File

@@ -28,6 +28,7 @@ mm:
hourly: "နာရီအလိုက်"
top: "အရောင်းရဆုံး"
orders: "အော်ဒါများ"
shiftsale: "အော်ဒါများ"
bookings: "အော်ဒါများ"
credit: "အကြွေး"
home: "မူလစာမျက်နှာ"

View File

@@ -339,6 +339,7 @@ scope "(:locale)", locale: /en|mm/ do
resources :orders
resources :credit_notes
resources :bookings
resources :shift_sales
get "/sales/:sale_id/manual_complete_sale" => "manual_sales#manual_complete_sale", :as => "manual_complete_sale"
get "/sales/:sale_id/void" => "manual_sales#void", :as => "void"