Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring

config/application.rb

@@ -6,6 +6,8 @@ require 'rails/all'
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 
+require 'carrierwave/orm/activerecord'
+
 module SXRestaurants
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.

config/initializers/assets.rb

@@ -19,6 +19,9 @@ Rails.application.config.assets.precompile += %w( OQS.js )
 
 Rails.application.config.assets.precompile += %w( settings.css )
 
+# --- Image Uploader ----
+Rails.application.config.assets.precompile += %w( fileinput.min.css )
+
 # --- Customer/ Customer - Crm ----
 Rails.application.config.assets.precompile += %w( CRM.css )
 Rails.application.config.assets.precompile += %w( CRM.js )
@@ -26,3 +29,6 @@ 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 )
+
+# --- Image Uploader ----
+Rails.application.config.assets.precompile += %w( fileinput.min.js )

config/initializers/carrier_wave.rb

@@ -0,0 +1 @@
+require 'carrierwave/orm/activerecord'

config/routes.rb

@@ -30,11 +30,12 @@ Rails.application.routes.draw do
     namespace :restaurant do
       get 'zones' => "zones#index"
       resources :menu, only:[:index, :show]
-      resources :menu_categories, only: [:index]
+      resources :menu_categories, only: [:index, :show]
       resources :menu_items, only: [:index, :show]
       resources :menu_item_attributes, only: [:index]
       resources :menu_item_options, only: [:index]
       resources :menu_sold_out, only: [:index]
+      get "item_sets" => "item_sets#index"
     end
 
     #User request move table or bills
@@ -131,6 +132,7 @@ Rails.application.routes.draw do
     get 'sale/:sale_id/first_bill' => 'payments#first_bill', :defaults => { :format => 'json' }
     get 'sale/:sale_id/payment' => 'payments#show'
 
+    post 'payment/foc' => 'payments#foc', :defaults => { :format => 'json' }
     post 'payment/cash' => 'payments#create'
     post 'payment/mpu' => "mpu#create"
     post 'payment/jcb' => "jcb#create"
@@ -163,7 +165,12 @@ Rails.application.routes.draw do
     get '/:sale_id/customers', to: "customers#add_customer"
     get '/:customer_id/get_customer' => 'home#get_customer',:as => "show_customer_details"
     post '/:sale_id/update_sale' , to: "customers#update_sale_by_customer" # update customer id in sale table
+
     post '/:sale_id/get_customer' => "customers#get_customer"
+
+    resources :addorders
+    resources :commissions
+    resources :commissioners
   end
 
   #--------- Waiter/Ordering Station ------------#
@@ -201,6 +208,8 @@ Rails.application.routes.draw do
     # Pass assigned_order_item_id
     get 'print/print/:id', to: "print#print"
     get 'print/print_order_summary/:id', to: "print#print_order_summary"
+
+    get "/get_items/:id" =>"home#get_items_by_oqs", :as => "get_order_items_by_oqs"
     #dashboard
     #
   end
@@ -215,6 +224,10 @@ Rails.application.routes.draw do
       resources :menu_categories, only: [:new, :create, :edit,:delete]
     end
 
+    resources :item_sets
+
+    resources :menu_item_sets
+
     #accounts
     resources :accounts
 
@@ -313,6 +326,6 @@ Rails.application.routes.draw do
 
   #----------- Print Setup --------#
   resources :print_settings
-
+  resources :commissioners
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 end