]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
Vladimir Fomichev [Tue, 2 Sep 2025 08:02:28 +0000 (11:02 +0300)]
Оптимизируем очистку товаров по актуальности
Vladimir Fomichev [Tue, 2 Sep 2025 07:55:05 +0000 (10:55 +0300)]
Добавление парсера
Aleksey Filippov [Fri, 29 Aug 2025 13:31:27 +0000 (13:31 +0000)]
Merge branch 'feature_fomichev_erp-450_shift_transfer_category_error' into 'develop'
[ERP-450] Восстановление вариантов выбора типов товара в интерфейсе Передачи смен
See merge request gitlab-instance/yii-erp24!949
Vladimir Fomichev [Fri, 29 Aug 2025 11:35:22 +0000 (14:35 +0300)]
Имя чека
Vladimir Fomichev [Fri, 29 Aug 2025 11:34:13 +0000 (14:34 +0300)]
Имя чека
Vladimir Fomichev [Fri, 29 Aug 2025 11:25:51 +0000 (14:25 +0300)]
Обработка чеков для МП
Vladimir Fomichev [Fri, 29 Aug 2025 10:48:23 +0000 (13:48 +0300)]
Обработка чеков для МП
Aleksey Filippov [Thu, 28 Aug 2025 12:18:36 +0000 (12:18 +0000)]
Merge branch 'feature_filippov_20250828_fix_send_tg_isDev' into 'develop'
Правка отправки сообщения в ТГ, isDev проброс в job очереди
See merge request gitlab-instance/yii-erp24!948
Aleksey Filippov [Thu, 28 Aug 2025 12:17:20 +0000 (15:17 +0300)]
Правка отправки сообщения в ТГ, isDev проброс в job очереди
Vladimir Fomichev [Thu, 28 Aug 2025 08:12:43 +0000 (11:12 +0300)]
Добавил свойства type_id и type_guid
Vladimir Fomichev [Thu, 28 Aug 2025 07:35:45 +0000 (10:35 +0300)]
Правки по чекбоксам
Vladimir Fomichev [Wed, 27 Aug 2025 15:02:55 +0000 (18:02 +0300)]
Исправление групп номенклатуры
Vladimir Fomichev [Wed, 27 Aug 2025 13:07:35 +0000 (16:07 +0300)]
Изменение полей
Vladimir Fomichev [Wed, 27 Aug 2025 12:11:40 +0000 (15:11 +0300)]
Изменение полей
Vladimir Fomichev [Wed, 27 Aug 2025 12:02:16 +0000 (15:02 +0300)]
Добавление полей
Aleksey Filippov [Wed, 27 Aug 2025 06:53:07 +0000 (06:53 +0000)]
Merge branch 'feature_filippov_20250826_add_kkm_to_MP' into 'develop'
Добавил цену в создание чека от МП
See merge request gitlab-instance/yii-erp24!947
Aleksey Filippov [Wed, 27 Aug 2025 06:52:37 +0000 (09:52 +0300)]
Добавил цену в создание чека от МП
Vladimir Fomichev [Tue, 26 Aug 2025 14:18:28 +0000 (17:18 +0300)]
Крон команда
Vladimir Fomichev [Tue, 26 Aug 2025 14:12:23 +0000 (17:12 +0300)]
Крон команда
Vladimir Fomichev [Tue, 26 Aug 2025 13:35:38 +0000 (16:35 +0300)]
Вывод остатков
Vladimir Fomichev [Tue, 26 Aug 2025 12:43:09 +0000 (15:43 +0300)]
Изменение прав
Vladimir Fomichev [Tue, 26 Aug 2025 12:38:59 +0000 (15:38 +0300)]
Изменение прав
Vladimir Fomichev [Tue, 26 Aug 2025 12:14:56 +0000 (15:14 +0300)]
Изменение прав
Vladimir Fomichev [Tue, 26 Aug 2025 11:08:01 +0000 (14:08 +0300)]
Правки и загрузка
Vladimir Fomichev [Tue, 26 Aug 2025 11:06:25 +0000 (14:06 +0300)]
Правки и загрузка
Vladimir Fomichev [Tue, 26 Aug 2025 09:41:19 +0000 (12:41 +0300)]
Обработка в DataController
Aleksey Filippov [Tue, 26 Aug 2025 07:04:40 +0000 (07:04 +0000)]
Merge branch 'fix_fomichev_erp-20250815_orders_substatuses_from_1c' into 'develop'
Логирование upload запроса и чеки
See merge request gitlab-instance/yii-erp24!942
Aleksey Filippov [Tue, 26 Aug 2025 06:21:55 +0000 (06:21 +0000)]
Merge branch 'feature_filippov_20250826_add_kkm_to_MP' into 'develop'
Добавил ккм для создания чеков для МП
See merge request gitlab-instance/yii-erp24!944
Aleksey Filippov [Tue, 26 Aug 2025 06:21:03 +0000 (09:21 +0300)]
Добавил ккм для создания чеков для МП
Vladimir Fomichev [Mon, 25 Aug 2025 15:12:09 +0000 (18:12 +0300)]
Добавление операций
Vladimir Fomichev [Mon, 25 Aug 2025 12:06:08 +0000 (15:06 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-457_nomenclature_actuality_autoplan_calculate
# Conflicts:
# erp24/services/AutoPlannogrammaService.php
Vladimir Fomichev [Mon, 25 Aug 2025 12:01:50 +0000 (15:01 +0300)]
Добавление переменных окружения
Aleksey Filippov [Mon, 25 Aug 2025 09:56:04 +0000 (09:56 +0000)]
Merge branch 'feature_zozirova_erp-427_add_comment_to_create_orders' into 'develop'
ERP-427 Доработка комментария при отправке заказа из маркетплейс с 1с
See merge request gitlab-instance/yii-erp24!890
Vladimir Fomichev [Mon, 25 Aug 2025 08:37:04 +0000 (11:37 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-443_add_canceled_orders_to_1c_exchange_request
# Conflicts:
# erp24/api2/controllers/DataController.php
# erp24/services/MarketplaceService.php
Vladimir Fomichev [Mon, 25 Aug 2025 08:28:08 +0000 (11:28 +0300)]
Merge branch 'refs/heads/develop' into feature_zozirova_erp-427_add_comment_to_create_orders
# Conflicts:
# erp24/api2/controllers/DataController.php
Aleksey Filippov [Mon, 25 Aug 2025 07:30:54 +0000 (07:30 +0000)]
Merge branch 'feature_fomichev_erp-459_call_kogort_fix' into 'develop'
[ERP-459] В когорту звонков отправлять основную когорту
See merge request gitlab-instance/yii-erp24!943
Aleksey Filippov [Mon, 25 Aug 2025 07:27:47 +0000 (07:27 +0000)]
Merge branch 'feature_fomichev_erp-20250729_nomenclature_actual' into 'develop'
[ERP-445] Актуальность товаров для планограммы
See merge request gitlab-instance/yii-erp24!922
Vladimir Fomichev [Mon, 25 Aug 2025 06:51:57 +0000 (09:51 +0300)]
Правки генерации когорт звонка и возможность отключения вотсапа
Vladimir Fomichev [Fri, 22 Aug 2025 14:59:47 +0000 (17:59 +0300)]
Логирование upload запроса
Vladimir Fomichev [Fri, 22 Aug 2025 14:53:29 +0000 (17:53 +0300)]
Логирование upload запроса
Vladimir Fomichev [Fri, 22 Aug 2025 14:37:40 +0000 (17:37 +0300)]
Кнопка по успеху и правки чеков
Aleksey Filippov [Fri, 22 Aug 2025 14:00:42 +0000 (14:00 +0000)]
Merge branch 'fix_fomichev_erp-20250815_orders_substatuses_from_1c' into 'develop'
Корректировка субстатуса заказа
See merge request gitlab-instance/yii-erp24!941
Vladimir Fomichev [Fri, 22 Aug 2025 13:58:59 +0000 (16:58 +0300)]
Корректирова субстатуса заказа
при смене статуса из 1С
Aleksey Filippov [Fri, 22 Aug 2025 13:28:34 +0000 (13:28 +0000)]
Merge branch 'fix_fomichev_erp-20250815_orders_substatuses_from_1c' into 'develop'
Товары без артикула в комментариях убрал если нет
See merge request gitlab-instance/yii-erp24!940
Vladimir Fomichev [Fri, 22 Aug 2025 13:27:50 +0000 (16:27 +0300)]
Товары без артикула в комментариях убрал если нет
Vladimir Fomichev [Fri, 22 Aug 2025 13:23:54 +0000 (16:23 +0300)]
Товары без артикула в комментариях убрал если нет
Aleksey Filippov [Fri, 22 Aug 2025 13:15:11 +0000 (13:15 +0000)]
Merge branch 'fix_fomichev_erp-20250815_orders_substatuses_from_1c' into 'develop'
Фикс смены статуса
See merge request gitlab-instance/yii-erp24!939
Vladimir Fomichev [Fri, 22 Aug 2025 13:05:27 +0000 (16:05 +0300)]
Рефакторинг
Vladimir Fomichev [Fri, 22 Aug 2025 09:54:56 +0000 (12:54 +0300)]
Рефакторинг
Vladimir Fomichev [Fri, 22 Aug 2025 09:48:26 +0000 (12:48 +0300)]
Рефакторинг
Vladimir Fomichev [Fri, 22 Aug 2025 08:58:21 +0000 (11:58 +0300)]
Проверка терминалов
Vladimir Fomichev [Fri, 22 Aug 2025 08:48:30 +0000 (11:48 +0300)]
Проверка терминалов
Vladimir Fomichev [Fri, 22 Aug 2025 08:48:15 +0000 (11:48 +0300)]
Проверка терминалов
Vladimir Fomichev [Fri, 22 Aug 2025 08:30:04 +0000 (11:30 +0300)]
Проверка терминалов
Vladimir Fomichev [Fri, 22 Aug 2025 07:24:35 +0000 (10:24 +0300)]
Логирование ошибки
Vladimir Fomichev [Fri, 22 Aug 2025 06:53:08 +0000 (09:53 +0300)]
Логирование ошибки
Vladimir Fomichev [Fri, 22 Aug 2025 06:39:38 +0000 (09:39 +0300)]
Комментарий
Vladimir Fomichev [Fri, 22 Aug 2025 06:28:37 +0000 (09:28 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-20250729_nomenclature_actual
# Conflicts:
# erp24/services/AutoPlannogrammaService.php
Vladimir Fomichev [Thu, 21 Aug 2025 15:02:36 +0000 (18:02 +0300)]
Фикс смены статуса
Aleksey Filippov [Thu, 21 Aug 2025 10:25:25 +0000 (10:25 +0000)]
Merge branch 'fix_fomichev_erp-20250815_orders_substatuses_from_1c' into 'develop'
Фикс отправки заказов в 1с и обработки статусов
See merge request gitlab-instance/yii-erp24!934
Aleksey Filippov [Thu, 21 Aug 2025 09:33:59 +0000 (09:33 +0000)]
Merge branch 'feature_fomichev_erp-452_clone_writeoffs_document' into 'develop'
[ERP-452] Перенос товаров в новый документ списания
See merge request gitlab-instance/yii-erp24!935
Vladimir Fomichev [Thu, 21 Aug 2025 09:00:43 +0000 (12:00 +0300)]
Меняем фильтр на промежутки
Vladimir Fomichev [Wed, 20 Aug 2025 14:50:58 +0000 (17:50 +0300)]
Добавляем актуальность в расчет
Vladimir Fomichev [Wed, 20 Aug 2025 14:04:51 +0000 (17:04 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-457_nomenclature_actuality_autoplan_calculate
# Conflicts:
# erp24/services/AutoPlannogrammaService.php
Vladimir Fomichev [Wed, 20 Aug 2025 13:34:49 +0000 (16:34 +0300)]
Добавляем актуальность в расчет
Vladimir Fomichev [Wed, 20 Aug 2025 09:57:30 +0000 (12:57 +0300)]
Убираем актуальность из расчета
Vladimir Fomichev [Wed, 20 Aug 2025 09:43:31 +0000 (12:43 +0300)]
Правки по ошибкам трансфера нового документа
Vladimir Fomichev [Wed, 20 Aug 2025 07:59:29 +0000 (10:59 +0300)]
Убираем автозаполнение
Aleksey Filippov [Tue, 19 Aug 2025 16:34:00 +0000 (16:34 +0000)]
Merge branch 'feature_filippov_erp-454_matrix_erp_bouket_filter' into 'develop'
[ERP-454] Добавил фильтр по умолчанию
See merge request gitlab-instance/yii-erp24!937
Aleksey Filippov [Tue, 19 Aug 2025 16:33:31 +0000 (19:33 +0300)]
[ERP-454] Добавил фильтр по умолчанию
Aleksey Filippov [Tue, 19 Aug 2025 16:30:51 +0000 (16:30 +0000)]
Merge branch 'feature_filippov_erp-454_matrix_erp_bouket_filter' into 'develop'
[ERP-454] Добавил фильтр по умолчанию
See merge request gitlab-instance/yii-erp24!936
Aleksey Filippov [Tue, 19 Aug 2025 16:23:53 +0000 (19:23 +0300)]
[ERP-454] Добавил фильтр по умолчанию
Vladimir Fomichev [Tue, 19 Aug 2025 15:49:41 +0000 (18:49 +0300)]
Добавление баланса
Vladimir Fomichev [Tue, 19 Aug 2025 11:45:04 +0000 (14:45 +0300)]
Фильтры и даты
Vladimir Fomichev [Tue, 19 Aug 2025 11:34:09 +0000 (14:34 +0300)]
Фильтры и даты
Vladimir Fomichev [Mon, 18 Aug 2025 15:09:12 +0000 (18:09 +0300)]
Исправление
Vladimir Fomichev [Mon, 18 Aug 2025 12:16:25 +0000 (15:16 +0300)]
Логирование джейсона
Vladimir Fomichev [Mon, 18 Aug 2025 11:53:48 +0000 (14:53 +0300)]
Правка логов
Vladimir Fomichev [Mon, 18 Aug 2025 11:27:30 +0000 (14:27 +0300)]
Правка
Vladimir Fomichev [Mon, 18 Aug 2025 11:20:14 +0000 (14:20 +0300)]
Перенос списаний
Vladimir Fomichev [Mon, 18 Aug 2025 05:50:40 +0000 (08:50 +0300)]
Убрал логи upload
Vladimir Fomichev [Fri, 15 Aug 2025 15:03:47 +0000 (18:03 +0300)]
Правки статусов и логов
Vladimir Fomichev [Fri, 15 Aug 2025 14:56:57 +0000 (17:56 +0300)]
Правки статусов и логов
Vladimir Fomichev [Fri, 15 Aug 2025 14:25:56 +0000 (17:25 +0300)]
Правки статусов и логов
Vladimir Fomichev [Fri, 15 Aug 2025 12:37:25 +0000 (15:37 +0300)]
Слияние запросов
Vladimir Fomichev [Fri, 15 Aug 2025 11:16:23 +0000 (14:16 +0300)]
Логирование request
Vladimir Fomichev [Fri, 15 Aug 2025 11:00:52 +0000 (14:00 +0300)]
Логирование request
Vladimir Fomichev [Fri, 15 Aug 2025 10:49:19 +0000 (13:49 +0300)]
Логирование request
Vladimir Fomichev [Fri, 15 Aug 2025 10:38:01 +0000 (13:38 +0300)]
Логирование request
Vladimir Fomichev [Fri, 15 Aug 2025 10:28:14 +0000 (13:28 +0300)]
Логирование request
Vladimir Fomichev [Fri, 15 Aug 2025 10:21:20 +0000 (13:21 +0300)]
Логирование request
Vladimir Fomichev [Fri, 15 Aug 2025 10:17:03 +0000 (13:17 +0300)]
Логирование request
Vladimir Fomichev [Fri, 15 Aug 2025 10:11:05 +0000 (13:11 +0300)]
Логирование upload
Vladimir Fomichev [Fri, 15 Aug 2025 09:40:03 +0000 (12:40 +0300)]
Логирование upload
Vladimir Fomichev [Fri, 15 Aug 2025 09:14:50 +0000 (12:14 +0300)]
Тестирование метода get-orders
Vladimir Fomichev [Fri, 15 Aug 2025 09:02:27 +0000 (12:02 +0300)]
Добавление логов
Vladimir Fomichev [Fri, 15 Aug 2025 08:53:39 +0000 (11:53 +0300)]
Добавление логов
Vladimir Fomichev [Thu, 14 Aug 2025 13:25:24 +0000 (16:25 +0300)]
Добавление текста если нет данных о доставке
Vladimir Fomichev [Thu, 14 Aug 2025 11:29:04 +0000 (14:29 +0300)]
Слияние смежных интервалов и коррекции по представлению
Aleksey Filippov [Thu, 14 Aug 2025 07:46:23 +0000 (07:46 +0000)]
Merge branch 'fix_fomichev_erp-20250814_remove_sent_to_1C_block_on_production' into 'develop'
Убрал блок отправки в 1с на проде
See merge request gitlab-instance/yii-erp24!933
projects / erp24_rep / yii-erp24 / .git / log