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

fixed conflict file

Browse Source
This commit is contained in:
Aung Myo
2017-06-13 10:40:49 +06:30
parent c05a64bae7 3e691ca3f7
commit f8df5147a4
19 changed files with 196 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/origami/discounts_controller.rb
View File

@@ -30,13 +30,15 @@ class Origami::DiscountsController < BaseOrigamiController
sale.save
#save sale item for discount
origin_sale_item = SaleItem.find(sale_item_id)
if sale_item_id != nil
origin_sale_item = SaleItem.find(sale_item_id)
end
sale_item = SaleItem.new
#pull
sale_item.sale_id = sale_id
sale_item.product_code = origin_sale_item.product_code
sale_item.product_name = origin_sale_item.product_name + " Discount"
sale_item.product_code = origin_sale_item != nil ? origin_sale_item.product_code : sale_id
sale_item.product_name = "Overall Discount"
sale_item.remark = remark
sale_item.qty = 1

4
app/controllers/origami/payments_controller.rb
View File

@@ -49,8 +49,8 @@ class Origami::PaymentsController < BaseOrigamiController
if spay.payment_method == "cash"
@cash = spay.payment_amount
end
if spay.payment_method == "mpu"
@other = spay.payment_amount
if spay.payment_method == "mpu" || spay.payment_method == "paypar"
@other += spay.payment_amount
end
end
end