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

config/environment.rb

@@ -3,3 +3,4 @@ require_relative 'application'
 
 # Initialize the Rails application.
 Rails.application.initialize!
+

config/initializers/assets.rb

@@ -12,7 +12,7 @@ Rails.application.config.assets.version = '1.0'
 
 # --- Waiter/ Cashier - Orgiami ----
 Rails.application.config.assets.precompile += %w( origami.css )
-Rails.application.config.assets.precompile += %w( origami.js )
+# Rails.application.config.assets.precompile += %w( origami.js )
 # -- Order Queue Station -----
 Rails.application.config.assets.precompile += %w( OQS.css )
 Rails.application.config.assets.precompile += %w( OQS.js )
@@ -22,3 +22,7 @@ Rails.application.config.assets.precompile += %w( settings.css )
 # --- Customer/ Customer - Crm ----
 Rails.application.config.assets.precompile += %w( CRM.css )
 Rails.application.config.assets.precompile += %w( CRM.js )
+
+# --- Customer/ Customer - Crm ----
+Rails.application.config.assets.precompile += %w( jquery-confirm.css )
+Rails.application.config.assets.precompile += %w( jquery-confirm.js )

config/routes.rb

@@ -44,10 +44,9 @@ Rails.application.routes.draw do
 
     #Order Controller
     resources :orders, only: [:create, :show, :update] do
-
       post "bill" => "bill#create"
-
     end
+    get 'view_orders' => "orders#view_orders"
 
     #Current active bookings
     resources :bookings, only: [:index, :show, :create, :update]
@@ -72,17 +71,24 @@ Rails.application.routes.draw do
   #--------- Cashier ------------#
   namespace :origami do
     root "home#index"
-    get "/:booking_id" => "home#index" do #origami/:booking_id will show
+    get "table/:dining_id" => "home#show" do #origami/:booking_id will show
       # resources :discounts, only: [:index,:new, :create ] #add discount type
       resources :customers #add customer type
     end
+    post 'moving' => "movetable#moving"
+
+    get 'table/:dining_id/movetable' => "movetable#move_dining"
+    get 'table/:dining_id/moveroom' => "moveroom#move_dining"
+    get 'sale/:sale_id' => 'sales#show'
+    get 'room/:room_id' => 'rooms#show'
+    get 'order/:order_id' => "orders#show"
 
     post '/:booking_id' => 'home#item_show'
 
     get "/:id/discount" => "discounts#index"
     post "/:id/discount" => "discounts#create"
 
-    get "/:id/request_bills" => "request_bills#print"
+    post "/:id/request_bills" => "request_bills#print" ,:defaults => { :format => 'json' }
     get '/:sale_id/reprint' => 'payments#reprint' ,:defaults => { :format => 'json' }
     #--------- Payment ------------#
     get 'sale/:sale_id/payment' => 'payments#show'
@@ -212,6 +218,7 @@ Rails.application.routes.draw do
   namespace :reports do
     resources :receipt_no, :only => [:index, :show]
     resources :daily_sale, :only => [:index, :show]
+    resources :sale_item, :only => [:index, :show]
     # resources :sales, :only => [:index, :show]
     # resources :orders, :only => [:index, :show]
     # resources :customers, :only => [:index, :show]