merge with staging

2017-10-12 09:59:24 +06:30
parent 1f6c05b314 476aafa791
commit bc2101bf42
89 changed files with 1810 additions and 1372 deletions
--- a/app/controllers/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -1,4 +1,4 @@
-class Origami::RedeemPaymentsController < ApplicationController#BaseOrigamiController
+class Origami::RedeemPaymentsController < ApplicationController #BaseOrigamiController
 	def index
 		@sale_id = params[:sale_id]
 		payment_method = params[:payment_method]