Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

2018-08-02 11:55:14 +06:30
parent fd44a57689 186bc090df
commit 5b94a4604b
21 changed files with 236 additions and 68 deletions
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -241,7 +241,7 @@ class Origami::PaymentsController < BaseOrigamiController
    sale_id = params[:sale_id]
    @cashier_type   = params[:type]
    if path.include? ("credit_payment")
-      @sale_payment = SalePayment.get_credit_total_left(sale_id)
+      @sale_payment = SalePayment.get_credit_amount_due_left(sale_id)
    end
    
    @member_discount = MembershipSetting.find_by_discount(1)