Merge branch 'adminbsb_material_ui'

2017-12-28 11:01:28 +06:30
parent 78729980ee 23e7c8db97
commit 7b0c504900
4 changed files with 24 additions and 3 deletions
--- a/app/controllers/origami/others_payments_controller.rb
+++ b/app/controllers/origami/others_payments_controller.rb
@@ -5,7 +5,7 @@ class Origami::OthersPaymentsController < BaseOrigamiController
  	@payment_method_setting = PaymentMethodSetting.all

  	@rebate = MembershipSetting.find_by_rebate(1)
-
+  	@sale_data = Sale.find_by_sale_id(@sale_id)
  	# @sale_id = params[:sale_id]
  	# sale_data = Sale.find_by_sale_id(@sale_id)