merged master

This commit is contained in:
Yan
2017-06-07 17:45:40 +06:30
25 changed files with 142 additions and 91 deletions

View File

@@ -68,17 +68,18 @@ Rails.application.routes.draw do
namespace :origami do
root "home#index"
get "/:booking_id" => "home#show" do #origami/:booking_id will show
resources :payments, only: [:index, :new, :create ] #add payment by payment_method
resources :discounts, only: [:index,:new, :create ] #add discount type
resources :customers, only: [:index,:new, :create ] #add customer type
end
# resources :request_bills, only: [:print]
get "/request_bills/:id" => "request_bills#print"
get 'sale/:sale_id/payment' => 'request_bills#show'
get 'sale/:sale_id/payment' => 'payments#show'
post 'payment_process' => 'payments#create'
get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index"
get 'sale/:sale_id/payment/card_payment' => "card_payments#index"
get 'sale/:sale_id/payment/others_payment' => "others_payments#index"
end
#--------- Waiter/Ordering Station ------------#