Integration/open prs 20260906 - #651
Open
AgelxNash wants to merge 29 commits into
Open
Conversation
Task journal: fork created (AgelxNash/MiniShop3), all PR refs fetched, each PR applied as a single squash commit, conflicting PRs skipped and listed below. Our integration changes come first. Merged: 596 598 600 614 619 620 623 624 627 629 631 637 639 642 643 647 648 649. Skipped (conflicts): 599 603 604 605 621 633 638 640 644 646. Drafts excluded. This PR itself (modx-pro#650) is excluded.
…roduct Categories tab modx-pro#642
….16.8 in /vueManager modx-pro#648
Conflict resolution: integrate with merged PR 598 gallery (ms3_product_gallery_public + ms3_public_seo in registry, seo attach wrapped around gallery-aware getById payload).
… release Conflict resolution: combine with merged PR 596 lifecycle gate — ms3_order_status factory now takes lifecycle ports + OrderInventoryCoordinator, dependency map merged, persistStatusWithInventory supersedes inline persist, event-failure path runs undoUncommittedNewStatus + rollbackStatus.
…k callback Conflict resolution: keep PR 596/603 status gate (lifecycle ports + inventory) in OrderStatusService, add ensure() as OrderStatusChanger impl; registry deps merged (order_status -> order_log, lifecycle_ports, inventory; payment_lifecycle -> order_status); docblock example switched to PaymentLifecycle API.
Conflict resolution: keep inventory (603) + payment (604) lifecycle additions, merge shipment events/settings/lexicons alongside them; ms3_get_order combines PaymentPublicFields (604) with shipments public payload; dedupe ms3_status_sent lexicon pair (kept from PR 596).
… MODX Conflict resolution: keep array-based fieldsBySections (merged modx-pro#620/modx-pro#611), port fieldHtmlId labels + isCheckboxXtype/normalizeCheckboxValue helpers on top.
…change-option Conflict resolution: keep PR 633 cart/add JSON-string tests alongside PR 638 change-option tests (both sets retained).
Conflict resolution: PR 640 supersedes merged modx-pro#621 rework (same author, same intent) — took PR side for 36 files; manually preserved modx-pro#631 useConfirm grids, modx-pro#623 datefield dialog styles, modx-pro#643 gallery bits, modx-pro#605 order entry; ProductData sections rebuilt on groupProductDataSections (keeps modx-pro#611/modx-pro#620 sort_order) under PR 640 Panel layout.
Conflict resolution: keep seo (599) + menuindex (627) imports alongside new CatalogResolve.
…key (modx-pro#645) Conflict resolution: keep XTYPE_DB_DEFAULTS (623 datefield) alongside isValidFieldKey key validation.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Описание
Краткое описание изменений и их цели.
Тип изменений
Связанные Issues
Closes #(номер issue)
Как это было протестировано?
Опишите тесты, которые вы провели для проверки изменений.
Локальный CI-гейт (без полной установки MODX/MySQL), PHP lint + vueManager jobs из
.github/workflows/ci.yml:PHPStan — отдельный job:
composer stan:prepare && composer stan(pinned MODX/pdoTools в.phpstan-deps).composer ci:php/composer test,npm run lint:ci,composer stan/ GitHub Actions CI)Конфигурация тестирования:
Скриншоты (если применимо)
Чеклист
composer stan/ CI jobPHPStan)npm run lint:ciдля Vue)Дополнительные заметки
Любая дополнительная информация для ревьюеров.