cahnge foc process

2017-12-15 11:50:05 +06:30
parent 66200ef11a
commit 20ae953af2
2 changed files with 2 additions and 2 deletions
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -187,7 +187,7 @@ class SalePayment < ApplicationRecord
    payment_status = false

    # add to sale item with foc
-    sale_items = SaleItem.where("sale_id='#{ self.sale.sale_id }'")
+    sale_items = SaleItem.where("sale_id='#{ self.sale.sale_id }' and remark is null")
    
    sale_items.each do|item|
      SaleItem.update_existing_item(item.qty, item, self.sale.sale_id, "foc", item.unit_price, item.price)
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -497,7 +497,7 @@

            //$( "#loading_wrapper" ).hide();
            
-            if (cash > 0) {
+            if (cash >= 0) {
              swal({
               title: "Information!",
               text: 'Thank You !',