git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflic when pull master item remark

Browse Source
This commit is contained in:
Aung Myo
2018-02-26 17:02:46 +06:30
parent da7dad05e4 b38e98a22a
commit ce8581f892
13 changed files with 147 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/sale_payment.rb
View File

@@ -194,7 +194,7 @@ class SalePayment < ApplicationRecord
payment_status = false
# add to sale item with foc
sale_items = SaleItem.where("sale_id='#{ self.sale.sale_id }' and remark is null")
sale_items = SaleItem.where("sale_id='#{ self.sale.sale_id }' and status is null")
sale_items.each do|item|
SaleItem.update_existing_item(item.qty, item, self.sale.sale_id, "foc", item.unit_price, item.price)