]>
gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/log
Aleksey Filippov [Fri, 27 Feb 2026 17:28:13 +0000 (17:28 +0000)]
Merge branch 'feature_filippov_ERP-244_fix_shift_reminder_csrf' into 'develop'
[ERP-244]: fix CSRF validation error in ShiftReminderController
See merge request gitlab-instance/yii-erp24!1105
Aleksey Filippov [Fri, 27 Feb 2026 15:06:41 +0000 (18:06 +0300)]
fix(ERP-244): fix CSRF validation error in ShiftReminderController
- Disable CSRF validation on ShiftReminderController: endpoint is
protected by session authentication (AccessControl, roles=['@']).
CSRF cookies may be absent in browsers with strict privacy settings,
causing false 400 errors for legitimate authenticated users.
- Stop retrying on 400/401/403 responses in shift-reminder.js to prevent
cascading error floods in logs when auth/validation fails.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Aleksey Filippov [Thu, 26 Feb 2026 20:17:01 +0000 (20:17 +0000)]
Merge branch 'feature_filippov_ERP-242_fix_domru_xml_validation' into 'develop'
fix(ERP-242): validate XML response from Domru API before parsing
See merge request gitlab-instance/yii-erp24!1104
Aleksey Filippov [Thu, 26 Feb 2026 20:04:33 +0000 (20:04 +0000)]
Merge branch 'feature_filippov_ERP-243_fix_timetable_transaction' into 'develop'
fix(ERP-243): catch all exceptions in TimetableService transaction rollback
See merge request gitlab-instance/yii-erp24!1103
Aleksey Filippov [Thu, 26 Feb 2026 19:58:14 +0000 (22:58 +0300)]
fix(ERP-243): catch all exceptions in TimetableService transaction rollback
catch (Exception) only caught yii\db\Exception, missing
InvalidArgumentException from validation/upload errors. This left
orphaned timetable records with tabel=1 but no timetable_fact entry,
blocking shift reopening.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Aleksey Filippov [Thu, 26 Feb 2026 18:19:45 +0000 (21:19 +0300)]
fix(ERP-242): validate XML response from Domru API before parsing
- Skip iteration on empty curl response instead of writing empty file
- Use libxml_use_internal_errors to catch invalid XML gracefully
- Auto-create log/text/ directory if missing
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Aleksey Filippov [Thu, 26 Feb 2026 16:45:28 +0000 (16:45 +0000)]
Merge branch 'feature_filippov_2026-02-26_fix_bubble_png_path' into 'develop'
fix: correct bubble.png path in minified CSS
See merge request gitlab-instance/yii-erp24!1102
Aleksey Filippov [Thu, 26 Feb 2026 16:43:48 +0000 (19:43 +0300)]
fix: correct bubble.png path in minified CSS
Minified CSS in web/min/ referenced ../images/png/bubble.png which
resolved to a non-existent web/images/png/ directory, causing 404.
Fixed to ../azea/assets/images/png/bubble.png where the file actually exists.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Aleksey Filippov [Thu, 26 Feb 2026 15:54:02 +0000 (15:54 +0000)]
Merge branch 'feature_filippov_ERP-241_fix_api3_timetable_exception' into 'develop'
fix(ERP-241): use InvalidArgumentException in TimetableService for proper error display
See merge request gitlab-instance/yii-erp24!1101
Aleksey Filippov [Thu, 26 Feb 2026 15:47:41 +0000 (18:47 +0300)]
fix(ERP-241): use InvalidArgumentException in TimetableService for proper error display
TimetableService threw generic \Exception which EventBehavior couldn't
handle, causing "Произошла неизвестная ошибка" in mobile app instead of
actual validation messages. Changed to InvalidArgumentException (matching
pattern used by all other api3 services) and switched from Json::encode
to firstErrors[0] for human-readable messages.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Aleksey Filippov [Wed, 25 Feb 2026 13:40:22 +0000 (13:40 +0000)]
Merge branch 'feature_filippov_ERP-240_remove_large_files' into 'develop'
chore(ERP-240): remove large log and csv files from repository
See merge request gitlab-instance/yii-erp24!1100
Aleksey Filippov [Wed, 25 Feb 2026 13:18:47 +0000 (16:18 +0300)]
chore(ERP-240): remove large log and csv files from repository
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Aleksey Filippov [Wed, 25 Feb 2026 12:51:42 +0000 (12:51 +0000)]
Merge branch 'feature_filippov_ERP-236_add_video_player' into 'develop'
feat(ERP-236): refine ConvertVideoController — entity filter, min-age window, proc_open fix
See merge request gitlab-instance/yii-erp24!1099
Aleksey Filippov [Wed, 25 Feb 2026 11:23:38 +0000 (14:23 +0300)]
feat(ERP-236): refine ConvertVideoController — entity filter, min-age window, proc_open fix
- Filter by entity=write_offs_products_erp_video (only write-off videos, not all files)
- Add --min-age=2h param: skip files younger than 2h (queue still processing)
- Reduce default --days from 10 to 2 (cron safety net for queue failures)
- Fix PHP hanging: switch from exec/system to proc_open with /dev/null pipes
- Fix timeout: raise from 600s to 1800s for large files
- Update actionStatus: show write-off video stats only (MOV+AVI / MP4)
- Update WriteOffsErp: change border date from -2 month to -1 month
- Add WriteOffsAttachmentsController: sync border_date comment
- Add erp24/docs/diagrams/convert-video-controller.html
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Aleksey Filippov [Tue, 24 Feb 2026 21:51:08 +0000 (21:51 +0000)]
Merge branch 'feature_filippov_ERP-236_add_video_player' into 'develop'
Изменение формирования списка файлов на удаление до одного месяца. Старше...
See merge request gitlab-instance/yii-erp24!1098
Aleksey Filippov [Tue, 24 Feb 2026 21:50:37 +0000 (00:50 +0300)]
Изменение формирования списка файлов на удаление до одного месяца. Старше одного месяца файлы удаляются.
Aleksey Filippov [Tue, 24 Feb 2026 20:27:09 +0000 (20:27 +0000)]
Merge branch 'feature_filippov_ERP-236_add_video_player' into 'develop'
auto-claude: subtask-1-1 - Создать FileServiceVideoTest.php с тестами для convertToMp4()
See merge request gitlab-instance/yii-erp24!1097
Aleksey Filippov [Tue, 24 Feb 2026 19:12:23 +0000 (22:12 +0300)]
Изменение формирования списка файлов на удаление до одного месяца. Старше одного месяца файлы удаляются.
Aleksey Filippov [Tue, 24 Feb 2026 15:36:32 +0000 (18:36 +0300)]
fix(ERP-236): fix basePath — use @app instead of @app/web for uploads
Files are stored in erp24/uploads/, not erp24/web/uploads/.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Aleksey Filippov [Tue, 24 Feb 2026 15:29:08 +0000 (18:29 +0300)]
fix(ERP-236): reduce default conversion interval to 10 days
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Aleksey Filippov [Tue, 24 Feb 2026 14:24:56 +0000 (17:24 +0300)]
fix(ERP-236): filter video conversion to files younger than 30 days
Files older than 1 month are cleaned by write-offs-attachments anyway.
Added --days option (default 30, 0=all).
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Aleksey Filippov [Tue, 24 Feb 2026 14:09:59 +0000 (17:09 +0300)]
feat(ERP-236): add console command for batch MOV→MP4 conversion
php yii convert-video/status — show stats
php yii convert-video/run — convert all
php yii convert-video/run --limit=50 --dry-run — preview
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Aleksey Filippov [Tue, 24 Feb 2026 10:51:18 +0000 (13:51 +0300)]
style: widen video player column to 400px in write-offs view
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Aleksey Filippov [Tue, 24 Feb 2026 08:50:39 +0000 (11:50 +0300)]
fix: review fixes — security, async conversion, CDN→local, tests rewrite
Code review (39 findings) fixes:
CRITICAL:
- CDN Plyr.js → local /js/plyr.min.js, /css/plyr.min.css
- Sync exec('ffmpeg') → async ConvertVideoToMp4Job (RabbitMQ)
- 2>/dev/null → 2>&1 + error logging in FFmpeg commands
- Add ALLOWED_UPLOAD_EXTENSIONS whitelist (block .php, .sh, .exe)
- Rewrite tests: regex→real method calls (AAA pattern)
HIGH:
- IDOR fix in actionDeleteVideo (getAllowedStoreId check)
- Add delete-video to VerbFilter (POST only)
- Case-insensitive switch: switch($extension) via strtolower()
- File size limit (200MB) and disk space check in job
- Inline styles → CSS classes in write-offs-erp.css
- XSS: validate URL scheme (only relative paths)
MEDIUM:
- FFmpeg timeout 300s wrapper
- Plyr fallback: if (typeof Plyr === 'undefined') return
- Emoji → glyphicon in AVI download card
New files:
- erp24/jobs/ConvertVideoToMp4Job.php
- erp24/tests/unit/jobs/ConvertVideoToMp4JobTest.php
- erp24/tests/unit/controllers/WriteOffsErpControllerSecurityTest.php
- erp24/docs/plans/002-write-offs-erp-video-v2.md
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Aleksey Filippov [Tue, 24 Feb 2026 08:04:53 +0000 (08:04 +0000)]
Merge branch 'feature_filippov_20260224_docker_config_edit' into 'develop'
docker config edit
See merge request gitlab-instance/yii-erp24!1096
Aleksey Filippov [Tue, 24 Feb 2026 08:04:26 +0000 (11:04 +0300)]
docker config edit
Aleksey Filippov [Tue, 24 Feb 2026 07:35:57 +0000 (07:35 +0000)]
Merge branch 'feature_filippov_ERP-238_fix_image_save' into 'develop'
[ERP-238] Ошибка сохранения списание при добавлении 13 -го товара с фото
See merge request gitlab-instance/yii-erp24!1095
Aleksey Filippov [Tue, 24 Feb 2026 07:32:42 +0000 (10:32 +0300)]
[ERP-238] Ошибка сохранения списание при добавлении 13 -го товара с фото
Aleksey Filippov [Tue, 24 Feb 2026 07:17:50 +0000 (07:17 +0000)]
Merge branch 'feature_fomichev_erp-234_email_flowwow_processing_update' into 'develop'
[ERP-234] Улучшение обработки писем
See merge request gitlab-instance/yii-erp24!1090
Aleksey Filippov [Fri, 20 Feb 2026 14:29:15 +0000 (14:29 +0000)]
Merge branch 'feature_filippov_BR-132_promocode_format' into 'develop'
fix(BR-132): make second group digits-only in alphanumeric format
See merge request gitlab-instance/yii-erp24!1094
Aleksey Filippov [Fri, 20 Feb 2026 14:20:50 +0000 (17:20 +0300)]
fix(BR-132): both groups digits-only in PROMO-XXXX-XXXX format
Format is now PROMO-0123-4567 (two 4-digit groups).
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Aleksey Filippov [Fri, 20 Feb 2026 14:18:10 +0000 (17:18 +0300)]
fix(BR-132): make second group digits-only in alphanumeric format
Format is now PROMO-XXXX-1234 (first group alphanumeric, second digits).
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Aleksey Filippov [Fri, 20 Feb 2026 13:57:30 +0000 (13:57 +0000)]
Merge branch 'feature_filippov_BR-132_promocode_format' into 'develop'
feat(BR-132): add alphanumeric promo code format PROMO-XXXX-XXXX
See merge request gitlab-instance/yii-erp24!1093
Aleksey Filippov [Fri, 20 Feb 2026 13:47:30 +0000 (16:47 +0300)]
feat(BR-132): add is_promo_balance flag to promocode
Boolean field to distinguish promo codes that credit separate promo
balance vs regular bonuses. Propagated to child codes on generation
and bulk update. UI toggle added to edit form.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Aleksey Filippov [Fri, 20 Feb 2026 13:33:10 +0000 (16:33 +0300)]
feat(BR-132): add alphanumeric promo code format PROMO-XXXX-XXXX
Add format switcher for promo code generation: legacy digits (CODE123)
and new alphanumeric (CODE-XXXX-XXXX) without confusing chars (0/O/1/l/I).
Expand code column from VARCHAR(13) to VARCHAR(20).
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Aleksey Filippov [Thu, 19 Feb 2026 16:50:01 +0000 (19:50 +0300)]
auto-claude: subtask-4-3 - Add Plyr JS init and CSS styles via registerCss
- Added registerCss with video-plyr-wrap wrapper styles
- Wrapped video elements in div.video-plyr-wrap for proper Plyr styling
- Plyr initialization already present from previous subtask
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Aleksey Filippov [Thu, 19 Feb 2026 16:48:41 +0000 (19:48 +0300)]
auto-claude: subtask-4-2 - Заменить блок видео на Plyr.js плеер + карточку скачивания
- Добавлен класс write-offs-video для инициализации Plyr.js плеера
- Для AVI файлов создана карточка скачивания с классом video-download-card
- MP4/MOV воспроизводятся через Plyr.js с кастомными контролами
- MOV файлы имеют дополнительную ссылку на скачивание
- Добавлена JS инициализация Plyr плееров при загрузке страницы
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Aleksey Filippov [Thu, 19 Feb 2026 16:47:21 +0000 (19:47 +0300)]
auto-claude: subtask-4-1 - Подключить Plyr.js CSS и JS через registerCssFile/registerJsFile
- Added Plyr.js CSS from CDN (https://cdn.plyr.io/3.7.8/plyr.css)
- Added Plyr.js JS from CDN (https://cdn.plyr.io/3.7.8/plyr.min.js)
- CSS registered with POS_HEAD position for proper styling
- JS registered with POS_END position for optimal page loading
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Aleksey Filippov [Thu, 19 Feb 2026 16:45:46 +0000 (19:45 +0300)]
auto-claude: subtask-3-2 - Скачать plyr.min.css с CDN и сохранить локально
Downloaded Plyr v3.7.8 CSS from official CDN (cdn.plyr.io)
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Aleksey Filippov [Thu, 19 Feb 2026 16:44:14 +0000 (19:44 +0300)]
auto-claude: subtask-3-1 - Скачать plyr.min.js с CDN и сохранить локально
- Downloaded plyr.min.js v3.7.8 from jsdelivr CDN
- File saved to erp24/web/js/plyr.min.js (113KB)
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Aleksey Filippov [Thu, 19 Feb 2026 16:43:10 +0000 (19:43 +0300)]
auto-claude: subtask-2-3 - Добавить авто-конвертацию MOV/AVI → MP4 в saveUploadedFile()
- Добавлена авто-конвертация MOV/AVI файлов в MP4 после saveAs()
- При успешной конвертации оригинальный файл удаляется
- URL в записи Files обновляется на MP4 версию
- Если FFmpeg недоступен, файл сохраняется в оригинальном формате
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Aleksey Filippov [Thu, 19 Feb 2026 16:41:23 +0000 (19:41 +0300)]
auto-claude: subtask-2-2 - Реализовать метод FileService::convertToMp4()
Добавлен метод для конвертации видео MOV/AVI в MP4 через FFmpeg:
- Проверка наличия FFmpeg через `which ffmpeg`
- Проверка существования исходного файла
- Использование безопасного escapeshellarg() для shell-команд
- Флаг -y для перезаписи без подтверждения
- Флаг -movflags +faststart для быстрого старта воспроизведения
- Graceful fallback: возвращает null при ошибках без исключений
- Логирование через Yii::warning() с категорией 'video'
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Aleksey Filippov [Thu, 19 Feb 2026 16:39:40 +0000 (19:39 +0300)]
auto-claude: subtask-2-1 - Добавить 'avi' в switch-case определения типа файла
Добавлена поддержка расширения 'avi' в определении типа файла как 'video'
в методе saveUploadedFile() класса FileService.
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Aleksey Filippov [Thu, 19 Feb 2026 16:38:42 +0000 (19:38 +0300)]
auto-claude: subtask-1-1 - Создать FileServiceVideoTest.php с тестами для convertToMp4()
TDD RED phase: тесты написаны ДО реализации метода convertToMp4().
Добавлены тесты:
- testConvertToMp4MethodExists: проверка наличия метода
- testConvertToMp4MethodSignature: проверка сигнатуры метода
- testConvertToMp4ChecksFfmpegAvailability: проверка FFmpeg через which
- testConvertToMp4UsesEscapeshellarg: проверка безопасности shell-команд
- testConvertToMp4UsesFfmpegOverwriteFlag: проверка флага -y
- testConvertToMp4UsesFaststartFlag: проверка movflags +faststart
- testConvertToMp4LogsWhenFfmpegNotInstalled: проверка логирования
- testAviFileTypeIsVideo: проверка типа AVI файлов
- testSaveUploadedFileAutoConvertsMovAvi: проверка авто-конвертации
- testOriginalFileDeletedOnlyAfterSuccessfulConversion: проверка удаления
- testConvertToMp4UsesH264Codec: проверка h264 кодека
- testConvertToMp4UsesAacCodec: проверка aac кодека
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Aleksey Filippov [Thu, 19 Feb 2026 09:35:18 +0000 (09:35 +0000)]
Merge branch 'feature_filippov_ERP-235_add_MP_filter' into 'develop'
Добавил разделение по тысячам для улучшения визуализации.
See merge request gitlab-instance/yii-erp24!1092
Aleksey Filippov [Thu, 19 Feb 2026 09:30:10 +0000 (12:30 +0300)]
feat(dashboard): add thousands separator to sales and plan columns
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Aleksey Filippov [Thu, 19 Feb 2026 09:14:40 +0000 (09:14 +0000)]
Merge branch 'feature_filippov_ERP-235_add_MP_filter' into 'develop'
Добавить фильтр для исключения из продаж розницы чеков по маркетплейсам для...
See merge request gitlab-instance/yii-erp24!1091
Aleksey Filippov [Thu, 19 Feb 2026 09:13:35 +0000 (12:13 +0300)]
Добавить фильтр для исключения из продаж розницы чеков по маркетплейсам для дашборда продаж сегодня.
Vladimir Fomichev [Thu, 19 Feb 2026 08:42:19 +0000 (11:42 +0300)]
ошибки при правке магазинов маркетплейса
Vladimir Fomichev [Thu, 19 Feb 2026 07:54:39 +0000 (10:54 +0300)]
Падение в таймаут
Vladimir Fomichev [Thu, 19 Feb 2026 07:43:19 +0000 (10:43 +0300)]
Логика проставления номера заказа из тела письма
Vladimir Fomichev [Thu, 19 Feb 2026 07:35:46 +0000 (10:35 +0300)]
Логика проставления номера заказа
Vladimir Fomichev [Wed, 18 Feb 2026 09:06:01 +0000 (12:06 +0300)]
Ошибки подключения
Vladimir Fomichev [Wed, 18 Feb 2026 08:55:41 +0000 (11:55 +0300)]
Сортировка писем в интерфейсе
Vladimir Fomichev [Wed, 18 Feb 2026 08:48:12 +0000 (11:48 +0300)]
Изменяем логику обработки писем от Flowwow
Aleksey Filippov [Tue, 17 Feb 2026 12:40:18 +0000 (15:40 +0300)]
Добавление логирования на загрузку файлов в документ списания.
Aleksey Filippov [Tue, 17 Feb 2026 12:37:51 +0000 (12:37 +0000)]
Merge branch 'feature_filippov_ERP-233_fix_upload_files_write_offs' into 'develop'
Добавление логирования на загрузку файлов в документ списания.
See merge request gitlab-instance/yii-erp24!1089
Aleksey Filippov [Tue, 17 Feb 2026 12:35:42 +0000 (15:35 +0300)]
Добавление логирования на загрузку файлов в документ списания.
Aleksey Filippov [Tue, 17 Feb 2026 11:23:07 +0000 (11:23 +0000)]
Merge branch 'feature_filippov_ERP-233_fix_upload_files_write_offs' into 'develop'
Добавление логирования на загрузку файлов в документ списания.
See merge request gitlab-instance/yii-erp24!1088
Aleksey Filippov [Tue, 17 Feb 2026 11:22:24 +0000 (14:22 +0300)]
Добавление логирования на загрузку файлов в документ списания.
Aleksey Filippov [Tue, 17 Feb 2026 10:04:20 +0000 (10:04 +0000)]
Merge branch 'feature_filippov_ERP-233_fix_upload_files_write_offs' into 'develop'
Добавление логирования на загрузку файлов в документ списания.
See merge request gitlab-instance/yii-erp24!1087
Aleksey Filippov [Tue, 17 Feb 2026 10:03:08 +0000 (13:03 +0300)]
Добавление логирования на загрузку файлов в документ списания.
Aleksey Filippov [Tue, 17 Feb 2026 09:41:03 +0000 (09:41 +0000)]
Merge branch 'feature_filippov_ERP-233_fix_upload_files_write_offs' into 'develop'
Добавление логирования на загрузку файлов в документ списания.
See merge request gitlab-instance/yii-erp24!1086
Aleksey Filippov [Tue, 17 Feb 2026 09:40:16 +0000 (12:40 +0300)]
Добавление логирования на загрузку файлов в документ списания.
Aleksey Filippov [Tue, 17 Feb 2026 08:35:47 +0000 (08:35 +0000)]
Merge branch 'feature_filippov_ERP-233_fix_upload_files_write_offs' into 'develop'
Добавление логирования на загрузку файлов в документ списания.
See merge request gitlab-instance/yii-erp24!1085
Aleksey Filippov [Tue, 17 Feb 2026 08:28:30 +0000 (11:28 +0300)]
Добавление логирования на загрузку файлов в документ списания.
Aleksey Filippov [Tue, 17 Feb 2026 07:54:06 +0000 (07:54 +0000)]
Merge branch 'feature_filippov_ERP-233_fix_upload_files_write_offs' into 'develop'
Feature filippov erp 233 fix upload files write offs
See merge request gitlab-instance/yii-erp24!1084
Aleksey Filippov [Tue, 17 Feb 2026 07:47:02 +0000 (10:47 +0300)]
Добавление логирования на загрузку файлов в документ списания.
Aleksey Filippov [Tue, 17 Feb 2026 06:58:20 +0000 (09:58 +0300)]
Добавление логирования на загрузку файлов в документ списания.
Aleksey Filippov [Tue, 17 Feb 2026 06:42:02 +0000 (09:42 +0300)]
Добавление логирования на загрузку файлов в документ списания.
Aleksey Filippov [Tue, 17 Feb 2026 06:39:01 +0000 (09:39 +0300)]
Добавление логирования на загрузку файлов в документ списания.
Aleksey Filippov [Mon, 16 Feb 2026 21:34:45 +0000 (00:34 +0300)]
[erp-233] Добавление логирования на загрузку файлов в документ списания.
Aleksey Filippov [Mon, 16 Feb 2026 09:10:15 +0000 (09:10 +0000)]
Merge branch 'feature_filippov_ERP-48J_scheduler_fix' into 'develop'
fix использовать claude CLI и временные файлы для промптов
See merge request gitlab-instance/yii-erp24!1083
Aleksey Filippov [Fri, 13 Feb 2026 20:25:39 +0000 (20:25 +0000)]
Merge branch 'feature_filippov_20260213_fix_marketplace_imap_check' into 'develop'
Добавлена проверка IMAP-ответа в MarketplaceController::actionGetFlowwowOrders
See merge request gitlab-instance/yii-erp24!1082
Aleksey Filippov [Fri, 13 Feb 2026 20:22:58 +0000 (23:22 +0300)]
Добавлена проверка IMAP-ответа в MarketplaceController::actionGetFlowwowOrders
Если IMAP не возвращает массив заказов — логируем ошибку и завершаем команду,
вместо падения на обращении к несуществующим ключам массива.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Aleksey Filippov [Fri, 13 Feb 2026 05:55:07 +0000 (05:55 +0000)]
Merge branch 'feature_filippov_20260213_add_open_shift_dashbord' into 'develop'
ERP-220 Фиксирование плашки смена открыть закрыть на первой странице.Доработка логирования.
See merge request gitlab-instance/yii-erp24!1081
Aleksey Filippov [Fri, 13 Feb 2026 05:50:04 +0000 (08:50 +0300)]
Фиксирование плашки смена открыть закрыть на первой странице.Доработка логирования.
Aleksey Filippov [Thu, 12 Feb 2026 18:09:11 +0000 (18:09 +0000)]
Merge branch 'feature_filippov_20260212_fim_message_modal' into 'develop'
[ERP-39] Создание страницы для добавления курьеров.
See merge request gitlab-instance/yii-erp24!1080
Aleksey Filippov [Thu, 12 Feb 2026 18:06:43 +0000 (21:06 +0300)]
[ERP-39] Создание страницы для добавления курьеров.
Aleksey Filippov [Thu, 12 Feb 2026 14:29:47 +0000 (14:29 +0000)]
Merge branch 'feature_filippov_erp-39_j_add_curier' into 'develop'
[ERP-39] Создание страницы для добавления курьеров.
See merge request gitlab-instance/yii-erp24!1079
Aleksey Filippov [Thu, 12 Feb 2026 14:29:15 +0000 (17:29 +0300)]
[ERP-39] Создание страницы для добавления курьеров.
Aleksey Filippov [Thu, 12 Feb 2026 14:21:23 +0000 (14:21 +0000)]
Merge branch 'feature_filippov_erp-43j_add_message_window' into 'develop'
Feature filippov erp 43j add message window
See merge request gitlab-instance/yii-erp24!1078
Aleksey Filippov [Thu, 12 Feb 2026 14:20:34 +0000 (17:20 +0300)]
Merge branch 'develop' into feature_filippov_erp-43j_add_message_window
# Conflicts:
# .gitignore
# docker/db/dev.db-pgsql.env
# docker/db/dev.db.env
# docker/php/dev.php.env
Aleksey Filippov [Thu, 12 Feb 2026 14:16:17 +0000 (14:16 +0000)]
Merge branch 'feature_filippov_ERP-219_fiw_add_sales_and_craste_checs' into 'develop'
[ERP-219] Добавлена дополнительная проверка по истории каталога , исправленно...
See merge request gitlab-instance/yii-erp24!1077
Aleksey Filippov [Thu, 12 Feb 2026 14:10:34 +0000 (17:10 +0300)]
[ERP-219] Добавлена дополнительная проверка по истории каталога , исправленно сохранение чеков от МП
Aleksey Filippov [Wed, 11 Feb 2026 14:49:17 +0000 (17:49 +0300)]
[ERP-43] Сообщение напоминание, всплывающее для открытия и закрытия смены.
Aleksey Filippov [Wed, 11 Feb 2026 14:30:16 +0000 (17:30 +0300)]
[ERP-43] Сообщение напоминание, всплывающее для открытия и закрытия смены.
Aleksey Filippov [Tue, 10 Feb 2026 19:03:25 +0000 (22:03 +0300)]
[ERP-43] Сообщение напоминание, всплывающее для открытия и закрытия смены.
Aleksey Filippov [Tue, 10 Feb 2026 09:22:33 +0000 (09:22 +0000)]
Merge branch 'feature_filippov_ERP-217_fix_upload_date' into 'develop'
[ERP-217-J] Подгрузка окружения env в media для Яндекса
See merge request gitlab-instance/yii-erp24!1076
Aleksey Filippov [Tue, 10 Feb 2026 09:21:56 +0000 (12:21 +0300)]
[ERP-217-J] Подгрузка окружения env в media для Яндекса
Aleksey Filippov [Tue, 10 Feb 2026 09:11:01 +0000 (09:11 +0000)]
Merge branch 'feature_filippov_ERP-217_fix_upload_date' into 'develop'
[ERP-217-J] Подгрузка окружения env в media для Яндекса
See merge request gitlab-instance/yii-erp24!1075
Aleksey Filippov [Tue, 10 Feb 2026 09:10:03 +0000 (12:10 +0300)]
[ERP-217-J] Подгрузка окружения env в media для Яндекса
Aleksey Filippov [Tue, 10 Feb 2026 07:46:17 +0000 (07:46 +0000)]
Merge branch 'feature_filippov_ERP-217_fix_upload_date' into 'develop'
[ERP-217-J] Подгрузка окружения env в media для Яндекса
See merge request gitlab-instance/yii-erp24!1074
Aleksey Filippov [Tue, 10 Feb 2026 07:45:07 +0000 (10:45 +0300)]
[ERP-217-J] Подгрузка окружения env в media для Яндекса
Aleksey Filippov [Tue, 10 Feb 2026 07:21:16 +0000 (07:21 +0000)]
Merge branch 'feature_filippov_ERP-217_fix_upload_date' into 'develop'
[ERP-217-J] Подгрузка окружения env в media для Яндекса
See merge request gitlab-instance/yii-erp24!1073
Aleksey Filippov [Tue, 10 Feb 2026 07:20:10 +0000 (10:20 +0300)]
[ERP-217-J] Подгрузка окружения env в media для Яндекса
Aleksey Filippov [Mon, 9 Feb 2026 19:08:54 +0000 (19:08 +0000)]
Merge branch 'feature_filippov_20260209_log_save_fix' into 'develop'
fix error log save
See merge request gitlab-instance/yii-erp24!1072
Aleksey Filippov [Mon, 9 Feb 2026 19:08:22 +0000 (22:08 +0300)]
fix error log save
Aleksey Filippov [Mon, 9 Feb 2026 18:02:25 +0000 (18:02 +0000)]
Merge branch 'feature_filippov_20260209_fix_check_api_cron_task' into 'develop'
fix checkApiCronTask
See merge request gitlab-instance/yii-erp24!1071
Aleksey Filippov [Mon, 9 Feb 2026 18:00:56 +0000 (21:00 +0300)]
fix checkApiCronTask