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

Merge branch 'r-1902001-01' of gitlab.com:code2lab/SXRestaurant into r-1902001-01

Browse Source
This commit is contained in:
yarzar_code
2020-06-08 15:48:13 +06:30
parent 7a09ed0108 f9db23b500
commit 62fb440850
65 changed files with 2049 additions and 1842 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
config/routes.rb
View File

@@ -29,6 +29,9 @@ scope "(:locale)", locale: /en|mm/ do
delete 'logout' => 'home#destroy'
get 'dashboard' => 'home#dashboard'
get 'expire' => 'renew_license#expire'
get 'renew' => 'renew_license#renew'
namespace :induties do
# resources :assign_in_duties
get ':booking_id/assign' => 'assign_in_duties#index', as: :assign_in_duties
@@ -244,23 +247,25 @@ scope "(:locale)", locale: /en|mm/ do
post 'payment/dinga' => 'dinga#create'
post 'payment/gift_voucher' => 'gift_voucher#create'
post 'payment/credit_payment' => 'credit_payments#create_credit_payment'
post 'payment/:method' => 'others_payments#create', :as => 'payment'
post 'payment/:type/change_tax' => 'payments#change_tax', :defaults => {:format => 'json'}
get 'sale/:sale_id/:type/payment/credit_payment' => "credit_payments#index"
get 'sale/:sale_id/:type/payment/others_payment' => "others_payments#index"
get 'sale/:sale_id/:type/payment/others_payment/MPU' => "mpu#index"
get 'sale/:sale_id/:type/payment/others_payment/VISA' => "visa#index"
get 'sale/:sale_id/:type/payment/others_payment/Master' => "master#index"
get 'sale/:sale_id/:type/payment/others_payment/JCB' => "jcb#index"
get 'sale/:sale_id/:type/payment/others_payment/PAYMAL' => "paymal#index"
get 'sale/:sale_id/:type/payment/others_payment/UNIONPAY' => "unionpay#index"
get 'sale/:sale_id/:type/payment/others_payment/Redeem' => "redeem_payments#index"
get 'sale/:sale_id/:type/payment/others_payment/Voucher' => "voucher#index"
get 'sale/:sale_id/:type/payment/others_payment/JunctionPay' => "junction_pay#index"
get 'sale/:sale_id/:type/payment/others_payment/Alipay' => "alipay#index"
get 'sale/:sale_id/:type/payment/others_payment/DINGA' => "dinga#index"
get 'sale/:sale_id/:type/payment/others_payment/GiftVoucher' => "gift_voucher#index"
get 'sale/:sale_id/:type/payment/others_payment/mpu' => "mpu#index"
get 'sale/:sale_id/:type/payment/others_payment/visa' => "visa#index"
get 'sale/:sale_id/:type/payment/others_payment/master' => "master#index"
get 'sale/:sale_id/:type/payment/others_payment/jcb' => "jcb#index"
get 'sale/:sale_id/:type/payment/others_payment/paymal' => "paymal#index"
get 'sale/:sale_id/:type/payment/others_payment/unionpay' => "unionpay#index"
get 'sale/:sale_id/:type/payment/others_payment/redeem' => "redeem_payments#index"
get 'sale/:sale_id/:type/payment/others_payment/voucher' => "voucher#index"
get 'sale/:sale_id/:type/payment/others_payment/junctionpay' => "junction_pay#index"
get 'sale/:sale_id/:type/payment/others_payment/alipay' => "alipay#index"
get 'sale/:sale_id/:type/payment/others_payment/dinga' => "dinga#index"
get 'sale/:sale_id/:type/payment/others_payment/giftvoucher' => "gift_voucher#index"
get 'sale/:sale_id/:type/payment/others_payment/:method' => 'others_payments#new'
#---------Void --------------#
post 'sale/:sale_id/:type/void' => 'void#overall_void'
@@ -351,20 +356,22 @@ scope "(:locale)", locale: /en|mm/ do
# post 'credit_payment/junctionpay' => 'junction_pay#create'
# post 'credit_payment/dinga' => 'dinga#create'
# post 'credit_payment/gift_voucher' => 'gift_voucher#create'
post 'credit_payment/:method' => 'others_payments#create', :as => 'credit_payment'
get 'sale/:sale_id/:type/credit_payment/others_payment' => "others_payments#index"
get 'sale/:sale_id/:type/credit_payment/others_payment/MPU' => "mpu#index"
get 'sale/:sale_id/:type/credit_payment/others_payment/VISA' => "visa#index"
get 'sale/:sale_id/:type/credit_payment/others_payment/Master' => "master#index"
get 'sale/:sale_id/:type/credit_payment/others_payment/JCB' => "jcb#index"
# get 'sale/:sale_id/:type/credit_payment/others_payment/PAYMAL' => "paymal#index"
get 'sale/:sale_id/:type/credit_payment/others_payment/UNIONPAY' => "unionpay#index"
# get 'sale/:sale_id/:type/credit_payment/others_payment/Redeem' => "redeem_payments#index"
# get 'sale/:sale_id/:type/credit_payment/others_payment/Voucher' => "voucher#index"
# get 'sale/:sale_id/:type/credit_payment/others_payment/JunctionPay' => "junction_pay#index"
get 'sale/:sale_id/:type/credit_payment/others_payment/Alipay' => "alipay#index"
# get 'sale/:sale_id/:type/credit_payment/others_payment/DINGA' => "dinga#index"
# get 'sale/:sale_id/:type/credit_payment/others_payment/GiftVoucher' => "gift_voucher#index"
get 'sale/:sale_id/:type/credit_payment/others_payment/mpu' => "mpu#index"
get 'sale/:sale_id/:type/credit_payment/others_payment/visa' => "visa#index"
get 'sale/:sale_id/:type/credit_payment/others_payment/master' => "master#index"
get 'sale/:sale_id/:type/credit_payment/others_payment/jcb' => "jcb#index"
# get 'sale/:sale_id/:type/credit_payment/others_payment/paymal' => "paymal#index"
get 'sale/:sale_id/:type/credit_payment/others_payment/unionpay' => "unionpay#index"
# get 'sale/:sale_id/:type/credit_payment/others_payment/redeem' => "redeem_payments#index"
# get 'sale/:sale_id/:type/credit_payment/others_payment/voucher' => "voucher#index"
# get 'sale/:sale_id/:type/credit_payment/others_payment/junctionpay' => "junction_pay#index"
get 'sale/:sale_id/:type/credit_payment/others_payment/alipay' => "alipay#index"
# get 'sale/:sale_id/:type/credit_payment/others_payment/dinga' => "dinga#index"
# get 'sale/:sale_id/:type/credit_payment/others_payment/giftvoucher' => "gift_voucher#index"
get 'sale/:sale_id/:type/credit_payment/others_payment/:method' => 'others_payments#new'
#------------- Start Reservation -------------------#
resources :reservation