From 0b779b7846deaa70a2150a590a8f15797b004464 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 31 Jan 2024 15:10:45 +0100 Subject: [PATCH] getBusinessHours(): return values with correct type. --- library/src/utilities.cpp | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/library/src/utilities.cpp b/library/src/utilities.cpp index 2ac7ddd..b42ce2a 100644 --- a/library/src/utilities.cpp +++ b/library/src/utilities.cpp @@ -405,18 +405,22 @@ uint32_t Utilities::getFirstDurationStep(Configuration const *cfg, PaymentMethod BusinessHours Utilities::getBusinessHours(Configuration const *cfg, PaymentMethod methodId) { int businessHours = cfg->PaymentOption.find(methodId)->second.pop_business_hours; + + qCritical() << __func__ << ":" << __LINE__ << businessHours; + switch (businessHours) { - case NoRestriction_24_7: return NoRestriction_24_7; - case OnlyWorkingDays: return OnlyWorkingDays; - case OnlyWeekDays: return OnlyWeekDays; - case OnlyWeekEnd: return OnlyWeekEnd; - case OnlyOfficialHolidays: return OnlyOfficialHolidays; - case OnlySpecialDays: return OnlySpecialDays; - case OnlySchoolHolidays: return OnlySchoolHolidays; - case SpecialAndSchoolHolidays: return SpecialAndSchoolHolidays; - case OnlyOpenForBusinessDays: return OnlyOpenForBusinessDays; + case NoRestriction_24_7: return BusinessHours::NoRestriction_24_7; + case OnlyWorkingDays: return BusinessHours::OnlyWorkingDays; + case OnlyWeekDays: return BusinessHours::OnlyWeekDays; + case OnlyWeekEnd: return BusinessHours::OnlyWeekEnd; + case OnlyOfficialHolidays: return BusinessHours::OnlyOfficialHolidays; + case OnlySpecialDays: return BusinessHours::OnlySpecialDays; + case OnlySchoolHolidays: return BusinessHours::OnlySchoolHolidays; + case SpecialAndSchoolHolidays: return BusinessHours::SpecialAndSchoolHolidays; + case OnlyOpenForBusinessDays: return BusinessHours::OnlyOpenForBusinessDays; + case AllDaysWithRestrictedHours: return BusinessHours::AllDaysWithRestrictedHours; } - return NoBusinessHoursDefined; + return BusinessHours::NoBusinessHoursDefined; } uint32_t Utilities::computeWeekDaysPrice(Configuration const *cfg, PaymentMethod id) {