]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
Aleksey Filippov [Thu, 27 Mar 2025 21:06:12 +0000 (21:06 +0000)]
Merge branch 'feature_zozirova_erp-389_change_percent' into 'develop'
ERP-389 ERP-391 Реализовать зависимость от наличия прогноза ОС МБ
See merge request gitlab-instance/yii-erp24!744
Aleksey Filippov [Thu, 27 Mar 2025 20:43:36 +0000 (20:43 +0000)]
Merge branch 'feature_zozirova_erp-355_lptracking_api' into 'develop'
ERP-355 Автоматизация звонков роботом из когорт
See merge request gitlab-instance/yii-erp24!716
Marina Zozirova [Thu, 27 Mar 2025 20:43:35 +0000 (20:43 +0000)]
ERP-355 Автоматизация звонков роботом из когорт
Aleksey Filippov [Thu, 27 Mar 2025 20:41:26 +0000 (20:41 +0000)]
Merge branch 'feature_zozirova_erp-377_add_constraint_on_doubles' into 'develop'
ERP-377 Убрать возможность создания одинаковых имен. Т.е. можно создать...
See merge request gitlab-instance/yii-erp24!737
Marina Zozirova [Thu, 27 Mar 2025 20:41:26 +0000 (20:41 +0000)]
ERP-377 Убрать возможность создания одинаковых имен. Т.е. можно создать...
Aleksey Filippov [Thu, 27 Mar 2025 20:35:54 +0000 (20:35 +0000)]
Merge branch 'feature_fomichev_erp-384_add_doc_to_bouquet_edit_view' into 'develop'
[ERP-384] Создать раздел"Документации" и добавить ссылку ОС МБ
See merge request gitlab-instance/yii-erp24!747
Aleksey Filippov [Thu, 27 Mar 2025 20:18:56 +0000 (20:18 +0000)]
Merge branch 'feature_fomichev_erp-386_add_text_to_video_dropzone_bouquet' into 'develop'
[ERP-386] Изменить "… (Или щелкните, что бы выбрать файл)" на требования к файлу
See merge request gitlab-instance/yii-erp24!746
Aleksey Filippov [Thu, 27 Mar 2025 16:04:28 +0000 (16:04 +0000)]
Merge branch 'feature_fomichev_erp-324_marketplace_orders' into 'develop'
Feature fomichev erp 324 marketplace orders
See merge request gitlab-instance/yii-erp24!752
fomichev [Thu, 27 Mar 2025 14:55:54 +0000 (17:55 +0300)]
Создание директории
Aleksey Filippov [Thu, 27 Mar 2025 14:43:59 +0000 (14:43 +0000)]
Merge branch 'feature_smirnov_erp-375_spisok_statusov' into 'develop'
[ERP-375] move filter apply buttons
See merge request gitlab-instance/yii-erp24!751
Alexander Smirnov [Thu, 27 Mar 2025 14:37:47 +0000 (17:37 +0300)]
[ERP-375] fix layout
Alexander Smirnov [Thu, 27 Mar 2025 14:31:37 +0000 (17:31 +0300)]
[ERP-375] move filter apply buttons
Aleksey Filippov [Thu, 27 Mar 2025 14:04:54 +0000 (14:04 +0000)]
Merge branch 'feature_smirnov_erp-326_order_to_telegram' into 'develop'
[ERP-326] test telegram send message
See merge request gitlab-instance/yii-erp24!689
Aleksey Filippov [Thu, 27 Mar 2025 13:28:26 +0000 (13:28 +0000)]
Merge branch 'feature_smirnov_erp-375_spisok_statusov' into 'develop'
[ERP-375] statuses filter
See merge request gitlab-instance/yii-erp24!741
Aleksey Filippov [Thu, 27 Mar 2025 13:24:37 +0000 (13:24 +0000)]
Merge branch 'feature_fomichev_erp-371_FW_status_from_email_2' into 'develop'
[ERP-371] Настройка получения статусов из почты по заказам из flowwow
See merge request gitlab-instance/yii-erp24!749
fomichev [Thu, 27 Mar 2025 08:36:15 +0000 (11:36 +0300)]
Изменение логики забора писем - ищем за день и до завтра
fomichev [Wed, 26 Mar 2025 12:48:01 +0000 (15:48 +0300)]
Добавление инструкций и обработка пути без index
fomichev [Wed, 26 Mar 2025 12:34:16 +0000 (15:34 +0300)]
Добавление документации и изменение экшена обработки
fomichev [Wed, 26 Mar 2025 10:16:24 +0000 (13:16 +0300)]
Убрал надпись и сменил на целевую
Aleksey Filippov [Wed, 26 Mar 2025 09:02:54 +0000 (09:02 +0000)]
Merge branch 'feature_fomichev_erp-371_FW_status_from_email_2' into 'develop'
[ERP-371] Настройка получения статусов из почты по заказам из flowwow
See merge request gitlab-instance/yii-erp24!745
fomichev [Wed, 26 Mar 2025 08:57:42 +0000 (11:57 +0300)]
Пометка непросмотренных писем при любых условиях если письмо обработано возвращена
marina [Wed, 26 Mar 2025 06:42:38 +0000 (09:42 +0300)]
ERP-389 ERP-391 Реализовать зависимость от наличия прогноза ОС МБ
Aleksey Filippov [Tue, 25 Mar 2025 16:16:01 +0000 (16:16 +0000)]
Merge branch 'feature_smirnov_erp-372_mp_instruction_dictionary' into 'develop'
[ERP-372] добавлены гуиды
See merge request gitlab-instance/yii-erp24!740
Alexander Smirnov [Tue, 25 Mar 2025 16:08:49 +0000 (19:08 +0300)]
[ERP-372] gen guids
Alexander Smirnov [Tue, 25 Mar 2025 09:56:13 +0000 (12:56 +0300)]
[ERP-375] statuses filter
Aleksey Filippov [Tue, 25 Mar 2025 08:02:20 +0000 (08:02 +0000)]
Merge branch 'feature_fomichev_erp-371_FW_status_from_email_2' into 'develop'
[ERP-371] Alter
See merge request gitlab-instance/yii-erp24!739
Aleksey Filippov [Tue, 25 Mar 2025 06:38:35 +0000 (06:38 +0000)]
Merge branch 'feature_smirnov_erp-372_mp_instruction_dictionary' into 'develop'
[ERP-372] marketplace order status dictionary
See merge request gitlab-instance/yii-erp24!730
Alexander Smirnov [Tue, 25 Mar 2025 06:34:42 +0000 (09:34 +0300)]
Merge branch 'develop' into feature_smirnov_erp-372_mp_instruction_dictionary
# Conflicts:
# erp24/api2/controllers/MarketplaceController.php
Aleksey Filippov [Mon, 24 Mar 2025 20:50:55 +0000 (20:50 +0000)]
Merge branch 'feature_smirnov_erp-373_erp-376_remove_view_and_eye' into 'develop'
[ERP-373][ERP-376] remove eye action and view
See merge request gitlab-instance/yii-erp24!738
fomichev [Mon, 24 Mar 2025 14:46:17 +0000 (17:46 +0300)]
Альтернативный вариант - Переделка логики
fomichev [Mon, 24 Mar 2025 13:01:47 +0000 (16:01 +0300)]
Веб интерфейс проверки почты
fomichev [Mon, 24 Mar 2025 12:57:05 +0000 (15:57 +0300)]
Веб интерфейс проверки почты
Alexander Smirnov [Mon, 24 Mar 2025 12:15:53 +0000 (15:15 +0300)]
[ERP-373][ERP-376] remove eye action and view
fomichev [Mon, 24 Mar 2025 12:10:18 +0000 (15:10 +0300)]
Добавлены ссылки
fomichev [Mon, 24 Mar 2025 11:43:47 +0000 (14:43 +0300)]
Запись писем
Aleksey Filippov [Mon, 24 Mar 2025 08:13:14 +0000 (08:13 +0000)]
Merge branch 'feature_smirnov_erp-310_matrix_statistics' into 'develop'
[ERP-310] fix
See merge request gitlab-instance/yii-erp24!732
Alexander Smirnov [Fri, 21 Mar 2025 15:12:03 +0000 (18:12 +0300)]
[ERP-326] убираю ошибку телеграмма
Alexander Smirnov [Fri, 21 Mar 2025 15:06:04 +0000 (18:06 +0300)]
[ERP-326] fix
Alexander Smirnov [Fri, 21 Mar 2025 14:55:24 +0000 (17:55 +0300)]
[ERP-326] status error
fomichev [Fri, 21 Mar 2025 14:52:47 +0000 (17:52 +0300)]
Таблица с письмами
Alexander Smirnov [Fri, 21 Mar 2025 14:46:59 +0000 (17:46 +0300)]
[ERP-326] test telegram error
Alexander Smirnov [Fri, 21 Mar 2025 13:11:44 +0000 (16:11 +0300)]
[ERP-326] fix
Alexander Smirnov [Fri, 21 Mar 2025 13:03:06 +0000 (16:03 +0300)]
Merge branch 'develop' into feature_smirnov_erp-326_order_to_telegram
# Conflicts:
# erp24/records/MarketplaceOrders.php
Aleksey Filippov [Fri, 21 Mar 2025 12:59:07 +0000 (12:59 +0000)]
Merge branch 'feature_fomichev_erp-371_FW_status_from_email' into 'develop'
[ERP-371] Настройка получения статусов из почты по заказам из flowwow
See merge request gitlab-instance/yii-erp24!735
fomichev [Fri, 21 Mar 2025 12:54:53 +0000 (15:54 +0300)]
Измение и дебагинг
Alexander Smirnov [Fri, 21 Mar 2025 10:13:00 +0000 (13:13 +0300)]
[ERP-326] remove afterSave
Alexander Smirnov [Fri, 21 Mar 2025 09:27:41 +0000 (12:27 +0300)]
[ERP-326] не пересылать повторно
fomichev [Fri, 21 Mar 2025 07:16:58 +0000 (10:16 +0300)]
Чистка кода и рефакторинг
fomichev [Fri, 21 Mar 2025 06:38:44 +0000 (09:38 +0300)]
Чистка кода и рефакторинг
fomichev [Fri, 21 Mar 2025 06:28:42 +0000 (09:28 +0300)]
Исправление статусов 1с в представлениях
fomichev [Thu, 20 Mar 2025 14:52:19 +0000 (17:52 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-371_FW_status_from_email
fomichev [Thu, 20 Mar 2025 13:09:11 +0000 (16:09 +0300)]
Сбор списем из папок
Alexander Smirnov [Thu, 20 Mar 2025 10:03:54 +0000 (13:03 +0300)]
[ERP-326] из afterSave
Aleksey Filippov [Wed, 19 Mar 2025 15:44:22 +0000 (15:44 +0000)]
Merge branch 'feature_smirnov_erp-327_new_orders_for_1c' into 'develop'
[ERP-327] api return count of new orders
See merge request gitlab-instance/yii-erp24!722
fomichev [Wed, 19 Mar 2025 15:21:27 +0000 (18:21 +0300)]
Отладка
Alexander Smirnov [Wed, 19 Mar 2025 13:55:37 +0000 (16:55 +0300)]
[ERP-372] артикул и команда
Alexander Smirnov [Wed, 19 Mar 2025 13:16:56 +0000 (16:16 +0300)]
[ERP-310] очистить фильтры кнопка
Alexander Smirnov [Wed, 19 Mar 2025 12:30:14 +0000 (15:30 +0300)]
[ERP-310] Применить фильтры после нажатия кнопки применить
fomichev [Wed, 19 Mar 2025 08:21:24 +0000 (11:21 +0300)]
Добавление поля email в marketplace_store
fomichev [Tue, 18 Mar 2025 14:46:46 +0000 (17:46 +0300)]
Переписывание логики
fomichev [Tue, 18 Mar 2025 13:08:26 +0000 (16:08 +0300)]
Обработка писем новых заказов
Alexander Smirnov [Tue, 18 Mar 2025 10:12:15 +0000 (13:12 +0300)]
[ERP-372] поправки
Alexander Smirnov [Mon, 17 Mar 2025 16:35:58 +0000 (19:35 +0300)]
[ERP-310] fix
Alexander Smirnov [Mon, 17 Mar 2025 13:46:54 +0000 (16:46 +0300)]
[ERP-372] send statuses to 1c
Alexander Smirnov [Mon, 17 Mar 2025 12:54:52 +0000 (15:54 +0300)]
[ERP-372] add sorting statuses
Aleksey Filippov [Mon, 17 Mar 2025 09:27:03 +0000 (09:27 +0000)]
Merge branch 'feature_fomichev_erp-294_unit_testing_setup' into 'develop'
Настройка юнит тестирования
See merge request gitlab-instance/yii-erp24!731
fomichev [Mon, 17 Mar 2025 08:47:25 +0000 (11:47 +0300)]
Тест сервиса
fomichev [Mon, 17 Mar 2025 08:44:23 +0000 (11:44 +0300)]
Автозагрузка
fomichev [Mon, 17 Mar 2025 08:23:41 +0000 (11:23 +0300)]
Настройки контейнера для imap
fomichev [Mon, 17 Mar 2025 08:22:45 +0000 (11:22 +0300)]
Сохранение данных
Alexander Smirnov [Fri, 14 Mar 2025 15:52:34 +0000 (18:52 +0300)]
[ERP-372] marketplace order status dictionary
fomichev [Fri, 14 Mar 2025 14:06:02 +0000 (17:06 +0300)]
Получение данных из письма
Aleksey Filippov [Fri, 14 Mar 2025 08:26:39 +0000 (08:26 +0000)]
Merge branch 'feature_fomichev_erp-353_send_whatsapp_message_integration' into 'develop'
Изменения тестового режима
See merge request gitlab-instance/yii-erp24!729
fomichev [Fri, 14 Mar 2025 08:20:01 +0000 (11:20 +0300)]
Изменения тестового режима
fomichev [Fri, 14 Mar 2025 08:04:24 +0000 (11:04 +0300)]
Получение почты
Aleksey Filippov [Fri, 14 Mar 2025 06:23:27 +0000 (06:23 +0000)]
Merge branch 'feature_smirnov_2025_03_14_comment_is_null' into 'develop'
comment is not required
See merge request gitlab-instance/yii-erp24!728
Alexander Smirnov [Fri, 14 Mar 2025 06:12:14 +0000 (09:12 +0300)]
comment is not required
Aleksey Filippov [Thu, 13 Mar 2025 13:52:08 +0000 (13:52 +0000)]
Merge branch 'feature_fomichev_erp-338_mp_orders_notifications' into 'develop'
[ERP-338] Уведомление о заказе от Яндекс маркета
See merge request gitlab-instance/yii-erp24!691
fomichev [Thu, 13 Mar 2025 13:47:56 +0000 (16:47 +0300)]
Кнопки для смены статусов только для группы IT
fomichev [Thu, 13 Mar 2025 13:42:21 +0000 (16:42 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-338_mp_orders_notifications
fomichev [Thu, 13 Mar 2025 13:41:57 +0000 (16:41 +0300)]
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# erp24/services/MarketplaceService.php
Aleksey Filippov [Thu, 13 Mar 2025 13:40:41 +0000 (13:40 +0000)]
Merge branch 'feature_fomichev_erp-353_send_whatsapp_message_integration' into 'develop'
При тестировании отправка на тестовые номера
See merge request gitlab-instance/yii-erp24!727
fomichev [Thu, 13 Mar 2025 13:38:36 +0000 (16:38 +0300)]
При тестировании отправка на тестовые номера
Aleksey Filippov [Thu, 13 Mar 2025 11:45:44 +0000 (11:45 +0000)]
Merge branch 'feature_smirnov_erp-356_call_site_api' into 'develop'
[ERP-356] call site api
See merge request gitlab-instance/yii-erp24!723
Aleksey Filippov [Thu, 13 Mar 2025 09:58:19 +0000 (09:58 +0000)]
Merge branch 'feature_filippov_20250313_fix_errer' into 'develop'
исправление , отключение валидации при сохранении заказов в амо
See merge request gitlab-instance/yii-erp24!726
Aleksey Filippov [Thu, 13 Mar 2025 09:57:51 +0000 (12:57 +0300)]
исправление , отключение валидации при сохранении заказов в амо
Aleksey Filippov [Thu, 13 Mar 2025 09:52:18 +0000 (09:52 +0000)]
Merge branch 'feature_smirnov_2025_03_13_error_id_8.3' into 'develop'
различать ошибки
See merge request gitlab-instance/yii-erp24!725
Aleksey Filippov [Thu, 13 Mar 2025 09:49:51 +0000 (09:49 +0000)]
Merge branch 'feature_fomichev_erp-324_marketplace_orders' into 'develop'
Добавил сохранение признака тестового заказа
See merge request gitlab-instance/yii-erp24!721
Alexander Smirnov [Thu, 13 Mar 2025 09:48:46 +0000 (12:48 +0300)]
различать ошибки
Aleksey Filippov [Thu, 13 Mar 2025 09:41:05 +0000 (09:41 +0000)]
Merge branch 'feature_fomichev_erp-300_create_nomenclature_1c_table' into 'develop'
Исправление обработки размера
See merge request gitlab-instance/yii-erp24!698
fomichev [Thu, 13 Mar 2025 06:35:17 +0000 (09:35 +0300)]
Merge remote-tracking branch 'origin/develop' into develop
Aleksey Filippov [Thu, 13 Mar 2025 06:14:41 +0000 (06:14 +0000)]
Merge branch 'feature_fomichev_erp-353_send_whatsapp_message_integration' into 'develop'
[ERP-353] Автоматизация отправки сообщений ватсап из когорт
See merge request gitlab-instance/yii-erp24!718
Alexander Smirnov [Wed, 12 Mar 2025 11:37:55 +0000 (14:37 +0300)]
Merge branch 'develop' into feature_smirnov_erp-356_call_site_api
Alexander Smirnov [Wed, 12 Mar 2025 11:35:32 +0000 (14:35 +0300)]
Merge branch 'develop' into feature_smirnov_erp-326_order_to_telegram
# Conflicts:
# erp24/records/MarketplaceOrders.php
Alexander Smirnov [Wed, 12 Mar 2025 11:31:52 +0000 (14:31 +0300)]
[ERP-356] prepare to test
Alexander Smirnov [Tue, 11 Mar 2025 11:38:32 +0000 (14:38 +0300)]
[ERP-327] результат от store_guid
fomichev [Tue, 11 Mar 2025 10:21:41 +0000 (13:21 +0300)]
Правки и добавление метода обновления лимита
Alexander Smirnov [Tue, 11 Mar 2025 07:58:12 +0000 (10:58 +0300)]
[ERP-327] api return count of new orders
fomichev [Tue, 11 Mar 2025 06:27:03 +0000 (09:27 +0300)]
Добавил сохранение признака тестового заказа
fomichev [Mon, 10 Mar 2025 14:49:05 +0000 (17:49 +0300)]
Добавил сохранение свойства тестовых заказов
projects / erp24_rep / yii-erp24 / .git / log