]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
fomichev [Fri, 7 Feb 2025 10:19:49 +0000 (13:19 +0300)]
Файл шаблона
fomichev [Fri, 7 Feb 2025 10:12:19 +0000 (13:12 +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] новый отчёт по зп
Alexander Smirnov [Fri, 31 Jan 2025 08:43:58 +0000 (11:43 +0300)]
[ERP-301] new payroll list
Aleksey Filippov [Fri, 31 Jan 2025 08:06:21 +0000 (08:06 +0000)]
Merge branch 'add_pagination_between_rows' into 'develop'
пространство между терупром и кшф
See merge request gitlab-instance/yii-erp24!644
marina [Fri, 31 Jan 2025 08:05:44 +0000 (11:05 +0300)]
пространство между терупром и кшф
marina [Fri, 31 Jan 2025 07:51:21 +0000 (10:51 +0300)]
пространство между терупром и кшф
marina [Fri, 31 Jan 2025 07:47:22 +0000 (10:47 +0300)]
пространство между терупром и кшф
fomichev [Thu, 30 Jan 2025 12:59:14 +0000 (15:59 +0300)]
Загрузка и сохранение в таблицу
fomichev [Wed, 29 Jan 2025 15:02:46 +0000 (18:02 +0300)]
Создана миграция для таблицы
Aleksey Filippov [Wed, 29 Jan 2025 10:55:08 +0000 (10:55 +0000)]
Merge branch 'fix_fomichev_290125_turnoff_bonuses_to_test_phones' into 'develop'
Не начисляем бонусы тестовым телефонам
See merge request gitlab-instance/yii-erp24!641
fomichev [Wed, 29 Jan 2025 10:53:08 +0000 (13:53 +0300)]
Не начисляем бонусы тестовым телефонам
Aleksey Filippov [Wed, 29 Jan 2025 08:42:19 +0000 (08:42 +0000)]
Merge branch 'feature_smirnov_erp-283_category_plan' into 'develop'
[ERP-283] план категорий
See merge request gitlab-instance/yii-erp24!620
Aleksey Filippov [Wed, 29 Jan 2025 07:48:33 +0000 (07:48 +0000)]
Merge branch 'feature_smirnov_2025_01_29_enable_script_11' into 'develop'
бонус удаления скрипт
See merge request gitlab-instance/yii-erp24!639
Alexander Smirnov [Wed, 29 Jan 2025 07:47:10 +0000 (10:47 +0300)]
бонус удаления скрипт
Aleksey Filippov [Wed, 29 Jan 2025 07:29:54 +0000 (07:29 +0000)]
Merge branch 'feature_smirnov_erp-292_switch_of_memorable_200' into 'develop'
[ERP-292] отключаем начисление и списание бонусов за памятные даты
See merge request gitlab-instance/yii-erp24!622
Aleksey Filippov [Wed, 29 Jan 2025 06:04:31 +0000 (06:04 +0000)]
Merge branch 'feature_fomichev_erp-298_add_prefix_to_write_offs_type' into 'develop'
[ERP-298] Добавь префикс к названию типа документа списания
See merge request gitlab-instance/yii-erp24!635
Alexander Smirnov [Tue, 28 Jan 2025 18:43:38 +0000 (21:43 +0300)]
[ERP-283] очередная копипаста фильтра
Alexander Smirnov [Tue, 28 Jan 2025 18:19:15 +0000 (21:19 +0300)]
Merge branch 'develop' into feature_smirnov_erp-283_category_plan
fomichev [Tue, 28 Jan 2025 15:14:17 +0000 (18:14 +0300)]
Заменил на функцию
Aleksey Filippov [Tue, 28 Jan 2025 15:10:07 +0000 (15:10 +0000)]
Merge branch 'feature_zozirova_erp-282_stores_view_config' into 'develop'
Feature zozirova erp 282 stores view config
See merge request gitlab-instance/yii-erp24!638
marina [Tue, 28 Jan 2025 15:06:59 +0000 (18:06 +0300)]
ERP-282 Нужно сделать интерфейс настройки магазина
marina [Tue, 28 Jan 2025 15:03:34 +0000 (18:03 +0300)]
ERP-282 Нужно сделать интерфейс настройки магазина
Aleksey Filippov [Tue, 28 Jan 2025 14:45:46 +0000 (14:45 +0000)]
Merge branch 'feature_zozirova_erp-282_stores_view_config' into 'develop'
ERP-282 Нужно сделать интерфейс настройки магазина
See merge request gitlab-instance/yii-erp24!637
marina [Tue, 28 Jan 2025 14:42:58 +0000 (17:42 +0300)]
ERP-282 Нужно сделать интерфейс настройки магазина
Aleksey Filippov [Tue, 28 Jan 2025 14:30:08 +0000 (14:30 +0000)]
Merge branch 'feature_zozirova_erp-282_stores_view_config' into 'develop'
ERP-282 Нужно сделать интерфейс настройки магазина
See merge request gitlab-instance/yii-erp24!630
Aleksey Filippov [Tue, 28 Jan 2025 14:01:44 +0000 (14:01 +0000)]
Merge branch 'fix_fomichev_erp-295_data_upload_issue' into 'develop'
[ERP-295] Исправить ошибку из логов Ошибка API URL: /data/upload/
See merge request gitlab-instance/yii-erp24!634
Alexander Smirnov [Tue, 28 Jan 2025 13:33:43 +0000 (16:33 +0300)]
добавки к фильтрам
marina [Tue, 28 Jan 2025 13:27:32 +0000 (16:27 +0300)]
ERP-282 Нужно сделать интерфейс настройки магазина
marina [Tue, 28 Jan 2025 13:21:06 +0000 (16:21 +0300)]
ERP-282 Нужно сделать интерфейс настройки магазина
Aleksey Filippov [Tue, 28 Jan 2025 13:08:16 +0000 (13:08 +0000)]
Merge branch 'fix_fomichev_280125_change_cam_user' into 'develop'
ERP-280125 Заменил логин камеры
See merge request gitlab-instance/yii-erp24!636
fomichev [Tue, 28 Jan 2025 13:05:57 +0000 (16:05 +0300)]
Заменил логин камеры
marina [Tue, 28 Jan 2025 13:01:26 +0000 (16:01 +0300)]
ERP-282 Нужно сделать интерфейс настройки магазина
marina [Tue, 28 Jan 2025 12:49:08 +0000 (15:49 +0300)]
ERP-282 Нужно сделать интерфейс настройки магазина
marina [Tue, 28 Jan 2025 12:48:57 +0000 (15:48 +0300)]
ERP-282 Нужно сделать интерфейс настройки магазина
fomichev [Tue, 28 Jan 2025 12:23:13 +0000 (15:23 +0300)]
Добавил константу
fomichev [Tue, 28 Jan 2025 12:21:52 +0000 (15:21 +0300)]
Добавил префикс
fomichev [Tue, 28 Jan 2025 10:34:00 +0000 (13:34 +0300)]
Добавил номер при логировании
marina [Tue, 28 Jan 2025 10:28:25 +0000 (13:28 +0300)]
ERP-282 Нужно сделать интерфейс настройки магазина
marina [Tue, 28 Jan 2025 10:20:34 +0000 (13:20 +0300)]
ERP-282 Нужно сделать интерфейс настройки магазина
Alexander Smirnov [Tue, 28 Jan 2025 09:20:51 +0000 (12:20 +0300)]
Merge branch 'develop' into feature_smirnov_erp-283_category_plan
marina [Tue, 28 Jan 2025 08:03:43 +0000 (11:03 +0300)]
ERP-282 Нужно сделать интерфейс настройки магазина
projects / erp24_rep / yii-erp24 / .git / log