gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log

marina [Fri, 6 Jun 2025 12:17:11 +0000 (15:17 +0300)]

Merge branch 'develop' into feature_zozirova_erp-360_autoplannogramma_build

# Conflicts:
# erp24/controllers/AutoPlannogrammaController.php

commit | commitdiff | tree

marina [Fri, 6 Jun 2025 12:16:49 +0000 (15:16 +0300)]

ERP-360 Сборка страницы автопм

commit | commitdiff | tree

Aleksey Filippov [Fri, 6 Jun 2025 11:57:58 +0000 (11:57 +0000)]

Merge branch 'feature_fomichev_erp-20250411_month_bouquet_goal' into 'develop'

[ERP-400] Обработка данных Создание расчёта месячной цели букета

See merge request gitlab-instance/yii-erp24!843

commit | commitdiff | tree

fomichev [Fri, 6 Jun 2025 10:24:44 +0000 (13:24 +0300)]

Исправление по ревью и очистка кода

commit | commitdiff | tree

Aleksey Filippov [Fri, 6 Jun 2025 09:50:02 +0000 (09:50 +0000)]

Merge branch 'feature_fomichev_erp-363_count_offline_week_sales_forecast' into 'develop'

[ERP-363] Создать логику расчета кол-ва продаж офлайн для прогноза на неделю (автопм)

See merge request gitlab-instance/yii-erp24!850

commit | commitdiff | tree

Aleksey Filippov [Fri, 6 Jun 2025 09:48:52 +0000 (09:48 +0000)]

Merge branch 'feature_fomichev_erp-419_calculate_cleared_species_month_goal' into 'develop'

[ERP-419] Вычисление месячной цели вида

See merge request gitlab-instance/yii-erp24!840

commit | commitdiff | tree

fomichev [Fri, 6 Jun 2025 09:08:05 +0000 (12:08 +0300)]

Исправление по ревью

commit | commitdiff | tree

marina [Fri, 6 Jun 2025 09:02:17 +0000 (12:02 +0300)]

ERP-360 Сборка страницы автопм

commit | commitdiff | tree

marina [Fri, 6 Jun 2025 06:42:34 +0000 (09:42 +0300)]

ERP-360 Сборка страницы автопм

commit | commitdiff | tree

marina [Fri, 6 Jun 2025 06:28:08 +0000 (09:28 +0300)]

ERP-360 Сборка страницы автопм

commit | commitdiff | tree

marina [Thu, 5 Jun 2025 21:30:59 +0000 (00:30 +0300)]

ERP-360 Сборка страницы автопм

commit | commitdiff | tree

fomichev [Wed, 4 Jun 2025 09:40:32 +0000 (12:40 +0300)]

Правки методов

commit | commitdiff | tree

fomichev [Wed, 4 Jun 2025 08:46:39 +0000 (11:46 +0300)]

commit | commitdiff | tree

Aleksey Filippov [Tue, 3 Jun 2025 14:02:00 +0000 (14:02 +0000)]

Merge branch 'feature_zozirova_erp-417_test_constaraints' into 'develop'

ERP-417

See merge request gitlab-instance/yii-erp24!852

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 13:25:47 +0000 (16:25 +0300)]

Merge branch 'develop' into feature_zozirova_erp-417_test_constaraints

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 13:24:55 +0000 (16:24 +0300)]

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 13:23:45 +0000 (16:23 +0300)]

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 13:22:16 +0000 (16:22 +0300)]

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 13:20:38 +0000 (16:20 +0300)]

commit | commitdiff | tree

Aleksey Filippov [Tue, 3 Jun 2025 12:50:09 +0000 (12:50 +0000)]

Merge branch 'feature_zozirova_erp-417_test_constaraints' into 'develop'

ERP-417

See merge request gitlab-instance/yii-erp24!851

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 12:44:12 +0000 (15:44 +0300)]

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 12:34:13 +0000 (15:34 +0300)]

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 10:27:14 +0000 (13:27 +0300)]

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 10:22:27 +0000 (13:22 +0300)]

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 10:12:16 +0000 (13:12 +0300)]

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 10:09:47 +0000 (13:09 +0300)]

Merge branch 'develop' into feature_zozirova_erp-417_test_constaraints

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 10:08:28 +0000 (13:08 +0300)]

commit | commitdiff | tree

fomichev [Tue, 3 Jun 2025 09:57:20 +0000 (12:57 +0300)]

commit | commitdiff | tree

Aleksey Filippov [Tue, 3 Jun 2025 09:54:14 +0000 (09:54 +0000)]

Merge branch 'feature_zozirova_erp-417_test_constaraints' into 'develop'

ERP-417 Сделать добавление в позицию списания видео файла и QR кода на это списание

See merge request gitlab-instance/yii-erp24!849

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 09:46:40 +0000 (12:46 +0300)]

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 09:45:40 +0000 (12:45 +0300)]

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 09:42:00 +0000 (12:42 +0300)]

commit | commitdiff | tree

fomichev [Tue, 3 Jun 2025 09:41:43 +0000 (12:41 +0300)]

Прогноз по неделям для вида

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 09:36:09 +0000 (12:36 +0300)]

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 07:48:48 +0000 (10:48 +0300)]

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 07:39:57 +0000 (10:39 +0300)]

commit | commitdiff | tree

fomichev [Tue, 3 Jun 2025 07:37:53 +0000 (10:37 +0300)]

Прогноз по неделям для вида

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 07:08:04 +0000 (10:08 +0300)]

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 07:07:12 +0000 (10:07 +0300)]

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 07:05:04 +0000 (10:05 +0300)]

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 06:58:43 +0000 (09:58 +0300)]

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 06:47:26 +0000 (09:47 +0300)]

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 06:45:10 +0000 (09:45 +0300)]

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 06:41:37 +0000 (09:41 +0300)]

commit | commitdiff | tree

marina [Tue, 3 Jun 2025 06:37:44 +0000 (09:37 +0300)]

commit | commitdiff | tree

fomichev [Mon, 2 Jun 2025 15:39:01 +0000 (18:39 +0300)]

Доля продаж недельи для вида

commit | commitdiff | tree

fomichev [Mon, 2 Jun 2025 12:28:06 +0000 (15:28 +0300)]

Доля продаж недельи для вида

commit | commitdiff | tree

fomichev [Fri, 30 May 2025 15:19:52 +0000 (18:19 +0300)]

Правки по товарам c истории

commit | commitdiff | tree

fomichev [Fri, 30 May 2025 12:50:31 +0000 (15:50 +0300)]

Merge branch 'refs/heads/feature_fomichev_erp-419_calculate_cleared_species_month_goal' into feature_fomichev_erp-363_count_offline_week_sales_forecast

# Conflicts:
# erp24/controllers/CategoryPlanController.php
# erp24/services/AutoPlannogrammaService.php
# erp24/services/StorePlanService.php

commit | commitdiff | tree

fomichev [Fri, 30 May 2025 11:51:09 +0000 (14:51 +0300)]

Merge branch 'refs/heads/develop' into feature_fomichev_erp-419_calculate_cleared_species_month_goal

# Conflicts:
# erp24/services/AutoPlannogrammaService.php

commit | commitdiff | tree

fomichev [Fri, 30 May 2025 11:43:13 +0000 (14:43 +0300)]

Правки по товарам без истории

commit | commitdiff | tree

fomichev [Fri, 30 May 2025 10:50:41 +0000 (13:50 +0300)]

Правки по количеству - расчет с раскрытием товаров

commit | commitdiff | tree

fomichev [Fri, 30 May 2025 10:42:01 +0000 (13:42 +0300)]

Правки по количеству - расчет с раскрытием товаров

commit | commitdiff | tree

fomichev [Fri, 30 May 2025 10:14:22 +0000 (13:14 +0300)]

Правки по количеству - расчет с раскрытием товаров

commit | commitdiff | tree

fomichev [Fri, 30 May 2025 10:12:46 +0000 (13:12 +0300)]

Правки по количеству - расчет с раскрытием товаров

commit | commitdiff | tree

fomichev [Fri, 30 May 2025 10:11:25 +0000 (13:11 +0300)]

Правки по количеству - расчет с раскрытием товаров

commit | commitdiff | tree

fomichev [Fri, 30 May 2025 08:43:56 +0000 (11:43 +0300)]

Правки по видам - расчет с раскрытием товаров

commit | commitdiff | tree

fomichev [Fri, 30 May 2025 06:51:37 +0000 (09:51 +0300)]

Правки по подкатегориям - расчет с раскрытием товаров

commit | commitdiff | tree

fomichev [Thu, 29 May 2025 15:02:43 +0000 (18:02 +0300)]

Правки по подкатегориям

commit | commitdiff | tree

Aleksey Filippov [Thu, 29 May 2025 14:54:33 +0000 (14:54 +0000)]

Merge branch 'feature_zozirova_erp-422_fix_lk_sales' into 'develop'

ERP-422 Не сходятся продажи в ЛК флориста

See merge request gitlab-instance/yii-erp24!848

commit | commitdiff | tree

marina [Thu, 29 May 2025 14:50:50 +0000 (17:50 +0300)]

ERP-422 Не сходятся продажи в ЛК флориста

commit | commitdiff | tree

fomichev [Thu, 29 May 2025 09:59:00 +0000 (12:59 +0300)]

Модификация метода calculateMedianSalesForProductsWithoutHistoryExtended

commit | commitdiff | tree

fomichev [Thu, 29 May 2025 09:50:35 +0000 (12:50 +0300)]

Модификация метода analyzeHistory

commit | commitdiff | tree

fomichev [Thu, 29 May 2025 09:49:03 +0000 (12:49 +0300)]

Модификация метода getSalesHistory

commit | commitdiff | tree

fomichev [Thu, 29 May 2025 09:39:12 +0000 (12:39 +0300)]

Правки по методу расчетов без истории

commit | commitdiff | tree

fomichev [Thu, 29 May 2025 09:32:34 +0000 (12:32 +0300)]

Добавил фильтрацию по категориям 'букет', 'сборка', 'сервис'

commit | commitdiff | tree

fomichev [Thu, 29 May 2025 09:19:53 +0000 (12:19 +0300)]

убрал проверку по пустой категории

commit | commitdiff | tree

fomichev [Thu, 29 May 2025 08:48:31 +0000 (11:48 +0300)]

убрал откладку

commit | commitdiff | tree

fomichev [Thu, 29 May 2025 08:45:45 +0000 (11:45 +0300)]

убрал откладку

commit | commitdiff | tree

Aleksey Filippov [Thu, 29 May 2025 08:35:54 +0000 (08:35 +0000)]

Merge branch 'feature_zozirova_erp-417_add_video_and_qr' into 'develop'

ERP-417 Сделать добавление в позицию списания видео файла и QR кода на это списание

See merge request gitlab-instance/yii-erp24!847

commit | commitdiff | tree

marina [Thu, 29 May 2025 08:29:46 +0000 (11:29 +0300)]

commit | commitdiff | tree

marina [Thu, 29 May 2025 08:26:46 +0000 (11:26 +0300)]

commit | commitdiff | tree

fomichev [Thu, 29 May 2025 08:26:08 +0000 (11:26 +0300)]

убрал откладку

commit | commitdiff | tree

marina [Thu, 29 May 2025 08:22:56 +0000 (11:22 +0300)]

commit | commitdiff | tree

fomichev [Thu, 29 May 2025 08:20:46 +0000 (11:20 +0300)]

убрал откладку

commit | commitdiff | tree

fomichev [Thu, 29 May 2025 08:07:24 +0000 (11:07 +0300)]

убрал откладку

commit | commitdiff | tree

Aleksey Filippov [Thu, 29 May 2025 06:59:10 +0000 (06:59 +0000)]

Merge branch 'feature_fomichev_erp-322_add_foto_to_marketplace_order' into 'develop'

[ERP-322] Добавление фото к заказу

See merge request gitlab-instance/yii-erp24!841

commit | commitdiff | tree

Aleksey Filippov [Thu, 29 May 2025 06:58:11 +0000 (06:58 +0000)]

Merge branch 'feature_fomichev_ERP-20250407_add_notification_telegram_mpstore_message' into 'develop'

уведомление в телеграм об отсутствии магазина ЯМ в MarketplaceStore

See merge request gitlab-instance/yii-erp24!778

commit | commitdiff | tree

Aleksey Filippov [Thu, 29 May 2025 06:57:30 +0000 (06:57 +0000)]

Merge branch 'fix_fomichev_20250228_telegram_error_msg_format' into 'develop'

Добавление уведомлений телеграм об ошибках в media

See merge request gitlab-instance/yii-erp24!708

commit | commitdiff | tree

fomichev [Wed, 28 May 2025 15:45:26 +0000 (18:45 +0300)]

Сбор недельных продаж

commit | commitdiff | tree

fomichev [Wed, 28 May 2025 14:15:25 +0000 (17:15 +0300)]

Сбор недельных продаж

commit | commitdiff | tree

fomichev [Wed, 28 May 2025 13:27:57 +0000 (16:27 +0300)]

Сбор недельных продаж

commit | commitdiff | tree

fomichev [Wed, 28 May 2025 13:06:28 +0000 (16:06 +0300)]

Добавление недельных методов