]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
fomichev [Fri, 18 Apr 2025 09:46:13 +0000 (12:46 +0300)]
Проверка на артикул
fomichev [Fri, 18 Apr 2025 09:34:07 +0000 (12:34 +0300)]
Тестовый заказ
Aleksey Filippov [Wed, 16 Apr 2025 14:38:36 +0000 (14:38 +0000)]
Merge branch 'feature_fomichev_erp-380_add_lightbox_to_image_bouquetr' into 'develop'
Feature fomichev erp 380 add lightbox to image bouquetr
See merge request gitlab-instance/yii-erp24!792
fomichev [Wed, 16 Apr 2025 14:31:26 +0000 (17:31 +0300)]
Разделение галлерей
fomichev [Wed, 16 Apr 2025 13:39:40 +0000 (16:39 +0300)]
Видео проигрыватель
fomichev [Wed, 16 Apr 2025 13:31:32 +0000 (16:31 +0300)]
Видео проигрыватель
Aleksey Filippov [Wed, 16 Apr 2025 06:39:30 +0000 (06:39 +0000)]
Merge branch 'fix_null_check_on_store' into 'develop'
правка проверки на налл
See merge request gitlab-instance/yii-erp24!720
Aleksey Filippov [Tue, 15 Apr 2025 12:16:36 +0000 (12:16 +0000)]
Merge branch 'feature_smirnov_2025_04_15_log_http_result' into 'develop'
add http_code. needs migrate
See merge request gitlab-instance/yii-erp24!789
Alexander Smirnov [Tue, 15 Apr 2025 12:01:41 +0000 (15:01 +0300)]
add http_code. needs migrate
Aleksey Filippov [Tue, 15 Apr 2025 11:54:26 +0000 (11:54 +0000)]
Merge branch 'feature_smirnov_debug_2025_04_25' into 'develop'
debug
See merge request gitlab-instance/yii-erp24!788
Alexander Smirnov [Tue, 15 Apr 2025 11:37:06 +0000 (14:37 +0300)]
debug
Aleksey Filippov [Tue, 15 Apr 2025 11:10:16 +0000 (11:10 +0000)]
Merge branch 'feature_smirnov_erp-399_matrix_erp_property_dynamic' into 'develop'
[ERP-399] matrix_erp_property_dynamic
See merge request gitlab-instance/yii-erp24!786
Alexander Smirnov [Tue, 15 Apr 2025 11:08:08 +0000 (14:08 +0300)]
[ERP-399] matrixerp components fillment
Alexander Smirnov [Tue, 15 Apr 2025 09:54:11 +0000 (12:54 +0300)]
[ERP-399] refactor 2
Aleksey Filippov [Tue, 15 Apr 2025 09:36:23 +0000 (09:36 +0000)]
Merge branch 'feature_smirnov_2025_04_15_disable_warning' into 'develop'
disable warning
See merge request gitlab-instance/yii-erp24!787
Alexander Smirnov [Tue, 15 Apr 2025 09:32:24 +0000 (12:32 +0300)]
disable warning
Alexander Smirnov [Tue, 15 Apr 2025 09:29:41 +0000 (12:29 +0300)]
[ERP-399] fix
Alexander Smirnov [Tue, 15 Apr 2025 09:27:12 +0000 (12:27 +0300)]
[ERP-399] refactor
Alexander Smirnov [Mon, 14 Apr 2025 11:39:56 +0000 (14:39 +0300)]
[ERP-399] matrix_erp_property_dynamic
Aleksey Filippov [Mon, 14 Apr 2025 09:18:42 +0000 (09:18 +0000)]
Merge branch 'feature_fomichev_erp-2025-04-14_add_server_name_to_env' into 'develop'
Feature fomichev erp 2025 04 14 add server name to env
See merge request gitlab-instance/yii-erp24!785
fomichev [Mon, 14 Apr 2025 08:11:19 +0000 (11:11 +0300)]
Вывод SERVER_NAME в TelegramTarget.php
fomichev [Mon, 14 Apr 2025 08:07:00 +0000 (11:07 +0300)]
Добавил SERVER_NAME в env
Aleksey Filippov [Mon, 14 Apr 2025 08:04:15 +0000 (08:04 +0000)]
Merge branch 'feature_fomichev_erp-344_cancel_order_from_1C' into 'develop'
Добавил очереди в bootstrap
See merge request gitlab-instance/yii-erp24!784
fomichev [Mon, 14 Apr 2025 08:02:31 +0000 (11:02 +0300)]
Добавил очереди в bootstrap
Aleksey Filippov [Mon, 14 Apr 2025 07:20:10 +0000 (07:20 +0000)]
Merge branch 'feature_fomichev_erp-344_cancel_order_from_1C' into 'develop'
344 Настройки для очередей
See merge request gitlab-instance/yii-erp24!783
fomichev [Thu, 10 Apr 2025 15:01:00 +0000 (18:01 +0300)]
Настройки для очередей
Aleksey Filippov [Thu, 10 Apr 2025 14:12:51 +0000 (14:12 +0000)]
Merge branch 'feature_fomichev_erp-366_calculate_history_share_product_species' into 'develop'
[ERP-366] Создать логику расчета на месяц для доли товара с историей
See merge request gitlab-instance/yii-erp24!782
fomichev [Thu, 10 Apr 2025 09:41:40 +0000 (12:41 +0300)]
Правки контроллера и представления
fomichev [Thu, 10 Apr 2025 09:10:48 +0000 (12:10 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-366_calculate_history_share_product_species
fomichev [Thu, 10 Apr 2025 06:40:23 +0000 (09:40 +0300)]
Добавление года в метод для расчета истории
fomichev [Thu, 10 Apr 2025 06:37:45 +0000 (09:37 +0300)]
Добавление года в метод для расчета истории
fomichev [Wed, 9 Apr 2025 14:36:21 +0000 (17:36 +0300)]
Правки в подсчете активных недель
fomichev [Wed, 9 Apr 2025 14:20:38 +0000 (17:20 +0300)]
Правки в представлении
fomichev [Wed, 9 Apr 2025 13:40:00 +0000 (16:40 +0300)]
Правки в контроллере
fomichev [Wed, 9 Apr 2025 13:24:53 +0000 (16:24 +0300)]
Выделение функций и правки по коду
Aleksey Filippov [Wed, 9 Apr 2025 12:05:02 +0000 (12:05 +0000)]
Merge branch 'feature_fomichev_erp-344_cancel_order_from_1C' into 'develop'
Получение статусов из ответа
See merge request gitlab-instance/yii-erp24!781
fomichev [Wed, 9 Apr 2025 11:52:06 +0000 (14:52 +0300)]
Тестирование и справление
fomichev [Wed, 9 Apr 2025 11:00:28 +0000 (14:00 +0300)]
Получение статусов из ответа
fomichev [Wed, 9 Apr 2025 08:58:29 +0000 (11:58 +0300)]
Подсчет цены
Aleksey Filippov [Wed, 9 Apr 2025 07:54:26 +0000 (07:54 +0000)]
Merge branch 'feature_fomichev_erp-344_cancel_order_from_1C' into 'develop'
[ERP-344] Реализовать логику для отказа от покупки через МП - заказы с МП
See merge request gitlab-instance/yii-erp24!743
fomichev [Wed, 9 Apr 2025 07:46:49 +0000 (10:46 +0300)]
Убрал подстатус из запроса
fomichev [Wed, 9 Apr 2025 07:17:42 +0000 (10:17 +0300)]
Вычисление средней цены
fomichev [Wed, 9 Apr 2025 07:16:14 +0000 (10:16 +0300)]
Вычисление средней цены
fomichev [Wed, 9 Apr 2025 07:13:05 +0000 (10:13 +0300)]
Вычисление средней цены
fomichev [Wed, 9 Apr 2025 07:11:27 +0000 (10:11 +0300)]
Вычисление средней цены
Aleksey Filippov [Wed, 9 Apr 2025 07:11:14 +0000 (07:11 +0000)]
Merge branch 'feature_smirnov_erp-331_request_orders' into 'develop'
[ERP-331] add productsNames
See merge request gitlab-instance/yii-erp24!779
fomichev [Wed, 9 Apr 2025 07:07:05 +0000 (10:07 +0300)]
Вычисление средней цены
fomichev [Wed, 9 Apr 2025 06:44:28 +0000 (09:44 +0300)]
Вычисление средней цены
fomichev [Tue, 8 Apr 2025 15:04:26 +0000 (18:04 +0300)]
Вернул статус в миграции
fomichev [Tue, 8 Apr 2025 15:00:55 +0000 (18:00 +0300)]
Влкючение отправки статуса
Alexander Smirnov [Tue, 8 Apr 2025 14:45:09 +0000 (17:45 +0300)]
[ERP-331] add productsNames
fomichev [Tue, 8 Apr 2025 14:32:54 +0000 (17:32 +0300)]
добавление цен и исправление недель
fomichev [Tue, 8 Apr 2025 10:28:16 +0000 (13:28 +0300)]
Добавление поля 'status_processing_1c'
fomichev [Tue, 8 Apr 2025 07:14:13 +0000 (10:14 +0300)]
Товары с историей
Aleksey Filippov [Mon, 7 Apr 2025 11:38:20 +0000 (11:38 +0000)]
Merge branch 'feature_smirnov_erp-flwr-133_questionary' into 'develop'
[FLWR-133] questionary quest001
See merge request gitlab-instance/yii-erp24!777
Alexander Smirnov [Mon, 7 Apr 2025 10:15:56 +0000 (13:15 +0300)]
[FLWR-133] questionary quest001
fomichev [Mon, 7 Apr 2025 09:41:56 +0000 (12:41 +0300)]
Возвращаем точное вхождение по доп характеристикам
fomichev [Mon, 7 Apr 2025 09:29:27 +0000 (12:29 +0300)]
Убрал точное вхождение
fomichev [Mon, 7 Apr 2025 07:11:55 +0000 (10:11 +0300)]
Анализ товаров с историей
fomichev [Mon, 7 Apr 2025 07:03:57 +0000 (10:03 +0300)]
Анализ товаров без истории
fomichev [Mon, 7 Apr 2025 07:01:12 +0000 (10:01 +0300)]
Анализ товаров без истории
fomichev [Sun, 6 Apr 2025 20:16:13 +0000 (23:16 +0300)]
Анализ товаров без истории
fomichev [Fri, 4 Apr 2025 14:35:49 +0000 (17:35 +0300)]
Получение товров с историей и без
fomichev [Fri, 4 Apr 2025 13:29:08 +0000 (16:29 +0300)]
Получение подкатегорий и видов
Marina Zozirova [Fri, 4 Apr 2025 13:25:37 +0000 (13:25 +0000)]
Merge branch 'feature_smirnov_erp-397_logs' into 'develop'
[ERP-397] logs
See merge request gitlab-instance/yii-erp24!776
Alexander Smirnov [Fri, 4 Apr 2025 13:09:18 +0000 (16:09 +0300)]
[ERP-397] logs
Marina Zozirova [Fri, 4 Apr 2025 12:32:25 +0000 (12:32 +0000)]
Merge branch 'feature_fomichev_erp-380_add_lightbox_to_image_bouquetr' into 'develop'
Feature fomichev erp 380 add lightbox to image bouquetr
See merge request gitlab-instance/yii-erp24!774
Marina Zozirova [Fri, 4 Apr 2025 12:20:34 +0000 (12:20 +0000)]
Merge branch 'feature_smirnov_erp-396_excel_to_numenclatur_replacement' into 'develop'
[ERP-396] product replacement import from excel
See merge request gitlab-instance/yii-erp24!775
Alexander Smirnov [Fri, 4 Apr 2025 11:57:59 +0000 (14:57 +0300)]
[ERP-396] view=1
Alexander Smirnov [Fri, 4 Apr 2025 11:53:27 +0000 (14:53 +0300)]
[ERP-396] template
Alexander Smirnov [Fri, 4 Apr 2025 11:50:04 +0000 (14:50 +0300)]
[ERP-396] timebehvaior
Alexander Smirnov [Fri, 4 Apr 2025 11:36:59 +0000 (14:36 +0300)]
[ERP-396] product replacement import from excel
fomichev [Fri, 4 Apr 2025 08:09:22 +0000 (11:09 +0300)]
Проверка наличия миниатюр
fomichev [Fri, 4 Apr 2025 08:03:18 +0000 (11:03 +0300)]
Метод для получения товаров
fomichev [Thu, 3 Apr 2025 14:42:46 +0000 (17:42 +0300)]
фэнсибокс для видео
fomichev [Thu, 3 Apr 2025 13:41:29 +0000 (16:41 +0300)]
Замена лайтбокс на фэнсибокс для видео
fomichev [Thu, 3 Apr 2025 08:22:34 +0000 (11:22 +0300)]
Лайтбокс для видео
Marina Zozirova [Thu, 3 Apr 2025 08:13:46 +0000 (08:13 +0000)]
Merge branch 'feature_smirnov_erp-381_edit_price_and_show_nacenka' into 'develop'
[ERP-381] fix price
See merge request gitlab-instance/yii-erp24!768
Alexander Smirnov [Thu, 3 Apr 2025 07:51:06 +0000 (10:51 +0300)]
Merge branch 'develop' into feature_smirnov_erp-381_edit_price_and_show_nacenka
# Conflicts:
# erp24/views/bouquet/index.php
Marina Zozirova [Thu, 3 Apr 2025 07:28:26 +0000 (07:28 +0000)]
Merge branch 'feature_smirnov_erp-378_control_access_for_statuses' into 'develop'
[ERP-378] notOnlyApprovedAndCreatedIn1C001
See merge request gitlab-instance/yii-erp24!772
Marina Zozirova [Thu, 3 Apr 2025 07:26:55 +0000 (07:26 +0000)]
Merge branch 'feature_fomichev_erp-385_show_stores_with_forecast' into 'develop'
Скрытие магазинов без значений прогноза
See merge request gitlab-instance/yii-erp24!773
Marina Zozirova [Thu, 3 Apr 2025 07:25:48 +0000 (07:25 +0000)]
Merge branch 'feature_fomichev_erp-380_add_lightbox_to_image_bouquetr' into 'develop'
[ERP-380] Добавить вызов отдельного окна просмотра медиа ОС МБ
See merge request gitlab-instance/yii-erp24!765
fomichev [Wed, 2 Apr 2025 14:44:41 +0000 (17:44 +0300)]
Скрытие магазинов без значений прогноза
Alexander Smirnov [Wed, 2 Apr 2025 14:28:32 +0000 (17:28 +0300)]
[ERP-378] add status error
Alexander Smirnov [Wed, 2 Apr 2025 13:10:17 +0000 (16:10 +0300)]
[ERP-378] notOnlyApprovedAndCreatedIn1C001 2
Alexander Smirnov [Wed, 2 Apr 2025 13:00:17 +0000 (16:00 +0300)]
[ERP-378] notOnlyApprovedAndCreatedIn1C001
fomichev [Wed, 2 Apr 2025 09:17:37 +0000 (12:17 +0300)]
Перевод статусов заказов на таблицу marketplace_order_1c_statuses
fomichev [Tue, 1 Apr 2025 13:01:01 +0000 (16:01 +0300)]
Получение массива заказов от 1С
Marina Zozirova [Tue, 1 Apr 2025 11:06:26 +0000 (11:06 +0000)]
Merge branch 'feature_smirnov_erp-394_check_after_btn_press_amo' into 'develop'
[ERP-394] fixes
See merge request gitlab-instance/yii-erp24!770
Alexander Smirnov [Tue, 1 Apr 2025 10:57:02 +0000 (13:57 +0300)]
[ERP-394] fixes 2
Alexander Smirnov [Tue, 1 Apr 2025 10:55:39 +0000 (13:55 +0300)]
[ERP-394] fixes
Alexander Smirnov [Tue, 1 Apr 2025 10:47:59 +0000 (13:47 +0300)]
[ERP-394] debug 10
Marina Zozirova [Tue, 1 Apr 2025 10:20:43 +0000 (10:20 +0000)]
Merge branch 'feature_smirnov_erp-394_check_after_btn_press_amo' into 'develop'
[ERP-393] fix orders delivery print check
See merge request gitlab-instance/yii-erp24!769
fomichev [Tue, 1 Apr 2025 10:20:16 +0000 (13:20 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-392_get_orders_statuses_1C
# Conflicts:
# erp24/records/MarketplaceOrders.php
Alexander Smirnov [Tue, 1 Apr 2025 10:08:18 +0000 (13:08 +0300)]
[ERP-394] debug 5
Alexander Smirnov [Tue, 1 Apr 2025 10:06:36 +0000 (13:06 +0300)]
[ERP-394] debug 4
Alexander Smirnov [Tue, 1 Apr 2025 10:02:39 +0000 (13:02 +0300)]
[ERP-394] debug 3
Alexander Smirnov [Tue, 1 Apr 2025 09:58:53 +0000 (12:58 +0300)]
[ERP-394] debug 2
Alexander Smirnov [Tue, 1 Apr 2025 09:55:46 +0000 (12:55 +0300)]
[ERP-394] debug
fomichev [Tue, 1 Apr 2025 09:43:01 +0000 (12:43 +0300)]
Merge branch 'refs/heads/feature_fomichev_erp-344_cancel_order_from_1C' into feature_fomichev_erp-392_get_orders_statuses_1C
projects / erp24_rep / yii-erp24 / .git / log