]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
marina [Mon, 28 Apr 2025 11:53:15 +0000 (14:53 +0300)]
ERP-402 Добавить в ЛК Флориста расчёт премии за авторские букеты
marina [Thu, 24 Apr 2025 21:33:44 +0000 (00:33 +0300)]
ERP-402 Добавить в ЛК Флориста расчёт премии за авторские букеты
Aleksey Filippov [Tue, 22 Apr 2025 08:47:17 +0000 (08:47 +0000)]
Merge branch 'feature_fomichev_erp-406_test_order_creation' into 'develop'
[ERP-406] Feature fomichev erp 406 test order creation
See merge request gitlab-instance/yii-erp24!811
fomichev [Tue, 22 Apr 2025 08:44:46 +0000 (11:44 +0300)]
Доставка и сортировка
Aleksey Filippov [Tue, 22 Apr 2025 08:24:36 +0000 (08:24 +0000)]
Merge branch 'feature_smirnov_20250422_create_orders_only_on_develop' into 'develop'
only on develop
See merge request gitlab-instance/yii-erp24!810
fomichev [Tue, 22 Apr 2025 08:24:05 +0000 (11:24 +0300)]
Merge branch 'refs/heads/feature_fomichev_erp-371_FW_status_from_email_2' into feature_fomichev_erp-406_test_order_creation
fomichev [Tue, 22 Apr 2025 08:22:22 +0000 (11:22 +0300)]
Вывод ошибки заказа
Alexander Smirnov [Tue, 22 Apr 2025 07:35:42 +0000 (10:35 +0300)]
only on develop
Aleksey Filippov [Tue, 22 Apr 2025 06:44:08 +0000 (06:44 +0000)]
Merge branch 'feature_fomichev_erp-406_test_order_creation' into 'develop'
[ERP-406] ссылка на заказ
See merge request gitlab-instance/yii-erp24!808
fomichev [Tue, 22 Apr 2025 06:42:14 +0000 (09:42 +0300)]
ссылка на заказ
Aleksey Filippov [Mon, 21 Apr 2025 16:40:26 +0000 (16:40 +0000)]
Merge branch 'feature_fomichev_erp-406_test_order_creation' into 'develop'
[ERP-406] Проверка товаров
See merge request gitlab-instance/yii-erp24!807
fomichev [Mon, 21 Apr 2025 14:40:11 +0000 (17:40 +0300)]
Проверка товаров
Aleksey Filippov [Mon, 21 Apr 2025 14:03:10 +0000 (14:03 +0000)]
Merge branch 'feature_fomichev_erp-406_test_order_creation' into 'develop'
Feature fomichev erp 406 test order creation
See merge request gitlab-instance/yii-erp24!806
fomichev [Mon, 21 Apr 2025 14:01:32 +0000 (17:01 +0300)]
Сохранение товаров
fomichev [Mon, 21 Apr 2025 13:53:22 +0000 (16:53 +0300)]
Merge branch 'refs/heads/feature_fomichev_erp-404_add_order_link' into feature_fomichev_erp-406_test_order_creation
fomichev [Mon, 21 Apr 2025 13:49:41 +0000 (16:49 +0300)]
Таблица с товарами
Aleksey Filippov [Mon, 21 Apr 2025 13:19:08 +0000 (13:19 +0000)]
Merge branch 'feature_fomichev_erp-406_test_order_creation' into 'develop'
[ERP-406] Цены и сортировка
See merge request gitlab-instance/yii-erp24!805
fomichev [Mon, 21 Apr 2025 13:15:39 +0000 (16:15 +0300)]
Цены и сортировка
Aleksey Filippov [Mon, 21 Apr 2025 13:08:42 +0000 (13:08 +0000)]
Merge branch 'feature_zozirova_erp-359_logic_of_calculation_for_month' into 'develop'
ERP-359 ERP-368 Создать логику расчета на месяц - сумма продаж и списаний вида для автопм
See merge request gitlab-instance/yii-erp24!804
marina [Mon, 21 Apr 2025 13:03:42 +0000 (16:03 +0300)]
ERP-359 Создать логику расчета на месяц - сумма продаж вида для автопм
Aleksey Filippov [Mon, 21 Apr 2025 12:37:03 +0000 (12:37 +0000)]
Merge branch 'feature_fomichev_erp-406_test_order_creation' into 'develop'
[ERP-406] Сделать добавление тестовых заказов в marketplace_ordersТестовый заказ
See merge request gitlab-instance/yii-erp24!801
Aleksey Filippov [Mon, 21 Apr 2025 08:42:47 +0000 (08:42 +0000)]
Merge branch 'feature_smirnov_erp-403_payroll_sales_summary' into 'develop'
[ERP-403] total summary
See merge request gitlab-instance/yii-erp24!803
Alexander Smirnov [Mon, 21 Apr 2025 08:24:18 +0000 (11:24 +0300)]
fix
Alexander Smirnov [Mon, 21 Apr 2025 08:22:38 +0000 (11:22 +0300)]
[ERP-403] total summary
Aleksey Filippov [Mon, 21 Apr 2025 07:53:52 +0000 (07:53 +0000)]
Merge branch 'feature_smirnov_erp-403_payroll_sales_summary' into 'develop'
[ERP-403] sales and fot columns in payroll
See merge request gitlab-instance/yii-erp24!793
fomichev [Fri, 18 Apr 2025 11:45:28 +0000 (14:45 +0300)]
Првавки
fomichev [Fri, 18 Apr 2025 11:44:08 +0000 (14:44 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-371_FW_status_from_email_2
# Conflicts:
# erp24/services/MarketplaceService.php
fomichev [Fri, 18 Apr 2025 11:41:56 +0000 (14:41 +0300)]
Выделение даты
marina [Fri, 18 Apr 2025 11:36:10 +0000 (14:36 +0300)]
ERP-359 Создать логику расчета на месяц - сумма продаж вида для автопм
marina [Fri, 18 Apr 2025 11:33:16 +0000 (14:33 +0300)]
ERP-359 Создать логику расчета на месяц - сумма продаж вида для автопм
marina [Fri, 18 Apr 2025 11:28:24 +0000 (14:28 +0300)]
ERP-359 Создать логику расчета на месяц - сумма продаж вида для автопм
marina [Fri, 18 Apr 2025 11:27:09 +0000 (14:27 +0300)]
ERP-359 Создать логику расчета на месяц - сумма продаж вида для автопм
fomichev [Fri, 18 Apr 2025 10:00:55 +0000 (13:00 +0300)]
Проверка класс товара
fomichev [Fri, 18 Apr 2025 09:59:47 +0000 (12:59 +0300)]
Проверка класс товара
fomichev [Fri, 18 Apr 2025 09:58:28 +0000 (12:58 +0300)]
Проверка класс товара
fomichev [Fri, 18 Apr 2025 09:46:13 +0000 (12:46 +0300)]
Проверка на артикул
fomichev [Fri, 18 Apr 2025 09:34:07 +0000 (12:34 +0300)]
Тестовый заказ
Aleksey Filippov [Fri, 18 Apr 2025 08:40:21 +0000 (08:40 +0000)]
Merge branch 'feature_smirnov_erp-401_delivery_type_and_link' into 'develop'
[ERP-401] delivery_type
See merge request gitlab-instance/yii-erp24!791
Alexander Smirnov [Fri, 18 Apr 2025 08:28:59 +0000 (11:28 +0300)]
Merge branch 'develop' into feature_smirnov_erp-401_delivery_type_and_link
# Conflicts:
# erp24/api2/controllers/DataController.php
Aleksey Filippov [Fri, 18 Apr 2025 08:21:43 +0000 (08:21 +0000)]
Merge branch 'feature_smirnov_erp-408_new_fields_sent_to_1c' into 'develop'
[ERP-408] delivery_date_time fields sent to 1c
See merge request gitlab-instance/yii-erp24!800
Alexander Smirnov [Fri, 18 Apr 2025 08:14:00 +0000 (11:14 +0300)]
Merge branch 'develop' into feature_smirnov_erp-401_delivery_type_and_link
# Conflicts:
# erp24/api2/controllers/DataController.php
Alexander Smirnov [Fri, 18 Apr 2025 08:05:02 +0000 (11:05 +0300)]
[ERP-408] fix
Alexander Smirnov [Fri, 18 Apr 2025 07:56:53 +0000 (10:56 +0300)]
[ERP-408] order_link
Alexander Smirnov [Fri, 18 Apr 2025 07:54:00 +0000 (10:54 +0300)]
[ERP-408] delivery_date_time fields sent to 1c
fomichev [Fri, 18 Apr 2025 07:48:10 +0000 (10:48 +0300)]
доставка сохранение флаувау
Aleksey Filippov [Fri, 18 Apr 2025 07:22:49 +0000 (07:22 +0000)]
Merge branch 'feature_smirnov_20250417_error_in_response' into 'develop'
error in response
See merge request gitlab-instance/yii-erp24!798
Alexander Smirnov [Thu, 17 Apr 2025 14:24:50 +0000 (17:24 +0300)]
fix
Alexander Smirnov [Thu, 17 Apr 2025 14:11:09 +0000 (17:11 +0300)]
error in response
Aleksey Filippov [Thu, 17 Apr 2025 12:42:15 +0000 (12:42 +0000)]
Merge branch 'feature_filippov_20250417_mp_debug' into 'develop'
Feature filippov
20250417 mp debug
See merge request gitlab-instance/yii-erp24!797
Aleksey Filippov [Thu, 17 Apr 2025 12:40:30 +0000 (15:40 +0300)]
отладка мп
Aleksey Filippov [Thu, 17 Apr 2025 12:31:13 +0000 (12:31 +0000)]
Merge branch 'feature_fomichev_erp-404_add_order_link' into 'develop'
[ERP-404] Добавить поле с адресом заказа в marketplace_orders
See merge request gitlab-instance/yii-erp24!796
fomichev [Thu, 17 Apr 2025 11:28:21 +0000 (14:28 +0300)]
Артикул товара флаувау
Aleksey Filippov [Thu, 17 Apr 2025 11:22:42 +0000 (14:22 +0300)]
отладка пути
Aleksey Filippov [Thu, 17 Apr 2025 11:04:09 +0000 (14:04 +0300)]
отладка пути
Aleksey Filippov [Thu, 17 Apr 2025 10:45:58 +0000 (13:45 +0300)]
отладка пути
Aleksey Filippov [Thu, 17 Apr 2025 10:26:34 +0000 (13:26 +0300)]
отладка пути
Aleksey Filippov [Thu, 17 Apr 2025 10:23:00 +0000 (13:23 +0300)]
отладка пути
Aleksey Filippov [Thu, 17 Apr 2025 10:17:24 +0000 (13:17 +0300)]
отладка мп
fomichev [Thu, 17 Apr 2025 09:56:02 +0000 (12:56 +0300)]
ссылка на заказ
Aleksey Filippov [Thu, 17 Apr 2025 09:55:24 +0000 (09:55 +0000)]
Merge branch 'feature_filippov_20250417_mp_debug' into 'develop'
отладка мп
See merge request gitlab-instance/yii-erp24!795
Aleksey Filippov [Thu, 17 Apr 2025 09:54:36 +0000 (12:54 +0300)]
отладка пути
Aleksey Filippov [Thu, 17 Apr 2025 09:51:27 +0000 (09:51 +0000)]
Merge branch 'feature_filippov_20250417_mp_debug' into 'develop'
отладка мп
See merge request gitlab-instance/yii-erp24!794
Aleksey Filippov [Thu, 17 Apr 2025 09:50:36 +0000 (12:50 +0300)]
отладка мп
marina [Thu, 17 Apr 2025 06:17:51 +0000 (09:17 +0300)]
ERP-359 Создать логику расчета на месяц - сумма продаж вида для автопм
marina [Thu, 17 Apr 2025 06:05:54 +0000 (09:05 +0300)]
ERP-359 Создать логику расчета на месяц - сумма продаж вида для автопм
Aleksey Filippov [Wed, 16 Apr 2025 14:38:36 +0000 (14:38 +0000)]
Merge branch 'feature_fomichev_erp-380_add_lightbox_to_image_bouquetr' into 'develop'
Feature fomichev erp 380 add lightbox to image bouquetr
See merge request gitlab-instance/yii-erp24!792
fomichev [Wed, 16 Apr 2025 14:31:26 +0000 (17:31 +0300)]
Разделение галлерей
Alexander Smirnov [Wed, 16 Apr 2025 14:02:35 +0000 (17:02 +0300)]
[ERP-403] sales and fot columns in payroll
fomichev [Wed, 16 Apr 2025 13:39:40 +0000 (16:39 +0300)]
Видео проигрыватель
fomichev [Wed, 16 Apr 2025 13:31:32 +0000 (16:31 +0300)]
Видео проигрыватель
marina [Wed, 16 Apr 2025 11:03:22 +0000 (14:03 +0300)]
ERP-359 Создать логику расчета на месяц - сумма продаж вида для автопм
Aleksey Filippov [Wed, 16 Apr 2025 06:39:30 +0000 (06:39 +0000)]
Merge branch 'fix_null_check_on_store' into 'develop'
правка проверки на налл
See merge request gitlab-instance/yii-erp24!720
Alexander Smirnov [Tue, 15 Apr 2025 18:10:12 +0000 (21:10 +0300)]
[ERP-401] delivery_type
Aleksey Filippov [Tue, 15 Apr 2025 12:16:36 +0000 (12:16 +0000)]
Merge branch 'feature_smirnov_2025_04_15_log_http_result' into 'develop'
add http_code. needs migrate
See merge request gitlab-instance/yii-erp24!789
Alexander Smirnov [Tue, 15 Apr 2025 12:01:41 +0000 (15:01 +0300)]
add http_code. needs migrate
Aleksey Filippov [Tue, 15 Apr 2025 11:54:26 +0000 (11:54 +0000)]
Merge branch 'feature_smirnov_debug_2025_04_25' into 'develop'
debug
See merge request gitlab-instance/yii-erp24!788
Alexander Smirnov [Tue, 15 Apr 2025 11:37:06 +0000 (14:37 +0300)]
debug
Aleksey Filippov [Tue, 15 Apr 2025 11:10:16 +0000 (11:10 +0000)]
Merge branch 'feature_smirnov_erp-399_matrix_erp_property_dynamic' into 'develop'
[ERP-399] matrix_erp_property_dynamic
See merge request gitlab-instance/yii-erp24!786
Alexander Smirnov [Tue, 15 Apr 2025 11:08:08 +0000 (14:08 +0300)]
[ERP-399] matrixerp components fillment
Alexander Smirnov [Tue, 15 Apr 2025 09:54:11 +0000 (12:54 +0300)]
[ERP-399] refactor 2
Aleksey Filippov [Tue, 15 Apr 2025 09:36:23 +0000 (09:36 +0000)]
Merge branch 'feature_smirnov_2025_04_15_disable_warning' into 'develop'
disable warning
See merge request gitlab-instance/yii-erp24!787
Alexander Smirnov [Tue, 15 Apr 2025 09:32:24 +0000 (12:32 +0300)]
disable warning
Alexander Smirnov [Tue, 15 Apr 2025 09:29:41 +0000 (12:29 +0300)]
[ERP-399] fix
Alexander Smirnov [Tue, 15 Apr 2025 09:27:12 +0000 (12:27 +0300)]
[ERP-399] refactor
marina [Tue, 15 Apr 2025 07:23:51 +0000 (10:23 +0300)]
Merge branch 'develop' into feature_zozirova_erp-359_logic_of_calculation_for_month
marina [Tue, 15 Apr 2025 07:23:39 +0000 (10:23 +0300)]
ERP-359 Создать логику расчета на месяц - сумма продаж вида для автопм
Alexander Smirnov [Mon, 14 Apr 2025 11:39:56 +0000 (14:39 +0300)]
[ERP-399] matrix_erp_property_dynamic
Aleksey Filippov [Mon, 14 Apr 2025 09:18:42 +0000 (09:18 +0000)]
Merge branch 'feature_fomichev_erp-2025-04-14_add_server_name_to_env' into 'develop'
Feature fomichev erp 2025 04 14 add server name to env
See merge request gitlab-instance/yii-erp24!785
fomichev [Mon, 14 Apr 2025 08:11:19 +0000 (11:11 +0300)]
Вывод SERVER_NAME в TelegramTarget.php
fomichev [Mon, 14 Apr 2025 08:07:00 +0000 (11:07 +0300)]
Добавил SERVER_NAME в env
Aleksey Filippov [Mon, 14 Apr 2025 08:04:15 +0000 (08:04 +0000)]
Merge branch 'feature_fomichev_erp-344_cancel_order_from_1C' into 'develop'
Добавил очереди в bootstrap
See merge request gitlab-instance/yii-erp24!784
fomichev [Mon, 14 Apr 2025 08:02:31 +0000 (11:02 +0300)]
Добавил очереди в bootstrap
Aleksey Filippov [Mon, 14 Apr 2025 07:20:10 +0000 (07:20 +0000)]
Merge branch 'feature_fomichev_erp-344_cancel_order_from_1C' into 'develop'
344 Настройки для очередей
See merge request gitlab-instance/yii-erp24!783
marina [Fri, 11 Apr 2025 06:47:45 +0000 (09:47 +0300)]
ERP-359 Создать логику расчета на месяц - сумма продаж вида для автопм
fomichev [Thu, 10 Apr 2025 15:01:00 +0000 (18:01 +0300)]
Настройки для очередей
Aleksey Filippov [Thu, 10 Apr 2025 14:12:51 +0000 (14:12 +0000)]
Merge branch 'feature_fomichev_erp-366_calculate_history_share_product_species' into 'develop'
[ERP-366] Создать логику расчета на месяц для доли товара с историей
See merge request gitlab-instance/yii-erp24!782
fomichev [Thu, 10 Apr 2025 09:41:40 +0000 (12:41 +0300)]
Правки контроллера и представления
fomichev [Thu, 10 Apr 2025 09:10:48 +0000 (12:10 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-366_calculate_history_share_product_species
fomichev [Thu, 10 Apr 2025 06:40:23 +0000 (09:40 +0300)]
Добавление года в метод для расчета истории
fomichev [Thu, 10 Apr 2025 06:37:45 +0000 (09:37 +0300)]
Добавление года в метод для расчета истории
projects / erp24_rep / yii-erp24 / .git / log