git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull from master

Browse Source
This commit is contained in:
San Wai Lwin
2018-04-12 10:04:28 +06:30
parent 36eab44f8b
commit 4a0995c7ba
11 changed files with 486 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config/initializers/assets.rb
View File

@@ -37,7 +37,7 @@ Rails.application.config.assets.precompile += %w( CRM.js )
# --- Image Uploader ----
Rails.application.config.assets.precompile += %w( fileinput.min.js )
# --- Customer/ Customer - Crm ----
# --- Add order/ Add order - Crm ----
Rails.application.config.assets.precompile += %w( addorder.css )
Rails.application.config.assets.precompile += %w( addorder.js )
@@ -53,4 +53,9 @@ Rails.application.config.assets.precompile += %w( sx-sidebar.css )
Rails.application.config.assets.precompile += %w( inventory_definitions.css )
Rails.application.config.assets.precompile += %w( inventory.js )
# --- Customer/ Customer - Crm ----
Rails.application.config.assets.precompile += %w( order_reservation.css )
Rails.application.config.assets.precompile += %w( order_reservation.js )

3
config/routes.rb
View File

@@ -266,6 +266,9 @@ scope "(:locale)", locale: /en|mm/ do
#order and reservation
resources :order_reservation
get 'order_reservation/get_order/:id' => "order_reservation#get_order",:as => "get_order", :defaults => { :format => 'json' }
post 'order_reservation/update', to: "order_reservation#update" , :defaults => { :format => 'json' }
end
#--------- Waiter/Ordering Station ------------#