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

This commit is contained in:
Aung Myo
2018-10-05 10:21:45 +06:30
9 changed files with 118 additions and 45 deletions

View File

@@ -19,7 +19,7 @@ class ActionController::Base
render :json => [{ status: false, message: 'Invalid Access!'}]
end
else
# check for license file
check for license file
if check_license
current_license(ENV["SX_PROVISION_URL"])
else

View File

@@ -346,6 +346,7 @@ en:
inventory: "inventory"
stock_taking: "Stock Taking"
stock_check: "Stock Check"
stock_ledger: "Stock Ledger"
stock_check_report: "Stock Check Report"
min_order: "Min Order"
max_stock: "Max Stock"

View File

@@ -340,6 +340,7 @@ mm:
inventory: "ကုန်လှောင်ရုံစာရင်း"
stock_taking: "စတော့ကောက်သည်"
stock_check: "စတော့စစ်ဆေးသည်"
stock_ledger: "စတော့စစ်ဆေးသည်"
stock_check_report: "စတော့စစ်ဆေးမှုမှတ်တမ်း"
min_order: "အနည်းဆုံးမှာယူမှု"
max_stock: "အများဆုံးစတော့"

View File

@@ -523,6 +523,8 @@ scope "(:locale)", locale: /en|mm/ do
get ':inventory_definition_id/show' => 'inventory#show'
get 'get_menu_category/:id' => "stock_checks#get_menu_category",:as => "get_menu_category", :defaults => { :format => 'json' }
post 'inventory_definitions/create_inventory' => 'inventory_definitions#create_inventory'
end
#mount_compendium at: '/report' #, controller: 'reports'