[Forwardport] Refactor Code for Mass Order Unhold #67
Conversation
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
- fix bundle performance test by creating it from the admin
- fix static test
- added use case for bundle with non-visible children
…MAGETWO-89292-SDL
…lor_picker [Team 3] [UI Component] Color Picker
…292-SDL [honey] MAGETWO-89246: Product visibility is not considered in search
…ueue", "magento/framework-bulk" libraries are packaged as part of "magento/framework" - Added Amqp, Bulk and MessageQueue namespaces to the list of exclusions for the framework package https://getcomposer.org/doc/04-schema.md#archive
…ueue", "magento/framework-bulk" libraries are packaged as part of "magento/framework" - aligned composer.json
# Conflicts: # app/code/Magento/AdvancedPricingImportExport/composer.json # app/code/Magento/AdvancedSearch/composer.json # app/code/Magento/Amqp/composer.json # app/code/Magento/Analytics/composer.json # app/code/Magento/AsynchronousOperations/composer.json # app/code/Magento/Authorization/composer.json # app/code/Magento/Authorizenet/composer.json # app/code/Magento/Backend/composer.json # app/code/Magento/Backup/composer.json # app/code/Magento/Braintree/composer.json # app/code/Magento/Bundle/composer.json # app/code/Magento/BundleGraphQl/composer.json # app/code/Magento/BundleImportExport/composer.json # app/code/Magento/CacheInvalidate/composer.json # app/code/Magento/Captcha/composer.json # app/code/Magento/Catalog/composer.json # app/code/Magento/CatalogAnalytics/composer.json # app/code/Magento/CatalogGraphQl/composer.json # app/code/Magento/CatalogInventory/composer.json # app/code/Magento/CatalogRule/composer.json # app/code/Magento/CatalogRuleConfigurable/composer.json # app/code/Magento/CatalogSearch/composer.json # app/code/Magento/CatalogUrlRewrite/composer.json # app/code/Magento/CatalogUrlRewriteGraphQl/composer.json # app/code/Magento/CatalogWidget/composer.json # app/code/Magento/Checkout/composer.json # app/code/Magento/CheckoutAgreements/composer.json # app/code/Magento/Cms/composer.json # app/code/Magento/CmsUrlRewrite/composer.json # app/code/Magento/CmsUrlRewriteGraphQl/composer.json # app/code/Magento/Config/composer.json # app/code/Magento/ConfigurableImportExport/composer.json # app/code/Magento/ConfigurableProduct/composer.json # app/code/Magento/ConfigurableProductGraphQl/composer.json # app/code/Magento/ConfigurableProductSales/composer.json # app/code/Magento/Contact/composer.json # app/code/Magento/Cookie/composer.json # app/code/Magento/Cron/composer.json # app/code/Magento/CurrencySymbol/composer.json # app/code/Magento/Customer/composer.json # app/code/Magento/CustomerAnalytics/composer.json # app/code/Magento/CustomerGraphQl/composer.json # app/code/Magento/CustomerImportExport/composer.json # app/code/Magento/Deploy/composer.json # app/code/Magento/Developer/composer.json # app/code/Magento/Downloadable/composer.json # app/code/Magento/DownloadableGraphQl/composer.json # app/code/Magento/DownloadableImportExport/composer.json # app/code/Magento/Eav/composer.json # app/code/Magento/EavGraphQl/composer.json # app/code/Magento/Elasticsearch/composer.json # app/code/Magento/Email/composer.json # app/code/Magento/EncryptionKey/composer.json # app/code/Magento/GiftMessage/composer.json # app/code/Magento/GoogleAdwords/composer.json # app/code/Magento/GoogleAnalytics/composer.json # app/code/Magento/GoogleOptimizer/composer.json # app/code/Magento/GraphQl/composer.json # app/code/Magento/GroupedImportExport/composer.json # app/code/Magento/GroupedProduct/composer.json # app/code/Magento/GroupedProductGraphQl/composer.json # app/code/Magento/Indexer/composer.json # app/code/Magento/InstantPurchase/composer.json # app/code/Magento/Integration/composer.json # app/code/Magento/LayeredNavigation/composer.json # app/code/Magento/Marketplace/composer.json # app/code/Magento/MediaStorage/composer.json # app/code/Magento/Msrp/composer.json # app/code/Magento/Multishipping/composer.json # app/code/Magento/MysqlMq/composer.json # app/code/Magento/NewRelicReporting/composer.json # app/code/Magento/Newsletter/composer.json # app/code/Magento/OfflinePayments/composer.json # app/code/Magento/OfflineShipping/composer.json # app/code/Magento/PageCache/composer.json # app/code/Magento/Payment/composer.json # app/code/Magento/Persistent/composer.json # app/code/Magento/ProductAlert/composer.json # app/code/Magento/ProductVideo/composer.json # app/code/Magento/Quote/composer.json # app/code/Magento/QuoteAnalytics/composer.json # app/code/Magento/ReleaseNotification/composer.json # app/code/Magento/Reports/composer.json # app/code/Magento/RequireJs/composer.json # app/code/Magento/Review/composer.json # app/code/Magento/ReviewAnalytics/composer.json # app/code/Magento/Robots/composer.json # app/code/Magento/Rss/composer.json # app/code/Magento/Sales/composer.json # app/code/Magento/SalesAnalytics/composer.json # app/code/Magento/SalesInventory/composer.json # app/code/Magento/SalesRule/composer.json # app/code/Magento/SalesSequence/composer.json # app/code/Magento/SampleData/composer.json # app/code/Magento/Search/composer.json # app/code/Magento/Security/composer.json # app/code/Magento/SendFriend/composer.json # app/code/Magento/Signifyd/composer.json # app/code/Magento/Sitemap/composer.json # app/code/Magento/Store/composer.json # app/code/Magento/Swagger/composer.json # app/code/Magento/SwaggerWebapi/composer.json # app/code/Magento/SwaggerWebapiAsync/composer.json # app/code/Magento/Swatches/composer.json # app/code/Magento/SwatchesGraphQl/composer.json # app/code/Magento/SwatchesLayeredNavigation/composer.json # app/code/Magento/Tax/composer.json # app/code/Magento/TaxGraphQl/composer.json # app/code/Magento/TaxImportExport/composer.json # app/code/Magento/Theme/composer.json # app/code/Magento/Tinymce3/composer.json # app/code/Magento/Translation/composer.json # app/code/Magento/Ui/composer.json # app/code/Magento/Ups/composer.json # app/code/Magento/UrlRewrite/composer.json # app/code/Magento/UrlRewriteGraphQl/composer.json # app/code/Magento/User/composer.json # app/code/Magento/Variable/composer.json # app/code/Magento/Vault/composer.json # app/code/Magento/Version/composer.json # app/code/Magento/Webapi/composer.json # app/code/Magento/WebapiAsync/composer.json # app/code/Magento/WebapiSecurity/composer.json # app/code/Magento/Weee/composer.json # app/code/Magento/WeeeGraphQl/composer.json # app/code/Magento/Widget/composer.json # app/code/Magento/Wishlist/composer.json # app/code/Magento/WishlistAnalytics/composer.json # app/design/adminhtml/Magento/backend/composer.json # app/design/frontend/Magento/blank/composer.json # app/design/frontend/Magento/luma/composer.json # app/design/frontend/Magento/rush/composer.json # composer.lock # dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json # dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/composer.json # dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride/composer.json # dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration/composer.json # dev/tests/integration/_files/Magento/TestModuleSample/composer.json # dev/tests/integration/testsuite/Magento/Deploy/_files/zoom1/composer.json # dev/tests/integration/testsuite/Magento/Deploy/_files/zoom2/composer.json # dev/tests/integration/testsuite/Magento/Deploy/_files/zoom3/composer.json # dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json # dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json # lib/internal/Magento/Framework/Amqp/composer.json # lib/internal/Magento/Framework/Bulk/composer.json # lib/internal/Magento/Framework/MessageQueue/composer.json
[honey] MAGETWO-90203: Failing Magento\Version\Controller\Index\IndexTest::testIndexAction
- add website object - refactor tests
(Trgger) Fixing Deployment on cloud
[Engcom] Fix packaging of message queue in CE
… present on minicart dropdown magento#14737 - Merge Pull Request magento#14737 from Karlasa/magento2:PR-14715-forwardport - Merged commits: 1. d37cfc4
…ize issue magento#14739 - Merge Pull Request magento#14739 from Karlasa/magento2:PR-14717-forwardport - Merged commits: 1. 5dc7e02 2. 5ed3cce
…21' into 2.3-develop-prs
Accepted Public Pull Requests: - magento#14710: added GNU Free Font to be used by sales PDFs (by @rossmc) - magento#14621: [Forwardport] Fix syntax of expectException() calls (by @mastiuhin-olexandr) Fixed GitHub Issues: - magento#9666: Magento 2.1.6 - Invoice PDF doesn't support Thai (reported by @jsdupuis) has been fixed in magento#14710 by @rossmc in 2.3-develop branch Related commits: 1. abd7be0 - magento#12323: Magento 2.1.3 - Invoice and shipment PDF doesn't support Arabic (reported by @Avinashsain) has been fixed in magento#14710 by @rossmc in 2.3-develop branch Related commits: 1. abd7be0 - magento#11059: 92 usages of expectException() with ignored $message parameter (reported by @schmengler) has been fixed in magento#14621 by @mastiuhin-olexandr in 2.3-develop branch Related commits: 1. 948e5fa 2. c557360 3. 353c04c 4. 5d6600e 5. 0d912e6 6. a205337 7. 87b3b58 8. 4955fae 9. 28cddb9 10. 7893cd6
… present on minicart dropdown magento#14737
Accepted Public Pull Requests: - magento#14739: [forwardport] magento#14716 Fix - minicart label fixed size issue (by @Karlasa) - magento#14737: [forwardport] magento#14669: Css class "empty" is always present on minicart dropdown (by @Karlasa)
Accepted Public Pull Requests: - magento#14704: Catalog price rule save is too slow, ignore on demand reindex (by @chrom) - magento#14676: [Forwardport] Specify the table when adding field to filter (by @rostyslav-hymon) Fixed GitHub Issues: - magento#14572: Specify the table when adding field to filter for the collection Eav/Model/ResourceModel/Entity/Attribute/Option/Collection.php (reported by @PierreLeMaguer) has been fixed in magento#14676 by @rostyslav-hymon in 2.3-develop branch Related commits: 1. a712d3e
[TSG] Upporting for 2.3 (pr12) (2.3.0)
I have observed that MassAction Unhold is using the collection to release order from hold, whereas MassAction Hold is using Interface to put the order on hold. So, I have refactor code in app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php same as in app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php
Added backward compatibility for the new orderManagementInterface dependency and made the variable $orderManagement private.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Original Pull Request
magento#14629
Description
I have observed that MassAction Unhold is using the collection to release order from hold, whereas MassAction Hold is using Interface to put the order on hold.
So, I have refactor code in app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php same as in app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php
Manual testing scenarios