Merge branch 'neuhauser-kirchdorf' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator into neuhauser-kirchdorf
This commit is contained in:
		@@ -91,6 +91,9 @@ int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg, PERMIT
 | 
				
			|||||||
            QVector<ATBTariffProduct> product = products.value();
 | 
					            QVector<ATBTariffProduct> product = products.value();
 | 
				
			||||||
            if (product.size() > 0) {
 | 
					            if (product.size() > 0) {
 | 
				
			||||||
                ATBTariffProduct const &p = product[0];
 | 
					                ATBTariffProduct const &p = product[0];
 | 
				
			||||||
 | 
					                return p.m_tariff_product_price;
 | 
				
			||||||
 | 
					#if 0
 | 
				
			||||||
 | 
					                // in case we do not have prepaid-option
 | 
				
			||||||
                QTime const ¤tTime = QDateTime::currentDateTime().time();
 | 
					                QTime const ¤tTime = QDateTime::currentDateTime().time();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                if (p.m_tariff_product_start <= currentTime && currentTime <= p.m_tariff_product_end) {
 | 
					                if (p.m_tariff_product_start <= currentTime && currentTime <= p.m_tariff_product_end) {
 | 
				
			||||||
@@ -103,6 +106,7 @@ int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg, PERMIT
 | 
				
			|||||||
                                << p.m_tariff_product_start.toString(Qt::ISODate)
 | 
					                                << p.m_tariff_product_start.toString(Qt::ISODate)
 | 
				
			||||||
                                << p.m_tariff_product_end.toString(Qt::ISODate) << ")";
 | 
					                                << p.m_tariff_product_end.toString(Qt::ISODate) << ")";
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    } break;
 | 
					    } break;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user