]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
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)]
Изменения тестового режима
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:31:52 +0000 (14:31 +0300)]
[ERP-356] prepare to test
fomichev [Tue, 11 Mar 2025 10:21:41 +0000 (13:21 +0300)]
Правки и добавление метода обновления лимита
fomichev [Tue, 11 Mar 2025 06:27:03 +0000 (09:27 +0300)]
Добавил сохранение признака тестового заказа
fomichev [Mon, 10 Mar 2025 14:49:05 +0000 (17:49 +0300)]
Добавил сохранение свойства тестовых заказов
Aleksey Filippov [Mon, 10 Mar 2025 12:07:15 +0000 (12:07 +0000)]
Merge branch 'feature_fomichev_erp-324_marketplace_orders' into 'develop'
Добавление колонок в marketplace_orders
See merge request gitlab-instance/yii-erp24!717
fomichev [Mon, 10 Mar 2025 10:14:03 +0000 (13:14 +0300)]
Статус в БД
fomichev [Mon, 10 Mar 2025 07:05:51 +0000 (10:05 +0300)]
Правки и улучшения генерации и вывода
Aleksey Filippov [Fri, 7 Mar 2025 16:26:11 +0000 (16:26 +0000)]
Merge branch 'feature_smirnov_erp-356_call_site_api' into 'develop'
[ERP-356] call site api
See merge request gitlab-instance/yii-erp24!719
Alexander Smirnov [Fri, 7 Mar 2025 16:25:18 +0000 (19:25 +0300)]
remove txt
Alexander Smirnov [Fri, 7 Mar 2025 16:24:22 +0000 (19:24 +0300)]
gitignore
Alexander Smirnov [Fri, 7 Mar 2025 16:21:02 +0000 (19:21 +0300)]
[ERP-356] things
Alexander Smirnov [Fri, 7 Mar 2025 16:15:20 +0000 (19:15 +0300)]
[ERP-356] remove excessive strings
Alexander Smirnov [Fri, 7 Mar 2025 16:05:19 +0000 (19:05 +0300)]
[ERP-356] remove debug info
Alexander Smirnov [Fri, 7 Mar 2025 15:58:50 +0000 (18:58 +0300)]
[ERP-356] environment for api2
Alexander Smirnov [Fri, 7 Mar 2025 15:52:34 +0000 (18:52 +0300)]
debug 5
Alexander Smirnov [Fri, 7 Mar 2025 15:43:51 +0000 (18:43 +0300)]
[ERP-356] .env
Alexander Smirnov [Fri, 7 Mar 2025 15:35:45 +0000 (18:35 +0300)]
[ERP-356] only once
Alexander Smirnov [Fri, 7 Mar 2025 15:29:43 +0000 (18:29 +0300)]
[ERP-356] without queue
Alexander Smirnov [Fri, 7 Mar 2025 15:18:01 +0000 (18:18 +0300)]
[ERP-356] final debug
Alexander Smirnov [Fri, 7 Mar 2025 15:15:54 +0000 (18:15 +0300)]
[ERP-356] debug 5
Alexander Smirnov [Fri, 7 Mar 2025 15:14:06 +0000 (18:14 +0300)]
[ERP-356] debug 4
fomichev [Fri, 7 Mar 2025 15:11:48 +0000 (18:11 +0300)]
Удаление записей при перегенерации
Alexander Smirnov [Fri, 7 Mar 2025 15:07:09 +0000 (18:07 +0300)]
[ERP-356] debug 3
Alexander Smirnov [Fri, 7 Mar 2025 14:57:34 +0000 (17:57 +0300)]
[ERP-356] deubug 2
Alexander Smirnov [Fri, 7 Mar 2025 14:52:58 +0000 (17:52 +0300)]
[ERP-356] debug
Alexander Smirnov [Fri, 7 Mar 2025 14:45:27 +0000 (17:45 +0300)]
[ERP-356] debug
Alexander Smirnov [Fri, 7 Mar 2025 14:33:39 +0000 (17:33 +0300)]
[ERP-356] debug
Alexander Smirnov [Fri, 7 Mar 2025 14:00:26 +0000 (17:00 +0300)]
[ERP-356] debug
Alexander Smirnov [Fri, 7 Mar 2025 13:49:37 +0000 (16:49 +0300)]
debug
Aleksey Filippov [Fri, 7 Mar 2025 13:13:02 +0000 (13:13 +0000)]
Merge branch 'feature_smirnov_erp-356_call_site_api' into 'develop'
[ERP-356] call site api
See merge request gitlab-instance/yii-erp24!711
fomichev [Fri, 7 Mar 2025 12:45:25 +0000 (15:45 +0300)]
Замена телефонов когорты на тестовые
fomichev [Fri, 7 Mar 2025 11:20:29 +0000 (14:20 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-353_send_whatsapp_message_integration
fomichev [Fri, 7 Mar 2025 11:19:52 +0000 (14:19 +0300)]
Подготовка к тестированию
fomichev [Fri, 7 Mar 2025 09:43:44 +0000 (12:43 +0300)]
Добавление колонок в marketplace_orders
fomichev [Fri, 7 Mar 2025 09:33:06 +0000 (12:33 +0300)]
Добавление колонок в marketplace_orders
fomichev [Fri, 7 Mar 2025 08:43:23 +0000 (11:43 +0300)]
Перенос настроек
Aleksey Filippov [Thu, 6 Mar 2025 15:13:24 +0000 (15:13 +0000)]
Merge branch 'feature_fomichev_erp-324_marketplace_orders' into 'develop'
Добавление гуида
See merge request gitlab-instance/yii-erp24!715
fomichev [Thu, 6 Mar 2025 15:09:10 +0000 (18:09 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-324_marketplace_orders
# Conflicts:
# erp24/.gitignore
fomichev [Thu, 6 Mar 2025 15:06:21 +0000 (18:06 +0300)]
Добавление гуида
fomichev [Thu, 6 Mar 2025 14:45:03 +0000 (17:45 +0300)]
Настройки вотсап
Alexander Smirnov [Thu, 6 Mar 2025 08:10:23 +0000 (11:10 +0300)]
debug
Alexander Smirnov [Thu, 6 Mar 2025 07:59:38 +0000 (10:59 +0300)]
debug
Alexander Smirnov [Thu, 6 Mar 2025 07:52:54 +0000 (10:52 +0300)]
debug
Alexander Smirnov [Thu, 6 Mar 2025 07:39:14 +0000 (10:39 +0300)]
debug
fomichev [Wed, 5 Mar 2025 15:03:15 +0000 (18:03 +0300)]
Тестирование отправки из когорт
fomichev [Wed, 5 Mar 2025 11:01:08 +0000 (14:01 +0300)]
Исправления в отправке и сохранении
fomichev [Wed, 5 Mar 2025 07:34:48 +0000 (10:34 +0300)]
Сообщения
Aleksey Filippov [Wed, 5 Mar 2025 07:09:45 +0000 (07:09 +0000)]
Merge branch 'feature_smirnov_erp-310_matrix_statistics' into 'develop'
[ERP-310] matrix statistics
See merge request gitlab-instance/yii-erp24!693
fomichev [Wed, 5 Mar 2025 06:59:37 +0000 (09:59 +0300)]
Callback
Aleksey Filippov [Wed, 5 Mar 2025 06:56:32 +0000 (06:56 +0000)]
Merge branch 'feature_smirnov_erp-357_non_bonusable_goods' into 'develop'
[ERP-357] non_bonusable_goods
See merge request gitlab-instance/yii-erp24!712
Alexander Smirnov [Tue, 4 Mar 2025 15:42:38 +0000 (18:42 +0300)]
[ERP-357] sale test
Alexander Smirnov [Tue, 4 Mar 2025 15:39:21 +0000 (18:39 +0300)]
дебаг 10
Alexander Smirnov [Tue, 4 Mar 2025 15:33:42 +0000 (18:33 +0300)]
дебаг 9
Alexander Smirnov [Tue, 4 Mar 2025 15:26:51 +0000 (18:26 +0300)]
дебаг 8
Alexander Smirnov [Tue, 4 Mar 2025 15:24:24 +0000 (18:24 +0300)]
дебаг 7
Alexander Smirnov [Tue, 4 Mar 2025 15:19:15 +0000 (18:19 +0300)]
дебаг 6
Alexander Smirnov [Tue, 4 Mar 2025 15:17:53 +0000 (18:17 +0300)]
дебаг 5
Alexander Smirnov [Tue, 4 Mar 2025 15:14:17 +0000 (18:14 +0300)]
дебаг 4
Alexander Smirnov [Tue, 4 Mar 2025 15:13:19 +0000 (18:13 +0300)]
дебаг 3
Alexander Smirnov [Tue, 4 Mar 2025 15:10:14 +0000 (18:10 +0300)]
дебаг 2
Alexander Smirnov [Tue, 4 Mar 2025 15:08:08 +0000 (18:08 +0300)]
дебаг
fomichev [Tue, 4 Mar 2025 15:05:28 +0000 (18:05 +0300)]
Тестирование апи
Alexander Smirnov [Tue, 4 Mar 2025 14:57:48 +0000 (17:57 +0300)]
[ERP-356] call site api from mq
fomichev [Tue, 4 Mar 2025 14:25:54 +0000 (17:25 +0300)]
Отправка сообщений
Aleksey Filippov [Tue, 4 Mar 2025 13:51:54 +0000 (13:51 +0000)]
Merge branch 'undisabled_buttons_on_bouquets' into 'develop'
ERP-302 Редактирование букета
See merge request gitlab-instance/yii-erp24!713
marina [Tue, 4 Mar 2025 13:50:24 +0000 (16:50 +0300)]
ERP-302 Редактирование букета
Alexander Smirnov [Tue, 4 Mar 2025 12:55:36 +0000 (15:55 +0300)]
[ERP-357] non_bonusable_goods
Alexander Smirnov [Tue, 4 Mar 2025 09:57:58 +0000 (12:57 +0300)]
[ERP-310] проценты
Aleksey Filippov [Tue, 4 Mar 2025 07:47:53 +0000 (07:47 +0000)]
Merge branch 'feature_smirnov_erp-327_new_orders_for_1c' into 'develop'
[ERP-327] new orders for 1c
See merge request gitlab-instance/yii-erp24!700
fomichev [Mon, 3 Mar 2025 15:12:32 +0000 (18:12 +0300)]
Таблица для хранения сообщений
Alexander Smirnov [Mon, 3 Mar 2025 14:27:02 +0000 (17:27 +0300)]
[ERP-356] dev1 7
Alexander Smirnov [Mon, 3 Mar 2025 14:25:23 +0000 (17:25 +0300)]
[ERP-356] dev1 6
Alexander Smirnov [Mon, 3 Mar 2025 14:23:03 +0000 (17:23 +0300)]
[ERP-356] dev1 5
Alexander Smirnov [Mon, 3 Mar 2025 14:19:23 +0000 (17:19 +0300)]
[ERP-356] dev1 4
Alexander Smirnov [Mon, 3 Mar 2025 14:17:10 +0000 (17:17 +0300)]
[ERP-356] dev1 3
Alexander Smirnov [Mon, 3 Mar 2025 14:10:55 +0000 (17:10 +0300)]
[ERP-356] dev1 2
Alexander Smirnov [Mon, 3 Mar 2025 13:51:26 +0000 (16:51 +0300)]
[ERP-356] dev1
Alexander Smirnov [Mon, 3 Mar 2025 13:49:55 +0000 (16:49 +0300)]
[ERP-356] call site api
Aleksey Filippov [Mon, 3 Mar 2025 09:44:44 +0000 (09:44 +0000)]
Merge branch 'feature_filippov_20250227_log_disable' into 'develop'
Отключение логирования без условий и признаков даты
See merge request gitlab-instance/yii-erp24!710
Aleksey Filippov [Mon, 3 Mar 2025 09:39:31 +0000 (09:39 +0000)]
Merge branch 'feature_fomichev_erp-307_wiki_doc_pages' into 'develop'
Добавление ссылок на документацию
See merge request gitlab-instance/yii-erp24!709
projects / erp24_rep / yii-erp24 / .git / log