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

merge with master

Browse Source
This commit is contained in:
Yan
2017-06-12 10:01:36 +06:30
parent f834911587 5ee3ae257a
commit 09f9a29cde
33 changed files with 537 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config/routes.rb
View File

@@ -1,7 +1,7 @@
require 'sidekiq/web'
Rails.application.routes.draw do
namespace :settings do
resources :membership_actions
end
@@ -90,7 +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"
# 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"
end
#--------- Waiter/Ordering Station ------------#