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

config/routes.rb

@@ -77,12 +77,12 @@ Rails.application.routes.draw do
 
 
     get "/request_bills/:id" => "request_bills#print"
+    get "/discount/:id" => "discounts#index"
 
+    #--------- Payment ------------#
     get 'sale/:sale_id/payment' => 'payments#show'
     post 'payment_process' => 'payments#create'
     post 'paypar_payment_process' => 'paypar_payments#create'
-
-
     get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index"
     get 'sale/:sale_id/payment/others_payment' => "others_payments#index"
 
@@ -98,12 +98,12 @@ Rails.application.routes.draw do
   #--------- Customer Relationship Management ------------#
   namespace :crm do
       root "home#index" #queue number
-      #customers
+      get 'customers/:sale_id/assign_sale_id', to: "customers#get_sale_id", :as => "assign_sale"#get sale id with customer for crm
       resources :customers
-      #membership
-      #bookings
-      post "update_booking" , to: "bookings#update_booking", as: "update_booking"
-      #queue
+      post "update_booking" , to: "bookings#update_booking", as: "update_booking"#assign and cancel
+      post "update_sale" , to: "home#update_sale_by_customer"#update customer id in sale table
+      get '/print/:id', to: "home#print_order"#print order for crm
+
   end
 
   #--------- Order Queue Station ------------#