ITsolved/prodejna
2
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

Fixed people prices recalculation.

Browse Source
This commit is contained in:
Josef Rokos
2019-07-01 20:26:04 +02:00
parent bb5b136aea
commit 32a836d3cf
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
camp/campservice.cpp
+18 -14
View File
@@ -238,10 +238,26 @@ void CampService::calcPeople(CampDataPtr data)
first = first.addDays(daysEnd);
int endAge = first.year() - 1;
auto setTotal = [&](){
if (sale != QDecDouble(0) && !fixedSale)
{
QDecDouble itemSale = (item->price() * sale) / 100;
item->setSale(itemSale);
item->setTotalPrice(item->price() - itemSale);
}
else
{
item->setSale(0);
item->setTotalPrice(item->price());
}
addAccFee(data, item, startAge, endAge, days);
};
if (!item->personPrice().isNull())
{
item->setPrice(item->personPrice()->price() * days);
addAccFee(data, item, startAge, endAge, days);
setTotal();
continue;
}
else
@@ -258,19 +274,7 @@ void CampService::calcPeople(CampDataPtr data)
}
}
if (sale != QDecDouble(0) && !fixedSale)
{
QDecDouble itemSale = (item->price() * sale) / 100;
item->setSale(itemSale);
item->setTotalPrice(item->price() - itemSale);
}
else
{
item->setSale(0);
item->setTotalPrice(item->price());
}
addAccFee(data, item, startAge, endAge, days);
setTotal();
}
}