From 9201e4598f83286f280a1a42f38c922ae2203a6a Mon Sep 17 00:00:00 2001 From: mage2-team Date: Mon, 13 Oct 2014 13:36:19 -0700 Subject: [PATCH] 0.1.0-alpha99 * Released Performance Toolkit * GitHub requests: * [#665](https://github.com/magento/magento2/issues/665) -- Main menu event in wrong area * [#666](https://github.com/magento/magento2/pull/666) -- Update di.xml * [#602](https://github.com/magento/magento2/issues/602) -- Magento\Sales\Model\Order::getFullTaxInfo() incorrectly combines percentages * [#673](https://github.com/magento/magento2/issues/673) -- Fixed fatal error during installation * Functional tests: * Updated API-functional test for Customer and Address metadata service * Add cross sell * Add a product to wishlist * Add up sell * Checkout with gift messages * Create an order from a customer * Create a shipment for offline payment methods * Delete a product from mini shopping cart * Reorder * Sales order report * Updating URL rewrites from a category page * Layout updates: * Moved layout files to the page_layout directory * Moved layout validation files to framework * Theme updates: * Blank Theme layouts & templates were unified * Search Library: * Added ability to aggregate queries for MySQL adapter * Implemented automatic range aggregation for MySQL adapter * Search module: * Introduced the Search module * Moved autocomplete to the Search module * Added base UI to the Search module * Documentation: * Added basic description of modules in the README.md files * Modularity: * Created API and script to get module and dependency information * Framework Improvements: * Decomposed heavy objects basing on profiling results * Refactored the getCustomAttributesCodes method in ProductService * Refactored Customer Model to use Group Model instead of Group Service * Updated Travis configuration to run "composer install" * Performance improvements: * Removed unnecessary "save order" call during order submission step * Fixed missing installation features of the new setup: * Added missing installation parameters: admin_no_form_key, order_increment_prefix, cleanup_database * Fixed the link to the license agreement in web installer * Fixed the web installation wizard which was stuck at 96% * Fixed bugs: * Fixed an issue where newly created attribute was always added to the Product Details tab * Fixed an issue where it was impossible to change the Stock Availability status of a product from the Advanced Inventory tab * Fixed an issue where the Stock Status value changed from In Stock to Out of Stock if quantity was not specified * Fixed an issue where performance toolkit failed in case of unknown argument * Fixed an issue where 404 error page was displayed instead of the URL Rewrite Information page * Fixed an issue where the Click for price link was not working if a product name contained quote mark * Fixed an issue where the Compare products link disappeared after switching to other page * Fixed an issue where the custom logo was not displayed on the category page * Fixed an XSS vulnerability in category name * Fixed an issue where a success save message was not displayed after saving a Search term * Fixed an issue with Google Analytics where it was impossible to add the code to the pages * Fixed an issue where import custom options grid was not displayed on the product creation page * Fixed an issue where it was impossible to retrieve a product collection from category in the "adminhtml" area * Fixed an issue where product attributes were absent on product creation form after switching to another product template * Fixed an issue where the 'URL key for specified store already exists.' error message was displayed when saving a configurable product with variations which have the same name * Fixed an issue where search in the Search Terms Report grid did not work * Fixed an issue where the unnecessary tab "General" was displayed on the Category page in the Admin panel * Fixed an issue where the Stock Status value changed from In Stock to Out of Stock if quantity was not specified for a configurable product when saving to a new template * Fixed an issue where product Stock Status was always set to 'In Stock' if product quantity was specified * Fixed an IE specific issue where for bundle products the Manage Stock option was reset to Yes * Fixed an issue where backorder messages were not displayed * Fixed an issue where the Price field was always required during Bundle product update using ProductService * Fixed an issue where product name was missing in the error message * Fixed an issue where configurable product did not contain a message to select options while adding product from wishlist to shopping cart * Fixed an issue where the Validate VAT Number button did not work during order creation in the Admin panel * Fixed an issue where Item qty in Wishlist got reset after update without changes * Fixed an issue where invoice amount was incorrect when items with discount were partially invoiced * Fixed product thumbnails alignment in the storefront * Fixed an issue where inactive Categories were not greyed out in the tree in the Admin panel * Fixed an issue where it was impossible to disable debug mode * Fixed the code sample in the index.php file * Removed language selector in the setup UI * Fixed an issue where setup was broken if db_prefix was used * Implemented usage of Symfony's PHPExecutableFinder for executing CLI tools * Fixed an issue with the Import/Export functionality * Fixed an issue with catalog product/category and category/product indexers invalidation after import * Fixed an issue with entering invalid date in the Product Views Report * Fixed an issue where it was impossible to view orders for customers from a deleted customer group * Fixed an issue where a duplicate customer record was created after adding an order from the Admin panel * Fixed an issue where it was impossible to log in to the Admin panel from the first attempt --- .travis.yml | 4 + CHANGELOG.md | 95 +- LICENSE.html | 42 - LICENSE.txt | 2 +- .../Magento/AdminNotification/composer.json | 10 +- .../layout/adminhtml_notification_block.xml | 2 +- .../layout/adminhtml_notification_index.xml | 2 +- .../view/adminhtml/layout/default.xml | 2 +- app/code/Magento/Authorization/composer.json | 6 +- app/code/Magento/Authorizenet/composer.json | 18 +- ...thorizenet_directpost_payment_redirect.xml | 2 +- ...net_directpost_payment_backendresponse.xml | 2 +- ...thorizenet_directpost_payment_redirect.xml | 2 +- ...thorizenet_directpost_payment_response.xml | 2 +- .../layout/checkout_onepage_index.xml | 2 +- .../layout/checkout_onepage_review.xml | 2 +- app/code/Magento/Backend/Block/Dashboard.php | 4 - .../Block/Widget/Grid/Column/Filter/Store.php | 14 +- .../Backend/Model/Session/AdminConfig.php | 24 +- .../Magento/Backend/Model/Session/Quote.php | 4 +- app/code/Magento/Backend/Model/Url.php | 9 +- .../Backend/Service/V1/ModuleService.php | 59 + .../Service/V1/ModuleServiceInterface.php | 12 +- app/code/Magento/Backend/composer.json | 35 +- app/code/Magento/Backend/etc/di.xml | 5 +- app/code/Magento/Backend/etc/module.xml | 1 - app/code/Magento/Backend/etc/webapi.xml | 34 + .../adminhtml/layout/adminhtml_auth_login.xml | 2 +- .../layout/adminhtml_cache_block.xml | 2 +- .../layout/adminhtml_cache_index.xml | 2 +- .../adminhtml_dashboard_customersmost.xml | 2 +- .../adminhtml_dashboard_customersnewest.xml | 2 +- .../layout/adminhtml_dashboard_index.xml | 2 +- .../adminhtml_dashboard_productsviewed.xml | 2 +- .../adminhtml/layout/adminhtml_denied.xml | 2 +- .../adminhtml/layout/adminhtml_noroute.xml | 2 +- .../layout/adminhtml_system_account_index.xml | 2 +- .../layout/adminhtml_system_config_edit.xml | 2 +- .../layout/adminhtml_system_design_edit.xml | 2 +- .../layout/adminhtml_system_design_grid.xml | 2 +- .../adminhtml_system_design_grid_block.xml | 2 +- .../layout/adminhtml_system_design_index.xml | 2 +- .../adminhtml_system_store_grid_block.xml | 2 +- .../layout/adminhtml_system_store_index.xml | 2 +- .../layout/adminhtml_system_variable_edit.xml | 2 +- .../adminhtml_system_variable_grid_block.xml | 2 +- .../adminhtml_system_variable_index.xml | 2 +- .../Backend/view/adminhtml/layout/default.xml | 2 +- .../Backend/view/adminhtml/layout/editor.xml | 2 +- .../Backend/view/adminhtml/layout/empty.xml | 2 +- .../Backend/view/adminhtml/layout/formkey.xml | 2 +- .../view/adminhtml/layout/overlay_popup.xml | 2 +- .../Backend/view/adminhtml/layout/popup.xml | 2 +- app/code/Magento/Backup/composer.json | 12 +- .../adminhtml/layout/backup_index_block.xml | 2 +- .../adminhtml/layout/backup_index_grid.xml | 2 +- .../adminhtml/layout/backup_index_index.xml | 2 +- app/code/Magento/Bundle/composer.json | 30 +- app/code/Magento/Bundle/etc/adminhtml/di.xml | 3 - app/code/Magento/Bundle/etc/di.xml | 3 + .../layout/adminhtml_order_shipment_new.xml | 2 +- .../layout/adminhtml_order_shipment_view.xml | 2 +- .../layout/catalog_product_bundle.xml | 2 +- .../adminhtml/layout/catalog_product_new.xml | 2 +- .../catalog_product_view_type_bundle.xml | 2 +- .../layout/customer_index_wishlist.xml | 2 +- .../layout/sales_order_creditmemo_new.xml | 2 +- .../sales_order_creditmemo_updateqty.xml | 2 +- .../layout/sales_order_creditmemo_view.xml | 2 +- .../layout/sales_order_invoice_new.xml | 2 +- .../layout/sales_order_invoice_updateqty.xml | 2 +- .../layout/sales_order_invoice_view.xml | 2 +- .../adminhtml/layout/sales_order_view.xml | 2 +- .../templates/product/stock/disabler.phtml | 1 + .../base/layout/catalog_product_prices.xml | 2 +- .../catalog_product_view_type_bundle.xml | 15 +- .../catalog_product_view_type_simple.xml | 2 +- .../checkout_cart_configure_type_bundle.xml | 2 +- .../layout/checkout_cart_item_renderers.xml | 2 +- .../checkout_cart_sidebar_item_renderers.xml | 2 +- ...checkout_onepage_review_item_renderers.xml | 2 +- .../Bundle/view/frontend/layout/default.xml | 2 +- ...sales_email_order_creditmemo_renderers.xml | 2 +- .../sales_email_order_invoice_renderers.xml | 2 +- .../layout/sales_email_order_renderers.xml | 2 +- .../sales_email_order_shipment_renderers.xml | 2 +- .../sales_order_creditmemo_renderers.xml | 2 +- .../layout/sales_order_invoice_renderers.xml | 2 +- .../layout/sales_order_item_renderers.xml | 2 +- ...sales_order_print_creditmemo_renderers.xml | 2 +- .../sales_order_print_invoice_renderers.xml | 2 +- .../layout/sales_order_print_renderers.xml | 2 +- .../sales_order_print_shipment_renderers.xml | 2 +- .../layout/sales_order_shipment_renderers.xml | 2 +- app/code/Magento/Captcha/composer.json | 14 +- .../layout/adminhtml_auth_forgotpassword.xml | 2 +- .../adminhtml/layout/adminhtml_auth_login.xml | 2 +- .../layout/checkout_onepage_index.xml | 2 +- .../frontend/layout/contact_index_index.xml | 2 +- .../layout/customer_account_create.xml | 2 +- .../customer_account_forgotpassword.xml | 2 +- .../layout/customer_account_login.xml | 2 +- .../Product/Edit/Tab/Attributes/Search.php | 2 +- .../Product/Edit/Tab/Options/Popup/Grid.php | 1 - .../Adminhtml/Product/NewAction.php | 1 + .../Controller/Adminhtml/Product/Save.php | 6 +- .../Indexer/Category/Product/Processor.php | 32 + .../Indexer/Product/Category/Processor.php | 32 + .../Catalog/Model/Layer/Filter/Price.php | 87 +- .../Catalog/Model/Layer/Search/Context.php | 7 +- .../Model/Layout/DepersonalizePlugin.php | 91 + .../Catalog/Model/Product/Image/View.php | 2 + .../Model/Resource/Layer/Filter/Price.php | 328 +- .../Catalog/Pricing/Render/FinalPriceBox.php | 4 + app/code/Magento/Catalog/composer.json | 49 +- app/code/Magento/Catalog/etc/frontend/di.xml | 4 + .../Magento/Catalog/etc/frontend/events.xml | 3 + app/code/Magento/Catalog/etc/module.xml | 1 + .../CATALOG_PRODUCT_COMPOSITE_CONFIGURE.xml | 2 +- ...ALOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR.xml | 2 +- ...ATALOG_PRODUCT_COMPOSITE_UPDATE_RESULT.xml | 2 +- .../layout/catalog_category_edit.xml | 2 +- .../catalog_product_action_attribute_edit.xml | 2 +- .../catalog_product_alertspricegrid.xml | 2 +- .../catalog_product_alertsstockgrid.xml | 2 +- .../layout/catalog_product_attribute_edit.xml | 2 +- .../catalog_product_attribute_edit_popup.xml | 2 +- .../layout/catalog_product_crosssell.xml | 2 +- .../layout/catalog_product_crosssellgrid.xml | 2 +- .../layout/catalog_product_customoptions.xml | 2 +- .../adminhtml/layout/catalog_product_edit.xml | 2 +- .../adminhtml/layout/catalog_product_grid.xml | 2 +- .../layout/catalog_product_index.xml | 2 +- .../adminhtml/layout/catalog_product_new.xml | 2 +- .../layout/catalog_product_options.xml | 2 +- .../catalog_product_optionsimportgrid.xml | 2 +- .../layout/catalog_product_related.xml | 2 +- .../layout/catalog_product_relatedgrid.xml | 2 +- .../layout/catalog_product_set_block.xml | 2 +- .../layout/catalog_product_set_edit.xml | 2 +- .../layout/catalog_product_set_index.xml | 2 +- .../layout/catalog_product_upsell.xml | 2 +- .../layout/catalog_product_upsellgrid.xml | 2 +- .../catalog/product/tab/inventory.phtml | 2 +- .../product/edit/attribute/search.phtml | 2 +- .../base/layout/catalog_product_prices.xml | 2 +- .../Catalog/view/base/layout/default.xml | 2 +- .../Catalog/view/base/layout/empty.xml | 2 +- .../templates/product/price/final_price.phtml | 14 +- .../frontend/layout/catalog_category_view.xml | 12 +- .../catalog_category_view_type_default.xml | 2 +- ...ory_view_type_default_without_children.xml | 2 +- .../layout/catalog_product_compare_index.xml | 2 +- .../layout/catalog_product_gallery.xml | 2 +- .../frontend/layout/catalog_product_view.xml | 75 +- .../catalog_product_view_type_simple.xml | 2 +- .../catalog_product_view_type_virtual.xml | 2 +- .../layout/checkout_cart_item_renderers.xml | 2 +- .../Catalog/view/frontend/layout/default.xml | 2 +- .../templates/product/compare/link.phtml | 1 - .../templates/product/view/mailto.phtml | 4 +- .../Model/Export/Product.php | 6 +- .../Model/Import/Product/Option.php | 39 +- .../Category/Product/Plugin/Import.php | 55 + .../Product/Category/Plugin/Import.php | 55 + .../Magento/CatalogImportExport/composer.json | 20 +- .../Magento/CatalogImportExport/etc/di.xml | 2 + .../Block/Adminhtml/Form/Field/Stock.php | 24 +- .../CatalogInventory/Model/Observer.php | 3 +- .../Initializer/StockItem.php | 3 +- .../CatalogInventory/Model/Stock/Item.php | 3 - .../Magento/CatalogInventory/composer.json | 20 +- .../frontend/layout/catalog_product_view.xml | 2 +- .../catalog_product_view_type_simple.xml | 2 +- .../catalog_product_view_type_virtual.xml | 2 +- app/code/Magento/CatalogRule/composer.json | 16 +- .../catalog_rule_promo_catalog_block.xml | 2 +- .../catalog_rule_promo_catalog_edit.xml | 2 +- .../catalog_rule_promo_catalog_index.xml | 2 +- .../Magento/CatalogSearch/Block/Result.php | 26 +- .../CatalogSearch/Controller/Result/Index.php | 22 +- .../Magento/CatalogSearch/Helper/Data.php | 423 +- .../Mysql/Aggregation/DataProvider.php | 107 + .../Magento/CatalogSearch/Model/Fulltext.php | 21 +- .../Model/Layer/Advanced/Context.php | 4 +- .../Model/Layer/Search/CollectionFilter.php | 36 +- .../Model/Layer/Search/StateKey.php | 14 +- .../CatalogSearch/Model/Price/Interval.php | 82 + .../Model/Resource/EngineProvider.php | 7 +- .../CatalogSearch/Model/Resource/Fulltext.php | 18 +- .../Model/Resource/Fulltext/Collection.php | 14 +- .../Model/Resource/Fulltext/Engine.php | 6 +- .../Model/Search/Catalog.php | 16 +- .../Model/Search/CatalogTest.php | 14 +- app/code/Magento/CatalogSearch/composer.json | 23 +- app/code/Magento/CatalogSearch/etc/config.xml | 1 + app/code/Magento/CatalogSearch/etc/di.xml | 35 +- .../CatalogSearch/etc/frontend/page_types.xml | 1 - app/code/Magento/CatalogSearch/etc/module.xml | 2 + .../CatalogSearch/etc/search_request.xml | 4 +- .../catalogsearch_setup/install-1.6.0.0.php | 93 +- .../layout/catalogsearch_advanced_index.xml | 2 +- .../layout/catalogsearch_advanced_result.xml | 2 +- .../layout/catalogsearch_result_index.xml | 2 +- .../view/frontend/layout/default.xml | 14 +- .../frontend/templates/advanced/link.phtml | 31 + .../Magento/CatalogUrlRewrite/composer.json | 18 +- .../data-install-1.0.0.0.php | 5 +- app/code/Magento/Centinel/composer.json | 14 +- ..._centinel_index_authenticationcomplete.xml | 2 +- ...tml_centinel_index_authenticationstart.xml | 2 +- .../layout/sales_order_create_index.xml | 2 +- ...rder_create_load_block_card_validation.xml | 2 +- .../sales_order_create_load_block_data.xml | 2 +- .../layout/sales_order_create_start.xml | 2 +- .../centinel_index_authenticationcomplete.xml | 2 +- .../centinel_index_authenticationstart.xml | 2 +- .../layout/checkout_onepage_review.xml | 2 +- .../multishipping_checkout_overview.xml | 2 +- app/code/Magento/Checkout/composer.json | 36 +- .../frontend/layout/catalog_category_view.xml | 2 +- .../frontend/layout/catalog_product_view.xml | 2 +- .../layout/checkout_cart_configure.xml | 2 +- .../checkout_cart_configure_type_simple.xml | 2 +- .../frontend/layout/checkout_cart_index.xml | 2 +- .../layout/checkout_cart_item_renderers.xml | 2 +- ...kout_cart_sidebar_item_price_renderers.xml | 2 +- .../checkout_cart_sidebar_item_renderers.xml | 2 +- .../checkout_cart_sidebar_total_renderers.xml | 2 +- .../layout/checkout_item_price_renderers.xml | 2 +- .../layout/checkout_onepage_additional.xml | 2 +- .../layout/checkout_onepage_failure.xml | 2 +- .../layout/checkout_onepage_index.xml | 2 +- .../layout/checkout_onepage_paymentmethod.xml | 2 +- .../layout/checkout_onepage_progress.xml | 2 +- .../layout/checkout_onepage_review.xml | 2 +- ...checkout_onepage_review_item_renderers.xml | 2 +- .../checkout_onepage_shippingmethod.xml | 2 +- .../layout/checkout_onepage_success.xml | 2 +- .../checkout_shipping_price_renderer.xml | 2 +- .../Checkout/view/frontend/layout/default.xml | 2 +- .../templates/cart/item/default.phtml | 2 +- .../frontend/templates/cart/minicart.phtml | 58 +- .../templates/onepage/review/item.phtml | 4 +- .../Magento/CheckoutAgreements/composer.json | 10 +- .../layout/checkout_onepage_review.xml | 2 +- .../multishipping_checkout_overview.xml | 2 +- .../frontend/layout/paypal_express_review.xml | 2 +- .../layout/paypal_payflowexpress_review.xml | 2 +- app/code/Magento/Cms/composer.json | 20 +- .../view/adminhtml/layout/cms_block_edit.xml | 2 +- .../view/adminhtml/layout/cms_block_index.xml | 2 +- .../adminhtml/layout/cms_block_listing.xml | 2 +- .../view/adminhtml/layout/cms_block_new.xml | 2 +- .../view/adminhtml/layout/cms_page_edit.xml | 2 +- .../view/adminhtml/layout/cms_page_index.xml | 2 +- .../adminhtml/layout/cms_page_listing.xml | 2 +- .../view/adminhtml/layout/cms_page_new.xml | 2 +- .../layout/cms_wysiwyg_images_contents.xml | 2 +- .../layout/cms_wysiwyg_images_index.xml | 2 +- .../layout/cms_index_defaultindex.xml | 2 +- .../layout/cms_index_defaultnoroute.xml | 2 +- .../view/frontend/layout/cms_index_index.xml | 2 +- .../frontend/layout/cms_index_nocookies.xml | 2 +- .../frontend/layout/cms_index_noroute.xml | 2 +- .../view/frontend/layout/cms_page_view.xml | 2 +- .../Cms/view/frontend/layout/default.xml | 2 +- .../Cms/view/frontend/layout/print.xml | 2 +- app/code/Magento/CmsUrlRewrite/composer.json | 8 +- .../ConfigurableImportExport/composer.json | 14 +- .../Magento/ConfigurableProduct/composer.json | 28 +- .../Magento/ConfigurableProduct/etc/di.xml | 2 +- .../layout/catalog_product_attribute_edit.xml | 2 +- ...bute_edit_product_tab_variations_popup.xml | 2 +- .../layout/catalog_product_configurable.xml | 2 +- .../layout/catalog_product_downloadable.xml | 2 +- ...talog_product_generatevariations_index.xml | 2 +- .../adminhtml/layout/catalog_product_new.xml | 2 +- .../layout/catalog_product_set_edit.xml | 2 +- .../layout/catalog_product_simple.xml | 2 +- .../catalog_product_superconfig_config.xml | 2 +- .../catalog_product_superconfig_index.xml | 2 +- ...catalog_product_view_type_configurable.xml | 2 +- .../layout/catalog_product_virtual.xml | 2 +- .../catalog/product/edit/super/config.phtml | 12 +- .../product/configurable/stock/disabler.phtml | 4 +- ...catalog_product_view_type_configurable.xml | 4 +- ...ckout_cart_configure_type_configurable.xml | 2 +- .../layout/checkout_cart_item_renderers.xml | 2 +- .../checkout_cart_sidebar_item_renderers.xml | 2 +- ...checkout_onepage_review_item_renderers.xml | 2 +- app/code/Magento/Contact/composer.json | 12 +- .../frontend/layout/contact_index_index.xml | 2 +- .../Contact/view/frontend/layout/default.xml | 2 +- app/code/Magento/Core/Model/Layout/Merge.php | 9 + .../Core/Model/Layout/Update/Validator.php | 34 +- .../TemplateEngine/Decorator/DebugHints.php | 4 +- app/code/Magento/Core/Model/View/Design.php | 14 +- app/code/Magento/Core/composer.json | 16 +- app/code/Magento/Core/etc/di.xml | 74 + app/code/Magento/Cron/composer.json | 8 +- app/code/Magento/CurrencySymbol/composer.json | 14 +- .../adminhtml_system_currencysymbol_index.xml | 2 +- .../Block/Account/Dashboard/Hello.php | 78 - .../Block/Adminhtml/Edit/Tab/Account.php | 7 +- .../Sales/Order/Address/Form/Renderer/Vat.php | 23 +- .../Magento/Customer/Block/Widget/Dob.php | 61 + .../Magento/Customer/Controller/Account.php | 136 +- .../Customer/Controller/Account/Confirm.php | 116 +- .../Controller/Account/Confirmation.php | 42 +- .../Customer/Controller/Account/Create.php | 39 +- .../Controller/Account/CreatePassword.php | 23 +- .../Controller/Account/CreatePost.php | 248 +- .../Customer/Controller/Account/Edit.php | 41 +- .../Customer/Controller/Account/EditPost.php | 88 +- .../Controller/Account/ForgotPasswordPost.php | 38 +- .../Customer/Controller/Account/LoginPost.php | 101 +- .../Controller/Account/ResetPasswordPost.php | 23 +- app/code/Magento/Customer/Helper/Data.php | 11 +- app/code/Magento/Customer/Model/Customer.php | 6 +- app/code/Magento/Customer/Model/Group.php | 9 +- .../Service/V1/CustomerGroupService.php | 2 +- .../V1/CustomerGroupServiceInterface.php | 2 + app/code/Magento/Customer/composer.json | 36 +- .../adminhtml/layout/customer_group_index.xml | 2 +- .../adminhtml/layout/customer_index_cart.xml | 2 +- .../adminhtml/layout/customer_index_carts.xml | 2 +- .../adminhtml/layout/customer_index_edit.xml | 2 +- .../adminhtml/layout/customer_index_grid.xml | 2 +- .../layout/customer_index_grid_block.xml | 2 +- .../adminhtml/layout/customer_index_index.xml | 2 +- .../layout/customer_index_lastorders.xml | 2 +- .../layout/customer_index_newsletter.xml | 2 +- .../layout/customer_index_orders.xml | 2 +- .../layout/customer_index_productreviews.xml | 2 +- .../layout/customer_index_viewcart.xml | 2 +- .../layout/customer_index_viewwishlist.xml | 2 +- .../view/frontend/layout/customer_account.xml | 2 +- .../layout/customer_account_confirmation.xml | 2 +- .../layout/customer_account_create.xml | 2 +- .../customer_account_createpassword.xml | 2 +- .../frontend/layout/customer_account_edit.xml | 2 +- .../customer_account_forgotpassword.xml | 2 +- .../layout/customer_account_index.xml | 3 +- .../layout/customer_account_login.xml | 2 +- .../layout/customer_account_logoutsuccess.xml | 2 +- .../frontend/layout/customer_address_form.xml | 2 +- .../layout/customer_address_index.xml | 2 +- .../Customer/view/frontend/layout/default.xml | 2 +- .../view/frontend/templates/widget/dob.phtml | 39 +- .../CustomerImportExport/composer.json | 16 +- ...customer_import_export_index_exportcsv.xml | 2 +- ...customer_import_export_index_exportxml.xml | 2 +- .../layout/customer_index_grid_block.xml | 2 +- app/code/Magento/DesignEditor/composer.json | 14 +- ...ml_system_design_editor_files_contents.xml | 2 +- ...nhtml_system_design_editor_files_index.xml | 2 +- ...tml_system_design_editor_firstentrance.xml | 2 +- .../adminhtml_system_design_editor_index.xml | 2 +- .../adminhtml_system_design_editor_launch.xml | 2 +- ...tml_system_design_editor_loadthemelist.xml | 2 +- app/code/Magento/Dhl/composer.json | 22 +- app/code/Magento/Directory/composer.json | 10 +- .../frontend/layout/catalog_category_view.xml | 2 +- .../layout/catalogsearch_advanced_index.xml | 2 +- .../layout/catalogsearch_advanced_result.xml | 2 +- .../layout/catalogsearch_result_index.xml | 2 +- .../view/frontend/layout/default.xml | 2 +- app/code/Magento/Downloadable/composer.json | 34 +- .../layout/catalog_product_downloadable.xml | 2 +- .../layout/catalog_product_simple.xml | 2 +- ...catalog_product_view_type_downloadable.xml | 2 +- .../layout/catalog_product_virtual.xml | 2 +- .../layout/customer_index_wishlist.xml | 2 +- .../layout/sales_order_creditmemo_new.xml | 2 +- .../sales_order_creditmemo_updateqty.xml | 2 +- .../layout/sales_order_creditmemo_view.xml | 2 +- .../layout/sales_order_invoice_new.xml | 2 +- .../layout/sales_order_invoice_updateqty.xml | 2 +- .../layout/sales_order_invoice_view.xml | 2 +- .../adminhtml/layout/sales_order_view.xml | 2 +- ...catalog_product_view_type_downloadable.xml | 19 +- ...ckout_cart_configure_type_downloadable.xml | 2 +- .../layout/checkout_cart_item_renderers.xml | 2 +- .../checkout_cart_sidebar_item_renderers.xml | 2 +- ...checkout_onepage_review_item_renderers.xml | 2 +- .../layout/checkout_onepage_success.xml | 2 +- .../view/frontend/layout/customer_account.xml | 2 +- .../layout/downloadable_customer_products.xml | 2 +- .../layout/multishipping_checkout_success.xml | 2 +- ...sales_email_order_creditmemo_renderers.xml | 2 +- .../sales_email_order_invoice_renderers.xml | 2 +- .../layout/sales_email_order_renderers.xml | 2 +- .../sales_order_creditmemo_renderers.xml | 2 +- .../layout/sales_order_invoice_renderers.xml | 2 +- .../layout/sales_order_item_renderers.xml | 2 +- ...sales_order_print_creditmemo_renderers.xml | 2 +- .../sales_order_print_invoice_renderers.xml | 2 +- .../layout/sales_order_print_renderers.xml | 2 +- app/code/Magento/Eav/composer.json | 12 +- app/code/Magento/Email/composer.json | 12 +- .../layout/adminhtml_email_template_edit.xml | 2 +- .../layout/adminhtml_email_template_grid.xml | 2 +- .../adminhtml_email_template_grid_block.xml | 2 +- .../layout/adminhtml_email_template_index.xml | 2 +- .../view/adminhtml/layout/systemPreview.xml | 2 +- app/code/Magento/Fedex/composer.json | 18 +- app/code/Magento/GiftMessage/composer.json | 22 +- .../layout/sales_order_create_index.xml | 2 +- .../sales_order_create_load_block_data.xml | 2 +- .../sales_order_create_load_block_items.xml | 2 +- .../adminhtml/layout/sales_order_view.xml | 2 +- .../view/frontend/templates/inline.phtml | 36 +- app/code/Magento/GoogleAdwords/composer.json | 8 +- .../layout/checkout_onepage_success.xml | 2 +- .../Magento/GoogleAnalytics/composer.json | 8 +- .../view/frontend/layout/default.xml | 4 +- .../Magento/GoogleOptimizer/composer.json | 14 +- .../layout/adminhtml_cms_page_edit.xml | 2 +- .../adminhtml/layout/catalog_product_new.xml | 2 +- .../frontend/layout/catalog_category_view.xml | 2 +- .../frontend/layout/catalog_product_view.xml | 2 +- .../view/frontend/layout/cms_page_view.xml | 2 +- app/code/Magento/GoogleShopping/composer.json | 20 +- .../adminhtml_googleshopping_items_index.xml | 2 +- .../adminhtml_googleshopping_types_block.xml | 2 +- .../adminhtml_googleshopping_types_grid.xml | 2 +- .../adminhtml_googleshopping_types_index.xml | 2 +- .../view/frontend/layout/cms_index_index.xml | 2 +- .../Magento/GroupedImportExport/composer.json | 14 +- app/code/Magento/GroupedProduct/composer.json | 24 +- .../layout/catalog_product_grouped.xml | 2 +- .../adminhtml/layout/catalog_product_new.xml | 2 +- .../catalog_product_view_type_grouped.xml | 2 +- .../layout/groupedproduct_edit_popup.xml | 2 +- .../layout/groupedproduct_popup_grid.xml | 2 +- .../layout/sales_order_creditmemo_new.xml | 2 +- .../sales_order_creditmemo_updateqty.xml | 2 +- .../layout/sales_order_creditmemo_view.xml | 2 +- .../layout/sales_order_invoice_new.xml | 2 +- .../layout/sales_order_invoice_updateqty.xml | 2 +- .../layout/sales_order_invoice_view.xml | 2 +- .../adminhtml/layout/sales_order_view.xml | 2 +- .../templates/product/stock/disabler.phtml | 3 +- .../base/layout/catalog_product_prices.xml | 2 +- ...catalog_product_rss_feed_renderer_list.xml | 2 +- .../catalog_product_view_type_grouped.xml | 5 +- .../layout/checkout_cart_item_renderers.xml | 2 +- .../checkout_cart_sidebar_item_renderers.xml | 2 +- ...checkout_onepage_review_item_renderers.xml | 2 +- ...sales_email_order_creditmemo_renderers.xml | 2 +- .../sales_email_order_invoice_renderers.xml | 2 +- .../layout/sales_email_order_renderers.xml | 2 +- .../frontend/layout/sales_guest_invoice.xml | 2 +- .../sales_order_creditmemo_renderers.xml | 2 +- .../layout/sales_order_invoice_renderers.xml | 2 +- .../layout/sales_order_item_renderers.xml | 2 +- ...sales_order_print_creditmemo_renderers.xml | 2 +- .../sales_order_print_invoice_renderers.xml | 2 +- .../layout/sales_order_print_renderers.xml | 2 +- app/code/Magento/ImportExport/composer.json | 14 +- .../layout/adminhtml_export_getfilter.xml | 2 +- .../layout/adminhtml_export_index.xml | 2 +- .../layout/adminhtml_import_busy.xml | 2 +- .../layout/adminhtml_import_index.xml | 2 +- .../layout/adminhtml_import_start.xml | 2 +- .../layout/adminhtml_import_validate.xml | 2 +- app/code/Magento/Indexer/composer.json | 8 +- .../adminhtml/layout/indexer_indexer_list.xml | 4 +- .../layout/indexer_indexer_list_grid.xml | 2 +- app/code/Magento/Install/Block/Begin.php | 87 - app/code/Magento/Install/Model/Installer.php | 2 +- app/code/Magento/Install/composer.json | 14 +- app/code/Magento/Install/etc/di.xml | 6 - .../Install/view/adminhtml/layout/default.xml | 2 +- .../view/install/layout/install_wizard.xml | 2 +- .../install/layout/install_wizard_config.xml | 2 +- .../view/install/templates/begin.phtml | 63 - app/code/Magento/Integration/composer.json | 16 +- .../layout/adminhtml_integration_edit.xml | 2 +- .../layout/adminhtml_integration_grid.xml | 2 +- .../adminhtml_integration_grid_block.xml | 2 +- .../layout/adminhtml_integration_index.xml | 2 +- .../layout/adminhtml_integration_new.xml | 2 +- ...dminhtml_integration_permissionsdialog.xml | 2 +- .../adminhtml_integration_tokensdialog.xml | 2 +- .../adminhtml_integration_tokensexchange.xml | 2 +- .../Magento/LayeredNavigation/composer.json | 8 +- .../view/frontend/layout/1column.xml | 2 +- .../view/frontend/layout/2columns-left.xml | 2 +- .../view/frontend/layout/2columns-right.xml | 2 +- .../view/frontend/layout/3columns.xml | 2 +- .../catalog_category_view_type_layered.xml | 2 +- ...ory_view_type_layered_without_children.xml | 2 +- .../layout/catalogsearch_advanced_result.xml | 2 +- .../layout/catalogsearch_result_index.xml | 2 +- .../view/frontend/layout/page_empty.xml | 2 +- app/code/Magento/Log/composer.json | 14 +- .../adminhtml/layout/customer_index_edit.xml | 2 +- .../adminhtml/layout/visitor_online_index.xml | 2 +- app/code/Magento/Msrp/composer.json | 24 +- .../base/layout/catalog_product_prices.xml | 2 +- .../base/templates/product/price/msrp.phtml | 38 +- .../frontend/layout/catalog_category_view.xml | 2 +- .../layout/catalog_product_compare_index.xml | 2 +- .../frontend/layout/catalog_product_view.xml | 2 +- ...catalog_product_view_type_downloadable.xml | 2 +- .../layout/catalogsearch_advanced_result.xml | 2 +- .../layout/catalogsearch_result_index.xml | 2 +- .../frontend/layout/checkout_cart_index.xml | 2 +- .../layout/checkout_onepage_failure.xml | 2 +- .../layout/checkout_onepage_success.xml | 2 +- .../Msrp/view/frontend/layout/default.xml | 2 +- .../Msrp/view/frontend/layout/msrp_popup.xml | 2 +- .../frontend/layout/review_product_list.xml | 2 +- ...list_index_configure_type_downloadable.xml | 2 +- .../frontend/layout/wishlist_index_index.xml | 2 +- .../frontend/layout/wishlist_search_view.xml | 2 +- .../frontend/layout/wishlist_shared_index.xml | 2 +- .../Multishipping/Block/Checkout/Overview.php | 17 +- app/code/Magento/Multishipping/composer.json | 20 +- .../frontend/layout/checkout_cart_index.xml | 2 +- .../layout/multishipping_checkout.xml | 2 +- ...ishipping_checkout_address_editaddress.xml | 2 +- ...ishipping_checkout_address_editbilling.xml | 2 +- ...shipping_checkout_address_editshipping.xml | 2 +- ...tishipping_checkout_address_newbilling.xml | 2 +- ...ishipping_checkout_address_newshipping.xml | 2 +- .../multishipping_checkout_address_select.xml | 2 +- ...hipping_checkout_address_selectbilling.xml | 2 +- .../multishipping_checkout_addresses.xml | 2 +- .../layout/multishipping_checkout_billing.xml | 2 +- ...ultishipping_checkout_customer_address.xml | 2 +- .../layout/multishipping_checkout_login.xml | 2 +- .../multishipping_checkout_overview.xml | 2 +- .../multishipping_checkout_register.xml | 2 +- .../multishipping_checkout_shipping.xml | 4 +- .../layout/multishipping_checkout_success.xml | 2 +- .../templates/checkout/address/select.phtml | 42 +- .../templates/checkout/addresses.phtml | 14 +- .../frontend/templates/checkout/billing.phtml | 78 +- .../templates/checkout/billing/items.phtml | 48 +- .../templates/checkout/item/default.phtml | 6 +- .../templates/checkout/overview.phtml | 198 +- .../templates/checkout/overview/item.phtml | 1 - .../templates/checkout/shipping.phtml | 109 +- app/code/Magento/Newsletter/composer.json | 22 +- .../layout/newsletter_problem_block.xml | 2 +- .../layout/newsletter_problem_grid.xml | 2 +- .../layout/newsletter_problem_index.xml | 2 +- .../layout/newsletter_queue_edit.xml | 2 +- .../layout/newsletter_queue_grid.xml | 2 +- .../layout/newsletter_queue_grid_block.xml | 2 +- .../layout/newsletter_queue_index.xml | 2 +- .../layout/newsletter_queue_preview.xml | 2 +- .../layout/newsletter_queue_preview_popup.xml | 2 +- .../layout/newsletter_subscriber_block.xml | 2 +- .../newsletter_subscriber_exportcsv.xml | 2 +- .../newsletter_subscriber_exportxml.xml | 2 +- .../layout/newsletter_subscriber_grid.xml | 2 +- .../layout/newsletter_subscriber_index.xml | 2 +- .../layout/newsletter_template_edit.xml | 2 +- .../layout/newsletter_template_preview.xml | 2 +- .../newsletter_template_preview_popup.xml | 2 +- .../view/adminhtml/layout/preview.xml | 2 +- .../view/frontend/layout/customer_account.xml | 2 +- .../view/frontend/layout/default.xml | 2 +- .../layout/newsletter_manage_index.xml | 2 +- .../Magento/OfflinePayments/composer.json | 6 +- .../Magento/OfflineShipping/composer.json | 20 +- app/code/Magento/Ogone/composer.json | 12 +- .../frontend/layout/ogone_api_paypage.xml | 2 +- .../frontend/layout/ogone_api_placeform.xml | 2 +- app/code/Magento/PageCache/composer.json | 8 +- .../layout/adminhtml_system_config_edit.xml | 2 +- .../view/frontend/layout/default.xml | 2 +- .../PayPalRecurringPayment/composer.json | 16 +- app/code/Magento/Payment/composer.json | 14 +- app/code/Magento/Paypal/composer.json | 30 +- .../layout/adminhtml_paypal_reports_block.xml | 2 +- .../layout/adminhtml_system_config_edit.xml | 2 +- .../adminhtml/layout/customer_index_edit.xml | 2 +- .../paypal_billing_agreement_customergrid.xml | 2 +- .../layout/paypal_billing_agreement_grid.xml | 2 +- .../layout/paypal_billing_agreement_index.xml | 2 +- .../paypal_billing_agreement_ordersgrid.xml | 2 +- .../layout/paypal_billing_agreement_view.xml | 2 +- .../layout/paypal_paypal_reports_grid.xml | 2 +- .../layout/paypal_paypal_reports_index.xml | 2 +- .../frontend/layout/catalog_category_view.xml | 2 +- .../frontend/layout/catalog_product_view.xml | 2 +- .../frontend/layout/checkout_cart_index.xml | 2 +- .../layout/checkout_onepage_index.xml | 2 +- .../layout/checkout_onepage_review.xml | 2 +- .../layout/checkout_onepage_success.xml | 2 +- .../view/frontend/layout/cms_index_index.xml | 2 +- .../view/frontend/layout/customer_account.xml | 2 +- .../layout/paypal_billing_agreement_index.xml | 2 +- .../layout/paypal_billing_agreement_view.xml | 2 +- .../frontend/layout/paypal_express_review.xml | 2 +- .../layout/paypal_express_review_details.xml | 2 +- .../layout/paypal_hostedpro_cancel.xml | 2 +- .../layout/paypal_payflow_cancelpayment.xml | 2 +- .../frontend/layout/paypal_payflow_form.xml | 2 +- .../layout/paypal_payflow_returnurl.xml | 2 +- .../paypal_payflowadvanced_cancelpayment.xml | 2 +- .../layout/paypal_payflowadvanced_form.xml | 2 +- .../paypal_payflowadvanced_returnurl.xml | 2 +- .../layout/paypal_payflowexpress_review.xml | 2 +- .../layout/paypal_standard_redirect.xml | 2 +- app/code/Magento/Persistent/composer.json | 16 +- .../layout/checkout_onepage_index.xml | 2 +- .../layout/customer_account_create.xml | 2 +- .../layout/customer_account_login.xml | 2 +- app/code/Magento/ProductAlert/composer.json | 12 +- .../frontend/layout/catalog_product_view.xml | 2 +- .../Magento/RecurringPayment/composer.json | 26 +- .../adminhtml/layout/customer_index_edit.xml | 2 +- .../sales_recurringpayment_customergrid.xml | 2 +- .../layout/sales_recurringpayment_grid.xml | 2 +- .../layout/sales_recurringpayment_index.xml | 2 +- .../layout/sales_recurringpayment_orders.xml | 2 +- .../layout/sales_recurringpayment_view.xml | 2 +- .../frontend/layout/catalog_product_view.xml | 2 +- .../layout/checkout_onepage_success.xml | 2 +- .../view/frontend/layout/customer_account.xml | 2 +- .../layout/sales_recurringpayment_index.xml | 2 +- .../layout/sales_recurringpayment_orders.xml | 2 +- .../layout/sales_recurringpayment_view.xml | 2 +- .../sales_recurringpayment_view__tabs.xml | 2 +- .../Adminhtml/Report/Product/Viewed.php | 35 +- app/code/Magento/Reports/composer.json | 36 +- .../layout/reports_index_exportsearchcsv.xml | 2 +- .../reports_index_exportsearchexcel.xml | 2 +- .../adminhtml/layout/reports_index_search.xml | 2 +- .../layout/reports_index_search_block.xml | 4 +- .../reports_report_customer_accounts.xml | 2 +- .../reports_report_customer_accounts_grid.xml | 2 +- ...orts_report_customer_exportaccountscsv.xml | 2 +- ...ts_report_customer_exportaccountsexcel.xml | 2 +- ...eports_report_customer_exportorderscsv.xml | 2 +- ...orts_report_customer_exportordersexcel.xml | 2 +- ...eports_report_customer_exporttotalscsv.xml | 2 +- ...orts_report_customer_exporttotalsexcel.xml | 2 +- .../layout/reports_report_customer_orders.xml | 2 +- .../reports_report_customer_orders_grid.xml | 2 +- .../layout/reports_report_customer_totals.xml | 2 +- .../reports_report_customer_totals_grid.xml | 2 +- .../adminhtml/layout/reports_report_grid.xml | 2 +- .../reports_report_product_downloads.xml | 2 +- ...ports_report_product_exportlowstockcsv.xml | 2 +- ...rts_report_product_exportlowstockexcel.xml | 2 +- .../reports_report_product_exportsoldcsv.xml | 2 +- ...reports_report_product_exportsoldexcel.xml | 2 +- .../reports_report_product_lowstock.xml | 2 +- .../reports_report_product_lowstock_grid.xml | 2 +- .../layout/reports_report_product_sold.xml | 2 +- .../reports_report_product_sold_grid.xml | 2 +- .../layout/reports_report_product_viewed.xml | 2 +- .../layout/reports_report_review_customer.xml | 2 +- .../reports_report_review_customer_grid.xml | 2 +- ...eports_report_review_exportcustomercsv.xml | 2 +- ...orts_report_review_exportcustomerexcel.xml | 2 +- ...reports_report_review_exportproductcsv.xml | 2 +- ...ports_report_review_exportproductexcel.xml | 2 +- .../layout/reports_report_review_product.xml | 2 +- .../reports_report_review_product_grid.xml | 2 +- .../reports_report_sales_bestsellers.xml | 2 +- .../layout/reports_report_sales_coupons.xml | 2 +- .../layout/reports_report_sales_invoiced.xml | 2 +- .../layout/reports_report_sales_refunded.xml | 2 +- .../layout/reports_report_sales_sales.xml | 2 +- .../layout/reports_report_sales_shipping.xml | 2 +- .../layout/reports_report_sales_tax.xml | 2 +- .../reports_report_shopcart_abandoned.xml | 2 +- .../reports_report_statistics_index.xml | 2 +- .../view/adminhtml/layout/reports_sales.xml | 2 +- .../Reports/view/frontend/layout/default.xml | 2 +- .../Reports/view/frontend/layout/print.xml | 2 +- app/code/Magento/RequireJs/composer.json | 4 +- app/code/Magento/Review/composer.json | 22 +- .../adminhtml/layout/catalog_product_new.xml | 2 +- .../view/adminhtml/layout/rating_block.xml | 2 +- .../adminhtml/layout/review_product_edit.xml | 2 +- .../adminhtml/layout/review_product_index.xml | 2 +- .../layout/review_product_reviews_grid.xml | 2 +- .../adminhtml/layout/review_rating_edit.xml | 2 +- .../adminhtml/layout/review_rating_index.xml | 2 +- .../frontend/layout/catalog_product_view.xml | 2 +- .../view/frontend/layout/customer_account.xml | 2 +- .../layout/customer_account_index.xml | 2 +- .../frontend/layout/review_customer_index.xml | 2 +- .../frontend/layout/review_customer_view.xml | 2 +- .../frontend/layout/review_product_list.xml | 2 +- .../layout/review_product_listajax.xml | 2 +- .../frontend/layout/review_product_view.xml | 2 +- app/code/Magento/Rss/composer.json | 8 +- .../Rss/view/frontend/layout/default.xml | 2 +- .../view/frontend/layout/rss_index_index.xml | 2 +- app/code/Magento/Rule/composer.json | 12 +- .../Sales/Block/Adminhtml/Order/View/Info.php | 9 +- app/code/Magento/Sales/Model/Order.php | 23 +- .../Magento/Sales/Model/Order/Creditmemo.php | 15 + .../Sales/Model/Order/Creditmemo/Item.php | 6 +- .../Model/Order/Creditmemo/Total/Tax.php | 37 +- .../Sales/Model/Order/Invoice/Total/Tax.php | 2 +- .../Resource/Order/Customer/Collection.php | 7 + .../Magento/Sales/Model/Service/Quote.php | 7 +- app/code/Magento/Sales/composer.json | 44 +- .../layout/sales_creditmemo_exportcsv.xml | 2 +- .../layout/sales_creditmemo_exportexcel.xml | 2 +- .../layout/sales_creditmemo_grid.xml | 2 +- .../layout/sales_creditmemo_grid_block.xml | 2 +- .../layout/sales_creditmemo_index.xml | 2 +- .../layout/sales_creditmemo_item_price.xml | 2 +- .../layout/sales_invoice_exportcsv.xml | 2 +- .../layout/sales_invoice_exportexcel.xml | 2 +- .../adminhtml/layout/sales_invoice_grid.xml | 2 +- .../layout/sales_invoice_grid_block.xml | 2 +- .../adminhtml/layout/sales_invoice_index.xml | 2 +- .../layout/sales_invoice_item_price.xml | 2 +- .../layout/sales_order_addcomment.xml | 2 +- .../adminhtml/layout/sales_order_address.xml | 2 +- .../sales_order_create_customer_block.xml | 9 +- .../layout/sales_order_create_index.xml | 2 +- .../layout/sales_order_create_item_price.xml | 2 +- ...rder_create_load_block_billing_address.xml | 2 +- ...order_create_load_block_billing_method.xml | 2 +- .../sales_order_create_load_block_comment.xml | 2 +- ..._order_create_load_block_customer_grid.xml | 2 +- .../sales_order_create_load_block_data.xml | 2 +- ...s_order_create_load_block_form_account.xml | 2 +- ...es_order_create_load_block_giftmessage.xml | 2 +- .../sales_order_create_load_block_header.xml | 2 +- .../sales_order_create_load_block_items.xml | 2 +- .../sales_order_create_load_block_json.xml | 2 +- .../sales_order_create_load_block_message.xml | 2 +- ...les_order_create_load_block_newsletter.xml | 2 +- .../sales_order_create_load_block_plain.xml | 2 +- .../sales_order_create_load_block_search.xml | 2 +- ...es_order_create_load_block_search_grid.xml | 2 +- ...der_create_load_block_shipping_address.xml | 2 +- ...rder_create_load_block_shipping_method.xml | 2 +- .../sales_order_create_load_block_sidebar.xml | 2 +- ...s_order_create_load_block_sidebar_cart.xml | 2 +- ...der_create_load_block_sidebar_compared.xml | 2 +- ...er_create_load_block_sidebar_pcompared.xml | 2 +- ...rder_create_load_block_sidebar_pviewed.xml | 2 +- ...rder_create_load_block_sidebar_reorder.xml | 2 +- ...order_create_load_block_sidebar_viewed.xml | 2 +- ...der_create_load_block_sidebar_wishlist.xml | 2 +- .../sales_order_create_load_block_totals.xml | 2 +- .../sales_order_creditmemo_addcomment.xml | 2 +- .../sales_order_creditmemo_grid_block.xml | 2 +- .../layout/sales_order_creditmemo_new.xml | 2 +- .../sales_order_creditmemo_updateqty.xml | 2 +- .../layout/sales_order_creditmemo_view.xml | 2 +- .../layout/sales_order_creditmemos.xml | 2 +- .../layout/sales_order_edit_index.xml | 2 +- .../layout/sales_order_exportcsv.xml | 2 +- .../layout/sales_order_exportexcel.xml | 2 +- .../adminhtml/layout/sales_order_grid.xml | 2 +- .../layout/sales_order_grid_block.xml | 2 +- .../adminhtml/layout/sales_order_index.xml | 2 +- .../layout/sales_order_invoice_addcomment.xml | 2 +- .../layout/sales_order_invoice_grid_block.xml | 2 +- .../layout/sales_order_invoice_new.xml | 2 +- .../layout/sales_order_invoice_updateqty.xml | 2 +- .../layout/sales_order_invoice_view.xml | 2 +- .../adminhtml/layout/sales_order_invoices.xml | 2 +- .../layout/sales_order_item_price.xml | 2 +- .../sales_order_shipment_grid_block.xml | 2 +- .../layout/sales_order_shipments.xml | 2 +- .../layout/sales_order_status_assign.xml | 2 +- .../layout/sales_order_status_edit.xml | 2 +- .../layout/sales_order_status_index.xml | 2 +- .../layout/sales_order_status_new.xml | 2 +- .../layout/sales_order_transactions.xml | 2 +- .../sales_order_transactions_grid_block.xml | 2 +- .../adminhtml/layout/sales_order_view.xml | 2 +- .../layout/sales_shipment_exportcsv.xml | 2 +- .../layout/sales_shipment_exportexcel.xml | 2 +- .../layout/sales_shipment_grid_block.xml | 2 +- .../adminhtml/layout/sales_shipment_index.xml | 2 +- .../layout/sales_transaction_child_block.xml | 2 +- .../layout/sales_transactions_grid.xml | 2 +- .../layout/sales_transactions_grid_block.xml | 2 +- .../layout/sales_transactions_index.xml | 2 +- .../layout/sales_transactions_view.xml | 2 +- .../adminhtml/web/order/create/scripts.js | 87 +- .../layout/checkout_onepage_index.xml | 2 +- .../view/frontend/layout/customer_account.xml | 2 +- .../layout/customer_account_index.xml | 2 +- .../Sales/view/frontend/layout/default.xml | 2 +- .../layout/sales_email_item_price.xml | 2 +- .../sales_email_order_creditmemo_items.xml | 2 +- ...sales_email_order_creditmemo_renderers.xml | 2 +- .../sales_email_order_invoice_items.xml | 2 +- .../sales_email_order_invoice_renderers.xml | 2 +- .../layout/sales_email_order_items.xml | 2 +- .../layout/sales_email_order_renderers.xml | 2 +- .../sales_email_order_shipment_items.xml | 2 +- .../sales_email_order_shipment_renderers.xml | 2 +- .../layout/sales_guest_creditmemo.xml | 2 +- .../view/frontend/layout/sales_guest_form.xml | 2 +- .../frontend/layout/sales_guest_invoice.xml | 2 +- .../frontend/layout/sales_guest_print.xml | 2 +- .../layout/sales_guest_printcreditmemo.xml | 2 +- .../layout/sales_guest_printinvoice.xml | 2 +- .../layout/sales_guest_printshipment.xml | 2 +- .../frontend/layout/sales_guest_reorder.xml | 2 +- .../frontend/layout/sales_guest_shipment.xml | 2 +- .../view/frontend/layout/sales_guest_view.xml | 2 +- .../layout/sales_order_creditmemo.xml | 2 +- .../sales_order_creditmemo_renderers.xml | 2 +- .../layout/sales_order_guest_info_links.xml | 2 +- .../frontend/layout/sales_order_history.xml | 2 +- .../layout/sales_order_info_links.xml | 2 +- .../frontend/layout/sales_order_invoice.xml | 2 +- .../layout/sales_order_invoice_renderers.xml | 2 +- .../layout/sales_order_item_price.xml | 2 +- .../layout/sales_order_item_renderers.xml | 2 +- .../frontend/layout/sales_order_print.xml | 2 +- ...sales_order_print_creditmemo_renderers.xml | 2 +- .../sales_order_print_invoice_renderers.xml | 2 +- .../layout/sales_order_print_renderers.xml | 2 +- .../sales_order_print_shipment_renderers.xml | 2 +- .../layout/sales_order_printcreditmemo.xml | 2 +- .../layout/sales_order_printinvoice.xml | 2 +- .../layout/sales_order_printshipment.xml | 2 +- .../frontend/layout/sales_order_reorder.xml | 2 +- .../frontend/layout/sales_order_shipment.xml | 2 +- .../layout/sales_order_shipment_renderers.xml | 2 +- .../view/frontend/layout/sales_order_view.xml | 2 +- app/code/Magento/SalesRule/composer.json | 34 +- .../sales_rule_promo_quote_couponsgrid.xml | 2 +- .../layout/sales_rule_promo_quote_edit.xml | 2 +- .../layout/sales_rule_promo_quote_index.xml | 2 +- .../Block/Adminhtml/Dashboard}/Last.php | 22 +- .../Block/Adminhtml/Dashboard}/Top.php | 22 +- .../Block/Adminhtml/Term.php} | 11 +- .../Block/Adminhtml/Term}/Edit.php | 7 +- .../Block/Adminhtml/Term}/Edit/Form.php | 8 +- .../Magento/Search/Block/Recommendations.php | 7 +- app/code/Magento/Search/Block/SearchData.php | 105 + .../Search/Block/SearchDataInterface.php | 50 + app/code/Magento/Search/Block/Suggestions.php | 28 + .../{CatalogSearch => Search}/Block/Term.php | 8 +- .../Controller/Adminhtml/Term.php} | 8 +- .../Controller/Adminhtml/Term}/Delete.php | 12 +- .../Controller/Adminhtml/Term}/Edit.php | 14 +- .../Controller/Adminhtml/Term}/Index.php | 6 +- .../Controller/Adminhtml/Term}/MassDelete.php | 8 +- .../Controller/Adminhtml/Term}/NewAction.php | 4 +- .../Controller/Adminhtml/Term}/Save.php | 13 +- .../Controller/Ajax/Suggest.php | 4 +- .../Controller/Term/Popular.php | 2 +- app/code/Magento/Search/Helper/Data.php | 385 + .../{CatalogSearch => Search}/Model/Query.php | 70 +- .../Magento/Search/Model/QueryFactory.php | 160 + .../Search/Model/QueryFactoryInterface.php | 33 + .../Magento/Search/Model/QueryInterface.php | 33 + app/code/Magento/Search/Model/QueryResult.php | 64 + .../Model/Resource/Helper.php | 6 +- .../Model/Resource/Query.php | 7 +- .../Model/Resource/Query/Collection.php | 21 +- .../Search/Model/SearchCollectionFactory.php | 67 + .../Model/SearchCollectionInterface.php | 37 + .../Search/Model/SearchDataProvider.php | 43 + .../Model/SearchDataProviderInterface.php | 40 + app/code/Magento/Search/composer.json | 22 + .../{CatalogSearch => Search}/etc/acl.xml | 2 +- .../etc/adminhtml/menu.xml | 2 +- .../etc/adminhtml/routes.xml} | 12 +- app/code/Magento/Search/etc/di.xml | 49 + .../etc/frontend/page_types.xml} | 10 +- .../Magento/Search/etc/frontend/routes.xml | 32 + app/code/Magento/Search/etc/module.xml | 38 + .../sql/search_setup/install-1.6.0.0.php | 119 + .../layout/adminhtml_dashboard_index.xml | 31 + .../adminhtml/layout/search_term_edit.xml} | 4 +- .../layout/search_term_grid_block.xml} | 8 +- .../adminhtml/layout/search_term_index.xml} | 6 +- .../Search/view/frontend/layout/default.xml | 38 + .../frontend/layout/search_term_popular.xml} | 4 +- .../view/frontend/templates/form.mini.phtml | 14 +- .../view/frontend/templates/search_data.phtml | 46 + .../view/frontend/web/form-mini.js | 2 +- app/code/Magento/Sendfriend/composer.json | 14 +- .../layout/sendfriend_product_send.xml | 2 +- app/code/Magento/Shipping/composer.json | 26 +- .../adminhtml_order_shipment_addcomment.xml | 2 +- .../adminhtml_order_shipment_addtrack.xml | 2 +- .../layout/adminhtml_order_shipment_new.xml | 2 +- .../adminhtml_order_shipment_removetrack.xml | 2 +- .../layout/adminhtml_order_shipment_view.xml | 2 +- .../layout/sales_order_invoice_new.xml | 2 +- .../adminhtml/layout/sales_order_view.xml | 2 +- .../frontend/layout/sales_guest_reorder.xml | 4 +- .../frontend/layout/sales_guest_shipment.xml | 2 +- .../view/frontend/layout/sales_guest_view.xml | 4 +- .../frontend/layout/sales_order_reorder.xml | 4 +- .../frontend/layout/sales_order_shipment.xml | 2 +- .../view/frontend/layout/sales_order_view.xml | 4 +- .../layout/shipping_tracking_popup.xml | 2 +- app/code/Magento/Sitemap/composer.json | 18 +- .../layout/adminhtml_sitemap_index.xml | 2 +- .../adminhtml_sitemap_index_grid_block.xml | 2 +- .../Model/Config/Processor/Placeholder.php | 4 +- app/code/Magento/Store/composer.json | 10 +- .../Store/view/base/layout/ui_components.xml | 2 +- app/code/Magento/Tax/Helper/Data.php | 10 +- .../AbstractAggregateCalculator.php | 37 +- .../Model/Calculation/AbstractCalculator.php | 2 +- app/code/Magento/Tax/README.md | 1 + app/code/Magento/Tax/composer.json | 28 +- .../layout/sales_creditmemo_item_price.xml | 2 +- .../layout/sales_invoice_item_price.xml | 2 +- .../layout/sales_order_create_item_price.xml | 2 +- .../layout/sales_order_item_price.xml | 2 +- .../view/adminhtml/layout/tax_rate_block.xml | 2 +- .../adminhtml/layout/tax_rate_exportcsv.xml | 2 +- .../adminhtml/layout/tax_rate_exportxml.xml | 2 +- .../view/adminhtml/layout/tax_rate_index.xml | 2 +- .../view/adminhtml/layout/tax_rule_block.xml | 2 +- .../view/adminhtml/layout/tax_rule_edit.xml | 2 +- .../view/adminhtml/layout/tax_rule_index.xml | 2 +- .../base/layout/catalog_product_prices.xml | 2 +- ...kout_cart_sidebar_item_price_renderers.xml | 2 +- .../checkout_cart_sidebar_total_renderers.xml | 2 +- .../layout/checkout_item_price_renderers.xml | 2 +- .../checkout_shipping_price_renderer.xml | 2 +- .../layout/sales_email_item_price.xml | 2 +- .../layout/sales_order_item_price.xml | 2 +- .../templates/checkout/grandtotal.phtml | 4 +- .../view/frontend/templates/order/tax.phtml | 44 +- .../Magento/TaxImportExport/composer.json | 12 +- .../view/adminhtml/layout/tax_rate_block.xml | 2 +- .../view/adminhtml/layout/tax_rule_edit.xml | 2 +- app/code/Magento/Theme/Block/Html/Header.php | 90 - .../Magento/Theme/Block/Html/Header/Logo.php | 139 + app/code/Magento/Theme/composer.json | 16 +- .../adminhtml_system_design_theme_block.xml | 2 +- .../adminhtml_system_design_theme_edit.xml | 2 +- .../adminhtml_system_design_theme_grid.xml | 2 +- .../adminhtml_system_design_theme_index.xml | 2 +- ...l_system_design_wysiwyg_files_contents.xml | 2 +- ...html_system_design_wysiwyg_files_index.xml | 2 +- .../{layout => page_layout}/admin-1column.xml | 2 +- .../admin-2columns-left.xml | 2 +- .../base/{layout => page_layout}/empty.xml | 2 +- .../Theme/view/frontend/layout/default.xml | 28 +- .../frontend/layout/default_head_blocks.xml | 2 +- .../view/frontend/layout/page_calendar.xml | 2 +- .../{layout => page_layout}/1column.xml | 2 +- .../{layout => page_layout}/2columns-left.xml | 2 +- .../2columns-right.xml | 2 +- .../{layout => page_layout}/3columns.xml | 2 +- .../view/frontend/templates/html/header.phtml | 16 +- .../templates/html/header/logo.phtml} | 22 +- .../view/frontend/templates/html/title.phtml | 2 +- app/code/Magento/Translation/composer.json | 10 +- app/code/Magento/Ui/composer.json | 8 +- .../Magento/Ui/view/base/layout/default.xml | 2 +- .../Ui/view/base/layout/ui_components.xml | 2 +- app/code/Magento/Ups/composer.json | 18 +- .../layout/adminhtml_system_config_edit.xml | 2 +- .../UrlRewrite/Block/Catalog/Edit/Form.php | 8 +- .../UrlRewrite/Block/Cms/Page/Edit/Form.php | 4 +- .../Magento/UrlRewrite/Block/Edit/Form.php | 37 +- ...ntityNotAssociatedWithWebsiteException.php | 28 + app/code/Magento/UrlRewrite/composer.json | 18 +- .../layout/adminhtml_url_rewrite_index.xml | 2 +- app/code/Magento/User/composer.json | 14 +- .../layout/adminhtml_auth_forgotpassword.xml | 2 +- .../adminhtml/layout/adminhtml_auth_login.xml | 2 +- .../layout/adminhtml_auth_resetpassword.xml | 2 +- .../adminhtml/layout/adminhtml_user_edit.xml | 2 +- .../layout/adminhtml_user_grid_block.xml | 2 +- .../adminhtml/layout/adminhtml_user_index.xml | 2 +- .../layout/adminhtml_user_role_editrole.xml | 2 +- .../adminhtml_user_role_editrolegrid.xml | 2 +- .../layout/adminhtml_user_role_grid_block.xml | 2 +- .../layout/adminhtml_user_role_index.xml | 2 +- .../layout/adminhtml_user_role_rolegrid.xml | 2 +- .../layout/adminhtml_user_rolegrid.xml | 2 +- .../layout/adminhtml_user_rolesgrid.xml | 2 +- app/code/Magento/Usps/composer.json | 18 +- app/code/Magento/Webapi/composer.json | 16 +- ...ntegration_activate_permissions_webapi.xml | 2 +- .../layout/adminhtml_integration_edit.xml | 2 +- app/code/Magento/Weee/Helper/Data.php | 149 + .../Weee/Model/Total/Creditmemo/Weee.php | 148 +- .../Magento/Weee/Model/Total/Invoice/Weee.php | 144 +- app/code/Magento/Weee/README.md | 1 + app/code/Magento/Weee/composer.json | 24 +- .../layout/sales_creditmemo_item_price.xml | 2 +- .../layout/sales_invoice_item_price.xml | 2 +- .../layout/sales_order_create_item_price.xml | 2 +- .../layout/sales_order_creditmemo_new.xml | 2 +- .../sales_order_creditmemo_updateqty.xml | 2 +- .../layout/sales_order_creditmemo_view.xml | 2 +- .../layout/sales_order_invoice_new.xml | 2 +- .../layout/sales_order_invoice_updateqty.xml | 2 +- .../layout/sales_order_invoice_view.xml | 2 +- .../layout/sales_order_item_price.xml | 2 +- .../adminhtml/layout/sales_order_view.xml | 2 +- .../base/layout/catalog_product_prices.xml | 2 +- ...kout_cart_sidebar_item_price_renderers.xml | 2 +- .../layout/checkout_item_price_renderers.xml | 2 +- .../Weee/view/frontend/layout/default.xml | 2 +- .../layout/sales_email_item_price.xml | 2 +- .../sales_email_order_creditmemo_items.xml | 2 +- .../sales_email_order_invoice_items.xml | 2 +- .../layout/sales_email_order_items.xml | 2 +- .../layout/sales_guest_creditmemo.xml | 2 +- .../frontend/layout/sales_guest_invoice.xml | 2 +- .../frontend/layout/sales_guest_print.xml | 2 +- .../layout/sales_guest_printcreditmemo.xml | 2 +- .../layout/sales_guest_printinvoice.xml | 2 +- .../view/frontend/layout/sales_guest_view.xml | 2 +- .../layout/sales_order_creditmemo.xml | 2 +- .../frontend/layout/sales_order_invoice.xml | 2 +- .../layout/sales_order_item_price.xml | 2 +- .../frontend/layout/sales_order_print.xml | 2 +- .../layout/sales_order_printcreditmemo.xml | 2 +- .../layout/sales_order_printinvoice.xml | 2 +- .../view/frontend/layout/sales_order_view.xml | 2 +- app/code/Magento/Widget/composer.json | 14 +- .../layout/adminhtml_widget_index.xml | 2 +- .../adminhtml_widget_instance_block.xml | 2 +- .../layout/adminhtml_widget_instance_edit.xml | 2 +- .../adminhtml_widget_instance_index.xml | 2 +- .../layout/adminhtml_widget_loadoptions.xml | 2 +- .../Widget/view/frontend/layout/default.xml | 2 +- .../Widget/view/frontend/layout/print.xml | 2 +- .../Magento/Wishlist/Block/Item/Configure.php | 2 +- app/code/Magento/Wishlist/Helper/Data.php | 2 +- app/code/Magento/Wishlist/composer.json | 32 +- .../layout/customer_index_wishlist.xml | 2 +- .../frontend/layout/catalog_category_view.xml | 2 +- .../frontend/layout/catalog_product_view.xml | 2 +- .../view/frontend/layout/customer_account.xml | 2 +- .../Wishlist/view/frontend/layout/default.xml | 2 +- .../layout/wishlist_index_configure.xml | 12 +- .../wishlist_index_configure_type_bundle.xml | 14 +- ...list_index_configure_type_configurable.xml | 4 +- ...list_index_configure_type_downloadable.xml | 22 +- .../wishlist_index_configure_type_grouped.xml | 5 +- .../wishlist_index_configure_type_simple.xml | 2 +- .../frontend/layout/wishlist_index_index.xml | 2 +- .../frontend/layout/wishlist_index_share.xml | 2 +- .../frontend/layout/wishlist_shared_index.xml | 2 +- .../view/frontend/web/js/add-to-wishlist.js | 4 +- .../Magento_Backend/layout/default.xml | 2 +- .../Magento_Core/web/css/source/module.less | 4 + .../adminhtml/Magento/backend/composer.json | 4 +- .../adminhtml/Magento/backend/theme.xml | 2 +- .../Magento_Bundle/web/css/source/module.less | 4 + .../layout/catalog_product_view.xml | 3 +- .../web/css/source/listings.less | 37 +- .../web/css/source/module.less | 23 +- .../layout/checkout_cart_index.xml | 2 +- .../layout/checkout_onepage_index.xml | 34 + .../Magento_Checkout/web/css/source/cart.less | 10 +- .../web/css/source/minicart.less | 151 +- .../web/css/source/module.less | 134 +- .../layout/customer_account.xml | 6 +- .../web/css/source/module.less | 24 + .../web/css/source/module.less | 39 + .../web/css/source/module.less | 158 +- .../layout/multishipping_checkout.xml | 33 + .../web/css/source/module.less | 388 +- .../Magento_Paypal/web/css/source/module.less | 2 +- .../Magento_Sales/web/css/source/module.less | 63 +- .../blank/Magento_Theme/layout/default.xml | 2 +- .../layout/default_head_blocks.xml | 2 +- .../Magento_Theme/web/css/source/module.less | 10 +- .../web/css/source/module.less | 1 + .../frontend/Magento/blank/composer.json | 4 +- app/design/frontend/Magento/blank/theme.xml | 2 +- .../blank/web/css/source/abstract.less | 85 +- .../frontend/Magento/plushe/composer.json | 6 +- app/design/frontend/Magento/plushe/theme.xml | 2 +- app/design/install/Magento/basic/theme.xml | 2 +- app/etc/di.xml | 10 +- app/i18n/magento/de_de/composer.json | 4 +- app/i18n/magento/en_us/composer.json | 4 +- app/i18n/magento/es_es/composer.json | 4 +- app/i18n/magento/fr_fr/composer.json | 4 +- app/i18n/magento/nl_nl/composer.json | 4 +- app/i18n/magento/pt_br/composer.json | 4 +- app/i18n/magento/zh_cn/composer.json | 4 +- composer.json | 10 +- dev/shell/cache.php | 75 + dev/shell/dependency.php | 402 + dev/tests/functional/.gitignore | 2 - .../Util/Generate/Factory/AbstractFactory.php | 19 +- .../Backend/Test/Block/Widget/Grid.php | 53 + .../Test/Block/Catalog/Product/View.php | 14 + .../Bundle/Test/Fixture/BundleProduct.php | 8 +- .../Bundle/Test/Fixture/BundleProduct.xml | 1 + .../Test/Fixture/BundleProduct/Price.php | 4 +- .../Magento/Bundle/Test/Fixture/Cart/Item.php | 4 +- .../CreateBundleProductEntityTest/test.csv | 8 +- .../Adminhtml/Category/Edit/PageActions.php | 55 + .../Product/Edit/Tab/AbstractRelated.php | 92 + .../Adminhtml/Product/Edit/Tab/Crosssell.php | 45 +- .../Product/Edit/Tab/Crosssell/Grid.php | 29 +- .../Adminhtml/Product/Edit/Tab/Related.php | 43 +- .../Product/Edit/Tab/Related/Grid.php | 47 +- .../Adminhtml/Product/Edit/Tab/Upsell.php | 45 +- .../Product/Edit/Tab/Upsell/Grid.php | 47 +- .../Block/Adminhtml/Product/ProductForm.php | 8 + .../Constraint/AssertCategoryRedirect.php | 72 + .../AssertCrossSellsProductsSection.php | 45 +- .../AssertNoCrossSellsProductsSection.php | 39 +- .../AssertNoRelatedProductsSection.php | 37 +- .../AssertNoUpSellsProductsSection.php | 37 +- .../Test/Constraint/AssertProductForm.php | 5 +- .../AssertRelatedProductsSection.php | 37 +- .../AssertUpSellsProductsSection.php | 37 +- .../Catalog/Test/Fixture/AssignProducts.php | 6 +- .../Catalog/Test/Fixture/Cart/Item.php | 6 +- .../Test/Fixture/CatalogProductSimple.php | 24 + .../Test/Fixture/CatalogProductSimple.xml | 12 + .../AbstractRelatedProducts.php | 135 + .../CatalogProductSimple/CheckoutData.php | 3 +- .../CrossSellProducts.php | 34 + .../CatalogProductSimple/UpSellProducts.php | 34 + .../Test/Fixture/CrosssellProducts.php | 11 +- .../Catalog/Test/Fixture/RelatedProducts.php | 6 +- .../Catalog/Test/Fixture/UpsellProducts.php | 8 +- .../Page/Adminhtml/CatalogCategoryEdit.xml | 2 +- .../UpdateCategoryEntityTest/test.csv | 4 +- .../Product/AddCrossSellEntityTest.php | 99 + .../Product/AddCrossSellEntityTest/test.csv | 2 + .../TestCase/Product/AddUpSellEntityTest.php | 148 + .../Product/AddUpSellEntityTest/test.csv | 3 + .../testCreate.csv | 38 +- .../testCreate.csv | 16 +- .../Magento/Catalog/Test/etc/constraint.xml | 3 + .../Test/Fixture/CatalogSearchQuery.xml | 4 +- .../TestCase/CreateSearchTermEntityTest.php | 1 - .../TestCase/EditSearchTermEntityTest.php | 1 - .../CatalogSearch/Test/etc/fixture.xml | 4 +- .../Checkout/Test/Block/Cart/Sidebar.php | 62 + .../Checkout/Test/Block/Cart/Sidebar/Item.php | 52 + .../AssertProductAbsentInMiniShoppingCart.php | 70 + ...AssertProductPresentInMiniShoppingCart.php | 71 + .../Checkout/Test/TestStep/PlaceOrderStep.php | 8 +- .../Magento/Checkout/Test/etc/constraint.xml | 6 + .../Fixture/ConfigurableProductInjectable.php | 14 +- .../Fixture/ConfigurableProductInjectable.xml | 7 + .../Test/TestStep/SetupConfigurationStep.php | 18 +- .../CreateOrderFromCustomerAccountStep.php | 61 + .../TestStep/LogoutCustomerOnFrontendStep.php | 64 + .../TestStep/OpenCustomerOnBackendStep.php | 72 + .../Product/Edit/Tab/Downloadable/Links.php | 13 +- .../Test/Block/Catalog/Product/View.php | 2 +- .../Test/Block/Catalog/Product/View/Links.php | 4 +- .../CheckoutData.php | 1 - .../DownloadableProductInjectable/Curl.php | 4 +- .../CreateDownloadableProductEntityTest.php | 3 +- ...CreateDownloadableProduct.csv => test.csv} | 30 +- .../UpdateDownloadableProductEntityTest.php | 3 +- ...UpdateDownloadableProduct.csv => test.csv} | 4 +- .../GiftMessage/Test/Block/Message/Inline.php | 105 + .../GiftMessage/Test/Block/Message/Inline.xml | 38 + .../Block/Message/Inline/GiftMessageForm.php | 36 + .../Block/Message/Inline/GiftMessageForm.xml | 38 + .../Test/Block/Message/Order/Items/View.php | 107 + .../Test/Block/Message/Order/View.php | 70 + .../AssertGiftMessageInFrontendOrder.php | 80 + .../AssertGiftMessageInFrontendOrderItems.php | 88 + .../GiftMessage/Test/Fixture/GiftMessage.php | 137 + .../GiftMessage/Test/Fixture/GiftMessage.xml | 81 + .../GiftMessage/Test/Page/CheckoutOnepage.xml | 21 +- .../GiftMessage/Test/Page/OrderView.xml | 39 + .../TestCase/CheckoutWithGiftMessagesTest.php | 159 + .../CheckoutWithGiftMessagesTest/test.csv | 3 + .../Test/TestStep/AddGiftMessageStep.php | 80 + .../GiftMessage/Test/etc/constraint.xml | 33 + .../Magento/GiftMessage/Test/etc/fixture.xml | 33 + .../Adminhtml/Sales/Orders/Viewed/Filter.php | 36 + .../Adminhtml/Sales/Orders/Viewed/Filter.xml | 54 + .../Sales/Orders/Viewed/FilterGrid.php | 102 + .../{Review/Products => }/Viewed/Action.php | 4 +- .../AbstractAssertSalesReportResult.php | 97 + .../AssertSalesReportIntervalResult.php | 72 + .../AssertSalesReportTotalResult.php | 72 + .../Test/Page/Adminhtml/ProductReportView.xml | 6 +- .../Test/Page/Adminhtml/SalesReport.xml | 49 + .../TestCase/SalesOrderReportEntityTest.php | 101 + .../SalesOrderReportEntityTest/test.csv | 4 + .../TestCase/SearchTermsReportEntityTest.php | 1 - .../Magento/Reports/Test/etc/constraint.xml | 6 + .../app/Magento/Reports/Test/etc/page.xml | 5 + .../Test/Block/Adminhtml/Rule/Edit/Form.php | 8 + .../Block/Adminhtml/Catalog/Category/Grid.php | 3 + .../AssertUrlRewriteCategoryInGrid.php | 70 + .../UrlRewrite/Test/etc/constraint.xml | 3 + .../Block/Customer/Wishlist/Items/Product.php | 35 + ...sertAddProductToWishlistSuccessMessage.php | 74 + .../AssertBundleProductDetailsInWishlist.php | 109 + ...ductIsPresentInCustomerBackendWishlist.php | 84 + .../AssertProductIsPresentInWishlist.php | 79 + .../AddProductToWishlistEntityTest.php | 187 + .../AddProductToWishlistEntityTest/test.csv | 8 + .../Magento/Wishlist/Test/etc/constraint.xml | 12 + .../functional/utils/generate/factory.php | 1 + .../Backend/Model/Session/AdminConfigTest.php | 2 +- .../Catalog/Controller/CategoryTest.php | 3 +- .../Model/Category/CategoryImageTest.php | 6 +- ...amTest.php => StubZendLogWriterStream.php} | 2 +- .../Filter/Price/AlgorithmAdvancedTest.php | 91 +- .../Layer/Filter/Price/AlgorithmBaseTest.php | 53 +- .../Magento/Catalog/_files/categories.php | 4 - .../_files/product_with_custom_options.csv | 2 + .../product_with_custom_options_new.csv | 2 + .../Magento/CatalogSearch/Block/TermTest.php | 4 +- .../Magento/CatalogSearch/Helper/DataTest.php | 26 +- .../Model/Indexer/FulltextTest.php | 9 +- .../Magento/CatalogSearch/_files/query.php | 4 +- .../CatalogUrlRewrite/_files/categories.php | 1 + .../_files/categories_with_products.php | 62 + .../Magento_Catalog/catalog_category_view.xml | 2 +- .../catalog_category_view_type_default.xml | 2 +- .../Magento_Catalog/catalog_product_view.xml | 2 +- .../catalog_product_view_type_simple.xml | 2 +- .../Magento_Cms/layout_test_handle_extra.xml | 2 +- .../Magento_Core/layout_test_handle_main.xml | 2 +- .../layout_test_handle_sample.xml | 2 +- .../Block/Account/Dashboard/HelloTest.php | 89 - .../Customer/Controller/AccountTest.php | 2 - .../Service/V1/CustomerGroupServiceTest.php | 7 +- .../Search/Adapter/Mysql/AdapterTest.php | 27 +- .../Framework/Search/_files/products.php | 10 +- .../Framework/Search/_files/requests.xml | 56 +- .../Search/_files/search_request.xml | 4 +- .../Search/_files/search_request_config.php | 1 + .../Magento/Framework/TranslateTest.php | 2 +- .../View/Layout/_files/_layout_update.xml | 2 +- .../Magento/Framework/View/Utility/Layout.php | 8 +- .../View/Utility/_files/layout/handle_one.xml | 2 +- .../Utility/_files/layout/handle_three.xml | 2 +- .../View/Utility/_files/layout/handle_two.xml | 2 +- .../Magento_Catalog/catalog_category_view.xml | 2 +- .../catalog_category_view_type_default.xml | 2 +- .../Magento_Catalog/catalog_product_view.xml | 2 +- .../catalog_product_view_type_simple.xml | 2 +- .../Magento_Cms/layout_test_handle_extra.xml | 2 +- .../Magento_Core/layout_test_handle_main.xml | 2 +- .../layout_test_handle_sample.xml | 2 +- .../View/_files/layout/cacheable.xml | 2 +- .../_files/layout/container_attributes.xml | 2 +- .../View/_files/layout/non_cacheable.xml | 2 +- .../action_for_anonymous_parent_block.xml | 2 +- .../layout_directives_test/arguments.xml | 2 +- .../arguments_complex_values.xml | 2 +- .../arguments_object_type.xml | 2 +- .../arguments_object_type_updaters.xml | 2 +- .../arguments_url_type.xml | 2 +- .../layout_directives_test/get_block.xml | 2 +- .../get_block_exception.xml | 2 +- .../_files/layout_directives_test/group.xml | 2 +- .../layout_directives_test/ifconfig.xml | 2 +- .../layout_directives_test/remove_broken.xml | 2 +- .../_files/layout_directives_test/render.xml | 2 +- .../sort_after_after.xml | 2 +- .../sort_after_previous.xml | 2 +- .../sort_before_after.xml | 2 +- .../sort_before_before.xml | 2 +- .../Multishipping/Controller/CheckoutTest.php | 3 +- .../Adminhtml/Report/Product/ViewedTest.php | 65 + .../Integrity/Modular/LayoutFilesTest.php | 4 +- .../Integrity/Modular/TemplateFilesTest.php | 4 +- .../ToolkitFramework/ApplicationTest.php | 112 + .../ToolkitFramework/_files/tax_rates.csv | 20 + .../Block/Catalog/Edit/FormTest.php | 46 +- .../Block/Cms/Page/Edit/FormTest.php | 10 +- .../child_page_with_inherited_containers.xml | 2 +- ...age_with_inherited_imported_containers.xml | 2 +- .../layout/child_page_with_own_containers.xml | 2 +- .../layout/child_page_without_containers.xml | 2 +- .../root_page_with_imported_containers.xml | 2 +- .../layout/root_page_with_own_containers.xml | 2 +- .../layout/root_page_without_containers.xml | 2 +- .../root_page_without_own_containers.xml | 2 +- .../mage/search/regular-search-test.js | 2 +- .../Magento/TestFramework/Utility/Files.php | 2 +- .../Dependency/_files/layout_handle.xml | 2 +- .../_files/layout_handle_parent.xml | 2 +- .../_files/layout_handle_update.xml | 2 +- .../Dependency/_files/layout_reference.xml | 2 +- .../Test/Integrity/ComposerLockTest.php | 41 +- .../Magento/Framework/Search/ConfigTest.php | 7 +- .../Framework/Search/_files/invalid.xml | 2 +- .../Search/_files/invalid_partial.xml | 6 +- .../Magento/Framework/Search/_files/valid.xml | 14 +- .../Framework/Search/_files/valid_partial.xml | 11 +- .../Magento/Test/Integrity/Xml/SchemaTest.php | 1 + .../_files/dependency_test/tables_ce.php | 2 +- .../Test/Legacy/_files/obsolete_classes.php | 30 +- .../Test/Legacy/_files/obsolete_constants.php | 3 + .../Test/Legacy/_files/obsolete_methods.php | 212 +- .../Legacy/_files/obsolete_properties.php | 18 + .../Test/Php/_files/blacklist/common.txt | 2 + .../Php/_files/phpcpd/blacklist/common.txt | 3 + .../Php/_files/phpcs/blacklist/common.txt | 2 + dev/tests/unit/filename | 0 dev/tests/unit/filename.csv | 0 dev/tests/unit/filename.invalid_type | 0 .../Widget/Grid/Column/Filter/StoreTest.php | 86 + .../Backend/Model/Session/AdminConfigTest.php | 27 +- .../Controller/Adminhtml/ProductTest.php | 1 + .../Category/Product/Plugin/ImportTest.php | 50 + .../Product/Category/Plugin/ImportTest.php | 50 + .../Layer/Search/CollectionFilterTest.php | 22 +- .../Model/Layer/Search/StateKeyTest.php | 22 +- .../Model/Layout/DepersonalizePluginTest.php | 154 + .../Model/Import/Product/Type/OptionTest.php | 11 +- .../_files/product_with_custom_options.csv | 21 +- .../CatalogSearch/Block/ResultTest.php | 19 +- .../Magento/CatalogSearch/Helper/DataTest.php | 8 +- .../Model/Resource/EngineProviderTest.php | 34 - .../Magento/Core/Model/Layout/MergeTest.php | 4 + .../Model/Layout/Update/ValidatorTest.php | 21 +- .../Magento/Core/Model/Layout/XsdTest.php | 2 +- .../Core/Model/Layout/_files/arguments.xml | 2 +- .../Magento/Core/Model/View/DesignTest.php | 14 +- .../Block/Adminhtml/Edit/Tab/AccountTest.php | 24 +- .../Magento/Customer/Block/Widget/DobTest.php | 3 +- .../Controller/Account/ConfirmTest.php | 412 + .../Controller/Account/CreatePostTest.php | 518 +- .../Controller/Account/LoginPostTest.php | 8 +- .../Magento/Customer/Helper/DataTest.php | 173 +- .../Customer/Model/Resource/AddressTest.php | 270 + .../Framework/App/Cache/ManagerAppTest.php | 199 + .../Framework/Autoload/IncludePathTest.php | 11 + .../Search/Adapter/Mysql/AdapterTest.php | 47 +- .../Aggregation/Builder/ContainerTest.php | 51 + .../Mysql/Aggregation/Builder/MetricsTest.php | 72 + .../Mysql/Aggregation/Builder/RangeTest.php | 128 + .../Mysql/Aggregation/Builder/TermTest.php | 94 + .../Adapter/Mysql/Aggregation/BuilderTest.php | 181 + .../Aggregation/DataProviderContainerTest.php | 51 + .../Adapter/Mysql/ResponseFactoryTest.php | 2 +- .../Framework/Search/Request/BuilderTest.php | 8 + .../Search/{ => Response}/AggregationTest.php | 34 +- .../{ => Response}/QueryResponseTest.php | 12 +- .../Framework/View/Asset/RepositoryTest.php | 2 +- .../View/Page/Config/_files/template_body.xml | 2 +- .../View/Page/Config/_files/template_head.xml | 2 +- .../View/Page/Config/_files/template_html.xml | 2 +- .../Magento/Install/Block/BeginTest.php | 114 - .../Magento/Log/Model/VisitorTest.php | 4 +- .../Block/Adminhtml/Order/View/InfoTest.php | 95 + .../Model/Order/Creditmemo/Total/TaxTest.php | 518 + .../Model/Order/Invoice/Total/TaxTest.php | 409 +- .../Magento/Sales/Model/OrderTest.php | 32 + .../Magento/Search/Block/SearchDataTest.php | 117 + .../Magento/Search/Model/DataProviderTest.php | 57 + .../Magento/Search/Model/QueryResultTest.php | 88 + .../Model/Sales/Total/Quote/ShippingTest.php | 409 + .../Model/Sales/Total/Quote/SubtotalTest.php | 402 + .../Tax/Model/Sales/Total/Quote/TaxTest.php | 649 + .../SomeModule/view/frontend/default.xml | 2 +- .../{HeaderTest.php => Header/LogoTest.php} | 8 +- .../Block/Catalog/Edit/FormTest.php | 122 + .../Magento/Weee/Helper/DataTest.php | 97 + .../Weee/Model/Total/Creditmemo/WeeeTest.php | 515 + .../Weee/Model/Total/Invoice/WeeeTest.php | 659 + .../Wishlist/Block/Item/ConfigureTest.php | 115 +- .../factory_table_names/replace_ce.php | 2 +- dev/tools/performance-toolkit/README.txt | 95 + dev/tools/performance-toolkit/benchmark.jmx | 4576 ++ .../fixtures/cart_price_rules.php | 178 + .../fixtures/catalog_price_rules.php | 131 + .../fixtures/categories.php | 78 + .../fixtures/configurable_products.php | 878 + .../fixtures/customers.php | 96 + .../fixtures/disable_form_key_usage.php | 37 + .../fixtures/eav_variations.php | 98 + .../fixtures/shipping_flatrate_enabled.php | 37 + .../fixtures/simple_products.php | 116 + .../performance-toolkit/fixtures/stores.php | 157 + .../fixtures/tax_rates.csv | 39714 ++++++++++++++++ .../fixtures/tax_rates.php | 49 + .../Magento/ToolkitFramework/Application.php | 189 + .../Magento/ToolkitFramework/Config.php | 111 + .../Magento/ToolkitFramework/FixtureSet.php | 75 + .../Magento/ToolkitFramework/Helper/Cli.php | 71 + .../Fixture/Complex/Generator.php | 140 + .../ImportExport/Fixture/Complex/Pattern.php | 145 + .../ImportExport/Fixture/Generator.php | 99 + .../framework/bootstrap.php | 33 + .../framework/fixtures.xml | 71 + .../performance-toolkit/framework/labels.xml | 38 + .../tests/unit/framework/bootstrap.php | 30 + .../framework/tests/unit/phpunit.xml.dist | 39 + .../ToolkitFramework/ApplicationTest.php | 167 + .../Magento/ToolkitFramework/ConfigTest.php | 36 + .../ToolkitFramework/FixtureSetTest.php | 36 + .../ToolkitFramework/Helper/CliTest.php | 102 + .../Fixture/Complex/ComplexGeneratorTest.php | 107 + .../Fixture/Complex/PatternTest.php | 116 + .../ImportExport/Fixture/GeneratorTest.php | 56 + .../_files/application_test/fixture1.php | 25 + .../_files/application_test/fixture2.php | 25 + dev/tools/performance-toolkit/generate.php | 86 + .../profiles/extra_large.xml | 40 + .../performance-toolkit/profiles/large.xml | 40 + .../performance-toolkit/profiles/medium.xml | 40 + .../performance-toolkit/profiles/small.xml | 40 + index.php | 9 +- .../Framework/App/Cache/ManagerApp.php | 237 + lib/internal/Magento/Framework/App/README.md | 16 + .../Magento/Framework/AppInterface.php | 2 +- .../Framework/Autoload/IncludePath.php | 5 +- .../Magento/Framework/Autoload/README.md | 3 + lib/internal/Magento/Framework/Code/README.md | 7 + .../Magento/Framework/Controller/README.md | 7 + .../Data/Argument/Interpreter/Constant.php | 3 +- .../Framework/Data/Form/AbstractForm.php | 2 +- lib/internal/Magento/Framework/Data/README.md | 39 + .../Magento/Framework/Event/README.md | 9 + .../Magento/Framework/Exception/README.md | 6 + .../Interception/PluginList/PluginList.php | 2 +- .../Magento/Framework/Locale/README.md | 4 + .../Magento/Framework/Logger/README.md | 5 + .../Magento/Framework/Message/README.md | 3 + .../Magento/Framework/Model/README.md | 3 + .../Magento/Framework/Module/README.md | 9 + .../Magento/Framework/Object/README.md | 4 + .../ObjectManager/Factory/Factory.php | 14 +- .../Magento/Framework/ObjectManager/README.md | 3 + .../Magento/Framework/Phrase/README.md | 8 + .../Search/Adapter/Mysql/Adapter.php | 43 +- .../Adapter/Mysql/Aggregation/Builder.php | 128 + .../Aggregation/Builder/BucketInterface.php | 38 + .../Mysql/Aggregation/Builder/Container.php | 49 + .../Mysql/Aggregation/Builder/Dynamic.php | 40 + .../Mysql/Aggregation/Builder/Metrics.php | 58 + .../Mysql/Aggregation/Builder/Range.php | 111 + .../Mysql/Aggregation/Builder/Term.php | 57 + .../Aggregation/DataProviderContainer.php | 49 + .../Aggregation/DataProviderInterface.php | 38 + .../Adapter/Mysql/AggregationFactory.php | 46 +- .../Search/Adapter/Mysql/Dimensions.php | 5 +- .../Search/Adapter/Mysql/DocumentFactory.php | 11 +- .../Search/Adapter/Mysql/ResponseFactory.php | 8 +- .../Framework/Search/AdapterInterface.php | 2 + .../Framework/Search/Dynamic}/Algorithm.php | 603 +- .../Search/Dynamic/IntervalFactory.php | 80 + .../Search/Dynamic/IntervalInterface.php | 52 + .../Magento/Framework/Search/Request.php | 14 +- .../Request/Aggregation/DynamicBucket.php | 101 + .../Request/Aggregation/RangeBucket.php | 8 +- .../Search/Request/Aggregation/TermBucket.php | 8 +- .../Search/Request/BucketInterface.php | 18 + .../Framework/Search/Request/Builder.php | 22 +- .../Framework/Search/Request/Dimension.php | 1 + .../Framework/Search/Request/Mapper.php | 68 +- .../Framework/Search/RequestInterface.php | 9 + .../Search/{ => Response}/Aggregation.php | 4 +- .../Search/Response/Aggregation/Value.php | 52 +- .../Framework/Search/Response/Bucket.php | 76 + .../Search/{ => Response}/QueryResponse.php | 5 +- .../Magento/Framework/Search/etc/requests.xsd | 45 +- .../Framework/Search/etc/search_request.xsd | 2 +- .../Data/AbstractExtensibleObjectBuilder.php | 16 +- .../Magento/Framework/Session/README.md | 5 + lib/internal/Magento/Framework/Shell.php | 9 +- .../Magento/Framework/Translate/README.md | 14 + .../Framework/View/Asset/Repository.php | 28 +- .../Framework/View/Layout}/etc/body.xsd | 0 .../Framework/View/Layout/etc/elements.xsd | 17 +- .../Framework/View/Layout}/etc/head.xsd | 0 .../Framework/View/Layout}/etc/html.xsd | 0 .../View/Layout/etc/layout_generic.xsd | 51 + .../View/Layout}/etc/layout_merged.xsd | 2 +- .../View/Layout/etc/page_configuration.xsd | 2 +- .../Framework/View/Layout/etc/page_layout.xsd | 45 + lib/internal/Magento/Framework/composer.json | 2 +- lib/internal/Zend/Stdlib/AbstractOptions.php | 150 - .../Stdlib/ArraySerializableInterface.php | 33 - lib/internal/Zend/Stdlib/ArrayStack.php | 37 - lib/internal/Zend/Stdlib/ArrayUtils.php | 249 - lib/internal/Zend/Stdlib/CallbackHandler.php | 303 - .../Zend/Stdlib/DispatchableInterface.php | 30 - lib/internal/Zend/Stdlib/ErrorHandler.php | 107 - .../Exception/BadMethodCallException.php | 22 - .../Zend/Stdlib/Exception/DomainException.php | 22 - .../Stdlib/Exception/ExceptionInterface.php | 22 - .../Exception/InvalidArgumentException.php | 22 - .../Exception/InvalidCallbackException.php | 22 - .../Zend/Stdlib/Exception/LogicException.php | 22 - lib/internal/Zend/Stdlib/Glob.php | 197 - .../Zend/Stdlib/Hydrator/AbstractHydrator.php | 117 - .../Stdlib/Hydrator/ArraySerializable.php | 77 - .../Zend/Stdlib/Hydrator/ClassMethods.php | 118 - .../Stdlib/Hydrator/HydratorInterface.php | 36 - .../Zend/Stdlib/Hydrator/ObjectProperty.php | 69 - .../Zend/Stdlib/Hydrator/Reflection.php | 95 - .../Hydrator/Strategy/DefaultStrategy.php | 41 - .../Hydrator/Strategy/StrategyInterface.php | 35 - .../Hydrator/StrategyEnabledInterface.php | 54 - lib/internal/Zend/Stdlib/Message.php | 124 - lib/internal/Zend/Stdlib/MessageInterface.php | 50 - .../Zend/Stdlib/ParameterObjectInterface.php | 43 - lib/internal/Zend/Stdlib/Parameters.php | 120 - .../Zend/Stdlib/ParametersInterface.php | 90 - lib/internal/Zend/Stdlib/PriorityQueue.php | 303 - lib/internal/Zend/Stdlib/Request.php | 20 - lib/internal/Zend/Stdlib/RequestInterface.php | 19 - lib/internal/Zend/Stdlib/Response.php | 20 - .../Zend/Stdlib/ResponseInterface.php | 20 - lib/internal/Zend/Stdlib/SplPriorityQueue.php | 97 - lib/internal/Zend/Stdlib/SplQueue.php | 59 - lib/internal/Zend/Stdlib/SplStack.php | 59 - lib/internal/Zend/Stdlib/composer.json | 21 - .../extjs/resources/css/ytheme-magento.css | 5 +- lib/web/mage/components.js | 2 +- setup/config/autoload/global.php | 19 +- .../module/Magento/Setup/config/di.config.php | 3 +- .../Magento/Setup/config/languages.config.php | 5 +- .../Magento/Setup/config/router.config.php | 2 +- .../Magento/Setup/config/states.config.php | 9 + setup/module/Magento/Setup/lang/en_US.mo | Bin 573 -> 0 bytes setup/module/Magento/Setup/lang/en_US.po | 280 - setup/module/Magento/Setup/lang/ua_UK.mo | Bin 864 -> 0 bytes setup/module/Magento/Setup/lang/ua_UK.po | 280 - .../src/Controller/ConsoleController.php | 47 +- .../Controller/Data/DatabaseController.php | 36 +- .../Setup/src/Controller/IndexController.php | 4 - .../Controller/Install/ProgressController.php | 60 +- .../Controller/Install/StartController.php | 15 +- .../src/Controller/LandingController.php | 24 +- .../src/Controller/LicenseController.php | 79 + .../Magento/Setup/src/Model/ConsoleLogger.php | 31 +- .../Magento/Setup/src/Model/Installer.php | 312 +- .../Setup/src/Model/Installer/Progress.php | 127 + .../src/Model/Installer/ProgressFactory.php | 53 + .../Setup/src/Model/InstallerFactory.php | 9 +- .../Magento/Setup/src/Model/License.php | 89 + .../Setup/src/Model/LoggerInterface.php | 10 +- .../Setup/src/Model/UserConfigurationData.php | 4 + .../Magento/Setup/src/Model/WebLogger.php | 12 +- .../Setup/src/Module/Resource/Resource.php | 23 +- .../module/Magento/Setup/src/Module/Setup.php | 44 +- .../Adapter.php => ConnectionFactory.php} | 16 +- .../Magento/Setup/src/Module/SetupFactory.php | 70 +- .../Magento/Setup/src/Module/SetupModule.php | 59 +- .../Setup/src/Mvc/Router/Http/Setup.php | 1 - .../Setup/view/magento/setup/install.phtml | 22 +- .../Setup/view/magento/setup/landing.phtml | 10 +- .../Setup/view/magento/setup/license.phtml | 33 + .../setup/readiness-check/progress.phtml | 2 +- setup/pub/magento/setup/install.js | 57 +- setup/pub/magento/setup/readiness-check.js | 11 +- 1561 files changed, 70396 insertions(+), 10038 deletions(-) delete mode 100644 LICENSE.html create mode 100644 app/code/Magento/Backend/Service/V1/ModuleService.php rename setup/module/Magento/Setup/src/Module/Setup/Connection/AdapterInterface.php => app/code/Magento/Backend/Service/V1/ModuleServiceInterface.php (78%) create mode 100644 app/code/Magento/Backend/etc/webapi.xml create mode 100644 app/code/Magento/Catalog/Model/Indexer/Category/Product/Processor.php create mode 100644 app/code/Magento/Catalog/Model/Indexer/Product/Category/Processor.php create mode 100644 app/code/Magento/Catalog/Model/Layout/DepersonalizePlugin.php create mode 100644 app/code/Magento/CatalogImportExport/Model/Indexer/Category/Product/Plugin/Import.php create mode 100644 app/code/Magento/CatalogImportExport/Model/Indexer/Product/Category/Plugin/Import.php create mode 100644 app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php rename app/code/Magento/{Catalog => CatalogSearch}/Model/Layer/Search/CollectionFilter.php (71%) rename app/code/Magento/{Catalog => CatalogSearch}/Model/Layer/Search/StateKey.php (78%) create mode 100644 app/code/Magento/CatalogSearch/Model/Price/Interval.php rename app/code/Magento/{Backend => CatalogSearch}/Model/Search/Catalog.php (86%) rename {dev/tests/integration/testsuite/Magento/Backend => app/code/Magento/CatalogSearch}/Model/Search/CatalogTest.php (88%) create mode 100644 app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml delete mode 100644 app/code/Magento/Customer/Block/Account/Dashboard/Hello.php delete mode 100644 app/code/Magento/Install/Block/Begin.php delete mode 100644 app/code/Magento/Install/view/install/templates/begin.phtml rename app/code/Magento/{Backend/Block/Dashboard/Searches => Search/Block/Adminhtml/Dashboard}/Last.php (84%) rename app/code/Magento/{Backend/Block/Dashboard/Searches => Search/Block/Adminhtml/Dashboard}/Top.php (84%) rename app/code/Magento/{Catalog/Block/Adminhtml/Search.php => Search/Block/Adminhtml/Term.php} (81%) rename app/code/Magento/{Catalog/Block/Adminhtml/Search => Search/Block/Adminhtml/Term}/Edit.php (93%) rename app/code/Magento/{Catalog/Block/Adminhtml/Search => Search/Block/Adminhtml/Term}/Edit/Form.php (96%) rename lib/internal/Magento/Framework/Search/Bucket.php => app/code/Magento/Search/Block/Recommendations.php (90%) create mode 100644 app/code/Magento/Search/Block/SearchData.php create mode 100644 app/code/Magento/Search/Block/SearchDataInterface.php create mode 100644 app/code/Magento/Search/Block/Suggestions.php rename app/code/Magento/{CatalogSearch => Search}/Block/Term.php (95%) rename app/code/Magento/{Catalog/Controller/Adminhtml/Search.php => Search/Controller/Adminhtml/Term.php} (80%) rename app/code/Magento/{Catalog/Controller/Adminhtml/Search => Search/Controller/Adminhtml/Term}/Delete.php (82%) rename app/code/Magento/{Catalog/Controller/Adminhtml/Search => Search/Controller/Adminhtml/Term}/Edit.php (86%) rename app/code/Magento/{Catalog/Controller/Adminhtml/Search => Search/Controller/Adminhtml/Term}/Index.php (84%) rename app/code/Magento/{Catalog/Controller/Adminhtml/Search => Search/Controller/Adminhtml/Term}/MassDelete.php (86%) rename app/code/Magento/{Catalog/Controller/Adminhtml/Search => Search/Controller/Adminhtml/Term}/NewAction.php (89%) rename app/code/Magento/{Catalog/Controller/Adminhtml/Search => Search/Controller/Adminhtml/Term}/Save.php (85%) rename app/code/Magento/{CatalogSearch => Search}/Controller/Ajax/Suggest.php (89%) rename app/code/Magento/{CatalogSearch => Search}/Controller/Term/Popular.php (97%) create mode 100644 app/code/Magento/Search/Helper/Data.php rename app/code/Magento/{CatalogSearch => Search}/Model/Query.php (82%) create mode 100644 app/code/Magento/Search/Model/QueryFactory.php create mode 100644 app/code/Magento/Search/Model/QueryFactoryInterface.php create mode 100644 app/code/Magento/Search/Model/QueryInterface.php create mode 100644 app/code/Magento/Search/Model/QueryResult.php rename app/code/Magento/{CatalogSearch => Search}/Model/Resource/Helper.php (96%) rename app/code/Magento/{CatalogSearch => Search}/Model/Resource/Query.php (95%) rename app/code/Magento/{CatalogSearch => Search}/Model/Resource/Query/Collection.php (88%) create mode 100644 app/code/Magento/Search/Model/SearchCollectionFactory.php create mode 100644 app/code/Magento/Search/Model/SearchCollectionInterface.php create mode 100644 app/code/Magento/Search/Model/SearchDataProvider.php create mode 100644 app/code/Magento/Search/Model/SearchDataProviderInterface.php create mode 100644 app/code/Magento/Search/composer.json rename app/code/Magento/{CatalogSearch => Search}/etc/acl.xml (93%) rename app/code/Magento/{CatalogSearch => Search}/etc/adminhtml/menu.xml (82%) rename app/code/Magento/{Catalog/etc/events.xml => Search/etc/adminhtml/routes.xml} (76%) create mode 100644 app/code/Magento/Search/etc/di.xml rename app/code/Magento/{Core/etc/layout_generic.xsd => Search/etc/frontend/page_types.xml} (79%) create mode 100644 app/code/Magento/Search/etc/frontend/routes.xml create mode 100644 app/code/Magento/Search/etc/module.xml create mode 100644 app/code/Magento/Search/sql/search_setup/install-1.6.0.0.php create mode 100644 app/code/Magento/Search/view/adminhtml/layout/adminhtml_dashboard_index.xml rename app/code/Magento/{CatalogSearch/view/adminhtml/layout/catalog_search_edit.xml => Search/view/adminhtml/layout/search_term_edit.xml} (83%) rename app/code/Magento/{CatalogSearch/view/adminhtml/layout/catalog_search_grid_block.xml => Search/view/adminhtml/layout/search_term_grid_block.xml} (96%) rename app/code/Magento/{CatalogSearch/view/adminhtml/layout/catalog_search_index.xml => Search/view/adminhtml/layout/search_term_index.xml} (80%) create mode 100644 app/code/Magento/Search/view/frontend/layout/default.xml rename app/code/Magento/{CatalogSearch/view/frontend/layout/catalogsearch_term_popular.xml => Search/view/frontend/layout/search_term_popular.xml} (82%) rename app/code/Magento/{CatalogSearch => Search}/view/frontend/templates/form.mini.phtml (82%) create mode 100644 app/code/Magento/Search/view/frontend/templates/search_data.phtml rename app/code/Magento/{CatalogSearch => Search}/view/frontend/web/form-mini.js (99%) create mode 100644 app/code/Magento/Tax/README.md create mode 100644 app/code/Magento/Theme/Block/Html/Header/Logo.php rename app/code/Magento/Theme/view/adminhtml/{layout => page_layout}/admin-1column.xml (96%) rename app/code/Magento/Theme/view/adminhtml/{layout => page_layout}/admin-2columns-left.xml (97%) rename app/code/Magento/Theme/view/base/{layout => page_layout}/empty.xml (94%) rename app/code/Magento/Theme/view/frontend/{layout => page_layout}/1column.xml (93%) rename app/code/Magento/Theme/view/frontend/{layout => page_layout}/2columns-left.xml (93%) rename app/code/Magento/Theme/view/frontend/{layout => page_layout}/2columns-right.xml (90%) rename app/code/Magento/Theme/view/frontend/{layout => page_layout}/3columns.xml (90%) rename app/code/Magento/{Customer/view/frontend/templates/account/dashboard/hello.phtml => Theme/view/frontend/templates/html/header/logo.phtml} (58%) create mode 100644 app/code/Magento/UrlRewrite/Model/EntityNotAssociatedWithWebsiteException.php create mode 100644 app/code/Magento/Weee/README.md create mode 100644 app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_onepage_index.xml create mode 100644 app/design/frontend/Magento/blank/Magento_Multishipping/layout/multishipping_checkout.xml create mode 100644 dev/shell/cache.php create mode 100644 dev/shell/dependency.php create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/PageActions.php create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/AbstractRelated.php create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/AbstractRelatedProducts.php create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CrossSellProducts.php create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/UpSellProducts.php create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCrossSellEntityTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCrossSellEntityTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddUpSellEntityTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddUpSellEntityTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar/Item.php create mode 100644 dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductAbsentInMiniShoppingCart.php create mode 100644 dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInMiniShoppingCart.php create mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/CreateOrderFromCustomerAccountStep.php create mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LogoutCustomerOnFrontendStep.php create mode 100644 dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/OpenCustomerOnBackendStep.php rename dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/{testCreateDownloadableProduct.csv => test.csv} (91%) mode change 100755 => 100644 rename dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/UpdateDownloadableProductEntityTest/{testUpdateDownloadableProduct.csv => test.csv} (87%) create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.php create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline.xml create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline/GiftMessageForm.php create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Inline/GiftMessageForm.xml create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/Items/View.php create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Message/Order/View.php create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrder.php create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.php create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/Fixture/GiftMessage.xml rename app/code/Magento/Core/etc/layout_single.xsd => dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/CheckoutOnepage.xml (71%) create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/Page/OrderView.xml create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.php create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestStep/AddGiftMessageStep.php create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/constraint.xml create mode 100644 dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/fixture.xml create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/Filter.php create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/Filter.xml create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Sales/Orders/Viewed/FilterGrid.php rename dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/{Review/Products => }/Viewed/Action.php (92%) create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertSalesReportResult.php create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/SalesReport.xml create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest/test.csv create mode 100644 dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertAddProductToWishlistSuccessMessage.php create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertBundleProductDetailsInWishlist.php create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php create mode 100644 dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest/test.csv rename dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest/{StubZendLogWriterStreamTest.php => StubZendLogWriterStream.php} (96%) create mode 100644 dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/categories_with_products.php delete mode 100644 dev/tests/integration/testsuite/Magento/Customer/Block/Account/Dashboard/HelloTest.php create mode 100644 dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/ViewedTest.php create mode 100644 dev/tests/integration/testsuite/Magento/ToolkitFramework/ApplicationTest.php create mode 100644 dev/tests/integration/testsuite/Magento/ToolkitFramework/_files/tax_rates.csv rename setup/module/Magento/Setup/src/Model/DatabaseCheck.php => dev/tests/static/testsuite/Magento/Test/Integrity/ComposerLockTest.php (60%) delete mode 100644 dev/tests/unit/filename delete mode 100644 dev/tests/unit/filename.csv delete mode 100644 dev/tests/unit/filename.invalid_type create mode 100644 dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Column/Filter/StoreTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Category/Product/Plugin/ImportTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Category/Plugin/ImportTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Model/Layout/DepersonalizePluginTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Customer/Model/Resource/AddressTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerAppTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/ContainerTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/MetricsTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/RangeTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/TermTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/BuilderTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderContainerTest.php rename dev/tests/unit/testsuite/Magento/Framework/Search/{ => Response}/AggregationTest.php (61%) rename dev/tests/unit/testsuite/Magento/Framework/Search/{ => Response}/QueryResponseTest.php (85%) delete mode 100644 dev/tests/unit/testsuite/Magento/Install/Block/BeginTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Sales/Model/Order/Creditmemo/Total/TaxTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Search/Block/SearchDataTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Search/Model/DataProviderTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Search/Model/QueryResultTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/ShippingTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php rename dev/tests/unit/testsuite/Magento/Theme/Block/Html/{HeaderTest.php => Header/LogoTest.php} (93%) create mode 100644 dev/tests/unit/testsuite/Magento/UrlRewrite/Block/Catalog/Edit/FormTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Weee/Model/Total/Creditmemo/WeeeTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Weee/Model/Total/Invoice/WeeeTest.php create mode 100644 dev/tools/performance-toolkit/README.txt create mode 100644 dev/tools/performance-toolkit/benchmark.jmx create mode 100644 dev/tools/performance-toolkit/fixtures/cart_price_rules.php create mode 100644 dev/tools/performance-toolkit/fixtures/catalog_price_rules.php create mode 100644 dev/tools/performance-toolkit/fixtures/categories.php create mode 100644 dev/tools/performance-toolkit/fixtures/configurable_products.php create mode 100644 dev/tools/performance-toolkit/fixtures/customers.php create mode 100644 dev/tools/performance-toolkit/fixtures/disable_form_key_usage.php create mode 100644 dev/tools/performance-toolkit/fixtures/eav_variations.php create mode 100644 dev/tools/performance-toolkit/fixtures/shipping_flatrate_enabled.php create mode 100644 dev/tools/performance-toolkit/fixtures/simple_products.php create mode 100644 dev/tools/performance-toolkit/fixtures/stores.php create mode 100644 dev/tools/performance-toolkit/fixtures/tax_rates.csv create mode 100644 dev/tools/performance-toolkit/fixtures/tax_rates.php create mode 100644 dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/Application.php create mode 100644 dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/Config.php create mode 100644 dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/FixtureSet.php create mode 100644 dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/Helper/Cli.php create mode 100644 dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/ImportExport/Fixture/Complex/Generator.php create mode 100644 dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/ImportExport/Fixture/Complex/Pattern.php create mode 100644 dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/ImportExport/Fixture/Generator.php create mode 100644 dev/tools/performance-toolkit/framework/bootstrap.php create mode 100644 dev/tools/performance-toolkit/framework/fixtures.xml create mode 100644 dev/tools/performance-toolkit/framework/labels.xml create mode 100644 dev/tools/performance-toolkit/framework/tests/unit/framework/bootstrap.php create mode 100644 dev/tools/performance-toolkit/framework/tests/unit/phpunit.xml.dist create mode 100644 dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/ApplicationTest.php create mode 100644 dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/ConfigTest.php create mode 100644 dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/FixtureSetTest.php create mode 100644 dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/Helper/CliTest.php create mode 100644 dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/ImportExport/Fixture/Complex/ComplexGeneratorTest.php create mode 100644 dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/ImportExport/Fixture/Complex/PatternTest.php create mode 100644 dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/ImportExport/Fixture/GeneratorTest.php create mode 100644 dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/_files/application_test/fixture1.php create mode 100644 dev/tools/performance-toolkit/framework/tests/unit/testsuite/Magento/ToolkitFramework/_files/application_test/fixture2.php create mode 100644 dev/tools/performance-toolkit/generate.php create mode 100644 dev/tools/performance-toolkit/profiles/extra_large.xml create mode 100644 dev/tools/performance-toolkit/profiles/large.xml create mode 100644 dev/tools/performance-toolkit/profiles/medium.xml create mode 100644 dev/tools/performance-toolkit/profiles/small.xml create mode 100644 lib/internal/Magento/Framework/App/Cache/ManagerApp.php create mode 100644 lib/internal/Magento/Framework/App/README.md create mode 100644 lib/internal/Magento/Framework/Autoload/README.md create mode 100644 lib/internal/Magento/Framework/Code/README.md create mode 100644 lib/internal/Magento/Framework/Controller/README.md create mode 100644 lib/internal/Magento/Framework/Data/README.md create mode 100644 lib/internal/Magento/Framework/Event/README.md create mode 100644 lib/internal/Magento/Framework/Exception/README.md create mode 100644 lib/internal/Magento/Framework/Locale/README.md create mode 100644 lib/internal/Magento/Framework/Logger/README.md create mode 100644 lib/internal/Magento/Framework/Message/README.md create mode 100644 lib/internal/Magento/Framework/Model/README.md create mode 100644 lib/internal/Magento/Framework/Module/README.md create mode 100644 lib/internal/Magento/Framework/Object/README.md create mode 100644 lib/internal/Magento/Framework/ObjectManager/README.md create mode 100644 lib/internal/Magento/Framework/Phrase/README.md create mode 100644 lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder.php create mode 100644 lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/BucketInterface.php create mode 100644 lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Container.php create mode 100644 lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Dynamic.php create mode 100644 lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Metrics.php create mode 100644 lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Range.php create mode 100644 lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Term.php create mode 100644 lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderContainer.php create mode 100644 lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/DataProviderInterface.php rename {app/code/Magento/Catalog/Model/Layer/Filter/Price => lib/internal/Magento/Framework/Search/Dynamic}/Algorithm.php (58%) create mode 100644 lib/internal/Magento/Framework/Search/Dynamic/IntervalFactory.php create mode 100644 lib/internal/Magento/Framework/Search/Dynamic/IntervalInterface.php create mode 100644 lib/internal/Magento/Framework/Search/Request/Aggregation/DynamicBucket.php rename lib/internal/Magento/Framework/Search/{ => Response}/Aggregation.php (96%) rename setup/module/Magento/Setup/src/Controller/Install/ClearProgressController.php => lib/internal/Magento/Framework/Search/Response/Aggregation/Value.php (60%) create mode 100644 lib/internal/Magento/Framework/Search/Response/Bucket.php rename lib/internal/Magento/Framework/Search/{ => Response}/QueryResponse.php (93%) create mode 100644 lib/internal/Magento/Framework/Session/README.md create mode 100644 lib/internal/Magento/Framework/Translate/README.md rename {app/code/Magento/Core => lib/internal/Magento/Framework/View/Layout}/etc/body.xsd (100%) rename app/code/Magento/Core/etc/layouts.xsd => lib/internal/Magento/Framework/View/Layout/etc/elements.xsd (95%) rename {app/code/Magento/Core => lib/internal/Magento/Framework/View/Layout}/etc/head.xsd (100%) rename {app/code/Magento/Core => lib/internal/Magento/Framework/View/Layout}/etc/html.xsd (100%) create mode 100644 lib/internal/Magento/Framework/View/Layout/etc/layout_generic.xsd rename {app/code/Magento/Core => lib/internal/Magento/Framework/View/Layout}/etc/layout_merged.xsd (98%) rename app/code/Magento/Core/etc/page.xsd => lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd (98%) create mode 100644 lib/internal/Magento/Framework/View/Layout/etc/page_layout.xsd delete mode 100644 lib/internal/Zend/Stdlib/AbstractOptions.php delete mode 100644 lib/internal/Zend/Stdlib/ArraySerializableInterface.php delete mode 100644 lib/internal/Zend/Stdlib/ArrayStack.php delete mode 100644 lib/internal/Zend/Stdlib/ArrayUtils.php delete mode 100644 lib/internal/Zend/Stdlib/CallbackHandler.php delete mode 100644 lib/internal/Zend/Stdlib/DispatchableInterface.php delete mode 100644 lib/internal/Zend/Stdlib/ErrorHandler.php delete mode 100644 lib/internal/Zend/Stdlib/Exception/BadMethodCallException.php delete mode 100644 lib/internal/Zend/Stdlib/Exception/DomainException.php delete mode 100644 lib/internal/Zend/Stdlib/Exception/ExceptionInterface.php delete mode 100644 lib/internal/Zend/Stdlib/Exception/InvalidArgumentException.php delete mode 100644 lib/internal/Zend/Stdlib/Exception/InvalidCallbackException.php delete mode 100644 lib/internal/Zend/Stdlib/Exception/LogicException.php delete mode 100644 lib/internal/Zend/Stdlib/Glob.php delete mode 100644 lib/internal/Zend/Stdlib/Hydrator/AbstractHydrator.php delete mode 100644 lib/internal/Zend/Stdlib/Hydrator/ArraySerializable.php delete mode 100644 lib/internal/Zend/Stdlib/Hydrator/ClassMethods.php delete mode 100644 lib/internal/Zend/Stdlib/Hydrator/HydratorInterface.php delete mode 100644 lib/internal/Zend/Stdlib/Hydrator/ObjectProperty.php delete mode 100644 lib/internal/Zend/Stdlib/Hydrator/Reflection.php delete mode 100644 lib/internal/Zend/Stdlib/Hydrator/Strategy/DefaultStrategy.php delete mode 100644 lib/internal/Zend/Stdlib/Hydrator/Strategy/StrategyInterface.php delete mode 100644 lib/internal/Zend/Stdlib/Hydrator/StrategyEnabledInterface.php delete mode 100644 lib/internal/Zend/Stdlib/Message.php delete mode 100644 lib/internal/Zend/Stdlib/MessageInterface.php delete mode 100644 lib/internal/Zend/Stdlib/ParameterObjectInterface.php delete mode 100644 lib/internal/Zend/Stdlib/Parameters.php delete mode 100644 lib/internal/Zend/Stdlib/ParametersInterface.php delete mode 100644 lib/internal/Zend/Stdlib/PriorityQueue.php delete mode 100644 lib/internal/Zend/Stdlib/Request.php delete mode 100644 lib/internal/Zend/Stdlib/RequestInterface.php delete mode 100644 lib/internal/Zend/Stdlib/Response.php delete mode 100644 lib/internal/Zend/Stdlib/ResponseInterface.php delete mode 100644 lib/internal/Zend/Stdlib/SplPriorityQueue.php delete mode 100644 lib/internal/Zend/Stdlib/SplQueue.php delete mode 100644 lib/internal/Zend/Stdlib/SplStack.php delete mode 100644 lib/internal/Zend/Stdlib/composer.json delete mode 100644 setup/module/Magento/Setup/lang/en_US.mo delete mode 100644 setup/module/Magento/Setup/lang/en_US.po delete mode 100644 setup/module/Magento/Setup/lang/ua_UK.mo delete mode 100644 setup/module/Magento/Setup/lang/ua_UK.po create mode 100644 setup/module/Magento/Setup/src/Controller/LicenseController.php create mode 100644 setup/module/Magento/Setup/src/Model/Installer/Progress.php create mode 100644 setup/module/Magento/Setup/src/Model/Installer/ProgressFactory.php create mode 100644 setup/module/Magento/Setup/src/Model/License.php rename setup/module/Magento/Setup/src/Module/Setup/{Connection/Adapter.php => ConnectionFactory.php} (76%) create mode 100644 setup/module/Magento/Setup/view/magento/setup/license.phtml diff --git a/.travis.yml b/.travis.yml index 9a94626445095..ea1c267b48170 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,10 @@ before_script: # Change memmory_limit for travis server - echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - phpenv rehash; + - composer install --no-interaction --prefer-source --dev + - cd setup + - composer install --no-interaction --prefer-source --dev + - cd .. script: # Unit tests - sh -c "if [ '$TEST_SUITE' = 'unit' ]; then ./vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist; fi" diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ba3ae52992c2..43781a27f9eb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,103 @@ +0.1.0-alpha99 +============= + * Released Performance Toolkit + * GitHub requests: + * [#665](https://github.com/magento/magento2/issues/665) -- Main menu event in wrong area + * [#666](https://github.com/magento/magento2/pull/666) -- Update di.xml + * [#602](https://github.com/magento/magento2/issues/602) -- Magento\Sales\Model\Order::getFullTaxInfo() incorrectly combines percentages + * [#673](https://github.com/magento/magento2/issues/673) -- Fixed fatal error during installation + * Functional tests: + * Updated API-functional test for Customer and Address metadata service + * Add cross sell + * Add a product to wishlist + * Add up sell + * Checkout with gift messages + * Create an order from a customer + * Create a shipment for offline payment methods + * Delete a product from mini shopping cart + * Reorder + * Sales order report + * Updating URL rewrites from a category page + * Layout updates: + * Moved layout files to the page_layout directory + * Moved layout validation files to framework + * Theme updates: + * Blank Theme layouts & templates were unified + * Search Library: + * Added ability to aggregate queries for MySQL adapter + * Implemented automatic range aggregation for MySQL adapter + * Search module: + * Introduced the Search module + * Moved autocomplete to the Search module + * Added base UI to the Search module + * Documentation: + * Added basic description of modules in the README.md files + * Modularity: + * Created API and script to get module and dependency information + * Framework Improvements: + * Decomposed heavy objects basing on profiling results + * Refactored the getCustomAttributesCodes method in ProductService + * Refactored Customer Model to use Group Model instead of Group Service + * Updated Travis configuration to run "composer install" + * Performance improvements: + * Removed unnecessary "save order" call during order submission step + * Fixed missing installation features of the new setup: + * Added missing installation parameters: admin_no_form_key, order_increment_prefix, cleanup_database + * Fixed the link to the license agreement in web installer + * Fixed the web installation wizard which was stuck at 96% + * Fixed bugs: + * Fixed an issue where newly created attribute was always added to the Product Details tab + * Fixed an issue where it was impossible to change the Stock Availability status of a product from the Advanced Inventory tab + * Fixed an issue where the Stock Status value changed from In Stock to Out of Stock if quantity was not specified + * Fixed an issue where performance toolkit failed in case of unknown argument + * Fixed an issue where 404 error page was displayed instead of the URL Rewrite Information page + * Fixed an issue where the Click for price link was not working if a product name contained quote mark + * Fixed an issue where the Compare products link disappeared after switching to other page + * Fixed an issue where the custom logo was not displayed on the category page + * Fixed an XSS vulnerability in category name + * Fixed an issue where a success save message was not displayed after saving a Search term + * Fixed an issue with Google Analytics where it was impossible to add the code to the pages + * Fixed an issue where import custom options grid was not displayed on the product creation page + * Fixed an issue where it was impossible to retrieve a product collection from category in the "adminhtml" area + * Fixed an issue where product attributes were absent on product creation form after switching to another product template + * Fixed an issue where the 'URL key for specified store already exists.' error message was displayed when saving a configurable product with variations which have the same name + * Fixed an issue where search in the Search Terms Report grid did not work + * Fixed an issue where the unnecessary tab "General" was displayed on the Category page in the Admin panel + * Fixed an issue where the Stock Status value changed from In Stock to Out of Stock if quantity was not specified for a configurable product when saving to a new template + * Fixed an issue where product Stock Status was always set to 'In Stock' if product quantity was specified + * Fixed an IE specific issue where for bundle products the Manage Stock option was reset to Yes + * Fixed an issue where backorder messages were not displayed + * Fixed an issue where the Price field was always required during Bundle product update using ProductService + * Fixed an issue where product name was missing in the error message + * Fixed an issue where configurable product did not contain a message to select options while adding product from wishlist to shopping cart + * Fixed an issue where the Validate VAT Number button did not work during order creation in the Admin panel + * Fixed an issue where Item qty in Wishlist got reset after update without changes + * Fixed an issue where invoice amount was incorrect when items with discount were partially invoiced + * Fixed product thumbnails alignment in the storefront + * Fixed an issue where inactive Categories were not greyed out in the tree in the Admin panel + * Fixed an issue where it was impossible to disable debug mode + * Fixed the code sample in the index.php file + * Removed language selector in the setup UI + * Fixed an issue where setup was broken if db_prefix was used + * Implemented usage of Symfony's PHPExecutableFinder for executing CLI tools + * Fixed an issue with the Import/Export functionality + * Fixed an issue with catalog product/category and category/product indexers invalidation after import + * Fixed an issue with entering invalid date in the Product Views Report + * Fixed an issue where it was impossible to view orders for customers from a deleted customer group + * Fixed an issue where a duplicate customer record was created after adding an order from the Admin panel + * Fixed an issue where it was impossible to log in to the Admin panel from the first attempt + 0.1.0-alpha98 ============= -* GitHub requests: + * GitHub requests: * [#678] (https://github.com/magento/magento2/issues/678) -- Fixed Travis CI builds -* Functional tests: + * Functional tests: * Create Sales Order Backend * Delete Products from Wishlist * Download Products Report * Mass Orders Update * Sales Tax Report -* Fixed bugs: + * Fixed bugs: * Fixed an issue where success message was not displayed after product review submit * Fixed an issue where it was impossible to start checkout process using PayPal from the JavaScript pop-up window when the Display Actual Price option was set to On Gesture * Fixed an issue where a fatal error was thrown after shipping method selection in PayPal Express Checkout diff --git a/LICENSE.html b/LICENSE.html deleted file mode 100644 index e2315f6a4167e..0000000000000 --- a/LICENSE.html +++ /dev/null @@ -1,42 +0,0 @@ -

Open Software License ("OSL") v. 3.0

- -

This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:

-
Licensed under the Open Software License version 3.0
-

Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:

- - -

Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.

- -

Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.

- -

Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.

- -

External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).

- -

Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.

- -

Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.

- -

Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.

- -

Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).

- -

Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.

- -

Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.

- -

Attorneys Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.

- -

Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.

- -

Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.

- -

Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.

- -

Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under Open Software License ("OSL") v. 3.0" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.

diff --git a/LICENSE.txt b/LICENSE.txt index 63f5337c5f9cd..49525fd99da9c 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -45,4 +45,4 @@ Licensed under the Open Software License version 3.0 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. - 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file + 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. \ No newline at end of file diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json index d6b9a18583024..c1fe011392d6a 100644 --- a/app/code/Magento/AdminNotification/composer.json +++ b/app/code/Magento/AdminNotification/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_block.xml b/app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_block.xml index b0a94fd8014bf..1d70a00559fdd 100644 --- a/app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_block.xml +++ b/app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_index.xml b/app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_index.xml index ed74b6e8b1667..c92a48d379ad4 100644 --- a/app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_index.xml +++ b/app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml b/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml index be68c170e83a3..b75b9c4d5eaef 100644 --- a/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml +++ b/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json index 19783cd57f058..cf442daffa9d4 100644 --- a/app/code/Magento/Authorization/composer.json +++ b/app/code/Magento/Authorization/composer.json @@ -3,12 +3,12 @@ "description": "Authorization module provides access to Magento ACL functionality.", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-backend": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-backend": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Authorizenet/composer.json b/app/code/Magento/Authorizenet/composer.json index 452828c3d788f..ea5ae667e682f 100644 --- a/app/code/Magento/Authorizenet/composer.json +++ b/app/code/Magento/Authorizenet/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-payment": "0.1.0-alpha98", - "magento/module-centinel": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-payment": "0.1.0-alpha99", + "magento/module-centinel": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Authorizenet/view/adminhtml/layout/adminhtml_authorizenet_directpost_payment_redirect.xml b/app/code/Magento/Authorizenet/view/adminhtml/layout/adminhtml_authorizenet_directpost_payment_redirect.xml index 6e724bee492f5..e08ef284215a7 100644 --- a/app/code/Magento/Authorizenet/view/adminhtml/layout/adminhtml_authorizenet_directpost_payment_redirect.xml +++ b/app/code/Magento/Authorizenet/view/adminhtml/layout/adminhtml_authorizenet_directpost_payment_redirect.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_backendresponse.xml b/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_backendresponse.xml index 63714b8f56d08..97a22f99fd6e6 100644 --- a/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_backendresponse.xml +++ b/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_backendresponse.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_redirect.xml b/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_redirect.xml index 63714b8f56d08..97a22f99fd6e6 100644 --- a/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_redirect.xml +++ b/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_redirect.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_response.xml b/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_response.xml index 63714b8f56d08..97a22f99fd6e6 100644 --- a/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_response.xml +++ b/app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_response.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_index.xml index 1a98d72b324b4..05f4ef76f5fb5 100644 --- a/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_index.xml +++ b/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_review.xml b/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_review.xml index fc8c82c892292..a2b2572580553 100644 --- a/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_review.xml +++ b/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_review.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/Block/Dashboard.php b/app/code/Magento/Backend/Block/Dashboard.php index 2dffdaf8c2dc5..75c64f13e3d76 100644 --- a/app/code/Magento/Backend/Block/Dashboard.php +++ b/app/code/Magento/Backend/Block/Dashboard.php @@ -46,10 +46,6 @@ protected function _prepareLayout() $this->addChild('sales', 'Magento\Backend\Block\Dashboard\Sales'); - $this->addChild('lastSearches', 'Magento\Backend\Block\Dashboard\Searches\Last'); - - $this->addChild('topSearches', 'Magento\Backend\Block\Dashboard\Searches\Top'); - if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) { $block = $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Diagrams'); } else { diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php index 11acaf7e26ca4..aa59ef3ab1224 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php @@ -29,6 +29,7 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter { + const ALL_STORE_VIEWS = '0'; /** * @var \Magento\Store\Model\System\Store */ @@ -71,9 +72,9 @@ public function getHtml() ) . '>'; $value = $this->getColumn()->getValue(); if ($allShow) { - $html .= ''; + $html .= ''; } else { $html .= ''; } @@ -129,13 +130,14 @@ public function getHtml() */ public function getCondition() { - if (is_null($this->getValue())) { + $value = $this->getValue(); + if (is_null($value) || $value == self::ALL_STORE_VIEWS) { return null; } - if ($this->getValue() == '_deleted_') { + if ($value == '_deleted_') { return array('null' => true); } else { - return array('eq' => $this->getValue()); + return array('eq' => $value); } } } diff --git a/app/code/Magento/Backend/Model/Session/AdminConfig.php b/app/code/Magento/Backend/Model/Session/AdminConfig.php index 919d3100b5ec4..614fb677d30a5 100644 --- a/app/code/Magento/Backend/Model/Session/AdminConfig.php +++ b/app/code/Magento/Backend/Model/Session/AdminConfig.php @@ -27,6 +27,7 @@ use Magento\Backend\App\Area\FrontNameResolver; use Magento\Framework\Session\Config; +use Magento\Framework\UrlInterface; /** * Magento Backend session configuration @@ -41,9 +42,14 @@ class AdminConfig extends Config const SESSION_NAME_ADMIN = 'admin'; /** - * @var FrontNameResolver $frontNameResolver + * @var FrontNameResolver */ - protected $frontNameResolver; + protected $_frontNameResolver; + + /** + * @var \Magento\Framework\StoreManagerInterface + */ + protected $_storeManager; /** * @param \Magento\Framework\ValidatorFactory $validatorFactory @@ -53,6 +59,7 @@ class AdminConfig extends Config * @param \Magento\Framework\App\Filesystem $filesystem * @param string $scopeType * @param FrontNameResolver $frontNameResolver + * @param \Magento\Framework\StoreManagerInterface $storeManager * @param string $saveMethod * @param null|string $savePath * @param null|string $cacheLimiter @@ -68,6 +75,7 @@ public function __construct( \Magento\Framework\App\Filesystem $filesystem, $scopeType, FrontNameResolver $frontNameResolver, + \Magento\Framework\StoreManagerInterface $storeManager, $saveMethod = \Magento\Framework\Session\SaveHandlerInterface::DEFAULT_HANDLER, $savePath = null, $cacheLimiter = null, @@ -87,7 +95,8 @@ public function __construct( $lifetimePath ); - $this->frontNameResolver = $frontNameResolver; + $this->_frontNameResolver = $frontNameResolver; + $this->_storeManager = $storeManager; $adminPath = $this->extractAdminPath(); $this->setCookiePath($adminPath); $this->setName($sessionName); @@ -100,12 +109,9 @@ public function __construct( */ private function extractAdminPath() { - $baseUrl = $this->_httpRequest->getBaseUrl(); - $adminPath = $this->frontNameResolver->getFrontName(); - - if (!substr($baseUrl, -1) || ('/' != substr($baseUrl, -1))) { - $baseUrl = $baseUrl . '/'; - } + $parsedUrl = parse_url($this->_storeManager->getStore()->getBaseUrl()); + $baseUrl = $parsedUrl['path']; + $adminPath = $this->_frontNameResolver->getFrontName(); return $baseUrl . $adminPath; } diff --git a/app/code/Magento/Backend/Model/Session/Quote.php b/app/code/Magento/Backend/Model/Session/Quote.php index f6c246b1eec64..6f0072df3029f 100644 --- a/app/code/Magento/Backend/Model/Session/Quote.php +++ b/app/code/Magento/Backend/Model/Session/Quote.php @@ -40,8 +40,6 @@ */ class Quote extends \Magento\Framework\Session\SessionManager { - const XML_PATH_DEFAULT_CREATEACCOUNT_GROUP = 'customer/create_account/default_group'; - /** * Quote model object * @@ -152,7 +150,7 @@ public function getQuote() $this->_quote->setStoreId($this->getStoreId())->load($this->getQuoteId()); } elseif ($this->getStoreId() && $this->hasCustomerId()) { $customerGroupId = $this->_scopeConfig->getValue( - self::XML_PATH_DEFAULT_CREATEACCOUNT_GROUP, + \Magento\Customer\Service\V1\CustomerGroupServiceInterface::XML_PATH_DEFAULT_ID, \Magento\Store\Model\ScopeInterface::SCOPE_STORE ); $this->_quote diff --git a/app/code/Magento/Backend/Model/Url.php b/app/code/Magento/Backend/Model/Url.php index 88d13211ba8cb..03459131288f7 100644 --- a/app/code/Magento/Backend/Model/Url.php +++ b/app/code/Magento/Backend/Model/Url.php @@ -33,6 +33,13 @@ */ class Url extends \Magento\Framework\Url implements \Magento\Backend\Model\UrlInterface { + /** + * Whether to use a security key in the backend + * + * @bug Currently, this constant is slightly misleading: it says "form key", but in fact it is used by URLs, too + */ + const XML_PATH_USE_SECURE_KEY = 'admin/security/use_form_key'; + /** * Authentication session * @@ -268,7 +275,7 @@ public function getSecretKey($routeName = null, $controller = null, $action = nu */ public function useSecretKey() { - return $this->_scopeConfig->isSetFlag('admin/security/use_form_key') && !$this->getNoSecret(); + return $this->_scopeConfig->isSetFlag(self::XML_PATH_USE_SECURE_KEY) && !$this->getNoSecret(); } /** diff --git a/app/code/Magento/Backend/Service/V1/ModuleService.php b/app/code/Magento/Backend/Service/V1/ModuleService.php new file mode 100644 index 0000000000000..ad8195afa9ba3 --- /dev/null +++ b/app/code/Magento/Backend/Service/V1/ModuleService.php @@ -0,0 +1,59 @@ +moduleList = $moduleList; + } + + /** + * Returns an array of enabled modules + * + * @return string[] + */ + public function getModules() + { + $result = []; + $modules = $this->moduleList->getModules(); + foreach ($modules as $module) { + $result[] = $module['name']; + } + return $result; + } +} diff --git a/setup/module/Magento/Setup/src/Module/Setup/Connection/AdapterInterface.php b/app/code/Magento/Backend/Service/V1/ModuleServiceInterface.php similarity index 78% rename from setup/module/Magento/Setup/src/Module/Setup/Connection/AdapterInterface.php rename to app/code/Magento/Backend/Service/V1/ModuleServiceInterface.php index 209006c6cd490..b01b0930a3199 100644 --- a/setup/module/Magento/Setup/src/Module/Setup/Connection/AdapterInterface.php +++ b/app/code/Magento/Backend/Service/V1/ModuleServiceInterface.php @@ -21,15 +21,15 @@ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ -namespace Magento\Setup\Module\Setup\Connection; -interface AdapterInterface +namespace Magento\Backend\Service\V1; + +interface ModuleServiceInterface { /** - * Get connection + * Returns an array of enabled modules * - * @param array $config - * @return \Magento\Setup\Framework\DB\Adapter\AdapterInterface|null + * @return string[] */ - public function getConnection(array $config = array()); + public function getModules(); } diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json index ed736bd65da7f..f26196a7f51d3 100644 --- a/app/code/Magento/Backend/composer.json +++ b/app/code/Magento/Backend/composer.json @@ -3,27 +3,26 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-cron": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/module-reports": "0.1.0-alpha98", - "magento/module-catalog-search": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-user": "0.1.0-alpha98", - "magento/module-backup": "0.1.0-alpha98", - "magento/module-email": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-translation": "0.1.0-alpha98", - "magento/module-require-js": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-cron": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/module-reports": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-user": "0.1.0-alpha99", + "magento/module-backup": "0.1.0-alpha99", + "magento/module-email": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-translation": "0.1.0-alpha99", + "magento/module-require-js": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Backend/etc/di.xml b/app/code/Magento/Backend/etc/di.xml index 343b3075c39bb..14b29b543523d 100644 --- a/app/code/Magento/Backend/etc/di.xml +++ b/app/code/Magento/Backend/etc/di.xml @@ -34,6 +34,7 @@ + @@ -141,10 +142,6 @@ - - Magento\Backend\Model\Search\Catalog - Magento_Catalog::catalog - Magento\Backend\Model\Search\Customer Magento_Customer::customer diff --git a/app/code/Magento/Backend/etc/module.xml b/app/code/Magento/Backend/etc/module.xml index 11c99dcde0304..181be8d2cb604 100644 --- a/app/code/Magento/Backend/etc/module.xml +++ b/app/code/Magento/Backend/etc/module.xml @@ -36,7 +36,6 @@ - diff --git a/app/code/Magento/Backend/etc/webapi.xml b/app/code/Magento/Backend/etc/webapi.xml new file mode 100644 index 0000000000000..3d273d2add77f --- /dev/null +++ b/app/code/Magento/Backend/etc/webapi.xml @@ -0,0 +1,34 @@ + + + + + + + + + + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_auth_login.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_auth_login.xml index 8defcd2f56840..3f9472326c031 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_auth_login.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_auth_login.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml index 537c143f43836..9eaa8698a7bb3 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml index 02b8c03fb467c..721dfac9347c7 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersmost.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersmost.xml index de25530d94763..87c72c8c1c538 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersmost.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersmost.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersnewest.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersnewest.xml index 114f524e116c5..6467f1b703524 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersnewest.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersnewest.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml index 2640fc5e3aaf8..b5d1a8f6c232c 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_denied.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_denied.xml index 6d4251833ecc6..6553279dd24a0 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_denied.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_denied.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_noroute.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_noroute.xml index 9bcf654cc5c63..d100395eaaada 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_noroute.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_noroute.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_account_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_account_index.xml index e4b281c77b6f1..647f7d49d75d0 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_account_index.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_account_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_config_edit.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_config_edit.xml index a6e2c06947701..f1ef18c000139 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_config_edit.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_config_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_edit.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_edit.xml index 0e1a15998cdaf..5178a0ed96932 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_edit.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_edit.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid.xml index 4b55f869b6301..b1c3e0f902eac 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid_block.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid_block.xml index bc15183536e38..83a1c645e761c 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid_block.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_grid_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_index.xml index 830dc8b83d227..d488a6b9b6fa8 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_index.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_design_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_grid_block.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_grid_block.xml index 5a0018c2b24ed..25677d50a2a15 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_grid_block.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_grid_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_index.xml index 555925518a819..e742f386a7913 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_index.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_edit.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_edit.xml index 6428e638f37d0..ec5df7a0bef5d 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_edit.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_grid_block.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_grid_block.xml index 00e1418066e76..1c6f65c7583c8 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_grid_block.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_grid_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_index.xml index 7aea6145d8243..c0974bb0d5811 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_index.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_variable_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml index e7d7e18610eae..384a98560b871 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/default.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + Magento Admin diff --git a/app/code/Magento/Backend/view/adminhtml/layout/editor.xml b/app/code/Magento/Backend/view/adminhtml/layout/editor.xml index 0e1ab8be92df5..88db1184bae2d 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/editor.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/editor.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/empty.xml b/app/code/Magento/Backend/view/adminhtml/layout/empty.xml index 7ab3943632ae3..26a37c355cf51 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/empty.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/empty.xml @@ -24,4 +24,4 @@ */ --> + xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd"/> diff --git a/app/code/Magento/Backend/view/adminhtml/layout/formkey.xml b/app/code/Magento/Backend/view/adminhtml/layout/formkey.xml index d0d766de79ab4..66ffc279f9b78 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/formkey.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/formkey.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/overlay_popup.xml b/app/code/Magento/Backend/view/adminhtml/layout/overlay_popup.xml index 77126c89c4522..75dfecb85aae1 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/overlay_popup.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/overlay_popup.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backend/view/adminhtml/layout/popup.xml b/app/code/Magento/Backend/view/adminhtml/layout/popup.xml index d3766960c3e32..9247f50f0d58c 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/popup.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/popup.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json index 2503def215619..90de70719b941 100644 --- a/app/code/Magento/Backup/composer.json +++ b/app/code/Magento/Backup/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-cron": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-cron": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Backup/view/adminhtml/layout/backup_index_block.xml b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_block.xml index b46a22cd5f056..75ce88120e747 100644 --- a/app/code/Magento/Backup/view/adminhtml/layout/backup_index_block.xml +++ b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backup/view/adminhtml/layout/backup_index_grid.xml b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_grid.xml index 25c7fc8be2823..bee72cc124779 100644 --- a/app/code/Magento/Backup/view/adminhtml/layout/backup_index_grid.xml +++ b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Backup/view/adminhtml/layout/backup_index_index.xml b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_index.xml index 7da938812362d..3e66d54fab02e 100644 --- a/app/code/Magento/Backup/view/adminhtml/layout/backup_index_index.xml +++ b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json index b5576e91c0cff..b4b2bd56ed543 100644 --- a/app/code/Magento/Bundle/composer.json +++ b/app/code/Magento/Bundle/composer.json @@ -3,24 +3,24 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-tax": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-catalog-inventory": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-catalog-rule": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-gift-message": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", - "magento/module-webapi": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-tax": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-catalog-inventory": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-catalog-rule": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-gift-message": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", + "magento/module-webapi": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Bundle/etc/adminhtml/di.xml b/app/code/Magento/Bundle/etc/adminhtml/di.xml index aa8319a0538b0..59d4ad89ff9ec 100644 --- a/app/code/Magento/Bundle/etc/adminhtml/di.xml +++ b/app/code/Magento/Bundle/etc/adminhtml/di.xml @@ -37,7 +37,4 @@ - - - diff --git a/app/code/Magento/Bundle/etc/di.xml b/app/code/Magento/Bundle/etc/di.xml index 15c5089db1cd7..96958d6b98c60 100644 --- a/app/code/Magento/Bundle/etc/di.xml +++ b/app/code/Magento/Bundle/etc/di.xml @@ -116,4 +116,7 @@ + + + diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_new.xml b/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_new.xml index b37651e7132f0..e13942eeac5e0 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_new.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_view.xml b/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_view.xml index 639a2d5e733f4..368eaa9061268 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_view.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_bundle.xml b/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_bundle.xml index 97536c0829759..5a0e35e659420 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_bundle.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_bundle.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_new.xml b/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_new.xml index a05ec046b49dc..20d9502c432a1 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_new.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_view_type_bundle.xml b/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_view_type_bundle.xml index ae413bc432b61..9d52b379852d9 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_view_type_bundle.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_view_type_bundle.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/customer_index_wishlist.xml b/app/code/Magento/Bundle/view/adminhtml/layout/customer_index_wishlist.xml index 701ce80dfce88..b7feb584e76b1 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/customer_index_wishlist.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/customer_index_wishlist.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_new.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_new.xml index f8512ca004c82..744574b9303c8 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_new.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml index f8512ca004c82..744574b9303c8 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_view.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_view.xml index 47df9ee96c4e0..ea161eb768a2a 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_view.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_new.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_new.xml index 1b5d422202255..707953eda0d6e 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_new.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_updateqty.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_updateqty.xml index 1b5d422202255..707953eda0d6e 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_updateqty.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_updateqty.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_view.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_view.xml index 26f4a9374247f..00acf1b136a1f 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_view.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_view.xml index b2debfb918a2c..df0273413e313 100644 --- a/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_view.xml +++ b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/stock/disabler.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/stock/disabler.phtml index 9815251d8d09c..7cd8f1cde4395 100644 --- a/app/code/Magento/Bundle/view/adminhtml/templates/product/stock/disabler.phtml +++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/stock/disabler.phtml @@ -26,6 +26,7 @@ require(['jquery'], function($){ $('[data-tab-panel=product-details]').on('stockbeforedisable', function(e) { if (e.productType === 'bundle') { + e.stopPropagation(); return false; } }); diff --git a/app/code/Magento/Bundle/view/base/layout/catalog_product_prices.xml b/app/code/Magento/Bundle/view/base/layout/catalog_product_prices.xml index eda52ea31e819..17e6d8e1c1df5 100644 --- a/app/code/Magento/Bundle/view/base/layout/catalog_product_prices.xml +++ b/app/code/Magento/Bundle/view/base/layout/catalog_product_prices.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml index 31c442f003027..2ea0c9e26c582 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_bundle.xml @@ -23,9 +23,9 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + - + @@ -45,7 +45,9 @@ - + + + @@ -55,7 +57,6 @@ - product.info.addtocart @@ -67,12 +68,14 @@ - + - + + + diff --git a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_simple.xml b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_simple.xml index 0c8007031f3c3..c45d3a1bfe66d 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_simple.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/catalog_product_view_type_simple.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + bundle diff --git a/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_configure_type_bundle.xml b/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_configure_type_bundle.xml index 14109148d3dc7..c14c78e1631ff 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_configure_type_bundle.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_configure_type_bundle.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_item_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_item_renderers.xml index f2f506daaa88f..852baa8104848 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_item_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml index 097874f0ab2c6..e5fd17e9a0853 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/frontend/layout/checkout_onepage_review_item_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/checkout_onepage_review_item_renderers.xml index 06ff0971f806c..e1f9c6408d043 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/checkout_onepage_review_item_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/checkout_onepage_review_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/frontend/layout/default.xml b/app/code/Magento/Bundle/view/frontend/layout/default.xml index 063e968f61505..bbf146b0a1663 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/default.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_creditmemo_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_creditmemo_renderers.xml index a40be037f3e26..c9ca45b4870bb 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_creditmemo_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_creditmemo_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_invoice_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_invoice_renderers.xml index 2e7c8d4a8c19c..562d098a42844 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_invoice_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_invoice_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_renderers.xml index cd716a4c640e9..9b24e58d13359 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_shipment_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_shipment_renderers.xml index 96423a7afbedb..a74b7956a1592 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_shipment_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_email_order_shipment_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_creditmemo_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_creditmemo_renderers.xml index 02f9b8e7022fd..9e77fa0f6cd61 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_order_creditmemo_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_order_creditmemo_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_invoice_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_invoice_renderers.xml index 90ce68bc66b90..9a62079c5d07e 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_order_invoice_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_order_invoice_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_item_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_item_renderers.xml index 702b8594e61a2..d40576349c421 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_order_item_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_order_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_creditmemo_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_creditmemo_renderers.xml index 708f56526c1ff..323809695701c 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_creditmemo_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_creditmemo_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_invoice_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_invoice_renderers.xml index a22768f62c630..70aa2dd64a50a 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_invoice_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_invoice_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_renderers.xml index 8b7adc46df977..cd50ebb403de8 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_shipment_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_shipment_renderers.xml index a76f22c396ecf..6176e3417d4bb 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_shipment_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_order_print_shipment_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Bundle/view/frontend/layout/sales_order_shipment_renderers.xml b/app/code/Magento/Bundle/view/frontend/layout/sales_order_shipment_renderers.xml index 96f810354adef..fcf55a14d640e 100644 --- a/app/code/Magento/Bundle/view/frontend/layout/sales_order_shipment_renderers.xml +++ b/app/code/Magento/Bundle/view/frontend/layout/sales_order_shipment_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json index 7d3f0eff666be..aeded47eb4b72 100644 --- a/app/code/Magento/Captcha/composer.json +++ b/app/code/Magento/Captcha/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Captcha/view/adminhtml/layout/adminhtml_auth_forgotpassword.xml b/app/code/Magento/Captcha/view/adminhtml/layout/adminhtml_auth_forgotpassword.xml index b27b0583c47bd..995142f9691f8 100644 --- a/app/code/Magento/Captcha/view/adminhtml/layout/adminhtml_auth_forgotpassword.xml +++ b/app/code/Magento/Captcha/view/adminhtml/layout/adminhtml_auth_forgotpassword.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Captcha/view/adminhtml/layout/adminhtml_auth_login.xml b/app/code/Magento/Captcha/view/adminhtml/layout/adminhtml_auth_login.xml index 7a03772a5095e..fccbd63f7ad17 100644 --- a/app/code/Magento/Captcha/view/adminhtml/layout/adminhtml_auth_login.xml +++ b/app/code/Magento/Captcha/view/adminhtml/layout/adminhtml_auth_login.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Captcha/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Captcha/view/frontend/layout/checkout_onepage_index.xml index 75321b025c78c..cfd9481f01616 100644 --- a/app/code/Magento/Captcha/view/frontend/layout/checkout_onepage_index.xml +++ b/app/code/Magento/Captcha/view/frontend/layout/checkout_onepage_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Captcha/view/frontend/layout/contact_index_index.xml b/app/code/Magento/Captcha/view/frontend/layout/contact_index_index.xml index 1d4de8a5c2998..619402350c213 100644 --- a/app/code/Magento/Captcha/view/frontend/layout/contact_index_index.xml +++ b/app/code/Magento/Captcha/view/frontend/layout/contact_index_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Captcha/view/frontend/layout/customer_account_create.xml b/app/code/Magento/Captcha/view/frontend/layout/customer_account_create.xml index 3ad54c8ae345f..9fa9242cc43d4 100644 --- a/app/code/Magento/Captcha/view/frontend/layout/customer_account_create.xml +++ b/app/code/Magento/Captcha/view/frontend/layout/customer_account_create.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Captcha/view/frontend/layout/customer_account_forgotpassword.xml b/app/code/Magento/Captcha/view/frontend/layout/customer_account_forgotpassword.xml index 25c56b77d4c11..2b86c38f869d0 100644 --- a/app/code/Magento/Captcha/view/frontend/layout/customer_account_forgotpassword.xml +++ b/app/code/Magento/Captcha/view/frontend/layout/customer_account_forgotpassword.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Captcha/view/frontend/layout/customer_account_login.xml b/app/code/Magento/Captcha/view/frontend/layout/customer_account_login.xml index 094ed7f082a9d..f1a823a1ea837 100644 --- a/app/code/Magento/Captcha/view/frontend/layout/customer_account_login.xml +++ b/app/code/Magento/Captcha/view/frontend/layout/customer_account_login.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php index 959051034c105..1e64386efe5d6 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php @@ -89,7 +89,7 @@ public function getSelectorOptions() 'source' => $this->getUrl('catalog/product/suggestAttributes'), 'minLength' => 0, 'ajaxOptions' => array('data' => array('template_id' => $templateId)), - 'template' => '[data-template-for="product-attribute-search"]', + 'template' => '[data-template-for="product-attribute-search-' . $this->getGroupId() . '"]', 'data' => $this->getSuggestedAttributes('', $templateId) ); } diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php index 46036ff28e267..6448c91820c41 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php @@ -56,7 +56,6 @@ public function _prepareColumns() $this->removeColumn('action'); $this->removeColumn('status'); $this->removeColumn('visibility'); - $this->clearRss(); } /** diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php index dc97a9da9ce95..3c1d34b33a171 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php @@ -76,6 +76,7 @@ public function execute() if ($this->getRequest()->getParam('popup')) { $this->_view->loadLayout(array( + 'default', 'popup', strtolower($this->_request->getFullActionName()), 'catalog_product_' . $product->getTypeId() diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php index 9e7da52f40eb8..b83a9e076b9c6 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php @@ -78,10 +78,10 @@ public function execute() $data = $this->getRequest()->getPost(); if ($data) { - $product = $this->initializationHelper->initialize($this->productBuilder->build($this->getRequest())); - $this->productTypeManager->processProduct($product); - try { + $product = $this->initializationHelper->initialize($this->productBuilder->build($this->getRequest())); + $this->productTypeManager->processProduct($product); + if (isset($data['product'][$product->getIdFieldName()])) { throw new \Magento\Framework\Model\Exception(__('Unable to save product')); } diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Processor.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Processor.php new file mode 100644 index 0000000000000..3eaa67a86e109 --- /dev/null +++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Processor.php @@ -0,0 +1,32 @@ +priceCurrency = $priceCurrency; - $this->_resource = $filterPriceFactory->create(); + $this->_resource = $resource; $this->_customerSession = $customerSession; $this->_priceAlgorithm = $priceAlgorithm; $this->_coreRegistry = $coreRegistry; @@ -212,7 +212,7 @@ public function getRangeItemCounts($range) $rangeKey = 'range_item_counts_' . $range; $items = $this->getData($rangeKey); if (is_null($items)) { - $items = $this->_getResource()->getCount($this, $range); + $items = $this->_getResource()->getCount($range); // checking max number of intervals $i = 0; $lastIndex = null; @@ -310,9 +310,7 @@ protected function _getCalculatedItemsData() if ($appliedInterval && $collection->getPricesCount() <= $this->getIntervalDivisionLimit()) { return array(); } - $this->_priceAlgorithm->setPricesModel( - $this - )->setStatistics( + $this->_priceAlgorithm->setStatistics( $collection->getMinPrice(), $collection->getMaxPrice(), $collection->getPriceStandardDeviation(), @@ -461,20 +459,6 @@ public function apply(\Zend_Controller_Request_Abstract $request) return $this; } - /** - * Apply filter value to product collection based on filter range and selected value - * - * @param int $range - * @param int $index - * @return \Magento\Catalog\Model\Layer\Filter\Price - * @deprecated since 1.7.0.0 - */ - protected function _applyToCollection($range, $index) - { - $this->_getResource()->applyFilterToCollection($this, $range, $index); - return $this; - } - /** * Retrieve active customer group id * @@ -589,59 +573,4 @@ public function getClearLinkText() return parent::getClearLinkText(); } - - /** - * Load range of product prices - * - * @param int $limit - * @param null|int $offset - * @param null|int $lowerPrice - * @param null|int $upperPrice - * @return array - */ - public function loadPrices($limit, $offset = null, $lowerPrice = null, $upperPrice = null) - { - $prices = $this->_getResource()->loadPrices($this, $limit, $offset, $lowerPrice, $upperPrice); - if ($prices) { - $prices = array_map('floatval', $prices); - } - - return $prices; - } - - /** - * Load range of product prices, preceding the price - * - * @param float $price - * @param int $index - * @param null|int $lowerPrice - * @return array|false - */ - public function loadPreviousPrices($price, $index, $lowerPrice = null) - { - $prices = $this->_getResource()->loadPreviousPrices($this, $price, $index, $lowerPrice); - if ($prices) { - $prices = array_map('floatval', $prices); - } - - return $prices; - } - - /** - * Load range of product prices, next to the price - * - * @param float $price - * @param int $rightIndex - * @param null|int $upperPrice - * @return array|false - */ - public function loadNextPrices($price, $rightIndex, $upperPrice = null) - { - $prices = $this->_getResource()->loadNextPrices($this, $price, $rightIndex, $upperPrice); - if ($prices) { - $prices = array_map('floatval', $prices); - } - - return $prices; - } } diff --git a/app/code/Magento/Catalog/Model/Layer/Search/Context.php b/app/code/Magento/Catalog/Model/Layer/Search/Context.php index 396961a930adb..b1d5e1fbd2180 100644 --- a/app/code/Magento/Catalog/Model/Layer/Search/Context.php +++ b/app/code/Magento/Catalog/Model/Layer/Search/Context.php @@ -24,6 +24,9 @@ */ namespace Magento\Catalog\Model\Layer\Search; +use Magento\CatalogSearch\Model\Layer\Search\CollectionFilter; +use Magento\CatalogSearch\Model\Layer\Search\StateKey; + class Context extends \Magento\Catalog\Model\Layer\Context { /** @@ -33,8 +36,8 @@ class Context extends \Magento\Catalog\Model\Layer\Context */ public function __construct( \Magento\Catalog\Model\Layer\Search\ItemCollectionProvider $collectionProvider, - \Magento\Catalog\Model\Layer\Search\StateKey $stateKey, - \Magento\Catalog\Model\Layer\Search\CollectionFilter $collectionFilter + \Magento\CatalogSearch\Model\Layer\Search\StateKey $stateKey, + \Magento\CatalogSearch\Model\Layer\Search\CollectionFilter $collectionFilter ) { parent::__construct($collectionProvider, $stateKey, $collectionFilter); } diff --git a/app/code/Magento/Catalog/Model/Layout/DepersonalizePlugin.php b/app/code/Magento/Catalog/Model/Layout/DepersonalizePlugin.php new file mode 100644 index 0000000000000..0b84231576903 --- /dev/null +++ b/app/code/Magento/Catalog/Model/Layout/DepersonalizePlugin.php @@ -0,0 +1,91 @@ +catalogSession = $catalogSession; + $this->request = $request; + $this->moduleManager = $moduleManager; + $this->cacheConfig = $cacheConfig; + } + + /** + * After generate Xml + * + * @param \Magento\Framework\View\LayoutInterface $subject + * @param \Magento\Framework\View\LayoutInterface $result + * @return \Magento\Framework\View\LayoutInterface + */ + public function afterGenerateXml(\Magento\Framework\View\LayoutInterface $subject, $result) + { + if ($this->moduleManager->isEnabled('Magento_PageCache') + && $this->cacheConfig->isEnabled() + && !$this->request->isAjax() + && $subject->isCacheable() + ) { + $this->catalogSession->clearStorage(); + } + return $result; + } +} diff --git a/app/code/Magento/Catalog/Model/Product/Image/View.php b/app/code/Magento/Catalog/Model/Product/Image/View.php index ae09fce051177..05d42bf3334e3 100644 --- a/app/code/Magento/Catalog/Model/Product/Image/View.php +++ b/app/code/Magento/Catalog/Model/Product/Image/View.php @@ -134,6 +134,8 @@ public function getUrl() $this->getType() )->keepFrame( $this->isWhiteBorders() + )->constrainOnly( + true )->resize( $this->getWidth(), $this->getHeight() diff --git a/app/code/Magento/Catalog/Model/Resource/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/Resource/Layer/Filter/Price.php index 0979f063231e9..98361f06b2f90 100644 --- a/app/code/Magento/Catalog/Model/Resource/Layer/Filter/Price.php +++ b/app/code/Magento/Catalog/Model/Resource/Layer/Filter/Price.php @@ -42,69 +42,93 @@ class Price extends \Magento\Framework\Model\Resource\Db\AbstractDb */ protected $_eventManager = null; + /** + * @var \Magento\Catalog\Model\Layer + */ + private $layer; + + /** + * @var \Magento\Customer\Model\Session + */ + private $session; + + /** + * @var \Magento\Framework\StoreManagerInterface + */ + private $storeManager; + /** * @param \Magento\Framework\App\Resource $resource * @param \Magento\Framework\Event\ManagerInterface $eventManager + * @param \Magento\Catalog\Model\Layer\Category $layer + * @param \Magento\Customer\Model\Session $session + * @param \Magento\Framework\StoreManagerInterface $storeManager */ - public function __construct(\Magento\Framework\App\Resource $resource, \Magento\Framework\Event\ManagerInterface $eventManager) - { + public function __construct( + \Magento\Framework\App\Resource $resource, + \Magento\Framework\Event\ManagerInterface $eventManager, + \Magento\Catalog\Model\Layer\Category $layer, + \Magento\Customer\Model\Session $session, + \Magento\Framework\StoreManagerInterface $storeManager + ) { + $this->layer = $layer; + $this->session = $session; + $this->storeManager = $storeManager; $this->_eventManager = $eventManager; parent::__construct($resource); } /** - * Initialize connection and define main table name + * Retrieve maximal price for attribute * - * @return void + * @param \Magento\Catalog\Model\Layer\Filter\Price $filter + * @return float + * @deprecated since 1.7.0.0 */ - protected function _construct() + public function getMaxPrice($filter) { - $this->_init('catalog_product_index_price', 'entity_id'); + return $filter->getLayer()->getProductCollection()->getMaxPrice(); } /** - * Retrieve joined price index table alias + * Retrieve array with products counts per price range * - * @return string + * @param int $range + * @return array */ - protected function _getIndexTableAlias() + public function getCount($range) { - return 'price_index'; - } + $select = $this->_getSelect(); + $priceExpression = $this->_getFullPriceExpression($select); - /** - * Replace table alias in condition string - * - * @param string|null $conditionString - * @return string|null - */ - protected function _replaceTableAlias($conditionString) - { - if (is_null($conditionString)) { - return null; + /** + * Check and set correct variable values to prevent SQL-injections + */ + $range = floatval($range); + if ($range == 0) { + $range = 1; } - $adapter = $this->_getReadAdapter(); - $oldAlias = array( - \Magento\Catalog\Model\Resource\Product\Collection::INDEX_TABLE_ALIAS . '.', - $adapter->quoteIdentifier(\Magento\Catalog\Model\Resource\Product\Collection::INDEX_TABLE_ALIAS) . '.' - ); - $newAlias = array( - \Magento\Catalog\Model\Resource\Product\Collection::MAIN_TABLE_ALIAS . '.', - $adapter->quoteIdentifier(\Magento\Catalog\Model\Resource\Product\Collection::MAIN_TABLE_ALIAS) . '.' - ); - return str_replace($oldAlias, $newAlias, $conditionString); + $countExpr = new \Zend_Db_Expr('COUNT(*)'); + $rangeExpr = new \Zend_Db_Expr("FLOOR(({$priceExpression}) / {$range}) + 1"); + + $select->columns(array('range' => $rangeExpr, 'count' => $countExpr)); + $select->group($rangeExpr)->order("{$rangeExpr} ASC"); + + return $this->_getReadAdapter()->fetchPairs($select); } /** * Retrieve clean select with joined price index table * - * @param \Magento\Catalog\Model\Layer\Filter\Price $filter * @return \Magento\Framework\DB\Select */ - protected function _getSelect($filter) + protected function _getSelect() { - $collection = $filter->getLayer()->getProductCollection(); - $collection->addPriceData($filter->getCustomerGroupId(), $filter->getWebsiteId()); + $collection = $this->layer->getProductCollection(); + $collection->addPriceData( + $this->session->getCustomerGroupId(), + $this->storeManager->getStore()->getWebsiteId() + ); if (!is_null($collection->getCatalogPreparedSelect())) { $select = clone $collection->getCatalogPreparedSelect(); @@ -121,10 +145,10 @@ protected function _getSelect($filter) // remove join with main table $fromPart = $select->getPart(\Zend_Db_Select::FROM); if (!isset( - $fromPart[\Magento\Catalog\Model\Resource\Product\Collection::INDEX_TABLE_ALIAS] - ) || !isset( - $fromPart[\Magento\Catalog\Model\Resource\Product\Collection::MAIN_TABLE_ALIAS] - ) + $fromPart[\Magento\Catalog\Model\Resource\Product\Collection::INDEX_TABLE_ALIAS] + ) || !isset( + $fromPart[\Magento\Catalog\Model\Resource\Product\Collection::MAIN_TABLE_ALIAS] + ) ) { return $select; } @@ -155,58 +179,50 @@ protected function _getSelect($filter) } $select->where($this->_replaceTableAlias($condition)); } - $select->where($this->_getPriceExpression($filter, $select) . ' IS NOT NULL'); + $select->where($this->_getPriceExpression($select) . ' IS NOT NULL'); return $select; } /** - * Prepare response object and dispatch prepare price event - * Return response object - * - * @param \Magento\Catalog\Model\Layer\Filter\Price $filter - * @param \Magento\Framework\DB\Select $select - * @return \Magento\Framework\Object - * - * @deprecated since 1.7.0.0 - */ - protected function _dispatchPreparePriceEvent($filter, $select) - { - // prepare response object for event - $response = new \Magento\Framework\Object(); - $response->setAdditionalCalculations(array()); - - return $response; - } - - /** - * Retrieve maximal price for attribute - * - * @param \Magento\Catalog\Model\Layer\Filter\Price $filter - * @return float + * Replace table alias in condition string * - * @deprecated since 1.7.0.0 + * @param string|null $conditionString + * @return string|null */ - public function getMaxPrice($filter) + protected function _replaceTableAlias($conditionString) { - return $filter->getLayer()->getProductCollection()->getMaxPrice(); + if (is_null($conditionString)) { + return null; + } + $adapter = $this->_getReadAdapter(); + $oldAlias = array( + \Magento\Catalog\Model\Resource\Product\Collection::INDEX_TABLE_ALIAS . '.', + $adapter->quoteIdentifier(\Magento\Catalog\Model\Resource\Product\Collection::INDEX_TABLE_ALIAS) . '.' + ); + $newAlias = array( + \Magento\Catalog\Model\Resource\Product\Collection::MAIN_TABLE_ALIAS . '.', + $adapter->quoteIdentifier(\Magento\Catalog\Model\Resource\Product\Collection::MAIN_TABLE_ALIAS) . '.' + ); + return str_replace($oldAlias, $newAlias, $conditionString); } /** * Price expression generated by products collection * - * @param \Magento\Catalog\Model\Layer\Filter\Price $filter * @param \Magento\Framework\DB\Select $select * @param bool $replaceAlias * @return string */ - protected function _getPriceExpression($filter, $select, $replaceAlias = true) + protected function _getPriceExpression($select, $replaceAlias = true) { - $priceExpression = $filter->getLayer()->getProductCollection()->getPriceExpression($select); - $additionalPriceExpression = $filter->getLayer()->getProductCollection()->getAdditionalPriceExpression( + $priceExpression = $this->layer->getProductCollection()->getPriceExpression($select); + $additionalPriceExpression = $this->layer->getProductCollection()->getAdditionalPriceExpression( $select ); - $result = empty($additionalPriceExpression) ? $priceExpression : "({$priceExpression} {$additionalPriceExpression})"; + $result = empty($additionalPriceExpression) + ? $priceExpression + : "({$priceExpression} {$additionalPriceExpression})"; if ($replaceAlias) { $result = $this->_replaceTableAlias($result); } @@ -214,68 +230,20 @@ protected function _getPriceExpression($filter, $select, $replaceAlias = true) return $result; } - /** - * Get comparing value sql part - * - * @param float $price - * @param \Magento\Catalog\Model\Layer\Filter\Price $filter - * @param bool $decrease - * @return float - */ - protected function _getComparingValue($price, $filter, $decrease = true) - { - $currencyRate = $filter->getLayer()->getProductCollection()->getCurrencyRate(); - if ($decrease) { - return ($price - self::MIN_POSSIBLE_PRICE / 2) / $currencyRate; - } - return ($price + self::MIN_POSSIBLE_PRICE / 2) / $currencyRate; - } - /** * Get full price expression generated by products collection * - * @param \Magento\Catalog\Model\Layer\Filter\Price $filter * @param \Magento\Framework\DB\Select $select * @return \Zend_Db_Expr */ - protected function _getFullPriceExpression($filter, $select) + protected function _getFullPriceExpression($select) { return new \Zend_Db_Expr( - 'ROUND((' . $this->_getPriceExpression( - $filter, - $select - ) . ') * ' . $filter->getLayer()->getProductCollection()->getCurrencyRate() . ', 2)' + 'ROUND((' . $this->_getPriceExpression($select) + . ') * ' . $this->layer->getProductCollection()->getCurrencyRate() . ', 2)' ); } - /** - * Retrieve array with products counts per price range - * - * @param \Magento\Catalog\Model\Layer\Filter\Price $filter - * @param int $range - * @return array - */ - public function getCount($filter, $range) - { - $select = $this->_getSelect($filter); - $priceExpression = $this->_getFullPriceExpression($filter, $select); - - /** - * Check and set correct variable values to prevent SQL-injections - */ - $range = floatval($range); - if ($range == 0) { - $range = 1; - } - $countExpr = new \Zend_Db_Expr('COUNT(*)'); - $rangeExpr = new \Zend_Db_Expr("FLOOR(({$priceExpression}) / {$range}) + 1"); - - $select->columns(array('range' => $rangeExpr, 'count' => $countExpr)); - $select->group($rangeExpr)->order("{$rangeExpr} ASC"); - - return $this->_getReadAdapter()->fetchPairs($select); - } - /** * Apply attribute filter to product collection * @@ -283,96 +251,108 @@ public function getCount($filter, $range) * @param int $range * @param int $index the range factor * @return $this - * * @deprecated since 1.7.0.0 */ public function applyFilterToCollection($filter, $range, $index) { $select = $filter->getLayer()->getProductCollection()->getSelect(); - $priceExpr = $this->_getPriceExpression($filter, $select); + $priceExpr = $this->_getPriceExpression($select); $filter->getLayer()->getProductCollection()->getSelect()->where( - $priceExpr . ' >= ' . $this->_getComparingValue($range * ($index - 1), $filter) + $priceExpr . ' >= ' . $this->_getComparingValue($range * ($index - 1)) )->where( - $priceExpr . ' < ' . $this->_getComparingValue($range * $index, $filter) + $priceExpr . ' < ' . $this->_getComparingValue($range * $index) ); return $this; } /** - * Load range of product prices + * Get comparing value sql part * - * @param \Magento\Catalog\Model\Layer\Filter\Price $filter - * @param int $limit - * @param null|int $offset - * @param null|int $lowerPrice - * @param null|int $upperPrice - * @return array + * @param float $price + * @param bool $decrease + * @return float */ - public function loadPrices($filter, $limit, $offset = null, $lowerPrice = null, $upperPrice = null) + protected function _getComparingValue($price, $decrease = true) { - $select = $this->_getSelect($filter); - $priceExpression = $this->_getPriceExpression($filter, $select); - $select->columns(array('min_price_expr' => $this->_getFullPriceExpression($filter, $select))); - if (!is_null($lowerPrice)) { - $select->where("{$priceExpression} >= " . $this->_getComparingValue($lowerPrice, $filter)); - } - if (!is_null($upperPrice)) { - $select->where("{$priceExpression} < " . $this->_getComparingValue($upperPrice, $filter)); + $currencyRate = $this->layer->getProductCollection()->getCurrencyRate(); + if ($decrease) { + return ($price - self::MIN_POSSIBLE_PRICE / 2) / $currencyRate; } - $select->order("{$priceExpression} ASC")->limit($limit, $offset); - - return $this->_getReadAdapter()->fetchCol($select); + return ($price + self::MIN_POSSIBLE_PRICE / 2) / $currencyRate; } /** * Load range of product prices, preceding the price * - * @param \Magento\Catalog\Model\Layer\Filter\Price $filter * @param float $price * @param int $index * @param null|int $lowerPrice * @return array|false */ - public function loadPreviousPrices($filter, $price, $index, $lowerPrice = null) + public function loadPreviousPrices($price, $index, $lowerPrice = null) { - $select = $this->_getSelect($filter); - $priceExpression = $this->_getPriceExpression($filter, $select); - $select->columns('COUNT(*)')->where("{$priceExpression} < " . $this->_getComparingValue($price, $filter)); + $select = $this->_getSelect(); + $priceExpression = $this->_getPriceExpression($select); + $select->columns('COUNT(*)')->where("{$priceExpression} < " . $this->_getComparingValue($price)); if (!is_null($lowerPrice)) { - $select->where("{$priceExpression} >= " . $this->_getComparingValue($lowerPrice, $filter)); + $select->where("{$priceExpression} >= " . $this->_getComparingValue($lowerPrice)); } $offset = $this->_getReadAdapter()->fetchOne($select); if (!$offset) { return false; } - return $this->loadPrices($filter, $index - $offset + 1, $offset - 1, $lowerPrice); + return $this->loadPrices($index - $offset + 1, $offset - 1, $lowerPrice); + } + + /** + * Load range of product prices + * + * @param int $limit + * @param null|int $offset + * @param null|int $lowerPrice + * @param null|int $upperPrice + * @return array + */ + public function loadPrices($limit, $offset = null, $lowerPrice = null, $upperPrice = null) + { + $select = $this->_getSelect(); + $priceExpression = $this->_getPriceExpression($select); + $select->columns(array('min_price_expr' => $this->_getFullPriceExpression($select))); + if (!is_null($lowerPrice)) { + $select->where("{$priceExpression} >= " . $this->_getComparingValue($lowerPrice)); + } + if (!is_null($upperPrice)) { + $select->where("{$priceExpression} < " . $this->_getComparingValue($upperPrice)); + } + $select->order("{$priceExpression} ASC")->limit($limit, $offset); + + return $this->_getReadAdapter()->fetchCol($select); } /** * Load range of product prices, next to the price * - * @param \Magento\Catalog\Model\Layer\Filter\Price $filter * @param float $price * @param int $rightIndex * @param null|int $upperPrice * @return array|false */ - public function loadNextPrices($filter, $price, $rightIndex, $upperPrice = null) + public function loadNextPrices($price, $rightIndex, $upperPrice = null) { - $select = $this->_getSelect($filter); + $select = $this->_getSelect(); $pricesSelect = clone $select; - $priceExpression = $this->_getPriceExpression($filter, $pricesSelect); + $priceExpression = $this->_getPriceExpression($pricesSelect); $select->columns( 'COUNT(*)' )->where( - "{$priceExpression} > " . $this->_getComparingValue($price, $filter, false) + "{$priceExpression} > " . $this->_getComparingValue($price, false) ); if (!is_null($upperPrice)) { - $select->where("{$priceExpression} < " . $this->_getComparingValue($upperPrice, $filter)); + $select->where("{$priceExpression} < " . $this->_getComparingValue($upperPrice)); } $offset = $this->_getReadAdapter()->fetchOne($select); if (!$offset) { @@ -380,12 +360,12 @@ public function loadNextPrices($filter, $price, $rightIndex, $upperPrice = null) } $pricesSelect->columns( - array('min_price_expr' => $this->_getFullPriceExpression($filter, $pricesSelect)) + array('min_price_expr' => $this->_getFullPriceExpression($pricesSelect)) )->where( - "{$priceExpression} >= " . $this->_getComparingValue($price, $filter) + "{$priceExpression} >= " . $this->_getComparingValue($price) ); if (!is_null($upperPrice)) { - $pricesSelect->where("{$priceExpression} < " . $this->_getComparingValue($upperPrice, $filter)); + $pricesSelect->where("{$priceExpression} < " . $this->_getComparingValue($upperPrice)); } $pricesSelect->order("{$priceExpression} DESC")->limit($rightIndex - $offset + 1, $offset - 1); @@ -411,7 +391,7 @@ public function applyPriceRange($filter) } $select = $filter->getLayer()->getProductCollection()->getSelect(); - $priceExpr = $this->_getPriceExpression($filter, $select, false); + $priceExpr = $this->_getPriceExpression($select, false); if ($to !== '') { $to = (double)$to; @@ -421,12 +401,32 @@ public function applyPriceRange($filter) } if ($from !== '') { - $select->where($priceExpr . ' >= ' . $this->_getComparingValue($from, $filter)); + $select->where($priceExpr . ' >= ' . $this->_getComparingValue($from)); } if ($to !== '') { - $select->where($priceExpr . ' < ' . $this->_getComparingValue($to, $filter)); + $select->where($priceExpr . ' < ' . $this->_getComparingValue($to)); } return $this; } + + /** + * Initialize connection and define main table name + * + * @return void + */ + protected function _construct() + { + $this->_init('catalog_product_index_price', 'entity_id'); + } + + /** + * Retrieve joined price index table alias + * + * @return string + */ + protected function _getIndexTableAlias() + { + return 'price_index'; + } } diff --git a/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php b/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php index a0c10b1f21110..2085b806b0136 100644 --- a/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php +++ b/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php @@ -42,6 +42,10 @@ class FinalPriceBox extends BasePriceBox */ protected function _toHtml() { + if (!$this->getSaleableItem() || $this->getSaleableItem()->getCanShowPrice() === false) { + return ''; + } + $result = parent::_toHtml(); try { diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json index 9816d6d7ad398..630753db730cf 100644 --- a/app/code/Magento/Catalog/composer.json +++ b/app/code/Magento/Catalog/composer.json @@ -3,33 +3,34 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-cms": "0.1.0-alpha98", - "magento/module-indexer": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-log": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-widget": "0.1.0-alpha98", - "magento/module-wishlist": "0.1.0-alpha98", - "magento/module-tax": "0.1.0-alpha98", - "magento/module-msrp": "0.1.0-alpha98", - "magento/module-catalog-inventory": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-catalog-rule": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-catalog-search": "0.1.0-alpha98", - "magento/module-product-alert": "0.1.0-alpha98", - "magento/module-url-rewrite": "0.1.0-alpha98", - "magento/module-catalog-url-rewrite": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-cms": "0.1.0-alpha99", + "magento/module-indexer": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-log": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-widget": "0.1.0-alpha99", + "magento/module-wishlist": "0.1.0-alpha99", + "magento/module-tax": "0.1.0-alpha99", + "magento/module-msrp": "0.1.0-alpha99", + "magento/module-catalog-inventory": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-catalog-rule": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-catalog-search": "0.1.0-alpha99", + "magento/module-product-alert": "0.1.0-alpha99", + "magento/module-url-rewrite": "0.1.0-alpha99", + "magento/module-catalog-url-rewrite": "0.1.0-alpha99", + "magento/module-page-cache": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Catalog/etc/frontend/di.xml b/app/code/Magento/Catalog/etc/frontend/di.xml index 9665dcee2ad3f..faadeaba5395b 100644 --- a/app/code/Magento/Catalog/etc/frontend/di.xml +++ b/app/code/Magento/Catalog/etc/frontend/di.xml @@ -56,4 +56,8 @@ + + + diff --git a/app/code/Magento/Catalog/etc/frontend/events.xml b/app/code/Magento/Catalog/etc/frontend/events.xml index eee61b3ec64d5..4af06703fb82a 100644 --- a/app/code/Magento/Catalog/etc/frontend/events.xml +++ b/app/code/Magento/Catalog/etc/frontend/events.xml @@ -30,4 +30,7 @@ + + + diff --git a/app/code/Magento/Catalog/etc/module.xml b/app/code/Magento/Catalog/etc/module.xml index 362c7d346faae..9b76a57f28643 100644 --- a/app/code/Magento/Catalog/etc/module.xml +++ b/app/code/Magento/Catalog/etc/module.xml @@ -54,6 +54,7 @@ + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE.xml b/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE.xml index 336ecaa0846a8..5fe0e1be94294 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR.xml b/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR.xml index 993b36f4c610f..931e3ed9e04d9 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_UPDATE_RESULT.xml b/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_UPDATE_RESULT.xml index a9f03e3a291b1..f5e87c09dd6dd 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_UPDATE_RESULT.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_UPDATE_RESULT.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_category_edit.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_category_edit.xml index 9a49726e05342..94e39a554347a 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_category_edit.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_category_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_action_attribute_edit.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_action_attribute_edit.xml index 3d5fa50cf4d3c..6cb1d4a83eec0 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_action_attribute_edit.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_action_attribute_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertspricegrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertspricegrid.xml index bf2926e9aa3c2..a6b6a497faa70 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertspricegrid.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertspricegrid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertsstockgrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertsstockgrid.xml index edcde3aafa8f4..38e4c36791352 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertsstockgrid.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertsstockgrid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit.xml index 0c8b7de3a8ef7..098fe9b68d893 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit_popup.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit_popup.xml index 996ceb26c22b1..a902d9089eb0f 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit_popup.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit_popup.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml index 095815566e6af..a96ec6efad151 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssellgrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssellgrid.xml index 5037b7c6b8f88..7b53b1b87ed5d 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssellgrid.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssellgrid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_customoptions.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_customoptions.xml index 1ebbdeec6b528..6b0124a30ebfa 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_customoptions.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_customoptions.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_edit.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_edit.xml index f1a3ea42d6c3e..91dfa3bbae379 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_edit.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grid.xml index e354a47ec9a31..fe53969775107 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grid.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml index 4ee8fbba74586..3a4f710a23b67 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + Magento_Catalog::catalog_products diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_new.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_new.xml index 40c23d672cdf7..316b3ea887bed 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_new.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_options.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_options.xml index 8869a742e03e0..c7f919b4b17d4 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_options.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_options.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_optionsimportgrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_optionsimportgrid.xml index 6ef9015b6b0ed..b7de81d34be8e 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_optionsimportgrid.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_optionsimportgrid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_related.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_related.xml index 5b5e3d9734844..f5cdc41a678e5 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_related.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_related.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_relatedgrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_relatedgrid.xml index e07f2105d7daf..ad7fd8a7b88b2 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_relatedgrid.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_relatedgrid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_block.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_block.xml index fc0c0092061b3..aaaa6794acf7c 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_block.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_edit.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_edit.xml index fbef56fcd1530..58783b06041f5 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_edit.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsell.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsell.xml index 691c4d952caf9..586e851fc102e 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsell.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsell.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsellgrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsellgrid.xml index 8909fa7548673..73ce1cad81484 100644 --- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsellgrid.xml +++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsellgrid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml index 93d2133913ee0..8885d42a7ec56 100644 --- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml +++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml @@ -282,7 +282,7 @@ toggleValueElements($('inventory_use_config_qty_increments'), $('inventory_use_c
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml index f2eee7e1660d3..950c83cb2b454 100644 --- a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml +++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml @@ -37,7 +37,7 @@
- getInList()): ?> diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml index ce95274d4ef25..7f09e6c36ec9f 100644 --- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml +++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml @@ -27,9 +27,9 @@ $_item = $this->getItem(); ?> - escapeHtml($this->getProductName()) ?> + escapeHtml($this->getProductName()) ?> getOptionList()):?> -
+
getFormatedOptionValue($_option) ?>
escapeHtml($_option['label']) ?>
diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json index 83c52cd325b9d..5c8fab2b69cd0 100644 --- a/app/code/Magento/CheckoutAgreements/composer.json +++ b/app/code/Magento/CheckoutAgreements/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-store": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/layout/checkout_onepage_review.xml b/app/code/Magento/CheckoutAgreements/view/frontend/layout/checkout_onepage_review.xml index 98e8901bffee3..2b82e637e57ef 100644 --- a/app/code/Magento/CheckoutAgreements/view/frontend/layout/checkout_onepage_review.xml +++ b/app/code/Magento/CheckoutAgreements/view/frontend/layout/checkout_onepage_review.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml b/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml index 915cabf185ddf..4e0eef6b396f4 100644 --- a/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml +++ b/app/code/Magento/CheckoutAgreements/view/frontend/layout/multishipping_checkout_overview.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/layout/paypal_express_review.xml b/app/code/Magento/CheckoutAgreements/view/frontend/layout/paypal_express_review.xml index c221177ac6dfc..e2c1fea67e04f 100644 --- a/app/code/Magento/CheckoutAgreements/view/frontend/layout/paypal_express_review.xml +++ b/app/code/Magento/CheckoutAgreements/view/frontend/layout/paypal_express_review.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/layout/paypal_payflowexpress_review.xml b/app/code/Magento/CheckoutAgreements/view/frontend/layout/paypal_payflowexpress_review.xml index c221177ac6dfc..e2c1fea67e04f 100644 --- a/app/code/Magento/CheckoutAgreements/view/frontend/layout/paypal_payflowexpress_review.xml +++ b/app/code/Magento/CheckoutAgreements/view/frontend/layout/paypal_payflowexpress_review.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json index 49ffbcf4fa66c..40f67d3f187d3 100644 --- a/app/code/Magento/Cms/composer.json +++ b/app/code/Magento/Cms/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/module-widget": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-email": "0.1.0-alpha98", - "magento/module-ui": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/module-widget": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-email": "0.1.0-alpha99", + "magento/module-ui": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_edit.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_edit.xml index ffce5673a3443..957342f773808 100644 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_edit.xml +++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml index 6439c07fd1686..e9e74c3dd24cf 100644 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml +++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_listing.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_listing.xml index 4c9f1a309ee99..29bb9e9f04732 100644 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_listing.xml +++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_listing.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + cms_block_listing diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_new.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_new.xml index 01ca2f6dc4f20..618ce5c81b9c9 100644 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_new.xml +++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_new.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_edit.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_edit.xml index ecfc23280d6df..bf3d34736470d 100644 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_edit.xml +++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml index bfe3daab138c3..56397a6e711b7 100644 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml +++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_listing.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_listing.xml index 7dedb50ab33b8..21b2d0cd9871e 100644 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_listing.xml +++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_listing.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + cms_page_listing diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_new.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_new.xml index 98b741cc5da04..369394cdf3c13 100644 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_new.xml +++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_new.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_contents.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_contents.xml index 718e5353d60a6..ad6220813a64c 100644 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_contents.xml +++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_contents.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_index.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_index.xml index f2f91a1955d73..d3dcb3de1e87a 100644 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_index.xml +++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_wysiwyg_images_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Cms/view/frontend/layout/cms_index_defaultindex.xml b/app/code/Magento/Cms/view/frontend/layout/cms_index_defaultindex.xml index 9de082fb74292..d51e83b6d3662 100644 --- a/app/code/Magento/Cms/view/frontend/layout/cms_index_defaultindex.xml +++ b/app/code/Magento/Cms/view/frontend/layout/cms_index_defaultindex.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Cms/view/frontend/layout/cms_index_defaultnoroute.xml b/app/code/Magento/Cms/view/frontend/layout/cms_index_defaultnoroute.xml index 6f358ae111abc..07909c50537ab 100644 --- a/app/code/Magento/Cms/view/frontend/layout/cms_index_defaultnoroute.xml +++ b/app/code/Magento/Cms/view/frontend/layout/cms_index_defaultnoroute.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Cms/view/frontend/layout/cms_index_index.xml b/app/code/Magento/Cms/view/frontend/layout/cms_index_index.xml index 28642f37db44e..706558a3cf19c 100644 --- a/app/code/Magento/Cms/view/frontend/layout/cms_index_index.xml +++ b/app/code/Magento/Cms/view/frontend/layout/cms_index_index.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Cms/view/frontend/layout/cms_index_nocookies.xml b/app/code/Magento/Cms/view/frontend/layout/cms_index_nocookies.xml index 28642f37db44e..706558a3cf19c 100644 --- a/app/code/Magento/Cms/view/frontend/layout/cms_index_nocookies.xml +++ b/app/code/Magento/Cms/view/frontend/layout/cms_index_nocookies.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Cms/view/frontend/layout/cms_index_noroute.xml b/app/code/Magento/Cms/view/frontend/layout/cms_index_noroute.xml index 28642f37db44e..706558a3cf19c 100644 --- a/app/code/Magento/Cms/view/frontend/layout/cms_index_noroute.xml +++ b/app/code/Magento/Cms/view/frontend/layout/cms_index_noroute.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Cms/view/frontend/layout/cms_page_view.xml b/app/code/Magento/Cms/view/frontend/layout/cms_page_view.xml index b665dcf4f6408..bede1914e156a 100644 --- a/app/code/Magento/Cms/view/frontend/layout/cms_page_view.xml +++ b/app/code/Magento/Cms/view/frontend/layout/cms_page_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Cms/view/frontend/layout/default.xml b/app/code/Magento/Cms/view/frontend/layout/default.xml index 2680f611724a8..ddfc2668cb3f6 100644 --- a/app/code/Magento/Cms/view/frontend/layout/default.xml +++ b/app/code/Magento/Cms/view/frontend/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Cms/view/frontend/layout/print.xml b/app/code/Magento/Cms/view/frontend/layout/print.xml index 28642f37db44e..706558a3cf19c 100644 --- a/app/code/Magento/Cms/view/frontend/layout/print.xml +++ b/app/code/Magento/Cms/view/frontend/layout/print.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json index 0817b25e54b15..0b9eb21309d7d 100644 --- a/app/code/Magento/CmsUrlRewrite/composer.json +++ b/app/code/Magento/CmsUrlRewrite/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-cms": "0.1.0-alpha98", - "magento/module-url-rewrite": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-cms": "0.1.0-alpha99", + "magento/module-url-rewrite": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json index 60a4cb8ee0a1f..ff6273fb6cbbe 100644 --- a/app/code/Magento/ConfigurableImportExport/composer.json +++ b/app/code/Magento/ConfigurableImportExport/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-catalog-import-export": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-import-export": "0.1.0-alpha98", - "magento/module-configurable-product": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-catalog-import-export": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-import-export": "0.1.0-alpha99", + "magento/module-configurable-product": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json index a73d1b581d4f6..9ed7ffec610a2 100644 --- a/app/code/Magento/ConfigurableProduct/composer.json +++ b/app/code/Magento/ConfigurableProduct/composer.json @@ -3,23 +3,23 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-catalog-inventory": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-catalog-rule": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", - "magento/module-webapi": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-catalog-inventory": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-catalog-rule": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", + "magento/module-webapi": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/ConfigurableProduct/etc/di.xml b/app/code/Magento/ConfigurableProduct/etc/di.xml index 447c8e94c509b..f45a634c98fd0 100644 --- a/app/code/Magento/ConfigurableProduct/etc/di.xml +++ b/app/code/Magento/ConfigurableProduct/etc/di.xml @@ -40,7 +40,7 @@ - + diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_attribute_edit.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_attribute_edit.xml index 853f9abf1e111..447b9bc1dea43 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_attribute_edit.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_attribute_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_attribute_edit_product_tab_variations_popup.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_attribute_edit_product_tab_variations_popup.xml index 7b05745a67be0..2ceb7fecedb27 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_attribute_edit_product_tab_variations_popup.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_attribute_edit_product_tab_variations_popup.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_configurable.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_configurable.xml index e2569e2bf7efa..45c110a4cfba7 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_configurable.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_configurable.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_downloadable.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_downloadable.xml index 386ab12e51ec2..8e9e19b1cd5d9 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_downloadable.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_downloadable.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_generatevariations_index.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_generatevariations_index.xml index a891595b108e5..9e628183fb5a2 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_generatevariations_index.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_generatevariations_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_new.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_new.xml index bbbd73d421811..9936ee8bc207a 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_new.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_set_edit.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_set_edit.xml index 572ff0bbe75e5..339aa7d30c304 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_set_edit.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_set_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + - + diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_superconfig_config.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_superconfig_config.xml index 3d55a7decd045..3de64f391f5bf 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_superconfig_config.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_superconfig_config.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_superconfig_index.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_superconfig_index.xml index ebae1ddde3278..90e927ebbcf7b 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_superconfig_index.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_superconfig_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_view_type_configurable.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_view_type_configurable.xml index 8ae8aa4f5f8cb..fadab3f38eb65 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_view_type_configurable.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_view_type_configurable.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_virtual.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_virtual.xml index 386ab12e51ec2..8e9e19b1cd5d9 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_virtual.xml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_virtual.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml index e269f3e3c81c0..46b6e73342209 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml @@ -73,6 +73,8 @@ require([ collapsableArea = $('> .collapse', collapsableWrapper), stockAvailabilityField = $('#quantity_and_stock_status'), qtyField = $('#qty'), + inventoryQty = $('#inventory_qty'), + inventoryAvailabilityField = $('#inventory_stock_availability'), currentProductTemplateControl = $('#product-template-suggest-container .action-dropdown > .action-toggle'), attributesInput = $("input[name='attributes[]']", variationsContainer), hasVariations = getProduct()->getTypeId() == Configurable::TYPE_CODE || $this->getRequest()->has('attributes')) ? 'true' : 'false' ?>, @@ -86,8 +88,7 @@ require([ }, enableElement = function (element) { if (!isLocked(element)) { - element.removeProp('disabled').trigger('change'); - + element.removeProp('disabled').trigger('change'); } }; @@ -99,9 +100,11 @@ require([ attributesInput.prop('disabled', false); + stockAvailabilityField.val(1); + inventoryQty.prop('disabled', true); + inventoryAvailabilityField.removeProp('disabled'); disableElement(qtyField); enableElement(stockAvailabilityField); - $.each($.mage.variationsAttributes($('#configurable-attributes-container')).getAttributes(), function() { $('#attribute-' + this.code + '-container select').prop('disabled', true); }) @@ -113,7 +116,8 @@ require([ currentProductTemplateControl .removeClass('disabled') .removeProp('disabled'); - + inventoryQty.removeProp('disabled'); + inventoryAvailabilityField.prop('disabled', true); disableElement(stockAvailabilityField); enableElement(qtyField); }) diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/stock/disabler.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/stock/disabler.phtml index 525f54a7e4793..9c786c809e8d8 100644 --- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/stock/disabler.phtml +++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/stock/disabler.phtml @@ -25,7 +25,9 @@ diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json index 30d86f3de8621..a0b8bf47eab8f 100644 --- a/app/code/Magento/GoogleAdwords/composer.json +++ b/app/code/Magento/GoogleAdwords/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/GoogleAdwords/view/frontend/layout/checkout_onepage_success.xml b/app/code/Magento/GoogleAdwords/view/frontend/layout/checkout_onepage_success.xml index 04767858e601f..771022f1eff10 100644 --- a/app/code/Magento/GoogleAdwords/view/frontend/layout/checkout_onepage_success.xml +++ b/app/code/Magento/GoogleAdwords/view/frontend/layout/checkout_onepage_success.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GoogleAnalytics/composer.json b/app/code/Magento/GoogleAnalytics/composer.json index d37451ce68754..0dd3827005128 100644 --- a/app/code/Magento/GoogleAnalytics/composer.json +++ b/app/code/Magento/GoogleAnalytics/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/GoogleAnalytics/view/frontend/layout/default.xml b/app/code/Magento/GoogleAnalytics/view/frontend/layout/default.xml index ba1d676c236fd..8f228b649f330 100644 --- a/app/code/Magento/GoogleAnalytics/view/frontend/layout/default.xml +++ b/app/code/Magento/GoogleAnalytics/view/frontend/layout/default.xml @@ -23,8 +23,8 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - - + + diff --git a/app/code/Magento/GoogleOptimizer/composer.json b/app/code/Magento/GoogleOptimizer/composer.json index 61834880cdddb..a971bab4db4d8 100644 --- a/app/code/Magento/GoogleOptimizer/composer.json +++ b/app/code/Magento/GoogleOptimizer/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-google-analytics": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-cms": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-google-analytics": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-cms": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/GoogleOptimizer/view/adminhtml/layout/adminhtml_cms_page_edit.xml b/app/code/Magento/GoogleOptimizer/view/adminhtml/layout/adminhtml_cms_page_edit.xml index f4994744affc3..21b5bc5e38cc5 100644 --- a/app/code/Magento/GoogleOptimizer/view/adminhtml/layout/adminhtml_cms_page_edit.xml +++ b/app/code/Magento/GoogleOptimizer/view/adminhtml/layout/adminhtml_cms_page_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + google-experiment diff --git a/app/code/Magento/GoogleOptimizer/view/adminhtml/layout/catalog_product_new.xml b/app/code/Magento/GoogleOptimizer/view/adminhtml/layout/catalog_product_new.xml index 6dafa0833c929..bb6873e23ad03 100644 --- a/app/code/Magento/GoogleOptimizer/view/adminhtml/layout/catalog_product_new.xml +++ b/app/code/Magento/GoogleOptimizer/view/adminhtml/layout/catalog_product_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + google-experiment diff --git a/app/code/Magento/GoogleOptimizer/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/GoogleOptimizer/view/frontend/layout/catalog_category_view.xml index 5f6e4a8562614..91a83d5bac467 100644 --- a/app/code/Magento/GoogleOptimizer/view/frontend/layout/catalog_category_view.xml +++ b/app/code/Magento/GoogleOptimizer/view/frontend/layout/catalog_category_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GoogleOptimizer/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/GoogleOptimizer/view/frontend/layout/catalog_product_view.xml index c8e69375781eb..9167cac80984f 100644 --- a/app/code/Magento/GoogleOptimizer/view/frontend/layout/catalog_product_view.xml +++ b/app/code/Magento/GoogleOptimizer/view/frontend/layout/catalog_product_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GoogleOptimizer/view/frontend/layout/cms_page_view.xml b/app/code/Magento/GoogleOptimizer/view/frontend/layout/cms_page_view.xml index c8f53e719a5fe..9a0c00b8d54d8 100644 --- a/app/code/Magento/GoogleOptimizer/view/frontend/layout/cms_page_view.xml +++ b/app/code/Magento/GoogleOptimizer/view/frontend/layout/cms_page_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GoogleShopping/composer.json b/app/code/Magento/GoogleShopping/composer.json index a745694b62e9d..b8da01b942a1d 100644 --- a/app/code/Magento/GoogleShopping/composer.json +++ b/app/code/Magento/GoogleShopping/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-tax": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-tax": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_items_index.xml b/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_items_index.xml index 5ff3bd78037aa..a0600a8c31949 100644 --- a/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_items_index.xml +++ b/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_items_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_block.xml b/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_block.xml index 55726205dbaa5..a7e7f571bc7e7 100644 --- a/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_block.xml +++ b/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_block.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_grid.xml b/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_grid.xml index 3847e080441e7..ebb70097ff7f5 100644 --- a/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_grid.xml +++ b/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_index.xml b/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_index.xml index b193cabf7143b..281d1e56d2f63 100644 --- a/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_index.xml +++ b/app/code/Magento/GoogleShopping/view/adminhtml/layout/adminhtml_googleshopping_types_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GoogleShopping/view/frontend/layout/cms_index_index.xml b/app/code/Magento/GoogleShopping/view/frontend/layout/cms_index_index.xml index 48ddf5978c5c2..7154d2ab1e15b 100644 --- a/app/code/Magento/GoogleShopping/view/frontend/layout/cms_index_index.xml +++ b/app/code/Magento/GoogleShopping/view/frontend/layout/cms_index_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedImportExport/composer.json b/app/code/Magento/GroupedImportExport/composer.json index c6f0282751b99..24eee9c8ca0fa 100644 --- a/app/code/Magento/GroupedImportExport/composer.json +++ b/app/code/Magento/GroupedImportExport/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-import-export": "0.1.0-alpha98", - "magento/module-catalog-import-export": "0.1.0-alpha98", - "magento/module-grouped-product": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-import-export": "0.1.0-alpha99", + "magento/module-catalog-import-export": "0.1.0-alpha99", + "magento/module-grouped-product": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json index 157c79664c81a..105c39d73cecf 100644 --- a/app/code/Magento/GroupedProduct/composer.json +++ b/app/code/Magento/GroupedProduct/composer.json @@ -3,21 +3,21 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-catalog-inventory": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-msrp": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-catalog-inventory": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-msrp": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_grouped.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_grouped.xml index e40ba57b44a27..de004287bbd55 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_grouped.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_grouped.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_new.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_new.xml index 5360a6ce095e9..e26f78d9cd00c 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_new.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_view_type_grouped.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_view_type_grouped.xml index b041dbba665ff..d7eb6329e387f 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_view_type_grouped.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/catalog_product_view_type_grouped.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_edit_popup.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_edit_popup.xml index d23628c37125f..e8309072286ba 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_edit_popup.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_edit_popup.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_popup_grid.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_popup_grid.xml index 753488728ae1d..d7f5b87fced0e 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_popup_grid.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_popup_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_new.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_new.xml index 00181c29d9dbd..0d378f8b19a4f 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_new.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml index 00181c29d9dbd..0d378f8b19a4f 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_view.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_view.xml index 22c8958e3b4f1..40c89c4e47538 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_view.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_creditmemo_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_new.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_new.xml index 00181c29d9dbd..0d378f8b19a4f 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_new.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_updateqty.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_updateqty.xml index 00181c29d9dbd..0d378f8b19a4f 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_updateqty.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_updateqty.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_view.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_view.xml index 2f2706f0ad4d2..5839c6fae2394 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_view.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_invoice_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_view.xml index 00181c29d9dbd..0d378f8b19a4f 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_view.xml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/layout/sales_order_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/stock/disabler.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/stock/disabler.phtml index c79defd79eba8..a5b32d96478de 100644 --- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/stock/disabler.phtml +++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/stock/disabler.phtml @@ -24,12 +24,11 @@ ?> diff --git a/app/code/Magento/GroupedProduct/view/base/layout/catalog_product_prices.xml b/app/code/Magento/GroupedProduct/view/base/layout/catalog_product_prices.xml index bd252f53f43eb..682cdc69cbea5 100644 --- a/app/code/Magento/GroupedProduct/view/base/layout/catalog_product_prices.xml +++ b/app/code/Magento/GroupedProduct/view/base/layout/catalog_product_prices.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_rss_feed_renderer_list.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_rss_feed_renderer_list.xml index 01274abfeaa53..6096237b090a7 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_rss_feed_renderer_list.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_rss_feed_renderer_list.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + catalog_product_prices diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_view_type_grouped.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_view_type_grouped.xml index f157c3dc85484..506bf1718da08 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_view_type_grouped.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/catalog_product_view_type_grouped.xml @@ -23,7 +23,10 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + + + + diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_item_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_item_renderers.xml index 534237f5f2432..e28ab0ee9bed7 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_item_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml index 5037d6ab8e875..f86ce5c6a1047 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_cart_sidebar_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_onepage_review_item_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_onepage_review_item_renderers.xml index 477c5dfe9fde0..8cc7148842228 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_onepage_review_item_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/checkout_onepage_review_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_creditmemo_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_creditmemo_renderers.xml index d5a9e85466e18..11fccaa410991 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_creditmemo_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_creditmemo_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_invoice_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_invoice_renderers.xml index 3ef1ea6d5dd5c..46c53cfc13072 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_invoice_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_invoice_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_renderers.xml index 4244ff7d511a9..675f206e4f31c 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_email_order_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_guest_invoice.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_guest_invoice.xml index 9df7cf6639d8c..e697612034cb5 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_guest_invoice.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_guest_invoice.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_creditmemo_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_creditmemo_renderers.xml index 9f32e9a595e5d..c28802936da11 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_creditmemo_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_creditmemo_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_invoice_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_invoice_renderers.xml index 9df7cf6639d8c..e697612034cb5 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_invoice_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_invoice_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_item_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_item_renderers.xml index 5add41f8b1101..2da4237857c17 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_item_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_item_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_creditmemo_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_creditmemo_renderers.xml index 099a0d75ab1fe..6763f97aa426b 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_creditmemo_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_creditmemo_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_invoice_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_invoice_renderers.xml index 833610a391880..9b1db40e5efb9 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_invoice_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_invoice_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_renderers.xml b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_renderers.xml index d60e003153b05..fdbef13de242a 100644 --- a/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_renderers.xml +++ b/app/code/Magento/GroupedProduct/view/frontend/layout/sales_order_print_renderers.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json index 0893d2ffac494..c4df769cd1cb5 100644 --- a/app/code/Magento/ImportExport/composer.json +++ b/app/code/Magento/ImportExport/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-indexer": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-indexer": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "ext-ctype": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_getfilter.xml b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_getfilter.xml index e732b8a72c1b1..f71d119db7eca 100644 --- a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_getfilter.xml +++ b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_getfilter.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_index.xml b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_index.xml index ac895c6fd1fc6..d07c5087acdcd 100644 --- a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_index.xml +++ b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_busy.xml b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_busy.xml index 479436acd5b32..da4b7e44fac53 100644 --- a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_busy.xml +++ b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_busy.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_index.xml b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_index.xml index f0939e9e99821..464c563ece823 100644 --- a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_index.xml +++ b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_start.xml b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_start.xml index 8e45931900594..038b61cf25e04 100644 --- a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_start.xml +++ b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_start.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_validate.xml b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_validate.xml index 8e45931900594..038b61cf25e04 100644 --- a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_validate.xml +++ b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_import_validate.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Indexer/composer.json b/app/code/Magento/Indexer/composer.json index c077d1cb6d95a..89158bdb712fd 100644 --- a/app/code/Magento/Indexer/composer.json +++ b/app/code/Magento/Indexer/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-page-cache": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-page-cache": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list.xml b/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list.xml index 1fba3b04c1b24..114704ab23474 100644 --- a/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list.xml +++ b/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list.xml @@ -23,9 +23,9 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + - \ No newline at end of file + diff --git a/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list_grid.xml b/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list_grid.xml index 7838f6daa6e5f..14d756faa8b78 100644 --- a/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list_grid.xml +++ b/app/code/Magento/Indexer/view/adminhtml/layout/indexer_indexer_list_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Install/Block/Begin.php b/app/code/Magento/Install/Block/Begin.php deleted file mode 100644 index 1cd3952eb00c1..0000000000000 --- a/app/code/Magento/Install/Block/Begin.php +++ /dev/null @@ -1,87 +0,0 @@ -_eulaFile = $eulaFile; - parent::__construct($context, $installer, $installWizard, $session, $data); - } - - /** - * Get wizard URL - * - * @return string - */ - public function getPostUrl() - { - return $this->getUrl('install/wizard/beginPost'); - } - - /** - * Get License HTML contents - * - * @return string - */ - public function getLicenseHtml() - { - return $this->_eulaFile ? $this->_filesystem->getDirectoryRead( - \Magento\Framework\App\Filesystem::ROOT_DIR - )->readFile( - $this->_eulaFile - ) : ''; - } -} diff --git a/app/code/Magento/Install/Model/Installer.php b/app/code/Magento/Install/Model/Installer.php index 5d5984ce81edb..c65795f30daba 100644 --- a/app/code/Magento/Install/Model/Installer.php +++ b/app/code/Magento/Install/Model/Installer.php @@ -401,7 +401,7 @@ public function installDb() } if (!empty($data['admin_no_form_key'])) { - $this->_installSetup->setConfigData('admin/security/use_form_key', 0); + $this->_installSetup->setConfigData(\Magento\Backend\Model\Url::XML_PATH_USE_SECURE_KEY, 0); } $unsecureBaseUrl = $this->_storeManager->getStore()->getBaseUrl('web'); diff --git a/app/code/Magento/Install/composer.json b/app/code/Magento/Install/composer.json index e77069c40ddce..d97e8728870e1 100644 --- a/app/code/Magento/Install/composer.json +++ b/app/code/Magento/Install/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-directory": "0.1.0-alpha98", - "magento/module-user": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-directory": "0.1.0-alpha99", + "magento/module-user": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Install/etc/di.xml b/app/code/Magento/Install/etc/di.xml index d324d9ebac622..d937d383f98ab 100644 --- a/app/code/Magento/Install/etc/di.xml +++ b/app/code/Magento/Install/etc/di.xml @@ -43,12 +43,6 @@ - - - LICENSE.html - Magento\Install\Model\Session - - Magento\Framework\Encryption\Encryptor::PARAM_CRYPT_KEY diff --git a/app/code/Magento/Install/view/adminhtml/layout/default.xml b/app/code/Magento/Install/view/adminhtml/layout/default.xml index 3bacc75455730..926dc03ac0142 100644 --- a/app/code/Magento/Install/view/adminhtml/layout/default.xml +++ b/app/code/Magento/Install/view/adminhtml/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Install/view/install/layout/install_wizard.xml b/app/code/Magento/Install/view/install/layout/install_wizard.xml index fe808ace143a7..202c11765cef9 100644 --- a/app/code/Magento/Install/view/install/layout/install_wizard.xml +++ b/app/code/Magento/Install/view/install/layout/install_wizard.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Install/view/install/layout/install_wizard_config.xml b/app/code/Magento/Install/view/install/layout/install_wizard_config.xml index 3badd73bdf650..789941b22da00 100644 --- a/app/code/Magento/Install/view/install/layout/install_wizard_config.xml +++ b/app/code/Magento/Install/view/install/layout/install_wizard_config.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + db/main.phtml diff --git a/app/code/Magento/Install/view/install/templates/begin.phtml b/app/code/Magento/Install/view/install/templates/begin.phtml deleted file mode 100644 index 9ab46265ed829..0000000000000 --- a/app/code/Magento/Install/view/install/templates/begin.phtml +++ /dev/null @@ -1,63 +0,0 @@ - -
-

!

-
-getLayout()->getMessagesBlock()->getGroupedHtml() ?> -getLayout()->getMessagesBlock()->getMessages()) == 0): ?> -
-
- getLicenseHtml() ?> -
-

- - -

- -
- -
-
- - diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json index ac122e1c5aa8d..aceae5052c414 100644 --- a/app/code/Magento/Integration/composer.json +++ b/app/code/Magento/Integration/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-user": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", - "magento/module-authorization": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-user": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", + "magento/module-authorization": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_edit.xml b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_edit.xml index c32013899ef22..3a54525dece7a 100644 --- a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_edit.xml +++ b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_grid.xml b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_grid.xml index 2325b44b985e3..25a665b1451d0 100644 --- a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_grid.xml +++ b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_grid.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_grid_block.xml b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_grid_block.xml index 152395b8753eb..16623b926c1c6 100644 --- a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_grid_block.xml +++ b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_grid_block.xml @@ -25,7 +25,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_index.xml b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_index.xml index aa065fb1b8a54..310e194d57c02 100644 --- a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_index.xml +++ b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_index.xml @@ -25,7 +25,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_new.xml b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_new.xml index 1a7a5a6f04a07..82ffd3d25250e 100644 --- a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_new.xml +++ b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_new.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_permissionsdialog.xml b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_permissionsdialog.xml index 689156c76b771..1ea7fb3f421bd 100644 --- a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_permissionsdialog.xml +++ b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_permissionsdialog.xml @@ -25,7 +25,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_tokensdialog.xml b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_tokensdialog.xml index 27bd30b20231c..9a7ef6eb8cff2 100644 --- a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_tokensdialog.xml +++ b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_tokensdialog.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_tokensexchange.xml b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_tokensexchange.xml index c3973927ef249..91227d43a0c93 100644 --- a/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_tokensexchange.xml +++ b/app/code/Magento/Integration/view/adminhtml/layout/adminhtml_integration_tokensexchange.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/LayeredNavigation/composer.json b/app/code/Magento/LayeredNavigation/composer.json index 3673a1dd30314..ff05d46afd5d6 100644 --- a/app/code/Magento/LayeredNavigation/composer.json +++ b/app/code/Magento/LayeredNavigation/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/1column.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/1column.xml index 5d0df7e4f0c73..54f9679596045 100644 --- a/app/code/Magento/LayeredNavigation/view/frontend/layout/1column.xml +++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/1column.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/2columns-left.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/2columns-left.xml index cca2f785f0bd2..eb3114fb730ba 100644 --- a/app/code/Magento/LayeredNavigation/view/frontend/layout/2columns-left.xml +++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/2columns-left.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/2columns-right.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/2columns-right.xml index 0d41915c8877e..f663cb7621546 100644 --- a/app/code/Magento/LayeredNavigation/view/frontend/layout/2columns-right.xml +++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/2columns-right.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/3columns.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/3columns.xml index b98930a466945..410e4c2b287a6 100644 --- a/app/code/Magento/LayeredNavigation/view/frontend/layout/3columns.xml +++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/3columns.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalog_category_view_type_layered.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalog_category_view_type_layered.xml index 026096a37add1..545e86586b922 100644 --- a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalog_category_view_type_layered.xml +++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalog_category_view_type_layered.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalog_category_view_type_layered_without_children.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalog_category_view_type_layered_without_children.xml index 28642f37db44e..706558a3cf19c 100644 --- a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalog_category_view_type_layered_without_children.xml +++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalog_category_view_type_layered_without_children.xml @@ -23,4 +23,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_advanced_result.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_advanced_result.xml index e1c51db81d0e3..a4c9f762b6501 100644 --- a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_advanced_result.xml +++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_advanced_result.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_result_index.xml index eaabebd1eba38..f755468c9d9b4 100644 --- a/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_result_index.xml +++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/catalogsearch_result_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/LayeredNavigation/view/frontend/layout/page_empty.xml b/app/code/Magento/LayeredNavigation/view/frontend/layout/page_empty.xml index f289e28ac5031..8a61895abf566 100644 --- a/app/code/Magento/LayeredNavigation/view/frontend/layout/page_empty.xml +++ b/app/code/Magento/LayeredNavigation/view/frontend/layout/page_empty.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Log/composer.json b/app/code/Magento/Log/composer.json index 0fa1ad00f7fe2..7ded9107c41d2 100644 --- a/app/code/Magento/Log/composer.json +++ b/app/code/Magento/Log/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-backend": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-backend": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Log/view/adminhtml/layout/customer_index_edit.xml b/app/code/Magento/Log/view/adminhtml/layout/customer_index_edit.xml index ceb709e783254..4af247fe6964c 100644 --- a/app/code/Magento/Log/view/adminhtml/layout/customer_index_edit.xml +++ b/app/code/Magento/Log/view/adminhtml/layout/customer_index_edit.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Log/view/adminhtml/layout/visitor_online_index.xml b/app/code/Magento/Log/view/adminhtml/layout/visitor_online_index.xml index e54d025b6cfd2..3c464b5b86d17 100644 --- a/app/code/Magento/Log/view/adminhtml/layout/visitor_online_index.xml +++ b/app/code/Magento/Log/view/adminhtml/layout/visitor_online_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json index 95939c5e8bf72..d91ccbe3d14fb 100644 --- a/app/code/Magento/Msrp/composer.json +++ b/app/code/Magento/Msrp/composer.json @@ -3,21 +3,21 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-bundle": "0.1.0-alpha98", - "magento/module-catalog": "0.1.0-alpha98", - "magento/module-configurable-product": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-downloadable": "0.1.0-alpha98", - "magento/module-eav": "0.1.0-alpha98", - "magento/module-grouped-product": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-store": "0.1.0-alpha98", - "magento/module-tax": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-bundle": "0.1.0-alpha99", + "magento/module-catalog": "0.1.0-alpha99", + "magento/module-configurable-product": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-downloadable": "0.1.0-alpha99", + "magento/module-eav": "0.1.0-alpha99", + "magento/module-grouped-product": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-store": "0.1.0-alpha99", + "magento/module-tax": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml b/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml index 38fd3db1aaf5a..412fd66c24938 100644 --- a/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml +++ b/app/code/Magento/Msrp/view/base/layout/catalog_product_prices.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml index f7b9229ca4140..6cd3469e0a495 100644 --- a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml +++ b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml @@ -66,27 +66,29 @@ if ($product->isSaleable()) { isShowPriceOnGesture()): ?> - getIdSuffix(); ?> + getIdSuffix(); + $popupId = 'msrp-popup-' . $productId . $this->getRandomString(20); + $data = ['addToCart' => [ + 'popupId' => '#' . $popupId, + 'productName' => $product->getName(), + 'realPrice' => $this->getRealPriceHtml(), + 'msrpPrice' => $msrpPrice, + 'priceElementId' => $priceElementId, + 'closeButtonId' => '#map-popup-close', + 'popupCartButtonId' => '#map-popup-button', + 'addToCartUrl' => $addToCartUrl, + ]]; + if ($this->getRequest()->getFullActionName() === 'catalog_product_view') { + $data['addToCartButton'] = '#product_addtocart_form [type=submit]'; + } else { + $data['cartForm'] = '#product_addtocart_form_from_popup'; + } + ?> - getRandomString(20); ?> - "addToCartButton": "#product_addtocart_form [type=submit]", - - "cartForm": "#product_addtocart_form_from_popup", - - "popupId": "#", - "productName": "getName() ?>", - "realPrice": jsonEncode($this->getRealPriceHtml()) ?>, - "msrpPrice": jsonEncode($msrpPrice) ?>, - "priceElementId":"", - "closeButtonId": "#map-popup-close", - "popupCartButtonId": "#map-popup-button", - "addToCartUrl": ""}}' - > - + data-mage-init="escapeHtml($this->helper('Magento\Core\Helper\Data')->jsonEncode($data))?>"> diff --git a/app/code/Magento/Msrp/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/Msrp/view/frontend/layout/catalog_category_view.xml index f33925824881b..42d5c75c23c9c 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/catalog_category_view.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/catalog_category_view.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Msrp/view/frontend/layout/catalog_product_compare_index.xml b/app/code/Magento/Msrp/view/frontend/layout/catalog_product_compare_index.xml index 81e2fc704466d..fb3f982b1480b 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/catalog_product_compare_index.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/catalog_product_compare_index.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Msrp/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Msrp/view/frontend/layout/catalog_product_view.xml index 6e35697c407bc..2a3ed5938446a 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/catalog_product_view.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/catalog_product_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Msrp/view/frontend/layout/catalog_product_view_type_downloadable.xml b/app/code/Magento/Msrp/view/frontend/layout/catalog_product_view_type_downloadable.xml index 05a07365711b6..b32eb2095e5bf 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/catalog_product_view_type_downloadable.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/catalog_product_view_type_downloadable.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + 1 diff --git a/app/code/Magento/Msrp/view/frontend/layout/catalogsearch_advanced_result.xml b/app/code/Magento/Msrp/view/frontend/layout/catalogsearch_advanced_result.xml index 316bbb5180c23..7a9b18310ebc2 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/catalogsearch_advanced_result.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/catalogsearch_advanced_result.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Msrp/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/Msrp/view/frontend/layout/catalogsearch_result_index.xml index 316bbb5180c23..7a9b18310ebc2 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/catalogsearch_result_index.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/catalogsearch_result_index.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Msrp/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Msrp/view/frontend/layout/checkout_cart_index.xml index 88d9cc02049ba..6e217b14c0baf 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/checkout_cart_index.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/checkout_cart_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Msrp/view/frontend/layout/checkout_onepage_failure.xml b/app/code/Magento/Msrp/view/frontend/layout/checkout_onepage_failure.xml index 316bbb5180c23..7a9b18310ebc2 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/checkout_onepage_failure.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/checkout_onepage_failure.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Msrp/view/frontend/layout/checkout_onepage_success.xml b/app/code/Magento/Msrp/view/frontend/layout/checkout_onepage_success.xml index 316bbb5180c23..7a9b18310ebc2 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/checkout_onepage_success.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/checkout_onepage_success.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Msrp/view/frontend/layout/default.xml b/app/code/Magento/Msrp/view/frontend/layout/default.xml index 4c627d7a49bb1..5dc7606b9e4cc 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/default.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/default.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Msrp/view/frontend/layout/msrp_popup.xml b/app/code/Magento/Msrp/view/frontend/layout/msrp_popup.xml index e10bcac543399..387ebce9dff54 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/msrp_popup.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/msrp_popup.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Msrp/view/frontend/layout/review_product_list.xml b/app/code/Magento/Msrp/view/frontend/layout/review_product_list.xml index 0681cfb064e72..2d12ad2c42d65 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/review_product_list.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/review_product_list.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Msrp/view/frontend/layout/wishlist_index_configure_type_downloadable.xml b/app/code/Magento/Msrp/view/frontend/layout/wishlist_index_configure_type_downloadable.xml index ebcf1cfc7a250..875a8e0f5d487 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/wishlist_index_configure_type_downloadable.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/wishlist_index_configure_type_downloadable.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + 1 diff --git a/app/code/Magento/Msrp/view/frontend/layout/wishlist_index_index.xml b/app/code/Magento/Msrp/view/frontend/layout/wishlist_index_index.xml index 5aefce3972560..c5bcdcee81f2b 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/wishlist_index_index.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/wishlist_index_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Msrp/view/frontend/layout/wishlist_search_view.xml b/app/code/Magento/Msrp/view/frontend/layout/wishlist_search_view.xml index 5aefce3972560..c5bcdcee81f2b 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/wishlist_search_view.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/wishlist_search_view.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Msrp/view/frontend/layout/wishlist_shared_index.xml b/app/code/Magento/Msrp/view/frontend/layout/wishlist_shared_index.xml index 5aefce3972560..c5bcdcee81f2b 100644 --- a/app/code/Magento/Msrp/view/frontend/layout/wishlist_shared_index.xml +++ b/app/code/Magento/Msrp/view/frontend/layout/wishlist_shared_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Multishipping/Block/Checkout/Overview.php b/app/code/Magento/Multishipping/Block/Checkout/Overview.php index f6261105eacb5..e7883f77d3aa3 100644 --- a/app/code/Magento/Multishipping/Block/Checkout/Overview.php +++ b/app/code/Magento/Multishipping/Block/Checkout/Overview.php @@ -48,20 +48,28 @@ class Overview extends \Magento\Sales\Block\Items\AbstractItems */ protected $_taxHelper; + /** + * @var PriceCurrencyInterface + */ + protected $priceCurrency; + /** * @param \Magento\Framework\View\Element\Template\Context $context * @param \Magento\Multishipping\Model\Checkout\Type\Multishipping $multishipping * @param \Magento\Tax\Helper\Data $taxHelper + * @param PriceCurrencyInterface $priceCurrency * @param array $data */ public function __construct( \Magento\Framework\View\Element\Template\Context $context, \Magento\Multishipping\Model\Checkout\Type\Multishipping $multishipping, \Magento\Tax\Helper\Data $taxHelper, + PriceCurrencyInterface $priceCurrency, array $data = array() ) { $this->_taxHelper = $taxHelper; $this->_multishipping = $multishipping; + $this->priceCurrency = $priceCurrency; parent::__construct($context, $data); $this->_isScopePrivate = true; } @@ -174,10 +182,17 @@ public function getShippingPriceExclTax($address) /** * @param float $price * @return mixed + * + * @codeCoverageIgnore */ public function formatPrice($price) { - return $this->pirceCurrency->format($price, true, PriceCurrencyInterface::DEFAULT_PRECISION, $this->getQuote()->getStore()); + return $this->priceCurrency->format( + $price, + true, + PriceCurrencyInterface::DEFAULT_PRECISION, + $this->getQuote()->getStore() + ); } /** diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json index 8c854c979c535..d06967fb250f5 100644 --- a/app/code/Magento/Multishipping/composer.json +++ b/app/code/Magento/Multishipping/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0", - "magento/module-store": "0.1.0-alpha98", - "magento/module-core": "0.1.0-alpha98", - "magento/module-checkout": "0.1.0-alpha98", - "magento/module-sales": "0.1.0-alpha98", - "magento/module-payment": "0.1.0-alpha98", - "magento/module-tax": "0.1.0-alpha98", - "magento/module-customer": "0.1.0-alpha98", - "magento/module-theme": "0.1.0-alpha98", - "magento/framework": "0.1.0-alpha98", + "magento/module-store": "0.1.0-alpha99", + "magento/module-core": "0.1.0-alpha99", + "magento/module-checkout": "0.1.0-alpha99", + "magento/module-sales": "0.1.0-alpha99", + "magento/module-payment": "0.1.0-alpha99", + "magento/module-tax": "0.1.0-alpha99", + "magento/module-customer": "0.1.0-alpha99", + "magento/module-theme": "0.1.0-alpha99", + "magento/framework": "0.1.0-alpha99", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.1.0-alpha98", + "version": "0.1.0-alpha99", "extra": { "map": [ [ diff --git a/app/code/Magento/Multishipping/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Multishipping/view/frontend/layout/checkout_cart_index.xml index 50e74df2f9fa0..03ae94aa6ec03 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/checkout_cart_index.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/checkout_cart_index.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml index 6abf7b7f2f617..18c7d65ef5024 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editaddress.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editaddress.xml index e97b6bbf2e7e6..d8187323bdd65 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editaddress.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editaddress.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editbilling.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editbilling.xml index 601d21c083d08..7be0dc65ed011 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editbilling.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editbilling.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editshipping.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editshipping.xml index 705c077fdecd6..6b4e23f0fb951 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editshipping.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_editshipping.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_newbilling.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_newbilling.xml index 4289c2e1abfd8..1acdd242f1f7d 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_newbilling.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_newbilling.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_newshipping.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_newshipping.xml index e4f0890d2a529..e8aa583a078b7 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_newshipping.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_newshipping.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_select.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_select.xml index 7220afd0a8ceb..b3471c835c5ae 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_select.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_select.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_selectbilling.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_selectbilling.xml index e26fe95a2d51c..479dadbb5b210 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_selectbilling.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_address_selectbilling.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_addresses.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_addresses.xml index e8ded06430fb1..c8b2aab23f136 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_addresses.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_addresses.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_billing.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_billing.xml index 5e604097767f2..c8758d5e7fe21 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_billing.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_billing.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml index 9ab1f86bc9f5e..62246576f0ed0 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_customer_address.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_login.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_login.xml index d62a7ab846658..37a53f1a41b13 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_login.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_login.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml index 9c9008fef6e98..ffb18b5423556 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_register.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_register.xml index 7377af7ad44b3..a214c13248a04 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_register.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_register.xml @@ -23,6 +23,6 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_shipping.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_shipping.xml index 52d9c0a4847d3..766b3c130db75 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_shipping.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_shipping.xml @@ -23,12 +23,12 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + - Shipping Information + Select Shipping Method diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml index 6f333ab37490e..de3b3eefb5b21 100644 --- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml +++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml @@ -23,7 +23,7 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) */ --> - + diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml index 53bdd2b212f18..8b5888d061ea6 100644 --- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml +++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml @@ -24,33 +24,35 @@ /** @var \Magento\Multishipping\Block\Checkout\Address\Select $this */ ?> -
-
+
+
getAddressCollection() as $_address): ?> -
-
- getAddressAsHtml($_address) ?> - isAddressDefaultBilling($_address)): ?> -
- - isAddressDefaultShipping($_address)): ?> -
- -
-
+
+
+
+ getAddressAsHtml($_address) ?> + isAddressDefaultBilling($_address)): ?> +
+ + isAddressDefaultShipping($_address)): ?> +
+ +
+
+
-
-
-
- -
-
- +
+
+ +
+
+ +