GerhardHoffmann/MOBILISIS-Calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add interface to access 'PaymentOptions'

Browse Source
This commit is contained in:
Siegfried Siegert
2023-11-22 16:27:41 +01:00
parent cd77e380ef
commit 3a2e521345
4 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/src/calculator_functions.cpp
View File

@@ -378,12 +378,11 @@ uint32_t Calculator::GetCostFromDuration(Configuration const* cfg,
double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_option, const QDateTime start_datetime, QDateTime & end_datetime, double durationMin, bool nextDay, bool prepaid)
{
// condition for 'PaymentMethod::Steps' (e.g. 332/Schoenau):
if (payment_option == PaymentOption::Option1
&& cfg->SpecialDays.size() == 0
if (cfg->SpecialDays.size() == 0
&& cfg->SpecialDaysWorktime.size() == 0)
{
QDateTime const end = start_datetime.addSecs(durationMin*60);
return GetCostFromDuration(cfg, start_datetime, end, PaymentMethod::Steps);
end_datetime = start_datetime.addSecs(durationMin*60);
return GetCostFromDuration(cfg, start_datetime, end_datetime, PaymentMethod::Steps);
}
// Get input date