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

2017-11-14 15:54:17 +06:30
parent 54f68bdfc5 f927d99807
commit 36275b55c6
41 changed files with 536 additions and 146 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -63,6 +63,7 @@ en:
  customer_details: "Customer Details"
  order_details: "Order Details"
  sale_details: "Sale Details"
+  booking_details: "Booking Details"
  inventory_definitions: "Inventory Definitions"
  sale_audits: "Sale Audits"

--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -63,6 +63,7 @@ mm:
  customer_details: "စားသုံးသူကိုယ်ရေးအသေးစိတ်"
  order_details: "မှာကြားမှုအသေးစိတ်"
  sale_details: "ရောင်းရငွေအသေးစိတ်"
+  booking_details: "ရောင်းရငွေအသေးစိတ်"
  inventory_definitions: "ကုန်လှောင်ရုံပစ္စည်းဖွင့်ဆိုချက်များ"
  sale_audits: "အရောင်းပြင်ဆင်ခြင်းများ"
  
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -335,6 +335,7 @@ scope "(:locale)", locale: /en|mm/ do
    resources :sales
    resources :orders
    resources :credit_notes
+    resources :bookings

    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"