Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

fix deposit is net value

Browse source
This commit is contained in:
viehlieb 2023-09-29 10:12:38 +02:00
parent b425d97876
commit 46e6bea49e
5 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/order.rb
View file

@ -207,7 +207,7 @@ class Order < ApplicationRecord
# :fc, guess what...
def sum(type = :gross)
total = 0
if %i[net gross net_deposit gross_without_deposit fc_deposit deposit fc].include?(type)
if %i[net gross net_deposit gross_without_deposit fc_without_deposit fc_deposit deposit fc].include?(type)
for oa in order_articles.ordered.includes(:article, :article_price)
quantity = oa.units * oa.price.unit_quantity
case type
@ -219,6 +219,8 @@ class Order < ApplicationRecord
total += quantity * oa.price.gross_price_without_deposit
when :fc
total += quantity * oa.price.fc_price
when :fc_without_deposit
total += quantity * oa.price.fc_price_without_deposit
when :net_deposit
total += quantity * oa.price.net_deposit_price
when :fc_deposit