]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
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] убрать комментарии
Alexander Smirnov [Mon, 10 Feb 2025 15:43:53 +0000 (18:43 +0300)]
[ERP-283] редактируемые категории планов
Alexander Smirnov [Mon, 10 Feb 2025 11:13:31 +0000 (14:13 +0300)]
[ERP-283] запрет на редактирование
Aleksey Filippov [Mon, 10 Feb 2025 09:06:19 +0000 (09:06 +0000)]
Merge branch 'feature_fomichev_erp-306_feedback_city_store_list' into 'develop'
[ERP-306] Обработка обратной связи по справочнику городов
See merge request gitlab-instance/yii-erp24!667
Aleksey Filippov [Mon, 10 Feb 2025 09:04:59 +0000 (09:04 +0000)]
Merge branch 'feature_fomichev_erp-20250210_bonus_target_tg_notification' into 'develop'
Отправка сообщения в бот при начислении бонусов
See merge request gitlab-instance/yii-erp24!671
fomichev [Mon, 10 Feb 2025 09:00:03 +0000 (12:00 +0300)]
Отправка сообщения в бот при начислении бонусов
Aleksey Filippov [Mon, 10 Feb 2025 06:30:55 +0000 (06:30 +0000)]
Merge branch 'bug_smirnov_2025_02_07_immidiate_300_bonus_for_5_memorable_dates' into 'develop'
исправил баг
See merge request gitlab-instance/yii-erp24!670
Alexander Smirnov [Mon, 10 Feb 2025 06:23:20 +0000 (09:23 +0300)]
исправил баг
Aleksey Filippov [Fri, 7 Feb 2025 13:26:21 +0000 (13:26 +0000)]
Merge branch 'bug_smirnov_2025_02_07_immidiate_300_bonus_for_5_memorable_dates' into 'develop'
300 за внесение дат, без задержек
See merge request gitlab-instance/yii-erp24!669
Alexander Smirnov [Fri, 7 Feb 2025 13:17:42 +0000 (16:17 +0300)]
поправка ошибок
Alexander Smirnov [Fri, 7 Feb 2025 13:00:09 +0000 (16:00 +0300)]
300 за внесение дат, без задержек
Aleksey Filippov [Fri, 7 Feb 2025 12:26:52 +0000 (12:26 +0000)]
Merge branch 'bug_smirnov_2025_02_07_arrayHelper_id_name' into 'develop'
массив объектов переведен в мэп id->name
See merge request gitlab-instance/yii-erp24!668
Alexander Smirnov [Fri, 7 Feb 2025 12:21:23 +0000 (15:21 +0300)]
массив объектов переведен в мэп id->name
fomichev [Fri, 7 Feb 2025 11:47:47 +0000 (14:47 +0300)]
Исправление загрузки с parent_id
fomichev [Fri, 7 Feb 2025 10:39:55 +0000 (13:39 +0300)]
Исправление загрузки дубликатов
fomichev [Fri, 7 Feb 2025 10:22:16 +0000 (13:22 +0300)]
Ссылка на документацию
fomichev [Fri, 7 Feb 2025 10:19:49 +0000 (13:19 +0300)]
Файл шаблона
fomichev [Fri, 7 Feb 2025 10:12:19 +0000 (13:12 +0300)]
Правки
Alexander Smirnov [Fri, 7 Feb 2025 10:02:46 +0000 (13:02 +0300)]
[ERP-283] поправки к отзыву
Alexander Smirnov [Thu, 6 Feb 2025 17:38:16 +0000 (20:38 +0300)]
[ERP-283] заголовок
fomichev [Thu, 6 Feb 2025 14:05:00 +0000 (17:05 +0300)]
Убираю DataController
fomichev [Thu, 6 Feb 2025 13:59:09 +0000 (16:59 +0300)]
Убираю DataController
fomichev [Thu, 6 Feb 2025 13:55:53 +0000 (16:55 +0300)]
При отсутствии файла задавать putenv("APP_ENV=development")
fomichev [Thu, 6 Feb 2025 13:06:52 +0000 (16:06 +0300)]
Переменные для теста
fomichev [Thu, 6 Feb 2025 13:05:17 +0000 (16:05 +0300)]
Переменные для теста
fomichev [Thu, 6 Feb 2025 13:04:03 +0000 (16:04 +0300)]
Переменные для теста
Aleksey Filippov [Thu, 6 Feb 2025 12:45:47 +0000 (12:45 +0000)]
Merge branch 'fix_fomichev_20250206_dev_env_fix' into 'develop'
Удален filnally
See merge request gitlab-instance/yii-erp24!664
fomichev [Thu, 6 Feb 2025 12:44:26 +0000 (15:44 +0300)]
Удален filnally
Aleksey Filippov [Thu, 6 Feb 2025 09:46:15 +0000 (09:46 +0000)]
Merge branch 'fix_fomichev_20250206_dev_env_fix' into 'develop'
Добавлена проверка на переменую окружения
See merge request gitlab-instance/yii-erp24!663
fomichev [Thu, 6 Feb 2025 09:42:40 +0000 (12:42 +0300)]
Добавлена проверка на переменую окружения
Aleksey Filippov [Thu, 6 Feb 2025 09:33:22 +0000 (09:33 +0000)]
Merge branch 'feature_smirnov_2025_02_06_switch_off_env_loading_check' into 'develop'
Отключили проверку загрузки .env
See merge request gitlab-instance/yii-erp24!662
Aleksey Filippov [Thu, 6 Feb 2025 09:32:44 +0000 (09:32 +0000)]
Merge branch 'feature-fomichev_erp-303_bonus_levels' into 'develop'
[ERP-303] Уровни БС
See merge request gitlab-instance/yii-erp24!661
Alexander Smirnov [Thu, 6 Feb 2025 09:26:29 +0000 (12:26 +0300)]
Отключили проверку загрузки .env
fomichev [Thu, 6 Feb 2025 09:05:42 +0000 (12:05 +0300)]
Исправлены миграцию users_bonus_levels
fomichev [Thu, 6 Feb 2025 08:13:11 +0000 (11:13 +0300)]
Исправлены списания
fomichev [Thu, 6 Feb 2025 07:45:56 +0000 (10:45 +0300)]
Исправлен баланс
fomichev [Thu, 6 Feb 2025 06:48:33 +0000 (09:48 +0300)]
Добавлен баланс и вывод
fomichev [Wed, 5 Feb 2025 18:46:43 +0000 (21:46 +0300)]
Переписал обновление бонусного уровня
Aleksey Filippov [Wed, 5 Feb 2025 14:48:06 +0000 (14:48 +0000)]
Merge branch 'feature-fomichev_erp-303_bonus_levels' into 'develop'
[ERP-303] Уровни БС - Вывод уровня и баланса сгораемого в getInfo ClientController
See merge request gitlab-instance/yii-erp24!660
fomichev [Wed, 5 Feb 2025 14:46:54 +0000 (17:46 +0300)]
Вывод уровня и баланса сгораемого в getInfo ClientController
Aleksey Filippov [Wed, 5 Feb 2025 14:38:36 +0000 (14:38 +0000)]
Merge branch 'feature-fomichev_erp-303_bonus_levels' into 'develop'
[ERP-303] Уровни БС
See merge request gitlab-instance/yii-erp24!659
fomichev [Wed, 5 Feb 2025 14:35:59 +0000 (17:35 +0300)]
Вывод баланса сгораемого в getBonuses
fomichev [Wed, 5 Feb 2025 14:34:04 +0000 (17:34 +0300)]
Вывод бонус уровня и баланса сгораемого в getClientInfo
Aleksey Filippov [Wed, 5 Feb 2025 14:20:54 +0000 (14:20 +0000)]
Merge branch 'feature-fomichev_erp-303_bonus_levels' into 'develop'
[ERP-303] Уровни БС
See merge request gitlab-instance/yii-erp24!658
fomichev [Wed, 5 Feb 2025 14:19:21 +0000 (17:19 +0300)]
Вывод бонус уровня в getBonuses
Aleksey Filippov [Wed, 5 Feb 2025 13:53:02 +0000 (13:53 +0000)]
Merge branch 'feature-fomichev_erp-303_bonus_levels' into 'develop'
[ERP-303] Уровни БС
See merge request gitlab-instance/yii-erp24!657
fomichev [Wed, 5 Feb 2025 13:48:00 +0000 (16:48 +0300)]
Правки по кешбеку
Aleksey Filippov [Wed, 5 Feb 2025 13:15:33 +0000 (13:15 +0000)]
Merge branch 'feature-fomichev_erp-303_bonus_levels' into 'develop'
[ERP-303] Уровни БС
See merge request gitlab-instance/yii-erp24!656
fomichev [Wed, 5 Feb 2025 13:12:01 +0000 (16:12 +0300)]
Убрал кешбек за первую покупку
fomichev [Wed, 5 Feb 2025 12:54:40 +0000 (15:54 +0300)]
Убрал пароль
Aleksey Filippov [Wed, 5 Feb 2025 12:35:34 +0000 (12:35 +0000)]
Merge branch 'feature-fomichev_erp-303_bonus_levels' into 'develop'
[ERP-303] Уровни БС
See merge request gitlab-instance/yii-erp24!655
fomichev [Wed, 5 Feb 2025 10:33:00 +0000 (13:33 +0300)]
Исправления и настройка
fomichev [Wed, 5 Feb 2025 09:27:15 +0000 (12:27 +0300)]
Исправления и настройка
fomichev [Wed, 5 Feb 2025 07:02:11 +0000 (10:02 +0300)]
Методы крона
fomichev [Tue, 4 Feb 2025 15:21:34 +0000 (18:21 +0300)]
Добавление поля check_id_last_sale в Users
fomichev [Tue, 4 Feb 2025 15:15:04 +0000 (18:15 +0300)]
Добавление поля check_id_last_sale в Users
fomichev [Tue, 4 Feb 2025 15:02:01 +0000 (18:02 +0300)]
Добавление поля check_id_last_sale в Users
Aleksey Filippov [Tue, 4 Feb 2025 13:54:18 +0000 (13:54 +0000)]
Merge branch 'feature_smirnov_erp-297_burn_account' into 'develop'
remove debug
See merge request gitlab-instance/yii-erp24!653
Alexander Smirnov [Tue, 4 Feb 2025 13:53:16 +0000 (16:53 +0300)]
remove debug
Aleksey Filippov [Tue, 4 Feb 2025 13:37:02 +0000 (13:37 +0000)]
Merge branch 'feature_smirnov_erp-297_burn_account' into 'develop'
debug comment test phones
See merge request gitlab-instance/yii-erp24!652
Alexander Smirnov [Tue, 4 Feb 2025 13:36:26 +0000 (16:36 +0300)]
debug comment test phones
Aleksey Filippov [Tue, 4 Feb 2025 13:23:31 +0000 (13:23 +0000)]
Merge branch 'feature_smirnov_erp-297_burn_account' into 'develop'
[ERP-297] burn balans
See merge request gitlab-instance/yii-erp24!651
Alexander Smirnov [Tue, 4 Feb 2025 13:20:33 +0000 (16:20 +0300)]
[ERP-297] поправка
Alexander Smirnov [Tue, 4 Feb 2025 11:29:14 +0000 (14:29 +0300)]
[ERP-297] burn balans 2
Alexander Smirnov [Tue, 4 Feb 2025 10:42:05 +0000 (13:42 +0300)]
[ERP-297] burn balans
Aleksey Filippov [Tue, 4 Feb 2025 07:56:18 +0000 (07:56 +0000)]
Merge branch 'add_delete_filter_on_sales_today' into 'develop'
ERP-302 Редактирование букета
See merge request gitlab-instance/yii-erp24!650
marina [Tue, 4 Feb 2025 07:53:49 +0000 (10:53 +0300)]
ERP-302 Редактирование букета
fomichev [Tue, 4 Feb 2025 07:03:06 +0000 (10:03 +0300)]
Добавление поля bonus_level в Users
Aleksey Filippov [Tue, 4 Feb 2025 07:01:52 +0000 (07:01 +0000)]
Merge branch 'add_delete_filter_on_sales_today' into 'develop'
фильтрация по удаленным сменам продажи сегодня
See merge request gitlab-instance/yii-erp24!649
fomichev [Tue, 4 Feb 2025 06:49:14 +0000 (09:49 +0300)]
Корректировки по таблице
fomichev [Tue, 4 Feb 2025 06:36:15 +0000 (09:36 +0300)]
Корректировки по таблице
fomichev [Mon, 3 Feb 2025 14:02:16 +0000 (17:02 +0300)]
Таблица уровней
marina [Mon, 3 Feb 2025 13:48:19 +0000 (16:48 +0300)]
фильтрация по удаленным сменам продажи сегодня
Aleksey Filippov [Mon, 3 Feb 2025 12:34:35 +0000 (12:34 +0000)]
Merge branch 'feature_fomichev_erp-300_create_nomenclature_1c_table' into 'develop'
[ERP-300] Создание таблицы для хранения данных о товарах с категориями
See merge request gitlab-instance/yii-erp24!643
fomichev [Mon, 3 Feb 2025 06:58:16 +0000 (09:58 +0300)]
Таблица просмотра
Aleksey Filippov [Fri, 31 Jan 2025 15:23:08 +0000 (15:23 +0000)]
Merge branch 'feature_smirnov_erp-301_filters_day_night_group' into 'develop'
[ERP-301] баги
See merge request gitlab-instance/yii-erp24!648
Alexander Smirnov [Fri, 31 Jan 2025 15:21:32 +0000 (18:21 +0300)]
[ERP-301] баги
Aleksey Filippov [Fri, 31 Jan 2025 14:40:22 +0000 (14:40 +0000)]
Merge branch 'feature_smirnov_erp-301_filters_day_night_group' into 'develop'
[ERP-301] должность не выбрана
See merge request gitlab-instance/yii-erp24!647
Alexander Smirnov [Fri, 31 Jan 2025 14:39:28 +0000 (17:39 +0300)]
[ERP-301] должность не выбрана
Aleksey Filippov [Fri, 31 Jan 2025 14:32:34 +0000 (14:32 +0000)]
Merge branch 'feature_smirnov_erp-301_filters_day_night_group' into 'develop'
[ERP-301] итого
See merge request gitlab-instance/yii-erp24!646
Alexander Smirnov [Fri, 31 Jan 2025 14:31:17 +0000 (17:31 +0300)]
[ERP-301] итого
Aleksey Filippov [Fri, 31 Jan 2025 14:15:04 +0000 (14:15 +0000)]
Merge branch 'feature_smirnov_erp-301_filters_day_night_group' into 'develop'
[ERP-301] новый отчёт по зп
See merge request gitlab-instance/yii-erp24!645
Alexander Smirnov [Fri, 31 Jan 2025 14:10:08 +0000 (17:10 +0300)]
[ERP-301] комментарий до будущего рефактора
Alexander Smirnov [Fri, 31 Jan 2025 14:00:43 +0000 (17:00 +0300)]
[ERP-301] спрятал фильтры
Alexander Smirnov [Fri, 31 Jan 2025 13:38:23 +0000 (16:38 +0300)]
[ERP-301] новый отчёт по зп
projects / erp24_rep / yii-erp24 / .git / log