Fixed price calculation in camp module. UI fixes.

closes #309
2017-06-14 11:04:57 +02:00
parent b83e1ee56e
commit 1df897e5c8
5 changed files with 24 additions and 5 deletions
@@ -246,11 +246,6 @@ void CampService::calcPeople(CampDataPtr data)
            }
        }

-        if (item->adbItem()->ztp())
-        {
-            continue;
-        }
-
        if (sale != QDecDouble(0) && !fixedSale)
        {
            QDecDouble itemSale = (item->price() * sale) / 100;
@@ -331,6 +326,11 @@ void CampService::calcPrice(CampDataPtr data)

 void CampService::addAccFee(CampDataPtr data, AddressItemPtr item, int startAge, int endAge, int days)
 {
+    if (item->adbItem()->ztp())
+    {
+        return;
+    }
+
    auto addAccService = [this, item, data](int count){
        ServiceItemPtr srvItem(new ServiceItem);