merge with crm

config/routes.rb

@@ -72,9 +72,15 @@ Rails.application.routes.draw do
   #--------- Cashier ------------#
   namespace :origami do
     root "home#index"
+<<<<<<< HEAD
     get "/:booking_id" => "home#index" do #origami/:booking_id will show
       # resources :discounts, only: [:index,:new, :create ] #add discount type      
       resources :customers, only: [:index,:new, :create ] #add customer type
+=======
+    get "/:booking_id" => "home#show" do #origami/:booking_id will show
+      resources :discounts, only: [:index,:new, :create ] #add discount type
+      resources :customers #add customer type
+>>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3
     end
 
     post '/:booking_id' => 'home#item_show'
@@ -90,10 +96,20 @@ Rails.application.routes.draw do
     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"
+<<<<<<< HEAD
     # get 'sale/:sale_id/payment/others_payment/:payment_method' => "redeem_payments#index"
     get 'sale/:sale_id/payment/others_payment/MPU' => "mpu#index"
     post 'create_mpu_payment' => "mpu#create"
     get 'sale/:sale_id/payment/others_payment/REDEEMREBATE' => "redeem_payments#index"
+=======
+
+    #---------Add Customer --------------#
+    #resources :customers
+    get '/:sale_id/add_customer', to: "customers#add_customer"
+    get '/:customer_id/get_customer' => 'home#get_customer'
+    post '/:sale_id/update_sale' , to: "home#update_sale_by_customer"#update customer id in sale table
+
+>>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3
   end
 
   #--------- Waiter/Ordering Station ------------#
@@ -108,9 +124,7 @@ Rails.application.routes.draw do
       root "home#index"
       resources :customers
       resources :dining_queues
-      get 'customers/:sale_id/assign_sale_id', to: "customers#get_sale_id", :as => "assign_sale"#get sale id with customer for crm
       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
@@ -162,6 +176,8 @@ Rails.application.routes.draw do
     resources :tax_profiles
     #lookups
     resources :lookups
+    #orders 
+    resources :orders
     #cashier_terminals
     resources :cashier_terminals
     #order_job_stations