Select last month (#96)

It should be possible to select last payout month if every 2, 3, 6 or 12
month is selected as payout frequency.

Author: UnoSite

README.md

@@ -36,14 +36,14 @@
 
 - **Custom Payday Calculation:**
   - Supports various pay frequencies:
+    - **Weekly**
+    - **Every 14 days**
+    - **Every 28 days**
     - **Monthly**
     - **Every 2 months**
     - **Quarterly (every 3 months)**
     - **Semi-annually (every 6 months)**
     - **Annually**
-    - **Every 28 days**
-    - **Every 14 days**
-    - **Weekly**
 
 - **Automatic Adjustment for Holidays and Weekends:**
   - Fetches public holidays from the [Nager.Date API](https://date.nager.at).
@@ -87,25 +87,25 @@
 
 - **Label:** Select the payout frequency
 - **Options:**
+  - `weekly`: Weekly
+  - `14_days`: Every 14th day
+  - `28_days`: Every 28th day
   - `monthly`: Monthly
   - `bimonthly`: Every 2 months
   - `quarterly`: Every 3 months
   - `semiannual`: Every 6 months
   - `annual`: Every year
-  - `28_days`: Every 28th day
-  - `14_days`: Every 14th day
-  - `weekly`: Weekly
 
 ### Step 3: Depending on the Selected Frequency
 
-- **Monthly / Bimonthly / Quarterly / Semiannual / Annual:**
+- **Monthly:**
   - **Label:** Select day of month
   - **Options:**
     - `last_bank_day`: Last bank day
     - `first_bank_day`: First bank day
     - `specific_day`: Specific day
 
-- **Every 28th or 14th day:**
+- **Every 14th or 28th day / Bimonthly / Quarterly / Semiannual / Annual:**
   - **Label:** Select last payday
   - **Description:** Choose the date of your last payday. The integration will calculate future paydays based on this date.
 

custom_components/isitpayday/config_flow.py

@@ -102,15 +102,16 @@ async def async_step_frequency(self, user_input=None):
 
         self.pay_frequency = user_input[CONF_PAY_FREQ]
 
-        if self.pay_frequency in [
-            PAY_FREQ_MONTHLY,
+        if self.pay_frequency == PAY_FREQ_MONTHLY:
+            return await self.async_step_monthly_day()
+        elif self.pay_frequency in [
             PAY_FREQ_BIMONTHLY,
             PAY_FREQ_QUARTERLY,
             PAY_FREQ_SEMIANNUAL,
-            PAY_FREQ_ANNUAL
+            PAY_FREQ_ANNUAL,
+            PAY_FREQ_28_DAYS,
+            PAY_FREQ_14_DAYS
         ]:
-            return await self.async_step_monthly_day()
-        elif self.pay_frequency in [PAY_FREQ_28_DAYS, PAY_FREQ_14_DAYS]:
             return await self.async_step_cycle_last_paydate()
         elif self.pay_frequency == PAY_FREQ_WEEKLY:
             return await self.async_step_weekly()

custom_components/isitpayday/payday_calculator.py

@@ -32,23 +32,19 @@ async def async_calculate_next_payday(country: str, pay_frequency: str, pay_day=
     year = today.year
     bank_holidays = await async_get_bank_holidays(country, year)
 
-    if pay_frequency in (
-        PAY_FREQ_MONTHLY, PAY_FREQ_BIMONTHLY,
-        PAY_FREQ_QUARTERLY, PAY_FREQ_SEMIANNUAL,
-        PAY_FREQ_ANNUAL
-    ):
-        months = {
-            PAY_FREQ_MONTHLY: 1,
-            PAY_FREQ_BIMONTHLY: 2,
-            PAY_FREQ_QUARTERLY: 3,
-            PAY_FREQ_SEMIANNUAL: 6,
-            PAY_FREQ_ANNUAL: 12,
+    if pay_frequency == PAY_FREQ_MONTHLY:
+        payday = await async_calculate_month_based(today, 1, pay_day, bank_offset, bank_holidays)
+
+    elif pay_frequency in (PAY_FREQ_28_DAYS, PAY_FREQ_14_DAYS, PAY_FREQ_BIMONTHLY, PAY_FREQ_QUARTERLY, PAY_FREQ_SEMIANNUAL, PAY_FREQ_ANNUAL):
+        interval_days = {
+            PAY_FREQ_14_DAYS: 14,
+            PAY_FREQ_28_DAYS: 28,
+            PAY_FREQ_BIMONTHLY: 60,
+            PAY_FREQ_QUARTERLY: 90,
+            PAY_FREQ_SEMIANNUAL: 182,
+            PAY_FREQ_ANNUAL: 365,
         }[pay_frequency]
-        payday = await async_calculate_month_based(today, months, pay_day, bank_offset, bank_holidays)
-
-    elif pay_frequency in (PAY_FREQ_28_DAYS, PAY_FREQ_14_DAYS):
-        interval = 28 if pay_frequency == PAY_FREQ_28_DAYS else 14
-        payday = await async_calculate_recurring(last_pay_date, interval, bank_holidays)
+        payday = await async_calculate_recurring(last_pay_date, interval_days, bank_holidays)
 
     elif pay_frequency == PAY_FREQ_WEEKLY:
         if weekday is None: