Pull from master

2018-05-25 16:22:30 +06:30
parent f906134fbf
commit 578c14ccc3
26 changed files with 536 additions and 358 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -199,6 +199,8 @@ scope "(:locale)", locale: /en|mm/ do
    post 'payment/junctionpay' => 'junctionpay#create'
    post 'payment/dinga' => 'dinga#create'

+    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"