]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
Alexander Smirnov [Wed, 20 Nov 2024 12:44:57 +0000 (15:44 +0300)]
[ERP-241] вывод во вьюшке остатков по смене
Alexander Smirnov [Wed, 20 Nov 2024 12:23:01 +0000 (15:23 +0300)]
[ERP-241] в перечисление сотрудников группа Другие последняя
Alexander Smirnov [Wed, 20 Nov 2024 11:39:52 +0000 (14:39 +0300)]
[ERP-241] маркировку продуктов в ProductsClass
Alexander Smirnov [Mon, 18 Nov 2024 11:57:30 +0000 (14:57 +0300)]
[ERP-241] поменялось расположение ввода
Alexander Smirnov [Mon, 18 Nov 2024 08:28:22 +0000 (11:28 +0300)]
[ERP-241] передача смены
Aleksey Filippov [Thu, 14 Nov 2024 08:44:35 +0000 (08:44 +0000)]
Merge branch 'feature_filippov_20241114_add_price_to_matrix_view' into 'develop'
Добавил цену в таблицу
See merge request gitlab-instance/yii-erp24!434
Aleksey Filippov [Thu, 14 Nov 2024 08:43:56 +0000 (11:43 +0300)]
Добавил цену в таблицу
Aleksey Filippov [Thu, 14 Nov 2024 08:07:36 +0000 (08:07 +0000)]
Merge branch 'feature_smirnov_erp-148_yandex_market_integration' into 'develop'
[ERP-148] вывод отправляемых на маркет данных 3
See merge request gitlab-instance/yii-erp24!433
Alexander Smirnov [Thu, 14 Nov 2024 08:03:12 +0000 (11:03 +0300)]
[ERP-148] вывод отправляемых на маркет данных в отдельном url 3
Alexander Smirnov [Thu, 14 Nov 2024 07:51:19 +0000 (10:51 +0300)]
[ERP-148] вывод отправляемых на маркет данных в отдельном url 2
Alexander Smirnov [Thu, 14 Nov 2024 07:16:41 +0000 (10:16 +0300)]
[ERP-148] вывод отправляемых на маркет данных в отдельном url
Alexander Smirnov [Wed, 13 Nov 2024 17:36:57 +0000 (20:36 +0300)]
[ERP-148] вывод отправляемых на маркет данных 3
Aleksey Filippov [Wed, 13 Nov 2024 15:35:46 +0000 (15:35 +0000)]
Merge branch 'feature_smirnov_erp-148_yandex_market_integration' into 'develop'
[ERP-148] вывод отправляемых на маркет данных
See merge request gitlab-instance/yii-erp24!432
Alexander Smirnov [Wed, 13 Nov 2024 15:15:22 +0000 (18:15 +0300)]
[ERP-148] вывод отправляемых на маркет данных 2
Alexander Smirnov [Wed, 13 Nov 2024 12:43:44 +0000 (15:43 +0300)]
[ERP-148] вывод отправляемых на маркет данных
Aleksey Filippov [Wed, 13 Nov 2024 12:02:27 +0000 (12:02 +0000)]
Merge branch 'feature_fomichev_erp_217_add_access_to_hr' into 'develop'
[ERP-217] Проверить возможность удаления окладов
See merge request gitlab-instance/yii-erp24!418
fomichev [Wed, 13 Nov 2024 11:56:26 +0000 (14:56 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp_217_add_access_to_hr
fomichev [Wed, 13 Nov 2024 11:50:18 +0000 (14:50 +0300)]
Исправление кнопки назад
Aleksey Filippov [Wed, 13 Nov 2024 10:34:14 +0000 (10:34 +0000)]
Merge branch 'feature_smirnov_erp-148_yandex_market_integration' into 'develop'
[ERP-148] красивая урл для картинки 7
See merge request gitlab-instance/yii-erp24!431
Alexander Smirnov [Wed, 13 Nov 2024 10:29:17 +0000 (13:29 +0300)]
[ERP-148] красивая урл для картинки 7
Aleksey Filippov [Wed, 13 Nov 2024 10:14:31 +0000 (10:14 +0000)]
Merge branch 'feature_smirnov_erp-148_yandex_market_integration' into 'develop'
[ERP-148] красивая урл для картинки 6
See merge request gitlab-instance/yii-erp24!429
Alexander Smirnov [Wed, 13 Nov 2024 10:12:58 +0000 (13:12 +0300)]
[ERP-148] красивая урл для картинки 6
Aleksey Filippov [Wed, 13 Nov 2024 10:10:28 +0000 (10:10 +0000)]
Merge branch 'feature_smirnov_erp-148_yandex_market_integration' into 'develop'
[ERP-148] красивая урл для картинки 4
See merge request gitlab-instance/yii-erp24!428
Alexander Smirnov [Wed, 13 Nov 2024 10:09:14 +0000 (13:09 +0300)]
[ERP-148] красивая урл для картинки 4
Aleksey Filippov [Wed, 13 Nov 2024 10:01:13 +0000 (10:01 +0000)]
Merge branch 'feature_smirnov_erp-148_yandex_market_integration' into 'develop'
[ERP-148] красивая урл для картинки 3
See merge request gitlab-instance/yii-erp24!427
Alexander Smirnov [Wed, 13 Nov 2024 09:58:27 +0000 (12:58 +0300)]
[ERP-148] красивая урл для картинки 3
Aleksey Filippov [Wed, 13 Nov 2024 09:53:46 +0000 (09:53 +0000)]
Merge branch 'feature_fomichev_erp-232_error_log_bot' into 'develop'
[ERP-232] Создать бота и настроить отправку логов с ошибками из ERPПроверка строки
See merge request gitlab-instance/yii-erp24!426
fomichev [Wed, 13 Nov 2024 09:45:38 +0000 (12:45 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-232_error_log_bot
fomichev [Wed, 13 Nov 2024 09:43:44 +0000 (12:43 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-232_error_log_bot
fomichev [Wed, 13 Nov 2024 09:27:33 +0000 (12:27 +0300)]
Проверка строки
Aleksey Filippov [Wed, 13 Nov 2024 09:26:31 +0000 (09:26 +0000)]
Merge branch 'feature_smirnov_erp-148_yandex_market_integration' into 'develop'
[ERP-148] красивая урл для картинки 2
See merge request gitlab-instance/yii-erp24!425
Alexander Smirnov [Wed, 13 Nov 2024 09:24:52 +0000 (12:24 +0300)]
[ERP-148] красивая урл для картинки 2
Aleksey Filippov [Wed, 13 Nov 2024 09:18:50 +0000 (09:18 +0000)]
Merge branch 'feature_smirnov_erp-148_yandex_market_integration' into 'develop'
[ERP-148] красивая урл для картинки
See merge request gitlab-instance/yii-erp24!424
Alexander Smirnov [Wed, 13 Nov 2024 09:18:02 +0000 (12:18 +0300)]
Merge branch 'develop' into feature_smirnov_erp-148_yandex_market_integration
Alexander Smirnov [Wed, 13 Nov 2024 09:13:52 +0000 (12:13 +0300)]
[ERP-148] красивая урл для картинки
Aleksey Filippov [Wed, 13 Nov 2024 06:45:35 +0000 (06:45 +0000)]
Merge branch 'feature_fomichev_erp_149_flowwow_feed' into 'develop'
[ERP-149] Интеграция с Flowwow
See merge request gitlab-instance/yii-erp24!422
fomichev [Tue, 12 Nov 2024 15:24:21 +0000 (18:24 +0300)]
Добавление параметров
fomichev [Tue, 12 Nov 2024 15:13:35 +0000 (18:13 +0300)]
Влил девелоп
fomichev [Tue, 12 Nov 2024 15:05:54 +0000 (18:05 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp_149_flowwow_feed
# Conflicts:
# erp24/services/MarketplaceService.php
Aleksey Filippov [Tue, 12 Nov 2024 15:04:26 +0000 (15:04 +0000)]
Merge branch 'feature_smirnov_erp-148_yandex_market_integration' into 'develop'
Feature smirnov erp 148 yandex market integration
See merge request gitlab-instance/yii-erp24!423
fomichev [Tue, 12 Nov 2024 15:04:02 +0000 (18:04 +0300)]
Поменял ссылки на прод
Alexander Smirnov [Tue, 12 Nov 2024 15:02:42 +0000 (18:02 +0300)]
[ERP-148] доработка яндекс маркетплейса 8
Alexander Smirnov [Tue, 12 Nov 2024 14:32:12 +0000 (17:32 +0300)]
[ERP-148] доработка яндекс маркетплейса 7
Alexander Smirnov [Tue, 12 Nov 2024 14:20:21 +0000 (17:20 +0300)]
[ERP-148] доработка яндекс маркетплейса 6
Alexander Smirnov [Tue, 12 Nov 2024 14:14:25 +0000 (17:14 +0300)]
[ERP-148] доработка яндекс маркетплейса 5
fomichev [Tue, 12 Nov 2024 14:07:59 +0000 (17:07 +0300)]
Проверка на категорию цветы - инверсия
fomichev [Tue, 12 Nov 2024 14:06:49 +0000 (17:06 +0300)]
Проверка на категорию цветы
fomichev [Tue, 12 Nov 2024 14:00:53 +0000 (17:00 +0300)]
Правки фида и чистка кода
Alexander Smirnov [Tue, 12 Nov 2024 13:08:58 +0000 (16:08 +0300)]
[ERP-148] доработка яндекс маркетплейса 4
Alexander Smirnov [Tue, 12 Nov 2024 12:56:36 +0000 (15:56 +0300)]
[ERP-148] доработка яндекс маркетплейса 3
Alexander Smirnov [Tue, 12 Nov 2024 12:53:30 +0000 (15:53 +0300)]
[ERP-148] доработка яндекс маркетплейса 2
Alexander Smirnov [Tue, 12 Nov 2024 12:14:00 +0000 (15:14 +0300)]
[ERP-148] доработка яндекс маркетплейса
fomichev [Tue, 12 Nov 2024 10:44:14 +0000 (13:44 +0300)]
Фид тестирование
fomichev [Tue, 12 Nov 2024 09:07:29 +0000 (12:07 +0300)]
Цены
fomichev [Tue, 12 Nov 2024 08:24:38 +0000 (11:24 +0300)]
Исправление 2
fomichev [Tue, 12 Nov 2024 07:59:01 +0000 (10:59 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp_149_flowwow_feed
# Conflicts:
# erp24/services/MarketplaceService.php
Aleksey Filippov [Tue, 12 Nov 2024 07:49:21 +0000 (07:49 +0000)]
Merge branch 'feature_smirnov_erp-148_yandex_market_integration' into 'develop'
[ERP-148] интеграция с яндексмаркетплейсом
See merge request gitlab-instance/yii-erp24!409
Alexander Smirnov [Tue, 12 Nov 2024 07:47:02 +0000 (10:47 +0300)]
[ERP-148] починил Маринин метод 2
Alexander Smirnov [Tue, 12 Nov 2024 07:19:47 +0000 (10:19 +0300)]
[ERP-148] починил Маринин метод
fomichev [Tue, 12 Nov 2024 07:12:11 +0000 (10:12 +0300)]
Исправление
fomichev [Mon, 11 Nov 2024 14:47:20 +0000 (17:47 +0300)]
Исправление
fomichev [Mon, 11 Nov 2024 14:32:03 +0000 (17:32 +0300)]
Все не найденые цены на 0
fomichev [Mon, 11 Nov 2024 14:18:11 +0000 (17:18 +0300)]
Проверка на dev
fomichev [Mon, 11 Nov 2024 13:43:44 +0000 (16:43 +0300)]
Проверка на dev
fomichev [Mon, 11 Nov 2024 13:20:28 +0000 (16:20 +0300)]
Путь к картинке
fomichev [Mon, 11 Nov 2024 12:22:38 +0000 (15:22 +0300)]
Проверка с категории
fomichev [Mon, 11 Nov 2024 11:19:38 +0000 (14:19 +0300)]
Проверка без категории
fomichev [Mon, 11 Nov 2024 11:13:43 +0000 (14:13 +0300)]
Добавление ссылки
fomichev [Mon, 11 Nov 2024 10:46:07 +0000 (13:46 +0300)]
Исправление ошибок
fomichev [Mon, 11 Nov 2024 10:23:51 +0000 (13:23 +0300)]
Добавление свойств
fomichev [Mon, 11 Nov 2024 07:54:49 +0000 (10:54 +0300)]
Перенос фида с api2 на media
Alexander Smirnov [Fri, 8 Nov 2024 14:50:55 +0000 (17:50 +0300)]
Merge branch 'develop' into feature_smirnov_erp-148_yandex_market_integration
Aleksey Filippov [Fri, 8 Nov 2024 14:48:16 +0000 (14:48 +0000)]
Merge branch 'feature-zozirova-erp_153-marketplace_methods' into 'develop'
ERP-153 Реализовать метод для сбора информации об остатках и стоимости товара
See merge request gitlab-instance/yii-erp24!421
marina [Fri, 8 Nov 2024 14:43:39 +0000 (17:43 +0300)]
ERP-153 Реализовать метод для сбора информации об остатках и стоимости товара
fomichev [Fri, 8 Nov 2024 14:41:59 +0000 (17:41 +0300)]
Мерж с девом файла MarketplaceService.php
fomichev [Fri, 8 Nov 2024 14:40:49 +0000 (17:40 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp_149_flowwow_feed
# Conflicts:
# erp24/services/MarketplaceService.php
Aleksey Filippov [Fri, 8 Nov 2024 13:34:42 +0000 (13:34 +0000)]
Merge branch 'feature-zozirova-erp_153-marketplace_methods' into 'develop'
ERP-153 Реализовать метод для сбора информации об остатках и стоимости товара
See merge request gitlab-instance/yii-erp24!420
marina [Fri, 8 Nov 2024 13:33:07 +0000 (16:33 +0300)]
ERP-153 Реализовать метод для сбора информации об остатках и стоимости товара
Alexander Smirnov [Fri, 8 Nov 2024 13:18:16 +0000 (16:18 +0300)]
Merge branch 'develop' into feature_smirnov_erp-148_yandex_market_integration
Aleksey Filippov [Fri, 8 Nov 2024 13:16:36 +0000 (13:16 +0000)]
Merge branch 'feature-zozirova-erp_153-marketplace_methods' into 'develop'
ERP-153 Реализовать метод для сбора информации об остатках и стоимости товара
See merge request gitlab-instance/yii-erp24!419
marina [Fri, 8 Nov 2024 13:13:39 +0000 (16:13 +0300)]
ERP-153 Реализовать метод для сбора информации об остатках и стоимости товара
Alexander Smirnov [Fri, 8 Nov 2024 12:27:30 +0000 (15:27 +0300)]
Merge branch 'develop' into feature_smirnov_erp-148_yandex_market_integration
fomichev [Fri, 8 Nov 2024 11:04:59 +0000 (14:04 +0300)]
Убрал кнопку создания для того у кого нет разрешения
fomichev [Fri, 8 Nov 2024 10:36:29 +0000 (13:36 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp_217_add_access_to_hr
fomichev [Fri, 8 Nov 2024 10:35:57 +0000 (13:35 +0300)]
Исправление ошибки логики
Aleksey Filippov [Fri, 8 Nov 2024 08:23:53 +0000 (08:23 +0000)]
Merge branch 'feature-zozirova-erp_153-marketplace_methods' into 'develop'
ERP-153 Реализовать метод для сбора информации об остатках и стоимости товара
See merge request gitlab-instance/yii-erp24!415
Aleksey Filippov [Fri, 8 Nov 2024 08:22:24 +0000 (08:22 +0000)]
Merge branch 'feature_smirnov_erp-231_marketplace_properties_stuff' into 'develop'
[ERP-231] правка багом на matrix-erp
See merge request gitlab-instance/yii-erp24!411
Alexander Smirnov [Fri, 8 Nov 2024 07:38:37 +0000 (10:38 +0300)]
[ERP-231] подвинуть видео урл и убрать ссылку на карточку и на картинку
marina [Fri, 8 Nov 2024 06:08:06 +0000 (09:08 +0300)]
ERP-153 Реализовать метод для сбора информации об остатках и стоимости товара
Aleksey Filippov [Thu, 7 Nov 2024 20:56:50 +0000 (20:56 +0000)]
Merge branch 'feature_fomichev_erp-232_error_log_bot' into 'develop'
[ERP-232] Создать бота и настроить отправку логов с ошибками из ERP
See merge request gitlab-instance/yii-erp24!416
Aleksey Filippov [Thu, 7 Nov 2024 19:20:48 +0000 (19:20 +0000)]
Merge branch 'feature_zozirova_erp-223_add_new_column' into 'develop'
ERP-223 Добавить в /admin-person-bonuses/ строчку Переработка (сумма)
See merge request gitlab-instance/yii-erp24!406
Aleksey Filippov [Thu, 7 Nov 2024 15:00:43 +0000 (15:00 +0000)]
Merge branch 'feature_smirnov_erp-222_subscription_for_weekly_report' into 'develop'
[ERP-222] bigInteger instread of integer
See merge request gitlab-instance/yii-erp24!417
Alexander Smirnov [Thu, 7 Nov 2024 14:59:06 +0000 (17:59 +0300)]
[ERP-222] bigInteger instread of integer
Aleksey Filippov [Thu, 7 Nov 2024 14:55:50 +0000 (14:55 +0000)]
Merge branch 'feature_smirnov_erp-235_return_sales_not_delivery_even_if_sales_check_is_delivery' into 'develop'
[ERP-235] Чек возврата без order_id может быть по доставке, если sales_check по доставке
See merge request gitlab-instance/yii-erp24!412
Aleksey Filippov [Thu, 7 Nov 2024 14:14:03 +0000 (14:14 +0000)]
Merge branch 'feature_smirnov_erp-155_marketplace_priorities' into 'develop'
[ERP-155] заполняются приоритеты для всех продуктов в самом начале
See merge request gitlab-instance/yii-erp24!413
fomichev [Thu, 7 Nov 2024 13:16:09 +0000 (16:16 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-232_error_log_bot
Alexander Smirnov [Thu, 7 Nov 2024 12:18:19 +0000 (15:18 +0300)]
[ERP-231] разрешить jpeg
Aleksey Filippov [Thu, 7 Nov 2024 06:57:07 +0000 (06:57 +0000)]
Merge branch 'feature_fomichev_erp_217_add_access_to_hr' into 'develop'
[ERP-217] Проверить возможность удаления окладов
See merge request gitlab-instance/yii-erp24!414
Alexander Smirnov [Wed, 6 Nov 2024 14:08:20 +0000 (17:08 +0300)]
[ERP-231] media урл для показа картинок и карточек
marina [Wed, 6 Nov 2024 06:49:24 +0000 (09:49 +0300)]
ERP-153 Реализовать метод для сбора информации об остатках и стоимости товара
projects / erp24_rep / yii-erp24 / .git / log