git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update route after merge with crm

Browse Source
This commit is contained in:
Yan
2017-06-12 10:27:53 +06:30
parent c5e9d7afd5
commit e1481eb591
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
config/routes.rb
View File

@@ -72,15 +72,9 @@ 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 :discounts, only: [:index,:new, :create ] #add discount type
resources :customers #add customer type
>>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3
end
post '/:booking_id' => 'home#item_show'
@@ -96,12 +90,10 @@ 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
@@ -109,7 +101,6 @@ Rails.application.routes.draw do
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 ------------#