]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
Vladimir Fomichev [Thu, 13 Nov 2025 14:37:51 +0000 (17:37 +0300)]
Штатное расписание миграция
Vladimir Fomichev [Thu, 13 Nov 2025 14:32:57 +0000 (17:32 +0300)]
Штатное расписание
Vladimir Fomichev [Wed, 12 Nov 2025 15:06:08 +0000 (15:06 +0000)]
Merge branch 'feature_fomichev_erp-491_add_articule_to_YM_balance' into 'develop'
[ERP-491] Добавление артикула в остатки ЯндексМаркета
See merge request gitlab-instance/yii-erp24!1011
Vladimir Fomichev [Wed, 12 Nov 2025 14:53:15 +0000 (17:53 +0300)]
Проверка на пустоту id
Vladimir Fomichev [Wed, 12 Nov 2025 14:28:47 +0000 (17:28 +0300)]
Добавление артикула
Vladimir Fomichev [Tue, 11 Nov 2025 14:06:23 +0000 (14:06 +0000)]
Merge branch 'feature_fomichev_erp-490_link_salary_to_employee_position' into 'develop'
[ERP-490] Привязка окладов к должностям EmployeePosition
See merge request gitlab-instance/yii-erp24!1010
Vladimir Fomichev [Tue, 11 Nov 2025 13:09:50 +0000 (16:09 +0300)]
Изменение group_name
Vladimir Fomichev [Tue, 11 Nov 2025 10:56:08 +0000 (13:56 +0300)]
Добавление позиции в грейдах и синхронизация со статусом
Vladimir Fomichev [Tue, 11 Nov 2025 08:36:28 +0000 (11:36 +0300)]
Добавление позиции в грейдах и синхронизация со статусом
Vladimir Fomichev [Tue, 11 Nov 2025 06:22:46 +0000 (09:22 +0300)]
Добавление позиции
Vladimir Fomichev [Mon, 10 Nov 2025 15:15:40 +0000 (18:15 +0300)]
Правки ревью
Vladimir Fomichev [Mon, 10 Nov 2025 14:56:56 +0000 (17:56 +0300)]
Синхронизация окладов
Vladimir Fomichev [Fri, 7 Nov 2025 09:58:52 +0000 (09:58 +0000)]
Merge branch 'feature_fomichev_erp-489_mp_sales_report' into 'develop'
[ERP-489] Вывод отчета по каналам продаж - маркетплейсы
See merge request gitlab-instance/yii-erp24!1009
Vladimir Fomichev [Fri, 7 Nov 2025 09:21:45 +0000 (12:21 +0300)]
Добавление источников и чистка кода
Vladimir Fomichev [Fri, 7 Nov 2025 07:55:36 +0000 (10:55 +0300)]
Правки по иконкам /dashboard/sales
Vladimir Fomichev [Thu, 6 Nov 2025 11:27:15 +0000 (14:27 +0300)]
Вывод продаж по МП в отчете /dashboard/sales
Vladimir Fomichev [Thu, 6 Nov 2025 10:12:37 +0000 (13:12 +0300)]
Детальный отчет по МП
Vladimir Fomichev [Wed, 5 Nov 2025 15:04:20 +0000 (18:04 +0300)]
Детальный отчет по магазинам
Vladimir Fomichev [Sat, 1 Nov 2025 14:02:37 +0000 (14:02 +0000)]
Merge branch 'feature_fomichev_erp-487_add_admin_position_dictionary' into 'develop'
[ERP-487] Создание справочника по должностям сотрудников
See merge request gitlab-instance/yii-erp24!1008
Vladimir Fomichev [Sat, 1 Nov 2025 14:00:44 +0000 (17:00 +0300)]
Добавляем позицию
Vladimir Fomichev [Sat, 1 Nov 2025 13:28:19 +0000 (16:28 +0300)]
убираем дублирование админов
Vladimir Fomichev [Sat, 1 Nov 2025 12:05:51 +0000 (12:05 +0000)]
Merge branch 'feature_fomichev_erp-487_add_admin_position_dictionary' into 'develop'
[ERP-487] Создание справочника по должностям сотрудников
See merge request gitlab-instance/yii-erp24!1006
Vladimir Fomichev [Sat, 1 Nov 2025 11:57:24 +0000 (14:57 +0300)]
добавляем смену к названию
Vladimir Fomichev [Sat, 1 Nov 2025 11:50:37 +0000 (14:50 +0300)]
Убираем внешний ключ
Vladimir Fomichev [Sat, 1 Nov 2025 11:37:13 +0000 (14:37 +0300)]
Убираем синхронизацию ЗП
Vladimir Fomichev [Sat, 1 Nov 2025 11:30:35 +0000 (14:30 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-487_add_admin_position_dictionary
Vladimir Fomichev [Sat, 1 Nov 2025 11:28:32 +0000 (14:28 +0300)]
Правки ревью
Vladimir Fomichev [Sat, 1 Nov 2025 08:08:31 +0000 (08:08 +0000)]
Merge branch 'feature_fomichev_erp-488_fix_kik_images_url' into 'develop'
[ERP-488] Проблема с выводом картинок клиента с чатбота
See merge request gitlab-instance/yii-erp24!1007
Vladimir Fomichev [Sat, 1 Nov 2025 07:46:43 +0000 (10:46 +0300)]
Правки ревью
Vladimir Fomichev [Sat, 1 Nov 2025 07:19:38 +0000 (10:19 +0300)]
расширению функционала обработки URL изображений kikfeedbackrequest_file
Vladimir Fomichev [Sat, 1 Nov 2025 06:54:56 +0000 (09:54 +0300)]
Корректрировка url для kikfeedbackrequest_file
Vladimir Fomichev [Sat, 1 Nov 2025 06:04:30 +0000 (09:04 +0300)]
синхронизация оклада
Vladimir Fomichev [Fri, 31 Oct 2025 06:22:17 +0000 (09:22 +0300)]
Удаляем AdminPositionsController.php
Vladimir Fomichev [Fri, 31 Oct 2025 06:13:00 +0000 (09:13 +0300)]
Удаляем AdminPositionsController.php
Vladimir Fomichev [Fri, 31 Oct 2025 06:07:40 +0000 (09:07 +0300)]
CRUD для групп
Vladimir Fomichev [Thu, 30 Oct 2025 07:30:35 +0000 (10:30 +0300)]
Отчеты за день и неделю
Vladimir Fomichev [Wed, 29 Oct 2025 08:57:56 +0000 (11:57 +0300)]
Отчеты
Vladimir Fomichev [Wed, 29 Oct 2025 08:57:43 +0000 (11:57 +0300)]
Отчеты
Vladimir Fomichev [Tue, 28 Oct 2025 13:59:47 +0000 (16:59 +0300)]
admin position
Vladimir Fomichev [Thu, 23 Oct 2025 14:27:56 +0000 (14:27 +0000)]
Merge branch 'feature_fomichev_erp-20251022_check_filter_dashboard' into 'develop'
[ERP-486] Исправление отчетности по онлайн продажам
See merge request gitlab-instance/yii-erp24!1005
Vladimir Fomichev [Thu, 23 Oct 2025 14:24:45 +0000 (17:24 +0300)]
Экшн контроллера проверки
Vladimir Fomichev [Wed, 22 Oct 2025 15:06:28 +0000 (18:06 +0300)]
Мониторинг чеков по выгрузкам из 1С
Vladimir Fomichev [Wed, 22 Oct 2025 13:10:57 +0000 (16:10 +0300)]
Добавление фильтрации по созданным чекам
Vladimir Fomichev [Fri, 17 Oct 2025 14:13:31 +0000 (14:13 +0000)]
Merge branch 'fix_fomichev_erp-20251017_change_ttr_queue_job' into 'develop'
Фикс добавляем ttr 7 мин в очередь
See merge request gitlab-instance/yii-erp24!1004
Vladimir Fomichev [Fri, 17 Oct 2025 13:38:29 +0000 (16:38 +0300)]
7 мин
Vladimir Fomichev [Fri, 17 Oct 2025 13:10:06 +0000 (16:10 +0300)]
Проверка наследования
Vladimir Fomichev [Fri, 17 Oct 2025 12:57:19 +0000 (15:57 +0300)]
Добавляем нормализацию
Vladimir Fomichev [Fri, 17 Oct 2025 12:40:50 +0000 (15:40 +0300)]
Добавляем логирование
Vladimir Fomichev [Fri, 17 Oct 2025 12:27:20 +0000 (15:27 +0300)]
Добавляем ошибку
Vladimir Fomichev [Fri, 17 Oct 2025 12:10:33 +0000 (15:10 +0300)]
Добавляем ttr переводим на RetryableJobInterface
Vladimir Fomichev [Fri, 17 Oct 2025 07:16:03 +0000 (07:16 +0000)]
Merge branch 'fix_fomichev_erp-20251017_import_class_marketplace_service' into 'develop'
Фикс маркетплейс сервис Добавляем импорт класса
See merge request gitlab-instance/yii-erp24!1003
Vladimir Fomichev [Fri, 17 Oct 2025 07:15:04 +0000 (10:15 +0300)]
Добавляем импорт
Aleksey Filippov [Thu, 16 Oct 2025 17:50:36 +0000 (17:50 +0000)]
Merge branch 'feature_fomichev_erp-484_upload_data_to_queue' into 'develop'
[ERP-484] Перевод принятия данных от 1с на очереди
See merge request gitlab-instance/yii-erp24!1002
Vladimir Fomichev [Thu, 16 Oct 2025 16:43:40 +0000 (19:43 +0300)]
Убираем логи
Vladimir Fomichev [Thu, 16 Oct 2025 16:35:08 +0000 (19:35 +0300)]
Исправления
Vladimir Fomichev [Thu, 16 Oct 2025 16:07:14 +0000 (19:07 +0300)]
Логи
Vladimir Fomichev [Thu, 16 Oct 2025 15:53:51 +0000 (18:53 +0300)]
Логи
Vladimir Fomichev [Thu, 16 Oct 2025 15:48:11 +0000 (18:48 +0300)]
Меняем реквестИД на микросекунды в крон планировщике
Vladimir Fomichev [Thu, 16 Oct 2025 15:44:34 +0000 (18:44 +0300)]
Меняем реквестИД на микросекунды в крон командах
Vladimir Fomichev [Thu, 16 Oct 2025 15:34:28 +0000 (18:34 +0300)]
Логи
Vladimir Fomichev [Thu, 16 Oct 2025 15:34:05 +0000 (18:34 +0300)]
Логи
Vladimir Fomichev [Thu, 16 Oct 2025 15:31:10 +0000 (18:31 +0300)]
Логи
Vladimir Fomichev [Thu, 16 Oct 2025 15:25:59 +0000 (18:25 +0300)]
Логи
Vladimir Fomichev [Thu, 16 Oct 2025 15:21:32 +0000 (18:21 +0300)]
Логи
Aleksey Filippov [Thu, 16 Oct 2025 14:10:23 +0000 (14:10 +0000)]
Merge branch 'feature_fomichev_erp-484_upload_data_to_queue' into 'develop'
[ERP-484] Перевод принятия данных от 1с на очереди
See merge request gitlab-instance/yii-erp24!998
Vladimir Fomichev [Thu, 16 Oct 2025 14:09:30 +0000 (17:09 +0300)]
Правки после мерджа
Vladimir Fomichev [Thu, 16 Oct 2025 14:06:17 +0000 (17:06 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-484_upload_data_to_queue
# Conflicts:
# erp24/api2/controllers/DataController.php
Aleksey Filippov [Thu, 16 Oct 2025 13:52:05 +0000 (13:52 +0000)]
Merge branch 'feature_filippov_erp-477_change_data_src_self_cost' into 'develop'
[ERP-477] Переключить получение себестоимости из другого источника
See merge request gitlab-instance/yii-erp24!1001
Aleksey Filippov [Thu, 16 Oct 2025 13:51:18 +0000 (16:51 +0300)]
ERP-477 Переключить получение себестоимости из другого источника
Vladimir Fomichev [Thu, 16 Oct 2025 13:50:36 +0000 (16:50 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-484_upload_data_to_queue
# Conflicts:
# erp24/api2/controllers/DataController.php
Aleksey Filippov [Thu, 16 Oct 2025 08:24:25 +0000 (08:24 +0000)]
Merge branch 'feature_fomichev_erp-485_check_api_cron_task_status_before_add' into 'develop'
[ERP-485] Оптимизация добавления заданий в список на обработку для 1с
See merge request gitlab-instance/yii-erp24!1000
Vladimir Fomichev [Thu, 16 Oct 2025 08:19:54 +0000 (11:19 +0300)]
Проверка на задачи крона если еще в очереди - status = 0 не добавляем задачу
Vladimir Fomichev [Wed, 15 Oct 2025 15:08:59 +0000 (18:08 +0300)]
добавление
Aleksey Filippov [Wed, 15 Oct 2025 13:55:30 +0000 (13:55 +0000)]
Merge branch 'feature_fomichev_erp-471_add_price_dictionary_for_fw_feed' into 'develop'
[ERP-471] Добавить справочник цен для товаров маркетплейса
See merge request gitlab-instance/yii-erp24!979
Aleksey Filippov [Wed, 15 Oct 2025 13:54:09 +0000 (13:54 +0000)]
Merge branch 'feature_fomichev_erp-470_add_analitycs_business_operations_to_shift_transfer_documents' into 'develop'
[ERP-470] Внедрение признака аналитико хозяйственных операций в списание
See merge request gitlab-instance/yii-erp24!987
Aleksey Filippov [Wed, 15 Oct 2025 13:46:43 +0000 (13:46 +0000)]
Merge branch 'feature_fomichev_erp-20251014_add_offerID_offerName_to_comment' into 'develop'
[ERP-481] Добавить название букета в примечание для 1с
See merge request gitlab-instance/yii-erp24!993
Vladimir Fomichev [Wed, 15 Oct 2025 12:04:21 +0000 (15:04 +0300)]
Очистка метода actionUpload
Vladimir Fomichev [Wed, 15 Oct 2025 11:50:43 +0000 (14:50 +0300)]
Передача url из очередей и очистка dataController
Vladimir Fomichev [Wed, 15 Oct 2025 11:38:09 +0000 (14:38 +0300)]
Исправление логов - заглушка на ip
Vladimir Fomichev [Wed, 15 Oct 2025 11:34:08 +0000 (14:34 +0300)]
Исправление логов
Vladimir Fomichev [Wed, 15 Oct 2025 11:20:39 +0000 (14:20 +0300)]
Добавление в очередь
Vladimir Fomichev [Wed, 15 Oct 2025 10:21:44 +0000 (13:21 +0300)]
Изменен requestId на милисекунды - 13 знаков
Vladimir Fomichev [Wed, 15 Oct 2025 08:03:57 +0000 (08:03 +0000)]
Merge branch 'feature_fomichev_erp-20251015_delete_isDev_checking_on_mp_orders_exchange' into 'develop'
Убираем проверку на дев при отправке заказов с МП в 1с
See merge request gitlab-instance/yii-erp24!997
Vladimir Fomichev [Wed, 15 Oct 2025 08:00:05 +0000 (11:00 +0300)]
Убираем проверку на дев при отправке заказов с МП в 1с
Vladimir Fomichev [Tue, 14 Oct 2025 14:22:12 +0000 (17:22 +0300)]
Тестирование и исправление ошибок
Aleksey Filippov [Tue, 14 Oct 2025 13:13:14 +0000 (13:13 +0000)]
Merge branch 'feature_fomichev_erp-472_add_feed_activity_to_matrix_erp' into 'develop'
[ERP-472] Флаг вывода в фид по товару он же ручная активность для МП
See merge request gitlab-instance/yii-erp24!996
Vladimir Fomichev [Tue, 14 Oct 2025 12:51:28 +0000 (15:51 +0300)]
Исправление фильтрации артикула
Aleksey Filippov [Tue, 14 Oct 2025 12:43:10 +0000 (12:43 +0000)]
Merge branch 'feature_fomichev_erp-472_add_feed_activity_to_matrix_erp' into 'develop'
Исправление фильтрации артикула
See merge request gitlab-instance/yii-erp24!995
Vladimir Fomichev [Tue, 14 Oct 2025 12:40:32 +0000 (15:40 +0300)]
Исправление фильтрации артикула
Vladimir Fomichev [Tue, 14 Oct 2025 12:12:31 +0000 (15:12 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-471_add_price_dictionary_for_fw_feed
# Conflicts:
# erp24/controllers/MarketplaceController.php
Vladimir Fomichev [Tue, 14 Oct 2025 12:11:21 +0000 (15:11 +0300)]
Исправление ошибки файла
Aleksey Filippov [Tue, 14 Oct 2025 12:07:30 +0000 (12:07 +0000)]
Merge branch 'feature_fomichev_erp-472_add_feed_activity_to_matrix_erp' into 'develop'
[ERP-472] Флаг вывода в фид по товару он же ручная активность для МП
See merge request gitlab-instance/yii-erp24!980
Aleksey Filippov [Tue, 14 Oct 2025 11:53:34 +0000 (11:53 +0000)]
Merge branch 'feature_filippov_erp-482_make_old_file_wr_off_list' into 'develop'
[ERP-482] Создание списка вложений из списаний старше двух месяцев
See merge request gitlab-instance/yii-erp24!994
Aleksey Filippov [Tue, 14 Oct 2025 11:52:20 +0000 (14:52 +0300)]
[ERP-482] Создание списка вложений из списаний старше двух месяцев
Vladimir Fomichev [Tue, 14 Oct 2025 09:59:32 +0000 (12:59 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-472_add_feed_activity_to_matrix_erp
# Conflicts:
# erp24/controllers/MatrixErpController.php
# erp24/views/matrix_erp/index.php
Vladimir Fomichev [Tue, 14 Oct 2025 07:47:31 +0000 (10:47 +0300)]
Строка доставки
Vladimir Fomichev [Tue, 14 Oct 2025 07:34:53 +0000 (10:34 +0300)]
Добавление строки с товарами в заказ
Vladimir Fomichev [Tue, 14 Oct 2025 07:29:29 +0000 (10:29 +0300)]
Добавление строки с товарами в заказ
Aleksey Filippov [Tue, 14 Oct 2025 07:18:10 +0000 (07:18 +0000)]
Merge branch 'feature_fomichev_erp-473_matrix_erp_feed_image_order' into 'develop'
[ERP-473] Порядок картинок в карточке товаров
See merge request gitlab-instance/yii-erp24!985
Aleksey Filippov [Tue, 14 Oct 2025 07:04:22 +0000 (07:04 +0000)]
Merge branch 'feature_fomichev_erp-474_change_articule_in_feed_and_in_process_orders' into 'develop'
[ERP-474] Добавление разделителя в артикул на FW
See merge request gitlab-instance/yii-erp24!992
projects / erp24_rep / yii-erp24 / .git / log