dates fix

server/backend/handlers/ozon_handler.py

@@ -4,9 +4,10 @@ from server.backend.api.nomenclature import processing
 import datetime
 import re
 def last_day_of_month(format: str):
-    next_month = datetime.datetime.now().replace(day=28) + datetime.timedelta(days=4)
-    last_day = next_month - datetime.timedelta(days=next_month.day)
-    return last_day.strftime(format)
+    today = datetime.datetime.now()
+    first_day_current_month = today.replace(day=1)
+    last_day_prev_month = first_day_current_month - datetime.timedelta(days=1)
+    return last_day_prev_month.strftime(format)
 def process_sheet(df,real_arti: int,real_quantity: int,real_sum_1: int,real_sum_2: int):
     # выбираем нужные колонки по индексам
     df = df.iloc[:, [real_arti, real_quantity, real_sum_1, real_sum_2]].copy()

server/backend/handlers/ozon_wb_yandex_com_handler.py

@@ -4,9 +4,10 @@ from server.backend.api.nomenclature import processing
 import re
 import datetime
 def last_day_of_month(format: str):
-    next_month = datetime.datetime.now().replace(day=28) + datetime.timedelta(days=4)
-    last_day = next_month - datetime.timedelta(days=next_month.day)
-    return last_day.strftime(format)
+    today = datetime.datetime.now()
+    first_day_current_month = today.replace(day=1)
+    last_day_prev_month = (first_day_current_month - datetime.timedelta(days=1)).replace(day=1)
+    return last_day_prev_month.strftime(format)
 def process_sheet(df, real_arti:str, real_quantity:str, real_sum_1:str):
     df= df.iloc[2:].reset_index(drop=True)
     #Выборка

server/backend/handlers/wb_handler.py

@@ -2,11 +2,12 @@ from pydantic import ValidationError
 from server.backend.schemas.pydantic import ExcelInfo, settings,Translit
 from server.backend.api.nomenclature import processing
 import datetime
-
-def last_day_of_month(date_format: str):
-    next_month = datetime.datetime.now().replace(day=28) + datetime.timedelta(days=4)
-    last_day = next_month - datetime.timedelta(days=next_month.day)
-    return last_day.strftime(date_format)
+#Доставать дату из колонки
+def last_day_of_month(format: str):
+    today = datetime.datetime.now()
+    first_day_current_month = today.replace(day=1)
+    last_day_prev_month = first_day_current_month - datetime.timedelta(days=1)
+    return last_day_prev_month.strftime(format)
 def process_sheet(df, document_type:str):
     #Выборка
     df = df[['Артикул поставщика', 'Тип документа', 'Кол-во', 'Вайлдберриз реализовал Товар (Пр)']].copy().dropna() #copy and drop all NA values

server/backend/handlers/yandex_handler.py

@@ -4,9 +4,10 @@ from server.backend.api.nomenclature import processing
 import datetime
 import re
 def last_day_of_month(format: str):
-    next_month = datetime.datetime.now().replace(day=28) + datetime.timedelta(days=4)
-    last_day = next_month - datetime.timedelta(days=next_month.day)
-    return last_day.strftime(format)
+    today = datetime.datetime.now()
+    first_day_current_month = today.replace(day=1)
+    last_day_prev_month = first_day_current_month - datetime.timedelta(days=1)
+    return last_day_prev_month.strftime(format)
 def process_sheet(df, multiply_price=1, sheet_name=''):
     #Выборка
     df = df[['Ваш SKU', 'Количество, шт.', 'Сумма транзакции, ₽']].copy().dropna() #выбираем нужные колонки, делаем копию, чтобы можно было удалить None inline модом