]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
Alexander Smirnov [Fri, 14 Mar 2025 06:24:39 +0000 (09:24 +0300)]
[ERP-370] поправил логику 2
Alexander Smirnov [Thu, 13 Mar 2025 16:33:25 +0000 (19:33 +0300)]
[ERP-370] поправил логику
Alexander Smirnov [Thu, 13 Mar 2025 10:51:25 +0000 (13:51 +0300)]
[ERP-370] command to active=0 excessive prices dynamics
Alexander Smirnov [Thu, 13 Mar 2025 07:22:37 +0000 (10:22 +0300)]
[ERP-370] fix
Alexander Smirnov [Wed, 12 Mar 2025 20:31:32 +0000 (23:31 +0300)]
[ERP-370] поправка getPriceDynamic с новым параметром regionId
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
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
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 09:43:44 +0000 (12:43 +0300)]
Добавление колонок в marketplace_orders
fomichev [Fri, 7 Mar 2025 09:33:06 +0000 (12:33 +0300)]
Добавление колонок в marketplace_orders
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)]
Добавление гуида
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
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
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)]
дебаг
Alexander Smirnov [Tue, 4 Mar 2025 14:57:48 +0000 (17:57 +0300)]
[ERP-356] call site api from mq
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
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
fomichev [Mon, 3 Mar 2025 09:21:25 +0000 (12:21 +0300)]
Добавление ссылок на документацию
Alexander Smirnov [Fri, 28 Feb 2025 14:25:16 +0000 (17:25 +0300)]
[ERP-310] расчёт total 3
Aleksey Filippov [Fri, 28 Feb 2025 14:15:25 +0000 (14:15 +0000)]
Merge branch 'fix_fomichev_20250228_telegram_error_msg_format' into 'develop'
Исправление caption сообщений в телеграм
See merge request gitlab-instance/yii-erp24!707
fomichev [Fri, 28 Feb 2025 13:43:42 +0000 (16:43 +0300)]
Исправление caption сообщений в телеграм
Alexander Smirnov [Fri, 28 Feb 2025 13:24:54 +0000 (16:24 +0300)]
[ERP-310] расчёт total 2
Alexander Smirnov [Fri, 28 Feb 2025 13:15:54 +0000 (16:15 +0300)]
[ERP-310] расчёт total
Alexander Smirnov [Fri, 28 Feb 2025 12:33:32 +0000 (15:33 +0300)]
Merge branch 'develop' into feature_smirnov_erp-310_matrix_statistics
Aleksey Filippov [Fri, 28 Feb 2025 11:35:43 +0000 (11:35 +0000)]
Merge branch 'fix_fomichev_20250228_telegram_error_msg_format' into 'develop'
Исправление caption сообщений в телеграм
See merge request gitlab-instance/yii-erp24!706
fomichev [Fri, 28 Feb 2025 11:33:04 +0000 (14:33 +0300)]
Исправление caption сообщений в телеграм
Aleksey Filippov [Fri, 28 Feb 2025 11:31:47 +0000 (11:31 +0000)]
Merge branch 'fomichev_feature_erp-328_change_status_order' into 'develop'
Исправление стилизации меток и кнопок
See merge request gitlab-instance/yii-erp24!705
fomichev [Fri, 28 Feb 2025 11:22:19 +0000 (14:22 +0300)]
Исправление стилизации меток и кнопок
Aleksey Filippov [Fri, 28 Feb 2025 08:45:09 +0000 (08:45 +0000)]
Merge branch 'fomichev_feature_erp-328_change_status_order' into 'develop'
Исправление деактивации истории и тестирование
See merge request gitlab-instance/yii-erp24!704
fomichev [Fri, 28 Feb 2025 08:36:39 +0000 (11:36 +0300)]
Исправление деактивации истории и тестирование
Aleksey Filippov [Fri, 28 Feb 2025 07:50:09 +0000 (07:50 +0000)]
Merge branch 'feature_smirnov_2025_02_28_full_js_css_summernote' into 'develop'
полные версии summernote
See merge request gitlab-instance/yii-erp24!703
Alexander Smirnov [Fri, 28 Feb 2025 07:48:00 +0000 (10:48 +0300)]
полные версии summernote
Aleksey Filippov [Fri, 28 Feb 2025 06:20:16 +0000 (06:20 +0000)]
Merge branch 'fomichev_feature_erp-328_change_status_order' into 'develop'
Исправление данных в конструкторе
See merge request gitlab-instance/yii-erp24!702
Aleksey Filippov [Thu, 27 Feb 2025 19:40:42 +0000 (22:40 +0300)]
Отключение логирования без условий и признаков даты
fomichev [Thu, 27 Feb 2025 15:11:51 +0000 (18:11 +0300)]
Исправление данных в конструкторе
Aleksey Filippov [Thu, 27 Feb 2025 13:16:33 +0000 (13:16 +0000)]
Merge branch 'fixes_for_302' into 'develop'
ERP-302 Редактирование букета
See merge request gitlab-instance/yii-erp24!701
marina [Thu, 27 Feb 2025 13:14:40 +0000 (16:14 +0300)]
ERP-302 Редактирование букета
Aleksey Filippov [Thu, 27 Feb 2025 12:17:12 +0000 (12:17 +0000)]
Merge branch 'feature-erp_302-fixes' into 'develop'
ERP-302 Редактирование букета
See merge request gitlab-instance/yii-erp24!696
Alexander Smirnov [Thu, 27 Feb 2025 12:06:52 +0000 (15:06 +0300)]
[ERP-327] new orders for 1c
Aleksey Filippov [Thu, 27 Feb 2025 11:51:28 +0000 (11:51 +0000)]
Merge branch 'fomichev_feature_erp-328_change_status_order' into 'develop'
Исправление типа контента
See merge request gitlab-instance/yii-erp24!699
fomichev [Thu, 27 Feb 2025 11:48:02 +0000 (14:48 +0300)]
Исправление типа контента
Aleksey Filippov [Thu, 27 Feb 2025 09:19:54 +0000 (09:19 +0000)]
Merge branch 'fomichev_feature_erp-328_change_status_order' into 'develop'
[ERP-328] Смена статуса заказа из ERP в МП
See merge request gitlab-instance/yii-erp24!697
fomichev [Thu, 27 Feb 2025 09:06:40 +0000 (12:06 +0300)]
Исправления и тестовый код
marina [Thu, 27 Feb 2025 07:38:57 +0000 (10:38 +0300)]
ERP-302 Редактирование букета
marina [Thu, 27 Feb 2025 07:30:44 +0000 (10:30 +0300)]
ERP-302 Редактирование букета
marina [Thu, 27 Feb 2025 07:28:35 +0000 (10:28 +0300)]
ERP-302 Редактирование букета
Aleksey Filippov [Wed, 26 Feb 2025 14:58:57 +0000 (14:58 +0000)]
Merge branch 'feature_smirnov_erp-305_response_on_category_plan' into 'develop'
[ERP-305] bug 2
See merge request gitlab-instance/yii-erp24!695
Alexander Smirnov [Wed, 26 Feb 2025 14:57:21 +0000 (17:57 +0300)]
[ERP-305] bug 2
Aleksey Filippov [Wed, 26 Feb 2025 14:52:12 +0000 (14:52 +0000)]
Merge branch 'feature_smirnov_erp-305_response_on_category_plan' into 'develop'
[ERP-305] bug
See merge request gitlab-instance/yii-erp24!694
Alexander Smirnov [Wed, 26 Feb 2025 14:46:39 +0000 (17:46 +0300)]
[ERP-305] bug
fomichev [Wed, 26 Feb 2025 12:40:11 +0000 (15:40 +0300)]
Логирование в файл
projects / erp24_rep / yii-erp24 / .git / log