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

dis fix

Browse Source
This commit is contained in:
Yan
2017-07-10 16:23:37 +06:30
parent 9402cde2bc
commit 082627018f
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,6 +42,7 @@ class Origami::DiscountsController < BaseOrigamiController
sale_item.unit_price = di["price"] sale_item.unit_price = di["price"]
sale_item.taxable_price = di["price"] sale_item.taxable_price = di["price"]
sale_item.is_taxable = 0 sale_item.is_taxable = 0
sale_item.account_id = origin_sale_item.account_id
sale_item.price = di["price"] sale_item.price = di["price"]
sale_item.save sale_item.save

2
app/models/sale_item.rb
View File

@@ -57,7 +57,7 @@ class SaleItem < ApplicationRecord
# Check for actual sale items # Check for actual sale items
sale_items.where("is_taxable = false AND remark = 'Discount'").find_each do |si| sale_items.where("is_taxable = false AND remark = 'Discount'").find_each do |si|
if si.account_id == a.id if si.account_id == a.id
discount_account[:price] = (discount_account[:price] + si.price) * -1 discount_account[:price] = (discount_account[:price].abs + si.price.abs) * -1
end end
end end
discount_accounts.push(discount_account) discount_accounts.push(discount_account)

6
app/views/origami/discounts/index.html.erb
View File

@@ -138,7 +138,7 @@
<div class="row bottom"> <div class="row bottom">
<div class="col-md-3"> <div class="col-md-3">
<div class="fluid cashier_number" data-value="20" data-type="add">15%</div> <div class="fluid cashier_number" data-value="15" data-type="add">15%</div>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<div class="col-md-4 cashier_number" data-value="7" data-type="num">7</div> <div class="col-md-4 cashier_number" data-value="7" data-type="num">7</div>
@@ -149,7 +149,7 @@
<div class="row bottom"> <div class="row bottom">
<div class="col-md-3"> <div class="col-md-3">
<div class="fluid cashier_number" data-value="30" data-type="add">20%</div> <div class="fluid cashier_number" data-value="20" data-type="add">20%</div>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<div class="col-md-4 cashier_number" data-value="0" data-type="num">0</div> <div class="col-md-4 cashier_number" data-value="0" data-type="num">0</div>
@@ -160,7 +160,7 @@
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<div class="fluid cashier_number" data-value="50" data-type="add">30%</div> <div class="fluid cashier_number" data-value="30" data-type="add">30%</div>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<div class="col-md-4 cashier_number"></div> <div class="col-md-4 cashier_number"></div>