update add order

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

@@ -80,6 +80,7 @@ Rails.application.routes.draw do
     post 'moving' => "movetable#moving"
     get "/table/:table_id/sale/:sale_id/edit" => "sale_edit#edit"
     post 'item_void' => "sale_edit#item_void"
+    post 'item_foc' => "sale_edit#item_foc"
     post 'item_edit' => "sale_edit#item_edit"
     post 'item_void_cancel' => "sale_edit#item_void_cancel"
     post 'cancel_all_void' => 'sale_edit#cancel_all_void'
@@ -130,6 +131,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"
@@ -137,6 +139,7 @@ Rails.application.routes.draw do
     post 'payment/visa' => "visa#create"
     post 'payment/paypar' => 'paypar_payments#create'
     post 'payment/credit' => 'credit_payments#create'
+    post 'payment/voucher' => 'voucher_payments#create'
 
     get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index"
     get 'sale/:sale_id/payment/others_payment' => "others_payments#index"
@@ -145,6 +148,7 @@ Rails.application.routes.draw do
     get 'sale/:sale_id/payment/others_payment/Master' => "master#index"
     get 'sale/:sale_id/payment/others_payment/JCB' => "jcb#index"
     get 'sale/:sale_id/payment/others_payment/Redeem' => "redeem_payments#index"
+    get 'sale/:sale_id/payment/others_payment/Voucher' => "voucher#index"
 
     #---------Void --------------#
     post 'sale/:sale_id/void' => 'void#overall_void'
@@ -161,6 +165,8 @@ Rails.application.routes.draw do
     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
   end
 
@@ -199,6 +205,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
@@ -213,6 +221,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
 
@@ -254,9 +266,13 @@ Rails.application.routes.draw do
     #zones
     resources :zones do
       #tables
-      resources :tables
+      resources :tables do
+        resources :dining_charges
+      end
       #rooms
-      resources :rooms
+      resources :rooms do
+        resources :dining_charges
+      end
     end
 
   end
@@ -278,14 +294,10 @@ Rails.application.routes.draw do
     resources :dailysale, :only => [:index, :show]
     resources :saleitem, :only => [:index, :show]
     resources :shiftsale, :only => [:index, :show]
+    resources :credit_payment, :only => [:index, :show]
+    resources :void_sale, :only => [:index, :show]
 
     get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date"
-    # resources :sales, :only => [:index, :show]
-    # resources :orders, :only => [:index, :show]
-    # resources :customers, :only => [:index, :show]
-    # resources :products,  :only => [:index, :show]
-    # resources :inventory, :only => [:index, :show]
-    # resources :employees, :only => [:index, :show]
   end
 
   #mount_compendium at: '/report' #, controller: 'reports'