]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
Vladimir Fomichev [Tue, 5 Aug 2025 11:40:05 +0000 (14:40 +0300)]
Правки по max-min
Vladimir Fomichev [Fri, 25 Jul 2025 14:55:55 +0000 (17:55 +0300)]
Выгрузка корректировки и филтрация по раскрытым спискам
Vladimir Fomichev [Fri, 25 Jul 2025 10:36:18 +0000 (13:36 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-362_export_to_excel_autoplannogram
# Conflicts:
# erp24/services/AutoPlannogrammaService.php
Marina Zozirova [Wed, 23 Jul 2025 13:15:34 +0000 (13:15 +0000)]
Merge branch 'feature_zozirova_erp-438_add_site_endpoints' into 'develop'
ERP-438 Доработка эндпойнтов
See merge request gitlab-instance/yii-erp24!920
marina [Wed, 23 Jul 2025 13:10:03 +0000 (16:10 +0300)]
ERP-438 Доработка эндпойнтов
marina [Wed, 23 Jul 2025 12:48:13 +0000 (15:48 +0300)]
ERP-438 Доработка эндпойнтов
marina [Wed, 23 Jul 2025 12:27:05 +0000 (15:27 +0300)]
ERP-438 Доработка эндпойнтов
marina [Wed, 23 Jul 2025 12:25:57 +0000 (15:25 +0300)]
ERP-438 Доработка эндпойнтов
marina [Wed, 23 Jul 2025 12:24:25 +0000 (15:24 +0300)]
ERP-438 Доработка эндпойнтов
marina [Wed, 23 Jul 2025 11:52:12 +0000 (14:52 +0300)]
ERP-438 Доработка эндпойнтов
marina [Wed, 23 Jul 2025 11:38:31 +0000 (14:38 +0300)]
ERP-438 Доработка эндпойнтов
marina [Wed, 23 Jul 2025 11:34:55 +0000 (14:34 +0300)]
ERP-438 Доработка эндпойнтов
marina [Wed, 23 Jul 2025 11:29:10 +0000 (14:29 +0300)]
ERP-438 Доработка эндпойнтов
marina [Wed, 23 Jul 2025 11:21:10 +0000 (14:21 +0300)]
ERP-438 Доработка эндпойнтов
marina [Wed, 23 Jul 2025 11:13:09 +0000 (14:13 +0300)]
ERP-438 Доработка эндпойнтов
marina [Wed, 23 Jul 2025 11:09:25 +0000 (14:09 +0300)]
ERP-438 Доработка эндпойнтов
marina [Wed, 23 Jul 2025 10:51:44 +0000 (13:51 +0300)]
ERP-438 Доработка эндпойнтов
marina [Wed, 23 Jul 2025 10:20:02 +0000 (13:20 +0300)]
ERP-438 Доработка эндпойнтов
marina [Wed, 23 Jul 2025 10:08:34 +0000 (13:08 +0300)]
ERP-438 Доработка эндпойнтов
marina [Wed, 23 Jul 2025 07:50:02 +0000 (10:50 +0300)]
ERP-438 Доработка эндпойнтов
marina [Wed, 23 Jul 2025 07:31:41 +0000 (10:31 +0300)]
ERP-438 Доработка эндпойнтов
marina [Tue, 22 Jul 2025 13:33:50 +0000 (16:33 +0300)]
ERP-438 Доработка эндпойнтов
marina [Tue, 22 Jul 2025 12:22:00 +0000 (15:22 +0300)]
ERP-438 Доработка эндпойнтов
marina [Tue, 22 Jul 2025 12:20:36 +0000 (15:20 +0300)]
ERP-438 Доработка эндпойнтов
marina [Tue, 22 Jul 2025 11:53:41 +0000 (14:53 +0300)]
ERP-438 Доработка эндпойнтов
marina [Tue, 22 Jul 2025 10:16:03 +0000 (13:16 +0300)]
ERP-438 Доработка эндпойнтов
marina [Tue, 22 Jul 2025 09:36:20 +0000 (12:36 +0300)]
Merge branch 'develop' into feature_zozirova_erp-438_add_site_endpoints
marina [Tue, 22 Jul 2025 09:36:08 +0000 (12:36 +0300)]
ERP-438 Доработка эндпойнтов
marina [Tue, 22 Jul 2025 09:32:45 +0000 (12:32 +0300)]
ERP-438 Доработка эндпойнтов
marina [Tue, 22 Jul 2025 08:30:32 +0000 (11:30 +0300)]
ERP-438 Доработка эндпойнтов
marina [Tue, 22 Jul 2025 06:20:22 +0000 (09:20 +0300)]
ERP-438 Доработка эндпойнтов
Marina Zozirova [Mon, 21 Jul 2025 13:16:06 +0000 (13:16 +0000)]
Merge branch 'feature_fomichev_erp-20250721_change_cam_pass_krasnodon' into 'develop'
Меняем пароль на краснодонцах
See merge request gitlab-instance/yii-erp24!919
fomichev [Mon, 21 Jul 2025 09:16:54 +0000 (12:16 +0300)]
Меняем пароль на краснодонцах
Aleksey Filippov [Fri, 18 Jul 2025 09:28:01 +0000 (09:28 +0000)]
Merge branch 'feature_smirnov_erp-409_create_check_for_success_marketplace_order' into 'develop'
[ERP-409] Создание заявки на создание чека в 1с при получении статуса Успех из МП
See merge request gitlab-instance/yii-erp24!917
Aleksey Filippov [Fri, 18 Jul 2025 08:51:48 +0000 (08:51 +0000)]
Merge branch 'feature_fomichev_erp-443_add_canceled_orders_to_1c_exchange_request' into 'develop'
[ERP-443] Отправка списка отменённых заказов МП в 1с
See merge request gitlab-instance/yii-erp24!915
Vladimir Fomichev [Fri, 18 Jul 2025 08:49:15 +0000 (11:49 +0300)]
changed cancel_order to cancel_orders
Vladimir Fomichev [Fri, 18 Jul 2025 08:14:05 +0000 (11:14 +0300)]
added comment
Aleksey Filippov [Fri, 18 Jul 2025 06:53:39 +0000 (06:53 +0000)]
Merge branch 'feature_filippov_erp-441_input_count_shift_transfer' into 'develop'
[ERP-441] Вывод дробных значений при Передачи смен
See merge request gitlab-instance/yii-erp24!916
Aleksey Filippov [Fri, 18 Jul 2025 06:52:18 +0000 (09:52 +0300)]
[ERP-441] Вывод дробных значений
Aleksey Filippov [Fri, 18 Jul 2025 06:24:05 +0000 (09:24 +0300)]
[ERP-441]
Aleksey Filippov [Fri, 18 Jul 2025 06:13:01 +0000 (06:13 +0000)]
Merge branch 'feature_fomichev_erp-442_add_allowed_editing_field_marketplace_order_1c_statuses' into 'develop'
[ERP-442] Доработать обмен с 1с (marketplace_orders)
See merge request gitlab-instance/yii-erp24!914
fomichev [Thu, 17 Jul 2025 14:47:10 +0000 (17:47 +0300)]
Добавляем ключ отправки отмененного заказа
fomichev [Thu, 17 Jul 2025 14:38:53 +0000 (17:38 +0300)]
Добавляем ключ отправки отмененного заказа
fomichev [Thu, 17 Jul 2025 14:01:05 +0000 (17:01 +0300)]
Передача ключей на успех и отмену
fomichev [Thu, 17 Jul 2025 13:00:11 +0000 (16:00 +0300)]
Передача отмененных заказов
fomichev [Thu, 17 Jul 2025 12:25:09 +0000 (15:25 +0300)]
Выравнивание в колонке
fomichev [Thu, 17 Jul 2025 11:39:11 +0000 (14:39 +0300)]
Собираем все действия в одной колонке
Aleksey Filippov [Thu, 17 Jul 2025 08:55:19 +0000 (08:55 +0000)]
Merge branch 'feature_smirnov_erp-409_create_check_for_success_marketplace_order' into 'develop'
Заполняем order_id
See merge request gitlab-instance/yii-erp24!911
fomichev [Thu, 17 Jul 2025 08:39:19 +0000 (11:39 +0300)]
Merge branch 'refs/heads/develop' into feature_smirnov_erp-409_create_check_for_success_marketplace_order
fomichev [Thu, 17 Jul 2025 08:34:08 +0000 (11:34 +0300)]
Проверка чеков на is_marketplace
fomichev [Thu, 17 Jul 2025 08:23:59 +0000 (11:23 +0300)]
добавление allowed_editing
fomichev [Thu, 17 Jul 2025 08:22:13 +0000 (11:22 +0300)]
добавление allowed_editing
fomichev [Thu, 17 Jul 2025 07:52:19 +0000 (10:52 +0300)]
добавление seller_id
fomichev [Thu, 17 Jul 2025 07:02:04 +0000 (10:02 +0300)]
Добавление привязки статусов заказа к статусу обработки 1С
Aleksey Filippov [Wed, 16 Jul 2025 15:17:17 +0000 (15:17 +0000)]
Merge branch 'feature_filippov_erp-441_input_count_shift_transfer' into 'develop'
[ERP-441] Изменение шага заполнения
See merge request gitlab-instance/yii-erp24!913
Aleksey Filippov [Wed, 16 Jul 2025 15:16:47 +0000 (18:16 +0300)]
[ERP-441] Изменение шага заполнения
fomichev [Wed, 16 Jul 2025 15:05:54 +0000 (18:05 +0300)]
Добавление привязки статусов заказа к статусу обработки 1С
fomichev [Wed, 16 Jul 2025 14:19:21 +0000 (17:19 +0300)]
Отслеживание заказа
fomichev [Wed, 16 Jul 2025 13:18:58 +0000 (16:18 +0300)]
Исправление получения статусов
fomichev [Wed, 16 Jul 2025 12:23:15 +0000 (15:23 +0300)]
Правки и добавление метода обработки статусов
fomichev [Wed, 16 Jul 2025 11:42:38 +0000 (14:42 +0300)]
Убираем условие проверки созданных чеков на наличие kkm_id
fomichev [Wed, 16 Jul 2025 11:23:38 +0000 (14:23 +0300)]
Merge branch 'refs/heads/develop' into feature_smirnov_erp-409_create_check_for_success_marketplace_order
fomichev [Wed, 16 Jul 2025 11:23:09 +0000 (14:23 +0300)]
Заполняем order_id
Aleksey Filippov [Wed, 16 Jul 2025 08:27:31 +0000 (08:27 +0000)]
Merge branch 'feature_smirnov_erp-409_create_check_for_success_marketplace_order' into 'develop'
Забор статуса из marketplace_orders
See merge request gitlab-instance/yii-erp24!910
fomichev [Wed, 16 Jul 2025 08:25:40 +0000 (11:25 +0300)]
Забор статуса из marketplace_orders
Aleksey Filippov [Wed, 16 Jul 2025 07:58:30 +0000 (07:58 +0000)]
Merge branch 'feature_fomichev_erp_424_change_marketplace+orders_statuses_1c_relations' into 'develop'
Артикул статуса вывод
See merge request gitlab-instance/yii-erp24!909
fomichev [Wed, 16 Jul 2025 07:57:06 +0000 (10:57 +0300)]
Артикул статуса
Aleksey Filippov [Wed, 16 Jul 2025 06:25:43 +0000 (06:25 +0000)]
Merge branch 'feature_fomichev_erp-431_category_plan-feedback_category_share' into 'develop'
[ERP-431] ОС по Планам по категориям
See merge request gitlab-instance/yii-erp24!908
fomichev [Tue, 15 Jul 2025 14:56:35 +0000 (17:56 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-431_category_plan-feedback_category_share
fomichev [Tue, 15 Jul 2025 14:55:26 +0000 (17:55 +0300)]
Перезапуск после выполнения
Aleksey Filippov [Tue, 15 Jul 2025 14:21:13 +0000 (14:21 +0000)]
Merge branch 'feature_fomichev_erp_424_change_marketplace+orders_statuses_1c_relations' into 'develop'
[ERP-424] Скрываем удаление и редирект после сохранения
See merge request gitlab-instance/yii-erp24!907
fomichev [Tue, 15 Jul 2025 14:14:35 +0000 (17:14 +0300)]
Скрываем удаление и редирект после сохранения
Aleksey Filippov [Tue, 15 Jul 2025 14:05:08 +0000 (14:05 +0000)]
Merge branch 'feature_smirnov_erp-409_create_check_for_success_marketplace_order' into 'develop'
[ERP-409] Создание заявки на создание чека в 1с при получении статуса Успех из МП
See merge request gitlab-instance/yii-erp24!906
fomichev [Tue, 15 Jul 2025 14:00:36 +0000 (17:00 +0300)]
скролл для gridView
fomichev [Tue, 15 Jul 2025 13:08:30 +0000 (16:08 +0300)]
Повторная отправка - количество попыток 4
fomichev [Tue, 15 Jul 2025 13:02:31 +0000 (16:02 +0300)]
Повторная отправка - количество попыток 4
fomichev [Tue, 15 Jul 2025 12:57:11 +0000 (15:57 +0300)]
Повторная отправка
fomichev [Tue, 15 Jul 2025 12:51:37 +0000 (15:51 +0300)]
Повторная отправка
fomichev [Tue, 15 Jul 2025 12:28:57 +0000 (15:28 +0300)]
Повторная отправка
Aleksey Filippov [Tue, 15 Jul 2025 10:27:04 +0000 (10:27 +0000)]
Merge branch 'feature_smirnov_erp-409_create_check_for_success_marketplace_order' into 'develop'
[ERP-409] Создание заявки на создание чека в 1с при получении статуса Успех из МП
See merge request gitlab-instance/yii-erp24!905
fomichev [Tue, 15 Jul 2025 08:25:21 +0000 (11:25 +0300)]
Добавление адреса в заказ
fomichev [Tue, 15 Jul 2025 07:39:06 +0000 (10:39 +0300)]
Добавление адреса в заказ
fomichev [Tue, 15 Jul 2025 07:33:52 +0000 (10:33 +0300)]
Добавление адреса в заказ
fomichev [Tue, 15 Jul 2025 07:30:29 +0000 (10:30 +0300)]
Добавление адреса в заказ
fomichev [Tue, 15 Jul 2025 07:21:38 +0000 (10:21 +0300)]
Проверка на пустой seller_id
fomichev [Tue, 15 Jul 2025 06:53:50 +0000 (09:53 +0300)]
Создание чеков в тестовых заказах
fomichev [Mon, 14 Jul 2025 15:06:54 +0000 (18:06 +0300)]
Проверка тестовых заказов
fomichev [Mon, 14 Jul 2025 14:58:50 +0000 (17:58 +0300)]
Проверка тестовых заказов
fomichev [Mon, 14 Jul 2025 14:58:30 +0000 (17:58 +0300)]
Проверка тестовых заказов
fomichev [Mon, 14 Jul 2025 14:12:15 +0000 (17:12 +0300)]
Перевод статусов
fomichev [Mon, 14 Jul 2025 13:02:20 +0000 (16:02 +0300)]
Ошибка warehouseId
Aleksey Filippov [Fri, 11 Jul 2025 12:20:24 +0000 (12:20 +0000)]
Merge branch 'feature_smirnov_erp-409_create_check_for_success_marketplace_order' into 'develop'
[ERP-409] draft
See merge request gitlab-instance/yii-erp24!809
Aleksey Filippov [Fri, 11 Jul 2025 12:18:12 +0000 (15:18 +0300)]
Merge branch 'develop' into feature_smirnov_erp-409_create_check_for_success_marketplace_order
# Conflicts:
# erp24/actions/infoTable/TestAction.php
Aleksey Filippov [Fri, 11 Jul 2025 10:18:19 +0000 (13:18 +0300)]
отладка
Aleksey Filippov [Fri, 11 Jul 2025 10:12:25 +0000 (13:12 +0300)]
fix ключ данных по отправке в 1с
Aleksey Filippov [Wed, 9 Jul 2025 15:19:15 +0000 (15:19 +0000)]
Merge branch 'feature_filippov_20250709_fix_sync_telegram_users' into 'develop'
fix sync telegram users
See merge request gitlab-instance/yii-erp24!904
Aleksey Filippov [Wed, 9 Jul 2025 15:18:37 +0000 (18:18 +0300)]
fix sync telegram users
Aleksey Filippov [Tue, 8 Jul 2025 05:50:06 +0000 (05:50 +0000)]
Merge branch 'feature_fomichev_erp-431_category_plan-feedback_category_share' into 'develop'
[ERP-431] ОС по Планам по категориям - пересчет
See merge request gitlab-instance/yii-erp24!887
Aleksey Filippov [Fri, 4 Jul 2025 17:22:21 +0000 (17:22 +0000)]
Merge branch 'feature_filippov_bc-278_tg_promo_message' into 'develop'
[BC-278] Отправка сообщения в Телеграм
See merge request gitlab-instance/yii-erp24!903
Aleksey Filippov [Fri, 4 Jul 2025 17:21:45 +0000 (20:21 +0300)]
[BC-278] Отправка сообщения в Телеграм
projects / erp24_rep / yii-erp24 / .git / log