]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
Alexander Smirnov [Fri, 4 Apr 2025 11:50:04 +0000 (14:50 +0300)]
[ERP-396] timebehvaior
Alexander Smirnov [Fri, 4 Apr 2025 11:36:59 +0000 (14:36 +0300)]
[ERP-396] product replacement import from excel
Marina Zozirova [Thu, 3 Apr 2025 08:13:46 +0000 (08:13 +0000)]
Merge branch 'feature_smirnov_erp-381_edit_price_and_show_nacenka' into 'develop'
[ERP-381] fix price
See merge request gitlab-instance/yii-erp24!768
Alexander Smirnov [Thu, 3 Apr 2025 07:51:06 +0000 (10:51 +0300)]
Merge branch 'develop' into feature_smirnov_erp-381_edit_price_and_show_nacenka
# Conflicts:
# erp24/views/bouquet/index.php
Marina Zozirova [Thu, 3 Apr 2025 07:28:26 +0000 (07:28 +0000)]
Merge branch 'feature_smirnov_erp-378_control_access_for_statuses' into 'develop'
[ERP-378] notOnlyApprovedAndCreatedIn1C001
See merge request gitlab-instance/yii-erp24!772
Marina Zozirova [Thu, 3 Apr 2025 07:26:55 +0000 (07:26 +0000)]
Merge branch 'feature_fomichev_erp-385_show_stores_with_forecast' into 'develop'
Скрытие магазинов без значений прогноза
See merge request gitlab-instance/yii-erp24!773
Marina Zozirova [Thu, 3 Apr 2025 07:25:48 +0000 (07:25 +0000)]
Merge branch 'feature_fomichev_erp-380_add_lightbox_to_image_bouquetr' into 'develop'
[ERP-380] Добавить вызов отдельного окна просмотра медиа ОС МБ
See merge request gitlab-instance/yii-erp24!765
fomichev [Wed, 2 Apr 2025 14:44:41 +0000 (17:44 +0300)]
Скрытие магазинов без значений прогноза
Alexander Smirnov [Wed, 2 Apr 2025 14:28:32 +0000 (17:28 +0300)]
[ERP-378] add status error
Alexander Smirnov [Wed, 2 Apr 2025 13:10:17 +0000 (16:10 +0300)]
[ERP-378] notOnlyApprovedAndCreatedIn1C001 2
Alexander Smirnov [Wed, 2 Apr 2025 13:00:17 +0000 (16:00 +0300)]
[ERP-378] notOnlyApprovedAndCreatedIn1C001
Marina Zozirova [Tue, 1 Apr 2025 11:06:26 +0000 (11:06 +0000)]
Merge branch 'feature_smirnov_erp-394_check_after_btn_press_amo' into 'develop'
[ERP-394] fixes
See merge request gitlab-instance/yii-erp24!770
Alexander Smirnov [Tue, 1 Apr 2025 10:57:02 +0000 (13:57 +0300)]
[ERP-394] fixes 2
Alexander Smirnov [Tue, 1 Apr 2025 10:55:39 +0000 (13:55 +0300)]
[ERP-394] fixes
Alexander Smirnov [Tue, 1 Apr 2025 10:47:59 +0000 (13:47 +0300)]
[ERP-394] debug 10
Marina Zozirova [Tue, 1 Apr 2025 10:20:43 +0000 (10:20 +0000)]
Merge branch 'feature_smirnov_erp-394_check_after_btn_press_amo' into 'develop'
[ERP-393] fix orders delivery print check
See merge request gitlab-instance/yii-erp24!769
Alexander Smirnov [Tue, 1 Apr 2025 10:08:18 +0000 (13:08 +0300)]
[ERP-394] debug 5
Alexander Smirnov [Tue, 1 Apr 2025 10:06:36 +0000 (13:06 +0300)]
[ERP-394] debug 4
Alexander Smirnov [Tue, 1 Apr 2025 10:02:39 +0000 (13:02 +0300)]
[ERP-394] debug 3
Alexander Smirnov [Tue, 1 Apr 2025 09:58:53 +0000 (12:58 +0300)]
[ERP-394] debug 2
Alexander Smirnov [Tue, 1 Apr 2025 09:55:46 +0000 (12:55 +0300)]
[ERP-394] debug
Alexander Smirnov [Tue, 1 Apr 2025 09:41:39 +0000 (12:41 +0300)]
[ERP-394] compare with previous delivery version
Alexander Smirnov [Tue, 1 Apr 2025 07:57:48 +0000 (10:57 +0300)]
[ERP-381] force without obj creation
Alexander Smirnov [Tue, 1 Apr 2025 07:35:34 +0000 (10:35 +0300)]
[ERP-381] enforce default value
Alexander Smirnov [Tue, 1 Apr 2025 07:32:14 +0000 (10:32 +0300)]
[ERP-381] catch errors
Alexander Smirnov [Tue, 1 Apr 2025 07:25:34 +0000 (10:25 +0300)]
[ERP-381] created_by from required to behavior take place
Alexander Smirnov [Tue, 1 Apr 2025 07:16:44 +0000 (10:16 +0300)]
[ERP-381] created_by and etc.
Alexander Smirnov [Mon, 31 Mar 2025 19:06:30 +0000 (22:06 +0300)]
[ERP-381] fix formula
Alexander Smirnov [Mon, 31 Mar 2025 18:59:52 +0000 (21:59 +0300)]
[ERP-381] fix price
Marina Zozirova [Mon, 31 Mar 2025 12:55:04 +0000 (12:55 +0000)]
Merge branch 'feature_fomichev_20250331_hide_warning_email_flowow' into 'develop'
Закомментировал логирование
See merge request gitlab-instance/yii-erp24!766
Marina Zozirova [Mon, 31 Mar 2025 12:40:22 +0000 (12:40 +0000)]
Merge branch 'feature_smirnov_erp-393_amo_to_yii' into 'develop'
[ERP-393] fix typo
See merge request gitlab-instance/yii-erp24!767
Alexander Smirnov [Mon, 31 Mar 2025 12:33:14 +0000 (15:33 +0300)]
[ERP-393] fix typo
fomichev [Mon, 31 Mar 2025 11:37:01 +0000 (14:37 +0300)]
Убрал дублирование истории
fomichev [Mon, 31 Mar 2025 08:54:39 +0000 (11:54 +0300)]
Закомментировал логирование
fomichev [Mon, 31 Mar 2025 08:39:32 +0000 (11:39 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-380_add_lightbox_to_image_bouquetr
# Conflicts:
# erp24/views/bouquet/index.php
fomichev [Mon, 31 Mar 2025 08:33:55 +0000 (11:33 +0300)]
Лайтбоксы для изображений
fomichev [Mon, 31 Mar 2025 08:32:45 +0000 (11:32 +0300)]
Лайтбоксы для изображений
Aleksey Filippov [Mon, 31 Mar 2025 07:41:19 +0000 (07:41 +0000)]
Merge branch 'feature_zozirova_erp-358_iterface_automp' into 'develop'
ERP-358 Сверстать интерфейс автопм
See merge request gitlab-instance/yii-erp24!764
Aleksey Filippov [Mon, 31 Mar 2025 07:21:20 +0000 (07:21 +0000)]
Merge branch 'feature_smirnov_erp-393_amo_to_yii' into 'develop'
[ERP-393] amo to yii
See merge request gitlab-instance/yii-erp24!750
Aleksey Filippov [Mon, 31 Mar 2025 06:58:22 +0000 (06:58 +0000)]
Merge branch 'feature_fomichev_erp-374_get_access_to_edit_wiki' into 'develop'
[ERP-374] Предоставить возможность редактировать ОС МБ
See merge request gitlab-instance/yii-erp24!761
Aleksey Filippov [Mon, 31 Mar 2025 06:54:26 +0000 (06:54 +0000)]
Merge branch 'feature_smirnov_erp-381_edit_price_and_show_nacenka' into 'develop'
[ERP-381] inputed cost
See merge request gitlab-instance/yii-erp24!748
Aleksey Filippov [Mon, 31 Mar 2025 06:51:10 +0000 (06:51 +0000)]
Merge branch 'feature_fomichev_erp-385_show_stores_with_forecast' into 'develop'
[ERP-385] Отображать магазины у которых существует прогноз на выбранный период ОС МБ
See merge request gitlab-instance/yii-erp24!763
Aleksey Filippov [Mon, 31 Mar 2025 06:37:28 +0000 (06:37 +0000)]
Merge branch 'feature_zozirova_erp-329_all_orders' into 'develop'
ERP-329 Новый интерфейс для работы с заказами мп и амо
See merge request gitlab-instance/yii-erp24!762
marina [Mon, 31 Mar 2025 06:32:58 +0000 (09:32 +0300)]
ERP-358 Сверстать интерфейс автопм
fomichev [Mon, 31 Mar 2025 06:22:39 +0000 (09:22 +0300)]
Скрываем если нет плановых показателей
Alexander Smirnov [Sun, 30 Mar 2025 13:28:58 +0000 (16:28 +0300)]
[ERP-393] start testing 4
Alexander Smirnov [Sun, 30 Mar 2025 13:27:26 +0000 (16:27 +0300)]
[ERP-393] start testing 3
Alexander Smirnov [Sun, 30 Mar 2025 13:23:09 +0000 (16:23 +0300)]
[ERP-393] start testing 2
Alexander Smirnov [Sun, 30 Mar 2025 12:33:34 +0000 (15:33 +0300)]
[ERP-393] start testing
fomichev [Fri, 28 Mar 2025 14:11:45 +0000 (17:11 +0300)]
Добавляем доступ для группы 71 - ком директор
Aleksey Filippov [Fri, 28 Mar 2025 13:44:10 +0000 (13:44 +0000)]
Merge branch 'feature_zozirova_erp-299_change_sales_sum' into 'develop'
ERP-299 Изменить подсчёт продаж в личном кабинете сотрудника
See merge request gitlab-instance/yii-erp24!642
Alexander Smirnov [Fri, 28 Mar 2025 13:39:42 +0000 (16:39 +0300)]
[ERP-381] dicts
Aleksey Filippov [Fri, 28 Mar 2025 12:53:14 +0000 (12:53 +0000)]
Merge branch 'feature_fomichev_erp-383_fix-_for_dropdown_list' into 'develop'
[ERP-383] Добавляем label
See merge request gitlab-instance/yii-erp24!760
marina [Fri, 28 Mar 2025 12:50:47 +0000 (15:50 +0300)]
ERP-329 Новый интерфейс для работы с заказами мп и амо
Alexander Smirnov [Fri, 28 Mar 2025 12:48:47 +0000 (15:48 +0300)]
[ERP-381] layout
Aleksey Filippov [Fri, 28 Mar 2025 12:47:12 +0000 (12:47 +0000)]
Merge branch 'feature_zozirova_erp-329_all_orders' into 'develop'
ERP-329 Новый интерфейс для работы с заказами мп и амо
See merge request gitlab-instance/yii-erp24!714
fomichev [Fri, 28 Mar 2025 12:39:12 +0000 (15:39 +0300)]
Добавляем label
Aleksey Filippov [Fri, 28 Mar 2025 12:36:23 +0000 (12:36 +0000)]
Merge branch 'feature_zozirova_erp-358_iterface_automp' into 'develop'
ERP-358 Сверстать интерфейс автопм
See merge request gitlab-instance/yii-erp24!734
Alexander Smirnov [Fri, 28 Mar 2025 12:23:07 +0000 (15:23 +0300)]
[ERP-381] правки
marina [Fri, 28 Mar 2025 11:57:13 +0000 (14:57 +0300)]
ERP-299 Изменить подсчёт продаж в личном кабинете сотрудника
Aleksey Filippov [Fri, 28 Mar 2025 11:45:37 +0000 (11:45 +0000)]
Merge branch 'feature_fomichev_erp-383_fix-_for_dropdown_list' into 'develop'
[ERP-383] "Первое значение выпадающего списка ""Тип матрицы"" заменить на ""Отобразить все"" ОС МБ
See merge request gitlab-instance/yii-erp24!759
fomichev [Fri, 28 Mar 2025 11:27:10 +0000 (14:27 +0300)]
Меняем на Отобразить все
Alexander Smirnov [Fri, 28 Mar 2025 09:44:55 +0000 (12:44 +0300)]
Merge branch 'develop' into feature_smirnov_erp-381_edit_price_and_show_nacenka
# Conflicts:
# erp24/controllers/BouquetController.php
Aleksey Filippov [Fri, 28 Mar 2025 09:42:11 +0000 (09:42 +0000)]
Merge branch 'feature_fomichev_erp-387_main_image_matrix_bouquet_correction' into 'develop'
[ERP-387] Нужно фиксировать основное изображение и добавлять его отдельно ОС МБ
See merge request gitlab-instance/yii-erp24!758
fomichev [Fri, 28 Mar 2025 09:35:24 +0000 (12:35 +0300)]
Убрал false из сохранения
fomichev [Fri, 28 Mar 2025 09:31:24 +0000 (12:31 +0300)]
Убрал false из сохранения
marina [Fri, 28 Mar 2025 09:27:36 +0000 (12:27 +0300)]
ERP-358 Сверстать интерфейс автопм
fomichev [Fri, 28 Mar 2025 08:57:49 +0000 (11:57 +0300)]
Merge branch 'refs/heads/develop' into feature_fomichev_erp-387_main_image_matrix_bouquet_correction
# Conflicts:
# erp24/web/js/bouquet/bouquet.js
Aleksey Filippov [Fri, 28 Mar 2025 08:35:03 +0000 (08:35 +0000)]
Merge branch 'feature_filippov_20250328_add_folder' into 'develop'
отладка пути
See merge request gitlab-instance/yii-erp24!757
Aleksey Filippov [Fri, 28 Mar 2025 08:34:38 +0000 (11:34 +0300)]
отладка пути
Aleksey Filippov [Fri, 28 Mar 2025 08:30:33 +0000 (08:30 +0000)]
Merge branch 'feature_filippov_20250328_add_folder' into 'develop'
отладка пути
See merge request gitlab-instance/yii-erp24!756
Aleksey Filippov [Fri, 28 Mar 2025 08:30:05 +0000 (11:30 +0300)]
отладка пути
Aleksey Filippov [Fri, 28 Mar 2025 08:28:27 +0000 (08:28 +0000)]
Merge branch 'feature_filippov_20250328_add_folder' into 'develop'
отладка пути
See merge request gitlab-instance/yii-erp24!755
Aleksey Filippov [Fri, 28 Mar 2025 08:27:49 +0000 (11:27 +0300)]
отладка пути
Aleksey Filippov [Fri, 28 Mar 2025 08:22:46 +0000 (08:22 +0000)]
Merge branch 'feature_filippov_20250328_add_folder' into 'develop'
отладка пути
See merge request gitlab-instance/yii-erp24!754
Aleksey Filippov [Fri, 28 Mar 2025 08:22:13 +0000 (11:22 +0300)]
отладка пути
Aleksey Filippov [Fri, 28 Mar 2025 08:14:00 +0000 (08:14 +0000)]
Merge branch 'feature_filippov_20250328_add_folder' into 'develop'
Добавление папки
See merge request gitlab-instance/yii-erp24!753
Aleksey Filippov [Fri, 28 Mar 2025 08:13:27 +0000 (11:13 +0300)]
Добавление папки
Aleksey Filippov [Fri, 28 Mar 2025 08:02:04 +0000 (08:02 +0000)]
Merge branch 'feature_smirnov_erp-331_request_orders' into 'develop'
[ERP-331] request orders
See merge request gitlab-instance/yii-erp24!692
fomichev [Fri, 28 Mar 2025 07:34:07 +0000 (10:34 +0300)]
Изменение порядка
marina [Fri, 28 Mar 2025 07:03:07 +0000 (10:03 +0300)]
Merge branch 'develop' into feature_zozirova_erp-329_all_orders
# Conflicts:
# erp24/controllers/MarketplaceOrdersController.php
Alexander Smirnov [Fri, 28 Mar 2025 06:52:21 +0000 (09:52 +0300)]
новая порция
marina [Fri, 28 Mar 2025 06:39:35 +0000 (09:39 +0300)]
ERP-358 Сверстать интерфейс автопм
Aleksey Filippov [Thu, 27 Mar 2025 21:07:55 +0000 (21:07 +0000)]
Merge branch 'feature_smirnov_erp-356_call_site_api' into 'develop'
[ERP-356] logs
See merge request gitlab-instance/yii-erp24!733
Aleksey Filippov [Thu, 27 Mar 2025 21:06:12 +0000 (21:06 +0000)]
Merge branch 'feature_zozirova_erp-389_change_percent' into 'develop'
ERP-389 ERP-391 Реализовать зависимость от наличия прогноза ОС МБ
See merge request gitlab-instance/yii-erp24!744
Aleksey Filippov [Thu, 27 Mar 2025 20:43:36 +0000 (20:43 +0000)]
Merge branch 'feature_zozirova_erp-355_lptracking_api' into 'develop'
ERP-355 Автоматизация звонков роботом из когорт
See merge request gitlab-instance/yii-erp24!716
Marina Zozirova [Thu, 27 Mar 2025 20:43:35 +0000 (20:43 +0000)]
ERP-355 Автоматизация звонков роботом из когорт
Aleksey Filippov [Thu, 27 Mar 2025 20:41:26 +0000 (20:41 +0000)]
Merge branch 'feature_zozirova_erp-377_add_constraint_on_doubles' into 'develop'
ERP-377 Убрать возможность создания одинаковых имен. Т.е. можно создать...
See merge request gitlab-instance/yii-erp24!737
Marina Zozirova [Thu, 27 Mar 2025 20:41:26 +0000 (20:41 +0000)]
ERP-377 Убрать возможность создания одинаковых имен. Т.е. можно создать...
Aleksey Filippov [Thu, 27 Mar 2025 20:35:54 +0000 (20:35 +0000)]
Merge branch 'feature_fomichev_erp-384_add_doc_to_bouquet_edit_view' into 'develop'
[ERP-384] Создать раздел"Документации" и добавить ссылку ОС МБ
See merge request gitlab-instance/yii-erp24!747
Aleksey Filippov [Thu, 27 Mar 2025 20:18:56 +0000 (20:18 +0000)]
Merge branch 'feature_fomichev_erp-386_add_text_to_video_dropzone_bouquet' into 'develop'
[ERP-386] Изменить "… (Или щелкните, что бы выбрать файл)" на требования к файлу
See merge request gitlab-instance/yii-erp24!746
Aleksey Filippov [Thu, 27 Mar 2025 16:04:28 +0000 (16:04 +0000)]
Merge branch 'feature_fomichev_erp-324_marketplace_orders' into 'develop'
Feature fomichev erp 324 marketplace orders
See merge request gitlab-instance/yii-erp24!752
fomichev [Thu, 27 Mar 2025 14:55:54 +0000 (17:55 +0300)]
Создание директории
Aleksey Filippov [Thu, 27 Mar 2025 14:43:59 +0000 (14:43 +0000)]
Merge branch 'feature_smirnov_erp-375_spisok_statusov' into 'develop'
[ERP-375] move filter apply buttons
See merge request gitlab-instance/yii-erp24!751
Alexander Smirnov [Thu, 27 Mar 2025 14:43:46 +0000 (17:43 +0300)]
Merge branch 'develop' into feature_smirnov_erp-331_request_orders
# Conflicts:
# erp24/records/MarketplaceOrders.php
Alexander Smirnov [Thu, 27 Mar 2025 14:37:47 +0000 (17:37 +0300)]
[ERP-375] fix layout
Alexander Smirnov [Thu, 27 Mar 2025 14:31:37 +0000 (17:31 +0300)]
[ERP-375] move filter apply buttons
Alexander Smirnov [Thu, 27 Mar 2025 14:10:58 +0000 (17:10 +0300)]
[ERP-381] force default price
Alexander Smirnov [Thu, 27 Mar 2025 14:05:06 +0000 (17:05 +0300)]
[ERP-393] draft amo to yii
Aleksey Filippov [Thu, 27 Mar 2025 14:04:54 +0000 (14:04 +0000)]
Merge branch 'feature_smirnov_erp-326_order_to_telegram' into 'develop'
[ERP-326] test telegram send message
See merge request gitlab-instance/yii-erp24!689
projects / erp24_rep / yii-erp24 / .git / log