]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
Alexander Smirnov [Wed, 26 Feb 2025 13:12:37 +0000 (16:12 +0300)]
[ERP-331] request orders
Aleksey Filippov [Wed, 26 Feb 2025 11:55:20 +0000 (11:55 +0000)]
Merge branch 'feature_fomichev_erp-324_marketplace_orders' into 'develop'
[ERP-324] Интеграциями по API с МП
See merge request gitlab-instance/yii-erp24!690
fomichev [Wed, 26 Feb 2025 07:53:01 +0000 (10:53 +0300)]
Формат наносекунд
fomichev [Wed, 26 Feb 2025 07:44:16 +0000 (10:44 +0300)]
Тест
fomichev [Wed, 26 Feb 2025 07:33:53 +0000 (10:33 +0300)]
Смена вывода времени
fomichev [Tue, 25 Feb 2025 14:15:48 +0000 (17:15 +0300)]
Тестирование возвратов
Aleksey Filippov [Tue, 25 Feb 2025 12:18:53 +0000 (12:18 +0000)]
Merge branch 'feature_smirnov_erp-325_amo_status' into 'develop'
[ERP-325] marketplace status
See merge request gitlab-instance/yii-erp24!687
Aleksey Filippov [Tue, 25 Feb 2025 12:16:57 +0000 (12:16 +0000)]
Merge branch 'feature_smirnov_erp-342_cdn_to_local_download' into 'develop'
[ERP-342] cdn to local js
See merge request gitlab-instance/yii-erp24!688
fomichev [Tue, 25 Feb 2025 10:39:08 +0000 (13:39 +0300)]
Обработка возвратов
fomichev [Tue, 25 Feb 2025 09:50:22 +0000 (12:50 +0300)]
Добавление полей возврата в модель заказов
fomichev [Tue, 25 Feb 2025 09:47:53 +0000 (12:47 +0300)]
Добавление полей возврата в модель заказов
fomichev [Tue, 25 Feb 2025 09:45:30 +0000 (12:45 +0300)]
Добавление полей возврата в таблицу заказов
fomichev [Tue, 25 Feb 2025 07:13:59 +0000 (10:13 +0300)]
Исправление ответа
fomichev [Mon, 24 Feb 2025 15:06:39 +0000 (18:06 +0300)]
Изменение ответов с тестовых на яндекс
fomichev [Mon, 24 Feb 2025 14:52:15 +0000 (17:52 +0300)]
Обработка адресов и переименование в index
fomichev [Mon, 24 Feb 2025 14:24:41 +0000 (17:24 +0300)]
Обработка отмены и возврата
fomichev [Mon, 24 Feb 2025 14:03:35 +0000 (17:03 +0300)]
Обработка смены статуса заказа
fomichev [Mon, 24 Feb 2025 12:44:35 +0000 (15:44 +0300)]
Обработка создания заказа
Alexander Smirnov [Mon, 24 Feb 2025 11:24:31 +0000 (14:24 +0300)]
[ERP-342] cdn to local css
fomichev [Mon, 24 Feb 2025 10:40:39 +0000 (13:40 +0300)]
Перенос в сервис
fomichev [Mon, 24 Feb 2025 09:12:50 +0000 (12:12 +0300)]
Добавление уведомлений
Alexander Smirnov [Sat, 22 Feb 2025 19:31:12 +0000 (22:31 +0300)]
[ERP-325] amo_status to marketplace_status
Alexander Smirnov [Fri, 21 Feb 2025 14:24:31 +0000 (17:24 +0300)]
[ERP-342] cdn to local js
Alexander Smirnov [Fri, 21 Feb 2025 14:11:22 +0000 (17:11 +0300)]
[ERP-325] api2 /marketplace/status
Alexander Smirnov [Fri, 21 Feb 2025 13:33:52 +0000 (16:33 +0300)]
[ERP-325] amo status
fomichev [Fri, 21 Feb 2025 12:30:15 +0000 (15:30 +0300)]
Правки тестирования
fomichev [Fri, 21 Feb 2025 09:38:31 +0000 (12:38 +0300)]
Рефакторинг и улучшение метода
fomichev [Thu, 20 Feb 2025 12:46:37 +0000 (15:46 +0300)]
Изменение вида таблиц и поиска
fomichev [Thu, 20 Feb 2025 12:35:17 +0000 (15:35 +0300)]
Изменение вида таблиц и поиска
fomichev [Thu, 20 Feb 2025 09:49:52 +0000 (12:49 +0300)]
Изменение таблиц и добавление элементов и доставок
fomichev [Wed, 19 Feb 2025 15:09:13 +0000 (18:09 +0300)]
Загрузка заказов
Aleksey Filippov [Wed, 19 Feb 2025 11:11:24 +0000 (11:11 +0000)]
Merge branch 'bug_smirnov_2025_02_19_fill_select2' into 'develop'
фикс
See merge request gitlab-instance/yii-erp24!686
Alexander Smirnov [Wed, 19 Feb 2025 10:41:50 +0000 (13:41 +0300)]
фикс
Aleksey Filippov [Wed, 19 Feb 2025 09:11:49 +0000 (09:11 +0000)]
Merge branch 'feature_smirnov_erp-323_region_id_in_price' into 'develop'
[ERP-323] region id in price
See merge request gitlab-instance/yii-erp24!684
Aleksey Filippov [Wed, 19 Feb 2025 07:15:10 +0000 (07:15 +0000)]
Merge branch 'feature_smirnov_erp-305_response_on_category_plan' into 'develop'
[ERP-305] заголовок
See merge request gitlab-instance/yii-erp24!680
Aleksey Filippov [Tue, 18 Feb 2025 09:52:01 +0000 (09:52 +0000)]
Merge branch 'feature_fomichev_erp-300_create_nomenclature_1c_table' into 'develop'
Полная выгрузка в excel
See merge request gitlab-instance/yii-erp24!685
fomichev [Tue, 18 Feb 2025 09:39:39 +0000 (12:39 +0300)]
Полная выгрузка в excel
fomichev [Tue, 18 Feb 2025 09:17:25 +0000 (12:17 +0300)]
Полная выгрузка
Aleksey Filippov [Tue, 18 Feb 2025 06:57:35 +0000 (06:57 +0000)]
Merge branch 'feature_fomichev_erp-300_create_nomenclature_1c_table' into 'develop'
Выгрузка в Excel
See merge request gitlab-instance/yii-erp24!683
fomichev [Tue, 18 Feb 2025 06:54:08 +0000 (09:54 +0300)]
Выгрузка в учсуд
Aleksey Filippov [Tue, 18 Feb 2025 06:24:06 +0000 (06:24 +0000)]
Merge branch 'feature_fomichev_erp-300_create_nomenclature_1c_table' into 'develop'
Feature fomichev erp 300 create nomenclature 1c table
See merge request gitlab-instance/yii-erp24!682
fomichev [Mon, 17 Feb 2025 15:04:12 +0000 (18:04 +0300)]
Фильтры
fomichev [Mon, 17 Feb 2025 15:01:30 +0000 (18:01 +0300)]
Фильтры
fomichev [Mon, 17 Feb 2025 14:59:26 +0000 (17:59 +0300)]
Фильтры
Alexander Smirnov [Mon, 17 Feb 2025 14:44:35 +0000 (17:44 +0300)]
typo
Alexander Smirnov [Mon, 17 Feb 2025 14:43:23 +0000 (17:43 +0300)]
typo
Alexander Smirnov [Mon, 17 Feb 2025 14:05:46 +0000 (17:05 +0300)]
typo
Alexander Smirnov [Mon, 17 Feb 2025 13:52:21 +0000 (16:52 +0300)]
[ERP-323] удаление region_id из prices, добавления prices_region
Aleksey Filippov [Mon, 17 Feb 2025 13:24:53 +0000 (13:24 +0000)]
Merge branch 'feature_fomichev_erp-300_create_nomenclature_1c_table' into 'develop'
Добавляем тип в таблицу номенклатуры
See merge request gitlab-instance/yii-erp24!681
fomichev [Mon, 17 Feb 2025 13:14:35 +0000 (16:14 +0300)]
Вывод
fomichev [Mon, 17 Feb 2025 12:49:49 +0000 (15:49 +0300)]
Добавляем тип в таблицу
Alexander Smirnov [Mon, 17 Feb 2025 09:44:16 +0000 (12:44 +0300)]
[ERP-305] редактируемые проценты
Alexander Smirnov [Mon, 17 Feb 2025 08:15:46 +0000 (11:15 +0300)]
[ERP-305] заголовок
Alexander Smirnov [Fri, 14 Feb 2025 12:16:30 +0000 (15:16 +0300)]
миграция сброса индекса
Aleksey Filippov [Fri, 14 Feb 2025 11:14:40 +0000 (11:14 +0000)]
Merge branch 'feature_fomichev_erp-307_wiki_doc_pages' into 'develop'
[ERP-307] Создать раздел документации
See merge request gitlab-instance/yii-erp24!679
fomichev [Fri, 14 Feb 2025 11:01:01 +0000 (14:01 +0300)]
Убираем иконку
Alexander Smirnov [Fri, 14 Feb 2025 10:51:06 +0000 (13:51 +0300)]
[ERP-323] region_id in prices and prices_dynamic 2
fomichev [Fri, 14 Feb 2025 10:48:44 +0000 (13:48 +0300)]
Миграция
fomichev [Fri, 14 Feb 2025 10:31:28 +0000 (13:31 +0300)]
ссылка на документацию в плане
Alexander Smirnov [Fri, 14 Feb 2025 10:30:49 +0000 (13:30 +0300)]
[ERP-323] region_id in prices and prices_dynamic
fomichev [Fri, 14 Feb 2025 10:30:04 +0000 (13:30 +0300)]
ссылка на документацию в плане
fomichev [Fri, 14 Feb 2025 10:29:37 +0000 (13:29 +0300)]
ссылка на документацию в плане
fomichev [Fri, 14 Feb 2025 10:00:28 +0000 (13:00 +0300)]
Добавление функционала адресов ресурсов
fomichev [Fri, 14 Feb 2025 09:02:05 +0000 (12:02 +0300)]
Удаление картинки
Aleksey Filippov [Thu, 13 Feb 2025 14:29:19 +0000 (14:29 +0000)]
Merge branch 'feature_fomichev_erp-307_wiki_doc_pages' into 'develop'
Путь к картинке
See merge request gitlab-instance/yii-erp24!678
fomichev [Thu, 13 Feb 2025 11:57:48 +0000 (14:57 +0300)]
Путь к картинке
Aleksey Filippov [Thu, 13 Feb 2025 11:33:11 +0000 (11:33 +0000)]
Merge branch 'feature_fomichev_erp-307_wiki_doc_pages' into 'develop'
[ERP-307] Создать раздел документации
See merge request gitlab-instance/yii-erp24!676
Aleksey Filippov [Thu, 13 Feb 2025 11:30:21 +0000 (11:30 +0000)]
Merge branch 'fix_fomichev_20250213_city_store_params_get_store_data' into 'develop'
Исправление экшена get_address_data
See merge request gitlab-instance/yii-erp24!677
fomichev [Thu, 13 Feb 2025 10:29:05 +0000 (13:29 +0300)]
Убираем автозагрузку
fomichev [Thu, 13 Feb 2025 10:09:39 +0000 (13:09 +0300)]
Исправление
fomichev [Thu, 13 Feb 2025 07:27:49 +0000 (10:27 +0300)]
настройки rabbitMQ
fomichev [Thu, 13 Feb 2025 07:26:20 +0000 (10:26 +0300)]
настройки rabbitMQ
fomichev [Wed, 12 Feb 2025 13:36:30 +0000 (16:36 +0300)]
Чистка кода
fomichev [Wed, 12 Feb 2025 13:33:44 +0000 (16:33 +0300)]
Чистка кода
fomichev [Wed, 12 Feb 2025 13:32:26 +0000 (16:32 +0300)]
Чистка кода
fomichev [Wed, 12 Feb 2025 13:26:37 +0000 (16:26 +0300)]
исправление адреса rabbit
Aleksey Filippov [Wed, 12 Feb 2025 13:14:26 +0000 (13:14 +0000)]
Merge branch 'feature_fomichev_erp-20250210_bonus_target_tg_notification' into 'develop'
Feature fomichev erp
20250210 bonus target tg notification
See merge request gitlab-instance/yii-erp24!675
fomichev [Wed, 12 Feb 2025 13:05:22 +0000 (16:05 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-307_wiki_doc_pages
fomichev [Wed, 12 Feb 2025 13:01:26 +0000 (16:01 +0300)]
Добавление тестовых телефонов
Aleksey Filippov [Wed, 12 Feb 2025 13:00:18 +0000 (13:00 +0000)]
Merge branch 'feature_fomichev_erp-20250210_bonus_target_tg_notification' into 'develop'
Добавление тестовых телефонов
See merge request gitlab-instance/yii-erp24!674
Aleksey Filippov [Wed, 12 Feb 2025 12:59:47 +0000 (12:59 +0000)]
Merge branch 'feature_fomichev_erp-306_feedback_city_store_list' into 'develop'
ссылка на документацию
See merge request gitlab-instance/yii-erp24!673
fomichev [Wed, 12 Feb 2025 12:57:55 +0000 (15:57 +0300)]
Добавление тестовых телефонов
fomichev [Wed, 12 Feb 2025 12:51:11 +0000 (15:51 +0300)]
ссылка на документацию
fomichev [Wed, 12 Feb 2025 12:48:49 +0000 (15:48 +0300)]
ссылка на документацию
fomichev [Wed, 12 Feb 2025 12:47:56 +0000 (15:47 +0300)]
ссылка на документацию
fomichev [Wed, 12 Feb 2025 12:28:13 +0000 (15:28 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-307_wiki_doc_pages
fomichev [Wed, 12 Feb 2025 11:23:46 +0000 (14:23 +0300)]
Правки по обновлению slug
fomichev [Wed, 12 Feb 2025 11:10:46 +0000 (14:10 +0300)]
Правки кнопок
fomichev [Wed, 12 Feb 2025 11:03:35 +0000 (14:03 +0300)]
Правки и редактор
Aleksey Filippov [Wed, 12 Feb 2025 06:28:42 +0000 (06:28 +0000)]
Merge branch 'feature_smirnov_erp-283_category_plan' into 'develop'
[ERP-283] category plan: фильтр + заголовок
See merge request gitlab-instance/yii-erp24!666
fomichev [Wed, 12 Feb 2025 05:27:25 +0000 (08:27 +0300)]
загрузка файлов
fomichev [Tue, 11 Feb 2025 14:38:34 +0000 (17:38 +0300)]
загрузка файлов
fomichev [Tue, 11 Feb 2025 11:20:29 +0000 (14:20 +0300)]
Создание правки по вики
Aleksey Filippov [Tue, 11 Feb 2025 10:04:15 +0000 (10:04 +0000)]
Merge branch 'feature_filippov_20250211_amo_token_refresh' into 'develop'
Обновление токена для подключения к AMO
See merge request gitlab-instance/yii-erp24!672
Aleksey Filippov [Tue, 11 Feb 2025 10:03:31 +0000 (13:03 +0300)]
Обновление токена для подключения к AMO
Aleksey Filippov [Tue, 11 Feb 2025 07:28:38 +0000 (07:28 +0000)]
Merge branch 'fix_fomichev_erp-295_data_upload_issue' into 'develop'
Окружение в докере и обновление функции
See merge request gitlab-instance/yii-erp24!640
fomichev [Tue, 11 Feb 2025 07:26:37 +0000 (10:26 +0300)]
Merge branch 'refs/heads/develop' into fix_fomichev_erp-295_data_upload_issue
# Conflicts:
# erp24/services/TelegramService.php
Aleksey Filippov [Tue, 11 Feb 2025 07:23:06 +0000 (07:23 +0000)]
Merge branch 'fix_fomichev_20250206_dev_env_fix' into 'develop'
Fix fomichev
20250206 dev env fix
See merge request gitlab-instance/yii-erp24!665
fomichev [Tue, 11 Feb 2025 07:05:35 +0000 (10:05 +0300)]
Создание CRUD документации
Alexander Smirnov [Mon, 10 Feb 2025 15:46:12 +0000 (18:46 +0300)]
[ERP-283] убрать комментарии
projects / erp24_rep / yii-erp24 / .git / log