merge with master

2017-12-13 11:43:22 +06:30
parent fef4d4caa1 ebf46e856d
commit b3b443735a
9 changed files with 96 additions and 36 deletions
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -180,6 +180,7 @@ class Origami::DiscountsController < BaseOrigamiController
      end

      generic_customer_id = sale.customer.membership_id
+      account_no          = sale.customer.paypar_account_no
      receipt_no          = sale.receipt_no
      membership          = MembershipSetting.find_by_membership_type("paypar_url")
      memberaction        = MembershipAction.find_by_membership_type("member_discount")
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -230,6 +230,7 @@ class Origami::PaymentsController < BaseOrigamiController
    sub_total       = params[:sub_total]
    member_info   = nil
    rebate_amount = nil
+    current_balance = nil

    if(Sale.exists?(sale_id))
      saleObj      = Sale.find(sale_id)