fixed conflic when pull master item remark

2018-02-26 17:02:46 +06:30
parent da7dad05e4 b38e98a22a
commit ce8581f892
13 changed files with 147 additions and 83 deletions
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -357,12 +357,13 @@ class Origami::PaymentsController < BaseOrigamiController

    if(Sale.exists?(sale_id))
      saleObj      = Sale.find(sale_id)
-
      if saleObj.discount_type == "member_discount"
        saleObj.update_attributes(rounding_adjustment: 0)
        saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0)
      end
      
+      saleObj.update_attributes(rounding_adjustment: 0)
+      
      sale_payment = SalePayment.new
      sale_payment.process_payment(saleObj, current_user.name, cash, "foc" ,remark)