From cc63630ec5c248b655b33937e27008c820910cb5 Mon Sep 17 00:00:00 2001
From: mage2-team <mage2-team@magento.com>
Date: Fri, 1 Nov 2013 13:22:57 -0700
Subject: [PATCH] 2.0.0.0-dev50 * Modularity improvements: * Cleavage of
Adminhtml module * Moved Sales, Catalog, Tax-related logic to respective
modules * Moved Action, Cache, Ajax, Dashboard, Index, Json, Rating,
Sitemap, Survey, UrlRewrite from root of Adminhtml Controller folder * View
abstraction was moved into library * Eliminated dependency in
Magento\Data\Form from Magento\Core module * Eliminated Magento\Media
module * Themes update: * Templates and layout updates are updated in Cms,
Contacts, Core, Directory, GoogleCheckout, Page, Payment, PaypalUk, Paypal,
Rating, Review, Rss,Sales, Widget modules, old files moved to magento_backup
theme * Layout improvements: * Removed page type hierarchy and page
fragment types * No direct code execution: methods addColumnRender,
addRenderer, addToParentGroup usages as action nodes were eliminated * Fixed
bugs: * Impossible to add image using WYSIWYG * Legacy static test
ObsoleteCodeTest::testPhpFiles produced false-positive results * Incorrect
copyright information
---
CHANGELOG.md | 19 +
.../Controller/Adminhtml/Notification.php | 10 +-
.../Controller/Adminhtml}/Survey.php | 4 +-
app/code/Magento/Adminhtml/Block/Cache.php | 4 +-
.../Adminhtml/Block/Cache/Additional.php | 4 +-
.../Block/Checkout/Agreement/Grid.php | 2 +-
.../Block/Cms/Block/Widget/Chooser.php | 4 +-
.../Magento/Adminhtml/Block/Cms/Page/Edit.php | 2 +-
.../Magento/Adminhtml/Block/Cms/Page/Grid.php | 2 +-
.../Block/Cms/Page/Widget/Chooser.php | 4 +-
.../Block/Cms/Wysiwyg/Images/Content.php | 10 +-
.../Cms/Wysiwyg/Images/Content/Uploader.php | 2 +-
.../Block/Cms/Wysiwyg/Images/Tree.php | 2 +-
.../Magento/Adminhtml/Block/Customer/Edit.php | 10 +-
.../Block/Customer/Edit/Tab/Addresses.php | 2 +-
.../Block/Customer/Edit/Tab/Cart.php | 4 +-
.../Customer/Edit/Tab/Newsletter/Grid.php | 2 +-
.../Tab/Newsletter/Grid/Renderer/Action.php | 2 +-
.../Block/Customer/Edit/Tab/Orders.php | 6 +-
.../Block/Customer/Edit/Tab/Reviews.php | 2 +-
.../Customer/Edit/Tab/View/Accordion.php | 6 +-
.../Block/Customer/Edit/Tab/View/Cart.php | 2 +-
.../Block/Customer/Edit/Tab/View/Orders.php | 4 +-
.../Block/Customer/Edit/Tab/View/Wishlist.php | 2 +-
.../Adminhtml/Block/Customer/Edit/Tabs.php | 8 +-
.../Magento/Adminhtml/Block/Customer/Grid.php | 12 +-
.../Block/Customer/Group/Edit/Form.php | 2 +-
.../Sales/Order/Address/Form/Renderer/Vat.php | 2 +-
app/code/Magento/Adminhtml/Block/Denied.php | 2 +-
.../Adminhtml/Block/Media/Uploader.php | 2 +-
.../Adminhtml/Block/Newsletter/Queue/Edit.php | 4 +-
.../Newsletter/Queue/Grid/Renderer/Action.php | 10 +-
.../Block/Newsletter/Queue/Preview/Form.php | 2 +-
.../Adminhtml/Block/Newsletter/Template.php | 2 +-
.../Block/Newsletter/Template/Edit.php | 8 +-
.../Block/Newsletter/Template/Edit/Form.php | 2 +-
.../Block/Newsletter/Template/Grid.php | 2 +-
.../Template/Grid/Renderer/Action.php | 4 +-
.../Newsletter/Template/Preview/Form.php | 2 +-
.../Magento/Adminhtml/Block/Promo/Catalog.php | 2 +-
.../Promo/Catalog/Edit/Tab/Conditions.php | 2 +-
.../Block/Promo/Quote/Edit/Tab/Actions.php | 2 +-
.../Block/Promo/Quote/Edit/Tab/Conditions.php | 2 +-
.../Promo/Quote/Edit/Tab/Coupons/Form.php | 2 +-
.../Promo/Quote/Edit/Tab/Coupons/Grid.php | 4 +-
.../Adminhtml/Block/Promo/Widget/Chooser.php | 4 +-
.../Block/Promo/Widget/Chooser/Sku.php | 2 +-
.../Adminhtml/Block/Report/Filter/Form.php | 2 +-
.../Report/Grid/Column/Renderer/Customer.php | 2 +-
.../Report/Grid/Column/Renderer/Product.php | 2 +-
.../Block/Report/Product/Downloads.php | 2 +-
.../Block/Report/Product/Lowstock.php | 2 +-
.../Adminhtml/Block/Report/Product/Viewed.php | 2 +-
.../Adminhtml/Block/Report/Review/Detail.php | 2 +-
.../Block/Report/Sales/Bestsellers.php | 2 +-
.../Adminhtml/Block/Report/Sales/Coupons.php | 2 +-
.../Adminhtml/Block/Report/Sales/Invoiced.php | 2 +-
.../Adminhtml/Block/Report/Sales/Refunded.php | 2 +-
.../Adminhtml/Block/Report/Sales/Sales.php | 2 +-
.../Adminhtml/Block/Report/Sales/Shipping.php | 2 +-
.../Adminhtml/Block/Report/Sales/Tax.php | 2 +-
.../Block/Report/Shopcart/Abandoned.php | 2 +-
.../Block/Report/Shopcart/Abandoned/Grid.php | 2 +-
.../Block/Report/Shopcart/Product/Grid.php | 2 +-
.../Magento/Adminhtml/Block/Review/Add.php | 4 +-
.../Adminhtml/Block/Review/Add/Form.php | 2 +-
.../Magento/Adminhtml/Block/Review/Edit.php | 12 +-
.../Adminhtml/Block/Review/Edit/Form.php | 6 +-
.../Magento/Adminhtml/Block/Review/Grid.php | 6 +-
.../Adminhtml/Block/Review/Product/Grid.php | 6 +-
.../Block/Review/Rating/Detailed.php | 2 +-
.../Adminhtml/Block/Review/Rating/Summary.php | 2 +-
.../Block/Sitemap/Grid/Renderer/Action.php | 2 +-
.../Block/System/Account/Edit/Form.php | 2 +-
.../Adminhtml/Block/System/Cache/Edit.php | 2 +-
.../Magento/Adminhtml/Block/System/Design.php | 2 +-
.../Adminhtml/Block/System/Design/Edit.php | 8 +-
.../Adminhtml/Block/System/Email/Template.php | 2 +-
.../Block/System/Email/Template/Edit.php | 10 +-
.../Email/Template/Grid/Renderer/Action.php | 2 +-
.../Block/System/Store/Delete/Group.php | 4 +-
.../Block/System/Store/Delete/Website.php | 4 +-
.../Block/System/Store/Edit/AbstractForm.php | 2 +-
.../Block/System/Store/Grid/Render/Group.php | 2 +-
.../Block/System/Store/Grid/Render/Store.php | 2 +-
.../System/Store/Grid/Render/Website.php | 2 +-
.../Adminhtml/Block/System/Store/Store.php | 6 +-
.../Adminhtml/Block/System/Variable/Edit.php | 6 +-
.../Magento/Adminhtml/Block/Urlrewrite.php | 2 +-
.../Urlrewrite/Catalog/Category/Edit.php | 4 +-
.../Urlrewrite/Catalog/Category/Tree.php | 4 +-
.../Block/Urlrewrite/Catalog/Edit/Form.php | 2 +-
.../Block/Urlrewrite/Catalog/Product/Edit.php | 11 +-
.../Block/Urlrewrite/Catalog/Product/Grid.php | 6 +-
.../Block/Urlrewrite/Cms/Page/Edit.php | 4 +-
.../Block/Urlrewrite/Cms/Page/Edit/Form.php | 2 +-
.../Block/Urlrewrite/Cms/Page/Grid.php | 4 +-
.../Adminhtml/Block/Urlrewrite/Edit.php | 7 +-
.../Adminhtml/Block/Urlrewrite/Edit/Form.php | 2 +-
.../Controller/Checkout/Agreement.php | 14 +-
.../Adminhtml/Controller/Cms/Block.php | 20 +-
.../Adminhtml/Controller/Cms/Block/Widget.php | 2 +-
.../Magento/Adminhtml/Controller/Cms/Page.php | 20 +-
.../Adminhtml/Controller/Cms/Page/Widget.php | 2 +-
.../Adminhtml/Controller/Cms/Wysiwyg.php | 2 +-
.../Controller/Cms/Wysiwyg/Images.php | 2 +-
.../Magento/Adminhtml/Controller/Customer.php | 24 +-
.../Customer/Cart/Product/Composite/Cart.php | 6 +-
.../Adminhtml/Controller/Customer/Group.php | 16 +-
.../Adminhtml/Controller/Customer/Online.php | 2 +-
.../Customer/System/Config/Validatevat.php | 2 +-
.../Wishlist/Product/Composite/Wishlist.php | 6 +-
.../Magento/Adminhtml/Controller/Index.php | 102 ----
.../Controller/Newsletter/Problem.php | 2 +-
.../Adminhtml/Controller/Newsletter/Queue.php | 26 +-
.../Controller/Newsletter/Subscriber.php | 6 +-
.../Controller/Newsletter/Template.php | 8 +-
.../Magento/Adminhtml/Controller/Promo.php | 2 +-
.../Adminhtml/Controller/Promo/Catalog.php | 24 +-
.../Adminhtml/Controller/Promo/Quote.php | 30 +-
.../Adminhtml/Controller/Promo/Widget.php | 8 +-
.../Magento/Adminhtml/Controller/Report.php | 2 +-
.../Controller/Report/AbstractReport.php | 6 +-
.../Adminhtml/Controller/Report/Customer.php | 2 +-
.../Adminhtml/Controller/Report/Review.php | 2 +-
.../Adminhtml/Controller/Report/Shopcart.php | 2 +-
.../Controller/Report/Statistics.php | 6 +-
.../Adminhtml/Controller/System/Account.php | 2 +-
.../Adminhtml/Controller/System/Backup.php | 24 +-
.../System/Config/System/Storage.php | 2 +-
.../Adminhtml/Controller/System/Design.php | 8 +-
.../Controller/System/Email/Template.php | 14 +-
.../Adminhtml/Controller/System/Store.php | 60 +--
.../Adminhtml/Controller/System/Variable.php | 14 +-
.../Adminhtml/Controller/Urlrewrite.php | 8 +-
.../Adminhtml/Model/Search/Catalog.php | 2 +-
.../Adminhtml/Model/Search/Customer.php | 2 +-
.../Magento/Adminhtml/Model/Search/Order.php | 2 +-
app/code/Magento/Adminhtml/etc/di.xml | 6 +-
app/code/Magento/Adminhtml/etc/module.xml | 5 -
.../view/adminhtml/backup/dialogs.phtml | 4 +-
.../view/adminhtml/customer/tab/cart.phtml | 4 +-
.../layout/adminhtml_cms_block_index.xml | 2 +-
.../layout/adminhtml_customer_edit.xml | 2 +-
.../layout/adminhtml_customer_group_index.xml | 2 +-
.../adminhtml_customer_online_index.xml | 2 +-
.../adminhtml_newsletter_subscriber_block.xml | 8 +-
.../layout/adminhtml_promo_catalog_block.xml | 2 +-
.../layout/adminhtml_promo_quote_index.xml | 2 +-
.../layout/adminhtml_report_search_block.xml | 6 +-
.../adminhtml_sales_order_addcomment.xml | 28 -
.../adminhtml_sales_order_create_index.xml | 122 -----
...tml_sales_order_create_load_block_data.xml | 68 ---
...der_create_load_block_shipping_address.xml | 30 --
...rder_create_load_block_shipping_method.xml | 32 --
..._sales_order_create_load_block_sidebar.xml | 38 --
...s_order_create_load_block_sidebar_cart.xml | 30 --
...der_create_load_block_sidebar_compared.xml | 30 --
...er_create_load_block_sidebar_pcompared.xml | 30 --
...rder_create_load_block_sidebar_pviewed.xml | 30 --
...rder_create_load_block_sidebar_reorder.xml | 30 --
...order_create_load_block_sidebar_viewed.xml | 30 --
...der_create_load_block_sidebar_wishlist.xml | 30 --
...l_sales_order_create_load_block_totals.xml | 30 --
.../adminhtml_sales_order_creditmemo_new.xml | 90 ----
...nhtml_sales_order_creditmemo_updateqty.xml | 81 ---
.../adminhtml_sales_order_creditmemo_view.xml | 98 ----
.../adminhtml_sales_order_invoice_new.xml | 101 ----
...dminhtml_sales_order_invoice_updateqty.xml | 93 ----
.../adminhtml_sales_order_invoice_view.xml | 105 ----
...dminhtml_sales_order_shipment_addtrack.xml | 28 -
.../adminhtml_sales_order_shipment_new.xml | 58 --
...nhtml_sales_order_shipment_removetrack.xml | 28 -
.../adminhtml_sales_order_shipment_view.xml | 65 ---
.../layout/adminhtml_system_backup_block.xml | 2 +-
.../adminhtml_system_design_grid_block.xml | 2 +-
...nhtml_system_email_template_grid_block.xml | 2 +-
.../adminhtml_system_variable_grid_block.xml | 2 +-
.../layout/adminhtml_urlrewrite_index.xml | 4 +-
.../view/adminhtml/layout/default.xml | 3 +-
.../view/adminhtml/page/footer.phtml | 2 +-
.../view/adminhtml/urlrewrite/selector.phtml | 2 +-
.../Authorizenet/Directpost/Payment.php | 10 +-
app/code/Magento/Authorizenet/Helper/Data.php | 2 +-
...index.xml => sales_order_create_index.xml} | 0
...thorizenet_directpost_payment_redirect.xml | 2 +-
...thorizenet_directpost_payment_response.xml | 2 +-
.../Block/Dashboard.php | 18 +-
.../Block/Dashboard/AbstractDashboard.php | 2 +-
.../Block/Dashboard/Bar.php | 4 +-
.../Block/Dashboard/Diagrams.php | 8 +-
.../Block/Dashboard/Graph.php | 14 +-
.../Block/Dashboard/Grid.php | 2 +-
.../Block/Dashboard/Grids.php | 14 +-
.../Block/Dashboard/Orders/Grid.php | 6 +-
.../Block/Dashboard/Sales.php | 4 +-
.../Block/Dashboard/Searches/Last.php | 8 +-
.../Searches/Renderer/Searchquery.php | 2 +-
.../Block/Dashboard/Searches/Top.php | 8 +-
.../Block/Dashboard/Tab/Amounts.php | 6 +-
.../Block/Dashboard/Tab/Customers/Most.php | 6 +-
.../Block/Dashboard/Tab/Customers/Newest.php | 6 +-
.../Block/Dashboard/Tab/Orders.php | 6 +-
.../Block/Dashboard/Tab/Products/Ordered.php | 6 +-
.../Block/Dashboard/Tab/Products/Viewed.php | 6 +-
.../Block/Dashboard/Totals.php | 4 +-
.../Magento/Backend/Block/GlobalSearch.php | 2 +-
.../Magento/Backend/Block/Page/Copyright.php | 38 ++
.../Backend/Block/Template/Context.php | 6 +-
.../Backend/Block/Widget/Grid/ColumnSet.php | 1 +
.../Controller/Adminhtml}/Action.php | 2 +-
.../Controller/Adminhtml}/Ajax.php | 4 +-
.../Backend/Controller/Adminhtml/Auth.php | 2 +-
.../Controller/Adminhtml}/Cache.php | 18 +-
.../Controller/Adminhtml}/Dashboard.php | 10 +-
.../Backend/Controller/Adminhtml/Index.php | 64 +++
.../Controller/Adminhtml/System/Config.php | 2 +-
.../Adminhtml/System/Config/Save.php | 2 +-
.../Helper/Dashboard/AbstractDashboard.php | 2 +-
.../Helper/Dashboard/Data.php | 2 +-
.../Helper/Dashboard/Order.php | 10 +-
app/code/Magento/Backend/etc/di.xml | 7 +-
.../Backend/view/adminhtml/admin/login.phtml | 2 +-
.../view/adminhtml/dashboard/graph.phtml | 2 +-
.../adminhtml/dashboard/graph/disabled.phtml | 0
.../view/adminhtml/dashboard/grid.phtml | 0
.../view/adminhtml/dashboard/index.phtml | 4 +-
.../view/adminhtml/dashboard/salebar.phtml | 0
.../view/adminhtml/dashboard/searches.phtml | 0
.../adminhtml/dashboard/store/switcher.phtml | 0
.../view/adminhtml/dashboard/totalbar.phtml | 0
.../adminhtml/layout/adminhtml_auth_login.xml | 1 +
.../layout/adminhtml_cache_block.xml | 6 +-
.../layout/adminhtml_cache_index.xml | 0
.../adminhtml_dashboard_customersmost.xml | 2 +-
.../adminhtml_dashboard_customersnewest.xml | 2 +-
.../layout/adminhtml_dashboard_index.xml | 2 +-
.../adminhtml_dashboard_productsviewed.xml | 2 +-
.../layout/adminhtml_system_config_edit.xml | 2 +-
.../view/adminhtml/page/copyright.phtml} | 7 +-
.../view/adminhtml/system/config/js.phtml | 2 +-
.../view/install/page/copyright.phtml} | 7 +-
.../Grid/Column/Renderer/Download.php | 6 +-
.../Block/Adminhtml/Grid/Column/Rollback.php | 4 +-
app/code/Magento/Backup/Exception.php | 2 +-
.../Backup/Model/Config/Source/Type.php | 4 +-
app/code/Magento/Backup/Model/Observer.php | 2 +-
app/code/Magento/Backup/etc/adminhtml/acl.xml | 2 +-
.../Magento/Backup/etc/adminhtml/menu.xml | 2 +-
.../Magento/Backup/etc/adminhtml/system.xml | 2 +-
.../Catalog/Product/Edit/Tab/Attributes.php | 6 +-
.../Product/Edit/Tab/Attributes/Extend.php | 2 +-
.../Product/Edit/Tab/Attributes/Special.php | 2 +-
.../Catalog/Product/Edit/Tab/Bundle.php | 2 +-
.../Edit/Tab/Bundle/Option/Search/Grid.php | 2 +-
.../Edit/Tab/Bundle/Option/Selection.php | 2 +-
.../Adminhtml/Catalog/Product/Edit/Tabs.php | 4 +-
.../Adminhtml/Sales/Order/Items/Renderer.php | 2 +-
.../Sales/Order/View/Items/Renderer.php | 2 +-
.../Catalog/Product/View/Type/Bundle.php | 18 +-
.../Adminhtml/Bundle/Product/Edit.php | 2 +-
.../Controller/Adminhtml/Bundle/Selection.php | 2 +-
app/code/Magento/Bundle/Model/Observer.php | 14 +-
..._bundle.xml => catalog_product_bundle.xml} | 0
.../catalog_product_view_type_bundle.xml | 20 +-
...new.xml => sales_order_creditmemo_new.xml} | 0
...l => sales_order_creditmemo_updateqty.xml} | 0
...ew.xml => sales_order_creditmemo_view.xml} | 0
...ce_new.xml => sales_order_invoice_new.xml} | 0
....xml => sales_order_invoice_updateqty.xml} | 0
..._view.xml => sales_order_invoice_view.xml} | 0
...t_new.xml => sales_order_shipment_new.xml} | 0
...view.xml => sales_order_shipment_view.xml} | 0
...es_order_view.xml => sales_order_view.xml} | 0
.../catalog_product_view_type_bundle.xml | 22 +-
.../checkout_cart_configure_type_bundle.xml | 2 +-
.../Captcha/Controller/Adminhtml/Refresh.php | 2 +-
app/code/Magento/Captcha/etc/module.xml | 2 -
.../Adminhtml}/Category/AbstractCategory.php | 17 +-
.../Adminhtml}/Category/Checkboxes/Tree.php | 4 +-
.../Block/Adminhtml}/Category/Edit.php | 11 +-
.../Block/Adminhtml}/Category/Edit/Form.php | 24 +-
.../Adminhtml}/Category/Helper/Image.php | 4 +-
.../Adminhtml}/Category/Helper/Pricestep.php | 4 +-
.../Category/Helper/Sortby/Available.php | 4 +-
.../Category/Helper/Sortby/DefaultSortby.php | 4 +-
.../Adminhtml}/Category/Tab/Attributes.php | 12 +-
.../Block/Adminhtml}/Category/Tab/Design.php | 4 +-
.../Block/Adminhtml}/Category/Tab/General.php | 8 +-
.../Block/Adminhtml}/Category/Tab/Product.php | 6 +-
.../Block/Adminhtml}/Category/Tabs.php | 24 +-
.../Block/Adminhtml}/Category/Tree.php | 18 +-
.../Adminhtml}/Category/Widget/Chooser.php | 12 +-
.../Block/Adminhtml}/Form.php | 6 +-
.../Form/Renderer/Attribute/Urlkey.php | 6 +-
.../Form/Renderer/Config/DateFieldsOrder.php | 4 +-
.../Form/Renderer/Config/YearRange.php | 4 +-
.../Form/Renderer/Fieldset/Element.php | 8 +-
.../Block/Adminhtml}/Helper/Form/Wysiwyg.php | 6 +-
.../Helper/Form/Wysiwyg/Content.php | 6 +-
.../Block/Adminhtml}/Product.php | 10 +-
.../Block/Adminhtml}/Product/Attribute.php | 7 +-
.../Adminhtml}/Product/Attribute/Edit.php | 10 +-
.../Product/Attribute/Edit/Form.php | 4 +-
.../Product/Attribute/Edit/Tab/Advanced.php | 8 +-
.../Product/Attribute/Edit/Tab/Front.php | 4 +-
.../Product/Attribute/Edit/Tab/Main.php | 8 +-
.../Product/Attribute/Edit/Tab/Options.php | 6 +-
.../Product/Attribute/Edit/Tab/System.php | 4 +-
.../Product/Attribute/Edit/Tabs.php | 4 +-
.../Adminhtml}/Product/Attribute/Grid.php | 9 +-
.../NewAttribute/Product/Attributes.php | 12 +-
.../NewAttribute/Product/Created.php | 4 +-
.../Adminhtml}/Product/Attribute/Set/Main.php | 16 +-
.../Attribute/Set/Main/Formattribute.php | 4 +-
.../Product/Attribute/Set/Main/Formgroup.php | 6 +-
.../Product/Attribute/Set/Main/Formset.php | 4 +-
.../Attribute/Set/Main/Tree/Attribute.php | 4 +-
.../Product/Attribute/Set/Main/Tree/Group.php | 4 +-
.../Product/Attribute/Set/Toolbar/Add.php | 8 +-
.../Product/Attribute/Set/Toolbar/Main.php | 6 +-
.../Attribute/Set/Toolbar/Main/Filter.php | 4 +-
.../Product/Composite/Configure.php | 6 +-
.../Adminhtml}/Product/Composite/Error.php | 4 +-
.../Adminhtml}/Product/Composite/Fieldset.php | 4 +-
.../Composite/Fieldset/Configurable.php | 36 +-
.../Product/Composite/Fieldset/Grouped.php | 8 +-
.../Product/Composite/Fieldset/Options.php | 4 +-
.../Product/Composite/Fieldset/Qty.php | 2 +-
.../Product/Composite/Update/Result.php | 4 +-
.../Block/Adminhtml}/Product/Created.php | 4 +-
.../Block/Adminhtml}/Product/Edit.php | 20 +-
.../Product/Edit/Action/Attribute.php | 20 +-
.../Edit/Action/Attribute/Tab/Attributes.php | 16 +-
.../Edit/Action/Attribute/Tab/Inventory.php | 4 +-
.../Edit/Action/Attribute/Tab/Websites.php | 4 +-
.../Product/Edit/Action/Attribute/Tabs.php | 4 +-
.../Adminhtml}/Product/Edit/AttributeSet.php | 6 +-
.../Block/Adminhtml}/Product/Edit/Js.php | 2 +-
.../Adminhtml}/Product/Edit/NewCategory.php | 12 +-
.../Product/Edit/Tab/Ajax/Serializer.php | 2 +-
.../Adminhtml}/Product/Edit/Tab/Alerts.php | 8 +-
.../Product/Edit/Tab/Alerts/Price.php | 6 +-
.../Product/Edit/Tab/Alerts/Stock.php | 6 +-
.../Product/Edit/Tab/Attributes.php | 30 +-
.../Product/Edit/Tab/Attributes/Create.php | 10 +-
.../Product/Edit/Tab/Attributes/Search.php | 8 +-
.../Adminhtml}/Product/Edit/Tab/Crosssell.php | 8 +-
.../Adminhtml}/Product/Edit/Tab/Inventory.php | 2 +-
.../Adminhtml}/Product/Edit/Tab/Options.php | 6 +-
.../Product/Edit/Tab/Options/Option.php | 6 +-
.../Product/Edit/Tab/Options/Popup/Grid.php | 10 +-
.../Edit/Tab/Options/Type/AbstractType.php | 9 +-
.../Product/Edit/Tab/Options/Type/Date.php | 6 +-
.../Product/Edit/Tab/Options/Type/File.php | 6 +-
.../Product/Edit/Tab/Options/Type/Select.php | 6 +-
.../Product/Edit/Tab/Options/Type/Text.php | 6 +-
.../Adminhtml}/Product/Edit/Tab/Price.php | 6 +-
.../Product/Edit/Tab/Price/Group.php | 8 +-
.../Edit/Tab/Price/Group/AbstractGroup.php | 6 +-
.../Product/Edit/Tab/Price/Recurring.php | 4 +-
.../Product/Edit/Tab/Price/Tier.php | 8 +-
.../Adminhtml}/Product/Edit/Tab/Related.php | 8 +-
.../Adminhtml}/Product/Edit/Tab/Reviews.php | 8 +-
.../Product/Edit/Tab/Super/Config.php | 14 +-
.../Edit/Tab/Super/Config/Attribute.php | 6 +-
.../Super/Config/Grid/Filter/Inventory.php | 4 +-
.../Super/Config/Grid/Renderer/Checkbox.php | 6 +-
.../Super/Config/Grid/Renderer/Inventory.php | 4 +-
.../Product/Edit/Tab/Super/Config/Matrix.php | 8 +-
.../Product/Edit/Tab/Super/Config/Simple.php | 6 +-
.../Product/Edit/Tab/Super/Settings.php | 8 +-
.../Adminhtml}/Product/Edit/Tab/Upsell.php | 8 +-
.../Adminhtml}/Product/Edit/Tab/Websites.php | 4 +-
.../Block/Adminhtml}/Product/Edit/Tabs.php | 36 +-
.../Product/Edit/Tabs/Configurable.php | 8 +-
.../Adminhtml}/Product/Edit/Tabs/Grouped.php | 6 +-
.../Product/Frontend/Product/Watermark.php | 4 +-
.../Block/Adminhtml}/Product/Grid.php | 14 +-
.../Adminhtml}/Product/Helper/Form/Apply.php | 6 +-
.../Product/Helper/Form/BaseImage.php | 6 +-
.../Product/Helper/Form/Boolean.php | 4 +-
.../Product/Helper/Form/Category.php | 6 +-
.../Adminhtml}/Product/Helper/Form/Config.php | 4 +-
.../Product/Helper/Form/Gallery.php | 8 +-
.../Product/Helper/Form/Gallery/Content.php | 6 +-
.../Adminhtml}/Product/Helper/Form/Image.php | 4 +-
.../Product/Helper/Form/Msrp/Enabled.php | 4 +-
.../Product/Helper/Form/Msrp/Price.php | 4 +-
.../Adminhtml}/Product/Helper/Form/Price.php | 4 +-
.../Adminhtml}/Product/Helper/Form/Weight.php | 4 +-
.../Block/Adminhtml}/Product/Options/Ajax.php | 8 +-
.../Block/Adminhtml}/Product/Price.php | 4 +-
.../Adminhtml}/Product/Widget/Chooser.php | 12 +-
.../Product/Widget/Chooser/Container.php | 4 +-
.../Block/Adminhtml}/Search.php | 4 +-
.../Block/Adminhtml}/Search/Edit.php | 5 +-
.../Block/Adminhtml}/Search/Edit/Form.php | 6 +-
.../Magento/Catalog/Block/Category/View.php | 2 +-
.../Configurable/AttributeSelector.php | 4 +-
.../Controller/Adminhtml}/Category.php | 26 +-
.../Controller/Adminhtml}/Category/Widget.php | 8 +-
.../Controller/Adminhtml}/Product.php | 48 +-
.../Adminhtml}/Product/Action/Attribute.php | 14 +-
.../Adminhtml}/Product/Attribute.php | 38 +-
.../Adminhtml}/Product/Datafeeds.php | 4 +-
.../Controller/Adminhtml}/Product/Gallery.php | 6 +-
.../Controller/Adminhtml}/Product/Group.php | 4 +-
.../Controller/Adminhtml}/Product/Review.php | 26 +-
.../Controller/Adminhtml}/Product/Set.php | 20 +-
.../Controller/Adminhtml}/Product/Widget.php | 12 +-
.../Controller/Adminhtml}/Search.php | 20 +-
.../Magento/Catalog/Controller/Category.php | 7 +
.../{Adminhtml => Catalog}/Helper/Catalog.php | 8 +-
.../Catalog/Helper/Product/Compare.php | 34 +-
.../Helper}/Product/Composite.php | 26 +-
.../Helper}/Product/Edit/Action/Attribute.php | 6 +-
.../Magento/Catalog/Helper/Product/View.php | 1 +
.../Catalog/Model/Product/Media/Config.php | 2 +-
.../Model/Product/Media}/ConfigInterface.php | 11 +-
.../Model/Product/Option/Type/DefaultType.php | 2 +-
.../Magento/Catalog/Model/Resource/Setup.php | 15 +-
.../data-upgrade-1.6.0.0.17-1.6.0.0.18.php | 2 +-
.../data-upgrade-1.6.0.0.18-1.6.0.0.19.php | 2 +-
.../data-upgrade-1.6.0.0.19-1.6.0.0.20.php | 2 +-
.../data-upgrade-1.6.0.0.21-1.6.0.0.22.php | 2 +-
.../data-upgrade-1.6.0.0.23-1.6.0.0.24.php | 83 +++
app/code/Magento/Catalog/etc/adminhtml/di.xml | 5 +
.../Magento/Catalog/etc/adminhtml/menu.xml | 8 +-
.../Magento/Catalog/etc/adminhtml/routes.xml | 32 ++
.../Magento/Catalog/etc/adminhtml/system.xml | 4 +-
app/code/Magento/Catalog/etc/di.xml | 8 +
app/code/Magento/Catalog/etc/module.xml | 3 +-
.../Magento/Catalog/etc/product_options.xml | 8 +-
app/code/Magento/Catalog/etc/widget.xml | 4 +-
.../upgrade-1.6.0.0-1.6.0.0.1.php | 4 +-
.../adminhtml/catalog/base-image-uploader.js | 0
.../adminhtml/catalog/category-selector.css | 0
.../catalog/category/checkboxes/tree.phtml | 0
.../view/adminhtml/catalog/category/edit.js | 0
.../adminhtml/catalog/category/edit.phtml | 2 +-
.../catalog/category/edit/form.phtml | 2 +-
.../view/adminhtml/catalog/category/form.js | 0
.../adminhtml/catalog/category/tree.phtml | 0
.../catalog/category/widget/tree.phtml | 0
.../form/renderer/fieldset/element.phtml | 2 +-
.../view/adminhtml/catalog/images/select2.png | Bin
.../adminhtml/catalog/images/select2x2.png | Bin
.../view/adminhtml/catalog/images/spinner.gif | Bin
.../adminhtml/catalog/product-variation.js | 0
.../view/adminhtml/catalog/product.js | 0
.../view/adminhtml/catalog/product.phtml | 2 +-
.../catalog/product/attribute/form.phtml | 0
.../catalog/product/attribute/js.phtml | 0
.../catalog/product/attribute/labels.phtml | 0
.../product/attribute/new/created.phtml | 2 +-
.../catalog/product/attribute/options.phtml | 0
.../catalog/product/attribute/set/main.phtml | 0
.../attribute/set/main/tree/attribute.phtml | 0
.../attribute/set/main/tree/group.phtml | 0
.../product/attribute/set/toolbar/add.phtml | 0
.../product/attribute/set/toolbar/main.phtml | 0
.../catalog/product/composite/configure.js | 0
.../catalog/product/composite/configure.phtml | 0
.../composite/fieldset/configurable.phtml | 2 +-
.../product/composite/fieldset/grouped.phtml | 2 +-
.../product/composite/fieldset/options.phtml | 2 +-
.../composite/fieldset/options/js.phtml | 0
.../fieldset/options/type/date.phtml | 0
.../fieldset/options/type/default.phtml | 2 +-
.../fieldset/options/type/file.phtml | 0
.../fieldset/options/type/select.phtml | 0
.../fieldset/options/type/text.phtml | 0
.../product/composite/fieldset/qty.phtml | 2 +-
.../adminhtml/catalog/product/created.phtml | 0
.../view/adminhtml/catalog/product/edit.phtml | 2 +-
.../product/edit/action/attribute.phtml | 0
.../product/edit/action/inventory.phtml | 0
.../product/edit/action/websites.phtml | 0
.../catalog/product/edit/attribute_set.phtml | 2 +-
.../product/edit/category/new/form.phtml | 2 +-
.../catalog/product/edit/options.phtml | 2 +-
.../catalog/product/edit/options/option.phtml | 2 +-
.../product/edit/options/type/date.phtml | 2 +-
.../product/edit/options/type/file.phtml | 2 +-
.../product/edit/options/type/select.phtml | 2 +-
.../product/edit/options/type/text.phtml | 2 +-
.../catalog/product/edit/price/group.phtml | 2 +-
.../catalog/product/edit/price/tier.phtml | 2 +-
.../catalog/product/edit/serializer.phtml | 0
.../edit/super/attribute-js-template.phtml | 0
.../edit/super/attribute-template.phtml | 0
.../catalog/product/edit/super/config.phtml | 2 +-
.../product/edit/super/generator.phtml | 2 +-
.../catalog/product/edit/super/matrix.phtml | 2 +-
.../catalog/product/edit/websites.phtml | 0
.../catalog/product/helper/gallery.phtml | 2 +-
.../view/adminhtml/catalog/product/js.phtml | 0
.../adminhtml/catalog/product/price.phtml | 2 +-
.../adminhtml/catalog/product/tab/alert.phtml | 2 +-
.../catalog/product/tab/inventory.phtml | 2 +-
.../product/widget/chooser/container.phtml | 2 +-
.../view/adminhtml/catalog/type-switcher.js | 0
.../view/adminhtml/catalog/wysiwyg/js.phtml | 0
.../CATALOG_PRODUCT_COMPOSITE_CONFIGURE.xml} | 18 +-
...LOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR.xml} | 2 +-
...TALOG_PRODUCT_COMPOSITE_UPDATE_RESULT.xml} | 2 +-
.../layout/catalog_category_edit.xml} | 6 +-
...catalog_product_action_attribute_edit.xml} | 10 +-
.../catalog_product_alertspricegrid.xml} | 2 +-
.../catalog_product_alertsstockgrid.xml} | 2 +-
.../catalog_product_attribute_edit.xml} | 12 +-
.../catalog_product_attribute_edit_popup.xml} | 8 +-
.../layout/catalog_product_configurable.xml} | 12 +-
.../catalog_product_configurable_new.xml} | 12 +-
.../layout/catalog_product_crosssell.xml} | 2 +-
.../layout/catalog_product_crosssellgrid.xml} | 2 +-
.../layout/catalog_product_customoptions.xml} | 2 +-
.../layout/catalog_product_edit.xml} | 2 +-
.../catalog_product_generatevariations.xml} | 8 +-
.../layout/catalog_product_grid.xml} | 2 +-
.../layout/catalog_product_grouped.xml} | 2 +-
.../catalog_product_grouped_grid_popup.xml} | 0
.../layout/catalog_product_index.xml} | 2 +-
.../adminhtml/layout/catalog_product_new.xml} | 20 +-
.../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_review_edit.xml} | 2 +-
.../layout/catalog_product_review_new.xml} | 0
.../layout/catalog_product_reviews.xml} | 2 +-
.../layout/catalog_product_set_block.xml} | 2 +-
.../layout/catalog_product_set_index.xml} | 4 +-
.../layout/catalog_product_simple.xml} | 12 +-
.../layout/catalog_product_superconfig.xml} | 2 +-
.../catalog_product_superconfig_config.xml} | 0
.../layout/catalog_product_supergroup.xml} | 2 +-
.../catalog_product_supergrouppopup.xml} | 2 +-
.../layout/catalog_product_upsell.xml} | 2 +-
.../layout/catalog_product_upsellgrid.xml} | 2 +-
...catalog_product_view_type_configurable.xml | 2 +-
.../catalog_product_view_type_grouped.xml | 2 +-
.../layout/catalog_product_virtual.xml} | 12 +-
.../product/edit/attribute/search.phtml | 2 +-
.../view/adminhtml/product/edit/tabs.phtml | 8 +-
.../view/adminhtml/product/product.css | 14 +-
.../Catalog/view/frontend/category/view.phtml | 3 -
.../frontend/layout/catalog_category_view.xml | 2 +-
.../catalog_category_view_type_default.xml | 2 +-
...ory_view_type_default_without_children.xml | 2 +-
.../catalog_category_view_type_layered.xml | 2 +-
...ory_view_type_layered_without_children.xml | 2 +-
.../layout/catalog_product_compare_index.xml | 2 +-
.../layout/catalog_product_gallery.xml | 2 +-
.../frontend/layout/catalog_product_view.xml | 12 +-
...catalog_product_view_type_configurable.xml | 2 +-
.../catalog_product_view_type_grouped.xml | 2 +-
.../catalog_product_view_type_simple.xml | 2 +-
.../catalog_product_view_type_virtual.xml | 2 +-
...=> catalog_product_superconfig_config.xml} | 2 +-
.../CatalogSearch/etc/adminhtml/menu.xml | 2 +-
app/code/Magento/CatalogSearch/etc/module.xml | 1 -
...earch_edit.xml => catalog_search_edit.xml} | 2 +-
...lock.xml => catalog_search_grid_block.xml} | 0
...rch_index.xml => catalog_search_index.xml} | 4 +-
.../layout/catalogsearch_advanced_index.xml | 2 +-
.../layout/catalogsearch_advanced_result.xml | 2 +-
.../layout/catalogsearch_ajax_suggest.xml | 2 +-
.../layout/catalogsearch_result_index.xml | 2 +-
.../layout/catalogsearch_term_popular.xml | 2 +-
.../Centinel/Block/Adminhtml/Validation.php | 2 +-
.../Block/Adminhtml/Validation/Form.php | 2 +-
.../Controller/Adminhtml/Centinel/Index.php | 4 +-
app/code/Magento/Centinel/Model/Service.php | 2 +-
.../Magento/Centinel/etc/adminhtml/di.xml | 2 +-
app/code/Magento/Centinel/etc/module.xml | 1 -
...index.xml => sales_order_create_index.xml} | 2 +-
...der_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 | 6 +-
.../centinel_index_authenticationstart.xml | 6 +-
.../Checkout/view/frontend/js/payment.js | 4 +-
.../layout/checkout_cart_configure.xml | 2 +-
...ckout_cart_configure_type_configurable.xml | 2 +-
.../checkout_cart_configure_type_simple.xml | 2 +-
.../frontend/layout/checkout_cart_index.xml | 2 +-
.../layout/checkout_multishipping.xml | 2 +-
...kout_multishipping_address_editaddress.xml | 2 +-
...kout_multishipping_address_editbilling.xml | 2 +-
...out_multishipping_address_editshipping.xml | 2 +-
...ckout_multishipping_address_newbilling.xml | 2 +-
...kout_multishipping_address_newshipping.xml | 2 +-
.../checkout_multishipping_address_select.xml | 2 +-
...ut_multishipping_address_selectbilling.xml | 2 +-
.../checkout_multishipping_addresses.xml | 2 +-
.../layout/checkout_multishipping_billing.xml | 2 +-
...heckout_multishipping_customer_address.xml | 2 +-
.../layout/checkout_multishipping_login.xml | 2 +-
.../checkout_multishipping_overview.xml | 2 +-
.../checkout_multishipping_register.xml | 2 +-
.../checkout_multishipping_shipping.xml | 2 +-
.../layout/checkout_multishipping_success.xml | 2 +-
.../layout/checkout_onepage_additional.xml | 12 +-
.../layout/checkout_onepage_failure.xml | 2 +-
.../layout/checkout_onepage_index.xml | 2 +-
.../layout/checkout_onepage_paymentmethod.xml | 4 +-
.../layout/checkout_onepage_progress.xml | 16 +-
.../layout/checkout_onepage_review.xml | 2 +-
.../checkout_onepage_shippingmethod.xml | 2 +-
.../layout/checkout_onepage_success.xml | 2 +-
app/code/Magento/Cms/Helper/Page.php | 1 +
app/code/Magento/Cms/Model/Wysiwyg/Config.php | 4 +-
.../Cms/Model/Wysiwyg/Images/Storage.php | 2 +-
.../Cms/view/frontend/content_heading.phtml | 4 +-
.../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 | 27 +-
.../Cms/view/frontend/layout/print.xml | 10 +-
.../widget/static_block/default.phtml | 2 +-
.../Block/Adminhtml/Extension/Custom/Edit.php | 2 +-
.../Extension/Custom/Edit/Tab/Grid.php | 4 +-
.../Extension/Custom/Edit/Tab/Local.php | 2 +-
.../Adminhtml/Extension/Custom/Edit/Tabs.php | 2 +-
.../Controller/Adminhtml/Extension/Custom.php | 20 +-
.../Controller/Adminhtml/Extension/Local.php | 2 +-
app/code/Magento/Contacts/etc/module.xml | 1 -
.../Magento/Contacts/view/frontend/form.phtml | 74 ++-
.../frontend/layout/contacts_index_index.xml | 2 +-
.../Contacts/view/frontend/layout/default.xml | 3 +-
app/code/Magento/Core/Block/AbstractBlock.php | 18 +-
app/code/Magento/Core/Block/Template.php | 14 +-
.../Magento/Core/Block/Template/Context.php | 16 +-
.../Magento/Core/Controller/Varien/Action.php | 3 +-
app/code/Magento/Core/Model/App.php | 4 +-
.../Core/Model/Design/Fallback/Factory.php | 132 -----
.../Strategy/Fallback/CachingProxy.php | 292 ----------
.../Design/FileResolution/StrategyPool.php | 202 -------
.../Magento/Core/Model/Factory/Helper.php | 2 +-
app/code/Magento/Core/Model/Layout.php | 6 +
.../Model/Layout/File/Source/Aggregated.php | 110 ----
.../Core/Model/Layout/File/Source/Base.php | 83 ---
app/code/Magento/Core/Model/Layout/Merge.php | 83 +--
.../Core/Model/Store/StorageFactory.php | 6 +-
.../TemplateEngine/Decorator/DebugHints.php | 8 +-
.../TemplateEngine/Plugin/DebugHints.php | 6 +-
.../Design.php => Theme/Source/Theme.php} | 24 +-
.../Magento/Core/Model/View/FileSystem.php | 10 +-
app/code/Magento/Core/etc/di.xml | 39 +-
app/code/Magento/Core/etc/layouts.xsd | 2 +-
app/code/Magento/Core/etc/module.xml | 1 -
.../Core/view/frontend/prototype/magento.css | 280 +++++++---
.../Magento/Core/view/frontend}/text.phtml | 0
.../Core/view/frontend/translate_inline.phtml | 22 +-
.../Block/Adminhtml/System/Currency.php | 2 +-
.../Adminhtml/System/Currency/Rate/Matrix.php | 2 +-
.../Block/Adminhtml/System/Currencysymbol.php | 2 +-
.../Controller/Adminhtml/System/Currency.php | 6 +-
.../Adminhtml/System/Currencysymbol.php | 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 | 2 +-
.../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 +-
.../Block/Adminhtml/Editor/Container.php | 2 +-
.../Form/Renderer/BackgroundUploader.php | 4 +-
.../Editor/Form/Renderer/LogoUploader.php | 4 +-
.../Adminhtml/Editor/Toolbar/Buttons/Edit.php | 2 +-
.../Adminhtml/Editor/Toolbar/Buttons/Save.php | 2 +-
.../Block/Adminhtml/Editor/Tools.php | 2 +-
.../Adminhtml/Editor/Tools/Code/Css/Group.php | 2 +-
.../Adminhtml/Editor/Tools/Code/Custom.php | 8 +-
.../Editor/Tools/Code/ImageSizing.php | 2 +-
.../Block/Adminhtml/Editor/Tools/Code/Js.php | 6 +-
.../SelectorList/AbstractSelectorList.php | 6 +-
.../Theme/Selector/SelectorList/Available.php | 2 +-
.../Adminhtml/Theme/Selector/StoreView.php | 4 +-
.../Block/Adminhtml/Theme/Selector/Tabs.php | 2 +-
.../Adminhtml/System/Design/Editor.php | 8 +-
.../Adminhtml/System/Design/Editor/Tools.php | 2 +-
.../Magento/DesignEditor/Model/Observer.php | 2 +-
app/code/Magento/DesignEditor/etc/module.xml | 2 -
.../Controller/Adminhtml}/Json.php | 4 +-
.../Directory/etc/adminhtml/routes.xml | 32 ++
.../Directory/view/frontend/currency.phtml | 34 +-
.../view/frontend/currency/switch.phtml | 7 +-
.../frontend/layout/catalog_category_view.xml | 6 +-
.../layout/catalogsearch_advanced_index.xml | 6 +-
.../layout/catalogsearch_advanced_result.xml | 6 +-
.../layout/catalogsearch_result_index.xml | 6 +-
.../view/frontend/layout/default.xml | 6 +-
.../Catalog/Product/Edit/Tab/Downloadable.php | 2 +-
.../Product/Edit/Tab/Downloadable/Links.php | 4 +-
.../Product/Edit/Tab/Downloadable/Samples.php | 2 +-
.../Sales/Items/Column/Downloadable/Name.php | 2 +-
.../Block/Catalog/Product/Links.php | 3 +-
.../Adminhtml/Downloadable/File.php | 2 +-
.../Adminhtml/Downloadable/Product/Edit.php | 3 +-
...e.xml => catalog_product_downloadable.xml} | 12 +-
..._simple.xml => catalog_product_simple.xml} | 0
...irtual.xml => catalog_product_virtual.xml} | 0
...new.xml => sales_order_creditmemo_new.xml} | 8 +-
...l => sales_order_creditmemo_updateqty.xml} | 8 +-
...ew.xml => sales_order_creditmemo_view.xml} | 8 +-
...ce_new.xml => sales_order_invoice_new.xml} | 8 +-
....xml => sales_order_invoice_updateqty.xml} | 8 +-
..._view.xml => sales_order_invoice_view.xml} | 8 +-
...es_order_view.xml => sales_order_view.xml} | 8 +-
...catalog_product_view_type_downloadable.xml | 2 +-
...ckout_cart_configure_type_downloadable.xml | 2 +-
.../layout/downloadable_customer_products.xml | 2 +-
.../Attribute/Edit/Options/Labels.php | 2 +-
.../Attribute/Edit/Options/Options.php | 2 +-
.../Adminhtml/Attribute/Grid/AbstractGrid.php | 9 +-
.../Adminhtml/Product/Helper/Form/Config.php | 2 +-
.../Adminhtml/Sales/Order/Create/Items.php | 2 +-
.../Adminhtml/Sales/Order/View/Items.php | 2 +-
.../GiftMessage/view/adminhtml/form.phtml | 2 +-
.../GiftMessage/view/adminhtml/helper.phtml | 2 +-
...index.xml => sales_order_create_index.xml} | 0
...=> sales_order_create_load_block_data.xml} | 0
...> sales_order_create_load_block_items.xml} | 0
...es_order_view.xml => sales_order_view.xml} | 0
.../GoogleCheckout/Controller/Redirect.php | 2 +-
.../frontend/layout/checkout_cart_index.xml | 3 -
.../googlecheckout_redirect_redirect.xml | 2 +-
.../GoogleCheckout/view/frontend/link.phtml | 12 +-
.../Category/Edit/Tab/Googleoptimizer.php | 2 +-
.../Model/Observer/Block/Category/Tab.php | 2 +-
.../Magento/GoogleOptimizer/etc/module.xml | 1 -
...roduct_new.xml => catalog_product_new.xml} | 0
.../Block/Adminhtml/Captcha.php | 2 +-
.../GoogleShopping/Block/Adminhtml/Items.php | 2 +-
.../Block/Adminhtml/Items/Item.php | 6 +-
.../Block/Adminhtml/Items/Product.php | 4 +-
.../Block/Adminhtml/Store/Switcher.php | 2 +-
.../Block/Adminhtml/Types/Edit/Form.php | 2 +-
.../Adminhtml/Googleshopping/Items.php | 6 +-
.../Adminhtml/Googleshopping/Selection.php | 2 +-
.../Adminhtml/Googleshopping/Types.php | 10 +-
.../Block/Adminhtml/Export/Edit/Form.php | 2 +-
.../Block/Adminhtml/Import/Edit/Form.php | 2 +-
.../Block/Adminhtml/Import/Frame/Result.php | 2 +-
.../Controller/Adminhtml/Export.php | 6 +-
.../Controller/Adminhtml/Import.php | 6 +-
.../Index/Block/Adminhtml/Process/Grid.php | 6 +-
.../Index/Controller/Adminhtml/Process.php | 14 +-
app/code/Magento/Install/Model/Installer.php | 4 +-
.../view/install/layout/install_wizard.xml | 1 +
.../Magento/Install/view/install/page.phtml | 2 +-
app/code/Magento/Media/Model/File/Image.php | 233 --------
app/code/Magento/Media/Model/Image.php | 284 ----------
app/code/Magento/Media/etc/module.xml | 35 --
app/code/Magento/Media/i18n/de_DE.csv | 4 -
app/code/Magento/Media/i18n/en_US.csv | 3 -
app/code/Magento/Media/i18n/es_ES.csv | 3 -
app/code/Magento/Media/i18n/fr_FR.csv | 3 -
app/code/Magento/Media/i18n/nl_NL.csv | 3 -
app/code/Magento/Media/i18n/pt_BR.csv | 3 -
app/code/Magento/Media/i18n/zh_CN.csv | 3 -
.../layout/newsletter_manage_index.xml | 2 +-
.../Adminhtml/Oauth/Consumer/Edit/Form.php | 2 +-
.../Block/Adminhtml/Oauth/Consumer/Grid.php | 4 +-
.../Controller/Adminhtml/Oauth/Consumer.php | 16 +-
.../frontend/layout/ogone_api_paypage.xml | 2 +-
.../frontend/layout/ogone_api_placeform.xml | 2 +-
.../Magento/Page/view/frontend/1column.phtml | 42 +-
.../Page/view/frontend/2columns-left.phtml | 49 +-
.../Page/view/frontend/2columns-right.phtml | 49 +-
.../Magento/Page/view/frontend/3columns.phtml | 55 +-
.../Magento/Page/view/frontend}/blank.phtml | 0
.../Magento/Page/view/frontend/empty.phtml | 29 +-
.../Page/view/frontend}/html/block.phtml | 0
.../Page/view/frontend/html/breadcrumbs.phtml | 8 +-
.../Page/view/frontend/html/bugreport.phtml | 33 ++
.../Page/view/frontend}/html/copyright.phtml | 0
.../Page/view/frontend/html/head.phtml | 4 -
.../Page/view/frontend/html/header.phtml | 36 +-
.../Page/view/frontend/html/notices.phtml | 36 +-
.../Page/view/frontend/html/pager.phtml | 121 ++---
.../Page/view/frontend}/html/title.phtml | 0
.../Page/view/frontend/html/topmenu.phtml | 22 +-
.../Page/view/frontend/layout/default.xml | 113 ++--
.../Page/view/frontend/layout/page_empty.xml | 2 +-
.../view/frontend/layout/page_one_column.xml | 2 +-
.../frontend/layout/page_three_columns.xml | 2 +-
.../frontend/layout/page_two_columns_left.xml | 2 +-
.../layout/page_two_columns_right.xml | 2 +-
.../Page/view/frontend/layout/print.xml | 6 +-
.../Page/view/frontend/link/current.phtml | 4 +-
.../Magento/Page/view/frontend}/page.phtml | 2 +-
.../Magento/Page/view/frontend/popup.phtml | 21 +-
.../Magento/Page/view/frontend/print.phtml | 20 +-
.../Page/view/frontend/switch/languages.phtml | 30 +-
.../Page/view/frontend/switch/stores.phtml | 19 +-
.../Block/Adminhtml/Cache/Additional.php | 2 +-
.../Controller/Adminhtml/PageCache.php | 4 +-
app/code/Magento/PageCache/etc/module.xml | 1 -
.../Paygate/Authorizenet/Payment.php | 2 +-
.../product/view/profile/options.phtml | 11 +-
.../product/view/profile/schedule.phtml | 11 +-
.../view/frontend/form/banktransfer.phtml | 11 +-
.../view/frontend/form/cashondelivery.phtml | 11 +-
.../Payment/view/frontend/form/cc.phtml | 126 +++--
.../Payment/view/frontend/form/ccsave.phtml | 100 ++--
.../Payment/view/frontend/form/checkmo.phtml | 23 +-
.../view/frontend/form/purchaseorder.phtml | 13 +-
.../Payment/view/frontend/info/checkmo.phtml | 30 +-
.../Payment/view/frontend/info/default.phtml | 29 +-
.../view/frontend/info/instructions.phtml | 13 +-
.../view/frontend/info/purchaseorder.phtml | 10 +-
.../frontend/layout/catalog_product_view.xml | 5 +-
.../Block/Adminhtml/Settlement/Report.php | 2 +-
.../System/Config/Fieldset/Payment.php | 2 +-
.../Controller/Adminhtml/Paypal/Reports.php | 6 +-
.../Paypal/view/frontend/express/review.phtml | 120 +++--
.../frontend/express/review/address.phtml | 253 +++++----
.../frontend/express/review/details.phtml | 44 +-
.../express/review/shipping/method.phtml | 51 +-
.../view/frontend/express/shortcut.phtml | 43 +-
.../Paypal/view/frontend/hss/form.phtml | 21 +-
.../Paypal/view/frontend/hss/iframe.phtml | 8 +-
.../Paypal/view/frontend/hss/info.phtml | 7 +-
.../Magento/Paypal/view/frontend/hss/js.phtml | 1 -
.../Paypal/view/frontend/hss/redirect.phtml | 51 +-
.../view/frontend/hss/review/button.phtml | 4 +-
.../view/frontend/js/paypal-checkout.js | 6 +-
.../view/frontend/layout/SHORTCUT_popup.xml | 6 +-
.../frontend/layout/catalog_product_view.xml | 5 +-
.../frontend/layout/checkout_cart_index.xml | 6 +-
.../Paypal/view/frontend/layout/default.xml | 7 +-
.../frontend/layout/paypal_express_review.xml | 29 +-
.../layout/paypal_express_review_details.xml | 14 +-
.../layout/paypal_hostedpro_cancel.xml | 2 +-
.../layout/paypal_payflow_cancelpayment.xml | 5 +-
.../frontend/layout/paypal_payflow_form.xml | 5 +-
.../layout/paypal_payflow_returnurl.xml | 5 +-
.../paypal_payflowadvanced_cancelpayment.xml | 5 +-
.../layout/paypal_payflowadvanced_form.xml | 5 +-
.../paypal_payflowadvanced_returnurl.xml | 5 +-
.../layout/paypal_standard_redirect.xml | 6 +-
.../Paypal/view/frontend/order-review.js | 47 +-
.../Paypal/view/frontend/partner/logo.phtml | 9 +-
.../view/frontend/payflowadvanced/form.phtml | 21 +-
.../frontend/payflowadvanced/iframe.phtml | 8 +-
.../view/frontend/payflowadvanced/info.phtml | 7 +-
.../frontend/payflowadvanced/redirect.phtml | 63 ++-
.../view/frontend/payflowlink/form.phtml | 21 +-
.../view/frontend/payflowlink/iframe.phtml | 8 +-
.../view/frontend/payflowlink/info.phtml | 7 +-
.../view/frontend/payflowlink/redirect.phtml | 41 +-
.../Paypal/view/frontend/payment/mark.phtml | 8 +-
.../view/frontend/payment/redirect.phtml | 15 +-
.../view/frontend/express/review.phtml | 208 +++----
.../frontend/layout/SHORTCUT_uk_popup.xml | 6 +-
.../frontend/layout/catalog_product_view.xml | 7 +-
.../frontend/layout/checkout_cart_index.xml | 6 +-
.../PaypalUk/view/frontend/layout/default.xml | 3 +-
.../layout/paypal_express_review_details.xml | 12 +-
.../layout/paypaluk_express_review.xml | 23 +-
.../paypaluk_express_review_details.xml | 2 +-
.../Block/Adminhtml}/Edit.php | 6 +-
.../Block/Adminhtml}/Edit/Form.php | 4 +-
.../Block/Adminhtml}/Edit/Tab/Form.php | 4 +-
.../Block/Adminhtml}/Edit/Tab/Options.php | 2 +-
.../Block/Adminhtml}/Edit/Tabs.php | 8 +-
.../Block/Adminhtml}/Rating.php | 5 +-
.../Controller/Adminhtml/Index.php} | 20 +-
app/code/Magento/Rating/etc/adminhtml/di.xml | 32 ++
.../Magento/Rating/etc/adminhtml/routes.xml | 32 ++
.../view/adminhtml/layout/rating_block.xml} | 2 +-
.../adminhtml/layout/rating_index_index.xml} | 4 +-
.../view/adminhtml/rating/detailed.phtml | 0
.../view/adminhtml/rating/options.phtml | 0
.../adminhtml/rating/stars/detailed.phtml | 0
.../view/adminhtml/rating/stars/summary.phtml | 0
.../Rating/view/frontend/detailed.phtml | 11 +-
.../Magento/Review/Controller/Product.php | 1 +
.../Magento/Review/etc/adminhtml/menu.xml | 4 +-
.../Review/view/frontend/customer/list.phtml | 86 +--
.../view/frontend/customer/recent.phtml | 40 +-
.../Review/view/frontend/customer/view.phtml | 81 +--
.../Magento/Review/view/frontend/form.phtml | 162 +++---
.../Review/view/frontend/helper/summary.phtml | 49 +-
.../view/frontend/helper/summary_short.phtml | 44 +-
.../layout/customer_account_index.xml | 4 +-
.../frontend/layout/review_customer_index.xml | 2 +-
.../frontend/layout/review_customer_view.xml | 2 +-
.../frontend/layout/review_product_list.xml | 2 +-
.../frontend/layout/review_product_view.xml | 4 +-
.../view/frontend/product/view/list.phtml | 81 +--
.../Review/view/frontend}/redirect.phtml | 0
.../Magento/Review/view/frontend/view.phtml | 46 +-
.../Magento/Rss/Block/Catalog/NotifyStock.php | 2 +-
app/code/Magento/Rss/Block/Catalog/Review.php | 2 +-
app/code/Magento/Rss/Block/Order/NewOrder.php | 2 +-
.../Rss/view/frontend/category/link.phtml | 29 +
.../frontend/layout/catalog_category_view.xml | 30 ++
.../view/frontend/layout/rss_index_index.xml | 7 +-
app/code/Magento/Rss/view/frontend/list.phtml | 28 +-
.../Adminhtml/Billing/Agreement/Grid.php | 4 +-
.../Adminhtml/Billing/Agreement/View.php | 2 +-
.../Billing/Agreement/View/Tab/Info.php | 2 +-
.../Block/Adminhtml}/Creditmemo.php | 9 +-
.../Block/Adminhtml}/Creditmemo/Grid.php | 12 +-
.../Adminhtml/Customer/Edit/Tab/Agreement.php | 2 +-
.../Customer/Edit/Tab/Recurring/Profile.php | 2 +-
.../Block/Adminhtml}/Invoice.php | 9 +-
.../Block/Adminhtml}/Invoice/Grid.php | 12 +-
.../Block/Adminhtml}/Items/AbstractItems.php | 93 ++--
.../Adminhtml}/Items/Column/DefaultColumn.php | 6 +-
.../Block/Adminhtml}/Items/Column/Name.php | 8 +-
.../Adminhtml}/Items/Column/Name/Grouped.php | 8 +-
.../Block/Adminhtml}/Items/Column/Qty.php | 8 +-
.../Items/Renderer/Configurable.php | 8 +-
.../Items/Renderer/DefaultRenderer.php | 8 +-
.../Sales => Sales/Block/Adminhtml}/Order.php | 11 +-
.../Block/Adminhtml}/Order/AbstractOrder.php | 10 +-
.../Block/Adminhtml}/Order/Address.php | 9 +-
.../Block/Adminhtml}/Order/Address/Form.php | 18 +-
.../Block/Adminhtml}/Order/Comments/View.php | 10 +-
.../Block/Adminhtml}/Order/Create.php | 18 +-
.../Order/Create/AbstractCreate.php | 12 +-
.../Order/Create/Billing/Address.php | 10 +-
.../Order/Create/Billing/Method.php | 8 +-
.../Order/Create/Billing/Method/Form.php | 6 +-
.../Block/Adminhtml}/Order/Create/Comment.php | 6 +-
.../Block/Adminhtml}/Order/Create/Coupons.php | 8 +-
.../Adminhtml}/Order/Create/Coupons/Form.php | 8 +-
.../Adminhtml}/Order/Create/Customer.php | 8 +-
.../Block/Adminhtml}/Order/Create/Data.php | 12 +-
.../Block/Adminhtml}/Order/Create/Form.php | 16 +-
.../Order/Create/Form/AbstractForm.php | 20 +-
.../Adminhtml}/Order/Create/Form/Account.php | 14 +-
.../Adminhtml}/Order/Create/Form/Address.php | 16 +-
.../Adminhtml}/Order/Create/Giftmessage.php | 14 +-
.../Order/Create/Giftmessage/Form.php | 18 +-
.../Block/Adminhtml}/Order/Create/Header.php | 6 +-
.../Block/Adminhtml}/Order/Create/Items.php | 8 +-
.../Adminhtml}/Order/Create/Items/Grid.php | 12 +-
.../Block/Adminhtml}/Order/Create/Load.php | 6 +-
.../Adminhtml}/Order/Create/Messages.php | 6 +-
.../Adminhtml}/Order/Create/Newsletter.php | 8 +-
.../Order/Create/Newsletter/Form.php | 6 +-
.../Block/Adminhtml}/Order/Create/Search.php | 8 +-
.../Adminhtml}/Order/Create/Search/Grid.php | 18 +-
.../Create/Search/Grid/Renderer/Price.php | 6 +-
.../Create/Search/Grid/Renderer/Product.php | 6 +-
.../Order/Create/Search/Grid/Renderer/Qty.php | 6 +-
.../Order/Create/Shipping/Address.php | 10 +-
.../Order/Create/Shipping/Method.php | 8 +-
.../Order/Create/Shipping/Method/Form.php | 12 +-
.../Block/Adminhtml}/Order/Create/Sidebar.php | 8 +-
.../Order/Create/Sidebar/AbstractSidebar.php | 12 +-
.../Adminhtml}/Order/Create/Sidebar/Cart.php | 10 +-
.../Order/Create/Sidebar/Compared.php | 8 +-
.../Order/Create/Sidebar/Pcompared.php | 12 +-
.../Order/Create/Sidebar/Pviewed.php | 12 +-
.../Order/Create/Sidebar/Reorder.php | 12 +-
.../Order/Create/Sidebar/Viewed.php | 8 +-
.../Order/Create/Sidebar/Wishlist.php | 8 +-
.../Block/Adminhtml}/Order/Create/Store.php | 8 +-
.../Adminhtml}/Order/Create/Store/Select.php | 4 +-
.../Block/Adminhtml}/Order/Create/Totals.php | 14 +-
.../Order/Create/Totals/DefaultTotals.php | 8 +-
.../Order/Create/Totals/Discount.php | 10 +-
.../Order/Create/Totals/Grandtotal.php | 12 +-
.../Order/Create/Totals/Shipping.php | 12 +-
.../Order/Create/Totals/Subtotal.php | 12 +-
.../Adminhtml}/Order/Create/Totals/Table.php | 6 +-
.../Adminhtml}/Order/Create/Totals/Tax.php | 8 +-
.../Adminhtml}/Order/Creditmemo/Create.php | 8 +-
.../Order/Creditmemo/Create/Adjustments.php | 4 +-
.../Order/Creditmemo/Create/Form.php | 8 +-
.../Order/Creditmemo/Create/Items.php | 10 +-
.../Adminhtml}/Order/Creditmemo/Totals.php | 8 +-
.../Adminhtml}/Order/Creditmemo/View.php | 24 +-
.../Order/Creditmemo/View/Comments.php | 6 +-
.../Adminhtml}/Order/Creditmemo/View/Form.php | 10 +-
.../Order/Creditmemo/View/Items.php | 10 +-
.../Block/Adminhtml}/Order/Grid.php | 6 +-
.../Block/Adminhtml}/Order/Invoice/Create.php | 8 +-
.../Adminhtml}/Order/Invoice/Create/Form.php | 12 +-
.../Adminhtml}/Order/Invoice/Create/Items.php | 10 +-
.../Order/Invoice/Create/Tracking.php | 10 +-
.../Block/Adminhtml}/Order/Invoice/Totals.php | 8 +-
.../Block/Adminhtml}/Order/Invoice/View.php | 24 +-
.../Order/Invoice/View/Comments.php | 6 +-
.../Adminhtml}/Order/Invoice/View/Form.php | 10 +-
.../Adminhtml}/Order/Invoice/View/Items.php | 10 +-
.../Block/Adminhtml}/Order/Payment.php | 6 +-
.../Adminhtml}/Order/Shipment/Create.php | 8 +-
.../Adminhtml}/Order/Shipment/Create/Form.php | 12 +-
.../Order/Shipment/Create/Items.php | 8 +-
.../Order/Shipment/Create/Tracking.php | 8 +-
.../Adminhtml}/Order/Shipment/Packaging.php | 14 +-
.../Order/Shipment/Packaging/Grid.php | 6 +-
.../Order/Shipment/Tracking/Info.php | 8 +-
.../Block/Adminhtml}/Order/Shipment/View.php | 16 +-
.../Order/Shipment/View/Comments.php | 6 +-
.../Adminhtml}/Order/Shipment/View/Form.php | 12 +-
.../Adminhtml}/Order/Shipment/View/Items.php | 8 +-
.../Order/Shipment/View/Tracking.php | 14 +-
.../Block/Adminhtml}/Order/Status.php | 12 +-
.../Block/Adminhtml}/Order/Status/Assign.php | 6 +-
.../Adminhtml}/Order/Status/Assign/Form.php | 6 +-
.../Block/Adminhtml}/Order/Status/Edit.php | 6 +-
.../Adminhtml}/Order/Status/Edit/Form.php | 8 +-
.../Adminhtml}/Order/Status/NewStatus.php | 6 +-
.../Order/Status/NewStatus/Form.php | 6 +-
.../Block/Adminhtml}/Order/Totalbar.php | 8 +-
.../Block/Adminhtml}/Order/Totals.php | 8 +-
.../Block/Adminhtml}/Order/Totals/Item.php | 14 +-
.../Block/Adminhtml}/Order/Totals/Tax.php | 8 +-
.../Block/Adminhtml}/Order/View.php | 36 +-
.../Block/Adminhtml}/Order/View/Form.php | 9 +-
.../Adminhtml}/Order/View/Giftmessage.php | 14 +-
.../Block/Adminhtml}/Order/View/History.php | 8 +-
.../Block/Adminhtml}/Order/View/Info.php | 14 +-
.../Block/Adminhtml}/Order/View/Items.php | 8 +-
.../View/Items/Renderer/DefaultRenderer.php | 12 +-
.../Block/Adminhtml}/Order/View/Messages.php | 6 +-
.../Adminhtml}/Order/View/Tab/Creditmemos.php | 10 +-
.../Adminhtml}/Order/View/Tab/History.php | 10 +-
.../Block/Adminhtml}/Order/View/Tab/Info.php | 10 +-
.../Adminhtml}/Order/View/Tab/Invoices.php | 10 +-
.../Adminhtml}/Order/View/Tab/Shipments.php | 8 +-
.../Order/View/Tab/Transactions.php | 12 +-
.../Block/Adminhtml}/Order/View/Tabs.php | 4 +-
.../Adminhtml/Recurring/Profile/Edit/Form.php | 2 +-
.../Adminhtml/Recurring/Profile/Grid.php | 4 +-
.../Adminhtml/Recurring/Profile/View.php | 10 +-
.../Recurring/Profile/View/Getawayinfo.php | 2 +-
.../Adminhtml/Recurring/Profile/View/Info.php | 2 +-
.../Recurring/Profile/View/Items.php | 4 +-
.../Recurring/Profile/View/Tab/Orders.php | 6 +-
.../Adminhtml}/Reorder/Renderer/Action.php | 8 +-
.../Block/Adminhtml}/Shipment.php | 9 +-
.../Block/Adminhtml}/Shipment/Grid.php | 16 +-
.../Block/Adminhtml}/Totals.php | 6 +-
.../Block/Adminhtml}/Transactions.php | 9 +-
.../Adminhtml}/Transactions/Child/Grid.php | 8 +-
.../Block/Adminhtml}/Transactions/Detail.php | 14 +-
.../Adminhtml}/Transactions/Detail/Grid.php | 6 +-
.../Block/Adminhtml}/Transactions/Grid.php | 10 +-
.../Sales/Block/Billing/Agreement/View.php | 2 +-
.../Adminhtml}/Billing/Agreement.php | 22 +-
.../Controller/Adminhtml}/Creditmemo.php | 10 +-
.../Creditmemo/AbstractCreditmemo.php | 18 +-
.../Controller/Adminhtml}/Invoice.php | 10 +-
.../Adminhtml}/Invoice/AbstractInvoice.php | 18 +-
.../Controller/Adminhtml}/Order.php | 62 +--
.../Controller/Adminhtml}/Order/Create.php | 56 +-
.../Adminhtml}/Order/Creditmemo.php | 18 +-
.../Controller/Adminhtml}/Order/Edit.php | 16 +-
.../Controller/Adminhtml}/Order/Invoice.php | 26 +-
.../Controller/Adminhtml}/Order/Shipment.php | 30 +-
.../Controller/Adminhtml}/Order/Status.php | 28 +-
.../Adminhtml}/Order/View/Giftmessage.php | 8 +-
.../Adminhtml}/Recurring/Profile.php | 20 +-
.../Controller/Adminhtml}/Shipment.php | 10 +-
.../Adminhtml}/Shipment/AbstractShipment.php | 16 +-
.../Controller/Adminhtml}/Transactions.php | 12 +-
.../Sales.php => Sales/Helper/Admin.php} | 6 +-
.../Order.php => Sales/Model/AdminOrder.php} | 8 +-
.../Model/AdminOrder}/Create.php | 44 +-
.../Model/AdminOrder}/Random.php | 4 +-
.../Order/Grid/Massaction/ItemsUpdater.php | 2 +-
.../Model/Order/Pdf/Shipment/Packaging.php | 2 +-
app/code/Magento/Sales/etc/adminhtml/menu.xml | 16 +-
.../Magento/Sales/etc/adminhtml/routes.xml | 32 ++
.../view/adminhtml}/items/column/name.phtml | 2 +-
.../view/adminhtml}/items/column/qty.phtml | 0
.../adminhtml}/items/renderer/default.phtml | 0
.../sales_billing_agreement_customergrid.xml} | 0
.../layout/sales_billing_agreement_grid.xml} | 0
.../layout/sales_billing_agreement_index.xml} | 0
.../sales_billing_agreement_ordersgrid.xml} | 2 +-
.../layout/sales_billing_agreement_view.xml} | 2 +-
.../layout/sales_order_addcomment.xml | 28 +
.../adminhtml/layout/sales_order_address.xml} | 2 +-
.../sales_order_create_customer_block.xml} | 0
.../layout/sales_order_create_index.xml | 122 +++++
...der_create_load_block_billing_address.xml} | 2 +-
...rder_create_load_block_billing_method.xml} | 4 +-
.../sales_order_create_load_block_comment.xml | 30 ++
...order_create_load_block_customer_grid.xml} | 2 +-
.../sales_order_create_load_block_data.xml | 68 +++
...s_order_create_load_block_form_account.xml | 30 ++
...s_order_create_load_block_giftmessage.xml} | 2 +-
.../sales_order_create_load_block_header.xml} | 2 +-
.../sales_order_create_load_block_items.xml} | 8 +-
.../sales_order_create_load_block_json.xml} | 2 +-
...sales_order_create_load_block_message.xml} | 2 +-
...es_order_create_load_block_newsletter.xml} | 4 +-
.../sales_order_create_load_block_plain.xml} | 0
.../sales_order_create_load_block_search.xml} | 4 +-
...s_order_create_load_block_search_grid.xml} | 2 +-
...der_create_load_block_shipping_address.xml | 30 ++
...rder_create_load_block_shipping_method.xml | 32 ++
.../sales_order_create_load_block_sidebar.xml | 38 ++
...s_order_create_load_block_sidebar_cart.xml | 30 ++
...der_create_load_block_sidebar_compared.xml | 30 ++
...er_create_load_block_sidebar_pcompared.xml | 30 ++
...rder_create_load_block_sidebar_pviewed.xml | 30 ++
...rder_create_load_block_sidebar_reorder.xml | 30 ++
...rder_create_load_block_sidebar_viewed.xml} | 2 +-
...der_create_load_block_sidebar_wishlist.xml | 30 ++
.../sales_order_create_load_block_totals.xml | 30 ++
.../sales_order_creditmemo_addcomment.xml} | 4 +-
.../layout/sales_order_creditmemo_new.xml | 77 +++
.../sales_order_creditmemo_updateqty.xml | 68 +++
.../layout/sales_order_creditmemo_view.xml | 85 +++
.../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} | 26 +-
.../adminhtml/layout/sales_order_index.xml} | 4 +-
.../sales_order_invoice_addcomment.xml} | 4 +-
.../layout/sales_order_invoice_new.xml | 88 +++
.../layout/sales_order_invoice_updateqty.xml | 80 +++
.../layout/sales_order_invoice_view.xml | 92 ++++
.../sales_order_shipment_addcomment.xml} | 4 +-
.../layout/sales_order_shipment_addtrack.xml | 28 +
.../layout/sales_order_shipment_new.xml | 50 ++
.../sales_order_shipment_removetrack.xml | 28 +
.../layout/sales_order_shipment_view.xml | 57 ++
.../layout/sales_order_status_assign.xml} | 2 +-
.../layout/sales_order_status_edit.xml} | 2 +-
.../layout/sales_order_status_index.xml} | 4 +-
.../layout/sales_order_status_newstatus.xml} | 2 +-
.../layout/sales_order_transactions.xml} | 2 +-
.../adminhtml/layout/sales_order_view.xml} | 59 +-
.../sales_recurring_profile_customergrid.xml} | 0
.../layout/sales_recurring_profile_grid.xml} | 0
.../layout/sales_recurring_profile_index.xml} | 0
.../sales_recurring_profile_orders.xml} | 0
.../layout/sales_recurring_profile_view.xml} | 40 +-
.../layout/sales_transactions_grid.xml} | 2 +-
.../layout/sales_transactions_index.xml} | 2 +-
.../layout/sales_transactions_view.xml} | 6 +-
.../view/adminhtml}/order/address/form.phtml | 0
.../view/adminhtml}/order/comments/view.phtml | 0
.../adminhtml}/order/create/abstract.phtml | 0
.../order/create/billing/method/form.phtml | 0
.../adminhtml}/order/create/comment.phtml | 0
.../order/create/coupons/form.phtml | 2 +-
.../view/adminhtml}/order/create/data.phtml | 0
.../view/adminhtml}/order/create/form.phtml | 0
.../order/create/form/account.phtml | 0
.../order/create/form/address.phtml | 0
.../adminhtml}/order/create/giftmessage.js | 2 +-
.../adminhtml}/order/create/giftmessage.phtml | 0
.../view/adminhtml}/order/create/items.phtml | 0
.../adminhtml}/order/create/items/grid.phtml | 2 +-
.../view/adminhtml}/order/create/js.phtml | 4 +-
.../order/create/newsletter/form.phtml | 0
.../view/adminhtml}/order/create/scripts.js | 2 +-
.../order/create/shipping/method/form.phtml | 2 +-
.../adminhtml}/order/create/sidebar.phtml | 8 +-
.../order/create/sidebar/items.phtml | 2 +-
.../order/create/store/select.phtml | 2 +-
.../view/adminhtml}/order/create/totals.phtml | 0
.../order/create/totals/default.phtml | 0
.../order/create/totals/grandtotal.phtml | 0
.../order/create/totals/shipping.phtml | 0
.../order/create/totals/subtotal.phtml | 4 +-
.../adminhtml}/order/create/totals/tax.phtml | 0
.../order/creditmemo/create/form.phtml | 0
.../order/creditmemo/create/items.phtml | 0
.../create/items/renderer/configurable.phtml | 0
.../create/items/renderer/default.phtml | 0
.../create/totals/adjustments.phtml | 0
.../order/creditmemo/view/form.phtml | 0
.../order/creditmemo/view/items.phtml | 0
.../view/items/renderer/configurable.phtml | 0
.../view/items/renderer/default.phtml | 0
.../view/adminhtml}/order/giftoptions.phtml | 0
.../adminhtml}/order/giftoptions_tooltip.js | 4 +-
.../order/invoice/create/form.phtml | 0
.../order/invoice/create/items.phtml | 0
.../create/items/renderer/configurable.phtml | 0
.../create/items/renderer/default.phtml | 0
.../order/invoice/create/tracking.phtml | 2 +-
.../adminhtml}/order/invoice/view/form.phtml | 0
.../adminhtml}/order/invoice/view/items.phtml | 0
.../view/items/renderer/configurable.phtml | 0
.../invoice/view/items/renderer/default.phtml | 0
.../order/shipment/create/form.phtml | 2 +-
.../order/shipment/create/items.phtml | 0
.../create/items/renderer/configurable.phtml | 0
.../create/items/renderer/default.phtml | 0
.../order/shipment/create/tracking.phtml | 2 +-
.../adminhtml}/order/shipment/packaging.js | 2 +-
.../order/shipment/packaging/grid.phtml | 0
.../order/shipment/packaging/packed.phtml | 0
.../order/shipment/packaging/popup.phtml | 2 +-
.../order/shipment/tracking/info.phtml | 0
.../adminhtml}/order/shipment/view/form.phtml | 2 +-
.../order/shipment/view/items.phtml | 0
.../view/items/renderer/configurable.phtml | 0
.../view/items/renderer/default.phtml | 0
.../order/shipment/view/tracking.phtml | 2 +-
.../view/adminhtml}/order/totalbar.phtml | 0
.../view/adminhtml}/order/totals.phtml | 0
.../adminhtml}/order/totals/discount.phtml | 0
.../view/adminhtml}/order/totals/due.phtml | 0
.../view/adminhtml}/order/totals/footer.phtml | 0
.../view/adminhtml}/order/totals/grand.phtml | 0
.../view/adminhtml}/order/totals/item.phtml | 0
.../view/adminhtml}/order/totals/main.phtml | 0
.../view/adminhtml}/order/totals/paid.phtml | 0
.../adminhtml}/order/totals/refunded.phtml | 0
.../adminhtml}/order/totals/shipping.phtml | 0
.../view/adminhtml}/order/totals/tax.phtml | 2 +-
.../view/adminhtml}/order/view/form.phtml | 0
.../adminhtml}/order/view/giftmessage.phtml | 0
.../view/adminhtml}/order/view/history.phtml | 0
.../view/adminhtml}/order/view/info.phtml | 2 +-
.../view/adminhtml}/order/view/items.phtml | 0
.../order/view/items/renderer/default.phtml | 0
.../adminhtml}/order/view/tab/history.phtml | 0
.../view/adminhtml}/order/view/tab/info.phtml | 2 +-
.../view/adminhtml}/order/view/tracking.phtml | 0
.../view/adminhtml}/transactions/detail.phtml | 0
.../frontend/billing/agreement/view.phtml | 145 +++--
.../view/frontend/billing/agreements.phtml | 99 ++--
.../Sales/view/frontend/guest/form.phtml | 104 ++--
.../layout/customer_account_index.xml | 4 +-
.../layout/sales_billing_agreement_index.xml | 2 +-
.../layout/sales_billing_agreement_view.xml | 2 +-
.../sales_email_order_creditmemo_items.xml | 12 +-
.../sales_email_order_invoice_items.xml | 12 +-
.../layout/sales_email_order_items.xml | 12 +-
.../sales_email_order_shipment_items.xml | 2 +-
.../layout/sales_guest_creditmemo.xml | 12 +-
.../view/frontend/layout/sales_guest_form.xml | 2 +-
.../frontend/layout/sales_guest_invoice.xml | 12 +-
.../layout/sales_guest_printorder.xml | 12 +-
.../sales_guest_printordercreditmemo.xml | 12 +-
.../layout/sales_guest_printorderinvoice.xml | 12 +-
.../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 | 12 +-
.../layout/sales_order_creditmemo.xml | 12 +-
.../layout/sales_order_guest_info_links.xml | 3 +
.../frontend/layout/sales_order_history.xml | 2 +-
.../layout/sales_order_info_links.xml | 3 +
.../frontend/layout/sales_order_invoice.xml | 12 +-
.../layout/sales_order_printorder.xml | 18 +-
.../sales_order_printordercreditmemo.xml | 12 +-
.../layout/sales_order_printorderinvoice.xml | 12 +-
.../layout/sales_order_printshipment.xml | 2 +-
.../frontend/layout/sales_order_reorder.xml | 2 +-
.../frontend/layout/sales_order_shipment.xml | 2 +-
.../view/frontend/layout/sales_order_view.xml | 12 +-
.../layout/sales_recurring_profile_index.xml | 2 +-
.../layout/sales_recurring_profile_orders.xml | 2 +-
.../layout/sales_recurring_profile_view.xml | 32 +-
.../sales_recurring_profile_view__tabs.xml | 12 +-
.../Sales/view/frontend/order/comments.phtml | 11 +-
.../view/frontend/order/creditmemo.phtml | 11 +-
.../frontend/order/creditmemo/items.phtml | 47 +-
.../creditmemo/items/renderer/default.phtml | 48 +-
.../Sales/view/frontend/order/history.phtml | 62 +--
.../Sales/view/frontend/order/info.phtml | 95 ++--
.../view/frontend/order/info/buttons.phtml | 33 +-
.../Sales/view/frontend/order/invoice.phtml | 11 +-
.../view/frontend/order/invoice/items.phtml | 42 +-
.../invoice/items/renderer/default.phtml | 33 +-
.../Sales/view/frontend/order/items.phtml | 50 +-
.../order/items/renderer/default.phtml | 62 +--
.../Sales/view/frontend/order/print.phtml | 103 ++--
.../frontend/order/print/creditmemo.phtml | 126 +++--
.../view/frontend/order/print/invoice.phtml | 88 +--
.../view/frontend/order/print/shipment.phtml | 124 +++--
.../Sales/view/frontend/order/recent.phtml | 91 ++--
.../Sales/view/frontend/order/shipment.phtml | 11 +-
.../view/frontend/order/shipment/items.phtml | 70 ++-
.../shipment/items/renderer/default.phtml | 22 +-
.../Sales/view/frontend/order/totals.phtml | 1 -
.../view/frontend/order/trackinginfo.phtml | 24 +-
.../Sales/view/frontend/order/view.phtml | 46 +-
.../payment/form/billing/agreement.phtml | 25 +-
.../Sales/view/frontend/recurring/grid.phtml | 98 ++--
.../frontend/recurring/profile/view.phtml | 158 +++---
.../recurring/profile/view/info.phtml | 37 +-
.../view/frontend/recurring/profiles.phtml | 17 +-
.../Sales/view/frontend/reorder/sidebar.phtml | 62 +--
.../view/frontend/widget/guest/form.phtml | 120 +++--
.../layout/sendfriend_product_send.xml | 2 +-
.../layout/shipping_tracking_popup.xml | 2 +-
.../Controller/Adminhtml}/Sitemap.php | 30 +-
.../Magento/Sitemap/etc/adminhtml/routes.xml | 32 ++
.../Tax => Tax/Block/Adminhtml}/Rate/Form.php | 18 +-
.../Adminhtml}/Rate/Grid/Renderer/Country.php | 6 +-
.../Adminhtml}/Rate/Grid/Renderer/Data.php | 6 +-
.../Block/Adminhtml}/Rate/ImportExport.php | 6 +-
.../Adminhtml}/Rate/ImportExportHeader.php | 8 +-
.../Block/Adminhtml}/Rate/Title.php | 6 +-
.../Block/Adminhtml}/Rate/Title/Fieldset.php | 10 +-
.../Block/Adminhtml}/Rate/Toolbar/Add.php | 10 +-
.../Block/Adminhtml}/Rate/Toolbar/Save.php | 14 +-
.../Tax => Tax/Block/Adminhtml}/Rule.php | 6 +-
.../Tax => Tax/Block/Adminhtml}/Rule/Edit.php | 7 +-
.../Block/Adminhtml}/Rule/Edit/Form.php | 16 +-
.../Magento/Tax/Block/Sales/Order/Tax.php | 2 +-
.../Tax => Tax/Controller/Adminhtml}/Rate.php | 30 +-
.../Tax => Tax/Controller/Adminhtml}/Rule.php | 22 +-
.../Tax => Tax/Controller/Adminhtml}/Tax.php | 8 +-
app/code/Magento/Tax/etc/adminhtml/menu.xml | 6 +-
.../frontend => Tax/etc/adminhtml}/routes.xml | 6 +-
app/code/Magento/Tax/etc/sales.xml | 10 +-
.../view/adminhtml}/class/page/edit.phtml | 0
.../view/adminhtml}/importExport.phtml | 4 +-
.../view/adminhtml}/importExportHeader.phtml | 0
.../view/adminhtml/layout/tax_rate_block.xml} | 10 +-
.../adminhtml/layout/tax_rate_exportcsv.xml} | 2 +-
.../adminhtml/layout/tax_rate_exportxml.xml} | 2 +-
.../view/adminhtml/layout/tax_rate_index.xml} | 4 +-
.../view/adminhtml/layout/tax_rule_block.xml} | 2 +-
.../view/adminhtml/layout/tax_rule_edit.xml} | 8 +-
.../view/adminhtml/layout/tax_rule_index.xml} | 4 +-
.../view/adminhtml}/rate/form.phtml | 0
.../tax => Tax/view/adminhtml}/rate/js.phtml | 0
.../view/adminhtml}/rate/title.phtml | 0
.../view/adminhtml}/rule/edit.phtml | 4 +-
.../view/adminhtml}/rule/rate/form.phtml | 2 +-
.../view/adminhtml}/toolbar/class/add.phtml | 0
.../view/adminhtml}/toolbar/class/save.phtml | 0
.../view/adminhtml}/toolbar/rate/add.phtml | 0
.../view/adminhtml}/toolbar/rate/save.phtml | 0
.../view/adminhtml}/toolbar/rule/add.phtml | 0
.../view/adminhtml}/toolbar/rule/save.phtml | 0
.../Adminhtml/System/Design/Theme/Edit.php | 2 +-
.../System/Design/Theme/Edit/Form.php | 2 +-
.../System/Design/Theme/Edit/Tab/Css.php | 8 +-
.../System/Design/Theme/Edit/Tab/Js.php | 4 +-
.../Block/Adminhtml/Wysiwyg/Files/Content.php | 16 +-
.../Wysiwyg/Files/Content/Uploader.php | 2 +-
.../Block/Adminhtml/Wysiwyg/Files/Tree.php | 2 +-
.../Adminhtml/System/Design/Theme.php | 12 +-
.../Adminhtml/System/Design/Wysiwyg/Files.php | 2 +-
.../User/Controller/Adminhtml/Auth.php | 4 +-
.../User/Controller/Adminhtml/User.php | 18 +-
.../User/Controller/Adminhtml/User/Role.php | 6 +-
.../view/adminhtml/admin/forgotpassword.phtml | 2 +-
.../admin/resetforgottenpassword.phtml | 2 +-
.../layout/adminhtml_auth_forgotpassword.xml | 1 +
.../layout/adminhtml_auth_resetpassword.xml | 4 +-
.../Magento/Webapi/Block/Adminhtml/Role.php | 2 +-
.../Webapi/Block/Adminhtml/Role/Edit.php | 2 +-
.../Webapi/Block/Adminhtml/Role/Edit/Form.php | 2 +-
.../Webapi/Block/Adminhtml/User/Edit/Form.php | 2 +-
.../Controller/Adminhtml/Webapi/Role.php | 12 +-
.../Controller/Adminhtml/Webapi/User.php | 12 +-
app/code/Magento/Webapi/etc/module.xml | 1 -
.../Block/Adminhtml/Registration/Activate.php | 2 +-
.../Adminhtml/Registration/Create/Form.php | 4 +-
.../Registration/Create/Form/Container.php | 4 +-
.../Adminhtml/Subscription/Edit/Form.php | 2 +-
.../Subscription/Grid/Renderer/Action.php | 8 +-
.../Adminhtml/Webhook/Registration.php | 4 +-
.../Adminhtml/Webhook/Subscription.php | 12 +-
...roduct_new.xml => catalog_product_new.xml} | 0
.../Magento/Weee/view/frontend/tax-toggle.js | 3 +-
.../Magento/Widget/Block/Adminhtml/Widget.php | 2 +-
.../Widget/Block/Adminhtml/Widget/Form.php | 2 +-
.../Block/Adminhtml/Widget/Instance/Edit.php | 4 +-
.../Widget/Instance/Edit/Chooser/Layout.php | 34 +-
.../Widget/Instance/Edit/Tab/Main/Layout.php | 8 +-
.../Widget/Instance/Edit/Tab/Settings.php | 2 +-
.../Widget/Controller/Adminhtml/Widget.php | 2 +-
.../Controller/Adminhtml/Widget/Instance.php | 20 +-
.../Magento/Widget/Model/Template/Filter.php | 10 +-
.../Magento/Widget/Model/Widget/Config.php | 2 +-
.../Widget/view/frontend/layout/default.xml | 10 +-
.../Widget/view/frontend/layout/print.xml | 10 +-
.../Model/Resource/Item/Collection.php | 6 +-
.../Model/Resource/Item/Collection/Grid.php | 4 +-
app/code/Magento/Wishlist/etc/module.xml | 1 -
.../layout/wishlist_index_configure.xml | 2 +-
.../wishlist_index_configure_type_bundle.xml | 22 +-
...list_index_configure_type_configurable.xml | 2 +-
.../wishlist_index_configure_type_grouped.xml | 2 +-
.../frontend/layout/wishlist_index_index.xml | 2 +-
.../adminhtml/magento_backend/css/admin.css | 64 +--
.../adminhtml/magento_backend/css/debug.css | 256 ++++-----
.../adminhtml/magento_backend/css/pages.css | 316 +++++------
.../Magento_Checkout/js/payment.js | 133 +++++
.../Magento_Cms/content_heading.phtml | 31 ++
.../Magento_Cms}/images/i_widget-link.gif | Bin
.../Magento_Cms/layout/override/default.xml | 45 ++
.../Magento_Cms/layout/override/print.xml} | 8 +-
.../widget/static_block/default.phtml} | 9 +-
.../magento_backup/Magento_Cms}/widgets.css | 0
.../Magento_Contacts/form.phtml | 79 +++
.../Magento_Core/fam_book_open.png | Bin 0 -> 622 bytes
.../Magento_Core/prototype/magento.css | 94 ++++
.../prototype/magento/btn_bg.gif | Bin
.../prototype/magento/content_bg.gif | Bin
.../prototype/magento/top_bg.gif | Bin
.../prototype/magento/window_close.png | Bin
.../Magento_Core/translate_inline.phtml | 72 +++
.../Magento_Directory/currency.phtml | 49 ++
.../Magento_Directory/currency/switch.phtml | 31 ++
.../js/optional_zip_countries.phtml | 0
.../layout/override/catalog_category_view.xml | 30 ++
.../override/catalogsearch_advanced_index.xml | 6 +-
.../catalogsearch_advanced_result.xml | 30 ++
.../override/catalogsearch_result_index.xml | 30 ++
.../layout/override/checkout_cart_index.xml} | 10 +-
.../Magento_GoogleCheckout/link.phtml | 37 ++
.../Magento_Page/1column.phtml | 42 +-
.../Magento_Page/2columns-left.phtml | 59 ++
.../Magento_Page/2columns-right.phtml | 59 ++
.../Magento_Page/3columns.phtml | 62 +++
.../Magento_Page/empty.phtml | 29 +-
.../Magento_Page/html/breadcrumbs.phtml | 8 +-
.../Magento_Page/html/head.phtml | 4 +
.../Magento_Page/html/header.phtml | 36 +-
.../Magento_Page/html/notices.phtml | 36 +-
.../Magento_Page/html/pager.phtml | 124 +++++
.../Magento_Page/html/topmenu.phtml | 22 +-
.../magento_backup/Magento_Page}/js/menu.js | 0
.../Magento_Page}/js/popup-menu.js | 0
.../Magento_Page/js/row-builder.js | 222 ++++++++
.../Magento_Page/link/current.phtml | 4 +-
.../Magento_Page/popup.phtml | 21 +-
.../Magento_Page/print.phtml | 20 +-
.../Magento_Page/switch/languages.phtml | 44 ++
.../Magento_Page/switch/stores.phtml | 28 +-
.../product/view/profile/options.phtml | 41 ++
.../product/view/profile/schedule.phtml | 39 ++
.../magento_backup/Magento_Payment/cc-type.js | 52 ++
.../Magento_Payment/form/banktransfer.phtml | 35 ++
.../Magento_Payment/form/cashondelivery.phtml | 39 ++
.../Magento_Payment/form/cc.phtml | 134 +++++
.../Magento_Payment/form/ccsave.phtml | 131 +++++
.../Magento_Payment/form/checkmo.phtml | 44 ++
.../Magento_Payment/form/purchaseorder.phtml | 34 ++
.../Magento_Payment/info/checkmo.phtml | 38 ++
.../Magento_Payment/info/default.phtml | 49 ++
.../Magento_Payment/info/instructions.phtml | 41 ++
.../Magento_Payment/info/purchaseorder.phtml | 28 +
.../layout/override/catalog_product_view.xml | 37 ++
.../Magento_Paypal/express/review.phtml | 115 ++++
.../express/review/address.phtml | 155 ++++++
.../express/review/details.phtml | 27 +-
.../express/review/shipping/method.phtml | 53 ++
.../Magento_Paypal/express/shortcut.phtml | 32 +-
.../Magento_Paypal/hss/form.phtml | 46 ++
.../Magento_Paypal/hss/iframe.phtml | 31 ++
.../Magento_Paypal/hss/info.phtml | 35 ++
.../Magento_Paypal/hss/js.phtml | 32 ++
.../Magento_Paypal/hss/redirect.phtml | 62 +++
.../Magento_Paypal/hss/review/button.phtml | 27 +
.../Magento_Paypal/js/paypal-checkout.js | 50 ++
.../layout/override/SHORTCUT_popup.xml} | 13 +-
.../layout/override/catalog_category_view.xml | 31 ++
.../layout/override/checkout_cart_index.xml} | 17 +-
.../override/checkout_onepage_review.xml} | 18 +-
.../override/checkout_onepage_success.xml | 28 +
.../layout/override/cms_index_index.xml | 30 ++
.../layout/override/paypal_express_review.xml | 47 ++
.../paypal_express_review_details.xml | 33 ++
.../override/paypal_hostedpro_cancel.xml | 30 ++
.../override/paypal_payflow_cancelpayment.xml | 30 ++
.../layout/override/paypal_payflow_form.xml | 30 ++
.../override/paypal_payflow_returnurl.xml | 30 ++
.../paypal_payflowadvanced_cancelpayment.xml | 30 ++
.../override/paypal_payflowadvanced_form.xml | 30 ++
.../paypal_payflowadvanced_returnurl.xml | 30 ++
.../override/paypal_standard_redirect.xml | 28 +
.../layout/override/review_product_list.xml | 28 +
.../layout/override/tag_customer_view.xml | 28 +
.../layout/override/tag_product_list.xml | 28 +
.../layout/override/wishlist_index_index.xml | 28 +
.../Magento_Paypal/order-review.js | 305 +++++++++++
.../Magento_Paypal/partner/logo.phtml | 34 ++
.../Magento_Paypal/payflowadvanced/form.phtml | 46 ++
.../payflowadvanced/iframe.phtml | 31 ++
.../Magento_Paypal/payflowadvanced/info.phtml | 35 ++
.../payflowadvanced/redirect.phtml | 67 +++
.../Magento_Paypal/payflowlink/form.phtml | 46 ++
.../Magento_Paypal/payflowlink/iframe.phtml | 31 ++
.../Magento_Paypal/payflowlink/info.phtml | 35 ++
.../Magento_Paypal/payflowlink/redirect.phtml | 66 +++
.../Magento_Paypal/payment/mark.phtml | 36 ++
.../Magento_Paypal/payment/redirect.phtml | 41 ++
.../Magento_PaypalUk/express/review.phtml | 148 +++++
.../layput/override/SHORTCUT_uk_popup.xml | 39 ++
.../layput/override/catalog_category_view.xml | 28 +
.../catalog_product_compare_index.xml | 28 +
.../layput/override/catalog_product_view.xml} | 15 +-
.../catalogsearch_advanced_result.xml | 28 +
.../override/catalogsearch_result_index.xml | 28 +
.../layput/override/checkout_cart_index.xml | 42 ++
.../override/checkout_onepage_failure.xml | 28 +
.../override/checkout_onepage_success.xml | 28 +
.../layput/override/default.xml} | 4 +-
.../paypal_express_review_details.xml} | 11 +-
.../override/paypaluk_express_review.xml | 46 ++
.../paypaluk_express_review_details.xml | 28 +
.../layput/override/review_product_list.xml | 28 +
.../layput/override/tag_customer_view.xml | 28 +
.../layput/override/tag_product_list.xml | 28 +
.../layput/override/wishlist_index_index.xml | 28 +
.../Magento_Rating/detailed.phtml | 46 ++
.../Magento_Review/customer/list.phtml | 64 +++
.../Magento_Review/customer/recent.phtml | 54 ++
.../Magento_Review/customer/view.phtml | 75 +++
.../magento_backup/Magento_Review/form.phtml | 118 ++++
.../Magento_Review/helper/summary.phtml | 42 ++
.../Magento_Review/helper/summary_short.phtml | 38 ++
.../layout/override/review_product_view.xml | 4 +-
.../Magento_Review/product/view/list.phtml | 66 +++
.../Magento_Review/view.phtml | 46 +-
.../magento_backup/Magento_Rss/list.phtml | 68 +++
.../billing/agreement/view.phtml | 110 ++++
.../Magento_Sales/billing/agreements.phtml | 99 ++++
.../email/creditmemo/items.phtml | 51 ++
.../Magento_Sales/email/invoice/items.phtml | 51 ++
.../Magento_Sales/email/items.phtml | 74 +++
.../email/items/creditmemo/default.phtml | 124 +++++
.../email/items/invoice/default.phtml | 124 +++++
.../email/items/order/default.phtml | 140 +++++
.../email/items/shipment/default.phtml | 47 ++
.../Magento_Sales/email/shipment/items.phtml | 47 ++
.../Magento_Sales/email/shipment/track.phtml | 46 ++
.../Magento_Sales/gift-message.js | 74 +++
.../Magento_Sales/guest/form.phtml | 85 +++
.../override/checkout_onepage_index.xml | 28 +
.../layout/override/customer_account.xml | 50 ++
.../sales_billing_agreement_index.xml | 36 ++
.../override/sales_billing_agreement_view.xml | 36 ++
.../sales_email_order_creditmemo_items.xml | 41 ++
.../sales_email_order_invoice_items.xml | 41 ++
.../override/sales_email_order_items.xml | 45 ++
.../sales_email_order_shipment_items.xml | 31 ++
.../override/sales_guest_creditmemo.xml | 54 ++
.../layout/override/sales_guest_form.xml | 35 ++
.../layout/override/sales_guest_invoice.xml | 54 ++
.../override/sales_guest_printorder.xml} | 17 +-
.../sales_guest_printordercreditmemo.xml | 42 ++
.../sales_guest_printorderinvoice.xml | 42 ++
.../override/sales_guest_printshipment.xml | 32 ++
.../layout/override/sales_guest_reorder.xml | 35 ++
.../layout/override/sales_guest_shipment.xml | 44 ++
.../layout/override/sales_guest_view.xml | 14 +-
.../override/sales_order_creditmemo.xml | 16 +-
.../sales_order_guest_info_links.xml} | 11 +-
.../layout/override/sales_order_history.xml | 34 ++
.../layout/override/sales_order_invoice.xml | 16 +-
.../sales_order_printordercreditmemo.xml | 12 +-
.../sales_order_printorderinvoice.xml | 12 +-
.../override/sales_order_printshipment.xml | 33 ++
.../layout/override/sales_order_reorder.xml | 31 ++
.../layout/override/sales_order_shipment.xml | 41 ++
.../layout/override/sales_order_view.xml | 16 +-
.../sales_recurring_profile_index.xml | 45 ++
.../sales_recurring_profile_orders.xml | 50 ++
.../override/sales_recurring_profile_view.xml | 87 +++
.../sales_recurring_profile_view__tabs.xml | 81 +++
.../Magento_Sales/order/comments.phtml | 11 +-
.../Magento_Sales/order/creditmemo.phtml | 11 +-
.../order/creditmemo/items.phtml | 47 +-
.../creditmemo/items/renderer/default.phtml | 31 +-
.../Magento_Sales/order/history.phtml | 76 +++
.../Magento_Sales/order/info.phtml | 92 ++++
.../Magento_Sales/order/info/buttons.phtml | 38 ++
.../Magento_Sales/order/invoice.phtml | 11 +-
.../Magento_Sales/order/invoice/items.phtml | 42 +-
.../invoice/items/renderer/default.phtml | 26 +-
.../Magento_Sales/order/items.phtml | 50 +-
.../order/items/renderer/default.phtml | 40 +-
.../Magento_Sales/order/print.phtml | 85 +++
.../order/print/creditmemo.phtml | 98 ++++
.../Magento_Sales/order/print/invoice.phtml | 94 ++++
.../Magento_Sales/order/print/shipment.phtml | 97 ++++
.../Magento_Sales/order/recent.phtml | 75 +++
.../Magento_Sales/order/shipment.phtml | 11 +-
.../Magento_Sales/order/shipment/items.phtml | 89 +++
.../shipment/items/renderer/default.phtml | 65 +++
.../Magento_Sales/order/totals.phtml | 52 ++
.../Magento_Sales/order/trackinginfo.phtml | 67 +++
.../Magento_Sales/order/view.phtml | 63 +++
.../Magento_Sales/orders-returns.js | 50 ++
.../payment/form/billing/agreement.phtml | 41 ++
.../Magento_Sales/recurring/grid.phtml | 80 +++
.../recurring/profile/view.phtml | 110 ++++
.../recurring/profile/view/info.phtml | 47 ++
.../Magento_Sales/recurring/profiles.phtml | 13 +-
.../Magento_Sales/reorder/sidebar.phtml | 62 ++-
.../Magento_Sales/widget/guest/form.phtml | 87 +++
.../Magento_Weee}/layout/override/default.xml | 8 +-
.../magento_backup/Magento_Weee/tax-toggle.js | 37 ++
.../layout/override/default.xml | 34 ++
.../Magento_Widget/layout/override/print.xml} | 8 +-
.../Magento_Widget}/widgets.css | 0
.../frontend/magento_backup/css/print.css | 37 ++
.../magento_backup/media/preview_image.jpg | Bin 0 -> 11420 bytes
app/design/frontend/magento_backup/theme.xml | 33 ++
.../frontend/magento_blank/css/print.css | 2 -
.../frontend/magento_demo/css/print.css | 2 -
app/design/frontend/magento_demo/theme.xml | 1 +
.../catalog_product_view_type_bundle.xml | 22 +-
.../{ => base}/checkout_cart_index.xml | 0
.../layout/override/{ => base}/default.xml | 0
.../{ => base}/checkout_onepage_index.xml | 0
.../{ => base}/customer_account_create.xml | 0
.../customer_account_forgotpassword.xml | 0
.../{ => base}/customer_account_login.xml | 0
.../layout/catalog_product_view.xml | 3 -
.../{ => base}/catalog_category_view.xml | 2 +-
.../catalog_category_view_type_default.xml | 2 +-
.../catalog_category_view_type_layered.xml | 2 +-
.../catalog_product_compare_index.xml | 2 +-
.../{ => base}/catalog_product_view.xml | 14 +-
...catalog_product_view_type_configurable.xml | 2 +-
.../catalog_product_view_type_grouped.xml | 2 +-
.../catalog_product_view_type_simple.xml | 2 +-
.../catalog_product_view_type_virtual.xml | 2 +-
.../layout/override/{ => base}/default.xml | 0
.../product/view/base-image.phtml | 2 +-
.../product/view/tierprices.phtml | 44 +-
.../product/view/type/grouped.phtml | 2 +-
.../{ => base}/catalogsearch_result_index.xml | 2 +-
.../Magento_Checkout/cart/item/default.phtml | 7 +-
.../Magento_Checkout/js/opcheckout.js | 14 +-
.../{ => base}/checkout_cart_index.xml | 6 +-
...heckout_multishipping_customer_address.xml | 2 +-
.../base/checkout_onepage_additional.xml | 32 ++
.../{ => base}/checkout_onepage_failure.xml | 2 +-
.../{ => base}/checkout_onepage_index.xml | 2 +-
.../{ => base}/checkout_onepage_success.xml | 2 +-
.../layout/override/{ => base}/default.xml | 0
.../multishipping/addresses.phtml | 8 +-
.../Magento_Checkout/onepage.phtml | 3 +-
.../Magento_Contacts/form.phtml | 70 ---
.../{ => base}/customer_account_create.xml | 2 +-
.../{ => base}/customer_account_edit.xml | 2 +-
.../customer_account_forgotpassword.xml | 2 +-
.../{ => base}/customer_account_index.xml | 2 +-
.../{ => base}/customer_account_login.xml | 2 +-
.../{ => base}/customer_address_index.xml | 2 +-
.../Magento_Directory/currency.phtml | 54 --
...catalog_product_view_type_downloadable.xml | 2 +-
.../{ => base}/checkout_cart_index.xml | 0
.../layout/override/{ => base}/default.xml | 0
.../{ => base}/newsletter_manage_index.xml | 2 +-
.../Magento_Page/2columns-left.phtml | 66 ---
.../Magento_Page/2columns-right.phtml | 66 ---
.../Magento_Page/3columns.phtml | 69 ---
.../Magento_Page/html/pager.phtml | 119 ----
.../Magento_Page/layout/override/default.xml | 168 ------
.../Magento_Page/layout/override/print.xml | 39 --
.../Magento_Page/switch/languages.phtml | 54 --
.../Magento_Paypal/express/review.phtml | 111 ----
.../express/review/address.phtml | 143 -----
.../express/review/shipping/method.phtml | 56 --
.../{ => base}/checkout_onepage_index.xml | 0
.../{ => base}/customer_account_create.xml | 0
.../{ => base}/customer_account_login.xml | 0
.../layout/override/{ => base}/default.xml | 0
.../layout/override/base}/print.xml | 0
.../Magento_Review/customer/list.phtml | 82 ---
.../Magento_Review/customer/recent.phtml | 50 --
.../Magento_Review/customer/view.phtml | 78 ---
.../magento_plushe/Magento_Review/form.phtml | 110 ----
.../Magento_Review/helper/summary.phtml | 66 ---
.../Magento_Review/helper/summary_short.phtml | 65 ---
.../layout/catalog_product_view.xml | 7 +-
.../Magento_Review/product/view/list.phtml | 74 ---
.../billing/agreement/view.phtml | 101 ----
.../Magento_Sales/billing/agreements.phtml | 91 ----
.../Magento_Sales/guest/form.phtml | 75 ---
.../Magento_Sales/order/history.phtml | 66 ---
.../Magento_Sales/order/info.phtml | 77 ---
.../Magento_Sales/order/info/buttons.phtml | 45 --
.../Magento_Sales/order/print.phtml | 98 ----
.../order/print/creditmemo.phtml | 117 ----
.../Magento_Sales/order/print/invoice.phtml | 115 ----
.../Magento_Sales/order/print/shipment.phtml | 123 -----
.../Magento_Sales/order/recent.phtml | 76 ---
.../Magento_Sales/order/shipment/items.phtml | 105 ----
.../Magento_Sales/order/view.phtml | 73 ---
.../Magento_Sales/success.phtml | 63 ---
.../{ => base}/sendfriend_product_send.xml | 2 +-
.../layout/override/default.xml | 26 -
.../Magento_Widget/layout/override/print.xml | 26 -
.../{ => base}/wishlist_index_configure.xml | 2 +-
.../wishlist_index_configure_type_bundle.xml | 22 +-
...list_index_configure_type_configurable.xml | 2 +-
.../wishlist_index_configure_type_grouped.xml | 2 +-
.../wishlist_index_configure_type_simple.xml | 0
.../{ => base}/wishlist_index_index.xml | 2 +-
.../{ => base}/wishlist_shared_index.xml | 0
.../frontend/magento_plushe/css/print.css | 1 -
.../frontend/magento_plushe/css/styles.css | 395 ++++++++++++--
.../frontend/magento_plushe/less/styles.less | 311 +++++++++--
app/etc/di.xml | 7 +
.../Magento/TestFramework/Application.php | 2 +-
.../Customer/Edit/Tab/View/AccordionTest.php | 2 +-
.../Adminhtml/Block/Customer/OnlineTest.php | 2 +-
.../Block/System/Account/Edit/FormTest.php | 2 +-
.../Urlrewrite/Catalog/Category/EditTest.php | 2 +-
.../Urlrewrite/Catalog/Product/EditTest.php | 2 +-
.../Urlrewrite/Catalog/Product/GridTest.php | 7 +-
.../Block/Urlrewrite/Cms/Page/EditTest.php | 2 +-
.../Block/Urlrewrite/Cms/Page/GridTest.php | 3 +-
.../Adminhtml/Block/Urlrewrite/EditTest.php | 2 +-
.../Adminhtml/Block/Widget/ContainerTest.php | 2 +-
.../Controller/System/DesignTest.php | 2 +-
.../Controller/System/VariableTest.php | 2 +-
.../Magento/Adminhtml/DashboardTest.php | 6 +-
.../controllers/Sales/_files/address_data.php | 38 --
.../Block/Dashboard/GraphTest.php | 8 +-
.../Backend/Block/System/Config/FormTest.php | 2 +-
.../Controller/Router/DefaultRouterTest.php | 1 -
.../Magento/Backend/Model/UrlTest.php | 5 +-
.../Tab/Bundle/Option/Search/GridTest.php | 2 +-
.../Edit/Tab/Bundle/Option/SearchTest.php | 2 +-
.../Block/Adminhtml}/Category/TreeTest.php | 8 +-
.../Product/Attribute/Set/Toolbar/AddTest.php | 7 +-
.../Product/Edit/Tab/Options/OptionTest.php | 6 +-
.../Edit/Tab/Options/Type/SelectTest.php | 11 +-
.../Edit/Tab/Super/Config/MatrixTest.php | 6 +-
.../Product/Edit/Tab/Super/ConfigTest.php | 12 +-
.../Product/Edit/Tab/Super/SettingsTest.php | 8 +-
.../Adminhtml}/Product/Edit/TabsTest.php | 10 +-
.../Block/Adminhtml}/Product/EditTest.php | 8 +-
.../Product/Helper/Form/CategoryTest.php | 4 +-
.../Helper/Form/Gallery/ContentTest.php | 11 +-
.../Product/Helper/Form/WeightTest.php | 12 +-
.../Adminhtml}/Product/Options/AjaxTest.php | 8 +-
.../Controller/Adminhtml}/CategoryTest.php | 14 +-
.../Product/Action/AttributeTest.php | 8 +-
.../Adminhtml}/Product/AttributeTest.php | 10 +-
.../Adminhtml}/Product/ReviewTest.php | 4 +-
.../Controller/Adminhtml}/ProductTest.php | 22 +-
.../Catalog/Helper/Product/ViewTest.php | 1 -
.../Magento/Centinel/CreateOrderTest.php | 6 +-
.../Checkout/Controller/MultishippingTest.php | 4 +-
.../Checkout/Controller/OnepageTest.php | 14 +-
.../Magento/Core/Block/AbstractBlockTest.php | 4 +-
.../Core/Controller/Varien/ActionTest.php | 53 +-
.../Core/Model/DataService/LayoutTest.php | 2 +-
.../Core/Model/Email/Template/FilterTest.php | 2 +-
.../Core/Model/LayoutDirectivesTest.php | 12 +
.../Magento/Core/Model/LayoutTest.php | 8 +-
.../Model/Resource/Theme/CollectionTest.php | 5 +-
.../Source/ThemeTest.php} | 18 +-
.../Source/_files/design/frontend/a_d/file | 0
.../_files/design/frontend/a_d/theme.xml | 0
.../Source/_files/design/frontend/b_e/file | 0
.../_files/design/frontend/b_e/theme.xml | 0
.../design/frontend/magento_default/file | 0
.../design/frontend/magento_default/theme.xml | 0
.../_files/design/frontend/magento_g/file | 0
.../design/frontend/magento_g/theme.xml | 0
.../catalog_category_view_type_default.xml | 2 +-
.../catalog_product_view_type_simple.xml | 2 +-
.../_files/layout_directives_test/group.xml | 44 ++
.../testsuite/Magento/Core/Utility/Layout.php | 6 +-
.../Edit/Tab/Downloadable/LinksTest.php | 2 +-
.../testsuite/Magento/File/SizeTest.php | 2 -
...avAbstractTest.php => AbstractEavTest.php} | 4 +-
.../Import/Entity/Eav/CustomerImportTest.php | 4 -
.../Model/Import/Entity/ProductTest.php | 1 -
.../Magento/Install/Block/AdminTest.php | 2 +-
.../ObjectManager/ObjectManagerTest.php | 2 +-
.../Magento/Page/Helper/RobotsTest.php | 2 +-
.../Paypal/Controller/StandardTest.php | 2 +-
.../Block/Adminhtml}/Edit/Tab/FormTest.php | 6 +-
.../Block/Adminhtml}/Items/AbstractTest.php | 8 +-
.../Order/Create/Form/AbstractTest.php | 14 +-
.../Adminhtml}/Order/CreateTest.php | 22 +-
.../Adminhtml}/Order/CreditmemoTest.php | 8 +-
.../Controller/Adminhtml}/OrderTest.php | 18 +-
.../Model/AdminOrder}/CreateTest.php | 12 +-
.../controllers => }/Sales/_files/address.php | 2 +-
.../Magento/Sales/_files/address_data.php | 1 +
.../Sales/_files/order_info.php | 2 +-
..._shipping_address_different_to_billing.php | 2 +-
...order_shipping_address_same_as_billing.php | 2 +-
.../Adminhtml}/Rate/ImportExportTest.php | 10 +-
.../Controller/Adminhtml}/RateTest.php | 8 +-
.../Controller/Adminhtml}/TaxTest.php | 6 +-
.../Magento/Test/Integrity/LayoutTest.php | 82 +--
.../Modular/_files/skip_blocks_ce.php | 2 +-
.../Test/Integrity/ViewFileReferenceTest.php | 10 +-
.../FileResolution/Strategy/FallbackTest.php | 20 +-
.../Fixture_Module/fixture_script_two.js | 0
.../Fixture_Module/fixture_template_two.phtml | 0
.../vendor_custom_theme/fixture_script_two.js | 0
.../fixture_template_two.phtml | 0
.../vendor_custom_theme/i18n/en_US.csv | 0
.../vendor_custom_theme/mage/script.js | 0
.../frontend/vendor_custom_theme/theme.xml | 0
.../frontend/vendor_custom_theme2/theme.xml | 0
.../Fixture_Module/fixture_script.js | 0
.../Fixture_Module/fixture_template.phtml | 0
.../frontend/vendor_default/fixture_script.js | 0
.../vendor_default/fixture_template.phtml | 0
.../frontend/vendor_default/i18n/en_US.csv | 0
.../ru_RU/Fixture_Module/fixture_script.js | 0
.../i18n/ru_RU/fixture_script.js | 0
.../design/frontend/vendor_default/theme.xml | 0
.../vendor_standalone_theme/theme.xml | 0
.../_files/fallback/pub/lib/mage/script.js | 0
.../Block/Adminhtml/AbstractFormTest.php | 2 +-
.../Adminhtml/Registration/ActivateTest.php | 2 +-
.../Create/Form/ContainerTest.php | 2 +-
.../Registration/Create/FormTest.php | 4 +-
.../Adminhtml/Subscription/Edit/FormTest.php | 2 +-
.../Webhook/Model/Resource/EventTest.php | 2 +-
.../Webhook/Model/Resource/JobTest.php | 2 +-
.../layout/catalogsearch_ajax_suggest.xml | 2 +-
.../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 +-
.../Chooser/_files/page_types_select.html | 19 +-
.../_files/code/Magento/Test/etc/widget.xml | 2 +-
.../Config/_files/expectedGlobalArray.php | 2 +-
.../_files/expectedGlobalDesignArray.php | 2 +-
.../Widget/Model/Widget/ConfigTest.php | 7 +-
.../Utility/AggregateInvoker.php | 4 +-
.../Magento/TestFramework/Utility/Classes.php | 3 +-
.../framework/tests/unit/phpunit.xml.dist | 2 +-
.../Tool/CodeMessDetectorTest.php | 2 +-
.../Tool/CodeSniffer/WrapperTest.php | 2 +-
.../CodingStandard/Tool/CodeSnifferTest.php | 2 +-
.../Inspection/JsHint/CommandTest.php | 2 +-
.../Inspection/WordsFinderTest.php | 2 +-
.../Inspection/_files/broken_config.xml | 0
.../Inspection/_files/config.xml | 0
.../Inspection/_files/config_additional.xml | 0
.../_files/empty_whitelist_path.xml | 0
.../Inspection/_files/empty_words_config.xml | 0
.../Inspection/_files/words_finder/buffy.php | 0
.../Inspection/_files/words_finder/buffy.zip | 0
.../interview_with_the_vampire.php | 0
.../interview_with_the_vampire.zip | 0
.../words_finder/self_tested_config.xml | 0
.../_files/words_finder/twilight/eclipse.php | 0
.../_files/words_finder/twilight/newmoon.php | 0
.../Utility/AggregateInvokerTest.php | 99 ++++
.../Magento/Test/Integrity/AdminhtmlTest.php | 92 ++++
.../Magento/Test/Integrity/ClassesTest.php | 1 +
.../Test/Integrity/Layout/HandlesTest.php | 23 +-
.../_files/blacklist/adminhtml_decoupling.php | 125 +++++
.../Magento/Test/Js/_files/blacklist/core.txt | 14 +-
.../Magento/Test/Legacy/LayoutTest.php | 5 +-
.../Magento/Test/Legacy/ObsoleteCodeTest.php | 16 +-
.../Legacy/_files/blacklist/obsolete_mage.php | 1 +
.../Test/Legacy/_files/obsolete_classes.php | 43 +-
.../Test/Legacy/_files/obsolete_methods.php | 39 +-
.../Legacy/_files/obsolete_properties.php | 1 +
.../Magento/Test/Php/LiveCodeTest.php | 8 +-
.../Test/Php/_files/blacklist/common.txt | 11 +-
.../Php/_files/phpcpd/blacklist/common.txt | 2 +
.../Php/_files/phpcs/blacklist/common.txt | 10 +-
.../Magento/Test/Php/_files/phpcs/ruleset.xml | 4 +-
.../Test/Php/_files/whitelist/common.txt | 17 +-
.../Magento/Test/Block/Adminhtml.php | 6 +-
.../Adminhtml/Block/UrlrewriteTest.php | 2 +-
.../Adminhtml/Controller/CacheTest.php | 4 +-
.../Adminhtml/Controller/CustomerTest.php | 4 +-
.../Magento/Adminhtml/DashboardTest.php | 16 +-
.../testsuite/Magento/App/UpdaterTest.php | 6 +-
.../Block/Widget/Grid/SerializerTest.php | 4 +-
.../Adminhtml/System/Config/SaveTest.php | 2 +-
.../testsuite/Magento/Backup/MediaTest.php | 2 +-
.../testsuite/Magento/Backup/NomediaTest.php | 2 +-
.../testsuite/Magento/Backup/SnapshotTest.php | 2 +-
.../Catalog/Product/View/Type/BundleTest.php | 78 +++
.../Adminhtml/Product/Attribute/GridTest.php | 67 +++
.../Composite/Fieldset/OptionsTest.php | 12 +-
.../Edit/Tab/Super/Config/MatrixTest.php | 6 +-
.../Product/Helper/Form/WeightTest.php | 9 +-
.../Block/Product/View/OptionsTest.php | 4 +-
.../Checkout/Block/Cart/AbstractTest.php | 2 +-
.../Checkout/Block/Cart/SidebarTest.php | 2 +-
.../Magento/Core/Block/TemplateTest.php | 8 +-
.../Core/Controller/Response/HttpTest.php | 7 +-
.../Controller/Varien/AbstractActionTest.php | 8 +-
.../FileResolution/StrategyPoolTest.php | 126 -----
.../Model/Layout/File/Source/BaseTest.php | 91 ----
.../Layout/File/Source/Override/BaseTest.php | 91 ----
.../Magento/Core/Model/Layout/MergeTest.php | 54 +-
.../layout/catalog_category_default.xml | 2 +-
.../layout/catalog_category_layered.xml | 2 +-
.../_files/layout/catalog_product_view.xml | 2 +-
...catalog_product_view_type_configurable.xml | 2 +-
.../catalog_product_view_type_grouped.xml | 2 +-
.../catalog_product_view_type_simple.xml | 2 +-
.../layout/catalogsearch_ajax_suggest.xml | 26 -
.../_files/layout/checkout_onepage_index.xml | 2 +-
.../layout/checkout_onepage_progress.xml | 26 -
.../_files/layout/sales_guest_print.xml | 2 +-
.../_files/layout/sales_order_print.xml | 2 +-
.../Core/Model/Layout/_files/merged.xml | 20 +-
.../Model/Layout/_files/pages_hierarchy.php | 110 ----
.../Model/Source/Urlrewrite/OptionsTest.php | 2 +-
.../Core/Model/Store/StorageFactoryTest.php | 11 +-
.../Decorator/DebugHintsTest.php | 2 +-
.../Core/Model/TemplateEngine/FactoryTest.php | 83 ---
.../TemplateEngine/Plugin/DebugHintsTest.php | 6 +-
.../Core/Model/View/FileSystemTest.php | 10 +-
.../unit/testsuite/Magento/CryptTest.php | 2 +-
.../Magento/Data/Form/FactoryTest.php | 78 +++
.../unit/testsuite/Magento/Data/FormTest.php | 81 +++
.../Editor/Tools/Code/CustomTest.php | 4 +-
.../Adminhtml/Editor/Tools/Code/JsTest.php | 4 +-
.../Editor/Tools/Files/ContentTest.php | 8 +-
.../Adminhtml/Editor/Tools/Files/TreeTest.php | 2 +-
.../Selector/SelectorList/AbstractTest.php | 2 +-
.../Adminhtml/System/Design/EditorTest.php | 2 +-
.../Magento/DesignEditor/Model/StateTest.php | 3 +-
.../Model/Observer/Block/Category/TabTest.php | 3 +-
.../Magento/Image/Adapter/AbstractTest.php | 2 +-
.../Magento/Image/Adapter/ImageMagickTest.php | 2 +-
...avAbstractTest.php => AbstractEavTest.php} | 4 +-
.../Import/Entity/CustomerCompositeTest.php | 2 +-
.../Payment/Block/Form/ContainerTest.php | 4 +-
.../Adminhtml/Items/AbstractItemsTest.php | 99 ++++
.../Block/Adminhtml}/Items/AbstractTest.php | 20 +-
.../Order/Create/Items/GridTest.php | 8 +-
.../Adminhtml}/Order/Invoice/ViewTest.php | 10 +-
.../Block/Adminhtml}/Order/Totals/TaxTest.php | 16 +-
.../Adminhtml}/Order/View/GiftmessageTest.php | 8 +-
.../Adminhtml}/Order/CreditmemoTest.php | 6 +-
.../unit/testsuite/Magento/ShellTest.php | 2 +-
.../Tools/View/Generator/CopyRuleTest.php | 2 +-
.../System/Design/Theme/Tab/JsTest.php | 2 +-
.../Adminhtml/Wysiwyg/Files/ContentTest.php | 8 +-
.../Adminhtml/Wysiwyg/Files/TreeTest.php | 2 +-
.../Constraint/Option/CallbackTest.php | 2 +-
.../Validator/Constraint/OptionTest.php | 2 +-
.../Validator/Constraint/PropertyTest.php | 2 +-
.../Magento/Validator/ConstraintTest.php | 2 +-
.../Validator/Entity/PropertiesTest.php | 2 +-
.../Magento/Validator/ExceptionTest.php | 2 +-
.../Magento/Validator/StringLengthTest.php | 2 +-
.../Magento/Validator/Test/Alnum.php | 2 +-
.../Magento/Validator/Test/Callback.php | 2 +-
.../testsuite/Magento/Validator/Test/Int.php | 2 +-
.../Magento/Validator/Test/NotEmpty.php | 2 +-
.../Magento/Validator/Test/StringLength.php | 2 +-
.../testsuite/Magento/Validator/Test/True.php | 2 +-
.../Validator/ValidatorAbstractTest.php | 2 +-
.../negative/invalid_builder_class.xml | 2 +-
.../negative/invalid_builder_instance.xml | 2 +-
.../negative/invalid_child_for_option.xml | 2 +-
.../negative/invalid_constraint.xml | 2 +-
.../negative/invalid_content_for callback.xml | 2 +-
.../negative/invalid_entity_callback.xml | 2 +-
.../validation/negative/invalid_method.xml | 2 +-
.../negative/invalid_method_callback.xml | 2 +-
.../multiple_callback_in_argument.xml | 2 +-
.../negative/no_class_for_constraint.xml | 2 +-
.../validation/negative/no_constraint.xml | 2 +-
.../negative/no_name_for_entity.xml | 2 +-
.../validation/negative/no_name_for_group.xml | 2 +-
.../validation/negative/no_name_for_rule.xml | 2 +-
.../negative/no_rule_for_reference.xml | 2 +-
.../validation/negative/not_unique_use.xml | 2 +-
.../positive/builder/validation.xml | 2 +-
.../positive/module_a/validation.xml | 2 +-
.../positive/module_b/validation.xml | 2 +-
.../unit/testsuite/Magento/ValidatorTest.php | 2 +-
.../Design/Fallback/FactoryTest.php | 64 ++-
.../Design/Fallback/Rule/CompositeTest.php | 25 +-
.../Fallback/Rule/ModularSwitchTest.php | 70 +--
.../Design/Fallback/Rule/SimpleTest.php | 14 +-
.../Design/Fallback/Rule/ThemeTest.php | 18 +-
.../Strategy/Fallback/CachingProxyTest.php | 116 ++--
.../FileResolution/Strategy/FallbackTest.php | 125 +++--
.../FileResolution/StrategyPoolTest.php | 128 +++++
.../Layout/File/FactoryTest.php | 10 +-
.../Layout/File/FileList/FactoryTest.php | 10 +-
.../Layout/File/FileListTest.php} | 14 +-
.../Layout/File/Source/AggregateTest.php | 39 +-
.../View/Layout/File/Source/BaseTest.php | 126 +++++
.../Source/Decorator/ModuleDependencyTest.php | 18 +-
.../Source/Decorator/ModuleOutputTest.php | 14 +-
.../Layout/File/Source/Override/BaseTest.php | 120 +++++
.../Layout/File/Source/Override/ThemeTest.php | 54 +-
.../Layout/File/Source/ThemeTest.php | 84 +--
.../{Core/Model => View}/Layout/FileTest.php | 6 +-
.../Model => View}/TemplateEngine/PhpTest.php | 6 +-
.../TemplateEngine/_files/simple.phtml | 0
.../TemplateEngineFactoryTest.php} | 45 +-
.../Webapi/Block/Adminhtml/Role/EditTest.php | 2 +-
.../Webapi/Block/Adminhtml/RoleTest.php | 2 +-
.../Adminhtml/Registration/ActivateTest.php | 2 +-
.../Create/Form/ContainerTest.php | 2 +-
.../Adminhtml/Webhook/RegistrationTest.php | 2 +-
.../Layout/processors/addToParentGroup.xsl | 54 ++
.../Magento/Tools/View/Generator/CopyRule.php | 6 +-
dev/tools/Magento/Tools/View/generator.php | 2 +-
.../app/Magento/Downloader/Controller.php | 3 +-
downloader/lib/Magento/Archive.php | 4 +-
.../lib/Magento/Archive/AbstractArchive.php | 4 +-
.../lib/Magento/Archive/ArchiveInterface.php | 4 +-
downloader/lib/Magento/Archive/Bz.php | 4 +-
downloader/lib/Magento/Archive/Gz.php | 4 +-
.../lib/Magento/Archive/Helper/File.php | 4 +-
.../lib/Magento/Archive/Helper/File/Bz.php | 4 +-
.../lib/Magento/Archive/Helper/File/Gz.php | 4 +-
downloader/lib/Magento/Archive/Tar.php | 4 +-
downloader/lib/Magento/Backup.php | 4 +-
.../lib/Magento/Backup/AbstractBackup.php | 6 +-
downloader/lib/Magento/Backup/Archive/Tar.php | 6 +-
.../{Exception.php => BackupException.php} | 6 +-
.../lib/Magento/Backup/BackupInterface.php | 14 +-
downloader/lib/Magento/Backup/Db.php | 25 +-
.../Magento/Backup/Db/BackupDbInterface.php | 35 ++
.../lib/Magento/Backup/Db/BackupFactory.php | 59 +-
.../lib/Magento/Backup/Db/BackupInterface.php | 82 +++
.../Backup/Exception/CantLoadSnapshot.php | 8 +-
.../Backup/Exception/FtpConnectionFailed.php | 8 +-
.../Backup/Exception/FtpValidationFailed.php | 8 +-
.../Backup/Exception/NotEnoughFreeSpace.php | 8 +-
.../Backup/Exception/NotEnoughPermissions.php | 8 +-
downloader/lib/Magento/Backup/Factory.php | 67 +++
downloader/lib/Magento/Backup/Filesystem.php | 9 +-
.../lib/Magento/Backup/Filesystem/Helper.php | 12 +-
.../Backup/Filesystem/Iterator/File.php | 4 +-
.../Backup/Filesystem/Iterator/Filter.php | 6 +-
.../Filesystem/Rollback/AbstractRollback.php | 6 +-
.../Magento/Backup/Filesystem/Rollback/Fs.php | 6 +-
.../Backup/Filesystem/Rollback/Ftp.php | 10 +-
downloader/lib/Magento/Backup/Media.php | 4 +-
downloader/lib/Magento/Backup/Nomedia.php | 4 +-
downloader/lib/Magento/Backup/Snapshot.php | 39 +-
.../template/copyright.phtml | 7 +-
downloader/template/footer.phtml | 2 +-
downloader/template/install/footer.phtml | 3 +-
lib/Magento/Archive.php | 4 +-
lib/Magento/Archive/AbstractArchive.php | 4 +-
lib/Magento/Archive/ArchiveInterface.php | 4 +-
lib/Magento/Archive/Bz.php | 4 +-
lib/Magento/Archive/Gz.php | 4 +-
lib/Magento/Archive/Helper/File.php | 5 +-
lib/Magento/Archive/Helper/File/Bz.php | 8 +-
lib/Magento/Archive/Helper/File/Gz.php | 4 -
lib/Magento/Archive/Tar.php | 4 +-
lib/Magento/Backup/AbstractBackup.php | 4 +-
lib/Magento/Backup/Archive/Tar.php | 4 +-
lib/Magento/Backup/BackupException.php | 4 +-
lib/Magento/Backup/BackupInterface.php | 4 +-
lib/Magento/Backup/Db.php | 4 +-
.../Backup/Exception/CantLoadSnapshot.php | 4 +-
.../Backup/Exception/FtpConnectionFailed.php | 4 +-
.../Backup/Exception/FtpValidationFailed.php | 4 +-
.../Backup/Exception/NotEnoughFreeSpace.php | 4 +-
.../Backup/Exception/NotEnoughPermissions.php | 4 +-
lib/Magento/Backup/Filesystem.php | 4 +-
lib/Magento/Backup/Filesystem/Helper.php | 6 +-
.../Backup/Filesystem/Iterator/File.php | 4 +-
.../Backup/Filesystem/Iterator/Filter.php | 4 +-
.../Filesystem/Rollback/AbstractRollback.php | 4 +-
lib/Magento/Backup/Filesystem/Rollback/Fs.php | 4 +-
.../Backup/Filesystem/Rollback/Ftp.php | 4 +-
lib/Magento/Backup/Media.php | 4 +-
lib/Magento/Backup/Nomedia.php | 4 +-
lib/Magento/Backup/Snapshot.php | 4 +-
lib/Magento/BootstrapException.php | 2 +-
lib/Magento/Code/Reader/ClassReader.php | 1 +
lib/Magento/Crypt.php | 2 +-
lib/Magento/Data/Form.php | 35 +-
lib/Magento/Data/Form/Factory.php | 88 +++
lib/Magento/Date.php | 4 +-
lib/Magento/Debug.php | 4 +-
lib/Magento/Event.php | 4 +-
lib/Magento/Event/Collection.php | 4 +-
lib/Magento/Event/Observer.php | 2 +-
lib/Magento/Event/Observer/Collection.php | 4 +-
lib/Magento/Event/Observer/Cron.php | 4 +-
lib/Magento/Event/Observer/Regex.php | 4 +-
lib/Magento/Exception.php | 2 +-
lib/Magento/Image.php | 4 +-
lib/Magento/Image/Adapter/AbstractAdapter.php | 2 +-
lib/Magento/Image/Adapter/Gd2.php | 2 +-
lib/Magento/Image/Adapter/ImageMagick.php | 2 +-
lib/Magento/Object.php | 4 +-
lib/Magento/Object/Cache.php | 2 +-
lib/Magento/Object/Factory.php | 2 +-
lib/Magento/Object/Mapper.php | 2 +-
lib/Magento/ObjectManager.php | 2 +-
lib/Magento/Pear.php | 4 +-
lib/Magento/Pear/Frontend.php | 4 +-
lib/Magento/Pear/Package.php | 4 +-
lib/Magento/Pear/Registry.php | 4 +-
lib/Magento/Shell.php | 2 +-
lib/Magento/Validator.php | 2 +-
lib/Magento/View/BlockPool.php | 86 +++
lib/Magento/View/Context.php | 510 ++++++++++++++++++
lib/Magento/View/DataSourcePool.php | 110 ++++
lib/Magento/View/Design/Fallback/Factory.php | 157 ++++++
.../View}/Design/Fallback/Rule/Composite.php | 21 +-
.../Design/Fallback/Rule/ModularSwitch.php | 36 +-
.../Design/Fallback/Rule/RuleInterface.php | 7 +-
.../View}/Design/Fallback/Rule/Simple.php | 16 +-
.../View}/Design/Fallback/Rule/Theme.php | 27 +-
.../FileResolution/Strategy/Fallback.php | 102 ++--
.../Strategy/Fallback/CachingProxy.php | 298 ++++++++++
.../FileResolution/Strategy/FileInterface.php | 13 +-
.../Strategy/LocaleInterface.php | 13 +-
.../Strategy/View/NotifiableInterface.php | 18 +-
.../FileResolution/Strategy/ViewInterface.php | 13 +-
.../Design/FileResolution/StrategyPool.php | 213 ++++++++
lib/Magento/View/Design/ThemeFactory.php | 55 ++
.../View/Element/RendererInterface.php | 24 +-
lib/Magento/View/Layout/Element.php | 47 +-
.../Magento/View}/Layout/File.php | 40 +-
.../Magento/View}/Layout/File/Factory.php | 36 +-
.../Magento/View/Layout/File/FileList.php | 41 +-
.../View}/Layout/File/FileList/Factory.php | 23 +-
.../View/Layout/File/Source/Aggregated.php | 114 ++++
lib/Magento/View/Layout/File/Source/Base.php | 94 ++++
.../Source/Decorator/ModuleDependency.php | 65 +--
.../File/Source/Decorator/ModuleOutput.php | 38 +-
.../Layout/File/Source/Override/Base.php | 64 ++-
.../Layout/File/Source/Override/Theme.php | 80 +--
.../View}/Layout/File/Source/Theme.php | 63 ++-
.../View}/Layout/File/SourceInterface.php | 16 +-
lib/Magento/View/Layout/ProcessorFactory.php | 10 +-
.../View/Layout/ProcessorInterface.php | 19 +-
lib/Magento/View/LayoutInterface.php | 2 +-
lib/Magento/View/Render/Html.php | 95 ++++
lib/Magento/View/Render/RenderFactory.php | 63 +++
lib/Magento/View/RenderInterface.php | 42 ++
.../Magento/View}/TemplateEngine/Php.php | 12 +-
.../Magento/View/TemplateEngineFactory.php | 35 +-
.../Magento/View/TemplateEngineInterface.php | 7 +-
pub/errors/default/page.phtml | 4 +-
pub/lib/mage/adminhtml/browser.js | 10 +-
pub/lib/mage/translate-inline.css | 53 +-
var/.htaccess | 0
2156 files changed, 23389 insertions(+), 14896 deletions(-)
rename app/code/Magento/{Adminhtml/Controller => AdminNotification/Controller/Adminhtml}/Survey.php (93%)
delete mode 100644 app/code/Magento/Adminhtml/Controller/Index.php
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_addcomment.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_index.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_data.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_shipping_address.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_shipping_method.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_cart.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_compared.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_pcompared.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_pviewed.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_reorder.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_viewed.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_wishlist.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_totals.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_creditmemo_new.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_creditmemo_updateqty.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_creditmemo_view.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_invoice_new.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_invoice_updateqty.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_invoice_view.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_shipment_addtrack.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_shipment_new.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_shipment_removetrack.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_shipment_view.xml
rename app/code/Magento/Authorizenet/view/adminhtml/layout/{adminhtml_sales_order_create_index.xml => sales_order_create_index.xml} (100%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Dashboard.php (72%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Dashboard/AbstractDashboard.php (98%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Dashboard/Bar.php (96%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Dashboard/Diagrams.php (89%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Dashboard/Graph.php (97%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Dashboard/Grid.php (96%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Dashboard/Grids.php (81%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Dashboard/Orders/Grid.php (96%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Dashboard/Sales.php (96%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Dashboard/Searches/Last.php (93%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Dashboard/Searches/Renderer/Searchquery.php (97%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Dashboard/Searches/Top.php (93%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Dashboard/Tab/Amounts.php (90%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Dashboard/Tab/Customers/Most.php (95%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Dashboard/Tab/Customers/Newest.php (96%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Dashboard/Tab/Orders.php (90%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Dashboard/Tab/Products/Ordered.php (96%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Dashboard/Tab/Products/Viewed.php (95%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Dashboard/Totals.php (96%)
create mode 100644 app/code/Magento/Backend/Block/Page/Copyright.php
rename app/code/Magento/{Adminhtml/Controller => Backend/Controller/Adminhtml}/Action.php (96%)
rename app/code/Magento/{Adminhtml/Controller => Backend/Controller/Adminhtml}/Ajax.php (92%)
rename app/code/Magento/{Adminhtml/Controller => Backend/Controller/Adminhtml}/Cache.php (95%)
rename app/code/Magento/{Adminhtml/Controller => Backend/Controller/Adminhtml}/Dashboard.php (93%)
rename app/code/Magento/{Adminhtml => Backend}/Helper/Dashboard/AbstractDashboard.php (98%)
rename app/code/Magento/{Adminhtml => Backend}/Helper/Dashboard/Data.php (98%)
rename app/code/Magento/{Adminhtml => Backend}/Helper/Dashboard/Order.php (89%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/dashboard/graph.phtml (93%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/dashboard/graph/disabled.phtml (100%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/dashboard/grid.phtml (100%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/dashboard/index.phtml (93%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/dashboard/salebar.phtml (100%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/dashboard/searches.phtml (100%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/dashboard/store/switcher.phtml (100%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/dashboard/totalbar.phtml (100%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/layout/adminhtml_cache_block.xml (95%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/layout/adminhtml_cache_index.xml (100%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/layout/adminhtml_dashboard_customersmost.xml (89%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/layout/adminhtml_dashboard_customersnewest.xml (89%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/layout/adminhtml_dashboard_index.xml (94%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/layout/adminhtml_dashboard_productsviewed.xml (89%)
rename app/{design/frontend/magento_plushe/Magento_Directory/layout/override/catalogsearch_advanced_result.xml => code/Magento/Backend/view/adminhtml/page/copyright.phtml} (87%)
rename app/{design/frontend/magento_plushe/Magento_Directory/layout/override/catalogsearch_result_index.xml => code/Magento/Backend/view/install/page/copyright.phtml} (87%)
rename app/code/Magento/Bundle/view/adminhtml/layout/{adminhtml_catalog_product_bundle.xml => catalog_product_bundle.xml} (100%)
rename app/code/Magento/Bundle/view/adminhtml/layout/{adminhtml_sales_order_creditmemo_new.xml => sales_order_creditmemo_new.xml} (100%)
rename app/code/Magento/Bundle/view/adminhtml/layout/{adminhtml_sales_order_creditmemo_updateqty.xml => sales_order_creditmemo_updateqty.xml} (100%)
rename app/code/Magento/Bundle/view/adminhtml/layout/{adminhtml_sales_order_creditmemo_view.xml => sales_order_creditmemo_view.xml} (100%)
rename app/code/Magento/Bundle/view/adminhtml/layout/{adminhtml_sales_order_invoice_new.xml => sales_order_invoice_new.xml} (100%)
rename app/code/Magento/Bundle/view/adminhtml/layout/{adminhtml_sales_order_invoice_updateqty.xml => sales_order_invoice_updateqty.xml} (100%)
rename app/code/Magento/Bundle/view/adminhtml/layout/{adminhtml_sales_order_invoice_view.xml => sales_order_invoice_view.xml} (100%)
rename app/code/Magento/Bundle/view/adminhtml/layout/{adminhtml_sales_order_shipment_new.xml => sales_order_shipment_new.xml} (100%)
rename app/code/Magento/Bundle/view/adminhtml/layout/{adminhtml_sales_order_shipment_view.xml => sales_order_shipment_view.xml} (100%)
rename app/code/Magento/Bundle/view/adminhtml/layout/{adminhtml_sales_order_view.xml => sales_order_view.xml} (100%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Category/AbstractCategory.php (94%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Category/Checkboxes/Tree.php (95%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Category/Edit.php (84%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Category/Edit/Form.php (89%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Category/Helper/Image.php (96%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Category/Helper/Pricestep.php (96%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Category/Helper/Sortby/Available.php (96%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Category/Helper/Sortby/DefaultSortby.php (96%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Category/Tab/Attributes.php (94%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Category/Tab/Design.php (94%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Category/Tab/General.php (95%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Category/Tab/Product.php (97%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Category/Tabs.php (89%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Category/Tree.php (95%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Category/Widget/Chooser.php (92%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Form.php (93%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Form/Renderer/Attribute/Urlkey.php (95%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Form/Renderer/Config/DateFieldsOrder.php (95%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Form/Renderer/Config/YearRange.php (95%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Form/Renderer/Fieldset/Element.php (95%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Helper/Form/Wysiwyg.php (96%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Helper/Form/Wysiwyg/Content.php (95%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product.php (93%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute.php (87%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute/Edit.php (93%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute/Edit/Form.php (94%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute/Edit/Tab/Advanced.php (97%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute/Edit/Tab/Front.php (98%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute/Edit/Tab/Main.php (94%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute/Edit/Tab/Options.php (88%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute/Edit/Tab/System.php (96%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute/Edit/Tabs.php (95%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute/Grid.php (95%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute/NewAttribute/Product/Attributes.php (89%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute/NewAttribute/Product/Created.php (98%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute/Set/Main.php (95%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute/Set/Main/Formattribute.php (96%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute/Set/Main/Formgroup.php (95%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute/Set/Main/Formset.php (96%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute/Set/Main/Tree/Attribute.php (92%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute/Set/Main/Tree/Group.php (92%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute/Set/Toolbar/Add.php (89%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute/Set/Toolbar/Main.php (91%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute/Set/Toolbar/Main/Filter.php (96%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Composite/Configure.php (94%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Composite/Error.php (95%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Composite/Fieldset.php (94%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Composite/Fieldset/Configurable.php (60%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Composite/Fieldset/Grouped.php (95%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Composite/Fieldset/Options.php (94%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Composite/Fieldset/Qty.php (97%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Composite/Update/Result.php (96%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Created.php (98%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit.php (93%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Action/Attribute.php (81%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Action/Attribute/Tab/Attributes.php (91%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Action/Attribute/Tab/Inventory.php (97%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Action/Attribute/Tab/Websites.php (95%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Action/Attribute/Tabs.php (93%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/AttributeSet.php (92%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Js.php (97%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/NewCategory.php (92%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Ajax/Serializer.php (96%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Alerts.php (89%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Alerts/Price.php (96%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Alerts/Stock.php (96%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Attributes.php (86%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Attributes/Create.php (92%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Attributes/Search.php (94%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Crosssell.php (97%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Inventory.php (99%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Options.php (90%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Options/Option.php (98%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Options/Popup/Grid.php (88%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Options/Type/AbstractType.php (90%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Options/Type/Date.php (88%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Options/Type/File.php (88%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Options/Type/Select.php (94%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Options/Type/Text.php (88%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Price.php (89%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Price/Group.php (91%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Price/Group/AbstractGroup.php (98%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Price/Recurring.php (94%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Price/Tier.php (92%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Related.php (97%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Reviews.php (86%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Super/Config.php (96%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Super/Config/Attribute.php (89%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php (94%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php (95%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php (94%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Super/Config/Matrix.php (97%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Super/Config/Simple.php (98%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Super/Settings.php (95%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Upsell.php (97%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Websites.php (98%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tabs.php (87%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tabs/Configurable.php (85%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tabs/Grouped.php (86%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Frontend/Product/Watermark.php (98%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Grid.php (96%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Helper/Form/Apply.php (93%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Helper/Form/BaseImage.php (97%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Helper/Form/Boolean.php (93%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Helper/Form/Category.php (96%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Helper/Form/Config.php (95%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Helper/Form/Gallery.php (95%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Helper/Form/Gallery/Content.php (97%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Helper/Form/Image.php (95%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Helper/Form/Msrp/Enabled.php (94%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Helper/Form/Msrp/Price.php (93%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Helper/Form/Price.php (97%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Helper/Form/Weight.php (97%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Options/Ajax.php (93%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Price.php (96%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Widget/Chooser.php (96%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Widget/Chooser/Container.php (92%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Search.php (94%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Search/Edit.php (94%)
rename app/code/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Search/Edit/Form.php (97%)
rename app/code/Magento/{Adminhtml/Controller/Catalog => Catalog/Controller/Adminhtml}/Category.php (95%)
rename app/code/Magento/{Adminhtml/Controller/Catalog => Catalog/Controller/Adminhtml}/Category/Widget.php (91%)
rename app/code/Magento/{Adminhtml/Controller/Catalog => Catalog/Controller/Adminhtml}/Product.php (96%)
rename app/code/Magento/{Adminhtml/Controller/Catalog => Catalog/Controller/Adminhtml}/Product/Action/Attribute.php (95%)
rename app/code/Magento/{Adminhtml/Controller/Catalog => Catalog/Controller/Adminhtml}/Product/Attribute.php (92%)
rename app/code/Magento/{Adminhtml/Controller/Catalog => Catalog/Controller/Adminhtml}/Product/Datafeeds.php (89%)
rename app/code/Magento/{Adminhtml/Controller/Catalog => Catalog/Controller/Adminhtml}/Product/Gallery.php (94%)
rename app/code/Magento/{Adminhtml/Controller/Catalog => Catalog/Controller/Adminhtml}/Product/Group.php (93%)
rename app/code/Magento/{Adminhtml/Controller/Catalog => Catalog/Controller/Adminhtml}/Product/Review.php (95%)
rename app/code/Magento/{Adminhtml/Controller/Catalog => Catalog/Controller/Adminhtml}/Product/Set.php (92%)
rename app/code/Magento/{Adminhtml/Controller/Catalog => Catalog/Controller/Adminhtml}/Product/Widget.php (86%)
rename app/code/Magento/{Adminhtml/Controller/Catalog => Catalog/Controller/Adminhtml}/Search.php (92%)
rename app/code/Magento/{Adminhtml => Catalog}/Helper/Catalog.php (95%)
rename app/code/Magento/{Adminhtml/Helper/Catalog => Catalog/Helper}/Product/Composite.php (88%)
rename app/code/Magento/{Adminhtml/Helper/Catalog => Catalog/Helper}/Product/Edit/Action/Attribute.php (97%)
rename app/code/Magento/{Media/Model/Image/Config => Catalog/Model/Product/Media}/ConfigInterface.php (87%)
create mode 100644 app/code/Magento/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.23-1.6.0.0.24.php
create mode 100644 app/code/Magento/Catalog/etc/adminhtml/routes.xml
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/base-image-uploader.js (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/category-selector.css (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/category/checkboxes/tree.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/category/edit.js (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/category/edit.phtml (99%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/category/edit/form.phtml (98%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/category/form.js (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/category/tree.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/category/widget/tree.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/form/renderer/fieldset/element.phtml (98%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/images/select2.png (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/images/select2x2.png (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/images/spinner.gif (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product-variation.js (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product.js (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product.phtml (96%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/attribute/form.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/attribute/js.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/attribute/labels.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/attribute/new/created.phtml (96%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/attribute/options.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/attribute/set/main.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/attribute/set/main/tree/attribute.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/attribute/set/main/tree/group.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/attribute/set/toolbar/add.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/attribute/set/toolbar/main.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/composite/configure.js (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/composite/configure.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/composite/fieldset/configurable.phtml (97%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/composite/fieldset/grouped.phtml (98%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/composite/fieldset/options.phtml (96%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/composite/fieldset/options/js.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/composite/fieldset/options/type/date.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/composite/fieldset/options/type/default.phtml (94%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/composite/fieldset/options/type/file.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/composite/fieldset/options/type/select.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/composite/fieldset/options/type/text.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/composite/fieldset/qty.phtml (95%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/created.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/edit.phtml (99%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/edit/action/attribute.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/edit/action/inventory.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/edit/action/websites.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/edit/attribute_set.phtml (97%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/edit/category/new/form.phtml (94%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/edit/options.phtml (97%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/edit/options/option.phtml (98%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/edit/options/type/date.phtml (97%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/edit/options/type/file.phtml (98%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/edit/options/type/select.phtml (98%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/edit/options/type/text.phtml (98%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/edit/price/group.phtml (99%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/edit/price/tier.phtml (99%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/edit/serializer.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/edit/super/attribute-js-template.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/edit/super/attribute-template.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/edit/super/config.phtml (99%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/edit/super/generator.phtml (96%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/edit/super/matrix.phtml (99%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/edit/websites.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/helper/gallery.phtml (99%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/js.phtml (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/price.phtml (99%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/tab/alert.phtml (95%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/tab/inventory.phtml (99%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/product/widget/chooser/container.phtml (95%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/type-switcher.js (100%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/catalog/wysiwyg/js.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/ADMINHTML_CATALOG_PRODUCT_COMPOSITE_CONFIGURE.xml => Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE.xml} (66%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/ADMINHTML_CATALOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR.xml => Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/ADMINHTML_CATALOG_PRODUCT_COMPOSITE_UPDATE_RESULT.xml => Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_UPDATE_RESULT.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_category_edit.xml => Catalog/view/adminhtml/layout/catalog_category_edit.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_action_attribute_edit.xml => Catalog/view/adminhtml/layout/catalog_product_action_attribute_edit.xml} (88%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_alertspricegrid.xml => Catalog/view/adminhtml/layout/catalog_product_alertspricegrid.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_alertsstockgrid.xml => Catalog/view/adminhtml/layout/catalog_product_alertsstockgrid.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_attribute_edit.xml => Catalog/view/adminhtml/layout/catalog_product_attribute_edit.xml} (81%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_attribute_edit_popup.xml => Catalog/view/adminhtml/layout/catalog_product_attribute_edit_popup.xml} (86%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_configurable.xml => Catalog/view/adminhtml/layout/catalog_product_configurable.xml} (60%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_configurable_new.xml => Catalog/view/adminhtml/layout/catalog_product_configurable_new.xml} (60%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_crosssell.xml => Catalog/view/adminhtml/layout/catalog_product_crosssell.xml} (96%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_crosssellgrid.xml => Catalog/view/adminhtml/layout/catalog_product_crosssellgrid.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_customoptions.xml => Catalog/view/adminhtml/layout/catalog_product_customoptions.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_edit.xml => Catalog/view/adminhtml/layout/catalog_product_edit.xml} (96%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_generatevariations.xml => Catalog/view/adminhtml/layout/catalog_product_generatevariations.xml} (58%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_grid.xml => Catalog/view/adminhtml/layout/catalog_product_grid.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_grouped.xml => Catalog/view/adminhtml/layout/catalog_product_grouped.xml} (96%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_grouped_grid_popup.xml => Catalog/view/adminhtml/layout/catalog_product_grouped_grid_popup.xml} (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_index.xml => Catalog/view/adminhtml/layout/catalog_product_index.xml} (96%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_new.xml => Catalog/view/adminhtml/layout/catalog_product_new.xml} (89%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_options.xml => Catalog/view/adminhtml/layout/catalog_product_options.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_optionsimportgrid.xml => Catalog/view/adminhtml/layout/catalog_product_optionsimportgrid.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_related.xml => Catalog/view/adminhtml/layout/catalog_product_related.xml} (96%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_relatedgrid.xml => Catalog/view/adminhtml/layout/catalog_product_relatedgrid.xml} (94%)
rename app/code/Magento/{Centinel/view/adminhtml/layout/adminhtml_sales_order_create_start.xml => Catalog/view/adminhtml/layout/catalog_product_review_edit.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_review_new.xml => Catalog/view/adminhtml/layout/catalog_product_review_new.xml} (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_reviews.xml => Catalog/view/adminhtml/layout/catalog_product_reviews.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_set_block.xml => Catalog/view/adminhtml/layout/catalog_product_set_block.xml} (97%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_set_index.xml => Catalog/view/adminhtml/layout/catalog_product_set_index.xml} (90%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_simple.xml => Catalog/view/adminhtml/layout/catalog_product_simple.xml} (60%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_superconfig.xml => Catalog/view/adminhtml/layout/catalog_product_superconfig.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_superconfig_config.xml => Catalog/view/adminhtml/layout/catalog_product_superconfig_config.xml} (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_supergroup.xml => Catalog/view/adminhtml/layout/catalog_product_supergroup.xml} (95%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_supergrouppopup.xml => Catalog/view/adminhtml/layout/catalog_product_supergrouppopup.xml} (95%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_upsell.xml => Catalog/view/adminhtml/layout/catalog_product_upsell.xml} (96%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_upsellgrid.xml => Catalog/view/adminhtml/layout/catalog_product_upsellgrid.xml} (94%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/layout/catalog_product_view_type_configurable.xml (95%)
rename app/code/Magento/{Adminhtml => Catalog}/view/adminhtml/layout/catalog_product_view_type_grouped.xml (95%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_virtual.xml => Catalog/view/adminhtml/layout/catalog_product_virtual.xml} (60%)
rename app/code/Magento/CatalogInventory/view/adminhtml/layout/{adminhtml_catalog_product_superconfig_config.xml => catalog_product_superconfig_config.xml} (97%)
rename app/code/Magento/CatalogSearch/view/adminhtml/layout/{adminhtml_catalog_search_edit.xml => catalog_search_edit.xml} (94%)
rename app/code/Magento/CatalogSearch/view/adminhtml/layout/{adminhtml_catalog_search_grid_block.xml => catalog_search_grid_block.xml} (100%)
rename app/code/Magento/CatalogSearch/view/adminhtml/layout/{adminhtml_catalog_search_index.xml => catalog_search_index.xml} (90%)
rename app/code/Magento/Centinel/view/adminhtml/layout/{adminhtml_sales_order_create_index.xml => sales_order_create_index.xml} (97%)
rename app/code/Magento/Centinel/view/adminhtml/layout/{adminhtml_sales_order_create_load_block_card_validation.xml => sales_order_create_load_block_card_validation.xml} (96%)
rename app/code/Magento/Centinel/view/adminhtml/layout/{adminhtml_sales_order_create_load_block_data.xml => sales_order_create_load_block_data.xml} (96%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_edit_index.xml => Centinel/view/adminhtml/layout/sales_order_create_start.xml} (94%)
delete mode 100644 app/code/Magento/Core/Model/Design/Fallback/Factory.php
delete mode 100644 app/code/Magento/Core/Model/Design/FileResolution/Strategy/Fallback/CachingProxy.php
delete mode 100644 app/code/Magento/Core/Model/Design/FileResolution/StrategyPool.php
delete mode 100644 app/code/Magento/Core/Model/Layout/File/Source/Aggregated.php
delete mode 100644 app/code/Magento/Core/Model/Layout/File/Source/Base.php
rename app/code/Magento/Core/Model/{Design/Source/Design.php => Theme/Source/Theme.php} (74%)
rename app/{design/frontend/magento_plushe/Magento_Core => code/Magento/Core/view/frontend}/text.phtml (100%)
rename app/code/Magento/{Adminhtml/Controller => Directory/Controller/Adminhtml}/Json.php (94%)
create mode 100644 app/code/Magento/Directory/etc/adminhtml/routes.xml
rename app/code/Magento/Downloadable/view/adminhtml/layout/{adminhtml_catalog_product_downloadable.xml => catalog_product_downloadable.xml} (62%)
rename app/code/Magento/Downloadable/view/adminhtml/layout/{adminhtml_catalog_product_simple.xml => catalog_product_simple.xml} (100%)
rename app/code/Magento/Downloadable/view/adminhtml/layout/{adminhtml_catalog_product_virtual.xml => catalog_product_virtual.xml} (100%)
rename app/code/Magento/Downloadable/view/adminhtml/layout/{adminhtml_sales_order_creditmemo_new.xml => sales_order_creditmemo_new.xml} (72%)
rename app/code/Magento/Downloadable/view/adminhtml/layout/{adminhtml_sales_order_creditmemo_updateqty.xml => sales_order_creditmemo_updateqty.xml} (72%)
rename app/code/Magento/Downloadable/view/adminhtml/layout/{adminhtml_sales_order_creditmemo_view.xml => sales_order_creditmemo_view.xml} (72%)
rename app/code/Magento/Downloadable/view/adminhtml/layout/{adminhtml_sales_order_invoice_new.xml => sales_order_invoice_new.xml} (72%)
rename app/code/Magento/Downloadable/view/adminhtml/layout/{adminhtml_sales_order_invoice_updateqty.xml => sales_order_invoice_updateqty.xml} (72%)
rename app/code/Magento/Downloadable/view/adminhtml/layout/{adminhtml_sales_order_invoice_view.xml => sales_order_invoice_view.xml} (72%)
rename app/code/Magento/Downloadable/view/adminhtml/layout/{adminhtml_sales_order_view.xml => sales_order_view.xml} (72%)
rename app/code/Magento/GiftMessage/view/adminhtml/layout/{adminhtml_sales_order_create_index.xml => sales_order_create_index.xml} (100%)
rename app/code/Magento/GiftMessage/view/adminhtml/layout/{adminhtml_sales_order_create_load_block_data.xml => sales_order_create_load_block_data.xml} (100%)
rename app/code/Magento/GiftMessage/view/adminhtml/layout/{adminhtml_sales_order_create_load_block_items.xml => sales_order_create_load_block_items.xml} (100%)
rename app/code/Magento/GiftMessage/view/adminhtml/layout/{adminhtml_sales_order_view.xml => sales_order_view.xml} (100%)
rename app/code/Magento/GoogleOptimizer/view/adminhtml/layout/{adminhtml_catalog_product_new.xml => catalog_product_new.xml} (100%)
delete mode 100644 app/code/Magento/Media/Model/File/Image.php
delete mode 100644 app/code/Magento/Media/Model/Image.php
delete mode 100755 app/code/Magento/Media/etc/module.xml
delete mode 100644 app/code/Magento/Media/i18n/de_DE.csv
delete mode 100644 app/code/Magento/Media/i18n/en_US.csv
delete mode 100644 app/code/Magento/Media/i18n/es_ES.csv
delete mode 100644 app/code/Magento/Media/i18n/fr_FR.csv
delete mode 100644 app/code/Magento/Media/i18n/nl_NL.csv
delete mode 100644 app/code/Magento/Media/i18n/pt_BR.csv
delete mode 100644 app/code/Magento/Media/i18n/zh_CN.csv
rename app/{design/frontend/magento_plushe/Magento_Page => code/Magento/Page/view/frontend}/blank.phtml (100%)
rename app/{design/frontend/magento_plushe/Magento_Page => code/Magento/Page/view/frontend}/html/block.phtml (100%)
create mode 100644 app/code/Magento/Page/view/frontend/html/bugreport.phtml
rename app/{design/frontend/magento_plushe/Magento_Page => code/Magento/Page/view/frontend}/html/copyright.phtml (100%)
rename app/{design/frontend/magento_plushe/Magento_Page => code/Magento/Page/view/frontend}/html/title.phtml (100%)
rename app/{design/frontend/magento_plushe/Magento_Page => code/Magento/Page/view/frontend}/page.phtml (94%)
rename app/code/Magento/{Adminhtml/Block/Rating => Rating/Block/Adminhtml}/Edit.php (94%)
rename app/code/Magento/{Adminhtml/Block/Rating => Rating/Block/Adminhtml}/Edit/Form.php (90%)
rename app/code/Magento/{Adminhtml/Block/Rating => Rating/Block/Adminhtml}/Edit/Tab/Form.php (98%)
rename app/code/Magento/{Adminhtml/Block/Rating => Rating/Block/Adminhtml}/Edit/Tab/Options.php (98%)
rename app/code/Magento/{Adminhtml/Block/Rating => Rating/Block/Adminhtml}/Edit/Tabs.php (91%)
rename app/code/Magento/{Adminhtml/Block/Rating => Rating/Block/Adminhtml}/Rating.php (91%)
rename app/code/Magento/{Adminhtml/Controller/Rating.php => Rating/Controller/Adminhtml/Index.php} (91%)
create mode 100644 app/code/Magento/Rating/etc/adminhtml/di.xml
create mode 100644 app/code/Magento/Rating/etc/adminhtml/routes.xml
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_rating_block.xml => Rating/view/adminhtml/layout/rating_block.xml} (98%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_rating_index.xml => Rating/view/adminhtml/layout/rating_index_index.xml} (91%)
rename app/code/Magento/{Adminhtml => Rating}/view/adminhtml/rating/detailed.phtml (100%)
rename app/code/Magento/{Adminhtml => Rating}/view/adminhtml/rating/options.phtml (100%)
rename app/code/Magento/{Adminhtml => Rating}/view/adminhtml/rating/stars/detailed.phtml (100%)
rename app/code/Magento/{Adminhtml => Rating}/view/adminhtml/rating/stars/summary.phtml (100%)
rename app/{design/frontend/magento_plushe/Magento_Review => code/Magento/Review/view/frontend}/redirect.phtml (100%)
create mode 100644 app/code/Magento/Rss/view/frontend/category/link.phtml
create mode 100644 app/code/Magento/Rss/view/frontend/layout/catalog_category_view.xml
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Creditmemo.php (86%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Creditmemo/Grid.php (94%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Invoice.php (87%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Invoice/Grid.php (95%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Items/AbstractItems.php (86%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Items/Column/DefaultColumn.php (96%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Items/Column/Name.php (92%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Items/Column/Name/Grouped.php (89%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Items/Column/Qty.php (85%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Items/Renderer/Configurable.php (86%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Items/Renderer/DefaultRenderer.php (86%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order.php (86%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/AbstractOrder.php (90%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Address.php (93%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Address/Form.php (85%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Comments/View.php (92%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create.php (89%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/AbstractCreate.php (91%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Billing/Address.php (90%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Billing/Method.php (88%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Billing/Method/Form.php (96%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Comment.php (91%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Coupons.php (89%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Coupons/Form.php (87%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Customer.php (90%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Data.php (91%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Form.php (91%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Form/AbstractForm.php (92%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Form/Account.php (92%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Form/Address.php (95%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Giftmessage.php (89%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Giftmessage/Form.php (94%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Header.php (93%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Items.php (93%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Items/Grid.php (97%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Load.php (95%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Messages.php (94%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Newsletter.php (89%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Newsletter/Form.php (90%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Search.php (90%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Search/Grid.php (93%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Search/Grid/Renderer/Price.php (92%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Search/Grid/Renderer/Product.php (93%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Search/Grid/Renderer/Qty.php (94%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Shipping/Address.php (93%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Shipping/Method.php (88%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Shipping/Method/Form.php (93%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Sidebar.php (91%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Sidebar/AbstractSidebar.php (94%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Sidebar/Cart.php (92%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Sidebar/Compared.php (92%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Sidebar/Pcompared.php (93%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Sidebar/Pviewed.php (93%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Sidebar/Reorder.php (92%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Sidebar/Viewed.php (89%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Sidebar/Wishlist.php (94%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Store.php (87%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Store/Select.php (93%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Totals.php (91%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Totals/DefaultTotals.php (86%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Totals/Discount.php (88%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Totals/Grandtotal.php (86%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Totals/Shipping.php (90%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Totals/Subtotal.php (86%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Totals/Table.php (91%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Totals/Tax.php (82%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Creditmemo/Create.php (93%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Creditmemo/Create/Adjustments.php (97%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Creditmemo/Create/Form.php (87%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Creditmemo/Create/Items.php (96%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Creditmemo/Totals.php (93%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Creditmemo/View.php (89%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Creditmemo/View/Comments.php (94%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Creditmemo/View/Form.php (86%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Creditmemo/View/Items.php (86%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Grid.php (90%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Invoice/Create.php (94%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Invoice/Create/Form.php (89%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Invoice/Create/Items.php (95%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Invoice/Create/Tracking.php (92%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Invoice/Totals.php (91%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Invoice/View.php (91%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Invoice/View/Comments.php (94%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Invoice/View/Form.php (86%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Invoice/View/Items.php (86%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Payment.php (95%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Shipment/Create.php (93%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Shipment/Create/Form.php (82%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Shipment/Create/Items.php (93%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Shipment/Create/Tracking.php (94%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Shipment/Packaging.php (95%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Shipment/Packaging/Grid.php (95%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Shipment/Tracking/Info.php (84%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Shipment/View.php (90%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Shipment/View/Comments.php (94%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Shipment/View/Form.php (90%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Shipment/View/Items.php (89%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Shipment/View/Tracking.php (91%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Status.php (86%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Status/Assign.php (91%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Status/Assign/Form.php (96%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Status/Edit.php (89%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Status/Edit/Form.php (85%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Status/NewStatus.php (91%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Status/NewStatus/Form.php (96%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Totalbar.php (92%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Totals.php (91%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Totals/Item.php (83%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Totals/Tax.php (94%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/View.php (92%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/View/Form.php (86%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/View/Giftmessage.php (95%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/View/History.php (94%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/View/Info.php (94%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/View/Items.php (89%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/View/Items/Renderer/DefaultRenderer.php (94%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/View/Messages.php (95%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/View/Tab/Creditmemos.php (96%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/View/Tab/History.php (97%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/View/Tab/Info.php (92%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/View/Tab/Invoices.php (96%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/View/Tab/Shipments.php (96%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/View/Tab/Transactions.php (84%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/View/Tabs.php (96%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Reorder/Renderer/Action.php (93%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Shipment.php (86%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Shipment/Grid.php (92%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Totals.php (95%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Transactions.php (86%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Transactions/Child/Grid.php (92%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Transactions/Detail.php (89%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Transactions/Detail/Grid.php (97%)
rename app/code/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Transactions/Grid.php (96%)
rename app/code/Magento/{Adminhtml/Controller/Sales => Sales/Controller/Adminhtml}/Billing/Agreement.php (91%)
rename app/code/Magento/{Adminhtml/Controller/Sales => Sales/Controller/Adminhtml}/Creditmemo.php (82%)
rename app/code/Magento/{Adminhtml/Controller/Sales => Sales/Controller/Adminhtml}/Creditmemo/AbstractCreditmemo.php (89%)
rename app/code/Magento/{Adminhtml/Controller/Sales => Sales/Controller/Adminhtml}/Invoice.php (81%)
rename app/code/Magento/{Adminhtml/Controller/Sales => Sales/Controller/Adminhtml}/Invoice/AbstractInvoice.php (90%)
rename app/code/Magento/{Adminhtml/Controller/Sales => Sales/Controller/Adminhtml}/Order.php (93%)
rename app/code/Magento/{Adminhtml/Controller/Sales => Sales/Controller/Adminhtml}/Order/Create.php (92%)
rename app/code/Magento/{Adminhtml/Controller/Sales => Sales/Controller/Adminhtml}/Order/Creditmemo.php (96%)
rename app/code/Magento/{Adminhtml/Controller/Sales => Sales/Controller/Adminhtml}/Order/Edit.php (84%)
rename app/code/Magento/{Adminhtml/Controller/Sales => Sales/Controller/Adminhtml}/Order/Invoice.php (94%)
rename app/code/Magento/{Adminhtml/Controller/Sales => Sales/Controller/Adminhtml}/Order/Shipment.php (96%)
rename app/code/Magento/{Adminhtml/Controller/Sales => Sales/Controller/Adminhtml}/Order/Status.php (92%)
rename app/code/Magento/{Adminhtml/Controller/Sales => Sales/Controller/Adminhtml}/Order/View/Giftmessage.php (92%)
rename app/code/Magento/{Adminhtml/Controller/Sales => Sales/Controller/Adminhtml}/Recurring/Profile.php (92%)
rename app/code/Magento/{Adminhtml/Controller/Sales => Sales/Controller/Adminhtml}/Shipment.php (81%)
rename app/code/Magento/{Adminhtml/Controller/Sales => Sales/Controller/Adminhtml}/Shipment/AbstractShipment.php (89%)
rename app/code/Magento/{Adminhtml/Controller/Sales => Sales/Controller/Adminhtml}/Transactions.php (92%)
rename app/code/Magento/{Adminhtml/Helper/Sales.php => Sales/Helper/Admin.php} (97%)
rename app/code/Magento/{Adminhtml/Model/Sales/Order.php => Sales/Model/AdminOrder.php} (96%)
rename app/code/Magento/{Adminhtml/Model/Sales/Order => Sales/Model/AdminOrder}/Create.php (97%)
rename app/code/Magento/{Adminhtml/Model/Sales/Order => Sales/Model/AdminOrder}/Random.php (98%)
create mode 100644 app/code/Magento/Sales/etc/adminhtml/routes.xml
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/items/column/name.phtml (98%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/items/column/qty.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/items/renderer/default.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_billing_agreement_customergrid.xml => Sales/view/adminhtml/layout/sales_billing_agreement_customergrid.xml} (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_billing_agreement_grid.xml => Sales/view/adminhtml/layout/sales_billing_agreement_grid.xml} (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_billing_agreement_index.xml => Sales/view/adminhtml/layout/sales_billing_agreement_index.xml} (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_billing_agreement_ordersgrid.xml => Sales/view/adminhtml/layout/sales_billing_agreement_ordersgrid.xml} (96%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_billing_agreement_view.xml => Sales/view/adminhtml/layout/sales_billing_agreement_view.xml} (97%)
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_addcomment.xml
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_address.xml => Sales/view/adminhtml/layout/sales_order_address.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_customer_block.xml => Sales/view/adminhtml/layout/sales_order_create_customer_block.xml} (100%)
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_form_account.xml => Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml} (87%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_billing_method.xml => Sales/view/adminhtml/layout/sales_order_create_load_block_billing_method.xml} (76%)
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_comment.xml
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_customer_grid.xml => Sales/view/adminhtml/layout/sales_order_create_load_block_customer_grid.xml} (94%)
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_form_account.xml
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_comment.xml => Sales/view/adminhtml/layout/sales_order_create_load_block_giftmessage.xml} (88%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_header.xml => Sales/view/adminhtml/layout/sales_order_create_load_block_header.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_items.xml => Sales/view/adminhtml/layout/sales_order_create_load_block_items.xml} (67%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_json.xml => Sales/view/adminhtml/layout/sales_order_create_load_block_json.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_message.xml => Sales/view/adminhtml/layout/sales_order_create_load_block_message.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_newsletter.xml => Sales/view/adminhtml/layout/sales_order_create_load_block_newsletter.xml} (77%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_plain.xml => Sales/view/adminhtml/layout/sales_order_create_load_block_plain.xml} (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_search.xml => Sales/view/adminhtml/layout/sales_order_create_load_block_search.xml} (85%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_search_grid.xml => Sales/view/adminhtml/layout/sales_order_create_load_block_search_grid.xml} (94%)
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_method.xml
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar.xml
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_cart.xml
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_compared.xml
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_pcompared.xml
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_pviewed.xml
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_reorder.xml
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_giftmessage.xml => Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_viewed.xml} (87%)
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_wishlist.xml
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_totals.xml
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_creditmemo_addcomment.xml => Sales/view/adminhtml/layout/sales_order_creditmemo_addcomment.xml} (84%)
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_view.xml
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_review_edit.xml => Sales/view/adminhtml/layout/sales_order_edit_index.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_exportcsv.xml => Sales/view/adminhtml/layout/sales_order_exportcsv.xml} (95%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_exportexcel.xml => Sales/view/adminhtml/layout/sales_order_exportexcel.xml} (95%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_grid.xml => Sales/view/adminhtml/layout/sales_order_grid.xml} (95%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_grid_block.xml => Sales/view/adminhtml/layout/sales_order_grid_block.xml} (92%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_index.xml => Sales/view/adminhtml/layout/sales_order_index.xml} (90%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_invoice_addcomment.xml => Sales/view/adminhtml/layout/sales_order_invoice_addcomment.xml} (83%)
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_updateqty.xml
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_view.xml
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_shipment_addcomment.xml => Sales/view/adminhtml/layout/sales_order_shipment_addcomment.xml} (84%)
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_addtrack.xml
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_new.xml
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_removetrack.xml
create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_view.xml
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_status_assign.xml => Sales/view/adminhtml/layout/sales_order_status_assign.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_status_edit.xml => Sales/view/adminhtml/layout/sales_order_status_edit.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_status_index.xml => Sales/view/adminhtml/layout/sales_order_status_index.xml} (98%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_status_newstatus.xml => Sales/view/adminhtml/layout/sales_order_status_newstatus.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_transactions_grid.xml => Sales/view/adminhtml/layout/sales_order_transactions.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_view.xml => Sales/view/adminhtml/layout/sales_order_view.xml} (52%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_recurring_profile_customergrid.xml => Sales/view/adminhtml/layout/sales_recurring_profile_customergrid.xml} (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_recurring_profile_grid.xml => Sales/view/adminhtml/layout/sales_recurring_profile_grid.xml} (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_recurring_profile_index.xml => Sales/view/adminhtml/layout/sales_recurring_profile_index.xml} (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_recurring_profile_orders.xml => Sales/view/adminhtml/layout/sales_recurring_profile_orders.xml} (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_recurring_profile_view.xml => Sales/view/adminhtml/layout/sales_recurring_profile_view.xml} (79%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_order_transactions.xml => Sales/view/adminhtml/layout/sales_transactions_grid.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_transactions_index.xml => Sales/view/adminhtml/layout/sales_transactions_index.xml} (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_sales_transactions_view.xml => Sales/view/adminhtml/layout/sales_transactions_view.xml} (81%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/address/form.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/comments/view.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/abstract.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/billing/method/form.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/comment.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/coupons/form.phtml (97%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/data.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/form.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/form/account.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/form/address.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/giftmessage.js (99%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/giftmessage.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/items.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/items/grid.phtml (99%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/js.phtml (86%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/newsletter/form.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/scripts.js (99%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/shipping/method/form.phtml (98%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/sidebar.phtml (87%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/sidebar/items.phtml (98%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/store/select.phtml (98%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/totals.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/totals/default.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/totals/grandtotal.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/totals/shipping.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/totals/subtotal.phtml (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/create/totals/tax.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/creditmemo/create/form.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/creditmemo/create/items.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/creditmemo/create/items/renderer/configurable.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/creditmemo/create/items/renderer/default.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/creditmemo/create/totals/adjustments.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/creditmemo/view/form.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/creditmemo/view/items.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/creditmemo/view/items/renderer/configurable.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/creditmemo/view/items/renderer/default.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/giftoptions.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/giftoptions_tooltip.js (98%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/invoice/create/form.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/invoice/create/items.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/invoice/create/items/renderer/configurable.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/invoice/create/items/renderer/default.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/invoice/create/tracking.phtml (98%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/invoice/view/form.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/invoice/view/items.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/invoice/view/items/renderer/configurable.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/invoice/view/items/renderer/default.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/shipment/create/form.phtml (99%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/shipment/create/items.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/shipment/create/items/renderer/configurable.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/shipment/create/items/renderer/default.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/shipment/create/tracking.phtml (98%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/shipment/packaging.js (99%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/shipment/packaging/grid.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/shipment/packaging/packed.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/shipment/packaging/popup.phtml (99%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/shipment/tracking/info.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/shipment/view/form.phtml (98%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/shipment/view/items.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/shipment/view/items/renderer/configurable.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/shipment/view/items/renderer/default.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/shipment/view/tracking.phtml (98%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/totalbar.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/totals.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/totals/discount.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/totals/due.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/totals/footer.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/totals/grand.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/totals/item.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/totals/main.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/totals/paid.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/totals/refunded.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/totals/shipping.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/totals/tax.phtml (98%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/view/form.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/view/giftmessage.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/view/history.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/view/info.phtml (99%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/view/items.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/view/items/renderer/default.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/view/tab/history.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/view/tab/info.phtml (98%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/order/view/tracking.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/sales => Sales/view/adminhtml}/transactions/detail.phtml (100%)
rename app/code/Magento/{Adminhtml/Controller => Sitemap/Controller/Adminhtml}/Sitemap.php (91%)
create mode 100644 app/code/Magento/Sitemap/etc/adminhtml/routes.xml
rename app/code/Magento/{Adminhtml/Block/Tax => Tax/Block/Adminhtml}/Rate/Form.php (94%)
rename app/code/Magento/{Adminhtml/Block/Tax => Tax/Block/Adminhtml}/Rate/Grid/Renderer/Country.php (91%)
rename app/code/Magento/{Adminhtml/Block/Tax => Tax/Block/Adminhtml}/Rate/Grid/Renderer/Data.php (92%)
rename app/code/Magento/{Adminhtml/Block/Tax => Tax/Block/Adminhtml}/Rate/ImportExport.php (91%)
rename app/code/Magento/{Adminhtml/Block/Tax => Tax/Block/Adminhtml}/Rate/ImportExportHeader.php (87%)
rename app/code/Magento/{Adminhtml/Block/Tax => Tax/Block/Adminhtml}/Rate/Title.php (95%)
rename app/code/Magento/{Adminhtml/Block/Tax => Tax/Block/Adminhtml}/Rate/Title/Fieldset.php (88%)
rename app/code/Magento/{Adminhtml/Block/Tax => Tax/Block/Adminhtml}/Rate/Toolbar/Add.php (87%)
rename app/code/Magento/{Adminhtml/Block/Tax => Tax/Block/Adminhtml}/Rate/Toolbar/Save.php (88%)
rename app/code/Magento/{Adminhtml/Block/Tax => Tax/Block/Adminhtml}/Rule.php (92%)
rename app/code/Magento/{Adminhtml/Block/Tax => Tax/Block/Adminhtml}/Rule/Edit.php (94%)
rename app/code/Magento/{Adminhtml/Block/Tax => Tax/Block/Adminhtml}/Rule/Edit/Form.php (94%)
rename app/code/Magento/{Adminhtml/Controller/Tax => Tax/Controller/Adminhtml}/Rate.php (94%)
rename app/code/Magento/{Adminhtml/Controller/Tax => Tax/Controller/Adminhtml}/Rule.php (90%)
rename app/code/Magento/{Adminhtml/Controller/Tax => Tax/Controller/Adminhtml}/Tax.php (96%)
rename app/code/Magento/{Media/etc/frontend => Tax/etc/adminhtml}/routes.xml (89%)
rename app/code/Magento/{Adminhtml/view/adminhtml/tax => Tax/view/adminhtml}/class/page/edit.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/tax => Tax/view/adminhtml}/importExport.phtml (94%)
rename app/code/Magento/{Adminhtml/view/adminhtml/tax => Tax/view/adminhtml}/importExportHeader.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_tax_rate_block.xml => Tax/view/adminhtml/layout/tax_rate_block.xml} (96%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_tax_rate_exportcsv.xml => Tax/view/adminhtml/layout/tax_rate_exportcsv.xml} (96%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_tax_rate_exportxml.xml => Tax/view/adminhtml/layout/tax_rate_exportxml.xml} (96%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_tax_rate_index.xml => Tax/view/adminhtml/layout/tax_rate_index.xml} (91%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_tax_rule_block.xml => Tax/view/adminhtml/layout/tax_rule_block.xml} (98%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_tax_rule_edit.xml => Tax/view/adminhtml/layout/tax_rule_edit.xml} (85%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_tax_rule_index.xml => Tax/view/adminhtml/layout/tax_rule_index.xml} (90%)
rename app/code/Magento/{Adminhtml/view/adminhtml/tax => Tax/view/adminhtml}/rate/form.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/tax => Tax/view/adminhtml}/rate/js.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/tax => Tax/view/adminhtml}/rate/title.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/tax => Tax/view/adminhtml}/rule/edit.phtml (98%)
rename app/code/Magento/{Adminhtml/view/adminhtml/tax => Tax/view/adminhtml}/rule/rate/form.phtml (95%)
rename app/code/Magento/{Adminhtml/view/adminhtml/tax => Tax/view/adminhtml}/toolbar/class/add.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/tax => Tax/view/adminhtml}/toolbar/class/save.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/tax => Tax/view/adminhtml}/toolbar/rate/add.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/tax => Tax/view/adminhtml}/toolbar/rate/save.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/tax => Tax/view/adminhtml}/toolbar/rule/add.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/tax => Tax/view/adminhtml}/toolbar/rule/save.phtml (100%)
rename app/code/Magento/Weee/view/adminhtml/layout/{adminhtml_catalog_product_new.xml => catalog_product_new.xml} (100%)
create mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/payment.js
create mode 100644 app/design/frontend/magento_backup/Magento_Cms/content_heading.phtml
rename app/{code/Magento/Cms/view/frontend => design/frontend/magento_backup/Magento_Cms}/images/i_widget-link.gif (100%)
create mode 100644 app/design/frontend/magento_backup/Magento_Cms/layout/override/default.xml
rename app/design/frontend/{magento_plushe/Magento_Review/layout/override/customer_account_index.xml => magento_backup/Magento_Cms/layout/override/print.xml} (78%)
rename app/design/frontend/{magento_plushe/Magento_Directory/layout/override/catalog_category_view.xml => magento_backup/Magento_Cms/widget/static_block/default.phtml} (86%)
rename app/{code/Magento/Cms/view/frontend => design/frontend/magento_backup/Magento_Cms}/widgets.css (100%)
create mode 100644 app/design/frontend/magento_backup/Magento_Contacts/form.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Core/fam_book_open.png
create mode 100644 app/design/frontend/magento_backup/Magento_Core/prototype/magento.css
rename app/{code/Magento/Core/view/frontend => design/frontend/magento_backup/Magento_Core}/prototype/magento/btn_bg.gif (100%)
rename app/{code/Magento/Core/view/frontend => design/frontend/magento_backup/Magento_Core}/prototype/magento/content_bg.gif (100%)
rename app/{code/Magento/Core/view/frontend => design/frontend/magento_backup/Magento_Core}/prototype/magento/top_bg.gif (100%)
rename app/{code/Magento/Core/view/frontend => design/frontend/magento_backup/Magento_Core}/prototype/magento/window_close.png (100%)
create mode 100644 app/design/frontend/magento_backup/Magento_Core/translate_inline.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Directory/currency.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Directory/currency/switch.phtml
rename app/{code/Magento/Directory/view/frontend => design/frontend/magento_backup/Magento_Directory}/js/optional_zip_countries.phtml (100%)
create mode 100644 app/design/frontend/magento_backup/Magento_Directory/layout/override/catalog_category_view.xml
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Directory/layout/override/catalogsearch_advanced_index.xml (78%)
create mode 100644 app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_advanced_result.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_result_index.xml
rename app/design/frontend/{magento_plushe/Magento_Directory/layout/override/default.xml => magento_backup/Magento_GoogleCheckout/layout/override/checkout_cart_index.xml} (74%)
create mode 100644 app/design/frontend/magento_backup/Magento_GoogleCheckout/link.phtml
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Page/1column.phtml (52%)
create mode 100644 app/design/frontend/magento_backup/Magento_Page/2columns-left.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Page/2columns-right.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Page/3columns.phtml
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Page/empty.phtml (58%)
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Page/html/breadcrumbs.phtml (89%)
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Page/html/head.phtml (89%)
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Page/html/header.phtml (50%)
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Page/html/notices.phtml (68%)
create mode 100644 app/design/frontend/magento_backup/Magento_Page/html/pager.phtml
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Page/html/topmenu.phtml (73%)
rename app/{code/Magento/Page/view/frontend => design/frontend/magento_backup/Magento_Page}/js/menu.js (100%)
rename app/{code/Magento/Page/view/frontend => design/frontend/magento_backup/Magento_Page}/js/popup-menu.js (100%)
create mode 100644 app/design/frontend/magento_backup/Magento_Page/js/row-builder.js
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Page/link/current.phtml (96%)
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Page/popup.phtml (68%)
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Page/print.phtml (74%)
create mode 100644 app/design/frontend/magento_backup/Magento_Page/switch/languages.phtml
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Page/switch/stores.phtml (62%)
create mode 100644 app/design/frontend/magento_backup/Magento_Payment/catalog/product/view/profile/options.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Payment/catalog/product/view/profile/schedule.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Payment/cc-type.js
create mode 100644 app/design/frontend/magento_backup/Magento_Payment/form/banktransfer.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Payment/form/cashondelivery.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Payment/form/cc.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Payment/form/ccsave.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Payment/form/checkmo.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Payment/form/purchaseorder.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Payment/info/checkmo.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Payment/info/default.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Payment/info/instructions.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Payment/info/purchaseorder.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Payment/layout/override/catalog_product_view.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/express/review.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/express/review/address.phtml
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Paypal/express/review/details.phtml (56%)
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/express/review/shipping/method.phtml
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Paypal/express/shortcut.phtml (79%)
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/hss/form.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/hss/iframe.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/hss/info.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/hss/js.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/hss/redirect.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/hss/review/button.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/js/paypal-checkout.js
rename app/design/frontend/{magento_plushe/Magento_Paypal/layout/override/catalog_product_view.xml => magento_backup/Magento_Paypal/layout/override/SHORTCUT_popup.xml} (77%)
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/catalog_category_view.xml
rename app/design/frontend/{magento_plushe/Magento_Paypal/layout/override/default.xml => magento_backup/Magento_Paypal/layout/override/checkout_cart_index.xml} (64%)
rename app/design/frontend/{magento_plushe/Magento_Sales/layout/override/default.xml => magento_backup/Magento_Paypal/layout/override/checkout_onepage_review.xml} (65%)
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_onepage_success.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/cms_index_index.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_express_review.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_express_review_details.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_hostedpro_cancel.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_cancelpayment.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_form.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_returnurl.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_cancelpayment.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_form.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_returnurl.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_standard_redirect.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/review_product_list.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/tag_customer_view.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/tag_product_list.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/wishlist_index_index.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/order-review.js
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/partner/logo.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/form.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/iframe.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/info.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/redirect.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowlink/form.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowlink/iframe.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowlink/info.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowlink/redirect.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payment/mark.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payment/redirect.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/express/review.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/SHORTCUT_uk_popup.xml
create mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_category_view.xml
create mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_product_compare_index.xml
rename app/design/frontend/{magento_plushe/Magento_Cms/layout/override/default.xml => magento_backup/Magento_PaypalUk/layput/override/catalog_product_view.xml} (63%)
create mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalogsearch_advanced_result.xml
create mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalogsearch_result_index.xml
create mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_cart_index.xml
create mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_onepage_failure.xml
create mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_onepage_success.xml
rename app/{code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_billing_address.xml => design/frontend/magento_backup/Magento_PaypalUk/layput/override/default.xml} (82%)
rename app/design/frontend/{magento_plushe/Magento_Checkout/layout/override/checkout_onepage_additional.xml => magento_backup/Magento_PaypalUk/layput/override/paypal_express_review_details.xml} (58%)
create mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypaluk_express_review.xml
create mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypaluk_express_review_details.xml
create mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/review_product_list.xml
create mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/tag_customer_view.xml
create mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/tag_product_list.xml
create mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/wishlist_index_index.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Rating/detailed.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Review/customer/list.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Review/customer/recent.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Review/customer/view.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Review/form.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Review/helper/summary.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Review/helper/summary_short.phtml
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Review/layout/override/review_product_view.xml (88%)
create mode 100644 app/design/frontend/magento_backup/Magento_Review/product/view/list.phtml
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Review/view.phtml (53%)
create mode 100644 app/design/frontend/magento_backup/Magento_Rss/list.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/billing/agreement/view.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/billing/agreements.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/creditmemo/items.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/invoice/items.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/items.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/items/creditmemo/default.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/items/invoice/default.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/items/order/default.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/items/shipment/default.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/shipment/items.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/shipment/track.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/gift-message.js
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/guest/form.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/checkout_onepage_index.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/customer_account.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_billing_agreement_index.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_billing_agreement_view.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_creditmemo_items.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_invoice_items.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_items.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_shipment_items.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_creditmemo.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_form.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_invoice.xml
rename app/design/frontend/{magento_plushe/Magento_Sales/layout/override/sales_order_printorder.xml => magento_backup/Magento_Sales/layout/override/sales_guest_printorder.xml} (78%)
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printordercreditmemo.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printorderinvoice.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printshipment.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_reorder.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_shipment.xml
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Sales/layout/override/sales_guest_view.xml (83%)
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Sales/layout/override/sales_order_creditmemo.xml (82%)
rename app/design/frontend/{magento_plushe/Magento_Sales/layout/override/sales_order_info_links.xml => magento_backup/Magento_Sales/layout/override/sales_order_guest_info_links.xml} (92%)
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_history.xml
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Sales/layout/override/sales_order_invoice.xml (82%)
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Sales/layout/override/sales_order_printordercreditmemo.xml (82%)
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Sales/layout/override/sales_order_printorderinvoice.xml (82%)
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printshipment.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_reorder.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_shipment.xml
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Sales/layout/override/sales_order_view.xml (81%)
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_index.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_orders.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_view.xml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_view__tabs.xml
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Sales/order/comments.phtml (75%)
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Sales/order/creditmemo.phtml (78%)
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Sales/order/creditmemo/items.phtml (52%)
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Sales/order/creditmemo/items/renderer/default.phtml (95%)
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/history.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/info.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/info/buttons.phtml
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Sales/order/invoice.phtml (78%)
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Sales/order/invoice/items.phtml (54%)
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Sales/order/invoice/items/renderer/default.phtml (97%)
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Sales/order/items.phtml (52%)
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Sales/order/items/renderer/default.phtml (96%)
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/print.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/print/creditmemo.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/print/invoice.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/print/shipment.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/recent.phtml
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Sales/order/shipment.phtml (78%)
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/shipment/items.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/shipment/items/renderer/default.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/totals.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/trackinginfo.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/view.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/orders-returns.js
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/payment/form/billing/agreement.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/recurring/grid.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/recurring/profile/view.phtml
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/recurring/profile/view/info.phtml
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Sales/recurring/profiles.phtml (79%)
rename app/design/frontend/{magento_plushe => magento_backup}/Magento_Sales/reorder/sidebar.phtml (53%)
create mode 100644 app/design/frontend/magento_backup/Magento_Sales/widget/guest/form.phtml
rename app/design/frontend/{magento_plushe/Magento_Contacts => magento_backup/Magento_Weee}/layout/override/default.xml (77%)
create mode 100644 app/design/frontend/magento_backup/Magento_Weee/tax-toggle.js
create mode 100644 app/design/frontend/magento_backup/Magento_Widget/layout/override/default.xml
rename app/design/frontend/{magento_plushe/Magento_Sales/layout/override/customer_account_index.xml => magento_backup/Magento_Widget/layout/override/print.xml} (78%)
rename app/{code/Magento/Widget/view/frontend => design/frontend/magento_backup/Magento_Widget}/widgets.css (100%)
create mode 100644 app/design/frontend/magento_backup/css/print.css
create mode 100644 app/design/frontend/magento_backup/media/preview_image.jpg
create mode 100644 app/design/frontend/magento_backup/theme.xml
rename app/design/frontend/magento_plushe/Magento_Bundle/layout/override/{ => base}/catalog_product_view_type_bundle.xml (83%)
rename app/design/frontend/magento_plushe/Magento_Bundle/layout/override/{ => base}/checkout_cart_index.xml (100%)
rename app/design/frontend/magento_plushe/Magento_Bundle/layout/override/{ => base}/default.xml (100%)
rename app/design/frontend/magento_plushe/Magento_Captcha/layout/override/{ => base}/checkout_onepage_index.xml (100%)
rename app/design/frontend/magento_plushe/Magento_Captcha/layout/override/{ => base}/customer_account_create.xml (100%)
rename app/design/frontend/magento_plushe/Magento_Captcha/layout/override/{ => base}/customer_account_forgotpassword.xml (100%)
rename app/design/frontend/magento_plushe/Magento_Captcha/layout/override/{ => base}/customer_account_login.xml (100%)
rename app/design/frontend/magento_plushe/Magento_Catalog/layout/override/{ => base}/catalog_category_view.xml (98%)
rename app/design/frontend/magento_plushe/Magento_Catalog/layout/override/{ => base}/catalog_category_view_type_default.xml (93%)
rename app/design/frontend/magento_plushe/Magento_Catalog/layout/override/{ => base}/catalog_category_view_type_layered.xml (94%)
rename app/design/frontend/magento_plushe/Magento_Catalog/layout/override/{ => base}/catalog_product_compare_index.xml (95%)
rename app/design/frontend/magento_plushe/Magento_Catalog/layout/override/{ => base}/catalog_product_view.xml (95%)
rename app/design/frontend/magento_plushe/Magento_Catalog/layout/override/{ => base}/catalog_product_view_type_configurable.xml (95%)
rename app/design/frontend/magento_plushe/Magento_Catalog/layout/override/{ => base}/catalog_product_view_type_grouped.xml (94%)
rename app/design/frontend/magento_plushe/Magento_Catalog/layout/override/{ => base}/catalog_product_view_type_simple.xml (94%)
rename app/design/frontend/magento_plushe/Magento_Catalog/layout/override/{ => base}/catalog_product_view_type_virtual.xml (94%)
rename app/design/frontend/magento_plushe/Magento_Catalog/layout/override/{ => base}/default.xml (100%)
rename app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/override/{ => base}/catalogsearch_result_index.xml (97%)
rename app/design/frontend/magento_plushe/Magento_Checkout/layout/override/{ => base}/checkout_cart_index.xml (95%)
rename app/design/frontend/magento_plushe/Magento_Checkout/layout/override/{ => base}/checkout_multishipping_customer_address.xml (97%)
create mode 100644 app/design/frontend/magento_plushe/Magento_Checkout/layout/override/base/checkout_onepage_additional.xml
rename app/design/frontend/magento_plushe/Magento_Checkout/layout/override/{ => base}/checkout_onepage_failure.xml (95%)
rename app/design/frontend/magento_plushe/Magento_Checkout/layout/override/{ => base}/checkout_onepage_index.xml (98%)
rename app/design/frontend/magento_plushe/Magento_Checkout/layout/override/{ => base}/checkout_onepage_success.xml (95%)
rename app/design/frontend/magento_plushe/Magento_Checkout/layout/override/{ => base}/default.xml (100%)
delete mode 100644 app/design/frontend/magento_plushe/Magento_Contacts/form.phtml
rename app/design/frontend/magento_plushe/Magento_Customer/layout/override/{ => base}/customer_account_create.xml (95%)
rename app/design/frontend/magento_plushe/Magento_Customer/layout/override/{ => base}/customer_account_edit.xml (95%)
rename app/design/frontend/magento_plushe/Magento_Customer/layout/override/{ => base}/customer_account_forgotpassword.xml (96%)
rename app/design/frontend/magento_plushe/Magento_Customer/layout/override/{ => base}/customer_account_index.xml (96%)
rename app/design/frontend/magento_plushe/Magento_Customer/layout/override/{ => base}/customer_account_login.xml (96%)
rename app/design/frontend/magento_plushe/Magento_Customer/layout/override/{ => base}/customer_address_index.xml (94%)
delete mode 100644 app/design/frontend/magento_plushe/Magento_Directory/currency.phtml
rename app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/{ => base}/catalog_product_view_type_downloadable.xml (95%)
rename app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/{ => base}/checkout_cart_index.xml (100%)
rename app/design/frontend/magento_plushe/Magento_Newsletter/layout/override/{ => base}/default.xml (100%)
rename app/design/frontend/magento_plushe/Magento_Newsletter/layout/override/{ => base}/newsletter_manage_index.xml (93%)
delete mode 100644 app/design/frontend/magento_plushe/Magento_Page/2columns-left.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Page/2columns-right.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Page/3columns.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Page/html/pager.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Page/layout/override/default.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Page/layout/override/print.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Page/switch/languages.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Paypal/express/review.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Paypal/express/review/address.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Paypal/express/review/shipping/method.phtml
rename app/design/frontend/magento_plushe/Magento_Persistent/layout/override/{ => base}/checkout_onepage_index.xml (100%)
rename app/design/frontend/magento_plushe/Magento_Persistent/layout/override/{ => base}/customer_account_create.xml (100%)
rename app/design/frontend/magento_plushe/Magento_Persistent/layout/override/{ => base}/customer_account_login.xml (100%)
rename app/design/frontend/magento_plushe/Magento_Reports/layout/override/{ => base}/default.xml (100%)
rename app/design/frontend/magento_plushe/{Magento_Cms/layout/override => Magento_Reports/layout/override/base}/print.xml (100%)
delete mode 100644 app/design/frontend/magento_plushe/Magento_Review/customer/list.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Review/customer/recent.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Review/customer/view.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Review/form.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Review/helper/summary.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Review/helper/summary_short.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Review/product/view/list.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Sales/billing/agreement/view.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Sales/billing/agreements.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Sales/guest/form.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Sales/order/history.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Sales/order/info.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Sales/order/info/buttons.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Sales/order/print.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Sales/order/print/creditmemo.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Sales/order/print/invoice.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Sales/order/print/shipment.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Sales/order/recent.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Sales/order/shipment/items.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Sales/order/view.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Sales/success.phtml
rename app/design/frontend/magento_plushe/Magento_Sendfriend/layout/override/{ => base}/sendfriend_product_send.xml (94%)
delete mode 100644 app/design/frontend/magento_plushe/Magento_Widget/layout/override/default.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Widget/layout/override/print.xml
rename app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/{ => base}/wishlist_index_configure.xml (95%)
rename app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/{ => base}/wishlist_index_configure_type_bundle.xml (83%)
rename app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/{ => base}/wishlist_index_configure_type_configurable.xml (95%)
rename app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/{ => base}/wishlist_index_configure_type_grouped.xml (94%)
rename app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/{ => base}/wishlist_index_configure_type_simple.xml (100%)
rename app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/{ => base}/wishlist_index_index.xml (97%)
rename app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/{ => base}/wishlist_shared_index.xml (100%)
delete mode 100644 dev/tests/integration/testsuite/Magento/Adminhtml/controllers/Sales/_files/address_data.php
rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/Block/Dashboard/GraphTest.php (85%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Category/TreeTest.php (88%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Attribute/Set/Toolbar/AddTest.php (88%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Options/OptionTest.php (94%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Options/Type/SelectTest.php (82%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Super/Config/MatrixTest.php (94%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Super/ConfigTest.php (89%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Super/SettingsTest.php (92%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/TabsTest.php (87%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/EditTest.php (91%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Helper/Form/CategoryTest.php (91%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Helper/Form/Gallery/ContentTest.php (82%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Helper/Form/WeightTest.php (88%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Options/AjaxTest.php (90%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Controller/Catalog => Catalog/Controller/Adminhtml}/CategoryTest.php (96%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Controller/Catalog => Catalog/Controller/Adminhtml}/Product/Action/AttributeTest.php (88%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Controller/Catalog => Catalog/Controller/Adminhtml}/Product/AttributeTest.php (94%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Controller/Catalog => Catalog/Controller/Adminhtml}/Product/ReviewTest.php (92%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Controller/Catalog => Catalog/Controller/Adminhtml}/ProductTest.php (89%)
rename dev/tests/integration/testsuite/Magento/Core/Model/{Design/Source/DesignTest.php => Theme/Source/ThemeTest.php} (79%)
rename dev/tests/integration/testsuite/Magento/Core/Model/{Design => Theme}/Source/_files/design/frontend/a_d/file (100%)
rename dev/tests/integration/testsuite/Magento/Core/Model/{Design => Theme}/Source/_files/design/frontend/a_d/theme.xml (100%)
rename dev/tests/integration/testsuite/Magento/Core/Model/{Design => Theme}/Source/_files/design/frontend/b_e/file (100%)
rename dev/tests/integration/testsuite/Magento/Core/Model/{Design => Theme}/Source/_files/design/frontend/b_e/theme.xml (100%)
rename dev/tests/integration/testsuite/Magento/Core/Model/{Design => Theme}/Source/_files/design/frontend/magento_default/file (100%)
rename dev/tests/integration/testsuite/Magento/Core/Model/{Design => Theme}/Source/_files/design/frontend/magento_default/theme.xml (100%)
rename dev/tests/integration/testsuite/Magento/Core/Model/{Design => Theme}/Source/_files/design/frontend/magento_g/file (100%)
rename dev/tests/integration/testsuite/Magento/Core/Model/{Design => Theme}/Source/_files/design/frontend/magento_g/theme.xml (100%)
create mode 100644 dev/tests/integration/testsuite/Magento/Core/Model/_files/layout_directives_test/group.xml
rename dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/Entity/{EavAbstractTest.php => AbstractEavTest.php} (98%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Rating => Rating/Block/Adminhtml}/Edit/Tab/FormTest.php (87%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Items/AbstractTest.php (88%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Form/AbstractTest.php (85%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Controller/Sales => Sales/Controller/Adminhtml}/Order/CreateTest.php (85%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Controller/Sales => Sales/Controller/Adminhtml}/Order/CreditmemoTest.php (90%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Controller/Sales => Sales/Controller/Adminhtml}/OrderTest.php (87%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Model/Sales/Order => Sales/Model/AdminOrder}/CreateTest.php (94%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/controllers => }/Sales/_files/address.php (97%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/controllers => }/Sales/_files/order_info.php (99%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml => Sales}/_files/order_shipping_address_different_to_billing.php (98%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml => Sales}/_files/order_shipping_address_same_as_billing.php (98%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Tax => Tax/Block/Adminhtml}/Rate/ImportExportTest.php (85%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Controller/Tax => Tax/Controller/Adminhtml}/RateTest.php (97%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Controller/Tax => Tax/Controller/Adminhtml}/TaxTest.php (95%)
rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/Design/FileResolution/Strategy/FallbackTest.php (95%)
rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/fallback/design/frontend/vendor_custom_theme/Fixture_Module/fixture_script_two.js (100%)
rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/fallback/design/frontend/vendor_custom_theme/Fixture_Module/fixture_template_two.phtml (100%)
rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/fallback/design/frontend/vendor_custom_theme/fixture_script_two.js (100%)
rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/fallback/design/frontend/vendor_custom_theme/fixture_template_two.phtml (100%)
rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/fallback/design/frontend/vendor_custom_theme/i18n/en_US.csv (100%)
rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/fallback/design/frontend/vendor_custom_theme/mage/script.js (100%)
rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/fallback/design/frontend/vendor_custom_theme/theme.xml (100%)
rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/fallback/design/frontend/vendor_custom_theme2/theme.xml (100%)
rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/fallback/design/frontend/vendor_default/Fixture_Module/fixture_script.js (100%)
rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/fallback/design/frontend/vendor_default/Fixture_Module/fixture_template.phtml (100%)
rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/fallback/design/frontend/vendor_default/fixture_script.js (100%)
rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/fallback/design/frontend/vendor_default/fixture_template.phtml (100%)
rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/fallback/design/frontend/vendor_default/i18n/en_US.csv (100%)
rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/fallback/design/frontend/vendor_default/i18n/ru_RU/Fixture_Module/fixture_script.js (100%)
rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/fallback/design/frontend/vendor_default/i18n/ru_RU/fixture_script.js (100%)
rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/fallback/design/frontend/vendor_default/theme.xml (100%)
rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/fallback/design/frontend/vendor_standalone_theme/theme.xml (100%)
rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/fallback/pub/lib/mage/script.js (100%)
rename dev/tests/static/framework/tests/unit/testsuite/Magento/{Test => TestFramework}/CodingStandard/Tool/CodeMessDetectorTest.php (96%)
rename dev/tests/static/framework/tests/unit/testsuite/Magento/{Test => TestFramework}/CodingStandard/Tool/CodeSniffer/WrapperTest.php (95%)
rename dev/tests/static/framework/tests/unit/testsuite/Magento/{Test => TestFramework}/CodingStandard/Tool/CodeSnifferTest.php (98%)
rename dev/tests/static/framework/tests/unit/testsuite/Magento/{Test => TestFramework}/Inspection/JsHint/CommandTest.php (99%)
rename dev/tests/static/framework/tests/unit/testsuite/Magento/{Test => TestFramework}/Inspection/WordsFinderTest.php (99%)
rename dev/tests/static/framework/tests/unit/testsuite/Magento/{Test => TestFramework}/Inspection/_files/broken_config.xml (100%)
rename dev/tests/static/framework/tests/unit/testsuite/Magento/{Test => TestFramework}/Inspection/_files/config.xml (100%)
rename dev/tests/static/framework/tests/unit/testsuite/Magento/{Test => TestFramework}/Inspection/_files/config_additional.xml (100%)
rename dev/tests/static/framework/tests/unit/testsuite/Magento/{Test => TestFramework}/Inspection/_files/empty_whitelist_path.xml (100%)
rename dev/tests/static/framework/tests/unit/testsuite/Magento/{Test => TestFramework}/Inspection/_files/empty_words_config.xml (100%)
rename dev/tests/static/framework/tests/unit/testsuite/Magento/{Test => TestFramework}/Inspection/_files/words_finder/buffy.php (100%)
rename dev/tests/static/framework/tests/unit/testsuite/Magento/{Test => TestFramework}/Inspection/_files/words_finder/buffy.zip (100%)
rename dev/tests/static/framework/tests/unit/testsuite/Magento/{Test => TestFramework}/Inspection/_files/words_finder/interview_with_the_vampire.php (100%)
rename dev/tests/static/framework/tests/unit/testsuite/Magento/{Test => TestFramework}/Inspection/_files/words_finder/interview_with_the_vampire.zip (100%)
rename dev/tests/static/framework/tests/unit/testsuite/Magento/{Test => TestFramework}/Inspection/_files/words_finder/self_tested_config.xml (100%)
rename dev/tests/static/framework/tests/unit/testsuite/Magento/{Test => TestFramework}/Inspection/_files/words_finder/twilight/eclipse.php (100%)
rename dev/tests/static/framework/tests/unit/testsuite/Magento/{Test => TestFramework}/Inspection/_files/words_finder/twilight/newmoon.php (100%)
create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/AggregateInvokerTest.php
create mode 100644 dev/tests/static/testsuite/Magento/Test/Integrity/AdminhtmlTest.php
create mode 100644 dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/adminhtml_decoupling.php
create mode 100644 dev/tests/unit/testsuite/Magento/Bundle/Block/Catalog/Product/View/Type/BundleTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Attribute/GridTest.php
rename dev/tests/unit/testsuite/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Composite/Fieldset/OptionsTest.php (92%)
rename dev/tests/unit/testsuite/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Edit/Tab/Super/Config/MatrixTest.php (93%)
rename dev/tests/unit/testsuite/Magento/{Adminhtml/Block/Catalog => Catalog/Block/Adminhtml}/Product/Helper/Form/WeightTest.php (88%)
delete mode 100644 dev/tests/unit/testsuite/Magento/Core/Model/Design/FileResolution/StrategyPoolTest.php
delete mode 100644 dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/BaseTest.php
delete mode 100644 dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/Override/BaseTest.php
delete mode 100644 dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalogsearch_ajax_suggest.xml
delete mode 100644 dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/checkout_onepage_progress.xml
delete mode 100644 dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/pages_hierarchy.php
delete mode 100644 dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/FactoryTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Data/Form/FactoryTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Data/FormTest.php
rename dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/{EavAbstractTest.php => AbstractEavTest.php} (98%)
create mode 100644 dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Items/AbstractItemsTest.php
rename dev/tests/unit/testsuite/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Items/AbstractTest.php (77%)
rename dev/tests/unit/testsuite/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Create/Items/GridTest.php (94%)
rename dev/tests/unit/testsuite/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Invoice/ViewTest.php (88%)
rename dev/tests/unit/testsuite/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/Totals/TaxTest.php (89%)
rename dev/tests/unit/testsuite/Magento/{Adminhtml/Block/Sales => Sales/Block/Adminhtml}/Order/View/GiftmessageTest.php (89%)
rename dev/tests/unit/testsuite/Magento/{Adminhtml/Controller/Sales => Sales/Controller/Adminhtml}/Order/CreditmemoTest.php (96%)
rename dev/tests/unit/testsuite/Magento/{Core/Model => View}/Design/Fallback/FactoryTest.php (81%)
rename dev/tests/unit/testsuite/Magento/{Core/Model => View}/Design/Fallback/Rule/CompositeTest.php (73%)
rename dev/tests/unit/testsuite/Magento/{Core/Model => View}/Design/Fallback/Rule/ModularSwitchTest.php (62%)
rename dev/tests/unit/testsuite/Magento/{Core/Model => View}/Design/Fallback/Rule/SimpleTest.php (90%)
rename dev/tests/unit/testsuite/Magento/{Core/Model => View}/Design/Fallback/Rule/ThemeTest.php (85%)
rename dev/tests/unit/testsuite/Magento/{Core/Model => View}/Design/FileResolution/Strategy/Fallback/CachingProxyTest.php (58%)
rename dev/tests/unit/testsuite/Magento/{Core/Model => View}/Design/FileResolution/Strategy/FallbackTest.php (61%)
create mode 100644 dev/tests/unit/testsuite/Magento/View/Design/FileResolution/StrategyPoolTest.php
rename dev/tests/unit/testsuite/Magento/{Core/Model => View}/Layout/File/FactoryTest.php (85%)
rename dev/tests/unit/testsuite/Magento/{Core/Model => View}/Layout/File/FileList/FactoryTest.php (81%)
rename dev/tests/unit/testsuite/Magento/{Core/Model/Layout/File/ListTest.php => View/Layout/File/FileListTest.php} (92%)
rename dev/tests/unit/testsuite/Magento/{Core/Model => View}/Layout/File/Source/AggregateTest.php (75%)
create mode 100644 dev/tests/unit/testsuite/Magento/View/Layout/File/Source/BaseTest.php
rename dev/tests/unit/testsuite/Magento/{Core/Model => View}/Layout/File/Source/Decorator/ModuleDependencyTest.php (83%)
rename dev/tests/unit/testsuite/Magento/{Core/Model => View}/Layout/File/Source/Decorator/ModuleOutputTest.php (80%)
create mode 100644 dev/tests/unit/testsuite/Magento/View/Layout/File/Source/Override/BaseTest.php
rename dev/tests/unit/testsuite/Magento/{Core/Model => View}/Layout/File/Source/Override/ThemeTest.php (65%)
rename dev/tests/unit/testsuite/Magento/{Core/Model => View}/Layout/File/Source/ThemeTest.php (50%)
rename dev/tests/unit/testsuite/Magento/{Core/Model => View}/Layout/FileTest.php (90%)
rename dev/tests/unit/testsuite/Magento/{Core/Model => View}/TemplateEngine/PhpTest.php (94%)
rename dev/tests/unit/testsuite/Magento/{Core/Model => View}/TemplateEngine/_files/simple.phtml (100%)
rename dev/tests/unit/testsuite/Magento/{Core/Model/TemplateEngine/PoolTest.php => View/TemplateEngineFactoryTest.php} (51%)
create mode 100644 dev/tools/Magento/Tools/Layout/processors/addToParentGroup.xsl
rename downloader/lib/Magento/Backup/{Exception.php => BackupException.php} (90%)
mode change 100755 => 100644
create mode 100644 downloader/lib/Magento/Backup/Db/BackupDbInterface.php
rename app/code/Magento/Core/Model/TemplateEngine/Factory.php => downloader/lib/Magento/Backup/Db/BackupFactory.php (50%)
create mode 100644 downloader/lib/Magento/Backup/Db/BackupInterface.php
create mode 100644 downloader/lib/Magento/Backup/Factory.php
rename app/design/frontend/magento_plushe/Magento_Reports/layout/override/print.xml => downloader/template/copyright.phtml (87%)
create mode 100644 lib/Magento/Data/Form/Factory.php
create mode 100644 lib/Magento/View/BlockPool.php
create mode 100644 lib/Magento/View/Context.php
create mode 100644 lib/Magento/View/DataSourcePool.php
create mode 100644 lib/Magento/View/Design/Fallback/Factory.php
rename {app/code/Magento/Core/Model => lib/Magento/View}/Design/Fallback/Rule/Composite.php (77%)
rename {app/code/Magento/Core/Model => lib/Magento/View}/Design/Fallback/Rule/ModularSwitch.php (64%)
rename {app/code/Magento/Core/Model => lib/Magento/View}/Design/Fallback/Rule/RuleInterface.php (92%)
rename {app/code/Magento/Core/Model => lib/Magento/View}/Design/Fallback/Rule/Simple.php (84%)
rename {app/code/Magento/Core/Model => lib/Magento/View}/Design/Fallback/Rule/Theme.php (75%)
rename {app/code/Magento/Core/Model => lib/Magento/View}/Design/FileResolution/Strategy/Fallback.php (53%)
create mode 100644 lib/Magento/View/Design/FileResolution/Strategy/Fallback/CachingProxy.php
rename {app/code/Magento/Core/Model => lib/Magento/View}/Design/FileResolution/Strategy/FileInterface.php (81%)
rename {app/code/Magento/Core/Model => lib/Magento/View}/Design/FileResolution/Strategy/LocaleInterface.php (81%)
rename {app/code/Magento/Core/Model => lib/Magento/View}/Design/FileResolution/Strategy/View/NotifiableInterface.php (76%)
rename {app/code/Magento/Core/Model => lib/Magento/View}/Design/FileResolution/Strategy/ViewInterface.php (81%)
create mode 100644 lib/Magento/View/Design/FileResolution/StrategyPool.php
create mode 100644 lib/Magento/View/Design/ThemeFactory.php
rename app/code/Magento/Media/Helper/Data.php => lib/Magento/View/Element/RendererInterface.php (76%)
rename {app/code/Magento/Core/Model => lib/Magento/View}/Layout/File.php (74%)
rename {app/code/Magento/Core/Model => lib/Magento/View}/Layout/File/Factory.php (63%)
rename app/code/Magento/Core/Model/Layout/File/ListFile.php => lib/Magento/View/Layout/File/FileList.php (71%)
rename {app/code/Magento/Core/Model => lib/Magento/View}/Layout/File/FileList/Factory.php (72%)
create mode 100644 lib/Magento/View/Layout/File/Source/Aggregated.php
create mode 100644 lib/Magento/View/Layout/File/Source/Base.php
rename {app/code/Magento/Core/Model => lib/Magento/View}/Layout/File/Source/Decorator/ModuleDependency.php (58%)
rename {app/code/Magento/Core/Model => lib/Magento/View}/Layout/File/Source/Decorator/ModuleOutput.php (64%)
rename {app/code/Magento/Core/Model => lib/Magento/View}/Layout/File/Source/Override/Base.php (54%)
rename {app/code/Magento/Core/Model => lib/Magento/View}/Layout/File/Source/Override/Theme.php (52%)
rename {app/code/Magento/Core/Model => lib/Magento/View}/Layout/File/Source/Theme.php (51%)
rename {app/code/Magento/Core/Model => lib/Magento/View}/Layout/File/SourceInterface.php (77%)
create mode 100644 lib/Magento/View/Render/Html.php
create mode 100644 lib/Magento/View/Render/RenderFactory.php
create mode 100644 lib/Magento/View/RenderInterface.php
rename {app/code/Magento/Core/Model => lib/Magento/View}/TemplateEngine/Php.php (91%)
rename app/code/Magento/Core/Model/TemplateEngine/Pool.php => lib/Magento/View/TemplateEngineFactory.php (56%)
rename app/code/Magento/Core/Model/TemplateEngine/EngineInterface.php => lib/Magento/View/TemplateEngineInterface.php (94%)
mode change 100755 => 100644 var/.htaccess
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47301676416..32477535ddc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+2.0.0.0-dev50
+=============
+* Modularity improvements:
+ * Cleavage of Adminhtml module
+ * Moved Sales, Catalog, Tax-related logic to respective modules
+ * Moved Action, Cache, Ajax, Dashboard, Index, Json, Rating, Sitemap, Survey, UrlRewrite from root of Adminhtml Controller folder
+ * View abstraction was moved into library
+ * Eliminated dependency in Magento\Data\Form from Magento\Core module
+ * Eliminated Magento\Media module
+* Themes update:
+ * Templates and layout updates are updated in Cms, Contacts, Core, Directory, GoogleCheckout, Page, Payment, PaypalUk, Paypal, Rating, Review, Rss,Sales, Widget modules, old files moved to magento_backup theme
+* Layout improvements:
+ * Removed page type hierarchy and page fragment types
+ * No direct code execution: methods addColumnRender, addRenderer, addToParentGroup usages as action nodes were eliminated
+* Fixed bugs:
+ * Impossible to add image using WYSIWYG
+ * Legacy static test ObsoleteCodeTest::testPhpFiles produced false-positive results
+ * Incorrect copyright information
+
2.0.0.0-dev49
=============
* Various improvements:
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php
index a312e798b08..dc3c1078de4 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php
@@ -62,7 +62,7 @@ class Notification extends \Magento\Backend\Controller\AbstractAction
$this->_redirectReferer();
return;
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
/**
@@ -113,7 +113,7 @@ class Notification extends \Magento\Backend\Controller\AbstractAction
);
}
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
public function removeAction()
@@ -123,7 +123,7 @@ class Notification extends \Magento\Backend\Controller\AbstractAction
->load($id);
if (!$model->getId()) {
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return ;
}
@@ -141,10 +141,10 @@ class Notification extends \Magento\Backend\Controller\AbstractAction
);
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
public function massRemoveAction()
diff --git a/app/code/Magento/Adminhtml/Controller/Survey.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Survey.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Controller/Survey.php
rename to app/code/Magento/AdminNotification/Controller/Adminhtml/Survey.php
index 54fea892de4..f8d688ac873 100644
--- a/app/code/Magento/Adminhtml/Controller/Survey.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Survey.php
@@ -32,9 +32,9 @@
* @package Magento_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller;
+namespace Magento\AdminNotification\Controller\Adminhtml;
-class Survey extends \Magento\Adminhtml\Controller\Action
+class Survey extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Index Action
diff --git a/app/code/Magento/Adminhtml/Block/Cache.php b/app/code/Magento/Adminhtml/Block/Cache.php
index 734ecfaf77a..9540a3f1cfd 100644
--- a/app/code/Magento/Adminhtml/Block/Cache.php
+++ b/app/code/Magento/Adminhtml/Block/Cache.php
@@ -56,7 +56,7 @@ class Cache extends \Magento\Adminhtml\Block\Widget\Grid\Container
*/
public function getFlushStorageUrl()
{
- return $this->getUrl('*/*/flushAll');
+ return $this->getUrl('adminhtml/*/flushAll');
}
/**
@@ -64,6 +64,6 @@ class Cache extends \Magento\Adminhtml\Block\Widget\Grid\Container
*/
public function getFlushSystemUrl()
{
- return $this->getUrl('*/*/flushSystem');
+ return $this->getUrl('adminhtml/*/flushSystem');
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Cache/Additional.php b/app/code/Magento/Adminhtml/Block/Cache/Additional.php
index d7d2b93aa65..d4a43697b44 100644
--- a/app/code/Magento/Adminhtml/Block/Cache/Additional.php
+++ b/app/code/Magento/Adminhtml/Block/Cache/Additional.php
@@ -30,11 +30,11 @@ class Additional extends \Magento\Adminhtml\Block\Template
{
public function getCleanImagesUrl()
{
- return $this->getUrl('*/*/cleanImages');
+ return $this->getUrl('adminhtml/*/cleanImages');
}
public function getCleanMediaUrl()
{
- return $this->getUrl('*/*/cleanMedia');
+ return $this->getUrl('adminhtml/*/cleanMedia');
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Checkout/Agreement/Grid.php b/app/code/Magento/Adminhtml/Block/Checkout/Agreement/Grid.php
index 390285b9c83..599d2d53d63 100644
--- a/app/code/Magento/Adminhtml/Block/Checkout/Agreement/Grid.php
+++ b/app/code/Magento/Adminhtml/Block/Checkout/Agreement/Grid.php
@@ -134,7 +134,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
public function getRowUrl($row)
{
- return $this->getUrl('*/*/edit', array('id' => $row->getId()));
+ return $this->getUrl('adminhtml/*/edit', array('id' => $row->getId()));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Cms/Block/Widget/Chooser.php b/app/code/Magento/Adminhtml/Block/Cms/Block/Widget/Chooser.php
index b75709203a5..f2e13864c8e 100644
--- a/app/code/Magento/Adminhtml/Block/Cms/Block/Widget/Chooser.php
+++ b/app/code/Magento/Adminhtml/Block/Cms/Block/Widget/Chooser.php
@@ -89,7 +89,7 @@ class Chooser extends \Magento\Adminhtml\Block\Widget\Grid
public function prepareElementHtml(\Magento\Data\Form\Element\AbstractElement $element)
{
$uniqId = $this->_coreData->uniqHash($element->getId());
- $sourceUrl = $this->getUrl('*/cms_block_widget/chooser', array('uniq_id' => $uniqId));
+ $sourceUrl = $this->getUrl('adminhtml/cms_block_widget/chooser', array('uniq_id' => $uniqId));
$chooser = $this->getLayout()->createBlock('Magento\Widget\Block\Adminhtml\Widget\Chooser')
->setElement($element)
@@ -184,6 +184,6 @@ class Chooser extends \Magento\Adminhtml\Block\Widget\Grid
public function getGridUrl()
{
- return $this->getUrl('*/cms_block_widget/chooser', array('_current' => true));
+ return $this->getUrl('adminhtml/cms_block_widget/chooser', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Cms/Page/Edit.php b/app/code/Magento/Adminhtml/Block/Cms/Page/Edit.php
index fc8f1ae8e22..2c0ad037b43 100644
--- a/app/code/Magento/Adminhtml/Block/Cms/Page/Edit.php
+++ b/app/code/Magento/Adminhtml/Block/Cms/Page/Edit.php
@@ -126,7 +126,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
*/
protected function _getSaveAndContinueUrl()
{
- return $this->getUrl('*/*/save', array(
+ return $this->getUrl('adminhtml/*/save', array(
'_current' => true,
'back' => 'edit',
'active_tab' => '{{tab_id}}'
diff --git a/app/code/Magento/Adminhtml/Block/Cms/Page/Grid.php b/app/code/Magento/Adminhtml/Block/Cms/Page/Grid.php
index ac42d7993f0..ee26de4e3e1 100644
--- a/app/code/Magento/Adminhtml/Block/Cms/Page/Grid.php
+++ b/app/code/Magento/Adminhtml/Block/Cms/Page/Grid.php
@@ -185,6 +185,6 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
*/
public function getRowUrl($row)
{
- return $this->getUrl('*/*/edit', array('page_id' => $row->getId()));
+ return $this->getUrl('adminhtml/*/edit', array('page_id' => $row->getId()));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Cms/Page/Widget/Chooser.php b/app/code/Magento/Adminhtml/Block/Cms/Page/Widget/Chooser.php
index c2711fa54db..125c99d4849 100644
--- a/app/code/Magento/Adminhtml/Block/Cms/Page/Widget/Chooser.php
+++ b/app/code/Magento/Adminhtml/Block/Cms/Page/Widget/Chooser.php
@@ -104,7 +104,7 @@ class Chooser extends \Magento\Adminhtml\Block\Widget\Grid
public function prepareElementHtml(\Magento\Data\Form\Element\AbstractElement $element)
{
$uniqId = $this->_coreData->uniqHash($element->getId());
- $sourceUrl = $this->getUrl('*/cms_page_widget/chooser', array('uniq_id' => $uniqId));
+ $sourceUrl = $this->getUrl('adminhtml/cms_page_widget/chooser', array('uniq_id' => $uniqId));
$chooser = $this->getLayout()->createBlock('Magento\Widget\Block\Adminhtml\Widget\Chooser')
->setElement($element)
@@ -212,6 +212,6 @@ class Chooser extends \Magento\Adminhtml\Block\Widget\Grid
public function getGridUrl()
{
- return $this->getUrl('*/cms_page_widget/chooser', array('_current' => true));
+ return $this->getUrl('adminhtml/cms_page_widget/chooser', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php b/app/code/Magento/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php
index 51f251098ae..acbb6a4b772 100644
--- a/app/code/Magento/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php
+++ b/app/code/Magento/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php
@@ -75,7 +75,7 @@ class Content extends \Magento\Adminhtml\Block\Widget\Container
*/
public function getContentsUrl()
{
- return $this->getUrl('*/*/contents', array('type' => $this->getRequest()->getParam('type')));
+ return $this->getUrl('adminhtml/*/contents', array('type' => $this->getRequest()->getParam('type')));
}
/**
@@ -111,7 +111,7 @@ class Content extends \Magento\Adminhtml\Block\Widget\Container
*/
public function getNewfolderUrl()
{
- return $this->getUrl('*/*/newFolder');
+ return $this->getUrl('adminhtml/*/newFolder');
}
/**
@@ -121,7 +121,7 @@ class Content extends \Magento\Adminhtml\Block\Widget\Container
*/
protected function getDeletefolderUrl()
{
- return $this->getUrl('*/*/deleteFolder');
+ return $this->getUrl('adminhtml/*/deleteFolder');
}
/**
@@ -132,7 +132,7 @@ class Content extends \Magento\Adminhtml\Block\Widget\Container
*/
public function getDeleteFilesUrl()
{
- return $this->getUrl('*/*/deleteFiles');
+ return $this->getUrl('adminhtml/*/deleteFiles');
}
/**
@@ -142,7 +142,7 @@ class Content extends \Magento\Adminhtml\Block\Widget\Container
*/
public function getOnInsertUrl()
{
- return $this->getUrl('*/*/onInsert');
+ return $this->getUrl('adminhtml/*/onInsert');
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php b/app/code/Magento/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php
index d71fdde757a..87e51428d38 100644
--- a/app/code/Magento/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php
+++ b/app/code/Magento/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php
@@ -72,7 +72,7 @@ class Uploader extends \Magento\Adminhtml\Block\Media\Uploader
$files[] = '*.' . $ext;
}
$this->getConfig()
- ->setUrl($this->_urlBuilder->addSessionParam()->getUrl('*/*/upload', array('type' => $type)))
+ ->setUrl($this->_urlBuilder->addSessionParam()->getUrl('adminhtml/*/upload', array('type' => $type)))
->setFileField('image')
->setFilters(array(
'images' => array(
diff --git a/app/code/Magento/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php b/app/code/Magento/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php
index aeefd2c3e45..78defe801e7 100644
--- a/app/code/Magento/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php
+++ b/app/code/Magento/Adminhtml/Block/Cms/Wysiwyg/Images/Tree.php
@@ -97,7 +97,7 @@ class Tree extends \Magento\Adminhtml\Block\Template
*/
public function getTreeLoaderUrl()
{
- return $this->getUrl('*/*/treeJson');
+ return $this->getUrl('adminhtml/*/treeJson');
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Customer/Edit.php b/app/code/Magento/Adminhtml/Block/Customer/Edit.php
index 7a303730d60..bbcbc7391ec 100644
--- a/app/code/Magento/Adminhtml/Block/Customer/Edit.php
+++ b/app/code/Magento/Adminhtml/Block/Customer/Edit.php
@@ -87,7 +87,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
}
if ($customer && $customer->getId()) {
- $url = $this->getUrl('*/*/resetPassword', array('customer_id' => $customer->getId()));
+ $url = $this->getUrl('adminhtml/*/resetPassword', array('customer_id' => $customer->getId()));
$this->_addButton('reset_password', array(
'label' => __('Reset Password'),
'onclick' => 'setLocation(\'' . $url . '\')',
@@ -98,7 +98,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
public function getCreateOrderUrl()
{
- return $this->getUrl('*/sales_order_create/start', array('customer_id' => $this->getCustomerId()));
+ return $this->getUrl('sales/order_create/start', array('customer_id' => $this->getCustomerId()));
}
public function getCustomerId()
@@ -124,14 +124,14 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
public function getFormHtml()
{
$html = parent::getFormHtml();
- $html .= $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Product\Composite\Configure')
+ $html .= $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Product\Composite\Configure')
->toHtml();
return $html;
}
public function getValidationUrl()
{
- return $this->getUrl('*/*/validate', array('_current' => true));
+ return $this->getUrl('adminhtml/*/validate', array('_current' => true));
}
protected function _prepareLayout()
@@ -153,7 +153,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
protected function _getSaveAndContinueUrl()
{
- return $this->getUrl('*/*/save', array(
+ return $this->getUrl('adminhtml/*/save', array(
'_current' => true,
'back' => 'edit',
'tab' => '{{tab_id}}'
diff --git a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Addresses.php b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Addresses.php
index e1dfae47f85..52da8910596 100644
--- a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Addresses.php
+++ b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Addresses.php
@@ -78,7 +78,7 @@ class Addresses extends \Magento\Backend\Block\Widget\Form\Generic
public function getRegionsUrl()
{
- return $this->getUrl('*/json/countryRegion');
+ return $this->getUrl('directory/json/countryRegion');
}
protected function _prepareLayout()
diff --git a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Cart.php b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Cart.php
index f63d0983220..75c47ece9df 100644
--- a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Cart.php
+++ b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Cart.php
@@ -205,7 +205,7 @@ class Cart extends \Magento\Adminhtml\Block\Widget\Grid
*/
public function getGridUrl()
{
- return $this->getUrl('*/*/cart', array('_current'=>true, 'website_id' => $this->getWebsiteId()));
+ return $this->getUrl('adminhtml/*/cart', array('_current'=>true, 'website_id' => $this->getWebsiteId()));
}
/**
@@ -219,6 +219,6 @@ class Cart extends \Magento\Adminhtml\Block\Widget\Grid
public function getRowUrl($row)
{
- return $this->getUrl('*/catalog_product/edit', array('id' => $row->getProductId()));
+ return $this->getUrl('catalog/product/edit', array('id' => $row->getProductId()));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php
index 2880611cb5d..657d4f8a46d 100644
--- a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php
+++ b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php
@@ -85,7 +85,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
public function getGridUrl()
{
- return $this->getUrl('*/*/newsletter', array('_current' => true));
+ return $this->getUrl('adminhtml/*/newsletter', array('_current' => true));
}
protected function _prepareCollection()
diff --git a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php
index 8acb5f7ba54..c783cb637ec 100644
--- a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php
+++ b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Action.php
@@ -62,7 +62,7 @@ class Action extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Abstra
$actions[] = array(
'@' => array(
- 'href' => $this->getUrl('*/newsletter_template/preview',
+ 'href' => $this->getUrl('adminhtml/newsletter_template/preview',
array(
'id' => $row->getTemplateId(),
'subscriber'=> $this->_coreRegistry->registry('subscriber')->getId()
diff --git a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Orders.php b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Orders.php
index b0910708c24..fa531814ee7 100644
--- a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Orders.php
+++ b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Orders.php
@@ -153,7 +153,7 @@ class Orders extends \Magento\Adminhtml\Block\Widget\Grid
'filter' => false,
'sortable' => false,
'width' => '100px',
- 'renderer' => 'Magento\Adminhtml\Block\Sales\Reorder\Renderer\Action'
+ 'renderer' => 'Magento\Sales\Block\Adminhtml\Reorder\Renderer\Action'
));
}
@@ -162,11 +162,11 @@ class Orders extends \Magento\Adminhtml\Block\Widget\Grid
public function getRowUrl($row)
{
- return $this->getUrl('*/sales_order/view', array('order_id' => $row->getId()));
+ return $this->getUrl('sales/order/view', array('order_id' => $row->getId()));
}
public function getGridUrl()
{
- return $this->getUrl('*/*/orders', array('_current' => true));
+ return $this->getUrl('adminhtml/*/orders', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Reviews.php b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Reviews.php
index b7e5077365f..e2c8d11d831 100644
--- a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Reviews.php
+++ b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Reviews.php
@@ -52,6 +52,6 @@ class Reviews extends \Magento\Adminhtml\Block\Review\Grid
*/
public function getGridUrl()
{
- return $this->getUrl('*/*/productReviews', array('_current' => true));
+ return $this->getUrl('adminhtml/*/productReviews', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php
index 549fd0ef802..8017c6dda98 100644
--- a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php
+++ b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/View/Accordion.php
@@ -83,7 +83,7 @@ class Accordion extends \Magento\Adminhtml\Block\Widget\Accordion
$this->addItem('lastOrders', array(
'title' => __('Recent Orders'),
'ajax' => true,
- 'content_url' => $this->getUrl('*/*/lastOrders', array('_current' => true)),
+ 'content_url' => $this->getUrl('adminhtml/*/lastOrders', array('_current' => true)),
));
// add shopping cart block of each website
@@ -106,7 +106,7 @@ class Accordion extends \Magento\Adminhtml\Block\Widget\Accordion
$this->addItem('shopingCart' . $websiteId, array(
'title' => $title,
'ajax' => true,
- 'content_url' => $this->getUrl('*/*/viewCart', array('_current' => true, 'website_id' => $websiteId)),
+ 'content_url' => $this->getUrl('adminhtml/*/viewCart', array('_current' => true, 'website_id' => $websiteId)),
));
}
@@ -119,7 +119,7 @@ class Accordion extends \Magento\Adminhtml\Block\Widget\Accordion
$this->addItem('wishlist', array(
'title' => __('Wishlist - %1 item(s)', $wishlistCount),
'ajax' => true,
- 'content_url' => $this->getUrl('*/*/viewWishlist', array('_current' => true)),
+ 'content_url' => $this->getUrl('adminhtml/*/viewWishlist', array('_current' => true)),
));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php
index fcdd0364edd..1cc671b6a28 100644
--- a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php
+++ b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php
@@ -158,7 +158,7 @@ class Cart extends \Magento\Adminhtml\Block\Widget\Grid
public function getRowUrl($row)
{
- return $this->getUrl('*/catalog_product/edit', array('id' => $row->getProductId()));
+ return $this->getUrl('catalog/product/edit', array('id' => $row->getProductId()));
}
public function getHeadersVisibility()
diff --git a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php
index 1f9795ab5ca..a48e4e0793e 100644
--- a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php
+++ b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php
@@ -143,7 +143,7 @@ class Orders extends \Magento\Adminhtml\Block\Widget\Grid
'filter' => false,
'sortable' => false,
'width' => '100px',
- 'renderer' => 'Magento\Adminhtml\Block\Sales\Reorder\Renderer\Action'
+ 'renderer' => 'Magento\Sales\Block\Adminhtml\Reorder\Renderer\Action'
));
return parent::_prepareColumns();
@@ -151,7 +151,7 @@ class Orders extends \Magento\Adminhtml\Block\Widget\Grid
public function getRowUrl($row)
{
- return $this->getUrl('*/sales_order/view', array('order_id' => $row->getId()));
+ return $this->getUrl('sales/order/view', array('order_id' => $row->getId()));
}
public function getHeadersVisibility()
diff --git a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php
index d1f92e55491..ab0edd74ef9 100644
--- a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php
+++ b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php
@@ -167,6 +167,6 @@ class Wishlist extends \Magento\Adminhtml\Block\Widget\Grid
*/
public function getRowUrl($row)
{
- return $this->getUrl('*/catalog_product/edit', array('id' => $row->getProductId()));
+ return $this->getUrl('catalog/product/edit', array('id' => $row->getProductId()));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tabs.php b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tabs.php
index 9b8c198eca5..bdf731ee312 100644
--- a/app/code/Magento/Adminhtml/Block/Customer/Edit/Tabs.php
+++ b/app/code/Magento/Adminhtml/Block/Customer/Edit/Tabs.php
@@ -90,20 +90,20 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
$this->addTab('orders', array(
'label' => __('Orders'),
'class' => 'ajax',
- 'url' => $this->getUrl('*/*/orders', array('_current' => true)),
+ 'url' => $this->getUrl('adminhtml/*/orders', array('_current' => true)),
));
}
$this->addTab('cart', array(
'label' => __('Shopping Cart'),
'class' => 'ajax',
- 'url' => $this->getUrl('*/*/carts', array('_current' => true)),
+ 'url' => $this->getUrl('adminhtml/*/carts', array('_current' => true)),
));
$this->addTab('wishlist', array(
'label' => __('Wishlist'),
'class' => 'ajax',
- 'url' => $this->getUrl('*/*/wishlist', array('_current' => true)),
+ 'url' => $this->getUrl('adminhtml/*/wishlist', array('_current' => true)),
));
if ($this->_authorization->isAllowed('Magento_Newsletter::subscriber')) {
@@ -118,7 +118,7 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
$this->addTab('reviews', array(
'label' => __('Product Reviews'),
'class' => 'ajax',
- 'url' => $this->getUrl('*/*/productReviews', array('_current' => true)),
+ 'url' => $this->getUrl('adminhtml/*/productReviews', array('_current' => true)),
));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Customer/Grid.php b/app/code/Magento/Adminhtml/Block/Customer/Grid.php
index c7b7f647a0a..23ca6f10cfb 100644
--- a/app/code/Magento/Adminhtml/Block/Customer/Grid.php
+++ b/app/code/Magento/Adminhtml/Block/Customer/Grid.php
@@ -217,18 +217,18 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
$this->getMassactionBlock()->addItem('delete', array(
'label' => __('Delete'),
- 'url' => $this->getUrl('*/*/massDelete'),
+ 'url' => $this->getUrl('adminhtml/*/massDelete'),
'confirm' => __('Are you sure?')
));
$this->getMassactionBlock()->addItem('newsletter_subscribe', array(
'label' => __('Subscribe to Newsletter'),
- 'url' => $this->getUrl('*/*/massSubscribe')
+ 'url' => $this->getUrl('adminhtml/*/massSubscribe')
));
$this->getMassactionBlock()->addItem('newsletter_unsubscribe', array(
'label' => __('Unsubscribe from Newsletter'),
- 'url' => $this->getUrl('*/*/massUnsubscribe')
+ 'url' => $this->getUrl('adminhtml/*/massUnsubscribe')
));
$groups = $this->helper('Magento\Customer\Helper\Data')->getGroups()->toOptionArray();
@@ -236,7 +236,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
array_unshift($groups, array('label'=> '', 'value'=> ''));
$this->getMassactionBlock()->addItem('assign_group', array(
'label' => __('Assign a Customer Group'),
- 'url' => $this->getUrl('*/*/massAssignGroup'),
+ 'url' => $this->getUrl('adminhtml/*/massAssignGroup'),
'additional' => array(
'visibility' => array(
'name' => 'group',
@@ -253,11 +253,11 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
public function getGridUrl()
{
- return $this->getUrl('*/*/grid', array('_current'=> true));
+ return $this->getUrl('adminhtml/*/grid', array('_current'=> true));
}
public function getRowUrl($row)
{
- return $this->getUrl('*/*/edit', array('id'=>$row->getId()));
+ return $this->getUrl('adminhtml/*/edit', array('id'=>$row->getId()));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Customer/Group/Edit/Form.php b/app/code/Magento/Adminhtml/Block/Customer/Group/Edit/Form.php
index 1b845c207d8..fa5d750aca0 100644
--- a/app/code/Magento/Adminhtml/Block/Customer/Group/Edit/Form.php
+++ b/app/code/Magento/Adminhtml/Block/Customer/Group/Edit/Form.php
@@ -130,7 +130,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
$form->setUseContainer(true);
$form->setId('edit_form');
- $form->setAction($this->getUrl('*/*/save'));
+ $form->setAction($this->getUrl('adminhtml/*/save'));
$this->setForm($form);
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php b/app/code/Magento/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php
index 1dfb03de978..9bea9ff6bca 100644
--- a/app/code/Magento/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php
+++ b/app/code/Magento/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php
@@ -59,7 +59,7 @@ class Vat
$vatElementId = $this->_element->getHtmlId();
$countryElementId = $form->getElement('country_id')->getHtmlId();
- $validateUrl = $this->_urlBuilder->getUrl('*/customer_system_config_validatevat/validateAdvanced');
+ $validateUrl = $this->_urlBuilder->getUrl('adminhtml/customer_system_config_validatevat/validateAdvanced');
$groupMessage = __('The customer is currently assigned to Customer Group %s.')
. ' ' . __('Would you like to change the Customer Group for this order?');
diff --git a/app/code/Magento/Adminhtml/Block/Denied.php b/app/code/Magento/Adminhtml/Block/Denied.php
index 1b4f3e2b886..d9c6b272f61 100644
--- a/app/code/Magento/Adminhtml/Block/Denied.php
+++ b/app/code/Magento/Adminhtml/Block/Denied.php
@@ -51,7 +51,7 @@ class Denied extends \Magento\Adminhtml\Block\Template
public function hasAvailableResources()
{
- $user = $this->authSession->getUser();
+ $user = $this->_authSession->getUser();
if ($user && $user->getHasAvailableResources()) {
return true;
}
diff --git a/app/code/Magento/Adminhtml/Block/Media/Uploader.php b/app/code/Magento/Adminhtml/Block/Media/Uploader.php
index 26342d5c99e..edf4b2951f1 100644
--- a/app/code/Magento/Adminhtml/Block/Media/Uploader.php
+++ b/app/code/Magento/Adminhtml/Block/Media/Uploader.php
@@ -76,7 +76,7 @@ class Uploader extends \Magento\Adminhtml\Block\Widget
$this->setId($this->getId() . '_Uploader');
- $uploadUrl = $this->_urlBuilder->addSessionParam()->getUrl('*/*/upload');
+ $uploadUrl = $this->_urlBuilder->addSessionParam()->getUrl('adminhtml/*/upload');
$this->getConfig()->setUrl($uploadUrl);
$this->getConfig()->setParams(array('form_key' => $this->getFormKey()));
$this->getConfig()->setFileField('file');
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Edit.php b/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Edit.php
index 5e52aca33f8..ffcd6e1866a 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Edit.php
+++ b/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Edit.php
@@ -98,7 +98,7 @@ class Edit extends \Magento\Adminhtml\Block\Template
} else {
$params = array('id' => $this->getRequest()->getParam('id'));
}
- return $this->getUrl('*/*/save', $params);
+ return $this->getUrl('adminhtml/*/save', $params);
}
protected function _prepareLayout()
@@ -164,7 +164,7 @@ class Edit extends \Magento\Adminhtml\Block\Template
*/
public function getPreviewUrl()
{
- return $this->getUrl('*/*/preview');
+ return $this->getUrl('adminhtml/*/preview');
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php b/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php
index 884b4d451ee..b7e0c66d064 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php
+++ b/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php
@@ -43,18 +43,18 @@ class Action extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Action
if($row->getQueueStatus()==\Magento\Newsletter\Model\Queue::STATUS_NEVER) {
if(!$row->getQueueStartAt() && $row->getSubscribersTotal()) {
$actions[] = array(
- 'url' => $this->getUrl('*/*/start', array('id'=>$row->getId())),
+ 'url' => $this->getUrl('adminhtml/*/start', array('id'=>$row->getId())),
'caption' => __('Start')
);
}
} else if ($row->getQueueStatus()==\Magento\Newsletter\Model\Queue::STATUS_SENDING) {
$actions[] = array(
- 'url' => $this->getUrl('*/*/pause', array('id'=>$row->getId())),
+ 'url' => $this->getUrl('adminhtml/*/pause', array('id'=>$row->getId())),
'caption' => __('Pause')
);
$actions[] = array(
- 'url' => $this->getUrl('*/*/cancel', array('id'=>$row->getId())),
+ 'url' => $this->getUrl('adminhtml/*/cancel', array('id'=>$row->getId())),
'confirm' => __('Do you really want to cancel the queue?'),
'caption' => __('Cancel')
);
@@ -63,14 +63,14 @@ class Action extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Action
} else if ($row->getQueueStatus()==\Magento\Newsletter\Model\Queue::STATUS_PAUSE) {
$actions[] = array(
- 'url' => $this->getUrl('*/*/resume', array('id'=>$row->getId())),
+ 'url' => $this->getUrl('adminhtml/*/resume', array('id'=>$row->getId())),
'caption' => __('Resume')
);
}
$actions[] = array(
- 'url' => $this->getUrl('*/newsletter_queue/preview',array('id'=>$row->getId())),
+ 'url' => $this->getUrl('adminhtml/newsletter_queue/preview',array('id'=>$row->getId())),
'caption' => __('Preview'),
'popup' => true
);
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Preview/Form.php b/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Preview/Form.php
index 221d0cf842f..5f7d41b5943 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Preview/Form.php
+++ b/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Preview/Form.php
@@ -46,7 +46,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
$form = $this->_formFactory->create(array(
'attributes' => array(
'id' => 'preview_form',
- 'action' => $this->getUrl('*/*/drop', array('_current' => true)),
+ 'action' => $this->getUrl('adminhtml/*/drop', array('_current' => true)),
'method' => 'post',
))
);
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template.php b/app/code/Magento/Adminhtml/Block/Newsletter/Template.php
index 1456be6267d..87842f7a1bf 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template.php
+++ b/app/code/Magento/Adminhtml/Block/Newsletter/Template.php
@@ -49,7 +49,7 @@ class Template extends \Magento\Adminhtml\Block\Template
public function getCreateUrl()
{
- return $this->getUrl('*/*/new');
+ return $this->getUrl('adminhtml/*/new');
}
public function getHeaderText()
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit.php b/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit.php
index eaa78cf951d..2c00dd14382 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit.php
+++ b/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit.php
@@ -98,7 +98,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
$this->addChild('back_button', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Back'),
- 'onclick' => "window.location.href = '" . $this->getUrl('*/*') . "'",
+ 'onclick' => "window.location.href = '" . $this->getUrl('adminhtml/*') . "'",
'class' => 'action-back'
));
@@ -295,7 +295,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
*/
public function getSaveUrl()
{
- return $this->getUrl('*/*/save');
+ return $this->getUrl('adminhtml/*/save');
}
/**
@@ -305,7 +305,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
*/
public function getPreviewUrl()
{
- return $this->getUrl('*/*/preview');
+ return $this->getUrl('adminhtml/*/preview');
}
/**
@@ -325,7 +325,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
*/
public function getDeleteUrl()
{
- return $this->getUrl('*/*/delete', array('id' => $this->getRequest()->getParam('id')));
+ return $this->getUrl('adminhtml/*/delete', array('id' => $this->getRequest()->getParam('id')));
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit/Form.php b/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit/Form.php
index d7156cbd223..3fc43a3f267 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit/Form.php
+++ b/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit/Form.php
@@ -169,7 +169,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
));
}
- $form->setAction($this->getUrl('*/*/save'));
+ $form->setAction($this->getUrl('adminhtml/*/save'));
$form->setUseContainer(true);
$this->setForm($form);
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid.php b/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid.php
index c47baf448d9..9c2f5ef483e 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid.php
+++ b/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid.php
@@ -152,7 +152,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
public function getRowUrl($row)
{
- return $this->getUrl('*/*/edit', array('id'=>$row->getId()));
+ return $this->getUrl('adminhtml/*/edit', array('id'=>$row->getId()));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php b/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php
index a1f598f9a7e..e30fbd8a666 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php
+++ b/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php
@@ -46,13 +46,13 @@ class Action extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Action
{
if($row->isValidForSend()) {
$actions[] = array(
- 'url' => $this->getUrl('*/newsletter_queue/edit', array('template_id' => $row->getId())),
+ 'url' => $this->getUrl('adminhtml/newsletter_queue/edit', array('template_id' => $row->getId())),
'caption' => __('Queue Newsletter...')
);
}
$actions[] = array(
- 'url' => $this->getUrl('*/*/preview', array('id'=>$row->getId())),
+ 'url' => $this->getUrl('adminhtml/*/preview', array('id'=>$row->getId())),
'popup' => true,
'caption' => __('Preview')
);
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview/Form.php b/app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview/Form.php
index 8c11c13b58b..77b03cd1cca 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview/Form.php
+++ b/app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview/Form.php
@@ -46,7 +46,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
$form = $this->_formFactory->create(array(
'attributes' => array(
'id' => 'preview_form',
- 'action' => $this->getUrl('*/*/drop', array('_current' => true)),
+ 'action' => $this->getUrl('adminhtml/*/drop', array('_current' => true)),
'method' => 'post',
))
);
diff --git a/app/code/Magento/Adminhtml/Block/Promo/Catalog.php b/app/code/Magento/Adminhtml/Block/Promo/Catalog.php
index bee39f9766c..f9fc07b8ba5 100644
--- a/app/code/Magento/Adminhtml/Block/Promo/Catalog.php
+++ b/app/code/Magento/Adminhtml/Block/Promo/Catalog.php
@@ -41,7 +41,7 @@ class Catalog extends \Magento\Backend\Block\Widget\Grid\Container
{
$this->_addButton('apply_rules', array(
'label' => __('Apply Rules'),
- 'onclick' => "location.href='".$this->getUrl('*/*/applyRules')."'",
+ 'onclick' => "location.href='".$this->getUrl('adminhtml/*/applyRules')."'",
'class' => 'apply',
));
diff --git a/app/code/Magento/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php b/app/code/Magento/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php
index fafd8b714c7..e6f427c74d9 100644
--- a/app/code/Magento/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php
+++ b/app/code/Magento/Adminhtml/Block/Promo/Catalog/Edit/Tab/Conditions.php
@@ -112,7 +112,7 @@ class Conditions
$form->setHtmlIdPrefix('rule_');
$renderer = $this->_rendererFieldset->setTemplate('Magento_Adminhtml::promo/fieldset.phtml')
- ->setNewChildUrl($this->getUrl('*/promo_catalog/newConditionHtml/form/rule_conditions_fieldset'));
+ ->setNewChildUrl($this->getUrl('adminhtml/promo_catalog/newConditionHtml/form/rule_conditions_fieldset'));
$fieldset = $form->addFieldset('conditions_fieldset', array(
'legend'=>__('Conditions (leave blank for all products)'))
diff --git a/app/code/Magento/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php b/app/code/Magento/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php
index c5a65cf9cb2..c28d674c100 100644
--- a/app/code/Magento/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php
+++ b/app/code/Magento/Adminhtml/Block/Promo/Quote/Edit/Tab/Actions.php
@@ -184,7 +184,7 @@ class Actions
$renderer = $this->_rendererFieldset
->setTemplate('Magento_Adminhtml::promo/fieldset.phtml')
- ->setNewChildUrl($this->getUrl('*/promo_quote/newActionHtml/form/rule_actions_fieldset'));
+ ->setNewChildUrl($this->getUrl('adminhtml/promo_quote/newActionHtml/form/rule_actions_fieldset'));
$fieldset = $form->addFieldset('actions_fieldset', array(
'legend'=>__('Apply the rule only to cart items matching the following conditions '
diff --git a/app/code/Magento/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php b/app/code/Magento/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php
index c169b45f54d..bc721411129 100644
--- a/app/code/Magento/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php
+++ b/app/code/Magento/Adminhtml/Block/Promo/Quote/Edit/Tab/Conditions.php
@@ -115,7 +115,7 @@ class Conditions
$renderer = $this->_rendererFieldset
->setTemplate('Magento_Adminhtml::promo/fieldset.phtml')
- ->setNewChildUrl($this->getUrl('*/promo_quote/newConditionHtml/form/rule_conditions_fieldset'));
+ ->setNewChildUrl($this->getUrl('adminhtml/promo_quote/newConditionHtml/form/rule_conditions_fieldset'));
$fieldset = $form->addFieldset('conditions_fieldset', array(
'legend'=>__('Apply the rule only if the following conditions are met (leave blank for all products).')
diff --git a/app/code/Magento/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Form.php b/app/code/Magento/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Form.php
index d239ba22e5a..83f3e2d3162 100644
--- a/app/code/Magento/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Form.php
+++ b/app/code/Magento/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Form.php
@@ -174,6 +174,6 @@ class Form
*/
public function getGenerateUrl()
{
- return $this->getUrl('*/*/generate');
+ return $this->getUrl('adminhtml/*/generate');
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php b/app/code/Magento/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php
index fddf409cc99..0afc803e579 100644
--- a/app/code/Magento/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php
+++ b/app/code/Magento/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php
@@ -163,7 +163,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
$this->getMassactionBlock()->addItem('delete', array(
'label'=> __('Delete'),
- 'url' => $this->getUrl('*/*/couponsMassDelete', array('_current' => true)),
+ 'url' => $this->getUrl('adminhtml/*/couponsMassDelete', array('_current' => true)),
'confirm' => __('Are you sure you want to delete the selected coupon(s)?'),
'complete' => 'refreshCouponCodesGrid'
));
@@ -178,6 +178,6 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
*/
public function getGridUrl()
{
- return $this->getUrl('*/*/couponsGrid', array('_current'=> true));
+ return $this->getUrl('adminhtml/*/couponsGrid', array('_current'=> true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Promo/Widget/Chooser.php b/app/code/Magento/Adminhtml/Block/Promo/Widget/Chooser.php
index de71ee563df..e3e726fb109 100644
--- a/app/code/Magento/Adminhtml/Block/Promo/Widget/Chooser.php
+++ b/app/code/Magento/Adminhtml/Block/Promo/Widget/Chooser.php
@@ -76,7 +76,7 @@ class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
public function prepareElementHtml(\Magento\Data\Form\Element\AbstractElement $element)
{
$uniqId = $this->_coreData->uniqHash($element->getId());
- $sourceUrl = $this->getUrl('*/promo_quote/chooser', array('uniq_id' => $uniqId));
+ $sourceUrl = $this->getUrl('adminhtml/promo_quote/chooser', array('uniq_id' => $uniqId));
$chooser = $this->getLayout()->createBlock('Magento\Widget\Block\Adminhtml\Widget\Chooser')
->setElement($element)
@@ -200,6 +200,6 @@ class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
*/
public function getGridUrl()
{
- return $this->getUrl('*/promo_quote/chooser', array('_current' => true));
+ return $this->getUrl('adminhtml/promo_quote/chooser', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Promo/Widget/Chooser/Sku.php b/app/code/Magento/Adminhtml/Block/Promo/Widget/Chooser/Sku.php
index ce0e442135c..482a4daf479 100644
--- a/app/code/Magento/Adminhtml/Block/Promo/Widget/Chooser/Sku.php
+++ b/app/code/Magento/Adminhtml/Block/Promo/Widget/Chooser/Sku.php
@@ -204,7 +204,7 @@ class Sku extends \Magento\Backend\Block\Widget\Grid\Extended
public function getGridUrl()
{
- return $this->getUrl('*/*/chooser', array(
+ return $this->getUrl('adminhtml/*/chooser', array(
'_current' => true,
'current_grid_id' => $this->getId(),
'collapse' => null
diff --git a/app/code/Magento/Adminhtml/Block/Report/Filter/Form.php b/app/code/Magento/Adminhtml/Block/Report/Filter/Form.php
index caa64205d7c..cd74153c9ab 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Filter/Form.php
+++ b/app/code/Magento/Adminhtml/Block/Report/Filter/Form.php
@@ -118,7 +118,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
*/
protected function _prepareForm()
{
- $actionUrl = $this->getUrl('*/*/sales');
+ $actionUrl = $this->getUrl('adminhtml/*/sales');
/** @var \Magento\Data\Form $form */
$form = $this->_formFactory->create(array(
diff --git a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php b/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php
index ed41e5fb004..89662e998c8 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php
+++ b/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php
@@ -52,7 +52,7 @@ class Customer
}
return sprintf('<a href="%s">%s</a>',
- $this->getUrl('*/catalog_product_review', array('customerId' => $id)),
+ $this->getUrl('adminhtml/catalog_product_review', array('customerId' => $id)),
__('Show Reviews')
);
}
diff --git a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php b/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php
index c3eb212662b..7e2f7e3381b 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php
+++ b/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php
@@ -48,7 +48,7 @@ class Product
$id = $row->getId();
return sprintf('<a href="%s">%s</a>',
- $this->getUrl('*/catalog_product_review/', array('productId' => $id)),
+ $this->getUrl('catalog/product_review/', array('productId' => $id)),
__('Show Reviews')
);
}
diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Downloads.php b/app/code/Magento/Adminhtml/Block/Report/Product/Downloads.php
index 0b8c1ea551b..469f8fa7bb7 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Product/Downloads.php
+++ b/app/code/Magento/Adminhtml/Block/Report/Product/Downloads.php
@@ -49,7 +49,7 @@ class Downloads extends \Magento\Adminhtml\Block\Widget\Grid\Container
$this->setChild('store_switcher',
$this->getLayout()->createBlock('Magento\Backend\Block\Store\Switcher')
->setUseConfirm(false)
- ->setSwitchUrl($this->getUrl('*/*/*', array('store'=>null)))
+ ->setSwitchUrl($this->getUrl('adminhtml/*/*', array('store'=>null)))
->setTemplate('Magento_Reports::store/switcher.phtml')
);
return parent::_prepareLayout();
diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Lowstock.php b/app/code/Magento/Adminhtml/Block/Report/Product/Lowstock.php
index ad0501103f1..83c2f2736d9 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Product/Lowstock.php
+++ b/app/code/Magento/Adminhtml/Block/Report/Product/Lowstock.php
@@ -49,7 +49,7 @@ class Lowstock extends \Magento\Adminhtml\Block\Widget\Grid\Container
$this->setChild('store_switcher',
$this->getLayout()->createBlock('Magento\Backend\Block\Store\Switcher')
->setUseConfirm(false)
- ->setSwitchUrl($this->getUrl('*/*/*', array('store'=>null)))
+ ->setSwitchUrl($this->getUrl('adminhtml/*/*', array('store'=>null)))
->setTemplate('Magento_Reports::store/switcher.phtml')
);
diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Viewed.php b/app/code/Magento/Adminhtml/Block/Report/Product/Viewed.php
index 851be435986..5e4d81c4b90 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Product/Viewed.php
+++ b/app/code/Magento/Adminhtml/Block/Report/Product/Viewed.php
@@ -60,6 +60,6 @@ class Viewed extends \Magento\Adminhtml\Block\Widget\Grid\Container
public function getFilterUrl()
{
$this->getRequest()->setParam('filter', null);
- return $this->getUrl('*/*/viewed', array('_current' => true));
+ return $this->getUrl('adminhtml/*/viewed', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Report/Review/Detail.php b/app/code/Magento/Adminhtml/Block/Report/Review/Detail.php
index 3ee3367c110..2164a5c5778 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Review/Detail.php
+++ b/app/code/Magento/Adminhtml/Block/Report/Review/Detail.php
@@ -66,7 +66,7 @@ class Detail extends \Magento\Adminhtml\Block\Widget\Grid\Container
parent::_construct();
$this->_removeButton('add');
- $this->setBackUrl($this->getUrl('*/report_review/product/'));
+ $this->setBackUrl($this->getUrl('adminhtml/report_review/product/'));
$this->_addBackButton();
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Bestsellers.php b/app/code/Magento/Adminhtml/Block/Report/Sales/Bestsellers.php
index 9394d394476..6bf1712a65c 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Bestsellers.php
+++ b/app/code/Magento/Adminhtml/Block/Report/Sales/Bestsellers.php
@@ -55,6 +55,6 @@ class Bestsellers extends \Magento\Adminhtml\Block\Widget\Grid\Container
public function getFilterUrl()
{
$this->getRequest()->setParam('filter', null);
- return $this->getUrl('*/*/bestsellers', array('_current' => true));
+ return $this->getUrl('adminhtml/*/bestsellers', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Coupons.php b/app/code/Magento/Adminhtml/Block/Report/Sales/Coupons.php
index b8a12611a45..e02617e9355 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Coupons.php
+++ b/app/code/Magento/Adminhtml/Block/Report/Sales/Coupons.php
@@ -55,6 +55,6 @@ class Coupons extends \Magento\Adminhtml\Block\Widget\Grid\Container
public function getFilterUrl()
{
$this->getRequest()->setParam('filter', null);
- return $this->getUrl('*/*/coupons', array('_current' => true));
+ return $this->getUrl('adminhtml/*/coupons', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Invoiced.php b/app/code/Magento/Adminhtml/Block/Report/Sales/Invoiced.php
index 740f2b610b3..e3a3d2c588c 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Invoiced.php
+++ b/app/code/Magento/Adminhtml/Block/Report/Sales/Invoiced.php
@@ -55,6 +55,6 @@ class Invoiced extends \Magento\Adminhtml\Block\Widget\Grid\Container
public function getFilterUrl()
{
$this->getRequest()->setParam('filter', null);
- return $this->getUrl('*/*/invoiced', array('_current' => true));
+ return $this->getUrl('adminhtml/*/invoiced', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Refunded.php b/app/code/Magento/Adminhtml/Block/Report/Sales/Refunded.php
index 848534dbc1f..79a81c0ecb5 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Refunded.php
+++ b/app/code/Magento/Adminhtml/Block/Report/Sales/Refunded.php
@@ -55,6 +55,6 @@ class Refunded extends \Magento\Adminhtml\Block\Widget\Grid\Container
public function getFilterUrl()
{
$this->getRequest()->setParam('filter', null);
- return $this->getUrl('*/*/refunded', array('_current' => true));
+ return $this->getUrl('adminhtml/*/refunded', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Sales.php b/app/code/Magento/Adminhtml/Block/Report/Sales/Sales.php
index 51b9908d609..28b260bc3c1 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Sales.php
+++ b/app/code/Magento/Adminhtml/Block/Report/Sales/Sales.php
@@ -55,6 +55,6 @@ class Sales extends \Magento\Adminhtml\Block\Widget\Grid\Container
public function getFilterUrl()
{
$this->getRequest()->setParam('filter', null);
- return $this->getUrl('*/*/sales', array('_current' => true));
+ return $this->getUrl('adminhtml/*/sales', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Shipping.php b/app/code/Magento/Adminhtml/Block/Report/Sales/Shipping.php
index 780be63ff8e..670b0e14299 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Shipping.php
+++ b/app/code/Magento/Adminhtml/Block/Report/Sales/Shipping.php
@@ -56,6 +56,6 @@ class Shipping extends \Magento\Adminhtml\Block\Widget\Grid\Container
public function getFilterUrl()
{
$this->getRequest()->setParam('filter', null);
- return $this->getUrl('*/*/shipping', array('_current' => true));
+ return $this->getUrl('adminhtml/*/shipping', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Tax.php b/app/code/Magento/Adminhtml/Block/Report/Sales/Tax.php
index 7f5bd34e2b2..b34b879ca8b 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Tax.php
+++ b/app/code/Magento/Adminhtml/Block/Report/Sales/Tax.php
@@ -56,7 +56,7 @@ class Tax extends \Magento\Adminhtml\Block\Widget\Grid\Container
public function getFilterUrl()
{
$this->getRequest()->setParam('filter', null);
- return $this->getUrl('*/*/tax', array('_current' => true));
+ return $this->getUrl('adminhtml/*/tax', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned.php b/app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned.php
index 214b19e5177..355beef2364 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned.php
+++ b/app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned.php
@@ -49,7 +49,7 @@ class Abandoned extends \Magento\Adminhtml\Block\Widget\Grid\Container
$this->setChild('store_switcher',
$this->getLayout()->createBlock('Magento\Backend\Block\Store\Switcher')
->setUseConfirm(false)
- ->setSwitchUrl($this->getUrl('*/*/*', array('store'=>null)))
+ ->setSwitchUrl($this->getUrl('adminhtml/*/*', array('store'=>null)))
->setTemplate('Magento_Reports::store/switcher.phtml')
);
diff --git a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php b/app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php
index da12662e9a9..08e6dd3f3e1 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php
+++ b/app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php
@@ -204,6 +204,6 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\Shopcart
public function getRowUrl($row)
{
- return $this->getUrl('*/customer/edit', array('id'=>$row->getCustomerId(), 'active_tab'=>'cart'));
+ return $this->getUrl('adminhtml/customer/edit', array('id'=>$row->getCustomerId(), 'active_tab'=>'cart'));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Product/Grid.php b/app/code/Magento/Adminhtml/Block/Report/Shopcart/Product/Grid.php
index 2e6ec7cbae1..b755b3e65c6 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Product/Grid.php
+++ b/app/code/Magento/Adminhtml/Block/Report/Shopcart/Product/Grid.php
@@ -132,7 +132,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\Shopcart
public function getRowUrl($row)
{
- return $this->getUrl('*/catalog_product/edit', array('id'=>$row->getEntityId()));
+ return $this->getUrl('catalog/product/edit', array('id'=>$row->getEntityId()));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Review/Add.php b/app/code/Magento/Adminhtml/Block/Review/Add.php
index 2609bdfff98..085fa08ffbe 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Add.php
+++ b/app/code/Magento/Adminhtml/Block/Review/Add.php
@@ -91,7 +91,7 @@ class Add extends \Magento\Adminhtml\Block\Widget\Form\Container
if (!params.form_key) {
params.form_key = FORM_KEY;
}
- new Ajax.Updater("rating_detail", "'.$this->getUrl('*/*/ratingItems').'", {parameters:params, evalScripts: true, onComplete:function(){ $(\'save_button\').disabled = false; } });
+ new Ajax.Updater("rating_detail", "'.$this->getUrl('catalog/*/ratingItems').'", {parameters:params, evalScripts: true, onComplete:function(){ $(\'save_button\').disabled = false; } });
},
reqSuccess :function(o) {
@@ -101,7 +101,7 @@ class Add extends \Magento\Adminhtml\Block\Widget\Form\Container
} else if( response.id ){
$("product_id").value = response.id;
- $("product_name").innerHTML = \'<a href="' . $this->getUrl('*/catalog_product/edit') . 'id/\' + response.id + \'" target="_blank">\' + response.name + \'</a>\';
+ $("product_name").innerHTML = \'<a href="' . $this->getUrl('catalog/product/edit') . 'id/\' + response.id + \'" target="_blank">\' + response.name + \'</a>\';
} else if( response.message ) {
alert(response.message);
}
diff --git a/app/code/Magento/Adminhtml/Block/Review/Add/Form.php b/app/code/Magento/Adminhtml/Block/Review/Add/Form.php
index 7a54b5db6f3..9df6b28ad36 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Add/Form.php
+++ b/app/code/Magento/Adminhtml/Block/Review/Add/Form.php
@@ -149,7 +149,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
$form->setMethod('post');
$form->setUseContainer(true);
$form->setId('edit_form');
- $form->setAction($this->getUrl('*/*/post'));
+ $form->setAction($this->getUrl('catalog/*/post'));
$this->setForm($form);
}
diff --git a/app/code/Magento/Adminhtml/Block/Review/Edit.php b/app/code/Magento/Adminhtml/Block/Review/Edit.php
index c5435ac0bdd..820a22e7757 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Edit.php
+++ b/app/code/Magento/Adminhtml/Block/Review/Edit.php
@@ -89,7 +89,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
if ($prevId !== false) {
$this->addButton('previous', array(
'label' => __('Previous'),
- 'onclick' => 'setLocation(\'' . $this->getUrl('*/*/*', array('id' => $prevId)) . '\')'
+ 'onclick' => 'setLocation(\'' . $this->getUrl('adminhtml/*/*', array('id' => $prevId)) . '\')'
), 3, 10);
$this->addButton('save_and_previous', array(
@@ -131,7 +131,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
$this->addButton('next', array(
'label' => __('Next'),
- 'onclick' => 'setLocation(\'' . $this->getUrl('*/*/*', array('id' => $nextId)) . '\')'
+ 'onclick' => 'setLocation(\'' . $this->getUrl('adminhtml/*/*', array('id' => $nextId)) . '\')'
), 3, 105);
}
$this->_updateButton('save', 'label', __('Save Review'));
@@ -144,7 +144,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
'onclick',
'setLocation(\''
. $this->getUrl(
- '*/catalog_product/edit',
+ 'catalog/product/edit',
array('id' => $this->getRequest()->getParam('productId', false))
)
.'\')'
@@ -157,7 +157,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
'onclick',
'setLocation(\''
. $this->getUrl(
- '*/customer/edit',
+ 'adminhtml/customer/edit',
array('id' => $this->getRequest()->getParam('customerId', false))
)
.'\')'
@@ -165,7 +165,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
}
if ($this->getRequest()->getParam('ret', false) == 'pending') {
- $this->_updateButton('back', 'onclick', 'setLocation(\'' . $this->getUrl('*/*/pending') .'\')' );
+ $this->_updateButton('back', 'onclick', 'setLocation(\'' . $this->getUrl('adminhtml/*/pending') .'\')' );
$this->_updateButton(
'delete',
'onclick',
@@ -199,7 +199,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
$(\'save_button\').disabled = true;
new Ajax.Updater(
"rating_detail",
- "' . $this->getUrl('*/*/ratingItems', array('_current'=>true)).'",
+ "' . $this->getUrl('catalog/*/ratingItems', array('_current'=>true)).'",
{
parameters:Form.serializeElements(elements),
evalScripts:true,
diff --git a/app/code/Magento/Adminhtml/Block/Review/Edit/Form.php b/app/code/Magento/Adminhtml/Block/Review/Edit/Form.php
index 671c1e74ec4..99a6bb12641 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Edit/Form.php
+++ b/app/code/Magento/Adminhtml/Block/Review/Edit/Form.php
@@ -92,7 +92,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
$form = $this->_formFactory->create(array(
'attributes' => array(
'id' => 'edit_form',
- 'action' => $this->getUrl('*/*/save', array(
+ 'action' => $this->getUrl('catalog/*/save', array(
'id' => $this->getRequest()->getParam('id'),
'ret' => $this->_coreRegistry->registry('ret')
)),
@@ -107,13 +107,13 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
$fieldset->addField('product_name', 'note', array(
'label' => __('Product'),
- 'text' => '<a href="' . $this->getUrl('*/catalog_product/edit', array('id' => $product->getId()))
+ 'text' => '<a href="' . $this->getUrl('catalog/product/edit', array('id' => $product->getId()))
. '" onclick="this.target=\'blank\'">' . $this->_reviewData->escapeHtml($product->getName()) . '</a>'
));
if ($customer->getId()) {
$customerText = __('<a href="%1" onclick="this.target=\'blank\'">%2 %3</a> <a href="mailto:%4">(%4)</a>',
- $this->getUrl('*/customer/edit', array('id' => $customer->getId(), 'active_tab'=>'review')),
+ $this->getUrl('adminhtml/customer/edit', array('id' => $customer->getId(), 'active_tab'=>'review')),
$this->escapeHtml($customer->getFirstname()),
$this->escapeHtml($customer->getLastname()),
$this->escapeHtml($customer->getEmail()));
diff --git a/app/code/Magento/Adminhtml/Block/Review/Grid.php b/app/code/Magento/Adminhtml/Block/Review/Grid.php
index 422de7c253f..54ed13592fd 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Grid.php
+++ b/app/code/Magento/Adminhtml/Block/Review/Grid.php
@@ -285,7 +285,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
array(
'caption' => __('Edit'),
'url' => array(
- 'base'=>'*/catalog_product_review/edit',
+ 'base'=>'catalog/product_review/edit',
'params'=> array(
'productId' => $this->getProductId(),
'customerId' => $this->getCustomerId(),
@@ -353,7 +353,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
*/
public function getRowUrl($row)
{
- return $this->getUrl('*/catalog_product_review/edit', array(
+ return $this->getUrl('catalog/product_review/edit', array(
'id' => $row->getReviewId(),
'productId' => $this->getProductId(),
'customerId' => $this->getCustomerId(),
@@ -370,7 +370,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
{
if ($this->getProductId() || $this->getCustomerId()) {
return $this->getUrl(
- '*/catalog_product_review/' . ($this->_coreRegistry->registry('usePendingFilter') ? 'pending' : ''),
+ 'catalog/product_review/' . ($this->_coreRegistry->registry('usePendingFilter') ? 'pending' : ''),
array(
'productId' => $this->getProductId(),
'customerId' => $this->getCustomerId(),
diff --git a/app/code/Magento/Adminhtml/Block/Review/Product/Grid.php b/app/code/Magento/Adminhtml/Block/Review/Product/Grid.php
index d2c5eae9314..3210efe0633 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Product/Grid.php
+++ b/app/code/Magento/Adminhtml/Block/Review/Product/Grid.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Block\Review\Product;
-class Grid extends \Magento\Adminhtml\Block\Catalog\Product\Grid
+class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
{
/**
* @var \Magento\Core\Model\Resource\Website\CollectionFactory
@@ -152,12 +152,12 @@ class Grid extends \Magento\Adminhtml\Block\Catalog\Product\Grid
public function getGridUrl()
{
- return $this->getUrl('*/*/productGrid', array('_current'=>true));
+ return $this->getUrl('catalog/*/productGrid', array('_current'=>true));
}
public function getRowUrl($row)
{
- return $this->getUrl('*/*/jsonProductInfo', array('id' => $row->getId()));
+ return $this->getUrl('catalog/*/jsonProductInfo', array('id' => $row->getId()));
}
protected function _prepareMassaction()
diff --git a/app/code/Magento/Adminhtml/Block/Review/Rating/Detailed.php b/app/code/Magento/Adminhtml/Block/Review/Rating/Detailed.php
index 6ebae97813e..8c464d1a724 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Rating/Detailed.php
+++ b/app/code/Magento/Adminhtml/Block/Review/Rating/Detailed.php
@@ -33,7 +33,7 @@ class Detailed extends \Magento\Adminhtml\Block\Template
{
protected $_voteCollection = false;
- protected $_template = 'rating/detailed.phtml';
+ protected $_template = 'Magento_Rating::rating/detailed.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Adminhtml/Block/Review/Rating/Summary.php b/app/code/Magento/Adminhtml/Block/Review/Rating/Summary.php
index 0f342113f2a..b3d99b87b30 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Rating/Summary.php
+++ b/app/code/Magento/Adminhtml/Block/Review/Rating/Summary.php
@@ -31,7 +31,7 @@ namespace Magento\Adminhtml\Block\Review\Rating;
class Summary extends \Magento\Adminhtml\Block\Template
{
- protected $_template = 'rating/stars/summary.phtml';
+ protected $_template = 'Magento_Rating::rating/stars/summary.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php b/app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php
index 13696b202d3..754750d651e 100644
--- a/app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php
+++ b/app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php
@@ -37,7 +37,7 @@ class Action extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Action
public function render(\Magento\Object $row)
{
$this->getColumn()->setActions(array(array(
- 'url' => $this->getUrl('*/sitemap/generate', array('sitemap_id' => $row->getSitemapId())),
+ 'url' => $this->getUrl('adminhtml/sitemap/generate', array('sitemap_id' => $row->getSitemapId())),
'caption' => __('Generate'),
)));
return parent::render($row);
diff --git a/app/code/Magento/Adminhtml/Block/System/Account/Edit/Form.php b/app/code/Magento/Adminhtml/Block/System/Account/Edit/Form.php
index 52d5c7ee6b6..fadde160eba 100644
--- a/app/code/Magento/Adminhtml/Block/System/Account/Edit/Form.php
+++ b/app/code/Magento/Adminhtml/Block/System/Account/Edit/Form.php
@@ -134,7 +134,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
));
$form->setValues($user->getData());
- $form->setAction($this->getUrl('*/system_account/save'));
+ $form->setAction($this->getUrl('adminhtml/system_account/save'));
$form->setMethod('post');
$form->setUseContainer(true);
$form->setId('edit_form');
diff --git a/app/code/Magento/Adminhtml/Block/System/Cache/Edit.php b/app/code/Magento/Adminhtml/Block/System/Cache/Edit.php
index c8b3fc83707..c31263adf6c 100644
--- a/app/code/Magento/Adminhtml/Block/System/Cache/Edit.php
+++ b/app/code/Magento/Adminhtml/Block/System/Cache/Edit.php
@@ -66,7 +66,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
public function getSaveUrl()
{
- return $this->getUrl('*/*/save', array('_current'=>true));
+ return $this->getUrl('adminhtml/*/save', array('_current'=>true));
}
public function initForm()
diff --git a/app/code/Magento/Adminhtml/Block/System/Design.php b/app/code/Magento/Adminhtml/Block/System/Design.php
index 225a9b58fe0..c627207bfc9 100644
--- a/app/code/Magento/Adminhtml/Block/System/Design.php
+++ b/app/code/Magento/Adminhtml/Block/System/Design.php
@@ -35,7 +35,7 @@ class Design extends \Magento\Adminhtml\Block\Template
$this->addChild('add_new_button', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Add Design Change'),
- 'onclick' => "setLocation('".$this->getUrl('*/*/new')."')",
+ 'onclick' => "setLocation('".$this->getUrl('adminhtml/*/new')."')",
'class' => 'add'
));
diff --git a/app/code/Magento/Adminhtml/Block/System/Design/Edit.php b/app/code/Magento/Adminhtml/Block/System/Design/Edit.php
index f2b2cb5d2af..f91ca37a681 100644
--- a/app/code/Magento/Adminhtml/Block/System/Design/Edit.php
+++ b/app/code/Magento/Adminhtml/Block/System/Design/Edit.php
@@ -65,7 +65,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
{
$this->addChild('back_button', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Back'),
- 'onclick' => 'setLocation(\'' . $this->getUrl('*/*/') . '\')',
+ 'onclick' => 'setLocation(\'' . $this->getUrl('adminhtml/*/') . '\')',
'class' => 'back'
));
@@ -94,17 +94,17 @@ class Edit extends \Magento\Adminhtml\Block\Widget
public function getDeleteUrl()
{
- return $this->getUrl('*/*/delete', array('_current'=>true));
+ return $this->getUrl('adminhtml/*/delete', array('_current'=>true));
}
public function getSaveUrl()
{
- return $this->getUrl('*/*/save', array('_current'=>true));
+ return $this->getUrl('adminhtml/*/save', array('_current'=>true));
}
public function getValidationUrl()
{
- return $this->getUrl('*/*/validate', array('_current'=>true));
+ return $this->getUrl('adminhtml/*/validate', array('_current'=>true));
}
public function getHeader()
diff --git a/app/code/Magento/Adminhtml/Block/System/Email/Template.php b/app/code/Magento/Adminhtml/Block/System/Email/Template.php
index 0b5da0dfa05..944913eaf2d 100644
--- a/app/code/Magento/Adminhtml/Block/System/Email/Template.php
+++ b/app/code/Magento/Adminhtml/Block/System/Email/Template.php
@@ -62,7 +62,7 @@ class Template extends \Magento\Adminhtml\Block\Template
*/
public function getCreateUrl()
{
- return $this->getUrl('*/*/new');
+ return $this->getUrl('adminhtml/*/new');
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/System/Email/Template/Edit.php b/app/code/Magento/Adminhtml/Block/System/Email/Template/Edit.php
index ad31e0d4e9f..d1cd8171a56 100644
--- a/app/code/Magento/Adminhtml/Block/System/Email/Template/Edit.php
+++ b/app/code/Magento/Adminhtml/Block/System/Email/Template/Edit.php
@@ -95,7 +95,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
->setData(
array(
'label' => __('Back'),
- 'onclick' => "window.location.href = '" . $this->getUrl('*/*') . "'",
+ 'onclick' => "window.location.href = '" . $this->getUrl('adminhtml/*') . "'",
'class' => 'back'
)
)
@@ -316,7 +316,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
*/
public function getSaveUrl()
{
- return $this->getUrl('*/*/save', array('_current' => true));
+ return $this->getUrl('adminhtml/*/save', array('_current' => true));
}
/**
@@ -326,7 +326,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
*/
public function getPreviewUrl()
{
- return $this->getUrl('*/*/preview');
+ return $this->getUrl('adminhtml/*/preview');
}
public function isTextType()
@@ -341,7 +341,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
*/
public function getDeleteUrl()
{
- return $this->getUrl('*/*/delete', array('_current' => true));
+ return $this->getUrl('adminhtml/*/delete', array('_current' => true));
}
/**
@@ -361,7 +361,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
*/
public function getLoadUrl()
{
- return $this->getUrl('*/*/defaultTemplate');
+ return $this->getUrl('adminhtml/*/defaultTemplate');
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php b/app/code/Magento/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php
index e5966d309e3..55ff7edcd49 100644
--- a/app/code/Magento/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php
+++ b/app/code/Magento/Adminhtml/Block/System/Email/Template/Grid/Renderer/Action.php
@@ -41,7 +41,7 @@ class Action extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Action
$actions = array();
$actions[] = array(
- 'url' => $this->getUrl('*/*/preview', array('id'=>$row->getId())),
+ 'url' => $this->getUrl('adminhtml/*/preview', array('id'=>$row->getId())),
'popup' => true,
'caption' => __('Preview')
);
diff --git a/app/code/Magento/Adminhtml/Block/System/Store/Delete/Group.php b/app/code/Magento/Adminhtml/Block/System/Store/Delete/Group.php
index 9ffbe45259e..3c9bf889bca 100644
--- a/app/code/Magento/Adminhtml/Block/System/Store/Delete/Group.php
+++ b/app/code/Magento/Adminhtml/Block/System/Store/Delete/Group.php
@@ -41,13 +41,13 @@ class Group extends \Magento\Adminhtml\Block\Template
$itemId = $this->getRequest()->getParam('group_id');
$this->setTemplate('system/store/delete_group.phtml');
- $this->setAction($this->getUrl('*/*/deleteGroupPost', array('group_id'=>$itemId)));
+ $this->setAction($this->getUrl('adminhtml/*/deleteGroupPost', array('group_id'=>$itemId)));
$this->addChild('confirm_deletion_button', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Delete Store'),
'onclick' => "deleteForm.submit()",
'class' => 'cancel'
));
- $onClick = "setLocation('".$this->getUrl('*/*/editGroup', array('group_id'=>$itemId))."')";
+ $onClick = "setLocation('".$this->getUrl('adminhtml/*/editGroup', array('group_id'=>$itemId))."')";
$this->addChild('cancel_button', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Cancel'),
'onclick' => $onClick,
diff --git a/app/code/Magento/Adminhtml/Block/System/Store/Delete/Website.php b/app/code/Magento/Adminhtml/Block/System/Store/Delete/Website.php
index bc231149e94..e3a36bf3237 100644
--- a/app/code/Magento/Adminhtml/Block/System/Store/Delete/Website.php
+++ b/app/code/Magento/Adminhtml/Block/System/Store/Delete/Website.php
@@ -41,13 +41,13 @@ class Website extends \Magento\Adminhtml\Block\Template
$itemId = $this->getRequest()->getParam('website_id');
$this->setTemplate('system/store/delete_website.phtml');
- $this->setAction($this->getUrl('*/*/deleteWebsitePost', array('website_id'=>$itemId)));
+ $this->setAction($this->getUrl('adminhtml/*/deleteWebsitePost', array('website_id'=>$itemId)));
$this->addChild('confirm_deletion_button', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Delete Web Site'),
'onclick' => "deleteForm.submit()",
'class' => 'cancel'
));
- $onClick = "setLocation('".$this->getUrl('*/*/editWebsite', array('website_id'=>$itemId))."')";
+ $onClick = "setLocation('".$this->getUrl('adminhtml/*/editWebsite', array('website_id'=>$itemId))."')";
$this->addChild('cancel_button', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Cancel'),
'onclick' => $onClick,
diff --git a/app/code/Magento/Adminhtml/Block/System/Store/Edit/AbstractForm.php b/app/code/Magento/Adminhtml/Block/System/Store/Edit/AbstractForm.php
index d7ff77d57c2..868357a09ac 100644
--- a/app/code/Magento/Adminhtml/Block/System/Store/Edit/AbstractForm.php
+++ b/app/code/Magento/Adminhtml/Block/System/Store/Edit/AbstractForm.php
@@ -77,7 +77,7 @@ abstract class AbstractForm extends \Magento\Backend\Block\Widget\Form\Generic
'value' => $this->_coreRegistry->registry('store_action')
));
- $form->setAction($this->getUrl('*/*/save'));
+ $form->setAction($this->getUrl('adminhtml/*/save'));
$form->setUseContainer(true);
$this->setForm($form);
diff --git a/app/code/Magento/Adminhtml/Block/System/Store/Grid/Render/Group.php b/app/code/Magento/Adminhtml/Block/System/Store/Grid/Render/Group.php
index f58e9b81ab3..f5a4b8b06d0 100644
--- a/app/code/Magento/Adminhtml/Block/System/Store/Grid/Render/Group.php
+++ b/app/code/Magento/Adminhtml/Block/System/Store/Grid/Render/Group.php
@@ -43,7 +43,7 @@ class Group
return null;
}
return '<a title="' . __('Edit Store') . '"
- href="' . $this->getUrl('*/*/editGroup', array('group_id' => $row->getGroupId())) . '">'
+ href="' . $this->getUrl('adminhtml/*/editGroup', array('group_id' => $row->getGroupId())) . '">'
. $this->escapeHtml($row->getData($this->getColumn()->getIndex())) . '</a>';
}
}
diff --git a/app/code/Magento/Adminhtml/Block/System/Store/Grid/Render/Store.php b/app/code/Magento/Adminhtml/Block/System/Store/Grid/Render/Store.php
index ead77a72d31..bb95effa01a 100644
--- a/app/code/Magento/Adminhtml/Block/System/Store/Grid/Render/Store.php
+++ b/app/code/Magento/Adminhtml/Block/System/Store/Grid/Render/Store.php
@@ -43,7 +43,7 @@ class Store
return null;
}
return '<a title="' . __('Edit Store View') . '"
- href="' . $this->getUrl('*/*/editStore', array('store_id' => $row->getStoreId())) . '">'
+ href="' . $this->getUrl('adminhtml/*/editStore', array('store_id' => $row->getStoreId())) . '">'
. $this->escapeHtml($row->getData($this->getColumn()->getIndex())) . '</a>';
}
}
diff --git a/app/code/Magento/Adminhtml/Block/System/Store/Grid/Render/Website.php b/app/code/Magento/Adminhtml/Block/System/Store/Grid/Render/Website.php
index b746550fc36..ca6ddc77fb9 100644
--- a/app/code/Magento/Adminhtml/Block/System/Store/Grid/Render/Website.php
+++ b/app/code/Magento/Adminhtml/Block/System/Store/Grid/Render/Website.php
@@ -41,7 +41,7 @@ class Website
public function render(\Magento\Object $row)
{
return '<a title="' . __('Edit Web Site') . '"
- href="' . $this->getUrl('*/*/editWebsite', array('website_id' => $row->getWebsiteId())) . '">'
+ href="' . $this->getUrl('adminhtml/*/editWebsite', array('website_id' => $row->getWebsiteId())) . '">'
. $this->escapeHtml($row->getData($this->getColumn()->getIndex())) . '</a>';
}
diff --git a/app/code/Magento/Adminhtml/Block/System/Store/Store.php b/app/code/Magento/Adminhtml/Block/System/Store/Store.php
index cbfbee6ba75..5358ead9a6f 100644
--- a/app/code/Magento/Adminhtml/Block/System/Store/Store.php
+++ b/app/code/Magento/Adminhtml/Block/System/Store/Store.php
@@ -52,19 +52,19 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Container
{
/* Update default add button to add website button */
$this->_updateButton('add', 'label', __('Create Website'));
- $this->_updateButton('add', 'onclick', "setLocation('" . $this->getUrl('*/*/newWebsite') . "')");
+ $this->_updateButton('add', 'onclick', "setLocation('" . $this->getUrl('adminhtml/*/newWebsite') . "')");
/* Add Store Group button */
$this->_addButton('add_group', array(
'label' => __('Create Store'),
- 'onclick' => 'setLocation(\'' . $this->getUrl('*/*/newGroup') .'\')',
+ 'onclick' => 'setLocation(\'' . $this->getUrl('adminhtml/*/newGroup') .'\')',
'class' => 'add',
));
/* Add Store button */
$this->_addButton('add_store', array(
'label' => __('Create Store View'),
- 'onclick' => 'setLocation(\'' . $this->getUrl('*/*/newStore') . '\')',
+ 'onclick' => 'setLocation(\'' . $this->getUrl('adminhtml/*/newStore') . '\')',
'class' => 'add',
));
diff --git a/app/code/Magento/Adminhtml/Block/System/Variable/Edit.php b/app/code/Magento/Adminhtml/Block/System/Variable/Edit.php
index 6af55e2e56f..42a702ee9c5 100644
--- a/app/code/Magento/Adminhtml/Block/System/Variable/Edit.php
+++ b/app/code/Magento/Adminhtml/Block/System/Variable/Edit.php
@@ -136,7 +136,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
*/
public function getValidationUrl()
{
- return $this->getUrl('*/*/validate', array('_current'=>true));
+ return $this->getUrl('adminhtml/*/validate', array('_current'=>true));
}
/**
@@ -146,7 +146,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
*/
public function getSaveUrl()
{
- return $this->getUrl('*/*/save', array('_current' => true, 'back' => null));
+ return $this->getUrl('adminhtml/*/save', array('_current' => true, 'back' => null));
}
/**
@@ -156,6 +156,6 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
*/
public function getSaveAndContinueUrl()
{
- return $this->getUrl('*/*/save', array('_current' => true, 'back' => 'edit'));
+ return $this->getUrl('adminhtml/*/save', array('_current' => true, 'back' => 'edit'));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Urlrewrite.php b/app/code/Magento/Adminhtml/Block/Urlrewrite.php
index b00e5a43fc5..12c52c2fa0d 100644
--- a/app/code/Magento/Adminhtml/Block/Urlrewrite.php
+++ b/app/code/Magento/Adminhtml/Block/Urlrewrite.php
@@ -85,7 +85,7 @@ class Urlrewrite extends \Magento\Adminhtml\Block\Widget\Grid\Container
*/
public function getCreateUrl()
{
- $url = $this->getUrl('*/*/edit');
+ $url = $this->getUrl('adminhtml/*/edit');
$selectorBlock = $this->getSelectorBlock();
if ($selectorBlock === null) {
diff --git a/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Category/Edit.php b/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Category/Edit.php
index e3bbad2a201..eb63830d34a 100644
--- a/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Category/Edit.php
+++ b/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Category/Edit.php
@@ -79,7 +79,7 @@ class Edit
if ($this->_getCategory()->getId()) {
$this->_addCategoryLinkBlock();
$this->_addEditFormBlock();
- $this->_updateBackButtonLink($this->_adminhtmlData->getUrl('*/*/edit') . 'category');
+ $this->_updateBackButtonLink($this->_adminhtmlData->getUrl('adminhtml/*/edit') . 'category');
} else {
$this->_addUrlRewriteSelectorBlock();
$this->_addCategoryTreeBlock();
@@ -105,7 +105,7 @@ class Edit
private function _addCategoryLinkBlock()
{
$this->addChild('category_link', 'Magento\Adminhtml\Block\Urlrewrite\Link', array(
- 'item_url' => $this->_adminhtmlData->getUrl('*/*/*') . 'category',
+ 'item_url' => $this->_adminhtmlData->getUrl('adminhtml/*/*') . 'category',
'item_name' => $this->_getCategory()->getName(),
'label' => __('Category:')
));
diff --git a/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Category/Tree.php b/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Category/Tree.php
index 245874495c3..112b806b4f9 100644
--- a/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Category/Tree.php
+++ b/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Category/Tree.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Block\Urlrewrite\Catalog\Category;
-class Tree extends \Magento\Adminhtml\Block\Catalog\Category\AbstractCategory
+class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
{
/**
* List of allowed category ids
@@ -185,6 +185,6 @@ class Tree extends \Magento\Adminhtml\Block\Catalog\Category\AbstractCategory
*/
public function getLoadTreeUrl()
{
- return $this->_adminhtmlData->getUrl('*/*/categoriesJson');
+ return $this->_adminhtmlData->getUrl('adminhtml/*/categoriesJson');
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Edit/Form.php b/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Edit/Form.php
index 61c9ef8281f..55b7614b3f6 100644
--- a/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Edit/Form.php
+++ b/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Edit/Form.php
@@ -113,7 +113,7 @@ class Form extends \Magento\Adminhtml\Block\Urlrewrite\Edit\Form
{
// Set form action
$form->setAction(
- $this->_adminhtmlData->getUrl('*/*/save', array(
+ $this->_adminhtmlData->getUrl('adminhtml/*/save', array(
'id' => $this->_getModel()->getId(),
'product' => $this->_getProduct()->getId(),
'category' => $this->_getCategory()->getId()
diff --git a/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Product/Edit.php b/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Product/Edit.php
index 1760306c171..96799d5401e 100644
--- a/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Product/Edit.php
+++ b/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Product/Edit.php
@@ -99,13 +99,13 @@ class Edit extends \Magento\Adminhtml\Block\Urlrewrite\Edit
$this->_addEditFormBlock();
$this->_updateBackButtonLink(
$this->_adminhtmlData
- ->getUrl('*/*/edit', array('product' => $this->_getProduct()->getId())) . 'category'
+ ->getUrl('adminhtml/*/edit', array('product' => $this->_getProduct()->getId())) . 'category'
);
} else {
// categories selector & skip categories button
$this->_addCategoriesTreeBlock();
$this->_addSkipCategoriesBlock();
- $this->_updateBackButtonLink($this->_adminhtmlData->getUrl('*/*/edit') . 'product');
+ $this->_updateBackButtonLink($this->_adminhtmlData->getUrl('adminhtml/*/edit') . 'product');
}
} else {
$this->_addUrlRewriteSelectorBlock();
@@ -145,7 +145,7 @@ class Edit extends \Magento\Adminhtml\Block\Urlrewrite\Edit
private function _addProductLinkBlock()
{
$this->addChild('product_link', 'Magento\Adminhtml\Block\Urlrewrite\Link', array(
- 'item_url' => $this->_adminhtmlData->getUrl('*/*/*') . 'product',
+ 'item_url' => $this->_adminhtmlData->getUrl('adminhtml/*/*') . 'product',
'item_name' => $this->_getProduct()->getName(),
'label' => __('Product:')
));
@@ -158,7 +158,7 @@ class Edit extends \Magento\Adminhtml\Block\Urlrewrite\Edit
{
$this->addChild('category_link', 'Magento\Adminhtml\Block\Urlrewrite\Link', array(
'item_url' => $this->_adminhtmlData
- ->getUrl('*/*/*', array('product' => $this->_getProduct()->getId())) . 'category',
+ ->getUrl('adminhtml/*/*', array('product' => $this->_getProduct()->getId())) . 'category',
'item_name' => $this->_getCategory()->getName(),
'label' => __('Category:')
));
@@ -188,7 +188,8 @@ class Edit extends \Magento\Adminhtml\Block\Urlrewrite\Edit
$this->addChild('skip_categories', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Skip Category Selection'),
'onclick' => 'window.location = \''
- . $this->_adminhtmlData->getUrl('*/*/*', array('product' => $this->_getProduct()->getId())) . '\'',
+ . $this->_adminhtmlData->getUrl('adminhtml/*/*', array('product' => $this->_getProduct()->getId()))
+ . '\'',
'class' => 'save',
'level' => -1
));
diff --git a/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Product/Grid.php b/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Product/Grid.php
index d5514994c74..d7e8abd3d36 100644
--- a/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Product/Grid.php
+++ b/app/code/Magento/Adminhtml/Block/Urlrewrite/Catalog/Product/Grid.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Block\Urlrewrite\Catalog\Product;
-class Grid extends \Magento\Adminhtml\Block\Catalog\Product\Grid
+class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
{
/**
* Disable massaction
@@ -89,7 +89,7 @@ class Grid extends \Magento\Adminhtml\Block\Catalog\Product\Grid
*/
public function getGridUrl()
{
- return $this->getUrl('*/*/productGrid', array('_current' => true));
+ return $this->getUrl('adminhtml/*/productGrid', array('_current' => true));
}
/**
@@ -100,6 +100,6 @@ class Grid extends \Magento\Adminhtml\Block\Catalog\Product\Grid
*/
public function getRowUrl($row)
{
- return $this->getUrl('*/*/edit', array('product' => $row->getId())) . 'category';
+ return $this->getUrl('adminhtml/*/edit', array('product' => $row->getId())) . 'category';
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Urlrewrite/Cms/Page/Edit.php b/app/code/Magento/Adminhtml/Block/Urlrewrite/Cms/Page/Edit.php
index 8703c741455..21b28ec5647 100644
--- a/app/code/Magento/Adminhtml/Block/Urlrewrite/Cms/Page/Edit.php
+++ b/app/code/Magento/Adminhtml/Block/Urlrewrite/Cms/Page/Edit.php
@@ -77,7 +77,7 @@ class Edit extends \Magento\Adminhtml\Block\Urlrewrite\Edit
if ($this->_getCmsPage()->getId()) {
$this->_addCmsPageLinkBlock();
$this->_addEditFormBlock();
- $this->_updateBackButtonLink($this->_adminhtmlData->getUrl('*/*/edit') . 'cms_page');
+ $this->_updateBackButtonLink($this->_adminhtmlData->getUrl('adminhtml/*/edit') . 'cms_page');
} else {
$this->_addUrlRewriteSelectorBlock();
$this->_addCmsPageGridBlock();
@@ -103,7 +103,7 @@ class Edit extends \Magento\Adminhtml\Block\Urlrewrite\Edit
private function _addCmsPageLinkBlock()
{
$this->addChild('cms_page_link', 'Magento\Adminhtml\Block\Urlrewrite\Link', array(
- 'item_url' => $this->_adminhtmlData->getUrl('*/*/*') . 'cms_page',
+ 'item_url' => $this->_adminhtmlData->getUrl('adminhtml/*/*') . 'cms_page',
'item_name' => $this->getCmsPage()->getTitle(),
'label' => __('CMS page:')
));
diff --git a/app/code/Magento/Adminhtml/Block/Urlrewrite/Cms/Page/Edit/Form.php b/app/code/Magento/Adminhtml/Block/Urlrewrite/Cms/Page/Edit/Form.php
index 1a041955e4b..8013bc87706 100644
--- a/app/code/Magento/Adminhtml/Block/Urlrewrite/Cms/Page/Edit/Form.php
+++ b/app/code/Magento/Adminhtml/Block/Urlrewrite/Cms/Page/Edit/Form.php
@@ -103,7 +103,7 @@ class Form extends \Magento\Adminhtml\Block\Urlrewrite\Edit\Form
{
$cmsPage = $this->_getCmsPage();
$form->setAction(
- $this->_adminhtmlData->getUrl('*/*/save', array(
+ $this->_adminhtmlData->getUrl('adminhtml/*/save', array(
'id' => $this->_getModel()->getId(),
'cms_page' => $cmsPage->getId()
))
diff --git a/app/code/Magento/Adminhtml/Block/Urlrewrite/Cms/Page/Grid.php b/app/code/Magento/Adminhtml/Block/Urlrewrite/Cms/Page/Grid.php
index cb0b025b6a9..e042d50d091 100644
--- a/app/code/Magento/Adminhtml/Block/Urlrewrite/Cms/Page/Grid.php
+++ b/app/code/Magento/Adminhtml/Block/Urlrewrite/Cms/Page/Grid.php
@@ -102,7 +102,7 @@ class Grid extends \Magento\Adminhtml\Block\Cms\Page\Grid
*/
public function getGridUrl()
{
- return $this->getUrl('*/*/cmsPageGrid', array('_current' => true));
+ return $this->getUrl('adminhtml/*/cmsPageGrid', array('_current' => true));
}
/**
@@ -113,6 +113,6 @@ class Grid extends \Magento\Adminhtml\Block\Cms\Page\Grid
*/
public function getRowUrl($row)
{
- return $this->getUrl('*/*/edit', array('cms_page' => $row->getId()));
+ return $this->getUrl('adminhtml/*/edit', array('cms_page' => $row->getId()));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Urlrewrite/Edit.php b/app/code/Magento/Adminhtml/Block/Urlrewrite/Edit.php
index 355d87cf75c..9027b3d0fc0 100644
--- a/app/code/Magento/Adminhtml/Block/Urlrewrite/Edit.php
+++ b/app/code/Magento/Adminhtml/Block/Urlrewrite/Edit.php
@@ -115,7 +115,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Container
}
$this->_updateBackButtonLink(
- $this->_adminhtmlData->getUrl('*/*/edit') . $this->_getSelectorBlock()->getDefaultMode()
+ $this->_adminhtmlData->getUrl('adminhtml/*/edit') . $this->_getSelectorBlock()->getDefaultMode()
);
$this->_addUrlRewriteSelectorBlock();
$this->_addEditFormBlock();
@@ -156,7 +156,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Container
{
$this->_addButton('back', array(
'label' => __('Back'),
- 'onclick' => 'setLocation(\'' . $this->_adminhtmlData->getUrl('*/*/') . '\')',
+ 'onclick' => 'setLocation(\'' . $this->_adminhtmlData->getUrl('adminhtml/*/') . '\')',
'class' => 'back',
'level' => -1
));
@@ -182,7 +182,8 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Container
'onclick' => 'deleteConfirm(\''
. addslashes(__('Are you sure you want to do this?'))
. '\', \''
- . $this->_adminhtmlData->getUrl('*/*/delete', array('id' => $this->getUrlRewrite()->getId())) . '\')',
+ . $this->_adminhtmlData->getUrl('adminhtml/*/delete', array('id' => $this->getUrlRewrite()->getId()))
+ . '\')',
'class' => 'scalable delete',
'level' => -1
));
diff --git a/app/code/Magento/Adminhtml/Block/Urlrewrite/Edit/Form.php b/app/code/Magento/Adminhtml/Block/Urlrewrite/Edit/Form.php
index 5ee36567687..ca19c7659c8 100644
--- a/app/code/Magento/Adminhtml/Block/Urlrewrite/Edit/Form.php
+++ b/app/code/Magento/Adminhtml/Block/Urlrewrite/Edit/Form.php
@@ -300,7 +300,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
*/
protected function _formPostInit($form)
{
- $form->setAction($this->_adminhtmlData->getUrl('*/*/save', array(
+ $form->setAction($this->_adminhtmlData->getUrl('adminhtml/*/save', array(
'id' => $this->_getModel()->getId()
)));
return $this;
diff --git a/app/code/Magento/Adminhtml/Controller/Checkout/Agreement.php b/app/code/Magento/Adminhtml/Controller/Checkout/Agreement.php
index f5c57fb31f4..fea93990fba 100644
--- a/app/code/Magento/Adminhtml/Controller/Checkout/Agreement.php
+++ b/app/code/Magento/Adminhtml/Controller/Checkout/Agreement.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Controller\Checkout;
-class Agreement extends \Magento\Adminhtml\Controller\Action
+class Agreement extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -82,7 +82,7 @@ class Agreement extends \Magento\Adminhtml\Controller\Action
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(
__('This condition no longer exists.')
);
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
}
@@ -104,7 +104,7 @@ class Agreement extends \Magento\Adminhtml\Controller\Action
->_addContent(
$this->getLayout()
->createBlock('Magento\Adminhtml\Block\Checkout\Agreement\Edit')
- ->setData('action', $this->getUrl('*/*/save'))
+ ->setData('action', $this->getUrl('adminhtml/*/save'))
)
->renderLayout();
}
@@ -120,7 +120,7 @@ class Agreement extends \Magento\Adminhtml\Controller\Action
$model->save();
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addSuccess(__('The condition has been saved.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
} catch (\Magento\Core\Exception $e) {
@@ -141,14 +141,14 @@ class Agreement extends \Magento\Adminhtml\Controller\Action
->load($id);
if (!$model->getId()) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(__('This condition no longer exists.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
try {
$model->delete();
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addSuccess(__('The condition has been deleted.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
} catch (\Magento\Core\Exception $e) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError($e->getMessage());
@@ -162,7 +162,7 @@ class Agreement extends \Magento\Adminhtml\Controller\Action
/**
* Initialize action
*
- * @return \Magento\Adminhtml\Controller\Action
+ * @return \Magento\Backend\Controller\Adminhtml\Action
*/
protected function _initAction()
{
diff --git a/app/code/Magento/Adminhtml/Controller/Cms/Block.php b/app/code/Magento/Adminhtml/Controller/Cms/Block.php
index f0a264d3057..e33189ae35e 100644
--- a/app/code/Magento/Adminhtml/Controller/Cms/Block.php
+++ b/app/code/Magento/Adminhtml/Controller/Cms/Block.php
@@ -34,7 +34,7 @@
*/
namespace Magento\Adminhtml\Controller\Cms;
-class Block extends \Magento\Adminhtml\Controller\Action
+class Block extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -106,7 +106,7 @@ class Block extends \Magento\Adminhtml\Controller\Action
$model->load($id);
if (! $model->getId()) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(__('This block no longer exists.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
}
@@ -140,7 +140,7 @@ class Block extends \Magento\Adminhtml\Controller\Action
$model = $this->_objectManager->create('Magento\Cms\Model\Block')->load($id);
if (!$model->getId() && $id) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(__('This block no longer exists.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
@@ -159,11 +159,11 @@ class Block extends \Magento\Adminhtml\Controller\Action
// check if 'Save and Continue'
if ($this->getRequest()->getParam('back')) {
- $this->_redirect('*/*/edit', array('block_id' => $model->getId()));
+ $this->_redirect('adminhtml/*/edit', array('block_id' => $model->getId()));
return;
}
// go to grid
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
} catch (\Exception $e) {
@@ -172,11 +172,11 @@ class Block extends \Magento\Adminhtml\Controller\Action
// save data in session
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->setFormData($data);
// redirect to edit form
- $this->_redirect('*/*/edit', array('block_id' => $this->getRequest()->getParam('block_id')));
+ $this->_redirect('adminhtml/*/edit', array('block_id' => $this->getRequest()->getParam('block_id')));
return;
}
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
/**
@@ -195,20 +195,20 @@ class Block extends \Magento\Adminhtml\Controller\Action
// display success message
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addSuccess(__('The block has been deleted.'));
// go to grid
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
} catch (\Exception $e) {
// display error message
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError($e->getMessage());
// go back to edit form
- $this->_redirect('*/*/edit', array('block_id' => $id));
+ $this->_redirect('adminhtml/*/edit', array('block_id' => $id));
return;
}
}
// display error message
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(__('We can\'t find a block to delete.'));
// go to grid
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
/**
diff --git a/app/code/Magento/Adminhtml/Controller/Cms/Block/Widget.php b/app/code/Magento/Adminhtml/Controller/Cms/Block/Widget.php
index 86cc33ca216..ef35401ebd9 100644
--- a/app/code/Magento/Adminhtml/Controller/Cms/Block/Widget.php
+++ b/app/code/Magento/Adminhtml/Controller/Cms/Block/Widget.php
@@ -34,7 +34,7 @@
*/
namespace Magento\Adminhtml\Controller\Cms\Block;
-class Widget extends \Magento\Adminhtml\Controller\Action
+class Widget extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Chooser Source action
diff --git a/app/code/Magento/Adminhtml/Controller/Cms/Page.php b/app/code/Magento/Adminhtml/Controller/Cms/Page.php
index 0206aaff009..2fa76351d34 100644
--- a/app/code/Magento/Adminhtml/Controller/Cms/Page.php
+++ b/app/code/Magento/Adminhtml/Controller/Cms/Page.php
@@ -34,7 +34,7 @@
*/
namespace Magento\Adminhtml\Controller\Cms;
-class Page extends \Magento\Adminhtml\Controller\Action
+class Page extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -108,7 +108,7 @@ class Page extends \Magento\Adminhtml\Controller\Action
if (! $model->getId()) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(
__('This page no longer exists.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
}
@@ -157,7 +157,7 @@ class Page extends \Magento\Adminhtml\Controller\Action
//validating
if (!$this->_validatePostData($data)) {
- $this->_redirect('*/*/edit', array('page_id' => $model->getId(), '_current' => true));
+ $this->_redirect('adminhtml/*/edit', array('page_id' => $model->getId(), '_current' => true));
return;
}
@@ -173,11 +173,11 @@ class Page extends \Magento\Adminhtml\Controller\Action
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->setFormData(false);
// check if 'Save and Continue'
if ($this->getRequest()->getParam('back')) {
- $this->_redirect('*/*/edit', array('page_id' => $model->getId(), '_current'=>true));
+ $this->_redirect('adminhtml/*/edit', array('page_id' => $model->getId(), '_current'=>true));
return;
}
// go to grid
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
} catch (\Magento\Core\Exception $e) {
@@ -188,10 +188,10 @@ class Page extends \Magento\Adminhtml\Controller\Action
}
$this->_getSession()->setFormData($data);
- $this->_redirect('*/*/edit', array('page_id' => $this->getRequest()->getParam('page_id')));
+ $this->_redirect('adminhtml/*/edit', array('page_id' => $this->getRequest()->getParam('page_id')));
return;
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
/**
@@ -214,7 +214,7 @@ class Page extends \Magento\Adminhtml\Controller\Action
__('The page has been deleted.'));
// go to grid
$this->_eventManager->dispatch('adminhtml_cmspage_on_delete', array('title' => $title, 'status' => 'success'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
} catch (\Exception $e) {
@@ -222,14 +222,14 @@ class Page extends \Magento\Adminhtml\Controller\Action
// display error message
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError($e->getMessage());
// go back to edit form
- $this->_redirect('*/*/edit', array('page_id' => $id));
+ $this->_redirect('adminhtml/*/edit', array('page_id' => $id));
return;
}
}
// display error message
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(__('We can\'t find a page to delete.'));
// go to grid
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
/**
diff --git a/app/code/Magento/Adminhtml/Controller/Cms/Page/Widget.php b/app/code/Magento/Adminhtml/Controller/Cms/Page/Widget.php
index 68e3d5ab150..a92e8ccfbde 100644
--- a/app/code/Magento/Adminhtml/Controller/Cms/Page/Widget.php
+++ b/app/code/Magento/Adminhtml/Controller/Cms/Page/Widget.php
@@ -34,7 +34,7 @@
*/
namespace Magento\Adminhtml\Controller\Cms\Page;
-class Widget extends \Magento\Adminhtml\Controller\Action
+class Widget extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Chooser Source action
diff --git a/app/code/Magento/Adminhtml/Controller/Cms/Wysiwyg.php b/app/code/Magento/Adminhtml/Controller/Cms/Wysiwyg.php
index 6d89f20aabd..12404b58351 100644
--- a/app/code/Magento/Adminhtml/Controller/Cms/Wysiwyg.php
+++ b/app/code/Magento/Adminhtml/Controller/Cms/Wysiwyg.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Controller\Cms;
-class Wysiwyg extends \Magento\Adminhtml\Controller\Action
+class Wysiwyg extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Template directives callback
diff --git a/app/code/Magento/Adminhtml/Controller/Cms/Wysiwyg/Images.php b/app/code/Magento/Adminhtml/Controller/Cms/Wysiwyg/Images.php
index 00ef9d1cc4c..5961f0f53a9 100644
--- a/app/code/Magento/Adminhtml/Controller/Cms/Wysiwyg/Images.php
+++ b/app/code/Magento/Adminhtml/Controller/Cms/Wysiwyg/Images.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Controller\Cms\Wysiwyg;
-class Images extends \Magento\Adminhtml\Controller\Action
+class Images extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
diff --git a/app/code/Magento/Adminhtml/Controller/Customer.php b/app/code/Magento/Adminhtml/Controller/Customer.php
index 4cb4194c8c7..e02d5b1dd5a 100644
--- a/app/code/Magento/Adminhtml/Controller/Customer.php
+++ b/app/code/Magento/Adminhtml/Controller/Customer.php
@@ -25,7 +25,7 @@
*/
namespace Magento\Adminhtml\Controller;
-class Customer extends \Magento\Adminhtml\Controller\Action
+class Customer extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* @var \Magento\Validator
@@ -212,7 +212,7 @@ class Customer extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addError($exception->getMessage());
}
}
- $this->_redirect('*/customer');
+ $this->_redirect('adminhtml/customer');
}
/**
@@ -285,12 +285,12 @@ class Customer extends \Magento\Adminhtml\Controller\Action
if ($returnToEdit) {
if ($customerId) {
- $this->_redirect('*/*/edit', array('id' => $customerId, '_current' => true));
+ $this->_redirect('adminhtml/*/edit', array('id' => $customerId, '_current' => true));
} else {
- $this->_redirect('*/*/new', array('_current' => true));
+ $this->_redirect('adminhtml/*/new', array('_current' => true));
}
} else {
- $this->_redirect('*/customer');
+ $this->_redirect('adminhtml/customer');
}
}
@@ -301,14 +301,14 @@ class Customer extends \Magento\Adminhtml\Controller\Action
{
$customerId = (int)$this->getRequest()->getParam('customer_id', 0);
if (!$customerId) {
- return $this->_redirect('*/customer');
+ return $this->_redirect('adminhtml/customer');
}
/** @var \Magento\Customer\Model\Customer $customer */
$customer = $this->_objectManager->create('Magento\Customer\Model\Customer');
$customer->load($customerId);
if (!$customer->getId()) {
- return $this->_redirect('*/customer');
+ return $this->_redirect('adminhtml/customer');
}
try {
@@ -334,7 +334,7 @@ class Customer extends \Magento\Adminhtml\Controller\Action
__('An error occurred while resetting customer password.'));
}
- $this->_redirect('*/*/edit', array('id' => $customerId, '_current' => true));
+ $this->_redirect('adminhtml/*/edit', array('id' => $customerId, '_current' => true));
}
/**
@@ -744,7 +744,7 @@ class Customer extends \Magento\Adminhtml\Controller\Action
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError($exception->getMessage());
}
}
- $this->_redirect('*/*/index');
+ $this->_redirect('adminhtml/*/index');
}
/**
@@ -770,7 +770,7 @@ class Customer extends \Magento\Adminhtml\Controller\Action
}
}
- $this->_redirect('*/*/index');
+ $this->_redirect('adminhtml/*/index');
}
/**
@@ -797,7 +797,7 @@ class Customer extends \Magento\Adminhtml\Controller\Action
}
}
- $this->_redirect('*/*/index');
+ $this->_redirect('adminhtml/*/index');
}
/**
@@ -823,7 +823,7 @@ class Customer extends \Magento\Adminhtml\Controller\Action
}
}
- $this->_redirect('*/*/index');
+ $this->_redirect('adminhtml/*/index');
}
/**
diff --git a/app/code/Magento/Adminhtml/Controller/Customer/Cart/Product/Composite/Cart.php b/app/code/Magento/Adminhtml/Controller/Customer/Cart/Product/Composite/Cart.php
index 249f5952c71..3bae3f19558 100644
--- a/app/code/Magento/Adminhtml/Controller/Customer/Cart/Product/Composite/Cart.php
+++ b/app/code/Magento/Adminhtml/Controller/Customer/Cart/Product/Composite/Cart.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Controller\Customer\Cart\Product\Composite;
-class Cart extends \Magento\Adminhtml\Controller\Action
+class Cart extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Customer we're working with
@@ -114,7 +114,7 @@ class Cart extends \Magento\Adminhtml\Controller\Action
$configureResult->setMessage($e->getMessage());
}
- $this->_objectManager->get('Magento\Adminhtml\Helper\Catalog\Product\Composite')
+ $this->_objectManager->get('Magento\Catalog\Helper\Product\Composite')
->renderConfigureResult($this, $configureResult);
return $this;
@@ -144,7 +144,7 @@ class Cart extends \Magento\Adminhtml\Controller\Action
$updateResult->setJsVarName($this->getRequest()->getParam('as_js_varname'));
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->setCompositeProductResult($updateResult);
- $this->_redirect('*/catalog_product/showUpdateResult');
+ $this->_redirect('adminhtml/product/showUpdateResult');
return $this;
}
diff --git a/app/code/Magento/Adminhtml/Controller/Customer/Group.php b/app/code/Magento/Adminhtml/Controller/Customer/Group.php
index 1ccdd1241f2..0f42f85803d 100644
--- a/app/code/Magento/Adminhtml/Controller/Customer/Group.php
+++ b/app/code/Magento/Adminhtml/Controller/Customer/Group.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Controller\Customer;
-class Group extends \Magento\Adminhtml\Controller\Action
+class Group extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -89,7 +89,7 @@ class Group extends \Magento\Adminhtml\Controller\Action
$this->loadLayout();
$this->_setActiveMenu('Magento_Customer::customer_group');
$this->_addBreadcrumb(__('Customers'), __('Customers'));
- $this->_addBreadcrumb(__('Customer Groups'), __('Customer Groups'), $this->getUrl('*/customer_group'));
+ $this->_addBreadcrumb(__('Customer Groups'), __('Customer Groups'), $this->getUrl('adminhtml/customer_group'));
$currentGroup = $this->_coreRegistry->registry('current_group');
@@ -138,12 +138,12 @@ class Group extends \Magento\Adminhtml\Controller\Action
$customerGroup->setTaxClassId($taxClass)->save();
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addSuccess(__('The customer group has been saved.'));
- $this->getResponse()->setRedirect($this->getUrl('*/customer_group'));
+ $this->getResponse()->setRedirect($this->getUrl('adminhtml/customer_group'));
return;
} catch (\Exception $e) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError($e->getMessage());
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->setCustomerGroupData($customerGroup->getData());
- $this->getResponse()->setRedirect($this->getUrl('*/customer_group/edit', array('id' => $id)));
+ $this->getResponse()->setRedirect($this->getUrl('adminhtml/customer_group/edit', array('id' => $id)));
return;
}
} else {
@@ -161,22 +161,22 @@ class Group extends \Magento\Adminhtml\Controller\Action
$customerGroup = $this->_objectManager->create('Magento\Customer\Model\Group')->load($id);
if (!$customerGroup->getId()) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(__('The customer group no longer exists.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
try {
$customerGroup->delete();
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addSuccess(__('The customer group has been deleted.'));
- $this->getResponse()->setRedirect($this->getUrl('*/customer_group'));
+ $this->getResponse()->setRedirect($this->getUrl('adminhtml/customer_group'));
return;
} catch (\Exception $e) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError($e->getMessage());
- $this->getResponse()->setRedirect($this->getUrl('*/customer_group/edit', array('id' => $id)));
+ $this->getResponse()->setRedirect($this->getUrl('adminhtml/customer_group/edit', array('id' => $id)));
return;
}
}
- $this->_redirect('*/customer_group');
+ $this->_redirect('adminhtml/customer_group');
}
protected function _isAllowed()
diff --git a/app/code/Magento/Adminhtml/Controller/Customer/Online.php b/app/code/Magento/Adminhtml/Controller/Customer/Online.php
index 85946e7bbb8..5d5df1a8092 100644
--- a/app/code/Magento/Adminhtml/Controller/Customer/Online.php
+++ b/app/code/Magento/Adminhtml/Controller/Customer/Online.php
@@ -25,7 +25,7 @@
*/
namespace Magento\Adminhtml\Controller\Customer;
-class Online extends \Magento\Adminhtml\Controller\Action
+class Online extends \Magento\Backend\Controller\Adminhtml\Action
{
public function indexAction()
diff --git a/app/code/Magento/Adminhtml/Controller/Customer/System/Config/Validatevat.php b/app/code/Magento/Adminhtml/Controller/Customer/System/Config/Validatevat.php
index 6ba5079491d..155112daa12 100644
--- a/app/code/Magento/Adminhtml/Controller/Customer/System/Config/Validatevat.php
+++ b/app/code/Magento/Adminhtml/Controller/Customer/System/Config/Validatevat.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Controller\Customer\System\Config;
-class Validatevat extends \Magento\Adminhtml\Controller\Action
+class Validatevat extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Perform customer VAT ID validation
diff --git a/app/code/Magento/Adminhtml/Controller/Customer/Wishlist/Product/Composite/Wishlist.php b/app/code/Magento/Adminhtml/Controller/Customer/Wishlist/Product/Composite/Wishlist.php
index 48fbdde338f..29b77cb3347 100644
--- a/app/code/Magento/Adminhtml/Controller/Customer/Wishlist/Product/Composite/Wishlist.php
+++ b/app/code/Magento/Adminhtml/Controller/Customer/Wishlist/Product/Composite/Wishlist.php
@@ -34,7 +34,7 @@
namespace Magento\Adminhtml\Controller\Customer\Wishlist\Product\Composite;
class Wishlist
- extends \Magento\Adminhtml\Controller\Action
+ extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Wishlist we're working with
@@ -100,7 +100,7 @@ class Wishlist
$configureResult->setMessage($e->getMessage());
}
- $this->_objectManager->get('Magento\Adminhtml\Helper\Catalog\Product\Composite')
+ $this->_objectManager->get('Magento\Catalog\Helper\Product\Composite')
->renderConfigureResult($this, $configureResult);
return $this;
@@ -131,7 +131,7 @@ class Wishlist
}
$updateResult->setJsVarName($this->getRequest()->getParam('as_js_varname'));
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->setCompositeProductResult($updateResult);
- $this->_redirect('*/catalog_product/showUpdateResult');
+ $this->_redirect('adminhtml/product/showUpdateResult');
return false;
}
diff --git a/app/code/Magento/Adminhtml/Controller/Index.php b/app/code/Magento/Adminhtml/Controller/Index.php
deleted file mode 100644
index 42690985985..00000000000
--- a/app/code/Magento/Adminhtml/Controller/Index.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category Magento
- * @package Magento_Adminhtml
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-
-/**
- * Index admin controller
- *
- * @category Magento
- * @package Magento_Adminhtml
- * @author Magento Core Team <core@magentocommerce.com>
- * @deprecated Partially moved to module Backend
- */
-namespace Magento\Adminhtml\Controller;
-
-class Index extends \Magento\Adminhtml\Controller\Action
-{
- /**
- * Global Search Action
- */
- public function globalSearchAction()
- {
- $searchModules = $this->_objectManager->get('Magento\Core\Model\Config')->getNode("adminhtml/global_search");
- $items = array();
-
- if (!$this->_authorization->isAllowed('Magento_Adminhtml::global_search')) {
- $items[] = array(
- 'id' => 'error',
- 'type' => __('Error'),
- 'name' => __('Access Denied'),
- 'description' => __('You need more permissions to do this.')
- );
- } else {
- if (empty($searchModules)) {
- $items[] = array(
- 'id' => 'error',
- 'type' => __('Error'),
- 'name' => __('No search modules were registered'),
- 'description' => __('Please make sure that all global admin search modules are installed and activated.')
- );
- } else {
- $start = $this->getRequest()->getParam('start', 1);
- $limit = $this->getRequest()->getParam('limit', 10);
- $query = $this->getRequest()->getParam('query', '');
- foreach ($searchModules->children() as $searchConfig) {
-
- if ($searchConfig->acl && !$this->_authorization->isAllowed($searchConfig->acl)){
- continue;
- }
-
- $className = $searchConfig->getClassName();
-
- if (empty($className)) {
- continue;
- }
- $searchInstance = $this->_objectManager->create($className);
- $results = $searchInstance->setStart($start)
- ->setLimit($limit)
- ->setQuery($query)
- ->load()
- ->getResults();
- $items = array_merge_recursive($items, $results);
- }
- }
- }
-
- $this->getResponse()->setBody(
- $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($items)
- );
- }
-
- /**
- * Check if user has permissions to access this controller
- *
- * @return boolean
- */
- protected function _isAllowed()
- {
- return true;
- }
-}
diff --git a/app/code/Magento/Adminhtml/Controller/Newsletter/Problem.php b/app/code/Magento/Adminhtml/Controller/Newsletter/Problem.php
index d31571a4e25..149d34db364 100644
--- a/app/code/Magento/Adminhtml/Controller/Newsletter/Problem.php
+++ b/app/code/Magento/Adminhtml/Controller/Newsletter/Problem.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Controller\Newsletter;
-class Problem extends \Magento\Adminhtml\Controller\Action
+class Problem extends \Magento\Backend\Controller\Adminhtml\Action
{
public function indexAction()
{
diff --git a/app/code/Magento/Adminhtml/Controller/Newsletter/Queue.php b/app/code/Magento/Adminhtml/Controller/Newsletter/Queue.php
index ba3208e4db8..295f7f47b4f 100644
--- a/app/code/Magento/Adminhtml/Controller/Newsletter/Queue.php
+++ b/app/code/Magento/Adminhtml/Controller/Newsletter/Queue.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Controller\Newsletter;
-class Queue extends \Magento\Adminhtml\Controller\Action
+class Queue extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -122,7 +122,7 @@ class Queue extends \Magento\Adminhtml\Controller\Action
if (!in_array($queue->getQueueStatus(),
array(\Magento\Newsletter\Model\Queue::STATUS_NEVER,
\Magento\Newsletter\Model\Queue::STATUS_PAUSE))) {
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
return;
}
@@ -131,7 +131,7 @@ class Queue extends \Magento\Adminhtml\Controller\Action
->save();
}
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
}
public function pauseAction()
@@ -141,14 +141,14 @@ class Queue extends \Magento\Adminhtml\Controller\Action
if (!in_array($queue->getQueueStatus(),
array(\Magento\Newsletter\Model\Queue::STATUS_SENDING))) {
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
return;
}
$queue->setQueueStatus(\Magento\Newsletter\Model\Queue::STATUS_PAUSE);
$queue->save();
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
}
public function resumeAction()
@@ -158,14 +158,14 @@ class Queue extends \Magento\Adminhtml\Controller\Action
if (!in_array($queue->getQueueStatus(),
array(\Magento\Newsletter\Model\Queue::STATUS_PAUSE))) {
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
return;
}
$queue->setQueueStatus(\Magento\Newsletter\Model\Queue::STATUS_SENDING);
$queue->save();
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
}
public function cancelAction()
@@ -175,14 +175,14 @@ class Queue extends \Magento\Adminhtml\Controller\Action
if (!in_array($queue->getQueueStatus(),
array(\Magento\Newsletter\Model\Queue::STATUS_SENDING))) {
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
return;
}
$queue->setQueueStatus(\Magento\Newsletter\Model\Queue::STATUS_CANCEL);
$queue->save();
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
}
public function sendingAction()
@@ -225,7 +225,7 @@ class Queue extends \Magento\Adminhtml\Controller\Action
$this->_addBreadcrumb(
__('Newsletter Queue'),
__('Newsletter Queue'),
- $this->getUrl('*/newsletter_queue')
+ $this->getUrl('adminhtml/newsletter_queue')
);
$this->_addBreadcrumb(__('Edit Queue'), __('Edit Queue'));
@@ -257,7 +257,7 @@ class Queue extends \Magento\Adminhtml\Controller\Action
array(\Magento\Newsletter\Model\Queue::STATUS_NEVER,
\Magento\Newsletter\Model\Queue::STATUS_PAUSE))
) {
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
return;
}
@@ -282,12 +282,12 @@ class Queue extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addSuccess(__('The newsletter queue has been saved.'));
$this->_getSession()->setFormData(false);
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
$id = $this->getRequest()->getParam('id');
if ($id) {
- $this->_redirect('*/*/edit', array('id' => $id));
+ $this->_redirect('adminhtml/*/edit', array('id' => $id));
} else {
$this->_redirectReferer();
}
diff --git a/app/code/Magento/Adminhtml/Controller/Newsletter/Subscriber.php b/app/code/Magento/Adminhtml/Controller/Newsletter/Subscriber.php
index 493e27a79e3..a768e0bad69 100644
--- a/app/code/Magento/Adminhtml/Controller/Newsletter/Subscriber.php
+++ b/app/code/Magento/Adminhtml/Controller/Newsletter/Subscriber.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Controller\Newsletter;
-class Subscriber extends \Magento\Adminhtml\Controller\Action
+class Subscriber extends \Magento\Backend\Controller\Adminhtml\Action
{
public function indexAction()
@@ -104,7 +104,7 @@ class Subscriber extends \Magento\Adminhtml\Controller\Action
}
}
- $this->_redirect('*/*/index');
+ $this->_redirect('adminhtml/*/index');
}
public function massDeleteAction()
@@ -127,7 +127,7 @@ class Subscriber extends \Magento\Adminhtml\Controller\Action
}
}
- $this->_redirect('*/*/index');
+ $this->_redirect('adminhtml/*/index');
}
protected function _isAllowed()
diff --git a/app/code/Magento/Adminhtml/Controller/Newsletter/Template.php b/app/code/Magento/Adminhtml/Controller/Newsletter/Template.php
index 2c606466b1f..9b17d8cf37e 100644
--- a/app/code/Magento/Adminhtml/Controller/Newsletter/Template.php
+++ b/app/code/Magento/Adminhtml/Controller/Newsletter/Template.php
@@ -32,7 +32,7 @@
*/
namespace Magento\Adminhtml\Controller\Newsletter;
-class Template extends \Magento\Adminhtml\Controller\Action
+class Template extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -177,7 +177,7 @@ class Template extends \Magento\Adminhtml\Controller\Action
{
$request = $this->getRequest();
if (!$request->isPost()) {
- $this->getResponse()->setRedirect($this->getUrl('*/newsletter_template'));
+ $this->getResponse()->setRedirect($this->getUrl('adminhtml/newsletter_template'));
}
$template = $this->_objectManager->create('Magento\Newsletter\Model\Template');
@@ -212,7 +212,7 @@ class Template extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addSuccess(__('The newsletter template has been saved.'));
$this->_getSession()->setFormData(false);
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
return;
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError(nl2br($e->getMessage()));
@@ -249,7 +249,7 @@ class Template extends \Magento\Adminhtml\Controller\Action
);
}
}
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
}
/**
diff --git a/app/code/Magento/Adminhtml/Controller/Promo.php b/app/code/Magento/Adminhtml/Controller/Promo.php
index 3c8b9fc5195..988b3535165 100644
--- a/app/code/Magento/Adminhtml/Controller/Promo.php
+++ b/app/code/Magento/Adminhtml/Controller/Promo.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Controller;
-class Promo extends \Magento\Adminhtml\Controller\Action
+class Promo extends \Magento\Backend\Controller\Adminhtml\Action
{
public function indexAction()
diff --git a/app/code/Magento/Adminhtml/Controller/Promo/Catalog.php b/app/code/Magento/Adminhtml/Controller/Promo/Catalog.php
index a7913f02cd5..8e3568f44fa 100644
--- a/app/code/Magento/Adminhtml/Controller/Promo/Catalog.php
+++ b/app/code/Magento/Adminhtml/Controller/Promo/Catalog.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Controller\Promo;
-class Catalog extends \Magento\Adminhtml\Controller\Action
+class Catalog extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Dirty rules notice message
@@ -107,7 +107,7 @@ class Catalog extends \Magento\Adminhtml\Controller\Action
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(
__('This rule no longer exists.')
);
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
return;
}
}
@@ -124,7 +124,7 @@ class Catalog extends \Magento\Adminhtml\Controller\Action
$this->_coreRegistry->register('current_promo_catalog_rule', $model);
$this->_initAction()->getLayout()->getBlock('promo_catalog_edit')
- ->setData('action', $this->getUrl('*/promo_catalog/save'));
+ ->setData('action', $this->getUrl('adminhtml/promo_catalog/save'));
$breadcrumb = $id ? __('Edit Rule') : __('New Rule');
$this->_addBreadcrumb($breadcrumb, $breadcrumb)->renderLayout();
@@ -155,7 +155,7 @@ class Catalog extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addError($errorMessage);
}
$this->_getSession()->setPageData($data);
- $this->_redirect('*/*/edit', array('id'=>$model->getId()));
+ $this->_redirect('adminhtml/*/edit', array('id'=>$model->getId()));
return;
}
@@ -180,10 +180,10 @@ class Catalog extends \Magento\Adminhtml\Controller\Action
->setState(1)
->save();
if ($this->getRequest()->getParam('back')) {
- $this->_redirect('*/*/edit', array('id' => $model->getId()));
+ $this->_redirect('adminhtml/*/edit', array('id' => $model->getId()));
return;
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
return;
} catch (\Magento\Core\Exception $e) {
@@ -194,11 +194,11 @@ class Catalog extends \Magento\Adminhtml\Controller\Action
);
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->setPageData($data);
- $this->_redirect('*/*/edit', array('id' => $this->getRequest()->getParam('rule_id')));
+ $this->_redirect('adminhtml/*/edit', array('id' => $this->getRequest()->getParam('rule_id')));
return;
}
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
public function deleteAction()
@@ -215,7 +215,7 @@ class Catalog extends \Magento\Adminhtml\Controller\Action
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addSuccess(
__('The rule has been deleted.')
);
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
@@ -224,14 +224,14 @@ class Catalog extends \Magento\Adminhtml\Controller\Action
__('An error occurred while deleting the rule. Please review the log and try again.')
);
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
- $this->_redirect('*/*/edit', array('id' => $this->getRequest()->getParam('id')));
+ $this->_redirect('adminhtml/*/edit', array('id' => $this->getRequest()->getParam('id')));
return;
}
}
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(
__('Unable to find a rule to delete.')
);
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
public function newConditionHtmlAction()
@@ -317,7 +317,7 @@ class Catalog extends \Magento\Adminhtml\Controller\Action
} catch (\Exception $e) {
$this->_getSession()->addError($errorMessage);
}
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
}
protected function _isAllowed()
diff --git a/app/code/Magento/Adminhtml/Controller/Promo/Quote.php b/app/code/Magento/Adminhtml/Controller/Promo/Quote.php
index 7de1a1b8c7c..33905536871 100644
--- a/app/code/Magento/Adminhtml/Controller/Promo/Quote.php
+++ b/app/code/Magento/Adminhtml/Controller/Promo/Quote.php
@@ -26,7 +26,7 @@
namespace Magento\Adminhtml\Controller\Promo;
-class Quote extends \Magento\Adminhtml\Controller\Action
+class Quote extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -96,7 +96,7 @@ class Quote extends \Magento\Adminhtml\Controller\Action
if (! $model->getRuleId()) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(
__('This rule no longer exists.'));
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
return;
}
}
@@ -115,7 +115,7 @@ class Quote extends \Magento\Adminhtml\Controller\Action
$this->_coreRegistry->register('current_promo_quote_rule', $model);
$this->_initAction()->getLayout()->getBlock('promo_quote_edit')
- ->setData('action', $this->getUrl('*/*/save'));
+ ->setData('action', $this->getUrl('adminhtml/*/save'));
$this
->_addBreadcrumb(
@@ -158,7 +158,7 @@ class Quote extends \Magento\Adminhtml\Controller\Action
$session->addError($errorMessage);
}
$session->setPageData($data);
- $this->_redirect('*/*/edit', array('id'=>$model->getId()));
+ $this->_redirect('adminhtml/*/edit', array('id'=>$model->getId()));
return;
}
@@ -185,18 +185,18 @@ class Quote extends \Magento\Adminhtml\Controller\Action
$session->addSuccess(__('The rule has been saved.'));
$session->setPageData(false);
if ($this->getRequest()->getParam('back')) {
- $this->_redirect('*/*/edit', array('id' => $model->getId()));
+ $this->_redirect('adminhtml/*/edit', array('id' => $model->getId()));
return;
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
$id = (int)$this->getRequest()->getParam('rule_id');
if (!empty($id)) {
- $this->_redirect('*/*/edit', array('id' => $id));
+ $this->_redirect('adminhtml/*/edit', array('id' => $id));
} else {
- $this->_redirect('*/*/new');
+ $this->_redirect('adminhtml/*/new');
}
return;
@@ -205,11 +205,11 @@ class Quote extends \Magento\Adminhtml\Controller\Action
__('An error occurred while saving the rule data. Please review the log and try again.'));
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->setPageData($data);
- $this->_redirect('*/*/edit', array('id' => $this->getRequest()->getParam('rule_id')));
+ $this->_redirect('adminhtml/*/edit', array('id' => $this->getRequest()->getParam('rule_id')));
return;
}
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
public function deleteAction()
@@ -222,7 +222,7 @@ class Quote extends \Magento\Adminhtml\Controller\Action
$model->delete();
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addSuccess(
__('The rule has been deleted.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
@@ -230,13 +230,13 @@ class Quote extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addError(
__('An error occurred while deleting the rule. Please review the log and try again.'));
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
- $this->_redirect('*/*/edit', array('id' => $this->getRequest()->getParam('id')));
+ $this->_redirect('adminhtml/*/edit', array('id' => $this->getRequest()->getParam('id')));
return;
}
}
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(
__('We can\'t find a rule to delete.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
public function newConditionHtmlAction()
@@ -318,7 +318,7 @@ class Quote extends \Magento\Adminhtml\Controller\Action
->getExcelFile($fileName);
$this->_prepareDownloadResponse($fileName, $content);
} else {
- $this->_redirect('*/*/detail', array('_current' => true));
+ $this->_redirect('adminhtml/*/detail', array('_current' => true));
return;
}
}
@@ -339,7 +339,7 @@ class Quote extends \Magento\Adminhtml\Controller\Action
->getCsvFile();
$this->_prepareDownloadResponse($fileName, $content);
} else {
- $this->_redirect('*/*/detail', array('_current' => true));
+ $this->_redirect('adminhtml/*/detail', array('_current' => true));
return;
}
}
diff --git a/app/code/Magento/Adminhtml/Controller/Promo/Widget.php b/app/code/Magento/Adminhtml/Controller/Promo/Widget.php
index 67fc930cfc5..8ab328746ee 100644
--- a/app/code/Magento/Adminhtml/Controller/Promo/Widget.php
+++ b/app/code/Magento/Adminhtml/Controller/Promo/Widget.php
@@ -26,7 +26,7 @@
namespace Magento\Adminhtml\Controller\Promo;
-class Widget extends \Magento\Adminhtml\Controller\Action
+class Widget extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -81,7 +81,7 @@ class Widget extends \Magento\Adminhtml\Controller\Action
$block = $this->getLayout()->createBlock(
- 'Magento\Adminhtml\Block\Catalog\Category\Checkboxes\Tree', 'promo_widget_chooser_category_ids',
+ 'Magento\Catalog\Block\Adminhtml\Category\Checkboxes\Tree', 'promo_widget_chooser_category_ids',
array('data' => array('js_form_object' => $request->getParam('form')))
)
->setCategoryIds($ids)
@@ -116,7 +116,7 @@ class Widget extends \Magento\Adminhtml\Controller\Action
return;
}
$this->getResponse()->setBody(
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Category\Tree')
+ $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Category\Tree')
->getTreeJson($category)
);
}
@@ -141,7 +141,7 @@ class Widget extends \Magento\Adminhtml\Controller\Action
$rootId = $this->_objectManager->get('Magento\Core\Model\StoreManager')
->getStore($storeId)->getRootCategoryId();
if (!in_array($rootId, $category->getPathIds())) {
- $this->_redirect('*/*/', array('_current' => true, 'id' => null));
+ $this->_redirect('adminhtml/*/', array('_current' => true, 'id' => null));
return false;
}
}
diff --git a/app/code/Magento/Adminhtml/Controller/Report.php b/app/code/Magento/Adminhtml/Controller/Report.php
index acd535e00c0..c550488c9bf 100644
--- a/app/code/Magento/Adminhtml/Controller/Report.php
+++ b/app/code/Magento/Adminhtml/Controller/Report.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Controller;
-class Report extends \Magento\Adminhtml\Controller\Action
+class Report extends \Magento\Backend\Controller\Adminhtml\Action
{
public function _initAction()
{
diff --git a/app/code/Magento/Adminhtml/Controller/Report/AbstractReport.php b/app/code/Magento/Adminhtml/Controller/Report/AbstractReport.php
index 7f255bba381..2d3a87439e2 100644
--- a/app/code/Magento/Adminhtml/Controller/Report/AbstractReport.php
+++ b/app/code/Magento/Adminhtml/Controller/Report/AbstractReport.php
@@ -34,7 +34,7 @@
*/
namespace Magento\Adminhtml\Controller\Report;
-abstract class AbstractReport extends \Magento\Adminhtml\Controller\Action
+abstract class AbstractReport extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Admin session model
@@ -118,8 +118,8 @@ abstract class AbstractReport extends \Magento\Adminhtml\Controller\Action
)
: 'undefined';
- $refreshStatsLink = $this->getUrl('*/report_statistics');
- $directRefreshLink = $this->getUrl('*/report_statistics/refreshRecent', array('code' => $refreshCode));
+ $refreshStatsLink = $this->getUrl('adminhtml/report_statistics');
+ $directRefreshLink = $this->getUrl('adminhtml/report_statistics/refreshRecent', array('code' => $refreshCode));
$this->_objectManager->get('Magento\Adminhtml\Model\Session')
->addNotice(__('Last updated: %1. To refresh last day\'s <a href="%2">statistics</a>, '
diff --git a/app/code/Magento/Adminhtml/Controller/Report/Customer.php b/app/code/Magento/Adminhtml/Controller/Report/Customer.php
index 035e0d7bec0..ad5fcdb9f80 100644
--- a/app/code/Magento/Adminhtml/Controller/Report/Customer.php
+++ b/app/code/Magento/Adminhtml/Controller/Report/Customer.php
@@ -34,7 +34,7 @@
*/
namespace Magento\Adminhtml\Controller\Report;
-class Customer extends \Magento\Adminhtml\Controller\Action
+class Customer extends \Magento\Backend\Controller\Adminhtml\Action
{
public function _initAction()
{
diff --git a/app/code/Magento/Adminhtml/Controller/Report/Review.php b/app/code/Magento/Adminhtml/Controller/Report/Review.php
index 0da685d6028..d6ad16dbd66 100644
--- a/app/code/Magento/Adminhtml/Controller/Report/Review.php
+++ b/app/code/Magento/Adminhtml/Controller/Report/Review.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Controller\Report;
-class Review extends \Magento\Adminhtml\Controller\Action
+class Review extends \Magento\Backend\Controller\Adminhtml\Action
{
public function _initAction()
{
diff --git a/app/code/Magento/Adminhtml/Controller/Report/Shopcart.php b/app/code/Magento/Adminhtml/Controller/Report/Shopcart.php
index f66b96ed65f..0bdbb5155c8 100644
--- a/app/code/Magento/Adminhtml/Controller/Report/Shopcart.php
+++ b/app/code/Magento/Adminhtml/Controller/Report/Shopcart.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Controller\Report;
-class Shopcart extends \Magento\Adminhtml\Controller\Action
+class Shopcart extends \Magento\Backend\Controller\Adminhtml\Action
{
public function _initAction()
{
diff --git a/app/code/Magento/Adminhtml/Controller/Report/Statistics.php b/app/code/Magento/Adminhtml/Controller/Report/Statistics.php
index cc1e802a6f1..2b1a66ec2af 100644
--- a/app/code/Magento/Adminhtml/Controller/Report/Statistics.php
+++ b/app/code/Magento/Adminhtml/Controller/Report/Statistics.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Controller\Report;
-class Statistics extends \Magento\Adminhtml\Controller\Action
+class Statistics extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Admin session model
@@ -139,7 +139,7 @@ class Statistics extends \Magento\Adminhtml\Controller\Action
}
if($this->_getSession()->isFirstPageAfterLogin()) {
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
} else {
$this->_redirectReferer('*/*');
}
@@ -170,7 +170,7 @@ class Statistics extends \Magento\Adminhtml\Controller\Action
}
if($this->_getSession()->isFirstPageAfterLogin()) {
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
} else {
$this->_redirectReferer('*/*');
}
diff --git a/app/code/Magento/Adminhtml/Controller/System/Account.php b/app/code/Magento/Adminhtml/Controller/System/Account.php
index 00f2a8080dd..2dbb3514b15 100644
--- a/app/code/Magento/Adminhtml/Controller/System/Account.php
+++ b/app/code/Magento/Adminhtml/Controller/System/Account.php
@@ -34,7 +34,7 @@
namespace Magento\Adminhtml\Controller\System;
-class Account extends \Magento\Adminhtml\Controller\Action
+class Account extends \Magento\Backend\Controller\Adminhtml\Action
{
public function indexAction()
{
diff --git a/app/code/Magento/Adminhtml/Controller/System/Backup.php b/app/code/Magento/Adminhtml/Controller/System/Backup.php
index 88b68ed37a3..44e7b667e84 100644
--- a/app/code/Magento/Adminhtml/Controller/System/Backup.php
+++ b/app/code/Magento/Adminhtml/Controller/System/Backup.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Controller\System;
-class Backup extends \Magento\Adminhtml\Controller\Action
+class Backup extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -95,12 +95,12 @@ class Backup extends \Magento\Adminhtml\Controller\Action
/**
* Create backup action
*
- * @return \Magento\Adminhtml\Controller\Action
+ * @return \Magento\Backend\Controller\Adminhtml\Action
*/
public function createAction()
{
if (!$this->getRequest()->isAjax()) {
- return $this->getUrl('*/*/index');
+ return $this->getUrl('adminhtml/*/index');
}
$response = new \Magento\Object();
@@ -153,7 +153,7 @@ class Backup extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addSuccess($successMessage);
- $response->setRedirectUrl($this->getUrl('*/*/index'));
+ $response->setRedirectUrl($this->getUrl('adminhtml/*/index'));
} catch (\Magento\Backup\Exception\NotEnoughFreeSpace $e) {
$errorMessage = __('You need more free space to create a backup.');
} catch (\Magento\Backup\Exception\NotEnoughPermissions $e) {
@@ -179,7 +179,7 @@ class Backup extends \Magento\Adminhtml\Controller\Action
/**
* Download backup action
*
- * @return \Magento\Adminhtml\Controller\Action
+ * @return \Magento\Backend\Controller\Adminhtml\Action
*/
public function downloadAction()
{
@@ -190,7 +190,7 @@ class Backup extends \Magento\Adminhtml\Controller\Action
);
if (!$backup->getTime() || !$backup->exists()) {
- return $this->_redirect('*/*');
+ return $this->_redirect('adminhtml/*');
}
$fileName = $this->_objectManager->get('Magento\Backup\Helper\Data')
@@ -207,7 +207,7 @@ class Backup extends \Magento\Adminhtml\Controller\Action
/**
* Rollback Action
*
- * @return \Magento\Adminhtml\Controller\Action
+ * @return \Magento\Backend\Controller\Adminhtml\Action
*/
public function rollbackAction()
{
@@ -216,7 +216,7 @@ class Backup extends \Magento\Adminhtml\Controller\Action
}
if (!$this->getRequest()->isAjax()) {
- return $this->getUrl('*/*/index');
+ return $this->getUrl('adminhtml/*/index');
}
$helper = $this->_objectManager->get('Magento\Backup\Helper\Data');
@@ -230,7 +230,7 @@ class Backup extends \Magento\Adminhtml\Controller\Action
);
if (!$backup->getTime() || !$backup->exists()) {
- return $this->_redirect('*/*');
+ return $this->_redirect('adminhtml/*');
}
if (!$backup->getTime()) {
@@ -325,14 +325,14 @@ class Backup extends \Magento\Adminhtml\Controller\Action
/**
* Delete backups mass action
*
- * @return \Magento\Adminhtml\Controller\Action
+ * @return \Magento\Backend\Controller\Adminhtml\Action
*/
public function massDeleteAction()
{
$backupIds = $this->getRequest()->getParam('ids', array());
if (!is_array($backupIds) || !count($backupIds)) {
- return $this->_redirect('*/*/index');
+ return $this->_redirect('adminhtml/*/index');
}
/** @var $backupModel \Magento\Backup\Model\Backup */
@@ -378,7 +378,7 @@ class Backup extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addError($deleteFailMessage);
}
- return $this->_redirect('*/*/index');
+ return $this->_redirect('adminhtml/*/index');
}
/**
diff --git a/app/code/Magento/Adminhtml/Controller/System/Config/System/Storage.php b/app/code/Magento/Adminhtml/Controller/System/Config/System/Storage.php
index 11e60bf1b04..2752ac1f3ef 100644
--- a/app/code/Magento/Adminhtml/Controller/System/Config/System/Storage.php
+++ b/app/code/Magento/Adminhtml/Controller/System/Config/System/Storage.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Controller\System\Config\System;
-class Storage extends \Magento\Adminhtml\Controller\Action
+class Storage extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Return file storage singleton
diff --git a/app/code/Magento/Adminhtml/Controller/System/Design.php b/app/code/Magento/Adminhtml/Controller/System/Design.php
index 6d8f7cb94b1..add865cab9e 100644
--- a/app/code/Magento/Adminhtml/Controller/System/Design.php
+++ b/app/code/Magento/Adminhtml/Controller/System/Design.php
@@ -26,7 +26,7 @@
namespace Magento\Adminhtml\Controller\System;
-class Design extends \Magento\Adminhtml\Controller\Action
+class Design extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -114,12 +114,12 @@ class Design extends \Magento\Adminhtml\Controller\Action
$this->_objectManager->get('Magento\Adminhtml\Model\Session')
->addError($e->getMessage())
->setDesignData($data);
- $this->_redirect('*/*/edit', array('id'=>$design->getId()));
+ $this->_redirect('adminhtml/*/edit', array('id'=>$design->getId()));
return;
}
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
public function deleteAction()
@@ -141,7 +141,7 @@ class Design extends \Magento\Adminhtml\Controller\Action
->addException($e, __("Cannot delete the design change."));
}
}
- $this->getResponse()->setRedirect($this->getUrl('*/*/'));
+ $this->getResponse()->setRedirect($this->getUrl('adminhtml/*/'));
}
protected function _isAllowed()
diff --git a/app/code/Magento/Adminhtml/Controller/System/Email/Template.php b/app/code/Magento/Adminhtml/Controller/System/Email/Template.php
index e34cba11c21..ff57dec4d25 100644
--- a/app/code/Magento/Adminhtml/Controller/System/Email/Template.php
+++ b/app/code/Magento/Adminhtml/Controller/System/Email/Template.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Controller\System\Email;
-class Template extends \Magento\Adminhtml\Controller\Action
+class Template extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -93,7 +93,7 @@ class Template extends \Magento\Adminhtml\Controller\Action
$this->loadLayout();
$template = $this->_initTemplate('id');
$this->_setActiveMenu('Magento_Adminhtml::system_email_template');
- $this->_addBreadcrumb(__('Transactional Emails'), __('Transactional Emails'), $this->getUrl('*/*'));
+ $this->_addBreadcrumb(__('Transactional Emails'), __('Transactional Emails'), $this->getUrl('adminhtml/*'));
if ($this->getRequest()->getParam('id')) {
$this->_addBreadcrumb(__('Edit Template'), __('Edit System Template'));
@@ -119,7 +119,7 @@ class Template extends \Magento\Adminhtml\Controller\Action
if (!$template->getId() && $id) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')
->addError(__('This email template no longer exists.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
@@ -145,7 +145,7 @@ class Template extends \Magento\Adminhtml\Controller\Action
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->setFormData(false);
$this->_objectManager->get('Magento\Adminhtml\Model\Session')
->addSuccess(__('The email template has been saved.'));
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
} catch (\Exception $e) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')
->setData('email_template_form_data', $request->getParams());
@@ -165,7 +165,7 @@ class Template extends \Magento\Adminhtml\Controller\Action
$this->_objectManager->get('Magento\Adminhtml\Model\Session')
->addSuccess(__('The email template has been deleted.'));
// go to grid
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
@@ -176,7 +176,7 @@ class Template extends \Magento\Adminhtml\Controller\Action
$this->_objectManager->get('Magento\Adminhtml\Model\Session')
->setFormData($this->getRequest()->getParams());
// redirect to edit form
- $this->_redirect('*/*/edit', array('id' => $template->getId()));
+ $this->_redirect('adminhtml/*/edit', array('id' => $template->getId()));
return;
}
}
@@ -184,7 +184,7 @@ class Template extends \Magento\Adminhtml\Controller\Action
$this->_objectManager->get('Magento\Adminhtml\Model\Session')
->addError(__('We can\'t find an email template to delete.'));
// go to grid
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
public function previewAction()
diff --git a/app/code/Magento/Adminhtml/Controller/System/Store.php b/app/code/Magento/Adminhtml/Controller/System/Store.php
index 7fe8aac1ace..f65f38436ed 100644
--- a/app/code/Magento/Adminhtml/Controller/System/Store.php
+++ b/app/code/Magento/Adminhtml/Controller/System/Store.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Controller\System;
-class Store extends \Magento\Adminhtml\Controller\Action
+class Store extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -171,7 +171,7 @@ class Store extends \Magento\Adminhtml\Controller\Action
->renderLayout();
} else {
$session->addError($notExists);
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
}
@@ -179,7 +179,7 @@ class Store extends \Magento\Adminhtml\Controller\Action
{
if ($this->getRequest()->isPost() && $postData = $this->getRequest()->getPost()) {
if (empty($postData['store_type']) || empty($postData['store_action'])) {
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
$session = $this->_getSession();
@@ -243,10 +243,10 @@ class Store extends \Magento\Adminhtml\Controller\Action
$session->addSuccess(__('The store view has been saved'));
break;
default:
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addMessages($e->getMessages());
@@ -258,7 +258,7 @@ class Store extends \Magento\Adminhtml\Controller\Action
$this->_redirectReferer();
return;
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
public function deleteWebsiteAction()
@@ -269,12 +269,12 @@ class Store extends \Magento\Adminhtml\Controller\Action
$itemId = $this->getRequest()->getParam('item_id', null);
if (!$model = $this->_objectManager->create('Magento\Core\Model\Website')->load($itemId)) {
$session->addError(__('Unable to proceed. Please, try again.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return ;
}
if (!$model->isCanDelete()) {
$session->addError(__('This website cannot be deleted.'));
- $this->_redirect('*/*/editWebsite', array('website_id' => $itemId));
+ $this->_redirect('adminhtml/*/editWebsite', array('website_id' => $itemId));
return ;
}
@@ -283,8 +283,8 @@ class Store extends \Magento\Adminhtml\Controller\Action
$this->_initAction()
->_addBreadcrumb(__('Delete Web Site'), __('Delete Web Site'))
->_addContent($this->getLayout()->createBlock('Magento\Adminhtml\Block\System\Store\Delete')
- ->setFormActionUrl($this->getUrl('*/*/deleteWebsitePost'))
- ->setBackUrl($this->getUrl('*/*/editWebsite', array('website_id' => $itemId)))
+ ->setFormActionUrl($this->getUrl('adminhtml/*/deleteWebsitePost'))
+ ->setBackUrl($this->getUrl('adminhtml/*/editWebsite', array('website_id' => $itemId)))
->setStoreTypeTitle(__('Web Site'))
->setDataObject($model)
)
@@ -299,12 +299,12 @@ class Store extends \Magento\Adminhtml\Controller\Action
$itemId = $this->getRequest()->getParam('item_id', null);
if (!$model = $this->_objectManager->create('Magento\Core\Model\Store\Group')->load($itemId)) {
$session->addError(__('Unable to proceed. Please, try again.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return ;
}
if (!$model->isCanDelete()) {
$session->addError(__('This store cannot be deleted.'));
- $this->_redirect('*/*/editGroup', array('group_id' => $itemId));
+ $this->_redirect('adminhtml/*/editGroup', array('group_id' => $itemId));
return ;
}
@@ -313,8 +313,8 @@ class Store extends \Magento\Adminhtml\Controller\Action
$this->_initAction()
->_addBreadcrumb(__('Delete Store'), __('Delete Store'))
->_addContent($this->getLayout()->createBlock('Magento\Adminhtml\Block\System\Store\Delete')
- ->setFormActionUrl($this->getUrl('*/*/deleteGroupPost'))
- ->setBackUrl($this->getUrl('*/*/editGroup', array('group_id' => $itemId)))
+ ->setFormActionUrl($this->getUrl('adminhtml/*/deleteGroupPost'))
+ ->setBackUrl($this->getUrl('adminhtml/*/editGroup', array('group_id' => $itemId)))
->setStoreTypeTitle(__('Store'))
->setDataObject($model)
)
@@ -329,12 +329,12 @@ class Store extends \Magento\Adminhtml\Controller\Action
$itemId = $this->getRequest()->getParam('item_id', null);
if (!$model = $this->_objectManager->create('Magento\Core\Model\Store')->load($itemId)) {
$session->addError(__('Unable to proceed. Please, try again.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return ;
}
if (!$model->isCanDelete()) {
$session->addError(__('This store view cannot be deleted.'));
- $this->_redirect('*/*/editStore', array('store_id' => $itemId));
+ $this->_redirect('adminhtml/*/editStore', array('store_id' => $itemId));
return ;
}
@@ -343,8 +343,8 @@ class Store extends \Magento\Adminhtml\Controller\Action
$this->_initAction()
->_addBreadcrumb(__('Delete Store View'), __('Delete Store View'))
->_addContent($this->getLayout()->createBlock('Magento\Adminhtml\Block\System\Store\Delete')
- ->setFormActionUrl($this->getUrl('*/*/deleteStorePost'))
- ->setBackUrl($this->getUrl('*/*/editStore', array('store_id' => $itemId)))
+ ->setFormActionUrl($this->getUrl('adminhtml/*/deleteStorePost'))
+ ->setBackUrl($this->getUrl('adminhtml/*/editStore', array('store_id' => $itemId)))
->setStoreTypeTitle(__('Store View'))
->setDataObject($model)
)
@@ -358,12 +358,12 @@ class Store extends \Magento\Adminhtml\Controller\Action
if (!$model) {
$this->_getSession()->addError(__('Unable to proceed. Please, try again'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return ;
}
if (!$model->isCanDelete()) {
$this->_getSession()->addError(__('This website cannot be deleted.'));
- $this->_redirect('*/*/editWebsite', array('website_id' => $model->getId()));
+ $this->_redirect('adminhtml/*/editWebsite', array('website_id' => $model->getId()));
return ;
}
@@ -372,14 +372,14 @@ class Store extends \Magento\Adminhtml\Controller\Action
try {
$model->delete();
$this->_getSession()->addSuccess(__('The website has been deleted.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return ;
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
} catch (\Exception $e) {
$this->_getSession()->addException($e, __('Unable to delete website. Please, try again later.'));
}
- $this->_redirect('*/*/editWebsite', array('website_id' => $itemId));
+ $this->_redirect('adminhtml/*/editWebsite', array('website_id' => $itemId));
}
public function deleteGroupPostAction()
@@ -388,12 +388,12 @@ class Store extends \Magento\Adminhtml\Controller\Action
if (!$model = $this->_objectManager->create('Magento\Core\Model\Store\Group')->load($itemId)) {
$this->_getSession()->addError(__('Unable to proceed. Please, try again.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return ;
}
if (!$model->isCanDelete()) {
$this->_getSession()->addError(__('This store cannot be deleted.'));
- $this->_redirect('*/*/editGroup', array('group_id' => $model->getId()));
+ $this->_redirect('adminhtml/*/editGroup', array('group_id' => $model->getId()));
return ;
}
@@ -402,14 +402,14 @@ class Store extends \Magento\Adminhtml\Controller\Action
try {
$model->delete();
$this->_getSession()->addSuccess(__('The store has been deleted.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return ;
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
} catch (\Exception $e) {
$this->_getSession()->addException($e, __('Unable to delete store. Please, try again later.'));
}
- $this->_redirect('*/*/editGroup', array('group_id' => $itemId));
+ $this->_redirect('adminhtml/*/editGroup', array('group_id' => $itemId));
}
/**
@@ -422,12 +422,12 @@ class Store extends \Magento\Adminhtml\Controller\Action
if (!$model = $this->_objectManager->create('Magento\Core\Model\Store')->load($itemId)) {
$this->_getSession()->addError(__('Unable to proceed. Please, try again'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return ;
}
if (!$model->isCanDelete()) {
$this->_getSession()->addError(__('This store view cannot be deleted.'));
- $this->_redirect('*/*/editStore', array('store_id' => $model->getId()));
+ $this->_redirect('adminhtml/*/editStore', array('store_id' => $model->getId()));
return ;
}
@@ -439,14 +439,14 @@ class Store extends \Magento\Adminhtml\Controller\Action
$this->_eventManager->dispatch('store_delete', array('store' => $model));
$this->_getSession()->addSuccess(__('The store view has been deleted.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return ;
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
} catch (\Exception $e) {
$this->_getSession()->addException($e, __('Unable to delete store view. Please, try again later.'));
}
- $this->_redirect('*/*/editStore', array('store_id' => $itemId));
+ $this->_redirect('adminhtml/*/editStore', array('store_id' => $itemId));
}
protected function _isAllowed()
diff --git a/app/code/Magento/Adminhtml/Controller/System/Variable.php b/app/code/Magento/Adminhtml/Controller/System/Variable.php
index 796b09da57e..c3cf3800f30 100644
--- a/app/code/Magento/Adminhtml/Controller/System/Variable.php
+++ b/app/code/Magento/Adminhtml/Controller/System/Variable.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Controller\System;
-class Variable extends \Magento\Adminhtml\Controller\Action
+class Variable extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -159,18 +159,18 @@ class Variable extends \Magento\Adminhtml\Controller\Action
__('You saved the custom variable.')
);
if ($back) {
- $this->_redirect('*/*/edit', array('_current' => true, 'variable_id' => $variable->getId()));
+ $this->_redirect('adminhtml/*/edit', array('_current' => true, 'variable_id' => $variable->getId()));
} else {
- $this->_redirect('*/*/', array());
+ $this->_redirect('adminhtml/*/', array());
}
return;
} catch (\Exception $e) {
$this->_getSession()->addError($e->getMessage());
- $this->_redirect('*/*/edit', array('_current' => true, ));
+ $this->_redirect('adminhtml/*/edit', array('_current' => true, ));
return;
}
}
- $this->_redirect('*/*/', array());
+ $this->_redirect('adminhtml/*/', array());
return;
}
@@ -188,11 +188,11 @@ class Variable extends \Magento\Adminhtml\Controller\Action
);
} catch (\Exception $e) {
$this->_getSession()->addError($e->getMessage());
- $this->_redirect('*/*/edit', array('_current' => true, ));
+ $this->_redirect('adminhtml/*/edit', array('_current' => true, ));
return;
}
}
- $this->_redirect('*/*/', array());
+ $this->_redirect('adminhtml/*/', array());
return;
}
diff --git a/app/code/Magento/Adminhtml/Controller/Urlrewrite.php b/app/code/Magento/Adminhtml/Controller/Urlrewrite.php
index af13365a0a6..5112c98e086 100644
--- a/app/code/Magento/Adminhtml/Controller/Urlrewrite.php
+++ b/app/code/Magento/Adminhtml/Controller/Urlrewrite.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Adminhtml\Controller;
-class Urlrewrite extends \Magento\Adminhtml\Controller\Action
+class Urlrewrite extends \Magento\Backend\Controller\Adminhtml\Action
{
const ID_MODE = 'id';
const PRODUCT_MODE = 'product';
@@ -219,7 +219,7 @@ class Urlrewrite extends \Magento\Adminhtml\Controller\Action
$this->_onUrlRewriteSaveAfter($model);
$session->addSuccess(__('The URL Rewrite has been saved.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
} catch (\Magento\Core\Exception $e) {
$session->addError($e->getMessage())
@@ -411,11 +411,11 @@ class Urlrewrite extends \Magento\Adminhtml\Controller\Action
__('An error occurred while deleting URL Rewrite.');
$this->_objectManager->get('Magento\Adminhtml\Model\Session')
->addException($e, $errorMessage);
- $this->_redirect('*/*/edit/', array('id' => $this->_getUrlRewrite()->getId()));
+ $this->_redirect('adminhtml/*/edit/', array('id' => $this->_getUrlRewrite()->getId()));
return;
}
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
/**
diff --git a/app/code/Magento/Adminhtml/Model/Search/Catalog.php b/app/code/Magento/Adminhtml/Model/Search/Catalog.php
index 41e25abcd43..a34a54267bb 100644
--- a/app/code/Magento/Adminhtml/Model/Search/Catalog.php
+++ b/app/code/Magento/Adminhtml/Model/Search/Catalog.php
@@ -99,7 +99,7 @@ class Catalog extends \Magento\Object
'type' => __('Product'),
'name' => $product->getName(),
'description' => $this->_coreString->substr($description, 0, 30),
- 'url' => $this->_adminhtmlData->getUrl('*/catalog_product/edit', array('id' => $product->getId())),
+ 'url' => $this->_adminhtmlData->getUrl('catalog/product/edit', array('id' => $product->getId())),
);
}
diff --git a/app/code/Magento/Adminhtml/Model/Search/Customer.php b/app/code/Magento/Adminhtml/Model/Search/Customer.php
index 72ab4bae39e..3129e9d5885 100644
--- a/app/code/Magento/Adminhtml/Model/Search/Customer.php
+++ b/app/code/Magento/Adminhtml/Model/Search/Customer.php
@@ -89,7 +89,7 @@ class Customer extends \Magento\Object
'type' => __('Customer'),
'name' => $customer->getName(),
'description' => $customer->getCompany(),
- 'url' => $this->_adminhtmlData->getUrl('*/customer/edit', array('id' => $customer->getId())),
+ 'url' => $this->_adminhtmlData->getUrl('adminhtml/customer/edit', array('id' => $customer->getId())),
);
}
diff --git a/app/code/Magento/Adminhtml/Model/Search/Order.php b/app/code/Magento/Adminhtml/Model/Search/Order.php
index 0a999a9dd62..e247b9db0dc 100644
--- a/app/code/Magento/Adminhtml/Model/Search/Order.php
+++ b/app/code/Magento/Adminhtml/Model/Search/Order.php
@@ -101,7 +101,7 @@ class Order extends \Magento\Object
'form_panel_title' => __('Order #%1 (%2)',
$order->getIncrementId(),
$order->getBillingFirstname() . ' ' . $order->getBillingLastname()),
- 'url' => $this->_adminhtmlData->getUrl('*/sales_order/view', array('order_id' => $order->getId())),
+ 'url' => $this->_adminhtmlData->getUrl('sales/order/view', array('order_id' => $order->getId())),
);
}
diff --git a/app/code/Magento/Adminhtml/etc/di.xml b/app/code/Magento/Adminhtml/etc/di.xml
index be3a96f2292..c3fa4d3d403 100644
--- a/app/code/Magento/Adminhtml/etc/di.xml
+++ b/app/code/Magento/Adminhtml/etc/di.xml
@@ -24,17 +24,17 @@
*/
-->
<config>
- <type name="Magento\Adminhtml\Controller\Catalog\Product\Attribute">
+ <type name="Magento\Catalog\Controller\Adminhtml\Product\Attribute">
<param name="attributeLabelCache">
<instance type="Magento\Core\Model\Cache\Type\Translate" />
</param>
</type>
- <type name="Magento\Adminhtml\Helper\Dashboard\Data">
+ <type name="Magento\Backend\Helper\Dashboard\Data">
<param name="installDate">
<value type="argument">Magento\App\State::PARAM_INSTALL_DATE</value>
</param>
</type>
- <type name="Magento\Adminhtml\Block\Rating\Edit\Tab\Form">
+ <type name="Magento\Rating\Block\Adminhtml\Edit\Tab\Form">
<param name="session">
<instance type="Magento\Adminhtml\Model\Session" />
</param>
diff --git a/app/code/Magento/Adminhtml/etc/module.xml b/app/code/Magento/Adminhtml/etc/module.xml
index b6907d43c88..f34309c3f0d 100755
--- a/app/code/Magento/Adminhtml/etc/module.xml
+++ b/app/code/Magento/Adminhtml/etc/module.xml
@@ -27,7 +27,6 @@
<module name="Magento_Adminhtml" version="0.7.1" active="true">
<depends>
<module name="Magento_Core"/>
- <module name="Magento_AdminNotification"/>
<module name="Magento_Reports"/>
<module name="Magento_Customer"/>
<module name="Magento_Newsletter"/>
@@ -43,19 +42,15 @@
<module name="Magento_Rating"/>
<module name="Magento_Tax"/>
<module name="Magento_Eav"/>
- <module name="Magento_CatalogInventory"/>
<module name="Magento_CatalogSearch"/>
- <module name="Magento_Index"/>
<module name="Magento_Rule"/>
<module name="Magento_SalesRule"/>
<module name="Magento_Downloadable"/>
- <module name="Magento_Payment"/>
<module name="Magento_Shipping"/>
<module name="Magento_Backup"/>
<module name="Magento_User"/>
<module name="Magento_Checkout"/>
<module name="Magento_Widget"/>
- <module name="Magento_ProductAlert"/>
<module name="Magento_Log"/>
<module name="Magento_Page"/>
<module name="Magento_GiftMessage"/>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/backup/dialogs.phtml b/app/code/Magento/Adminhtml/view/adminhtml/backup/dialogs.phtml
index 5e6cd20a621..6b6ed9d329b 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/backup/dialogs.phtml
+++ b/app/code/Magento/Adminhtml/view/adminhtml/backup/dialogs.phtml
@@ -150,8 +150,8 @@
<?php
$helper = $this->helper('Magento\Backup\Helper\Data');
- $rollbackUrl = $this->getUrl('*/*/rollback');
- $backupUrl = $this->getUrl('*/*/create');
+ $rollbackUrl = $this->getUrl('adminhtml/*/rollback');
+ $backupUrl = $this->getUrl('adminhtml/*/create');
?>
<script type="text/javascript">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/customer/tab/cart.phtml b/app/code/Magento/Adminhtml/view/adminhtml/customer/tab/cart.phtml
index 2f484023407..75f1efbed0e 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/customer/tab/cart.phtml
+++ b/app/code/Magento/Adminhtml/view/adminhtml/customer/tab/cart.phtml
@@ -87,8 +87,8 @@ $params = array(
productConfigure.addListType(
'<?php echo $listType ?>',
{
- urlFetch: '<?php echo $this->getUrl('*/customer_cart_product_composite_cart/configure', $params) ?>',
- urlConfirm: '<?php echo $this->getUrl('*/customer_cart_product_composite_cart/update', $params) ?>'
+ urlFetch: '<?php echo $this->getUrl('adminhtml/customer_cart_product_composite_cart/configure', $params) ?>',
+ urlConfirm: '<?php echo $this->getUrl('adminhtml/customer_cart_product_composite_cart/update', $params) ?>'
}
);
</script>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_cms_block_index.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_cms_block_index.xml
index f93da0dd349..265c1599966 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_cms_block_index.xml
+++ b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_cms_block_index.xml
@@ -37,7 +37,7 @@
<arguments>
<argument name="id" xsi:type="string">cmsBlockGrid</argument>
<argument name="rowUrl" xsi:type="array">
- <item name="path" xsi:type="string">*/*/edit</item>
+ <item name="path" xsi:type="string">adminhtml/*/edit</item>
<item name="extraParamsTemplate" xsi:type="array">
<item name="block_id" xsi:type="string">getId</item>
</item>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_customer_edit.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_customer_edit.xml
index 48b014416c5..c28a3b842c7 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_customer_edit.xml
+++ b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_customer_edit.xml
@@ -31,7 +31,7 @@
<block class="Magento\Adminhtml\Block\Template" name="optional_zip_countries" as="optional_zip_countries" template="Magento_Directory::js/optional_zip_countries.phtml"/>
<block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-catalog-product-composite-configure-js">
<arguments>
- <argument name="file" xsi:type="string">Magento_Adminhtml::catalog/product/composite/configure.js</argument>
+ <argument name="file" xsi:type="string">Magento_Catalog::catalog/product/composite/configure.js</argument>
</arguments>
</block>
<block class="Magento\Page\Block\Html\Head\Script" name="varien-configurable-js">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_customer_group_index.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_customer_group_index.xml
index baa108f324a..8fd72e0ec4e 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_customer_group_index.xml
+++ b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_customer_group_index.xml
@@ -37,7 +37,7 @@
<block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="adminhtml.customer.group.grid.columnSet">
<arguments>
<argument name="rowUrl" xsi:type="array">
- <item name="path" xsi:type="string">*/*/edit</item>
+ <item name="path" xsi:type="string">adminhtml/*/edit</item>
<item name="extraParamsTemplate" xsi:type="array">
<item name="id" xsi:type="string">getId</item>
</item>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_customer_online_index.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_customer_online_index.xml
index 8a6dadb8b64..6b172871def 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_customer_online_index.xml
+++ b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_customer_online_index.xml
@@ -38,7 +38,7 @@
<arguments>
<argument name="rowUrl" xsi:type="array">
<item name="generatorClass" xsi:type="string">Magento\Log\Model\Resource\Visitor\Online\Grid\Row\UrlGenerator</item>
- <item name="path" xsi:type="string">*/customer/edit</item>
+ <item name="path" xsi:type="string">adminhtml/customer/edit</item>
<item name="extraParamsTemplate" xsi:type="array">
<item name="id" xsi:type="string">getCustomerId</item>
</item>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_block.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_block.xml
index ca8174db5de..2dbf6c7b132 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_block.xml
+++ b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_block.xml
@@ -41,11 +41,11 @@
<argument name="options" xsi:type="array">
<item name="unsubscribe" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Unsubscribe</item>
- <item name="url" xsi:type="string">*/*/massUnsubscribe</item>
+ <item name="url" xsi:type="string">adminhtml/*/massUnsubscribe</item>
</item>
<item name="delete" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Delete</item>
- <item name="url" xsi:type="string">*/*/massDelete</item>
+ <item name="url" xsi:type="string">adminhtml/*/massDelete</item>
</item>
</argument>
</arguments>
@@ -54,11 +54,11 @@
<arguments>
<argument name="exportTypes" xsi:type="array">
<item name="csv" xsi:type="array">
- <item name="urlPath" xsi:type="string">*/*/exportCsv</item>
+ <item name="urlPath" xsi:type="string">adminhtml/*/exportCsv</item>
<item name="label" xsi:type="string" translate="true">CSV</item>
</item>
<item name="excel" xsi:type="array">
- <item name="urlPath" xsi:type="string">*/*/exportXml</item>
+ <item name="urlPath" xsi:type="string">adminhtml/*/exportXml</item>
<item name="label" xsi:type="string" translate="true">Excel XML</item>
</item>
</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_promo_catalog_block.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_promo_catalog_block.xml
index 43ea3661227..438e9e61e45 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_promo_catalog_block.xml
+++ b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_promo_catalog_block.xml
@@ -36,7 +36,7 @@
<block class="Magento\Backend\Block\Widget\Grid\ColumnSet" name="promo.catalog.grid.columnSet" as="grid.columnSet">
<arguments>
<argument name="rowUrl" xsi:type="array">
- <item name="path" xsi:type="string">*/*/edit</item>
+ <item name="path" xsi:type="string">adminhtml/*/edit</item>
<item name="extraParamsTemplate" xsi:type="array">
<item name="id" xsi:type="string">getRuleId</item>
</item>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_promo_quote_index.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_promo_quote_index.xml
index 70dbda6365b..e4d417cb8e4 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_promo_quote_index.xml
+++ b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_promo_quote_index.xml
@@ -37,7 +37,7 @@
<block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="adminhtml.promo.quote.grid.columnSet">
<arguments>
<argument name="rowUrl" xsi:type="array">
- <item name="path" xsi:type="string">*/*/edit</item>
+ <item name="path" xsi:type="string">adminhtml/*/edit</item>
<item name="extraParamsTemplate" xsi:type="array">
<item name="id" xsi:type="string">getRuleId</item>
</item>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_search_block.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_search_block.xml
index 2af76a4572a..a08d9aa4ab9 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_search_block.xml
+++ b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_search_block.xml
@@ -36,11 +36,11 @@
<arguments>
<argument name="exportTypes" xsi:type="array">
<item name="csv" xsi:type="array">
- <item name="urlPath" xsi:type="string">*/*/exportSearchCsv</item>
+ <item name="urlPath" xsi:type="string">adminhtml/*/exportSearchCsv</item>
<item name="label" xsi:type="string" translate="true">CSV</item>
</item>
<item name="excel" xsi:type="array">
- <item name="urlPath" xsi:type="string">*/*/exportSearchExcel</item>
+ <item name="urlPath" xsi:type="string">adminhtml/*/exportSearchExcel</item>
<item name="label" xsi:type="string" translate="true">Excel XML</item>
</item>
</argument>
@@ -49,7 +49,7 @@
<block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="adminhtml.report.search.grid.columnSet">
<arguments>
<argument name="rowUrl" xsi:type="array">
- <item name="path" xsi:type="string">*/catalog_search/edit</item>
+ <item name="path" xsi:type="string">adminhtml/catalog_search/edit</item>
<item name="extraParamsTemplate" xsi:type="array">
<item name="id" xsi:type="string">getId</item>
</item>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_addcomment.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_addcomment.xml
deleted file mode 100644
index 18b3455feff..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_addcomment.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <block class="Magento\Adminhtml\Block\Sales\Order\View\History" name="order_history" template="sales/order/view/history.phtml" output="1"/>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_index.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_index.xml
deleted file mode 100644
index af573ae5cea..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_index.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_sales_order_create_customer_block"/>
- <referenceBlock name="page-title">
- <action method="setTitleId">
- <argument translate="true" name="id" xsi:type="string">order-header</argument>
- </action>
- </referenceBlock>
- <referenceBlock name="head">
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-sales-order-create-scripts-js">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Adminhtml::sales/order/create/scripts.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-sales-order-create-giftmessage-js">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Adminhtml::sales/order/create/giftmessage.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-catalog-product-composite-configure-js">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Adminhtml::catalog/product/composite/configure.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="varien-configurable-js">
- <arguments>
- <argument name="file" xsi:type="string">varien/configurable.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-sales-order-giftoptions-tooltip-js">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Adminhtml::sales/order/giftoptions_tooltip.js</argument>
- </arguments>
- </block>
- <block class="Magento\Adminhtml\Block\Template" name="optional_zip_countries" as="optional_zip_countries" template="Magento_Directory::js/optional_zip_countries.phtml"/>
- <block class="Magento\Page\Block\Html\Head\Css" name="magento-core-prototype-magento-css">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Core::prototype/magento.css</argument>
- </arguments>
- </block>
- </referenceBlock>
- <referenceContainer name="js">
- <block class="Magento\Adminhtml\Block\Template" template="sales/order/create/js.phtml" name="create"/>
- </referenceContainer>
- <referenceBlock name="root">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create" name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Form" template="sales/order/create/form.phtml" name="order_create_form" as="form">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Messages" name="message"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Customer" template="sales/order/create/abstract.phtml" name="customer.grid.container"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Store" template="sales/order/create/abstract.phtml" name="store">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Store\Select" template="sales/order/create/store/select.phtml" name="select"/>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Data" template="sales/order/create/data.phtml" name="data">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar" template="sales/order/create/sidebar.phtml" name="sidebar">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Cart" template="sales/order/create/sidebar/items.phtml" name="cart"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Wishlist" template="sales/order/create/sidebar/items.phtml" name="wishlist"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Reorder" template="sales/order/create/sidebar/items.phtml" name="reorder"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Viewed" template="sales/order/create/sidebar/items.phtml" name="viewed"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Compared" template="sales/order/create/sidebar/items.phtml" name="compared"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Pcompared" template="sales/order/create/sidebar/items.phtml" name="pcompared"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Pviewed" template="sales/order/create/sidebar/items.phtml" name="pviewed"/>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Form\Account" template="sales/order/create/form/account.phtml" name="form_account"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Shipping\Address" template="sales/order/create/form/address.phtml" name="shipping_address"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Billing\Address" template="sales/order/create/form/address.phtml" name="billing_address"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Shipping\Method" template="sales/order/create/abstract.phtml" name="shipping_method">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Shipping\Method\Form" template="sales/order/create/shipping/method/form.phtml" name="order_create_shipping_form" as="form"/>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Billing\Method" template="sales/order/create/abstract.phtml" name="billing_method">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Billing\Method\Form" template="sales/order/create/billing/method/form.phtml" name="order_create_billing_form" as="form"/>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Newsletter" template="sales/order/create/abstract.phtml" name="newsletter">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Newsletter\Form" template="sales/order/create/newsletter/form.phtml" name="order_create_newsletter_form" as="form"/>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Search" template="sales/order/create/abstract.phtml" name="search">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Search\Grid" name="search_grid" as="grid"/>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Items" template="sales/order/create/items.phtml" name="items">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Items\Grid" template="sales/order/create/items/grid.phtml" name="items_grid">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Coupons" template="sales/order/create/coupons/form.phtml" name="coupons">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Coupons\Form" template="sales/order/create/coupons/form.phtml" name="order_create_coupons_form" as="form"/>
- </block>
- </block>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Comment" template="sales/order/create/comment.phtml" name="comment"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Totals" template="sales/order/create/totals.phtml" name="totals"/>
- <block class="Magento\Adminhtml\Block\Template" name="gift_options" template="sales/order/giftoptions.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Giftmessage" template="sales/order/create/giftmessage.phtml" name="giftmessage"/>
- </block>
- <block class="Magento\Core\Block\Text\ListText" name="order_item_extra_info"/>
- </block>
- </block>
- </block>
- </referenceBlock>
- <referenceContainer name="before_body_end">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Composite\Configure" template="catalog/product/composite/configure.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_data.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_data.xml
deleted file mode 100644
index 13e767fc95b..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_data.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Data" template="sales/order/create/data.phtml" name="data">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar" template="sales/order/create/sidebar.phtml" name="sidebar">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Cart" template="sales/order/create/sidebar/items.phtml" name="cart"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Wishlist" template="sales/order/create/sidebar/items.phtml" name="wishlist"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Reorder" template="sales/order/create/sidebar/items.phtml" name="reorder"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Viewed" template="sales/order/create/sidebar/items.phtml" name="viewed"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Compared" template="sales/order/create/sidebar/items.phtml" name="compared"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Pcompared" template="sales/order/create/sidebar/items.phtml" name="pcompared"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Pviewed" template="sales/order/create/sidebar/items.phtml" name="pviewed"/>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Form\Account" template="sales/order/create/form/account.phtml" name="form_account"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Shipping\Address" template="sales/order/create/form/address.phtml" name="shipping_address"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Billing\Address" template="sales/order/create/form/address.phtml" name="billing_address"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Shipping\Method" template="sales/order/create/abstract.phtml" name="shipping_method">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Shipping\Method\Form" template="sales/order/create/shipping/method/form.phtml" name="order.create.shipping.method.form" as="form"/>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Billing\Method" template="sales/order/create/abstract.phtml" name="billing_method">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Billing\Method\Form" template="sales/order/create/billing/method/form.phtml" name="order.create.billing.method.form" as="form"/>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Newsletter" template="sales/order/create/abstract.phtml" name="newsletter">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Newsletter\Form" template="sales/order/create/newsletter/form.phtml" name="order.create.newsletter.form" as="form"/>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Search" template="sales/order/create/abstract.phtml" name="search">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Search\Grid" name="search.grid" as="grid"/>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Items" template="sales/order/create/items.phtml" name="items">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Items\Grid" template="sales/order/create/items/grid.phtml" name="items_grid">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Coupons" template="sales/order/create/coupons/form.phtml" name="coupons">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Coupons\Form" template="sales/order/create/coupons/form.phtml" name="order.create.coupons.form" as="form"/>
- </block>
- </block>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Comment" template="sales/order/create/comment.phtml" name="comment"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Totals" template="sales/order/create/totals.phtml" name="totals"/>
- <block class="Magento\Adminhtml\Block\Template" name="gift_options" template="sales/order/giftoptions.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Giftmessage" template="sales/order/create/giftmessage.phtml" name="giftmessage"/>
- </block>
- <block class="Magento\Core\Block\Text\ListText" name="order_item_extra_info"/>
- </block>
- </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_shipping_address.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_shipping_address.xml
deleted file mode 100644
index c1f137bbaa8..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_shipping_address.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Shipping\Address" template="sales/order/create/form/address.phtml" name="shipping_address"/>
- </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_shipping_method.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_shipping_method.xml
deleted file mode 100644
index e37c1b5c7c2..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_shipping_method.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Shipping\Method" template="sales/order/create/abstract.phtml" name="shipping_method">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Shipping\Method\Form" template="sales/order/create/shipping/method/form.phtml" name="order.create.shipping.method.form" as="form"/>
- </block>
- </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar.xml
deleted file mode 100644
index b471bad43ec..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar" template="sales/order/create/sidebar.phtml" name="sidebar">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Cart" template="sales/order/create/sidebar/items.phtml" name="cart"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Wishlist" template="sales/order/create/sidebar/items.phtml" name="wishlist"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Reorder" template="sales/order/create/sidebar/items.phtml" name="reorder"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Viewed" template="sales/order/create/sidebar/items.phtml" name="viewed"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Compared" template="sales/order/create/sidebar/items.phtml" name="compared"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Pcompared" template="sales/order/create/sidebar/items.phtml" name="pcompared"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Pviewed" template="sales/order/create/sidebar/items.phtml" name="pviewed"/>
- </block>
- </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_cart.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_cart.xml
deleted file mode 100644
index d7a56fcf25d..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_cart.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Cart" template="sales/order/create/sidebar/items.phtml" name="sidebar_cart"/>
- </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_compared.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_compared.xml
deleted file mode 100644
index e541e467382..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_compared.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Compared" template="sales/order/create/sidebar/items.phtml" name="sidebar_compared"/>
- </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_pcompared.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_pcompared.xml
deleted file mode 100644
index 9cbc48bcdb3..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_pcompared.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Pcompared" template="sales/order/create/sidebar/items.phtml" name="sidebar_pcompared"/>
- </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_pviewed.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_pviewed.xml
deleted file mode 100644
index 5ef73a59007..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_pviewed.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Pviewed" template="sales/order/create/sidebar/items.phtml" name="sidebar_pviewed"/>
- </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_reorder.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_reorder.xml
deleted file mode 100644
index a021683e565..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_reorder.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Reorder" template="sales/order/create/sidebar/items.phtml" name="sidebar_reorder"/>
- </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_viewed.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_viewed.xml
deleted file mode 100644
index 5c0caa41551..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_viewed.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Viewed" template="sales/order/create/sidebar/items.phtml" name="sidebar_viewed"/>
- </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_wishlist.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_wishlist.xml
deleted file mode 100644
index c6d6394fce9..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_sidebar_wishlist.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Wishlist" template="sales/order/create/sidebar/items.phtml" name="sidebar_wishlist"/>
- </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_totals.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_totals.xml
deleted file mode 100644
index 6994e73384a..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_totals.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Totals" template="sales/order/create/totals.phtml" name="totals"/>
- </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_creditmemo_new.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_creditmemo_new.xml
deleted file mode 100644
index 0b052ac2615..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_creditmemo_new.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Creditmemo\Create" name="sales_creditmemo_create">
- <block class="Magento\Adminhtml\Block\Sales\Order\Creditmemo\Create\Form" name="form" template="sales/order/creditmemo/create/form.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\View\Info" name="order_info" template="sales/order/view/info.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Payment" name="order_payment"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Creditmemo\Create\Items" name="order_items" template="sales/order/creditmemo/create/items.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Items\Renderer\DefaultRenderer" as="default" template="sales/order/creditmemo/create/items/renderer/default.phtml"/>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">qty</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Qty</argument>
- <argument name="template" xsi:type="string">sales/items/column/qty.phtml</argument>
- </action>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">name</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Name</argument>
- <argument name="template" xsi:type="string">sales/items/column/name.phtml</argument>
- </action>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">name</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Name\Grouped</argument>
- <argument name="template" xsi:type="string">sales/items/column/name.phtml</argument>
- <argument name="type" xsi:type="string">grouped</argument>
- </action>
- <block class="Magento\Core\Block\Text\ListText" name="order_item_extra_info"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totalbar" name="order_totalbar" template="sales/order/totalbar.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Creditmemo\Totals" name="creditmemo_totals" template="sales/order/totals.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\Creditmemo\Create\Adjustments" name="adjustments" template="sales/order/creditmemo/create/totals/adjustments.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Tax" name="tax" template="sales/order/totals/tax.phtml"/>
- <!--
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="footer" template="sales/order/totals/footer.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="grand" template="sales/order/totals/grand.phtml">
- <action method="setGrandTotalTitle">
- <argument name="title" xsi:type="string">Total Refund</argument>
- </action>
- </block>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="sales.order.view.totals.main" as="main" template="sales/order/totals/main.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="tax" template="sales/order/totals/item.phtml">
- <action method="setSourceField">
- <argument name="value" xsi:type="string">tax_amount</argument>
- </action>
- <action method="setLabel">
- <argument name="value" xsi:type="string">Tax</argument>
- </action>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="discount" template="sales/order/totals/item.phtml">
- <action method="setSourceField">
- <argument name="value" xsi:type="string">discount_amount</argument>
- </action>
- <action method="setLabel">
- <argument name="value" xsi:type="string">Discount</argument>
- </action>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="adjustments" template="sales/order/creditmemo/create/totals/adjustments.phtml"/>
- </block>
- -->
- </block>
- <container name="submit_before" label="Submit Before"/>
- <container name="submit_after" label="Submit After"/>
- </block>
- </block>
- </block>
- </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_creditmemo_updateqty.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_creditmemo_updateqty.xml
deleted file mode 100644
index 204bcc41055..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_creditmemo_updateqty.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <block class="Magento\Adminhtml\Block\Sales\Order\Creditmemo\Create\Items" name="order_items" template="sales/order/creditmemo/create/items.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Items\Renderer\DefaultRenderer" as="default" template="sales/order/creditmemo/create/items/renderer/default.phtml"/>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">qty</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Qty</argument>
- <argument name="template" xsi:type="string">sales/items/column/qty.phtml</argument>
- </action>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">name</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Name</argument>
- <argument name="template" xsi:type="string">sales/items/column/name.phtml</argument>
- </action>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">name</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Name\Grouped</argument>
- <argument name="template" xsi:type="string">sales/items/column/name.phtml</argument>
- <argument name="type" xsi:type="string">grouped</argument>
- </action>
- <block class="Magento\Core\Block\Text\ListText" name="order_item_extra_info"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totalbar" name="order_totalbar" template="sales/order/totalbar.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Creditmemo\Totals" name="creditmemo_totals" template="sales/order/totals.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\Creditmemo\Create\Adjustments" name="adjustments" template="sales/order/creditmemo/create/totals/adjustments.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Tax" name="tax" template="sales/order/totals/tax.phtml"/>
- <!--<block class="Magento\Adminhtml\Block\Sales\Order\Totals" name="order_totals" template="sales/order/totals.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="footer" template="sales/order/totals/footer.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="grand" template="sales/order/totals/grand.phtml">
- <action method="setGrandTotalTitle">
- <argument name="title" xsi:type="string">Total Refund</argument>
- </action>
- </block>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="sales.order.view.totals.main" as="main" template="sales/order/totals/main.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="tax" template="sales/order/totals/item.phtml">
- <action method="setSourceField">
- <argument name="value" xsi:type="string">tax_amount</argument>
- </action>
- <action method="setLabel">
- <argument name="value" xsi:type="string">Tax</argument>
- </action>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="discount" template="sales/order/totals/item.phtml">
- <action method="setSourceField">
- <argument name="value" xsi:type="string">discount_amount</argument>
- </action>
- <action method="setLabel">
- <argument name="value" xsi:type="string">Discount</argument>
- </action>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="adjustments" template="sales/order/creditmemo/create/totals/adjustments.phtml"/>
- </block>-->
- </block>
- <container name="submit_before" label="Submit Before"/>
- <container name="submit_after" label="Submit After"/>
- </block>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_creditmemo_view.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_creditmemo_view.xml
deleted file mode 100644
index c5e74c6b0b9..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_creditmemo_view.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Creditmemo\View" name="sales_creditmemo_view">
- <block class="Magento\Adminhtml\Block\Sales\Order\Creditmemo\View\Form" name="form" template="sales/order/creditmemo/view/form.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\View\Info" name="order_info" template="sales/order/view/info.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Payment" name="order_payment"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Creditmemo\View\Items" name="creditmemo_items" template="sales/order/creditmemo/view/items.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Items\Renderer\DefaultRenderer" as="default" template="sales/order/creditmemo/view/items/renderer/default.phtml"/>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">qty</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Qty</argument>
- <argument name="template" xsi:type="string">sales/items/column/qty.phtml</argument>
- </action>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">name</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Name</argument>
- <argument name="template" xsi:type="string">sales/items/column/name.phtml</argument>
- </action>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">name</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Name\Grouped</argument>
- <argument name="template" xsi:type="string">sales/items/column/name.phtml</argument>
- <argument name="type" xsi:type="string">grouped</argument>
- </action>
- <block class="Magento\Core\Block\Text\ListText" name="order_item_extra_info"/>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Comments\View" name="order_comments" template="sales/order/comments/view.phtml">
- <action method="setParentType">
- <argument name="type" xsi:type="string">creditmemo</argument>
- </action>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Creditmemo\Totals" name="creditmemo_totals" template="sales/order/totals.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Tax" name="tax" template="sales/order/totals/tax.phtml"/>
- <!--<block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="footer" template="sales/order/totals/footer.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="grand" template="sales/order/totals/grand.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="paid" template="sales/order/totals/paid.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="refunded" template="sales/order/totals/refunded.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="due" template="sales/order/totals/due.phtml"/>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="sales.order.view.totals.main" as="main" template="sales/order/totals/main.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Tax" name="tax" template="sales/order/totals/tax.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="shipping" template="sales/order/totals/shipping.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="discount" template="sales/order/totals/discount.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="giftcert" template="sales/order/totals/item.phtml">
- <action method="setSourceField">
- <argument name="value" xsi:type="string">giftcert_amount</argument>
- </action>
- <action method="setLabel">
- <argument name="value" xsi:type="string">Gift Certificate</argument>
- </action>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="adjustment_positive" template="sales/order/totals/item.phtml">
- <action method="setSourceField">
- <argument name="value" xsi:type="string">adjustment_positive</argument>
- </action>
- <action method="setLabel">
- <argument name="value" xsi:type="string">Adjustment Refund</argument>
- </action>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="adjustment_negative" template="sales/order/totals/item.phtml">
- <action method="setSourceField">
- <argument name="value" xsi:type="string">adjustment_negative</argument>
- </action>
- <action method="setLabel">
- <argument name="value" xsi:type="string">Adjustment Fee</argument>
- </action>
- </block>
- </block>-->
- </block>
- </block>
- </block>
- </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_invoice_new.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_invoice_new.xml
deleted file mode 100644
index d7e115c53bd..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_invoice_new.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Invoice\Create" name="sales_invoice_create">
- <block class="Magento\Adminhtml\Block\Sales\Order\Invoice\Create\Form" name="form" template="sales/order/invoice/create/form.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\View\Info" name="order_info" template="sales/order/view/info.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Payment" name="order_payment"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Invoice\Create\Items" name="order_items" template="sales/order/invoice/create/items.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Items\Renderer\DefaultRenderer" as="default" template="sales/order/invoice/create/items/renderer/default.phtml"/>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">qty</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Qty</argument>
- <argument name="template" xsi:type="string">sales/items/column/qty.phtml</argument>
- </action>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">name</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Name</argument>
- <argument name="template" xsi:type="string">sales/items/column/name.phtml</argument>
- </action>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">name</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Name\Grouped</argument>
- <argument name="template" xsi:type="string">sales/items/column/name.phtml</argument>
- <argument name="type" xsi:type="string">grouped</argument>
- </action>
- <block class="Magento\Core\Block\Text\ListText" name="order_item_extra_info"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totalbar" name="order_totalbar" template="sales/order/totalbar.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Invoice\Totals" name="invoice_totals" template="sales/order/totals.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Tax" name="tax" template="sales/order/totals/tax.phtml"/>
- <!--<block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="footer" template="sales/order/totals/footer.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="grand" template="sales/order/totals/grand.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="paid" template="sales/order/totals/paid.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="refunded" template="sales/order/totals/refunded.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="due" template="sales/order/totals/due.phtml"/>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="sales.order.view.totals.main" as="main" template="sales/order/totals/main.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="tax" template="sales/order/totals/item.phtml">
- <action method="setSourceField">
- <argument name="value" xsi:type="string">tax_amount</argument>
- </action>
- <action method="setLabel">
- <argument name="value" xsi:type="string">Tax</argument>
- </action>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="shipping" template="sales/order/totals/shipping.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="discount" template="sales/order/totals/discount.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="giftcert" template="sales/order/totals/item.phtml">
- <action method="setSourceField">
- <argument name="value" xsi:type="string">giftcert_amount</argument>
- </action>
- <action method="setLabel">
- <argument name="value" xsi:type="string">Gift Certificate</argument>
- </action>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="adjustment_positive" template="sales/order/totals/item.phtml">
- <action method="setSourceField">
- <argument name="value" xsi:type="string">adjustment_positive</argument>
- </action>
- <action method="setLabel">
- <argument name="value" xsi:type="string">Adjustment Refund</argument>
- </action>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="adjustment_negative" template="sales/order/totals/item.phtml">
- <action method="setSourceField">
- <argument name="value" xsi:type="string">adjustment_negative</argument>
- </action>
- <action method="setLabel">
- <argument name="value" xsi:type="string">Adjustment Fee</argument>
- </action>
- </block>
- </block>-->
- </block>
- </block>
- </block>
- </block>
- </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_invoice_updateqty.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_invoice_updateqty.xml
deleted file mode 100644
index e6b50b6e52c..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_invoice_updateqty.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <block class="Magento\Adminhtml\Block\Sales\Order\Invoice\Create\Items" name="order_items" template="sales/order/invoice/create/items.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Items\Renderer\DefaultRenderer" as="default" template="sales/order/invoice/create/items/renderer/default.phtml"/>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">qty</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Qty</argument>
- <argument name="template" xsi:type="string">sales/items/column/qty.phtml</argument>
- </action>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">name</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Name</argument>
- <argument name="template" xsi:type="string">sales/items/column/name.phtml</argument>
- </action>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">name</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Name\Grouped</argument>
- <argument name="template" xsi:type="string">sales/items/column/name.phtml</argument>
- <argument name="type" xsi:type="string">grouped</argument>
- </action>
- <block class="Magento\Core\Block\Text\ListText" name="order_item_extra_info"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totalbar" name="order_totalbar" template="sales/order/totalbar.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Invoice\Totals" name="invoice_totals" template="sales/order/totals.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Tax" name="tax" template="sales/order/totals/tax.phtml"/>
- <!--<block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="footer" template="sales/order/totals/footer.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="grand" template="sales/order/totals/grand.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="paid" template="sales/order/totals/paid.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="refunded" template="sales/order/totals/refunded.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="due" template="sales/order/totals/due.phtml"/>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="sales.order.view.totals.main" as="main" template="sales/order/totals/main.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="tax" template="sales/order/totals/item.phtml">
- <action method="setSourceField">
- <argument name="value" xsi:type="string">tax_amount</argument>
- </action>
- <action method="setLabel">
- <argument name="value" xsi:type="string">Tax</argument>
- </action>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="shipping" template="sales/order/totals/shipping.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="discount" template="sales/order/totals/discount.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="giftcert" template="sales/order/totals/item.phtml">
- <action method="setSourceField">
- <argument name="value" xsi:type="string">giftcert_amount</argument>
- </action>
- <action method="setLabel">
- <argument name="value" xsi:type="string">Gift Certificate</argument>
- </action>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="adjustment_positive" template="sales/order/totals/item.phtml">
- <action method="setSourceField">
- <argument name="value" xsi:type="string">adjustment_positive</argument>
- </action>
- <action method="setLabel">
- <argument name="value" xsi:type="string">Adjustment Refund</argument>
- </action>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="adjustment_negative" template="sales/order/totals/item.phtml">
- <action method="setSourceField">
- <argument name="value" xsi:type="string">adjustment_negative</argument>
- </action>
- <action method="setLabel">
- <argument name="value" xsi:type="string">Adjustment Fee</argument>
- </action>
- </block>
- </block>-->
- </block>
- </block>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_invoice_view.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_invoice_view.xml
deleted file mode 100644
index 3f79e7a5f85..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_invoice_view.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Invoice\View" name="sales_invoice_view">
- <block class="Magento\Adminhtml\Block\Sales\Order\Invoice\View\Form" name="form" template="sales/order/invoice/view/form.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\View\Info" name="order_info" template="sales/order/view/info.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Payment" name="order_payment"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Invoice\View\Items" name="invoice_items" template="sales/order/invoice/view/items.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Items\Renderer\DefaultRenderer" as="default" template="sales/order/invoice/view/items/renderer/default.phtml"/>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">qty</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Qty</argument>
- <argument name="template" xsi:type="string">sales/items/column/qty.phtml</argument>
- </action>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">name</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Name</argument>
- <argument name="template" xsi:type="string">sales/items/column/name.phtml</argument>
- </action>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">name</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Name\Grouped</argument>
- <argument name="template" xsi:type="string">sales/items/column/name.phtml</argument>
- <argument name="type" xsi:type="string">grouped</argument>
- </action>
- <block class="Magento\Core\Block\Text\ListText" name="order_item_extra_info"/>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Comments\View" name="order_comments" template="sales/order/comments/view.phtml">
- <action method="setParentType">
- <argument name="type" xsi:type="string">invoice</argument>
- </action>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Invoice\Totals" name="invoice_totals" template="sales/order/totals.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Tax" name="tax" template="sales/order/totals/tax.phtml"/>
- <!--<block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="footer" template="sales/order/totals/footer.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="grand" template="sales/order/totals/grand.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="paid" template="sales/order/totals/paid.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="refunded" template="sales/order/totals/refunded.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="due" template="sales/order/totals/due.phtml"/>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="sales.order.view.totals.main" as="main" template="sales/order/totals/main.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="tax" template="sales/order/totals/item.phtml">
- <action method="setSourceField">
- <argument name="value" xsi:type="string">tax_amount</argument>
- </action>
- <action method="setLabel">
- <argument name="value" xsi:type="string">Tax</argument>
- </action>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="shipping" template="sales/order/totals/shipping.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="discount" template="sales/order/totals/discount.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="giftcert" template="sales/order/totals/item.phtml">
- <action method="setSourceField">
- <argument name="value" xsi:type="string">giftcert_amount</argument>
- </action>
- <action method="setLabel">
- <argument name="value" xsi:type="string">Gift Certificate</argument>
- </action>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="adjustment_positive" template="sales/order/totals/item.phtml">
- <action method="setSourceField">
- <argument name="value" xsi:type="string">adjustment_positive</argument>
- </action>
- <action method="setLabel">
- <argument name="value" xsi:type="string">Adjustment Refund</argument>
- </action>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Item" name="adjustment_negative" template="sales/order/totals/item.phtml">
- <action method="setSourceField">
- <argument name="value" xsi:type="string">adjustment_negative</argument>
- </action>
- <action method="setLabel">
- <argument name="value" xsi:type="string">Adjustment Fee</argument>
- </action>
- </block>
- </block>-->
- </block>
- </block>
- </block>
- </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_shipment_addtrack.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_shipment_addtrack.xml
deleted file mode 100644
index b90ef9c431b..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_shipment_addtrack.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <block class="Magento\Adminhtml\Block\Sales\Order\Shipment\View\Tracking" name="shipment_tracking" template="sales/order/shipment/view/tracking.phtml"/>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_shipment_new.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_shipment_new.xml
deleted file mode 100644
index c125eeb86c8..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_shipment_new.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="head">
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-sales-order-shipment-packaging-js">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Adminhtml::sales/order/shipment/packaging.js</argument>
- </arguments>
- </block>
- </referenceBlock>
- <referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Shipment\Create" name="sales_shipment_create">
- <block class="Magento\Adminhtml\Block\Sales\Order\Shipment\Create\Form" name="form" template="sales/order/shipment/create/form.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\View\Info" name="order_info" template="sales/order/view/info.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Payment" name="order_payment"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Shipment\Create\Tracking" name="shipment_tracking" template="sales/order/shipment/create/tracking.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Shipment\Create\Items" name="order_items" template="sales/order/shipment/create/items.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Items\Renderer\DefaultRenderer" as="default" template="sales/order/shipment/create/items/renderer/default.phtml"/>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">qty</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Qty</argument>
- <argument name="template" xsi:type="string">sales/items/column/qty.phtml</argument>
- </action>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">name</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Name</argument>
- <argument name="template" xsi:type="string">sales/items/column/name.phtml</argument>
- </action>
- <block class="Magento\Core\Block\Text\ListText" name="order_item_extra_info"/>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Shipment\Packaging" name="shipment_packaging" template="sales/order/shipment/packaging/popup.phtml"/>
- </block>
- </block>
- </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_shipment_removetrack.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_shipment_removetrack.xml
deleted file mode 100644
index b90ef9c431b..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_shipment_removetrack.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <block class="Magento\Adminhtml\Block\Sales\Order\Shipment\View\Tracking" name="shipment_tracking" template="sales/order/shipment/view/tracking.phtml"/>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_shipment_view.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_shipment_view.xml
deleted file mode 100644
index 72e6c810167..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_shipment_view.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="head">
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-sales-order-shipment-packaging-js">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Adminhtml::sales/order/shipment/packaging.js</argument>
- </arguments>
- </block>
- </referenceBlock>
- <referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Shipment\View" name="sales_shipment_view">
- <block class="Magento\Adminhtml\Block\Sales\Order\Shipment\View\Form" name="form" template="sales/order/shipment/view/form.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\View\Info" name="order_info" template="sales/order/view/info.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Payment" name="order_payment"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Shipment\View\Tracking" name="shipment_tracking" template="sales/order/shipment/view/tracking.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Shipment\View\Items" name="shipment_items" template="sales/order/shipment/view/items.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Items\Renderer\DefaultRenderer" as="default" template="sales/order/shipment/view/items/renderer/default.phtml"/>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">qty</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Qty</argument>
- <argument name="template" xsi:type="string">sales/items/column/qty.phtml</argument>
- </action>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">name</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Name</argument>
- <argument name="template" xsi:type="string">sales/items/column/name.phtml</argument>
- </action>
- <block class="Magento\Core\Block\Text\ListText" name="order_item_extra_info"/>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Invoice\Create\Tracking" name="invoice_tracking" template="sales/order/shipment/create/tracking.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Comments\View" name="order_comments" template="sales/order/comments/view.phtml">
- <action method="setParentType">
- <argument name="type" xsi:type="string">shipment</argument>
- </action>
- </block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Shipment\Packaging" name="shipment_packaging" template="sales/order/shipment/packaging/popup.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\Shipment\Packaging" name="shipment_packed" template="sales/order/shipment/packaging/packed.phtml"/>
- </block>
- </block>
- </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_system_backup_block.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_system_backup_block.xml
index 09bb5eb8c15..1456601804b 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_system_backup_block.xml
+++ b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_system_backup_block.xml
@@ -40,7 +40,7 @@
<argument name="options" xsi:type="array">
<item name="delete" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Delete</item>
- <item name="url" xsi:type="string">*/*/massDelete</item>
+ <item name="url" xsi:type="string">adminhtml/*/massDelete</item>
<item name="confirm" xsi:type="string" translate="true">Are you sure you want to delete the selected backup(s)?</item>
</item>
</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_system_design_grid_block.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_system_design_grid_block.xml
index 1bd70883661..56c93931db7 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_system_design_grid_block.xml
+++ b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_system_design_grid_block.xml
@@ -39,7 +39,7 @@
<arguments>
<argument name="id" xsi:type="string">designGrid</argument>
<argument name="rowUrl" xsi:type="array">
- <item name="path" xsi:type="string">*/*/edit</item>
+ <item name="path" xsi:type="string">adminhtml/*/edit</item>
<item name="extraParamsTemplate" xsi:type="array">
<item name="id" xsi:type="string">getId</item>
</item>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_system_email_template_grid_block.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_system_email_template_grid_block.xml
index 86528761f26..b7d0ddb3322 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_system_email_template_grid_block.xml
+++ b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_system_email_template_grid_block.xml
@@ -38,7 +38,7 @@
<block class="Magento\Backend\Block\Widget\Grid\ColumnSet" name="adminhtml.system.email.template.grid.columnSet" as="grid.columnSet">
<arguments>
<argument name="rowUrl" xsi:type="array">
- <item name="path" xsi:type="string">*/*/edit</item>
+ <item name="path" xsi:type="string">adminhtml/*/edit</item>
<item name="extraParamsTemplate" xsi:type="array">
<item name="id" xsi:type="string">getId</item>
</item>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_system_variable_grid_block.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_system_variable_grid_block.xml
index 1002e21c91e..f468517c45d 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_system_variable_grid_block.xml
+++ b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_system_variable_grid_block.xml
@@ -35,7 +35,7 @@
<block class="Magento\Backend\Block\Widget\Grid\ColumnSet" name="adminhtml.system.variable.grid.columnSet" as="grid.columnSet">
<arguments>
<argument name="rowUrl" xsi:type="array">
- <item name="path" xsi:type="string">*/*/edit</item>
+ <item name="path" xsi:type="string">adminhtml/*/edit</item>
<item name="extraParamsTemplate" xsi:type="array">
<item name="variable_id" xsi:type="string">getId</item>
</item>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_urlrewrite_index.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_urlrewrite_index.xml
index 56024a711ca..7e3a897c56a 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_urlrewrite_index.xml
+++ b/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_urlrewrite_index.xml
@@ -35,7 +35,7 @@
<block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="adminhtml.urlrewrite.grid.columnSet">
<arguments>
<argument name="rowUrl" xsi:type="array">
- <item name="path" xsi:type="string">*/*/edit</item>
+ <item name="path" xsi:type="string">adminhtml/*/edit</item>
<item name="extraParamsTemplate" xsi:type="array">
<item name="id" xsi:type="string">getId</item>
</item>
@@ -128,7 +128,7 @@
<item name="view_action" xsi:type="array">
<item name="caption" xsi:type="string" translate="true">Edit</item>
<item name="url" xsi:type="array">
- <item name="base" xsi:type="string">*/*/edit</item>
+ <item name="base" xsi:type="string">adminhtml/*/edit</item>
</item>
<item name="field" xsi:type="string">id</item>
</item>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/default.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/default.xml
index a70f4379424..dc046bfc44e 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/default.xml
+++ b/app/code/Magento/Adminhtml/view/adminhtml/layout/default.xml
@@ -181,7 +181,7 @@
</block>
<block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-catalog-product-js">
<arguments>
- <argument name="file" xsi:type="string">Magento_Adminhtml::catalog/product.js</argument>
+ <argument name="file" xsi:type="string">Magento_Catalog::catalog/product.js</argument>
</arguments>
</block>
<block class="Magento\Page\Block\Html\Head\Script" name="lib-ds-sleight-js">
@@ -291,6 +291,7 @@
<block class="Magento\Core\Block\Messages" name="messages" as="messages"/>
<container name="js" as="js" label="JavaScript"/>
<block class="Magento\Adminhtml\Block\Page\Footer" name="footer" as="footer">
+ <block class="Magento\Backend\Block\Page\Copyright" name="copyright" as="copyright"/>
<action method="setBugreportUrl">
<argument name="url" xsi:type="string">http://www.magentocommerce.com/bug-tracking</argument>
</action>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/page/footer.phtml b/app/code/Magento/Adminhtml/view/adminhtml/page/footer.phtml
index 89b8cfeaeb8..e9c898098fa 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/page/footer.phtml
+++ b/app/code/Magento/Adminhtml/view/adminhtml/page/footer.phtml
@@ -24,5 +24,5 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php echo __('Copyright © %1 Magento Inc. All rights reserved.', date('Y')) ?> /
+<?php echo $this->getChildHtml('copyright');?> /
<?php echo __('Magento ver. %1', \Magento\Core\Model\App::VERSION) ?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/urlrewrite/selector.phtml b/app/code/Magento/Adminhtml/view/adminhtml/urlrewrite/selector.phtml
index 350f5608ffb..99cb75e01ff 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/urlrewrite/selector.phtml
+++ b/app/code/Magento/Adminhtml/view/adminhtml/urlrewrite/selector.phtml
@@ -35,7 +35,7 @@
<div class="field field-url-rewrite-option-select">
<label for="url-rewrite-option-select" class="label"><?php echo $this->getSelectorLabel() ?></label>
<div class="control">
- <?php $url = $this->helper('Magento\Adminhtml\Helper\Data')->getUrl('*/*/*')?>
+ <?php $url = $this->helper('Magento\Adminhtml\Helper\Data')->getUrl('adminhtml/*/*')?>
<select id="url-rewrite-option-select" class="select" onchange="window.location = this.value;">
<?php foreach ($this->getModes() as $mode => $label): ?>
<option <?php echo ($this->isMode($mode) ? 'selected="selected" ' :'' ) ?>value="<?php echo $url . $mode ?>"><?php echo $label ?></option>
diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment.php
index d3fa9a8cd94..4e52666b5fd 100644
--- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment.php
+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment.php
@@ -34,7 +34,7 @@
namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost;
class Payment
- extends \Magento\Adminhtml\Controller\Sales\Order\Create
+ extends \Magento\Sales\Controller\Adminhtml\Order\Create
{
/**
* Core registry
@@ -78,11 +78,11 @@ class Payment
/**
* Retrieve order create model
*
- * @return \Magento\Adminhtml\Model\Sales\Order\Create
+ * @return \Magento\Sales\Model\AdminOrder\Create
*/
protected function _getOrderCreateModel()
{
- return $this->_objectManager->get('Magento\Adminhtml\Model\Sales\Order\Create');
+ return $this->_objectManager->get('Magento\Sales\Model\AdminOrder\Create');
}
/**
@@ -166,7 +166,9 @@ class Payment
if ($isError) {
$result['success'] = 0;
$result['error'] = 1;
- $result['redirect'] = $this->_objectManager->get('Magento\Backend\Model\Url')->getUrl('*/sales_order_create/');
+ $result['redirect'] = $this->_objectManager
+ ->get('Magento\Backend\Model\Url')
+ ->getUrl('sales/order_create/');
}
$this->getResponse()->setBody($this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result));
diff --git a/app/code/Magento/Authorizenet/Helper/Data.php b/app/code/Magento/Authorizenet/Helper/Data.php
index 658711bb923..63a555f6788 100644
--- a/app/code/Magento/Authorizenet/Helper/Data.php
+++ b/app/code/Magento/Authorizenet/Helper/Data.php
@@ -198,7 +198,7 @@ class Data extends \Magento\Core\Helper\AbstractHelper
case 'sales_order_create':
case 'sales_order_edit':
- $route = 'adminhtml/sales_order/view';
+ $route = 'sales/order/view';
$order = $this->_orderFactory->create()->loadByIncrementId($params['x_invoice_num']);
$param['order_id'] = $order->getId();
return $this->getAdminUrl($route, $param);
diff --git a/app/code/Magento/Authorizenet/view/adminhtml/layout/adminhtml_sales_order_create_index.xml b/app/code/Magento/Authorizenet/view/adminhtml/layout/sales_order_create_index.xml
similarity index 100%
rename from app/code/Magento/Authorizenet/view/adminhtml/layout/adminhtml_sales_order_create_index.xml
rename to app/code/Magento/Authorizenet/view/adminhtml/layout/sales_order_create_index.xml
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 d31aeecaece..09482313117 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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="AuthorizeNet Directpost Redirect" type="fragment" owner="checkout_onepage_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="AuthorizeNet Directpost Redirect" type="page">
<block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
<block class="Magento\Authorizenet\Block\Directpost\Iframe" name="iframe" template="directpost/iframe.phtml"/>
</block>
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 02494c6360b..27bcc151dbb 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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="AuthorizeNet Directpost Response" type="fragment" owner="checkout_onepage_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="AuthorizeNet Directpost Response" type="page">
<block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
<block class="Magento\Authorizenet\Block\Directpost\Iframe" name="iframe" template="directpost/iframe.phtml"/>
</block>
diff --git a/app/code/Magento/Adminhtml/Block/Dashboard.php b/app/code/Magento/Backend/Block/Dashboard.php
similarity index 72%
rename from app/code/Magento/Adminhtml/Block/Dashboard.php
rename to app/code/Magento/Backend/Block/Dashboard.php
index 36a72f921e9..a1568bb961a 100644
--- a/app/code/Magento/Adminhtml/Block/Dashboard.php
+++ b/app/code/Magento/Backend/Block/Dashboard.php
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block;
+namespace Magento\Backend\Block;
class Dashboard extends \Magento\Adminhtml\Block\Template
{
@@ -39,18 +39,18 @@ class Dashboard extends \Magento\Adminhtml\Block\Template
protected function _prepareLayout()
{
- $this->addChild('lastOrders', 'Magento\Adminhtml\Block\Dashboard\Orders\Grid');
+ $this->addChild('lastOrders', 'Magento\Backend\Block\Dashboard\Orders\Grid');
- $this->addChild('totals', 'Magento\Adminhtml\Block\Dashboard\Totals');
+ $this->addChild('totals', 'Magento\Backend\Block\Dashboard\Totals');
- $this->addChild('sales', 'Magento\Adminhtml\Block\Dashboard\Sales');
+ $this->addChild('sales', 'Magento\Backend\Block\Dashboard\Sales');
- $this->addChild('lastSearches', 'Magento\Adminhtml\Block\Dashboard\Searches\Last');
+ $this->addChild('lastSearches', 'Magento\Backend\Block\Dashboard\Searches\Last');
- $this->addChild('topSearches', 'Magento\Adminhtml\Block\Dashboard\Searches\Top');
+ $this->addChild('topSearches', 'Magento\Backend\Block\Dashboard\Searches\Top');
if ($this->_storeConfig->getConfig(self::XML_PATH_ENABLE_CHARTS)) {
- $block = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Dashboard\Diagrams');
+ $block = $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Diagrams');
} else {
$block = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Template')
->setTemplate('dashboard/graph/disabled.phtml')
@@ -58,7 +58,7 @@ class Dashboard extends \Magento\Adminhtml\Block\Template
}
$this->setChild('diagrams', $block);
- $this->addChild('grids', 'Magento\Adminhtml\Block\Dashboard\Grids');
+ $this->addChild('grids', 'Magento\Backend\Block\Dashboard\Grids');
parent::_prepareLayout();
}
@@ -68,6 +68,6 @@ class Dashboard extends \Magento\Adminhtml\Block\Template
if ($url = $this->getData('switch_url')) {
return $url;
}
- return $this->getUrl('*/*/*', array('_current'=>true, 'period'=>null));
+ return $this->getUrl('adminhtml/*/*', array('_current'=>true, 'period'=>null));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Dashboard/AbstractDashboard.php b/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php
similarity index 98%
rename from app/code/Magento/Adminhtml/Block/Dashboard/AbstractDashboard.php
rename to app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php
index 04e7446a1e2..49096dd63f8 100644
--- a/app/code/Magento/Adminhtml/Block/Dashboard/AbstractDashboard.php
+++ b/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php
@@ -32,7 +32,7 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Dashboard;
+namespace Magento\Backend\Block\Dashboard;
abstract class AbstractDashboard extends \Magento\Adminhtml\Block\Widget
{
diff --git a/app/code/Magento/Adminhtml/Block/Dashboard/Bar.php b/app/code/Magento/Backend/Block/Dashboard/Bar.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Dashboard/Bar.php
rename to app/code/Magento/Backend/Block/Dashboard/Bar.php
index 65f910bb5c9..7829f508cbc 100644
--- a/app/code/Magento/Adminhtml/Block/Dashboard/Bar.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Bar.php
@@ -32,9 +32,9 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Dashboard;
+namespace Magento\Backend\Block\Dashboard;
-class Bar extends \Magento\Adminhtml\Block\Dashboard\AbstractDashboard
+class Bar extends \Magento\Backend\Block\Dashboard\AbstractDashboard
{
protected $_totals = array();
protected $_currentCurrencyCode = null;
diff --git a/app/code/Magento/Adminhtml/Block/Dashboard/Diagrams.php b/app/code/Magento/Backend/Block/Dashboard/Diagrams.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Dashboard/Diagrams.php
rename to app/code/Magento/Backend/Block/Dashboard/Diagrams.php
index 498830a9f13..30293996e80 100644
--- a/app/code/Magento/Adminhtml/Block/Dashboard/Diagrams.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Diagrams.php
@@ -32,12 +32,12 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Dashboard;
+namespace Magento\Backend\Block\Dashboard;
class Diagrams extends \Magento\Adminhtml\Block\Widget\Tabs
{
- protected $_template = 'widget/tabshoriz.phtml';
+ protected $_template = 'Magento_Adminhtml::widget/tabshoriz.phtml';
protected function _construct()
{
@@ -50,13 +50,13 @@ class Diagrams extends \Magento\Adminhtml\Block\Widget\Tabs
{
$this->addTab('orders', array(
'label' => __('Orders'),
- 'content' => $this->getLayout()->createBlock('Magento\Adminhtml\Block\Dashboard\Tab\Orders')->toHtml(),
+ 'content' => $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Tab\Orders')->toHtml(),
'active' => true
));
$this->addTab('amounts', array(
'label' => __('Amounts'),
- 'content' => $this->getLayout()->createBlock('Magento\Adminhtml\Block\Dashboard\Tab\Amounts')->toHtml(),
+ 'content' => $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Tab\Amounts')->toHtml(),
));
return parent::_prepareLayout();
}
diff --git a/app/code/Magento/Adminhtml/Block/Dashboard/Graph.php b/app/code/Magento/Backend/Block/Dashboard/Graph.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Dashboard/Graph.php
rename to app/code/Magento/Backend/Block/Dashboard/Graph.php
index 8450443dbe4..f62e3d26343 100644
--- a/app/code/Magento/Adminhtml/Block/Dashboard/Graph.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Graph.php
@@ -32,9 +32,9 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Dashboard;
+namespace Magento\Backend\Block\Dashboard;
-class Graph extends \Magento\Adminhtml\Block\Dashboard\AbstractDashboard
+class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
{
/**
* Api URL
@@ -116,19 +116,19 @@ class Graph extends \Magento\Adminhtml\Block\Dashboard\AbstractDashboard
/**
* Adminhtml dashboard data
*
- * @var \Magento\Adminhtml\Helper\Dashboard\Data
+ * @var \Magento\Backend\Helper\Dashboard\Data
*/
protected $_dashboardData = null;
/**
- * @param \Magento\Adminhtml\Helper\Dashboard\Data $dashboardData
+ * @param \Magento\Backend\Helper\Dashboard\Data $dashboardData
* @param \Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
* @param array $data
*/
public function __construct(
- \Magento\Adminhtml\Helper\Dashboard\Data $dashboardData,
+ \Magento\Backend\Helper\Dashboard\Data $dashboardData,
\Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
@@ -458,7 +458,7 @@ class Graph extends \Magento\Adminhtml\Block\Dashboard\AbstractDashboard
$gaData = urlencode(base64_encode(json_encode($params)));
$gaHash = $this->_dashboardData->getChartDataHash($gaData);
$params = array('ga' => $gaData, 'h' => $gaHash);
- return $this->getUrl('*/*/tunnel', array('_query' => $params));
+ return $this->getUrl('adminhtml/*/tunnel', array('_query' => $params));
}
}
@@ -562,7 +562,7 @@ class Graph extends \Magento\Adminhtml\Block\Dashboard\AbstractDashboard
protected function _prepareData()
{
if (!is_null($this->getDataHelperName())) {
- $availablePeriods = array_keys($this->helper('Magento\Adminhtml\Helper\Dashboard\Data')->getDatePeriods());
+ $availablePeriods = array_keys($this->helper('Magento\Backend\Helper\Dashboard\Data')->getDatePeriods());
$period = $this->getRequest()->getParam('period');
$this->getDataHelper()->setParam('period',
($period && in_array($period, $availablePeriods)) ? $period : '24h'
diff --git a/app/code/Magento/Adminhtml/Block/Dashboard/Grid.php b/app/code/Magento/Backend/Block/Dashboard/Grid.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Dashboard/Grid.php
rename to app/code/Magento/Backend/Block/Dashboard/Grid.php
index da51a55a497..034a4df364a 100644
--- a/app/code/Magento/Adminhtml/Block/Dashboard/Grid.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Grid.php
@@ -32,7 +32,7 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Dashboard;
+namespace Magento\Backend\Block\Dashboard;
class Grid extends \Magento\Adminhtml\Block\Widget\Grid
{
diff --git a/app/code/Magento/Adminhtml/Block/Dashboard/Grids.php b/app/code/Magento/Backend/Block/Dashboard/Grids.php
similarity index 81%
rename from app/code/Magento/Adminhtml/Block/Dashboard/Grids.php
rename to app/code/Magento/Backend/Block/Dashboard/Grids.php
index 8138a3682ab..e927e658f43 100644
--- a/app/code/Magento/Adminhtml/Block/Dashboard/Grids.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Grids.php
@@ -32,12 +32,12 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Dashboard;
+namespace Magento\Backend\Block\Dashboard;
class Grids extends \Magento\Adminhtml\Block\Widget\Tabs
{
- protected $_template = 'widget/tabshoriz.phtml';
+ protected $_template = 'Magento_Adminhtml::widget/tabshoriz.phtml';
protected function _construct()
{
@@ -58,7 +58,7 @@ class Grids extends \Magento\Adminhtml\Block\Widget\Tabs
* 2) specify url (BE CAREFUL)
* 3) specify class 'ajax'
*
- * @return \Magento\Adminhtml\Block\Dashboard\Grids
+ * @return \Magento\Backend\Block\Dashboard\Grids
*/
protected function _prepareLayout()
{
@@ -66,26 +66,26 @@ class Grids extends \Magento\Adminhtml\Block\Widget\Tabs
$this->addTab('ordered_products', array(
'label' => __('Bestsellers'),
'content' => $this->getLayout()
- ->createBlock('Magento\Adminhtml\Block\Dashboard\Tab\Products\Ordered')->toHtml(),
+ ->createBlock('Magento\Backend\Block\Dashboard\Tab\Products\Ordered')->toHtml(),
'active' => true
));
// load other tabs with ajax
$this->addTab('reviewed_products', array(
'label' => __('Most Viewed Products'),
- 'url' => $this->getUrl('*/*/productsViewed', array('_current'=>true)),
+ 'url' => $this->getUrl('adminhtml/*/productsViewed', array('_current'=>true)),
'class' => 'ajax'
));
$this->addTab('new_customers', array(
'label' => __('New Customers'),
- 'url' => $this->getUrl('*/*/customersNewest', array('_current'=>true)),
+ 'url' => $this->getUrl('adminhtml/*/customersNewest', array('_current'=>true)),
'class' => 'ajax'
));
$this->addTab('customers', array(
'label' => __('Customers'),
- 'url' => $this->getUrl('*/*/customersMost', array('_current'=>true)),
+ 'url' => $this->getUrl('adminhtml/*/customersMost', array('_current'=>true)),
'class' => 'ajax'
));
diff --git a/app/code/Magento/Adminhtml/Block/Dashboard/Orders/Grid.php b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Dashboard/Orders/Grid.php
rename to app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
index a9c0997aa3d..c101cf0dd60 100644
--- a/app/code/Magento/Adminhtml/Block/Dashboard/Orders/Grid.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
@@ -32,9 +32,9 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Dashboard\Orders;
+namespace Magento\Backend\Block\Dashboard\Orders;
-class Grid extends \Magento\Adminhtml\Block\Dashboard\Grid
+class Grid extends \Magento\Backend\Block\Dashboard\Grid
{
/**
* @var \Magento\Reports\Model\Resource\Order\CollectionFactory
@@ -146,6 +146,6 @@ class Grid extends \Magento\Adminhtml\Block\Dashboard\Grid
public function getRowUrl($row)
{
- return $this->getUrl('*/sales_order/view', array('order_id'=>$row->getId()));
+ return $this->getUrl('sales/order/view', array('order_id'=>$row->getId()));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Dashboard/Sales.php b/app/code/Magento/Backend/Block/Dashboard/Sales.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Dashboard/Sales.php
rename to app/code/Magento/Backend/Block/Dashboard/Sales.php
index a2a82f3c19e..0220b643a4b 100644
--- a/app/code/Magento/Adminhtml/Block/Dashboard/Sales.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Sales.php
@@ -32,9 +32,9 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Dashboard;
+namespace Magento\Backend\Block\Dashboard;
-class Sales extends \Magento\Adminhtml\Block\Dashboard\Bar
+class Sales extends \Magento\Backend\Block\Dashboard\Bar
{
protected $_template = 'dashboard/salebar.phtml';
diff --git a/app/code/Magento/Adminhtml/Block/Dashboard/Searches/Last.php b/app/code/Magento/Backend/Block/Dashboard/Searches/Last.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Dashboard/Searches/Last.php
rename to app/code/Magento/Backend/Block/Dashboard/Searches/Last.php
index 3edc75f7c14..4de111d5d70 100644
--- a/app/code/Magento/Adminhtml/Block/Dashboard/Searches/Last.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Searches/Last.php
@@ -32,9 +32,9 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Dashboard\Searches;
+namespace Magento\Backend\Block\Dashboard\Searches;
-class Last extends \Magento\Adminhtml\Block\Dashboard\Grid
+class Last extends \Magento\Backend\Block\Dashboard\Grid
{
protected $_collection;
@@ -98,7 +98,7 @@ class Last extends \Magento\Adminhtml\Block\Dashboard\Grid
'header' => __('Search Term'),
'sortable' => false,
'index' => 'query_text',
- 'renderer' => 'Magento\Adminhtml\Block\Dashboard\Searches\Renderer\Searchquery',
+ 'renderer' => 'Magento\Backend\Block\Dashboard\Searches\Renderer\Searchquery',
));
$this->addColumn('num_results', array(
@@ -123,6 +123,6 @@ class Last extends \Magento\Adminhtml\Block\Dashboard\Grid
public function getRowUrl($row)
{
- return $this->getUrl('*/catalog_search/edit', array('id'=>$row->getId()));
+ return $this->getUrl('catalog/search/edit', array('id'=>$row->getId()));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php b/app/code/Magento/Backend/Block/Dashboard/Searches/Renderer/Searchquery.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php
rename to app/code/Magento/Backend/Block/Dashboard/Searches/Renderer/Searchquery.php
index 80ebd1c0198..559aebebda7 100644
--- a/app/code/Magento/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Searches/Renderer/Searchquery.php
@@ -31,7 +31,7 @@
* @category Magento
* @package Magento_Adminhtml
*/
-namespace Magento\Adminhtml\Block\Dashboard\Searches\Renderer;
+namespace Magento\Backend\Block\Dashboard\Searches\Renderer;
class Searchquery
extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer
diff --git a/app/code/Magento/Adminhtml/Block/Dashboard/Searches/Top.php b/app/code/Magento/Backend/Block/Dashboard/Searches/Top.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Dashboard/Searches/Top.php
rename to app/code/Magento/Backend/Block/Dashboard/Searches/Top.php
index a06c399a1ed..453ed8f84e1 100644
--- a/app/code/Magento/Adminhtml/Block/Dashboard/Searches/Top.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Searches/Top.php
@@ -32,9 +32,9 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Dashboard\Searches;
+namespace Magento\Backend\Block\Dashboard\Searches;
-class Top extends \Magento\Adminhtml\Block\Dashboard\Grid
+class Top extends \Magento\Backend\Block\Dashboard\Grid
{
protected $_collection;
@@ -100,7 +100,7 @@ class Top extends \Magento\Adminhtml\Block\Dashboard\Grid
'header' => __('Search Term'),
'sortable' => false,
'index' => 'name',
- 'renderer' => 'Magento\Adminhtml\Block\Dashboard\Searches\Renderer\Searchquery',
+ 'renderer' => 'Magento\Backend\Block\Dashboard\Searches\Renderer\Searchquery',
));
$this->addColumn('num_results', array(
@@ -125,6 +125,6 @@ class Top extends \Magento\Adminhtml\Block\Dashboard\Grid
public function getRowUrl($row)
{
- return $this->getUrl('*/catalog_search/edit', array('id'=>$row->getId()));
+ return $this->getUrl('catalog/search/edit', array('id'=>$row->getId()));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Dashboard/Tab/Amounts.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Amounts.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Dashboard/Tab/Amounts.php
rename to app/code/Magento/Backend/Block/Dashboard/Tab/Amounts.php
index c9351e9cee7..a1bcc0c1568 100644
--- a/app/code/Magento/Adminhtml/Block/Dashboard/Tab/Amounts.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Amounts.php
@@ -32,9 +32,9 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Dashboard\Tab;
+namespace Magento\Backend\Block\Dashboard\Tab;
-class Amounts extends \Magento\Adminhtml\Block\Dashboard\Graph
+class Amounts extends \Magento\Backend\Block\Dashboard\Graph
{
/**
* Initialize object
@@ -54,7 +54,7 @@ class Amounts extends \Magento\Adminhtml\Block\Dashboard\Graph
*/
protected function _prepareData()
{
- $this->setDataHelperName('Magento\Adminhtml\Helper\Dashboard\Order');
+ $this->setDataHelperName('Magento\Backend\Helper\Dashboard\Order');
$this->getDataHelper()->setParam('store', $this->getRequest()->getParam('store'));
$this->getDataHelper()->setParam('website', $this->getRequest()->getParam('website'));
$this->getDataHelper()->setParam('group', $this->getRequest()->getParam('group'));
diff --git a/app/code/Magento/Adminhtml/Block/Dashboard/Tab/Customers/Most.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Dashboard/Tab/Customers/Most.php
rename to app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php
index 2f7d38c83db..74bd1d70e36 100644
--- a/app/code/Magento/Adminhtml/Block/Dashboard/Tab/Customers/Most.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php
@@ -32,9 +32,9 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Dashboard\Tab\Customers;
+namespace Magento\Backend\Block\Dashboard\Tab\Customers;
-class Most extends \Magento\Adminhtml\Block\Dashboard\Grid
+class Most extends \Magento\Backend\Block\Dashboard\Grid
{
/**
* @var \Magento\Reports\Model\Resource\Order\CollectionFactory
@@ -140,6 +140,6 @@ class Most extends \Magento\Adminhtml\Block\Dashboard\Grid
public function getRowUrl($row)
{
- return $this->getUrl('*/customer/edit', array('id'=>$row->getCustomerId()));
+ return $this->getUrl('adminhtml/customer/edit', array('id'=>$row->getCustomerId()));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php
rename to app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
index fd3e0f2af46..dfb8b578183 100644
--- a/app/code/Magento/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
@@ -32,9 +32,9 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Dashboard\Tab\Customers;
+namespace Magento\Backend\Block\Dashboard\Tab\Customers;
-class Newest extends \Magento\Adminhtml\Block\Dashboard\Grid
+class Newest extends \Magento\Backend\Block\Dashboard\Grid
{
/**
* @var \Magento\Reports\Model\Resource\Customer\CollectionFactory
@@ -138,6 +138,6 @@ class Newest extends \Magento\Adminhtml\Block\Dashboard\Grid
public function getRowUrl($row)
{
- return $this->getUrl('*/customer/edit', array('id'=>$row->getId()));
+ return $this->getUrl('adminhtml/customer/edit', array('id'=>$row->getId()));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Dashboard/Tab/Orders.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Orders.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Dashboard/Tab/Orders.php
rename to app/code/Magento/Backend/Block/Dashboard/Tab/Orders.php
index dd1fb3b75fd..12799a540dd 100644
--- a/app/code/Magento/Adminhtml/Block/Dashboard/Tab/Orders.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Orders.php
@@ -32,9 +32,9 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Dashboard\Tab;
+namespace Magento\Backend\Block\Dashboard\Tab;
-class Orders extends \Magento\Adminhtml\Block\Dashboard\Graph
+class Orders extends \Magento\Backend\Block\Dashboard\Graph
{
/**
* Initialize object
@@ -54,7 +54,7 @@ class Orders extends \Magento\Adminhtml\Block\Dashboard\Graph
*/
protected function _prepareData()
{
- $this->setDataHelperName('Magento\Adminhtml\Helper\Dashboard\Order');
+ $this->setDataHelperName('Magento\Backend\Helper\Dashboard\Order');
$this->getDataHelper()->setParam('store', $this->getRequest()->getParam('store'));
$this->getDataHelper()->setParam('website', $this->getRequest()->getParam('website'));
$this->getDataHelper()->setParam('group', $this->getRequest()->getParam('group'));
diff --git a/app/code/Magento/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php
rename to app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php
index 44de1acce23..5cb3852864a 100644
--- a/app/code/Magento/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php
@@ -32,9 +32,9 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Dashboard\Tab\Products;
+namespace Magento\Backend\Block\Dashboard\Tab\Products;
-class Ordered extends \Magento\Adminhtml\Block\Dashboard\Grid
+class Ordered extends \Magento\Backend\Block\Dashboard\Grid
{
/**
* @var \Magento\Sales\Model\Resource\Report\Bestsellers\CollectionFactory
@@ -148,6 +148,6 @@ class Ordered extends \Magento\Adminhtml\Block\Dashboard\Grid
if ($this->getRequest()->getParam('store')) {
$params['store'] = $this->getRequest()->getParam('store');
}
- return $this->getUrl('*/catalog_product/edit', $params);
+ return $this->getUrl('catalog/product/edit', $params);
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php
rename to app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php
index 123aae13de7..a6021ff461b 100644
--- a/app/code/Magento/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php
@@ -32,9 +32,9 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Dashboard\Tab\Products;
+namespace Magento\Backend\Block\Dashboard\Tab\Products;
-class Viewed extends \Magento\Adminhtml\Block\Dashboard\Grid
+class Viewed extends \Magento\Backend\Block\Dashboard\Grid
{
/**
* @var \Magento\Reports\Model\Resource\Product\CollectionFactory
@@ -127,6 +127,6 @@ class Viewed extends \Magento\Adminhtml\Block\Dashboard\Grid
if ($this->getRequest()->getParam('store')) {
$params['store'] = $this->getRequest()->getParam('store');
}
- return $this->getUrl('*/catalog_product/edit', $params);
+ return $this->getUrl('catalog/product/edit', $params);
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Dashboard/Totals.php b/app/code/Magento/Backend/Block/Dashboard/Totals.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Dashboard/Totals.php
rename to app/code/Magento/Backend/Block/Dashboard/Totals.php
index eb7f6386322..dcd1ff8feee 100644
--- a/app/code/Magento/Adminhtml/Block/Dashboard/Totals.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Totals.php
@@ -32,9 +32,9 @@
* @package Magento_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Dashboard;
+namespace Magento\Backend\Block\Dashboard;
-class Totals extends \Magento\Adminhtml\Block\Dashboard\Bar
+class Totals extends \Magento\Backend\Block\Dashboard\Bar
{
protected $_template = 'dashboard/totalbar.phtml';
diff --git a/app/code/Magento/Backend/Block/GlobalSearch.php b/app/code/Magento/Backend/Block/GlobalSearch.php
index de4210f7d72..93f0419e561 100644
--- a/app/code/Magento/Backend/Block/GlobalSearch.php
+++ b/app/code/Magento/Backend/Block/GlobalSearch.php
@@ -44,7 +44,7 @@ class GlobalSearch extends \Magento\Backend\Block\Template
'dropdownWrapper' => '<div class="autocomplete-results" ></div >',
'template' => '[data-template=search-suggest]',
'termAjaxArgument' => 'query',
- 'source' => $this->getUrl('*/index/globalSearch'),
+ 'source' => $this->getUrl('adminhtml/index/globalSearch'),
'filterProperty' => 'name',
'preventClickPropagation' => false,
'minLength' => 2
diff --git a/app/code/Magento/Backend/Block/Page/Copyright.php b/app/code/Magento/Backend/Block/Page/Copyright.php
new file mode 100644
index 00000000000..f85f61de65a
--- /dev/null
+++ b/app/code/Magento/Backend/Block/Page/Copyright.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Backend\Block\Page;
+
+/**
+ * Copyright footer block
+ */
+class Copyright extends \Magento\Backend\Block\Template
+{
+ /**
+ * Path to template file in theme
+ *
+ * @var string
+ */
+ protected $_template = 'page/copyright.phtml';
+}
diff --git a/app/code/Magento/Backend/Block/Template/Context.php b/app/code/Magento/Backend/Block/Template/Context.php
index def099d23b2..eaf911dcd52 100644
--- a/app/code/Magento/Backend/Block/Template/Context.php
+++ b/app/code/Magento/Backend/Block/Template/Context.php
@@ -65,7 +65,7 @@ class Context extends \Magento\Core\Block\Template\Context
* @param \Magento\Core\Model\Logger $logger
* @param \Magento\Filesystem $filesystem
* @param \Magento\Core\Model\View\FileSystem $viewFileSystem
- * @param \Magento\Core\Model\TemplateEngine\Pool $enginePool
+ * @param \Magento\View\TemplateEngineFactory $engineFactory
* @param \Magento\AuthorizationInterface $authorization
* @param \Magento\Core\Model\App $app
* @param \Magento\Backend\Model\Session $backendSession
@@ -93,7 +93,7 @@ class Context extends \Magento\Core\Block\Template\Context
\Magento\Core\Model\Logger $logger,
\Magento\Filesystem $filesystem,
\Magento\Core\Model\View\FileSystem $viewFileSystem,
- \Magento\Core\Model\TemplateEngine\Pool $enginePool,
+ \Magento\View\TemplateEngineFactory $engineFactory,
\Magento\AuthorizationInterface $authorization,
\Magento\Core\Model\App $app,
\Magento\Backend\Model\Session $backendSession,
@@ -102,7 +102,7 @@ class Context extends \Magento\Core\Block\Template\Context
parent::__construct(
$request, $layout, $eventManager, $urlBuilder, $translator, $cache, $design, $session, $storeConfig,
$frontController, $helperFactory, $viewUrl, $viewConfig, $cacheState,
- $dirs, $logger, $filesystem, $viewFileSystem, $enginePool, $app
+ $dirs, $logger, $filesystem, $viewFileSystem, $engineFactory, $app
);
$this->_storeManager = $storeManager;
$this->_authorization = $authorization;
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php b/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
index 18002498e49..19c2c124541 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
@@ -174,6 +174,7 @@ class ColumnSet extends \Magento\Core\Block\Template
*/
public function getColumns()
{
+
$columns = $this->getLayout()->getChildBlocks($this->getNameInLayout());
foreach ($columns as $key => $column) {
if (!$column->isDisplayed()) {
diff --git a/app/code/Magento/Adminhtml/Controller/Action.php b/app/code/Magento/Backend/Controller/Adminhtml/Action.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Controller/Action.php
rename to app/code/Magento/Backend/Controller/Adminhtml/Action.php
index 0228e51dbc4..e41636898d6 100644
--- a/app/code/Magento/Adminhtml/Controller/Action.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Action.php
@@ -27,7 +27,7 @@
/**
* Generic backend controller
*/
-namespace Magento\Adminhtml\Controller;
+namespace Magento\Backend\Controller\Adminhtml;
class Action extends \Magento\Backend\Controller\AbstractAction
{
diff --git a/app/code/Magento/Adminhtml/Controller/Ajax.php b/app/code/Magento/Backend/Controller/Adminhtml/Ajax.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Controller/Ajax.php
rename to app/code/Magento/Backend/Controller/Adminhtml/Ajax.php
index 4643d532823..9e843632f74 100644
--- a/app/code/Magento/Adminhtml/Controller/Ajax.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Ajax.php
@@ -21,9 +21,9 @@
* @category Magento
* @package Magento_Adminhtml
*/
-namespace Magento\Adminhtml\Controller;
+namespace Magento\Backend\Controller\Adminhtml;
-class Ajax extends \Magento\Adminhtml\Controller\Action
+class Ajax extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Ajax action for inline translation
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth.php b/app/code/Magento/Backend/Controller/Adminhtml/Auth.php
index c287995d6eb..9e711ea79e0 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Auth.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Auth.php
@@ -43,7 +43,7 @@ class Auth extends \Magento\Backend\Controller\AbstractAction
$this->_redirect($this->_backendUrl->getStartupPageUrl());
return;
}
- $this->loadLayout();
+ $this->loadLayout(false);
$this->renderLayout();
}
diff --git a/app/code/Magento/Adminhtml/Controller/Cache.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Controller/Cache.php
rename to app/code/Magento/Backend/Controller/Adminhtml/Cache.php
index 3a09e7672d2..7fc6334cf5b 100644
--- a/app/code/Magento/Adminhtml/Controller/Cache.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache.php
@@ -24,9 +24,9 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Controller;
+namespace Magento\Backend\Controller\Adminhtml;
-class Cache extends \Magento\Adminhtml\Controller\Action
+class Cache extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* @var \Magento\Core\Model\Cache\TypeListInterface
@@ -96,7 +96,7 @@ class Cache extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addSuccess(
__("You flushed the cache storage.")
);
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
}
/**
@@ -112,7 +112,7 @@ class Cache extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addSuccess(
__("The Magento cache storage has been flushed.")
);
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
}
/**
@@ -145,7 +145,7 @@ class Cache extends \Magento\Adminhtml\Controller\Action
__('An error occurred while enabling cache.')
);
}
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
}
/**
@@ -179,7 +179,7 @@ class Cache extends \Magento\Adminhtml\Controller\Action
__('An error occurred while disabling cache.')
);
}
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
}
/**
@@ -210,7 +210,7 @@ class Cache extends \Magento\Adminhtml\Controller\Action
__('An error occurred while refreshing cache.')
);
}
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
}
/**
@@ -252,7 +252,7 @@ class Cache extends \Magento\Adminhtml\Controller\Action
__('An error occurred while clearing the JavaScript/CSS cache.')
);
}
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
}
/**
@@ -276,7 +276,7 @@ class Cache extends \Magento\Adminhtml\Controller\Action
__('An error occurred while clearing the image cache.')
);
}
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
}
/**
diff --git a/app/code/Magento/Adminhtml/Controller/Dashboard.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Controller/Dashboard.php
rename to app/code/Magento/Backend/Controller/Adminhtml/Dashboard.php
index 8b6663c35e1..209dd13fe79 100644
--- a/app/code/Magento/Adminhtml/Controller/Dashboard.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard.php
@@ -31,9 +31,9 @@
* @package Magento_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller;
+namespace Magento\Backend\Controller\Adminhtml;
-class Dashboard extends \Magento\Adminhtml\Controller\Action
+class Dashboard extends \Magento\Backend\Controller\Adminhtml\Action
{
public function indexAction()
{
@@ -102,8 +102,8 @@ class Dashboard extends \Magento\Adminhtml\Controller\Action
$gaData = $this->_request->getParam('ga');
$gaHash = $this->_request->getParam('h');
if ($gaData && $gaHash) {
- /** @var $helper \Magento\Adminhtml\Helper\Dashboard\Data */
- $helper = $this->_objectManager->get('Magento\Adminhtml\Helper\Dashboard\Data');
+ /** @var $helper \Magento\Backend\Helper\Dashboard\Data */
+ $helper = $this->_objectManager->get('Magento\Backend\Helper\Dashboard\Data');
$newHash = $helper->getChartDataHash($gaData);
if ($newHash == $gaHash) {
$params = json_decode(base64_decode(urldecode($gaData)), true);
@@ -111,7 +111,7 @@ class Dashboard extends \Magento\Adminhtml\Controller\Action
try {
/** @var $httpClient \Magento\HTTP\ZendClient */
$httpClient = $this->_objectManager->create('Magento\HTTP\ZendClient');
- $response = $httpClient->setUri(\Magento\Adminhtml\Block\Dashboard\Graph::API_URL)
+ $response = $httpClient->setUri(\Magento\Backend\Block\Dashboard\Graph::API_URL)
->setParameterGet($params)
->setConfig(array('timeout' => 5))
->request('GET');
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/Index.php
index 06b8de1bbae..e52af1e505e 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Index.php
@@ -31,6 +31,70 @@ namespace Magento\Backend\Controller\Adminhtml;
class Index extends \Magento\Backend\Controller\AbstractAction
{
+ /**
+ * Global Search Action
+ */
+ public function globalSearchAction()
+ {
+ $searchModules = $this->_objectManager->get('Magento\Core\Model\Config')->getNode("adminhtml/global_search");
+ $items = array();
+
+ if (!$this->_authorization->isAllowed('Magento_Adminhtml::global_search')) {
+ $items[] = array(
+ 'id' => 'error',
+ 'type' => __('Error'),
+ 'name' => __('Access Denied'),
+ 'description' => __('You need more permissions to do this.')
+ );
+ } else {
+ if (empty($searchModules)) {
+ $items[] = array(
+ 'id' => 'error',
+ 'type' => __('Error'),
+ 'name' => __('No search modules were registered'),
+ 'description' => __('Please make sure that all global admin search modules are installed and activated.')
+ );
+ } else {
+ $start = $this->getRequest()->getParam('start', 1);
+ $limit = $this->getRequest()->getParam('limit', 10);
+ $query = $this->getRequest()->getParam('query', '');
+ foreach ($searchModules->children() as $searchConfig) {
+
+ if ($searchConfig->acl && !$this->_authorization->isAllowed($searchConfig->acl)){
+ continue;
+ }
+
+ $className = $searchConfig->getClassName();
+
+ if (empty($className)) {
+ continue;
+ }
+ $searchInstance = $this->_objectManager->create($className);
+ $results = $searchInstance->setStart($start)
+ ->setLimit($limit)
+ ->setQuery($query)
+ ->load()
+ ->getResults();
+ $items = array_merge_recursive($items, $results);
+ }
+ }
+ }
+
+ $this->getResponse()->setBody(
+ $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($items)
+ );
+ }
+
+ /**
+ * Check if user has permissions to access this controller
+ *
+ * @return boolean
+ */
+ protected function _isAllowed()
+ {
+ return true;
+ }
+
/**
* Admin area entry point
* Always redirects to the startup page url
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Config.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Config.php
index a3305238de2..f8ea5e8a3d7 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Config.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Config.php
@@ -74,7 +74,7 @@ class Config extends \Magento\Backend\Controller\System\AbstractConfig
/** @var $section \Magento\Backend\Model\Config\Structure\Element\Section */
$section = $this->_configStructure->getElement($current);
if ($current && !$section->isVisible($website, $store)) {
- return $this->_redirect('*/*/', array('website' => $website, 'store' => $store));
+ return $this->_redirect('adminhtml/*/', array('website' => $website, 'store' => $store));
}
$this->loadLayout();
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Config/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Config/Save.php
index 0594fae1bad..8625ffdcbcf 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Config/Save.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Config/Save.php
@@ -110,7 +110,7 @@ class Save extends \Magento\Backend\Controller\System\AbstractConfig
}
$this->_saveState($this->getRequest()->getPost('config_state'));
- $this->_redirect('*/system_config/edit', array('_current' => array('section', 'website', 'store')));
+ $this->_redirect('adminhtml/system_config/edit', array('_current' => array('section', 'website', 'store')));
}
/**
diff --git a/app/code/Magento/Adminhtml/Helper/Dashboard/AbstractDashboard.php b/app/code/Magento/Backend/Helper/Dashboard/AbstractDashboard.php
similarity index 98%
rename from app/code/Magento/Adminhtml/Helper/Dashboard/AbstractDashboard.php
rename to app/code/Magento/Backend/Helper/Dashboard/AbstractDashboard.php
index 3dd4cb576d4..e8bc4628fbb 100644
--- a/app/code/Magento/Adminhtml/Helper/Dashboard/AbstractDashboard.php
+++ b/app/code/Magento/Backend/Helper/Dashboard/AbstractDashboard.php
@@ -27,7 +27,7 @@
/**
* Adminhtml abstract dashboard helper.
*/
-namespace Magento\Adminhtml\Helper\Dashboard;
+namespace Magento\Backend\Helper\Dashboard;
abstract class AbstractDashboard extends \Magento\Core\Helper\Data
{
diff --git a/app/code/Magento/Adminhtml/Helper/Dashboard/Data.php b/app/code/Magento/Backend/Helper/Dashboard/Data.php
similarity index 98%
rename from app/code/Magento/Adminhtml/Helper/Dashboard/Data.php
rename to app/code/Magento/Backend/Helper/Dashboard/Data.php
index 0127d6d008f..80f601e2033 100644
--- a/app/code/Magento/Adminhtml/Helper/Dashboard/Data.php
+++ b/app/code/Magento/Backend/Helper/Dashboard/Data.php
@@ -27,7 +27,7 @@
/**
* Data helper for dashboard
*/
-namespace Magento\Adminhtml\Helper\Dashboard;
+namespace Magento\Backend\Helper\Dashboard;
class Data extends \Magento\Core\Helper\Data
{
diff --git a/app/code/Magento/Adminhtml/Helper/Dashboard/Order.php b/app/code/Magento/Backend/Helper/Dashboard/Order.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Helper/Dashboard/Order.php
rename to app/code/Magento/Backend/Helper/Dashboard/Order.php
index 7f14046330f..0e4f7e93095 100644
--- a/app/code/Magento/Adminhtml/Helper/Dashboard/Order.php
+++ b/app/code/Magento/Backend/Helper/Dashboard/Order.php
@@ -27,9 +27,9 @@
/**
* Adminhtml dashboard helper for orders
*/
-namespace Magento\Adminhtml\Helper\Dashboard;
+namespace Magento\Backend\Helper\Dashboard;
-class Order extends \Magento\Adminhtml\Helper\Dashboard\AbstractDashboard
+class Order extends \Magento\Backend\Helper\Dashboard\AbstractDashboard
{
/**
* @var \Magento\Reports\Model\Resource\Order\Collection
@@ -80,14 +80,14 @@ class Order extends \Magento\Adminhtml\Helper\Dashboard\AbstractDashboard
if ($this->getParam('store')) {
$this->_collection->addFieldToFilter('store_id', $this->getParam('store'));
} else if ($this->getParam('website')){
- $storeIds = $this->_storeManger->getWebsite($this->getParam('website'))->getStoreIds();
+ $storeIds = $this->_storeManager->getWebsite($this->getParam('website'))->getStoreIds();
$this->_collection->addFieldToFilter('store_id', array('in' => implode(',', $storeIds)));
} else if ($this->getParam('group')){
- $storeIds = $this->_storeManger->getGroup($this->getParam('group'))->getStoreIds();
+ $storeIds = $this->_storeManager->getGroup($this->getParam('group'))->getStoreIds();
$this->_collection->addFieldToFilter('store_id', array('in' => implode(',', $storeIds)));
} elseif (!$this->_collection->isLive()) {
$this->_collection->addFieldToFilter('store_id',
- array('eq' => $this->_storeManger->getStore(\Magento\Core\Model\Store::ADMIN_CODE)->getId())
+ array('eq' => $this->_storeManager->getStore(\Magento\Core\Model\Store::ADMIN_CODE)->getId())
);
}
diff --git a/app/code/Magento/Backend/etc/di.xml b/app/code/Magento/Backend/etc/di.xml
index 3944fb92876..dc0a768235b 100644
--- a/app/code/Magento/Backend/etc/di.xml
+++ b/app/code/Magento/Backend/etc/di.xml
@@ -83,7 +83,7 @@
</type>
<type name="Magento\Backend\Helper\Data">
<param name="app">
- <instance type="Magento\Core\Model\App\Proxy" />
+ <instance type="Magento\Core\Model\AppInterface" />
</param>
<param name="backendUrl">
<instance type="Magento\Backend\Model\Url\Proxy" />
@@ -112,4 +112,9 @@
<instance type="Magento\Backend\Model\Auth\Session\Proxy" />
</param>
</type>
+ <type name="Magento\Backend\Helper\Dashboard\Data">
+ <param name="installDate">
+ <value type="argument">Magento\App\State::PARAM_INSTALL_DATE</value>
+ </param>
+ </type>
</config>
diff --git a/app/code/Magento/Backend/view/adminhtml/admin/login.phtml b/app/code/Magento/Backend/view/adminhtml/admin/login.phtml
index c1d7f25db2e..1ff8ecd7fc5 100644
--- a/app/code/Magento/Backend/view/adminhtml/admin/login.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/admin/login.phtml
@@ -99,7 +99,7 @@
</div>
<footer class="footer">
<div class="footer-content">
- <div class="footer-copyright"><?php echo __('Magento® is a trademark of X.commerce, Inc. Copyright © %1 X.commerce, Inc.', date('Y')) ?></div>
+ <div class="footer-copyright"><?php echo $this->getChildHtml('copyright');?></div>
</div>
</footer>
</body>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/dashboard/graph.phtml b/app/code/Magento/Backend/view/adminhtml/dashboard/graph.phtml
similarity index 93%
rename from app/code/Magento/Adminhtml/view/adminhtml/dashboard/graph.phtml
rename to app/code/Magento/Backend/view/adminhtml/dashboard/graph.phtml
index 62ad00bc221..61439c7256d 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/dashboard/graph.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/dashboard/graph.phtml
@@ -28,7 +28,7 @@
<div class="store-switcher">
<label><?php echo __('Select Range') ?>:
<select name="period" id="order_<?php echo $this->getHtmlId() ?>_period" onchange="changeDiagramsPeriod(this);">
- <?php foreach ($this->helper('Magento\Adminhtml\Helper\Dashboard\Data')->getDatePeriods() as $value => $label): ?>
+ <?php foreach ($this->helper('Magento\Backend\Helper\Dashboard\Data')->getDatePeriods() as $value => $label): ?>
<?php if(in_array($value, array('custom'))) continue; ?>
<option value="<?php echo $value ?>" <?php if ($this->getRequest()->getParam('period') == $value): ?> selected="selected"<?php endif; ?>><?php echo $label ?></option>
<?php endforeach; ?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/dashboard/graph/disabled.phtml b/app/code/Magento/Backend/view/adminhtml/dashboard/graph/disabled.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/dashboard/graph/disabled.phtml
rename to app/code/Magento/Backend/view/adminhtml/dashboard/graph/disabled.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/dashboard/grid.phtml b/app/code/Magento/Backend/view/adminhtml/dashboard/grid.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/dashboard/grid.phtml
rename to app/code/Magento/Backend/view/adminhtml/dashboard/grid.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/dashboard/index.phtml b/app/code/Magento/Backend/view/adminhtml/dashboard/index.phtml
similarity index 93%
rename from app/code/Magento/Adminhtml/view/adminhtml/dashboard/index.phtml
rename to app/code/Magento/Backend/view/adminhtml/dashboard/index.phtml
index cd6978a99fa..c6f41fc3817 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/dashboard/index.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/dashboard/index.phtml
@@ -32,7 +32,7 @@ function changeDiagramsPeriod(periodObj) {
periodParam = periodObj.value ? 'period/' + periodObj.value + '/' : '';
<?php foreach ($this->getChildBlock('diagrams')->getTabsIds() as $tabId): ?>
ajaxBlockParam = 'block/tab_<?php echo $tabId ?>/';
- ajaxBlockUrl = '<?php echo $this->getUrl('*/*/ajaxBlock', array('_current' => true, 'block' => '', 'period' => '')) ?>' + ajaxBlockParam + periodParam;
+ ajaxBlockUrl = '<?php echo $this->getUrl('adminhtml/*/ajaxBlock', array('_current' => true, 'block' => '', 'period' => '')) ?>' + ajaxBlockParam + periodParam;
new Ajax.Request(ajaxBlockUrl, {
parameters: {isAjax: 'true', form_key: FORM_KEY},
onSuccess: function(transport) {
@@ -56,7 +56,7 @@ function changeDiagramsPeriod(periodObj) {
}
});
<?php endforeach; ?>
- ajaxBlockUrl = '<?php echo $this->getUrl('*/*/ajaxBlock', array('_current' => true, 'block' => 'totals', 'period' => '')) ?>' + periodParam;
+ ajaxBlockUrl = '<?php echo $this->getUrl('adminhtml/*/ajaxBlock', array('_current' => true, 'block' => 'totals', 'period' => '')) ?>' + periodParam;
new Ajax.Request(ajaxBlockUrl, {
parameters: {isAjax: 'true', form_key: FORM_KEY},
onSuccess: function(transport) {
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/dashboard/salebar.phtml b/app/code/Magento/Backend/view/adminhtml/dashboard/salebar.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/dashboard/salebar.phtml
rename to app/code/Magento/Backend/view/adminhtml/dashboard/salebar.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/dashboard/searches.phtml b/app/code/Magento/Backend/view/adminhtml/dashboard/searches.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/dashboard/searches.phtml
rename to app/code/Magento/Backend/view/adminhtml/dashboard/searches.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/dashboard/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/dashboard/store/switcher.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/dashboard/store/switcher.phtml
rename to app/code/Magento/Backend/view/adminhtml/dashboard/store/switcher.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/dashboard/totalbar.phtml b/app/code/Magento/Backend/view/adminhtml/dashboard/totalbar.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/dashboard/totalbar.phtml
rename to app/code/Magento/Backend/view/adminhtml/dashboard/totalbar.phtml
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 e5f92e295ba..dd6e0577ae2 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
@@ -26,6 +26,7 @@
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<container name="root" label="Root" output="1">
<block class="Magento\Backend\Block\Template" name="content" template="admin/login.phtml">
+ <block class="Magento\Backend\Block\Page\Copyright" name="copyright" as="copyright"/>
<container name="form.additional.info" label="Form Additional Info"/>
<container name="form.buttons" label="Form Buttons">
<block class="Magento\Backend\Block\Template" name="adminhtml_auth_login_buttons" template="admin/login_buttons.phtml"/>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_cache_block.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_cache_block.xml
rename to app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml
index f219667410c..40034062684 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_cache_block.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml
@@ -39,15 +39,15 @@
<argument name="options" xsi:type="array">
<item name="enable" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Enable</item>
- <item name="url" xsi:type="string">*/*/massEnable</item>
+ <item name="url" xsi:type="string">adminhtml/*/massEnable</item>
</item>
<item name="disable" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Disable</item>
- <item name="url" xsi:type="string">*/*/massDisable</item>
+ <item name="url" xsi:type="string">adminhtml/*/massDisable</item>
</item>
<item name="refresh" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Refresh</item>
- <item name="url" xsi:type="string">*/*/massRefresh</item>
+ <item name="url" xsi:type="string">adminhtml/*/massRefresh</item>
<item name="selected" xsi:type="string">1</item>
</item>
</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_cache_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_cache_index.xml
rename to app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_dashboard_customersmost.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersmost.xml
similarity index 89%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_dashboard_customersmost.xml
rename to app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersmost.xml
index 36c4840b0c0..f695e413ea7 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_dashboard_customersmost.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersmost.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<container name="root" label="Root" output="1">
- <block class="Magento\Adminhtml\Block\Dashboard\Tab\Customers\Most" name="adminhtml.dashboard.tab.customers.most"/>
+ <block class="Magento\Backend\Block\Dashboard\Tab\Customers\Most" name="adminhtml.dashboard.tab.customers.most"/>
</container>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_dashboard_customersnewest.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersnewest.xml
similarity index 89%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_dashboard_customersnewest.xml
rename to app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersnewest.xml
index f2b0267ea4e..8c13d9b697f 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_dashboard_customersnewest.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_customersnewest.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<container name="root" label="Root" output="1">
- <block class="Magento\Adminhtml\Block\Dashboard\Tab\Customers\Newest" name="adminhtml.dashboard.tab.customers.newest"/>
+ <block class="Magento\Backend\Block\Dashboard\Tab\Customers\Newest" name="adminhtml.dashboard.tab.customers.newest"/>
</container>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_dashboard_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_dashboard_index.xml
rename to app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml
index eaf71d9afe2..b9ae51fe7cc 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_dashboard_index.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml
@@ -25,7 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Dashboard" name="dashboard">
+ <block class="Magento\Backend\Block\Dashboard" name="dashboard">
<block class="Magento\Backend\Block\Store\Switcher" name="store_switcher" as="store_switcher" template="store/switcher.phtml">
<action method="setUseConfirm">
<argument name="params" xsi:type="string">0</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_dashboard_productsviewed.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_productsviewed.xml
similarity index 89%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_dashboard_productsviewed.xml
rename to app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_productsviewed.xml
index 6402658786f..534dd8c4d29 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_dashboard_productsviewed.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_productsviewed.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<container name="root" label="Root" output="1">
- <block class="Magento\Adminhtml\Block\Dashboard\Tab\Products\Viewed" name="adminhtml.dashboard.tab.products.viewed"/>
+ <block class="Magento\Backend\Block\Dashboard\Tab\Products\Viewed" name="adminhtml.dashboard.tab.products.viewed"/>
</container>
</layout>
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 4a7791f5368..180d7d7390e 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
@@ -41,6 +41,6 @@
<block class="Magento\Backend\Block\System\Config\Switcher" name="adminhtml.system.config.switcher" before="-"/>
</referenceContainer>
<referenceContainer name="content">
- <block class="Magento\Backend\Block\System\Config\Edit"/>
+ <block name="system.config.edit" class="Magento\Backend\Block\System\Config\Edit"/>
</referenceContainer>
</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Directory/layout/override/catalogsearch_advanced_result.xml b/app/code/Magento/Backend/view/adminhtml/page/copyright.phtml
similarity index 87%
rename from app/design/frontend/magento_plushe/Magento_Directory/layout/override/catalogsearch_advanced_result.xml
rename to app/code/Magento/Backend/view/adminhtml/page/copyright.phtml
index 6c60196129d..913b04e48f9 100644
--- a/app/design/frontend/magento_plushe/Magento_Directory/layout/override/catalogsearch_advanced_result.xml
+++ b/app/code/Magento/Backend/view/adminhtml/page/copyright.phtml
@@ -1,5 +1,4 @@
-<?xml version="1.0"?>
-<!--
+<?php
/**
* Magento
*
@@ -22,5 +21,5 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
+?>
+<?php echo __('Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved.', date('Y')) ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/system/config/js.phtml b/app/code/Magento/Backend/view/adminhtml/system/config/js.phtml
index 5430e61715d..85234baccff 100644
--- a/app/code/Magento/Backend/view/adminhtml/system/config/js.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/system/config/js.phtml
@@ -85,7 +85,7 @@ originModel.prototype = {
{
this.reload = false;
this.loader = new varienLoader(true);
- this.regionsUrl = "<?php echo $this->getUrl('adminhtml/json/countryRegion') ?>";
+ this.regionsUrl = "<?php echo $this->getUrl('directory/json/countryRegion') ?>";
this.bindCountryRegionRelation();
},
diff --git a/app/design/frontend/magento_plushe/Magento_Directory/layout/override/catalogsearch_result_index.xml b/app/code/Magento/Backend/view/install/page/copyright.phtml
similarity index 87%
rename from app/design/frontend/magento_plushe/Magento_Directory/layout/override/catalogsearch_result_index.xml
rename to app/code/Magento/Backend/view/install/page/copyright.phtml
index 6c60196129d..913b04e48f9 100644
--- a/app/design/frontend/magento_plushe/Magento_Directory/layout/override/catalogsearch_result_index.xml
+++ b/app/code/Magento/Backend/view/install/page/copyright.phtml
@@ -1,5 +1,4 @@
-<?xml version="1.0"?>
-<!--
+<?php
/**
* Magento
*
@@ -22,5 +21,5 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
+?>
+<?php echo __('Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved.', date('Y')) ?>
diff --git a/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Renderer/Download.php b/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Renderer/Download.php
index 4a97f1220d1..bbfd4254c29 100644
--- a/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Renderer/Download.php
+++ b/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Renderer/Download.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Backup grid item renderer
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Block\Adminhtml\Grid\Column\Renderer;
@@ -47,7 +47,7 @@ class Download
$url7zip = __('The archive can be uncompressed with <a href="%1">%2</a> on Windows systems.', 'http://www.7-zip.org/',
'7-Zip');
- return '<a href="' . $this->getUrl('*/*/download',
+ return '<a href="' . $this->getUrl('adminhtml/*/download',
array('time' => $row->getData('time'), 'type' => $row->getData('type'))) . '">' . $row->getData('extension')
. '</a> <small>(' . $url7zip . ')</small>';
diff --git a/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Rollback.php b/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Rollback.php
index f94d01ed532..1d6cf4d58e2 100644
--- a/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Rollback.php
+++ b/app/code/Magento/Backup/Block/Adminhtml/Grid/Column/Rollback.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Grid column block that is displayed only if rollback allowed
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Block\Adminhtml\Grid\Column;
diff --git a/app/code/Magento/Backup/Exception.php b/app/code/Magento/Backup/Exception.php
index f0454c07543..044ad1c78d0 100644
--- a/app/code/Magento/Backup/Exception.php
+++ b/app/code/Magento/Backup/Exception.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/Magento/Backup/Model/Config/Source/Type.php b/app/code/Magento/Backup/Model/Config/Source/Type.php
index 17158b40ccb..04cf8d5cb49 100644
--- a/app/code/Magento/Backup/Model/Config/Source/Type.php
+++ b/app/code/Magento/Backup/Model/Config/Source/Type.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Backups types' source model for system configuration
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Model\Config\Source;
diff --git a/app/code/Magento/Backup/Model/Observer.php b/app/code/Magento/Backup/Model/Observer.php
index 924e7446845..91a4524a468 100644
--- a/app/code/Magento/Backup/Model/Observer.php
+++ b/app/code/Magento/Backup/Model/Observer.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/app/code/Magento/Backup/etc/adminhtml/acl.xml b/app/code/Magento/Backup/etc/adminhtml/acl.xml
index ad41ebcee75..6dde6e3e460 100644
--- a/app/code/Magento/Backup/etc/adminhtml/acl.xml
+++ b/app/code/Magento/Backup/etc/adminhtml/acl.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
diff --git a/app/code/Magento/Backup/etc/adminhtml/menu.xml b/app/code/Magento/Backup/etc/adminhtml/menu.xml
index 4d20f8c7564..17c54d4b17e 100644
--- a/app/code/Magento/Backup/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Backup/etc/adminhtml/menu.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
diff --git a/app/code/Magento/Backup/etc/adminhtml/system.xml b/app/code/Magento/Backup/etc/adminhtml/system.xml
index 8d9c8882062..e52153fa097 100644
--- a/app/code/Magento/Backup/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backup/etc/adminhtml/system.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
index ddfc0567648..9948c13e42d 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
@@ -34,7 +34,7 @@
namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab;
class Attributes
- extends \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Attributes
+ extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes
{
/**
* Prepare attributes form of bundle product
@@ -118,7 +118,7 @@ class Attributes
$tier_price = $this->getForm()->getElement('tier_price');
if ($tier_price) {
$tier_price->setRenderer(
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Price\Tier')
+ $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Tier')
->setPriceColumnHeader(__('Percent Discount'))
->setPriceValidation('validate-greater-than-zero validate-number-range number-range-0.00-100.00')
);
@@ -127,7 +127,7 @@ class Attributes
$groupPrice = $this->getForm()->getElement('group_price');
if ($groupPrice) {
$groupPrice->setRenderer(
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Price\Group')
+ $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Group')
->setPriceColumnHeader(__('Percent Discount'))
->setPriceValidation('validate-greater-than-zero validate-number-range number-range-0.00-100.00')
);
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
index 1bb332cc621..13f44331cf2 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
@@ -34,7 +34,7 @@
namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes;
class Extend
- extends \Magento\Adminhtml\Block\Catalog\Form\Renderer\Fieldset\Element
+ extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element
{
const DYNAMIC = 0;
const FIXED = 1;
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php
index 3c6aaae779b..d51b16898c5 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Special.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes;
-class Special extends \Magento\Adminhtml\Block\Catalog\Form\Renderer\Fieldset\Element
+class Special extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element
{
public function getElementHtml()
{
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
index 8863a7464d9..ca30197c635 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
@@ -65,7 +65,7 @@ class Bundle extends \Magento\Adminhtml\Block\Widget
public function getTabUrl()
{
- return $this->getUrl('*/bundle_product_edit/form', array('_current' => true));
+ return $this->getUrl('adminhtml/bundle_product_edit/form', array('_current' => true));
}
public function getTabClass()
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php
index b156f17d357..2abcf375ae4 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php
@@ -187,7 +187,7 @@ class Grid
*/
public function getGridUrl()
{
- return $this->getUrl('*/bundle_selection/grid', array('index' => $this->getIndex(), 'productss' => implode(',', $this->_getProducts())));
+ return $this->getUrl('adminhtml/bundle_selection/grid', array('index' => $this->getIndex(), 'productss' => implode(',', $this->_getProducts())));
}
protected function _getSelectedProducts()
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
index 79089972258..65e6b9ce0ad 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
@@ -187,7 +187,7 @@ class Selection
*/
public function getSelectionSearchUrl()
{
- return $this->getUrl('*/bundle_selection/grid');
+ return $this->getUrl('adminhtml/bundle_selection/grid');
}
/**
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php
index d0935fed4b2..d2e67475211 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit;
-class Tabs extends \Magento\Adminhtml\Block\Catalog\Product\Edit\Tabs
+class Tabs extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs
{
protected $_attributeTabBlock = 'Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes';
@@ -43,7 +43,7 @@ class Tabs extends \Magento\Adminhtml\Block\Catalog\Product\Edit\Tabs
$this->addTab('bundle_items', array(
'label' => __('Bundle Items'),
- 'url' => $this->getUrl('*/*/bundles', array('_current' => true)),
+ 'url' => $this->getUrl('adminhtml/*/bundles', array('_current' => true)),
'class' => 'ajax',
));
$this->bindShadowTabs('bundle_items', 'customer_options');
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
index 433b86b84b7..a76795eea79 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
@@ -34,7 +34,7 @@
*/
namespace Magento\Bundle\Block\Adminhtml\Sales\Order\Items;
-class Renderer extends \Magento\Adminhtml\Block\Sales\Items\Renderer\DefaultRenderer
+class Renderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer
{
/**
* Getting all available childs for Invoice, Shipmen or Creditmemo item
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php
index 00aa5e72d47..37fb5143aaa 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php
@@ -35,7 +35,7 @@
namespace Magento\Bundle\Block\Adminhtml\Sales\Order\View\Items;
class Renderer
- extends \Magento\Adminhtml\Block\Sales\Order\View\Items\Renderer\DefaultRenderer
+ extends \Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer\DefaultRenderer
{
public function isShipmentSeparately($item = null)
{
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
index 87bb9a6b7ac..61b91a3a66a 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
@@ -36,7 +36,6 @@ namespace Magento\Bundle\Block\Catalog\Product\View\Type;
class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
{
- protected $_optionRenderers = array();
protected $_options = null;
/**
@@ -260,17 +259,18 @@ class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
return $coreHelper->jsonEncode($config);
}
- public function addRenderer($type, $block)
- {
- $this->_optionRenderers[$type] = $block;
- }
-
+ /**
+ * Get html for option
+ *
+ * @param \Magento\Bundle\Model\Option $option
+ * @return string
+ */
public function getOptionHtml($option)
{
- if (!isset($this->_optionRenderers[$option->getType()])) {
+ $optionBlock = $this->getChildBlock($option->getType());
+ if (!$optionBlock) {
return __('There is no defined renderer for "%1" option type.', $option->getType());
}
- return $this->getLayout()->createBlock($this->_optionRenderers[$option->getType()])
- ->setOption($option)->toHtml();
+ return $optionBlock->setOption($option)->toHtml();
}
}
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit.php
index 68a28ccd9f0..7ac58a5e53d 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Product/Edit.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Bundle\Controller\Adminhtml\Bundle\Product;
-class Edit extends \Magento\Adminhtml\Controller\Catalog\Product
+class Edit extends \Magento\Catalog\Controller\Adminhtml\Product
{
public function formAction()
{
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Selection.php b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Selection.php
index b3c1b10785c..5821cd8790c 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Selection.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Bundle/Selection.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Bundle\Controller\Adminhtml\Bundle;
-class Selection extends \Magento\Adminhtml\Controller\Action
+class Selection extends \Magento\Backend\Controller\Adminhtml\Action
{
public function searchAction()
{
diff --git a/app/code/Magento/Bundle/Model/Observer.php b/app/code/Magento/Bundle/Model/Observer.php
index 88aaa0eba87..875d4ad3b6f 100644
--- a/app/code/Magento/Bundle/Model/Observer.php
+++ b/app/code/Magento/Bundle/Model/Observer.php
@@ -43,11 +43,11 @@ class Observer
protected $_bundleData = null;
/**
- * Adminhtml catalog
+ * Catalog helper
*
- * @var \Magento\Adminhtml\Helper\Catalog
+ * @var \Magento\Catalog\Helper\Catalog
*/
- protected $_adminhtmlCatalog = null;
+ protected $_helperCatalog = null;
/**
* @var \Magento\Bundle\Model\Resource\Selection
@@ -68,17 +68,17 @@ class Observer
* @param \Magento\Catalog\Model\Product\Visibility $productVisibility
* @param \Magento\Catalog\Model\Config $config
* @param \Magento\Bundle\Model\Resource\Selection $bundleSelection
- * @param \Magento\Adminhtml\Helper\Catalog $adminhtmlCatalog
+ * @param \Magento\Catalog\Helper\Catalog $helperCatalog
* @param \Magento\Bundle\Helper\Data $bundleData
*/
public function __construct(
\Magento\Catalog\Model\Product\Visibility $productVisibility,
\Magento\Catalog\Model\Config $config,
\Magento\Bundle\Model\Resource\Selection $bundleSelection,
- \Magento\Adminhtml\Helper\Catalog $adminhtmlCatalog,
+ \Magento\Catalog\Helper\Catalog $helperCatalog,
\Magento\Bundle\Helper\Data $bundleData
) {
- $this->_adminhtmlCatalog = $adminhtmlCatalog;
+ $this->_helperCatalog = $helperCatalog;
$this->_bundleData = $bundleData;
$this->_bundleSelection = $bundleSelection;
$this->_config = $config;
@@ -280,7 +280,7 @@ class Observer
{
$product = $observer->getEvent()->getProduct();
if ($product->getTypeId() == \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
- $this->_adminhtmlCatalog
+ $this->_helperCatalog
->setAttributeTabBlock('Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes');
}
return $this;
diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_catalog_product_bundle.xml b/app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_bundle.xml
similarity index 100%
rename from app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_catalog_product_bundle.xml
rename to app/code/Magento/Bundle/view/adminhtml/layout/catalog_product_bundle.xml
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 04bb00ce942..d96d858389d 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
@@ -26,22 +26,10 @@
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="product.composite.fieldset">
<block class="Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Bundle" before="product.composite.fieldset.options" name="product.composite.fieldset.bundle" template="product/composite/fieldset/options/bundle.phtml">
- <action method="addRenderer">
- <argument name="type" xsi:type="string">select</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Select</argument>
- </action>
- <action method="addRenderer">
- <argument name="type" xsi:type="string">multi</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Multi</argument>
- </action>
- <action method="addRenderer">
- <argument name="type" xsi:type="string">radio</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Radio</argument>
- </action>
- <action method="addRenderer">
- <argument name="type" xsi:type="string">checkbox</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Checkbox</argument>
- </action>
+ <block class="Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Select" name="product.info.bundle.options.select" as="select"/>
+ <block class="Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Multi" name="product.info.bundle.options.multi" as="multi"/>
+ <block class="Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Radio" name="product.info.bundle.options.radio" as="radio"/>
+ <block class="Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Checkbox" name="product.info.bundle.options.checkbox" as="checkbox"/>
</block>
</referenceBlock>
</layout>
diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_sales_order_creditmemo_new.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_new.xml
similarity index 100%
rename from app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_sales_order_creditmemo_new.xml
rename to app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_new.xml
diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_sales_order_creditmemo_updateqty.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
similarity index 100%
rename from app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_sales_order_creditmemo_updateqty.xml
rename to app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_sales_order_creditmemo_view.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_view.xml
similarity index 100%
rename from app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_sales_order_creditmemo_view.xml
rename to app/code/Magento/Bundle/view/adminhtml/layout/sales_order_creditmemo_view.xml
diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_sales_order_invoice_new.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_new.xml
similarity index 100%
rename from app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_sales_order_invoice_new.xml
rename to app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_new.xml
diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_sales_order_invoice_updateqty.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_updateqty.xml
similarity index 100%
rename from app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_sales_order_invoice_updateqty.xml
rename to app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_updateqty.xml
diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_sales_order_invoice_view.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_view.xml
similarity index 100%
rename from app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_sales_order_invoice_view.xml
rename to app/code/Magento/Bundle/view/adminhtml/layout/sales_order_invoice_view.xml
diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_sales_order_shipment_new.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_shipment_new.xml
similarity index 100%
rename from app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_sales_order_shipment_new.xml
rename to app/code/Magento/Bundle/view/adminhtml/layout/sales_order_shipment_new.xml
diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_sales_order_shipment_view.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_shipment_view.xml
similarity index 100%
rename from app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_sales_order_shipment_view.xml
rename to app/code/Magento/Bundle/view/adminhtml/layout/sales_order_shipment_view.xml
diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_sales_order_view.xml b/app/code/Magento/Bundle/view/adminhtml/layout/sales_order_view.xml
similarity index 100%
rename from app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_sales_order_view.xml
rename to app/code/Magento/Bundle/view/adminhtml/layout/sales_order_view.xml
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 822c7004fff..56a759b99e4 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,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Bundle)" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Bundle)" type="page">
<referenceBlock name="head">
<block class="Magento\Page\Block\Html\Head\Script" name="magento-bundle-bundle-js">
<arguments>
@@ -52,22 +52,10 @@
</referenceBlock>
<referenceBlock name="product.info.options.wrapper">
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle.options" as="type_bundle_options" template="catalog/product/view/type/bundle/options.phtml" before="-">
- <action method="addRenderer">
- <argument name="type" xsi:type="string">select</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select</argument>
- </action>
- <action method="addRenderer">
- <argument name="type" xsi:type="string">multi</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi</argument>
- </action>
- <action method="addRenderer">
- <argument name="type" xsi:type="string">radio</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio</argument>
- </action>
- <action method="addRenderer">
- <argument name="type" xsi:type="string">checkbox</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox</argument>
- </action>
+ <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select" name="product.info.bundle.options.select" as="select"/>
+ <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi" name="product.info.bundle.options.multi" as="multi"/>
+ <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio" name="product.info.bundle.options.radio" as="radio"/>
+ <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox" name="product.info.bundle.options.checkbox" as="checkbox"/>
</block>
</referenceBlock>
<referenceBlock name="product.info.options.wrapper.bottom">
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 173fac26607..3f97cfe6220 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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Bundle Cart Item" type="page" parent="checkout_cart_configure">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Bundle Cart Item" type="page">
<update handle="catalog_product_view_type_bundle"/>
<referenceBlock name="product.info.addtocart.bundle">
<action method="setTemplate">
diff --git a/app/code/Magento/Captcha/Controller/Adminhtml/Refresh.php b/app/code/Magento/Captcha/Controller/Adminhtml/Refresh.php
index 0cd6e620891..62e7149993f 100644
--- a/app/code/Magento/Captcha/Controller/Adminhtml/Refresh.php
+++ b/app/code/Magento/Captcha/Controller/Adminhtml/Refresh.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Captcha\Controller\Adminhtml;
-class Refresh extends \Magento\Adminhtml\Controller\Action
+class Refresh extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Refreshes captcha and returns JSON encoded URL to image (AJAX action)
diff --git a/app/code/Magento/Captcha/etc/module.xml b/app/code/Magento/Captcha/etc/module.xml
index 1e83a3261de..9182e4a8050 100755
--- a/app/code/Magento/Captcha/etc/module.xml
+++ b/app/code/Magento/Captcha/etc/module.xml
@@ -28,12 +28,10 @@
<sequence>
<module name="Magento_Customer"/>
<module name="Magento_Checkout"/>
- <module name="Magento_Adminhtml"/>
</sequence>
<depends>
<module name="Magento_Customer"/>
<module name="Magento_Checkout"/>
- <module name="Magento_Adminhtml"/>
<module name="Magento_Core"/>
<module name="Magento_Backend"/>
<module name="Magento_Page"/>
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Category/AbstractCategory.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Catalog/Category/AbstractCategory.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php
index c25a5f7d539..19d4b52f364 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Category/AbstractCategory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php
@@ -28,10 +28,10 @@
* Category abstract block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Category;
+namespace Magento\Catalog\Block\Adminhtml\Category;
class AbstractCategory extends \Magento\Backend\Block\Template
{
@@ -204,12 +204,21 @@ class AbstractCategory extends \Magento\Backend\Block\Template
{
$params = array('_current'=>true);
$params = array_merge($params, $args);
- return $this->getUrl('*/*/save', $params);
+ return $this->getUrl('catalog/*/save', $params);
}
public function getEditUrl()
{
- return $this->getUrl("*/catalog_category/edit", array('_current'=>true, 'store'=>null, '_query'=>false, 'id'=>null, 'parent'=>null));
+ return $this->getUrl(
+ 'catalog/category/edit',
+ array(
+ '_current' => true,
+ 'store' => null,
+ '_query' => false,
+ 'id' => null,
+ 'parent' => null
+ )
+ );
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php
index 5a499c5d77e..4276474764f 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Category/Checkboxes/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php
@@ -29,9 +29,9 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Category\Checkboxes;
+namespace Magento\Catalog\Block\Adminhtml\Category\Checkboxes;
-class Tree extends \Magento\Adminhtml\Block\Catalog\Category\Tree
+class Tree extends \Magento\Catalog\Block\Adminhtml\Category\Tree
{
protected $_selectedIds = array();
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Category/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit.php
similarity index 84%
rename from app/code/Magento/Adminhtml/Block/Catalog/Category/Edit.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Category/Edit.php
index 33e69c6e583..3a135da1b70 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Category/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit.php
@@ -28,10 +28,10 @@
* Category container block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Category;
+namespace Magento\Catalog\Block\Adminhtml\Category;
class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
{
@@ -42,9 +42,10 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
protected function _construct()
{
- $this->_objectId = 'entity_id';
- $this->_controller = 'catalog_category';
- $this->_mode = 'edit';
+ $this->_objectId = 'entity_id';
+ $this->_blockGroup = 'Magento_Catalog';
+ $this->_controller = 'adminhtml_category';
+ $this->_mode = 'edit';
parent::_construct();
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Category/Edit/Form.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Catalog/Category/Edit/Form.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php
index 2222771df44..a2ee233933d 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Category/Edit/Form.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php
@@ -28,12 +28,12 @@
* Category edit block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Category\Edit;
+namespace Magento\Catalog\Block\Adminhtml\Category\Edit;
-class Form extends \Magento\Adminhtml\Block\Catalog\Category\AbstractCategory
+class Form extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
{
/**
* Additional buttons on category page
@@ -54,7 +54,7 @@ class Form extends \Magento\Adminhtml\Block\Catalog\Category\AbstractCategory
'magento-adminhtml-catalog-category-edit-js',
'Magento\Page\Block\Html\Head\Script',
array(
- 'file' => 'Magento_Adminhtml::catalog/category/edit.js'
+ 'file' => 'Magento_Catalog::catalog/category/edit.js'
)
);
}
@@ -63,7 +63,7 @@ class Form extends \Magento\Adminhtml\Block\Catalog\Category\AbstractCategory
$categoryId = (int) $category->getId(); // 0 when we create category, otherwise some value for editing category
$this->setChild('tabs',
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Category\Tabs', 'tabs')
+ $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Category\Tabs', 'tabs')
);
// Save button
@@ -79,14 +79,14 @@ class Form extends \Magento\Adminhtml\Block\Catalog\Category\AbstractCategory
if (!in_array($categoryId, $this->getRootIds()) && $category->isDeleteable()) {
$this->addChild('delete_button', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Delete Category'),
- 'onclick' => "categoryDelete('" . $this->getUrl('*/*/delete', array('_current' => true)) . "', true, {$categoryId})",
+ 'onclick' => "categoryDelete('" . $this->getUrl('catalog/*/delete', array('_current' => true)) . "', true, {$categoryId})",
'class' => 'delete'
));
}
// Reset button
if (!$category->isReadonly()) {
- $resetPath = $categoryId ? '*/*/edit' : '*/*/add';
+ $resetPath = $categoryId ? 'catalog/*/edit' : 'catalog/*/add';
$this->addChild('reset_button', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Reset'),
'onclick' => "categoryReset('".$this->getUrl($resetPath, array('_current'=>true))."',true)"
@@ -106,7 +106,7 @@ class Form extends \Magento\Adminhtml\Block\Catalog\Category\AbstractCategory
$params['website'] = $store->getWebsite()->getCode();
$params['store'] = $store->getCode();
}
- return $this->getUrl('*/system_store', $params);
+ return $this->getUrl('catalog/system_store', $params);
}
public function getDeleteButtonHtml()
@@ -149,7 +149,7 @@ class Form extends \Magento\Adminhtml\Block\Catalog\Category\AbstractCategory
*
* @param string $alias
* @param array $config
- * @return \Magento\Adminhtml\Block\Catalog\Category\Edit\Form
+ * @return \Magento\Catalog\Block\Adminhtml\Category\Edit\Form
*/
public function addAdditionalButton($alias, $config)
{
@@ -166,7 +166,7 @@ class Form extends \Magento\Adminhtml\Block\Catalog\Category\AbstractCategory
* Remove additional button
*
* @param string $alias
- * @return \Magento\Adminhtml\Block\Catalog\Category\Edit\Form
+ * @return \Magento\Catalog\Block\Adminhtml\Category\Edit\Form
*/
public function removeAdditionalButton($alias)
{
@@ -204,7 +204,7 @@ class Form extends \Magento\Adminhtml\Block\Catalog\Category\AbstractCategory
{
$params = array('_current'=>true);
$params = array_merge($params, $args);
- return $this->getUrl('*/*/delete', $params);
+ return $this->getUrl('catalog/*/delete', $params);
}
/**
@@ -217,7 +217,7 @@ class Form extends \Magento\Adminhtml\Block\Catalog\Category\AbstractCategory
{
$params = array('_current'=>true);
$params = array_merge($params, $args);
- return $this->getUrl('*/*/refreshPath', $params);
+ return $this->getUrl('catalog/*/refreshPath', $params);
}
public function getProductsJson()
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Category/Helper/Image.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Catalog/Category/Helper/Image.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php
index 7bbc7b0c72d..c71a6c30662 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Category/Helper/Image.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php
@@ -28,10 +28,10 @@
* Category form image field helper
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Category\Helper;
+namespace Magento\Catalog\Block\Adminhtml\Category\Helper;
class Image extends \Magento\Data\Form\Element\Image
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php
index 343fd8c1029..26324f333e0 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Category/Helper/Pricestep.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php
@@ -29,10 +29,10 @@
* Adminhtml additional helper block for sort by
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Category\Helper;
+namespace Magento\Catalog\Block\Adminhtml\Category\Helper;
class Pricestep extends \Magento\Data\Form\Element\Text
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php
index d88714f598f..d3efa80c1b1 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Category/Helper/Sortby/Available.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php
@@ -29,10 +29,10 @@
* Adminhtml additional helper block for sort by
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Category\Helper\Sortby;
+namespace Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby;
class Available
extends \Magento\Data\Form\Element\Multiselect
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Category/Helper/Sortby/DefaultSortby.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Catalog/Category/Helper/Sortby/DefaultSortby.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php
index f0d488c6ae2..134dc3ea027 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Category/Helper/Sortby/DefaultSortby.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php
@@ -29,10 +29,10 @@
* Adminhtml additional helper block for sort by
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Category\Helper\Sortby;
+namespace Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby;
class DefaultSortby
extends \Magento\Data\Form\Element\Select
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Category/Tab/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Attributes.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Catalog/Category/Tab/Attributes.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Attributes.php
index 829d5ee9a85..e20d2c53550 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Category/Tab/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Attributes.php
@@ -29,10 +29,10 @@
* Adminhtml Catalog Category Attributes per Group Tab block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Category\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Category\Tab;
class Attributes extends \Magento\Backend\Block\Widget\Form\Generic
{
@@ -95,7 +95,7 @@ class Attributes extends \Magento\Backend\Block\Widget\Form\Generic
/**
* Prepare form before rendering HTML
*
- * @return \Magento\Adminhtml\Block\Catalog\Category\Tab\Attributes
+ * @return \Magento\Catalog\Block\Adminhtml\Category\Tab\Attributes
*/
protected function _prepareForm()
{
@@ -152,7 +152,7 @@ class Attributes extends \Magento\Backend\Block\Widget\Form\Generic
} else {
$form->getElement('url_key')->setRenderer(
$this->getLayout()
- ->createBlock('Magento\Adminhtml\Block\Catalog\Form\Renderer\Attribute\Urlkey')
+ ->createBlock('Magento\Catalog\Block\Adminhtml\Form\Renderer\Attribute\Urlkey')
);
}
}
@@ -203,8 +203,8 @@ class Attributes extends \Magento\Backend\Block\Widget\Form\Generic
protected function _getAdditionalElementTypes()
{
return array(
- 'image' => 'Magento\Adminhtml\Block\Catalog\Category\Helper\Image',
- 'textarea' => 'Magento\Adminhtml\Block\Catalog\Helper\Form\Wysiwyg'
+ 'image' => 'Magento\Catalog\Block\Adminhtml\Category\Helper\Image',
+ 'textarea' => 'Magento\Catalog\Block\Adminhtml\Helper\Form\Wysiwyg'
);
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Category/Tab/Design.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Design.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Catalog/Category/Tab/Design.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Design.php
index e283297bd51..6ec8e9c5af5 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Category/Tab/Design.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Design.php
@@ -23,9 +23,9 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Catalog\Category\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Category\Tab;
-class Design extends \Magento\Adminhtml\Block\Catalog\Form
+class Design extends \Magento\Catalog\Block\Adminhtml\Form
{
public function _construct()
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Category/Tab/General.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/General.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Catalog/Category/Tab/General.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/General.php
index 83302afe062..d5517e5b00f 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Category/Tab/General.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/General.php
@@ -28,12 +28,12 @@
* Category edit general tab
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Category\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Category\Tab;
-class General extends \Magento\Adminhtml\Block\Catalog\Form
+class General extends \Magento\Catalog\Block\Adminhtml\Form
{
protected $_category;
@@ -112,7 +112,7 @@ class General extends \Magento\Adminhtml\Block\Catalog\Form
protected function _getAdditionalElementTypes()
{
- return array('image' => 'Magento\Adminhtml\Block\Catalog\Category\Helper\Image');
+ return array('image' => 'Magento\Catalog\Block\Adminhtml\Category\Helper\Image');
}
protected function _getParentCategoryOptions($node=null, &$options=array())
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Category/Tab/Product.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Catalog/Category/Tab/Product.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php
index 9ae9d87e48e..402212ca660 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Category/Tab/Product.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php
@@ -28,10 +28,10 @@
* Product in category grid
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Category\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Category\Tab;
class Product extends \Magento\Backend\Block\Widget\Grid\Extended
{
@@ -181,7 +181,7 @@ class Product extends \Magento\Backend\Block\Widget\Grid\Extended
public function getGridUrl()
{
- return $this->getUrl('*/*/grid', array('_current'=>true));
+ return $this->getUrl('catalog/*/grid', array('_current'=>true));
}
protected function _getSelectedProducts()
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Category/Tabs.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tabs.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Catalog/Category/Tabs.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Category/Tabs.php
index d37816f222a..d3bf8962556 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Category/Tabs.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tabs.php
@@ -27,7 +27,7 @@
/**
* Category tabs
*/
-namespace Magento\Adminhtml\Block\Catalog\Category;
+namespace Magento\Catalog\Block\Adminhtml\Category;
class Tabs extends \Magento\Backend\Block\Widget\Tabs
{
@@ -36,9 +36,9 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
*
* @var string
*/
- protected $_attributeTabBlock = 'Magento\Adminhtml\Block\Catalog\Category\Tab\Attributes';
+ protected $_attributeTabBlock = 'Magento\Catalog\Block\Adminhtml\Category\Tab\Attributes';
- protected $_template = 'widget/tabshoriz.phtml';
+ protected $_template = 'Magento_Adminhtml::widget/tabshoriz.phtml';
/**
* Core registry
@@ -48,11 +48,11 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
protected $_coreRegistry = null;
/**
- * Adminhtml catalog
+ * Catalog helper
*
- * @var \Magento\Adminhtml\Helper\Catalog
+ * @var \Magento\Catalog\Helper\Catalog
*/
- protected $_adminhtmlCatalog = null;
+ protected $_helperCatalog = null;
/**
* @var \Magento\Eav\Model\Resource\Entity\Attribute\Group\CollectionFactory
@@ -61,7 +61,7 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
/**
* @param \Magento\Eav\Model\Resource\Entity\Attribute\Group\CollectionFactory $collectionFactory
- * @param \Magento\Adminhtml\Helper\Catalog $adminhtmlCatalog
+ * @param \Magento\Catalog\Helper\Catalog $helperCatalog
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Backend\Model\Auth\Session $authSession
@@ -70,7 +70,7 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
*/
public function __construct(
\Magento\Eav\Model\Resource\Entity\Attribute\Group\CollectionFactory $collectionFactory,
- \Magento\Adminhtml\Helper\Catalog $adminhtmlCatalog,
+ \Magento\Catalog\Helper\Catalog $helperCatalog,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
\Magento\Backend\Model\Auth\Session $authSession,
@@ -79,7 +79,7 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
) {
$this->_collectionFactory = $collectionFactory;
$this->_coreRegistry = $registry;
- $this->_adminhtmlCatalog = $adminhtmlCatalog;
+ $this->_helperCatalog = $helperCatalog;
parent::__construct($coreData, $context, $authSession, $data);
}
@@ -112,7 +112,7 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
*/
public function getAttributeTabBlock()
{
- if ($block = $this->_adminhtmlCatalog->getCategoryAttributeTabBlock()) {
+ if ($block = $this->_helperCatalog->getCategoryAttributeTabBlock()) {
return $block;
}
return $this->_attributeTabBlock;
@@ -121,7 +121,7 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
/**
* Prepare Layout Content
*
- * @return \Magento\Adminhtml\Block\Catalog\Category\Tabs
+ * @return \Magento\Catalog\Block\Adminhtml\Category\Tabs
*/
protected function _prepareLayout()
{
@@ -181,7 +181,7 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
$this->addTab('products', array(
'label' => __('Category Products'),
'content' => $this->getLayout()->createBlock(
- 'Magento\Adminhtml\Block\Catalog\Category\Tab\Product',
+ 'Magento\Catalog\Block\Adminhtml\Category\Tab\Product',
'category.product.grid'
)->toHtml(),
));
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Catalog/Category/Tree.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
index 481688e0cb2..02a82ea70de 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Category/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -29,12 +29,12 @@
* Categories tree block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Category;
+namespace Magento\Catalog\Block\Adminhtml\Category;
-class Tree extends \Magento\Adminhtml\Block\Catalog\Category\AbstractCategory
+class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
{
protected $_withProductCount;
@@ -115,8 +115,8 @@ class Tree extends \Magento\Adminhtml\Block\Catalog\Category\AbstractCategory
$this->setChild('store_switcher',
$this->getLayout()->createBlock('Magento\Backend\Block\Store\Switcher')
- ->setSwitchUrl($this->getUrl('*/*/*', array('_current'=>true, '_query'=>false, 'store'=>null)))
- ->setTemplate('store/switcher/enhanced.phtml')
+ ->setSwitchUrl($this->getUrl('catalog/*/*', array('_current'=>true, '_query'=>false, 'store'=>null)))
+ ->setTemplate('Magento_Adminhtml::store/switcher/enhanced.phtml')
);
return parent::_prepareLayout();
}
@@ -231,18 +231,18 @@ class Tree extends \Magento\Adminhtml\Block\Catalog\Category\AbstractCategory
|| $expanded == true) {
$params['expand_all'] = true;
}
- return $this->getUrl('*/*/categoriesJson', $params);
+ return $this->getUrl('catalog/*/categoriesJson', $params);
}
public function getNodesUrl()
{
- return $this->getUrl('*/catalog_category/jsonTree');
+ return $this->getUrl('catalog/category/jsonTree');
}
public function getSwitchTreeUrl()
{
return $this->getUrl(
- "*/catalog_category/tree",
+ 'catalog/category/tree',
array('_current'=>true, 'store'=>null, '_query'=>false, 'id'=>null, 'parent'=>null)
);
}
@@ -254,7 +254,7 @@ class Tree extends \Magento\Adminhtml\Block\Catalog\Category\AbstractCategory
public function getMoveUrl()
{
- return $this->getUrl('*/catalog_category/move', array('store'=>$this->getRequest()->getParam('store')));
+ return $this->getUrl('catalog/category/move', array('store'=>$this->getRequest()->getParam('store')));
}
public function getTree($parenNodeCategory=null)
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Category/Widget/Chooser.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Catalog/Category/Widget/Chooser.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php
index e5911f7a591..b32ebd400dc 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Category/Widget/Chooser.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php
@@ -28,12 +28,12 @@
* Category chooser for Wysiwyg CMS widget
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Category\Widget;
+namespace Magento\Catalog\Block\Adminhtml\Category\Widget;
-class Chooser extends \Magento\Adminhtml\Block\Catalog\Category\Tree
+class Chooser extends \Magento\Catalog\Block\Adminhtml\Category\Tree
{
protected $_selectedCategories = array();
@@ -54,7 +54,7 @@ class Chooser extends \Magento\Adminhtml\Block\Catalog\Category\Tree
* Setter
*
* @param array $selectedCategories
- * @return \Magento\Adminhtml\Block\Catalog\Category\Widget\Chooser
+ * @return \Magento\Catalog\Block\Adminhtml\Category\Widget\Chooser
*/
public function setSelectedCategories($selectedCategories)
{
@@ -81,7 +81,7 @@ class Chooser extends \Magento\Adminhtml\Block\Catalog\Category\Tree
public function prepareElementHtml(\Magento\Data\Form\Element\AbstractElement $element)
{
$uniqId = $this->_coreData->uniqHash($element->getId());
- $sourceUrl = $this->getUrl('*/catalog_category_widget/chooser', array('uniq_id' => $uniqId, 'use_massaction' => false));
+ $sourceUrl = $this->getUrl('catalog/category_widget/chooser', array('uniq_id' => $uniqId, 'use_massaction' => false));
$chooser = $this->getLayout()->createBlock('Magento\Widget\Block\Adminhtml\Widget\Chooser')
->setElement($element)
@@ -172,7 +172,7 @@ class Chooser extends \Magento\Adminhtml\Block\Catalog\Category\Tree
*/
public function getLoadTreeUrl($expanded=null)
{
- return $this->getUrl('*/catalog_category_widget/categoriesJson', array(
+ return $this->getUrl('catalog/category_widget/categoriesJson', array(
'_current'=>true,
'uniq_id' => $this->getId(),
'use_massaction' => $this->getUseMassaction()
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Form.php b/app/code/Magento/Catalog/Block/Adminhtml/Form.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Catalog/Form.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Form.php
index edf4603ecc4..e01a49b8da1 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Form.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Form.php
@@ -28,10 +28,10 @@
* Base block for rendering category and product forms
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog;
+namespace Magento\Catalog\Block\Adminhtml;
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
@@ -51,7 +51,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
);
\Magento\Data\Form::setFieldsetElementRenderer(
$this->getLayout()->createBlock(
- 'Magento\Adminhtml\Block\Catalog\Form\Renderer\Fieldset\Element',
+ 'Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element',
$this->getNameInLayout() . '_fieldset_element'
)
);
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Attribute/Urlkey.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Attribute/Urlkey.php
index 1181df26c17..2f1c035d736 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Form/Renderer/Attribute/Urlkey.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Attribute/Urlkey.php
@@ -29,14 +29,14 @@
* Allows to manage and overwrite URL Rewrites History save settings
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Form\Renderer\Attribute;
+namespace Magento\Catalog\Block\Adminhtml\Form\Renderer\Attribute;
class Urlkey
- extends \Magento\Adminhtml\Block\Catalog\Form\Renderer\Fieldset\Element
+ extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element
{
/**
* Catalog data
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php
index f795c1c9305..fd213659e61 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Form/Renderer/Config/DateFieldsOrder.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/DateFieldsOrder.php
@@ -28,10 +28,10 @@
* Catalog Custom Options Config Renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Form\Renderer\Config;
+namespace Magento\Catalog\Block\Adminhtml\Form\Renderer\Config;
class DateFieldsOrder
extends \Magento\Backend\Block\System\Config\Form\Field
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
index 65bb1429d61..fbf1c5539d5 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
@@ -28,10 +28,10 @@
* Catalog Custom Options Config Renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Form\Renderer\Config;
+namespace Magento\Catalog\Block\Adminhtml\Form\Renderer\Config;
class YearRange extends \Magento\Backend\Block\System\Config\Form\Field
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
index 571675f95c6..00c11072748 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
@@ -28,10 +28,10 @@
* Catalog fieldset element renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Form\Renderer\Fieldset;
+namespace Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset;
class Element
extends \Magento\Adminhtml\Block\Widget\Form\Renderer\Fieldset\Element
@@ -40,7 +40,7 @@ class Element
* Initialize block template
*/
- protected $_template = 'Magento_Adminhtml::catalog/form/renderer/fieldset/element.phtml';
+ protected $_template = 'Magento_Catalog::catalog/form/renderer/fieldset/element.phtml';
/**
* Retrieve data object related with form
@@ -116,7 +116,7 @@ class Element
/**
* Disable field in default value using case
*
- * @return \Magento\Adminhtml\Block\Catalog\Form\Renderer\Fieldset\Element
+ * @return \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element
*/
public function checkFieldDisable()
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
index b498f6c79f7..4feec79d6c2 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
@@ -28,10 +28,10 @@
* Catalog textarea attribute WYSIWYG button
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Helper\Form;
+namespace Magento\Catalog\Block\Adminhtml\Helper\Form;
class Wysiwyg extends \Magento\Data\Form\Element\Textarea
{
@@ -102,7 +102,7 @@ class Wysiwyg extends \Magento\Data\Form\Element\Textarea
'disabled' => $disabled,
'class' => ($disabled) ? 'disabled action-wysiwyg' : 'action-wysiwyg',
'onclick' => 'catalogWysiwygEditor.open(\''
- . $this->_backendData->getUrl('adminhtml/catalog_product/wysiwyg')
+ . $this->_backendData->getUrl('catalog/product/wysiwyg')
. '\', \'' . $this->getHtmlId().'\')'
)))->toHtml();
$html .= <<<HTML
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg/Content.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php
index 8a17d328c70..86ef938b6ed 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg/Content.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php
@@ -28,10 +28,10 @@
* Textarea attribute WYSIWYG content
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Helper\Form\Wysiwyg;
+namespace Magento\Catalog\Block\Adminhtml\Helper\Form\Wysiwyg;
class Content
extends \Magento\Backend\Block\Widget\Form\Generic
@@ -65,7 +65,7 @@ class Content
* Prepare form.
* Adding editor field to render
*
- * @return \Magento\Adminhtml\Block\Catalog\Helper\Form\Wysiwyg\Content
+ * @return \Magento\Catalog\Block\Adminhtml\Helper\Form\Wysiwyg\Content
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product.php b/app/code/Magento/Catalog/Block/Adminhtml/Product.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product.php
index 94164429a32..3fccf671cb5 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product.php
@@ -28,10 +28,10 @@
* Catalog manage products block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog;
+namespace Magento\Catalog\Block\Adminhtml;
class Product extends \Magento\Adminhtml\Block\Widget\Container
{
@@ -70,7 +70,7 @@ class Product extends \Magento\Adminhtml\Block\Widget\Container
/**
* Prepare button and grid
*
- * @return \Magento\Adminhtml\Block\Catalog\Product
+ * @return \Magento\Catalog\Block\Adminhtml\Product
*/
protected function _prepareLayout()
{
@@ -86,7 +86,7 @@ class Product extends \Magento\Adminhtml\Block\Widget\Container
$this->setChild(
'grid',
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Product\Grid', 'product.grid')
+ $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Product\Grid', 'product.grid')
);
return parent::_prepareLayout();
}
@@ -119,7 +119,7 @@ class Product extends \Magento\Adminhtml\Block\Widget\Container
*/
protected function _getProductCreateUrl($type)
{
- return $this->getUrl('*/*/new', array(
+ return $this->getUrl('catalog/*/new', array(
'set' => $this->_productFactory->create()->getDefaultAttributeSetId(),
'type' => $type
));
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute.php
similarity index 87%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute.php
index 579bdf257b2..530f6721a07 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute.php
@@ -28,18 +28,19 @@
* Adminhtml catalog product attributes block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product;
+namespace Magento\Catalog\Block\Adminhtml\Product;
class Attribute extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
protected function _construct()
{
- $this->_controller = 'catalog_product_attribute';
+ $this->_controller = 'adminhtml_product_attribute';
+ $this->_blockGroup = 'Magento_Catalog';
$this->_headerText = __('Product Attributes');
$this->_addButtonLabel = __('Add New Attribute');
parent::_construct();
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
index a915bb2b229..a4f227816cc 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
@@ -28,7 +28,7 @@
* Product attribute edit page
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Attribute;
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute;
class Edit extends \Magento\Backend\Block\Widget\Form\Container
{
@@ -37,7 +37,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
*
* @var string
*/
- protected $_blockGroup = 'Magento_Adminhtml';
+ protected $_blockGroup = 'Magento_Catalog';
/**
* Core registry
@@ -65,7 +65,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
protected function _construct()
{
$this->_objectId = 'attribute_id';
- $this->_controller = 'catalog_product_attribute';
+ $this->_controller = 'adminhtml_product_attribute';
parent::_construct();
@@ -139,7 +139,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
*/
public function getValidationUrl()
{
- return $this->getUrl('*/*/validate', array('_current'=>true));
+ return $this->getUrl('catalog/*/validate', array('_current'=>true));
}
/**
@@ -149,7 +149,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
*/
public function getSaveUrl()
{
- return $this->getUrl('*/' . $this->_controller . '/save', array(
+ return $this->getUrl('catalog/product_attribute/save', array(
'_current' => true,
'back' => null,
'product_tab' => $this->getRequest()->getParam('product_tab')
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Form.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Form.php
index be57fb6c4f7..8c173867c54 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit/Form.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Form.php
@@ -28,11 +28,11 @@
* Product attribute add/edit form block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Attribute\Edit;
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit;
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Advanced.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Advanced.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
index a995cdc3439..cbf29a0c266 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Advanced.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
@@ -29,10 +29,10 @@
* Product attribute add/edit form main tab
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Attribute\Edit\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
class Advanced
extends \Magento\Backend\Block\Widget\Form\Generic
@@ -75,7 +75,7 @@ class Advanced
/**
* Adding product form elements for editing attribute
*
- * @return \Magento\Adminhtml\Block\Catalog\Product\Attribute\Edit\Tab\Advanced
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Advanced
*/
protected function _prepareForm()
{
@@ -229,7 +229,7 @@ class Advanced
/**
* Initialize form fileds values
*
- * @return \Magento\Adminhtml\Block\Catalog\Product\Attribute\Edit\Tab\Advanced
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Advanced
*/
protected function _initFormValues()
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
similarity index 98%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
index 42e82bc18be..a15da363cd4 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Front.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
@@ -28,11 +28,11 @@
* Product attribute add/edit form main tab
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Attribute\Edit\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
class Front
extends \Magento\Backend\Block\Widget\Form\Generic
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
index 1e59b233b8f..8c3de01c977 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
@@ -28,17 +28,17 @@
* Product attribute add/edit form main tab
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Attribute\Edit\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
class Main extends \Magento\Eav\Block\Adminhtml\Attribute\Edit\Main\AbstractMain
{
/**
* Adding product form elements for editing attribute
*
- * @return \Magento\Adminhtml\Block\Catalog\Product\Attribute\Edit\Tab\Main
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Main
*/
protected function _prepareForm()
{
@@ -118,6 +118,6 @@ class Main extends \Magento\Eav\Block\Adminhtml\Attribute\Edit\Main\AbstractMain
*/
protected function _getAdditionalElementTypes()
{
- return array('apply' => 'Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Apply');
+ return array('apply' => 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Apply');
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
similarity index 88%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
index 54340403132..555390dbf89 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/Options.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Options.php
@@ -27,14 +27,14 @@
/**
* Product attribute add/edit form options tab
*
- * @method \Magento\Adminhtml\Block\Catalog\Product\Attribute\Edit\Tab\Options setReadOnly(bool $value)
+ * @method \Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Options setReadOnly(bool $value)
* @method null|bool getReadOnly
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Attribute\Edit\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
class Options
extends \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\AbstractOptions
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/System.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/System.php
index 54375c19706..af73668a0d8 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tab/System.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/System.php
@@ -28,11 +28,11 @@
* Product attribute add/edit form system tab
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Attribute\Edit\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
class System extends \Magento\Backend\Block\Widget\Form\Generic
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tabs.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tabs.php
index f029dc8919b..ef859959e98 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tabs.php
@@ -28,10 +28,10 @@
* Adminhtml product attribute edit page tabs
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Attribute\Edit;
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit;
class Tabs extends \Magento\Adminhtml\Block\Widget\Tabs
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Grid.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php
index b21c4b64260..3ddc8d33263 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Grid.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php
@@ -28,10 +28,10 @@
* Product attributes grid
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Attribute;
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute;
class Grid extends \Magento\Eav\Block\Adminhtml\Attribute\Grid\AbstractGrid
{
@@ -57,13 +57,14 @@ class Grid extends \Magento\Eav\Block\Adminhtml\Attribute\Grid\AbstractGrid
array $data = array()
) {
$this->_collectionFactory = $collectionFactory;
+ $this->_module = 'catalog';
parent::__construct($coreData, $context, $storeManager, $urlModel, $data);
}
/**
* Prepare product attributes grid collection object
*
- * @return \Magento\Adminhtml\Block\Catalog\Product\Attribute\Grid
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Attribute\Grid
*/
protected function _prepareCollection()
{
@@ -77,7 +78,7 @@ class Grid extends \Magento\Eav\Block\Adminhtml\Attribute\Grid\AbstractGrid
/**
* Prepare product attributes grid columns
*
- * @return \Magento\Adminhtml\Block\Catalog\Product\Attribute\Grid
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Attribute\Grid
*/
protected function _prepareColumns()
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/NewAttribute/Product/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Attributes.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/NewAttribute/Product/Attributes.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Attributes.php
index b9acd384881..1a5137de94a 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/NewAttribute/Product/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Attributes.php
@@ -28,12 +28,12 @@
* Product attributes tab
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Attribute\NewAttribute\Product;
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\NewAttribute\Product;
-class Attributes extends \Magento\Adminhtml\Block\Catalog\Form
+class Attributes extends \Magento\Catalog\Block\Adminhtml\Form
{
protected function _prepareForm()
{
@@ -72,9 +72,9 @@ class Attributes extends \Magento\Adminhtml\Block\Catalog\Form
protected function _getAdditionalElementTypes()
{
$result = array(
- 'price' => 'Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Price',
- 'image' => 'Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Image',
- 'boolean' => 'Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Boolean',
+ 'price' => 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Price',
+ 'image' => 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Image',
+ 'boolean' => 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Boolean',
);
$response = new \Magento\Object();
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/NewAttribute/Product/Created.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php
similarity index 98%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/NewAttribute/Product/Created.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php
index 9bef46a8f64..ef822d317db 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/NewAttribute/Product/Created.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php
@@ -28,10 +28,10 @@
* New product attribute created on product edit page
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Attribute\NewAttribute\Product;
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\NewAttribute\Product;
class Created extends \Magento\Backend\Block\Widget
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
index d3dd2838452..2c039061c8c 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
@@ -31,7 +31,7 @@
* @package Magento_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Attribute\Set;
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set;
class Main extends \Magento\Backend\Block\Template
{
@@ -105,15 +105,15 @@ class Main extends \Magento\Backend\Block\Template
/**
* Prepare Global Layout
*
- * @return \Magento\Adminhtml\Block\Catalog\Product\Attribute\Set\Main
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main
*/
protected function _prepareLayout()
{
$setId = $this->_getSetId();
- $this->addChild('group_tree', 'Magento\Adminhtml\Block\Catalog\Product\Attribute\Set\Main\Tree\Group');
+ $this->addChild('group_tree', 'Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main\Tree\Group');
- $this->addChild('edit_set_form', 'Magento\Adminhtml\Block\Catalog\Product\Attribute\Set\Main\Formset');
+ $this->addChild('edit_set_form', 'Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main\Formset');
$this->addChild('delete_group_button', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Delete Selected Group'),
@@ -129,7 +129,7 @@ class Main extends \Magento\Backend\Block\Template
$this->addChild('back_button', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Back'),
- 'onclick' => 'setLocation(\''.$this->getUrl('*/*/').'\')',
+ 'onclick' => 'setLocation(\''.$this->getUrl('catalog/*/').'\')',
'class' => 'back'
));
@@ -146,7 +146,7 @@ class Main extends \Magento\Backend\Block\Template
$this->addChild('delete_button', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Delete Attribute Set'),
- 'onclick' => 'deleteConfirm(\''. $this->jsQuoteEscape(__('You are about to delete all products in this set. Are you sure you want to delete this attribute set?')) . '\', \'' . $this->getUrl('*/*/delete', array('id' => $setId)) . '\')',
+ 'onclick' => 'deleteConfirm(\''. $this->jsQuoteEscape(__('You are about to delete all products in this set. Are you sure you want to delete this attribute set?')) . '\', \'' . $this->getUrl('catalog/*/delete', array('id' => $setId)) . '\')',
'class' => 'delete'
));
@@ -195,7 +195,7 @@ class Main extends \Magento\Backend\Block\Template
*/
public function getMoveUrl()
{
- return $this->getUrl('*/catalog_product_set/save', array('id' => $this->_getSetId()));
+ return $this->getUrl('catalog/product_set/save', array('id' => $this->_getSetId()));
}
/**
@@ -205,7 +205,7 @@ class Main extends \Magento\Backend\Block\Template
*/
public function getGroupUrl()
{
- return $this->getUrl('*/catalog_product_group/save', array('id' => $this->_getSetId()));
+ return $this->getUrl('catalog/product_group/save', array('id' => $this->_getSetId()));
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formattribute.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formattribute.php
index 8833ef8b0fd..068dd0879ee 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formattribute.php
@@ -26,11 +26,11 @@
/**
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Attribute\Set\Main;
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main;
class Formattribute extends \Magento\Backend\Block\Widget\Form\Generic
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php
index 6c0ef6d85ba..12ad387b0f2 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formgroup.php
@@ -26,11 +26,11 @@
/**
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Attribute\Set\Main;
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main;
class Formgroup
extends \Magento\Backend\Block\Widget\Form\Generic
@@ -97,7 +97,7 @@ class Formgroup
$form->setUseContainer(true);
$form->setMethod('post');
- $form->setAction($this->getUrl('*/catalog_product_group/save'));
+ $form->setAction($this->getUrl('catalog/product_group/save'));
$this->setForm($form);
}
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formset.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formset.php
index f200a791dff..69d2bf4b5f6 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Formset.php
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Attribute\Set\Main;
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main;
class Formset
extends \Magento\Backend\Block\Widget\Form\Generic
@@ -98,7 +98,7 @@ class Formset
$form->setMethod('post');
$form->setUseContainer(true);
$form->setId('set-prop-form');
- $form->setAction($this->getUrl('*/*/save'));
+ $form->setAction($this->getUrl('catalog/*/save'));
$form->setOnsubmit('return false;');
$this->setForm($form);
}
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php
index 3900e6495d7..9ecdea26602 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php
@@ -26,11 +26,11 @@
/**
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Attribute\Set\Main\Tree;
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main\Tree;
class Attribute extends \Magento\Adminhtml\Block\Template
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php
index efc08fd70b0..44e900b8a8a 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php
@@ -26,11 +26,11 @@
/**
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Attribute\Set\Main\Tree;
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main\Tree;
class Group extends \Magento\Adminhtml\Block\Template
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
index 17fb62bb426..26b253143b7 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
@@ -28,10 +28,10 @@
* description
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Attribute\Set\Toolbar;
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Toolbar;
class Add extends \Magento\Adminhtml\Block\Template
{
@@ -51,11 +51,11 @@ class Add extends \Magento\Adminhtml\Block\Template
));
$this->addChild('back_button', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Back'),
- 'onclick' => 'setLocation(\''.$this->getUrl('*/*/').'\')',
+ 'onclick' => 'setLocation(\''.$this->getUrl('catalog/*/').'\')',
'class' => 'back'
));
- $this->addChild('setForm', 'Magento\Adminhtml\Block\Catalog\Product\Attribute\Set\Main\Formset');
+ $this->addChild('setForm', 'Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main\Formset');
return parent::_prepareLayout();
}
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
index 84512df4956..65973c4a7e6 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
@@ -28,11 +28,11 @@
* Adminhtml catalog product sets main page toolbar
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Attribute\Set\Toolbar;
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Toolbar;
class Main extends \Magento\Backend\Block\Template
{
@@ -45,7 +45,7 @@ class Main extends \Magento\Backend\Block\Template
{
$this->addChild('addButton', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Add New Set'),
- 'onclick' => 'setLocation(\'' . $this->getUrl('*/*/add') . '\')',
+ 'onclick' => 'setLocation(\'' . $this->getUrl('catalog/*/add') . '\')',
'class' => 'add',
));
return parent::_prepareLayout();
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main/Filter.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main/Filter.php
index 1ec39a5b3e6..ce9e145ef50 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main/Filter.php
@@ -26,11 +26,11 @@
/**
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Attribute\Set\Toolbar\Main;
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Toolbar\Main;
class Filter
extends \Magento\Backend\Block\Widget\Form\Generic
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Configure.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Configure.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php
index 9e08cbda716..667e8196b35 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Configure.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php
@@ -28,10 +28,10 @@
* Adminhtml catalog product composite configure block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Composite;
+namespace Magento\Catalog\Block\Adminhtml\Product\Composite;
class Configure extends \Magento\Adminhtml\Block\Widget
{
@@ -94,7 +94,7 @@ class Configure extends \Magento\Adminhtml\Block\Widget
* Set product object
*
* @param \Magento\Catalog\Model\Product $product
- * @return \Magento\Adminhtml\Block\Catalog\Product\Composite\Configure
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Composite\Configure
*/
public function setProduct(\Magento\Catalog\Model\Product $product = null)
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Error.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Error.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Error.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Error.php
index a1239f090fc..7bab6937961 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Error.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Error.php
@@ -28,10 +28,10 @@
* Adminhtml block for showing product options fieldsets
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Composite;
+namespace Magento\Catalog\Block\Adminhtml\Product\Composite;
class Error extends \Magento\Core\Block\Template
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Fieldset.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Fieldset.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset.php
index bf4006ecef5..55f915ebac8 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Fieldset.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset.php
@@ -28,10 +28,10 @@
* Adminhtml block for showing product options fieldsets
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Composite;
+namespace Magento\Catalog\Block\Adminhtml\Product\Composite;
class Fieldset extends \Magento\Core\Block\Text\ListText
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
similarity index 60%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
index 1c28fdd5a49..763b599c103 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Configurable.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
@@ -27,42 +27,10 @@
/**
* Adminhtml block for fieldset of configurable product
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Composite\Fieldset;
+namespace Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset;
class Configurable extends \Magento\Catalog\Block\Product\View\Type\Configurable
{
- /**
- * Construct
- *
- * @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Catalog\Model\Config $catalogConfig
- * @param \Magento\Tax\Model\Calculation $taxCalculation
- * @param \Magento\Core\Model\Registry $coreRegistry
- * @param \Magento\Catalog\Helper\Product $catalogProduct
- * @param \Magento\Tax\Helper\Data $taxData
- * @param \Magento\Catalog\Helper\Data $catalogData
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Block\Template\Context $context
- * @param array $data
- *
- * @SuppressWarnings(PHPMD.ExcessiveParameterList)
- */
- public function __construct(
- \Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Catalog\Model\Config $catalogConfig,
- \Magento\Tax\Model\Calculation $taxCalculation,
- \Magento\Core\Model\Registry $coreRegistry,
- \Magento\Catalog\Helper\Product $catalogProduct,
- \Magento\Tax\Helper\Data $taxData,
- \Magento\Catalog\Helper\Data $catalogData,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Block\Template\Context $context,
- array $data = array()
- ) {
- parent::__construct($storeManager, $catalogConfig, $taxCalculation, $coreRegistry, $catalogProduct, $taxData,
- $catalogData, $coreData, $context, $data);
- }
-
/**
* Retrieve product
*
@@ -76,7 +44,7 @@ class Configurable extends \Magento\Catalog\Block\Product\View\Type\Configurable
$product = $this->getData('product');
if (is_null($product->getTypeInstance()->getStoreFilter($product))) {
$product->getTypeInstance()->setStoreFilter(
- $this->_storeConfig->getStore($product->getStoreId()),
+ $this->_storeManager->getStore($product->getStoreId()),
$product
);
}
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Grouped.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Grouped.php
index 9d65a143df5..69df4e66967 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Grouped.php
@@ -27,7 +27,7 @@
/**
* Adminhtml block for fieldset of grouped product
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Composite\Fieldset;
+namespace Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset;
class Grouped
extends \Magento\Catalog\Block\Product\View\Type\Grouped
@@ -37,6 +37,8 @@ class Grouped
*/
protected $_taxCalculation;
+ protected $_priceBlockDefaultTemplate = 'catalog/product/price.phtml';
+
/**
* Construct
*
@@ -74,7 +76,7 @@ class Grouped
{
parent::_construct();
- $this->_block = 'Magento\Adminhtml\Block\Catalog\Product\Price';
+ $this->_block = 'Magento\Catalog\Block\Adminhtml\Product\Price';
$this->_useLinkForAsLowAs = false;
if (!$this->_taxCalculation->getCustomer() && $this->_coreRegistry->registry('current_customer')) {
@@ -95,7 +97,7 @@ class Grouped
$product = $this->getData('product');
if (is_null($product->getTypeInstance()->getStoreFilter($product))) {
$product->getTypeInstance()->setStoreFilter(
- $this->_storeManger->getStore($product->getStoreId()),
+ $this->_storeManager->getStore($product->getStoreId()),
$product
);
}
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Options.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Options.php
index 14372b57f18..608cce8a529 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Options.php
@@ -28,10 +28,10 @@
* Adminhtml block for fieldset of product custom options
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Composite\Fieldset;
+namespace Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset;
class Options extends \Magento\Catalog\Block\Product\View\Options
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Qty.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Qty.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Qty.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Qty.php
index cf1df780750..5ad377bfe6a 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Qty.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Qty.php
@@ -27,7 +27,7 @@
/**
* Adminhtml block for fieldset of product custom options
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Composite\Fieldset;
+namespace Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset;
class Qty extends \Magento\Core\Block\Template
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Update/Result.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Update/Result.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Update/Result.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Update/Result.php
index 46b7e6c1923..34d75a06bbd 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Composite/Update/Result.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Update/Result.php
@@ -30,10 +30,10 @@
* for single item
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Composite\Update;
+namespace Magento\Catalog\Block\Adminhtml\Product\Composite\Update;
class Result extends \Magento\Core\Block\Template
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Created.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Created.php
similarity index 98%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Created.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Created.php
index 493ed904c02..9f593f53a85 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Created.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Created.php
@@ -28,10 +28,10 @@
* Product after creation popup window
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product;
+namespace Magento\Catalog\Block\Adminhtml\Product;
class Created extends \Magento\Adminhtml\Block\Widget
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
index 1fc127f238d..fefd6246b43 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
@@ -28,10 +28,10 @@
* Customer edit block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product;
+namespace Magento\Catalog\Block\Adminhtml\Product;
class Edit extends \Magento\Backend\Block\Widget
{
@@ -88,7 +88,7 @@ class Edit extends \Magento\Backend\Block\Widget
/**
* Add elements in layout
*
- * @return \Magento\Adminhtml\Block\Catalog\Product\Edit
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Edit
*/
protected function _prepareLayout()
{
@@ -97,7 +97,7 @@ class Edit extends \Magento\Backend\Block\Widget
'label' => __('Back'),
'title' => __('Back'),
'onclick' => 'setLocation(\''
- . $this->getUrl('*/*/', array('store' => $this->getRequest()->getParam('store', 0))) . '\')',
+ . $this->getUrl('catalog/*/', array('store' => $this->getRequest()->getParam('store', 0))) . '\')',
'class' => 'action-back'
));
} else {
@@ -111,7 +111,7 @@ class Edit extends \Magento\Backend\Block\Widget
if (!$this->getProduct()->isReadonly()) {
$this->addChild('reset_button', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Reset'),
- 'onclick' => 'setLocation(\'' . $this->getUrl('*/*/*', array('_current' => true)) . '\')'
+ 'onclick' => 'setLocation(\'' . $this->getUrl('catalog/*/*', array('_current' => true)) . '\')'
));
}
@@ -170,17 +170,17 @@ class Edit extends \Magento\Backend\Block\Widget
public function getValidationUrl()
{
- return $this->getUrl('*/*/validate', array('_current'=>true));
+ return $this->getUrl('catalog/*/validate', array('_current'=>true));
}
public function getSaveUrl()
{
- return $this->getUrl('*/*/save', array('_current'=>true, 'back'=>null));
+ return $this->getUrl('catalog/*/save', array('_current'=>true, 'back'=>null));
}
public function getSaveAndContinueUrl()
{
- return $this->getUrl('*/*/save', array(
+ return $this->getUrl('catalog/*/save', array(
'_current' => true,
'back' => 'edit',
'tab' => '{{tab_id}}',
@@ -209,7 +209,7 @@ class Edit extends \Magento\Backend\Block\Widget
public function getDuplicateUrl()
{
- return $this->getUrl('*/*/duplicate', array('_current'=>true));
+ return $this->getUrl('catalog/*/duplicate', array('_current'=>true));
}
public function getHeader()
@@ -278,7 +278,7 @@ class Edit extends \Magento\Backend\Block\Widget
{
return $this->_coreData->jsonEncode(array(
'tab_id' => 'product_info_tabs_downloadable_items',
- 'is_virtual_id' => \Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Weight::VIRTUAL_FIELD_HTML_ID,
+ 'is_virtual_id' => \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight::VIRTUAL_FIELD_HTML_ID,
'weight_id' => 'weight',
'current_type' => $this->getProduct()->getTypeId(),
'attributes' => $this->_getAttributes(),
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute.php
similarity index 81%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute.php
index bc7a0b09525..35cc3d1dd58 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute.php
@@ -29,10 +29,10 @@
* Adminhtml catalog product action attribute update
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Action;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Action;
class Attribute extends \Magento\Adminhtml\Block\Widget
{
@@ -40,18 +40,18 @@ class Attribute extends \Magento\Adminhtml\Block\Widget
/**
* Adminhtml catalog product edit action attribute
*
- * @var \Magento\Adminhtml\Helper\Catalog\Product\Edit\Action\Attribute
+ * @var \Magento\Catalog\Helper\Product\Edit\Action\Attribute
*/
protected $_helperActionAttribute = null;
/**
- * @param \Magento\Adminhtml\Helper\Catalog\Product\Edit\Action\Attribute $helperActionAttribute
+ * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $helperActionAttribute
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
* @param array $data
*/
public function __construct(
- \Magento\Adminhtml\Helper\Catalog\Product\Edit\Action\Attribute $helperActionAttribute,
+ \Magento\Catalog\Helper\Product\Edit\Action\Attribute $helperActionAttribute,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
array $data = array()
@@ -64,13 +64,13 @@ class Attribute extends \Magento\Adminhtml\Block\Widget
{
$this->addChild('back_button', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Back'),
- 'onclick' => 'setLocation(\''.$this->getUrl('*/catalog_product/', array('store'=>$this->getRequest()->getParam('store', 0))).'\')',
+ 'onclick' => 'setLocation(\''.$this->getUrl('catalog/product/', array('store'=>$this->getRequest()->getParam('store', 0))).'\')',
'class' => 'back'
));
$this->addChild('reset_button', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Reset'),
- 'onclick' => 'setLocation(\''.$this->getUrl('*/*/*', array('_current'=>true)).'\')'
+ 'onclick' => 'setLocation(\''.$this->getUrl('catalog/*/*', array('_current'=>true)).'\')'
));
$this->addChild('save_button', 'Magento\Adminhtml\Block\Widget\Button', array(
@@ -97,11 +97,11 @@ class Attribute extends \Magento\Adminhtml\Block\Widget
/**
* Retrieve block attributes update helper
*
- * @return \Magento\Adminhtml\Helper\Catalog\Product\Edit\Action\Attribute
+ * @return \Magento\Catalog\Helper\Product\Edit\Action\Attribute
*/
protected function _getHelper()
{
- return $this->helper('Magento\Adminhtml\Helper\Catalog\Product\Edit\Action\Attribute');
+ return $this->helper('Magento\Catalog\Helper\Product\Edit\Action\Attribute');
}
/**
@@ -157,6 +157,6 @@ class Attribute extends \Magento\Adminhtml\Block\Widget
*/
public function getValidationUrl()
{
- return $this->getUrl('*/*/validate', array('_current'=>true));
+ return $this->getUrl('catalog/*/validate', array('_current'=>true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
index 27481e9f566..ae66f85c5af 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
@@ -29,13 +29,13 @@
* Adminhtml catalog product edit action attributes update tab block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Action\Attribute\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tab;
class Attributes
- extends \Magento\Adminhtml\Block\Catalog\Form
+ extends \Magento\Catalog\Block\Adminhtml\Form
implements \Magento\Backend\Block\Widget\Tab\TabInterface
{
/**
@@ -108,7 +108,7 @@ class Attributes
*/
public function getAttributes()
{
- return $this->helper('Magento\Adminhtml\Helper\Catalog\Product\Edit\Action\Attribute')
+ return $this->helper('Magento\Catalog\Helper\Product\Edit\Action\Attribute')
->getAttributes()->getItems();
}
@@ -120,10 +120,10 @@ class Attributes
protected function _getAdditionalElementTypes()
{
return array(
- 'price' => 'Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Price',
- 'weight' => 'Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Weight',
- 'image' => 'Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Image',
- 'boolean' => 'Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Boolean',
+ 'price' => 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Price',
+ 'weight' => 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight',
+ 'image' => 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Image',
+ 'boolean' => 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Boolean',
);
}
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
index f2adf5f1a7c..85cb43ba9dc 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Inventory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
@@ -28,10 +28,10 @@
* Products mass update inventory tab
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Action\Attribute\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tab;
class Inventory
extends \Magento\Adminhtml\Block\Widget
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Websites.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Websites.php
index 59e20239012..34fb5ab8d32 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tab/Websites.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Websites.php
@@ -28,10 +28,10 @@
* Product mass attribute update websites tab
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Action\Attribute\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tab;
class Websites
extends \Magento\Adminhtml\Block\Widget
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tabs.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tabs.php
index 60af8f15049..11e253dd11d 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Action/Attribute/Tabs.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tabs.php
@@ -29,10 +29,10 @@
* Adminhtml catalog product edit action attributes update tabs block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Action\Attribute;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute;
class Tabs extends \Magento\Adminhtml\Block\Widget\Tabs
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/AttributeSet.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/AttributeSet.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php
index b3c734f1ed8..a6a76c898ab 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/AttributeSet.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php
@@ -28,10 +28,10 @@
* Create product attribute set selector
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit;
class AttributeSet extends \Magento\Backend\Block\Widget\Form
{
@@ -66,7 +66,7 @@ class AttributeSet extends \Magento\Backend\Block\Widget\Form
public function getSelectorOptions()
{
return array(
- 'source' => $this->getUrl('*/catalog_product/suggestProductTemplates'),
+ 'source' => $this->getUrl('catalog/product/suggestProductTemplates'),
'className' => 'category-select',
'showRecent' => true,
'storageKey' => 'product-template-key',
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Js.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Js.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php
index 68d772c1abf..4888ebc2875 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Js.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit;
class Js extends \Magento\Adminhtml\Block\Template
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/NewCategory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/NewCategory.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/NewCategory.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/NewCategory.php
index d8f8498dac5..5ac86bb6807 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/NewCategory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/NewCategory.php
@@ -28,10 +28,10 @@
* New category creation form
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit;
/**
* @SuppressWarnings(PHPMD.DepthOfInheritance)
@@ -91,7 +91,7 @@ class NewCategory extends \Magento\Backend\Block\Widget\Form\Generic
'class' => 'validate-parent-category',
'name' => 'new_category_parent',
// @codingStandardsIgnoreStart
- 'note' => __('If there are no custom parent categories, please use the default parent category. You can reassign the category at any time in <a href="%1" target="_blank">Products > Categories</a>.', $this->getUrl('*/catalog_category')),
+ 'note' => __('If there are no custom parent categories, please use the default parent category. You can reassign the category at any time in <a href="%1" target="_blank">Products > Categories</a>.', $this->getUrl('catalog/category')),
// @codingStandardsIgnoreEnd
));
@@ -125,7 +125,7 @@ class NewCategory extends \Magento\Backend\Block\Widget\Form\Generic
*/
public function getSaveCategoryUrl()
{
- return $this->getUrl('adminhtml/catalog_category/save');
+ return $this->getUrl('catalog/category/save');
}
/**
@@ -137,13 +137,13 @@ class NewCategory extends \Magento\Backend\Block\Widget\Form\Generic
{
$widgetOptions = $this->_coreData->jsonEncode(array(
'suggestOptions' => array(
- 'source' => $this->getUrl('adminhtml/catalog_category/suggestCategories'),
+ 'source' => $this->getUrl('catalog/category/suggestCategories'),
'valueField' => '#new_category_parent',
'className' => 'category-select',
'multiselect' => true,
'showAll' => true,
),
- 'saveCategoryUrl' => $this->getUrl('adminhtml/catalog_category/save'),
+ 'saveCategoryUrl' => $this->getUrl('catalog/category/save'),
));
return <<<HTML
<script>
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Ajax/Serializer.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Ajax/Serializer.php
index 77846686ad7..044371b0654 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Ajax/Serializer.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Ajax/Serializer.php
@@ -23,7 +23,7 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Ajax;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Ajax;
class Serializer extends \Magento\Core\Block\Template
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
index 63c9aef76bb..2e51f42b828 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
@@ -29,11 +29,11 @@
* Product alerts tab
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
class Alerts extends \Magento\Adminhtml\Block\Template
{
@@ -52,7 +52,7 @@ class Alerts extends \Magento\Adminhtml\Block\Template
$accordion->addItem('price', array(
'title' => __('We saved the price alert subscription.'),
'content' => $this->getLayout()
- ->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Alerts\Price')
+ ->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Alerts\Price')
->toHtml() . '<br />',
'open' => true
));
@@ -61,7 +61,7 @@ class Alerts extends \Magento\Adminhtml\Block\Template
$accordion->addItem('stock', array(
'title' => __('We saved the stock notification.'),
'content' => $this->getLayout()
- ->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Alerts\Stock'),
+ ->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Alerts\Stock'),
'open' => true
));
}
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
index dd437c44136..3c0bdf702a9 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
@@ -29,10 +29,10 @@
* Sign up for an alert when the product price changes grid
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Alerts;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Alerts;
class Price extends \Magento\Adminhtml\Block\Widget\Grid
{
@@ -150,7 +150,7 @@ class Price extends \Magento\Adminhtml\Block\Widget\Grid
if ($storeId) {
$storeId = $this->_storeManager->getStore($storeId)->getId();
}
- return $this->getUrl('*/catalog_product/alertsPriceGrid', array(
+ return $this->getUrl('catalog/product/alertsPriceGrid', array(
'id' => $productId,
'store' => $storeId
));
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php
index c2e831686f5..ff9081f8f5c 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php
@@ -29,10 +29,10 @@
* Sign up for an alert when the product price changes grid
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Alerts;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Alerts;
class Stock extends \Magento\Adminhtml\Block\Widget\Grid
{
@@ -143,7 +143,7 @@ class Stock extends \Magento\Adminhtml\Block\Widget\Grid
if ($storeId) {
$storeId = $this->_storeManager->getStore($storeId)->getId();
}
- return $this->getUrl('*/catalog_product/alertsStockGrid', array(
+ return $this->getUrl('catalog/product/alertsStockGrid', array(
'id' => $productId,
'store' => $storeId
));
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes.php
index 585a4c55f6b..2ac94ea56cd 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes.php
@@ -28,12 +28,12 @@
* Product attributes tab
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
-class Attributes extends \Magento\Adminhtml\Block\Catalog\Form
+class Attributes extends \Magento\Catalog\Block\Adminhtml\Form
{
/**
* Catalog data
@@ -121,28 +121,28 @@ class Attributes extends \Magento\Adminhtml\Block\Catalog\Form
$urlKey = $form->getElement('url_key');
if ($urlKey) {
$urlKey->setRenderer(
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Form\Renderer\Attribute\Urlkey')
+ $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Form\Renderer\Attribute\Urlkey')
);
}
$tierPrice = $form->getElement('tier_price');
if ($tierPrice) {
$tierPrice->setRenderer(
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Price\Tier')
+ $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Tier')
);
}
$groupPrice = $form->getElement('group_price');
if ($groupPrice) {
$groupPrice->setRenderer(
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Price\Group')
+ $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Group')
);
}
$recurringProfile = $form->getElement('recurring_profile');
if ($recurringProfile) {
$recurringProfile->setRenderer(
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Price\Recurring')
+ $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Recurring')
);
}
@@ -152,7 +152,7 @@ class Attributes extends \Magento\Adminhtml\Block\Catalog\Form
&& $isWrapped
) {
$attributeCreate = $this->getLayout()
- ->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Attributes\Create');
+ ->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes\Create');
$attributeCreate->getConfig()
->setAttributeGroupCode($group->getAttributeGroupCode())
@@ -164,7 +164,7 @@ class Attributes extends \Magento\Adminhtml\Block\Catalog\Form
->setProductId($form->getDataObject()->getId());
$attributeSearch = $this->getLayout()
- ->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Attributes\Search')
+ ->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes\Search')
->setGroupId($group->getId())
->setGroupCode($group->getAttributeGroupCode());
@@ -209,12 +209,12 @@ class Attributes extends \Magento\Adminhtml\Block\Catalog\Form
protected function _getAdditionalElementTypes()
{
$result = array(
- 'price' => 'Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Price',
- 'weight' => 'Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Weight',
- 'gallery' => 'Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Gallery',
- 'image' => 'Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Image',
- 'boolean' => 'Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Boolean',
- 'textarea' => 'Magento\Adminhtml\Block\Catalog\Helper\Form\Wysiwyg',
+ 'price' => 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Price',
+ 'weight' => 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight',
+ 'gallery' => 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery',
+ 'image' => 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Image',
+ 'boolean' => 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Boolean',
+ 'textarea' => 'Magento\Catalog\Block\Adminhtml\Helper\Form\Wysiwyg',
);
$response = new \Magento\Object();
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Create.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Create.php
index 5d310b64805..53e6149c75e 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Create.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Create.php
@@ -28,10 +28,10 @@
* New attribute panel on product edit page
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Attributes;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes;
class Create extends \Magento\Backend\Block\Widget\Button
{
@@ -66,7 +66,7 @@ class Create extends \Magento\Backend\Block\Widget\Button
array('productAttributes' =>
array(
'url' => $this->getUrl(
- '*/catalog_product_attribute/new',
+ 'catalog/product_attribute/new',
array(
'group' => $this->getConfig()->getAttributeGroupCode(),
'store' => $this->getConfig()->getStoreId(),
@@ -81,7 +81,7 @@ class Create extends \Magento\Backend\Block\Widget\Button
$this->getConfig()
->setUrl($this->getUrl(
- '*/catalog_product_attribute/new',
+ 'catalog/product_attribute/new',
array(
'group' => $this->getConfig()->getAttributeGroupCode(),
'store' => $this->getConfig()->getStoreId(),
@@ -111,4 +111,4 @@ class Create extends \Magento\Backend\Block\Widget\Button
{
return $this->getId() . 'JsObject';
}
-} // Class \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Attributes\Create End
+} // Class \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes\Create End
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Search.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Search.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
index e1323df090e..ceebf65883d 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Search.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
@@ -28,10 +28,10 @@
* New attribute panel on product edit page
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Attributes;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes;
class Search extends \Magento\Backend\Block\Widget
{
@@ -90,7 +90,7 @@ class Search extends \Magento\Backend\Block\Widget
{
$templateId = $this->_coreRegistry->registry('product')->getAttributeSetId();
return array(
- 'source' => $this->getUrl('*/catalog_product/suggestAttributes'),
+ 'source' => $this->getUrl('catalog/product/suggestAttributes'),
'minLength' => 0,
'ajaxOptions' => array('data' => array('template_id' => $templateId)),
'template' => '[data-template-for="product-attribute-search"]',
@@ -132,6 +132,6 @@ class Search extends \Magento\Backend\Block\Widget
*/
public function getAddAttributeUrl()
{
- return $this->getUrl('*/catalog_product/addAttributeToTemplate');
+ return $this->getUrl('catalog/product/addAttributeToTemplate');
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
index 8594ca48240..f4cd6aedeac 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
@@ -28,10 +28,10 @@
* Crossell products admin grid
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
class Crosssell extends \Magento\Adminhtml\Block\Widget\Grid
{
@@ -144,7 +144,7 @@ class Crosssell extends \Magento\Adminhtml\Block\Widget\Grid
* Add filter
*
* @param object $column
- * @return \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Crosssell
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Crosssell
*/
protected function _addColumnFilterToCollection($column)
{
@@ -318,7 +318,7 @@ class Crosssell extends \Magento\Adminhtml\Block\Widget\Grid
*/
public function getGridUrl()
{
- return $this->_getData('grid_url') ? $this->_getData('grid_url') : $this->getUrl('*/*/crosssellGrid', array('_current'=>true));
+ return $this->_getData('grid_url') ? $this->_getData('grid_url') : $this->getUrl('catalog/*/crosssellGrid', array('_current'=>true));
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php
similarity index 99%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php
index 0b8526eff3b..9a7a7dd7d6d 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php
@@ -29,7 +29,7 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
class Inventory extends \Magento\Adminhtml\Block\Widget
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php
index 985da76221b..550e3a4e4d7 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php
@@ -28,11 +28,11 @@
* customers defined options
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
class Options extends \Magento\Adminhtml\Block\Widget
{
@@ -46,7 +46,7 @@ class Options extends \Magento\Adminhtml\Block\Widget
'id' => 'add_new_defined_option'
));
- $this->addChild('options_box', 'Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Option');
+ $this->addChild('options_box', 'Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Option');
$this->addChild('import_button', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Import Options'),
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
similarity index 98%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
index 3f6547ed55b..b10e34625fd 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
@@ -27,7 +27,7 @@
/**
* Customers defined options
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options;
class Option extends \Magento\Adminhtml\Block\Widget
{
@@ -383,7 +383,7 @@ class Option extends \Magento\Adminhtml\Block\Widget
*/
public function getProductGridUrl()
{
- return $this->getUrl('*/*/optionsImportGrid');
+ return $this->getUrl('catalog/*/optionsImportGrid');
}
/**
@@ -393,6 +393,6 @@ class Option extends \Magento\Adminhtml\Block\Widget
*/
public function getCustomOptionsUrl()
{
- return $this->getUrl('*/*/customOptions');
+ return $this->getUrl('catalog/*/customOptions');
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Popup/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php
similarity index 88%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Popup/Grid.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php
index b775df53c10..c0148a4d28f 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Popup/Grid.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php
@@ -28,13 +28,13 @@
* Adminhtml product grid in custom options popup
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Popup;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Popup;
class Grid
- extends \Magento\Adminhtml\Block\Catalog\Product\Grid
+ extends \Magento\Catalog\Block\Adminhtml\Product\Grid
{
/**
* Return empty row url for disabling JS click events
@@ -63,7 +63,7 @@ class Grid
/**
* Add import action to massaction block
*
- * @return \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Popup\Grid
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Popup\Grid
*/
public function _prepareMassaction()
{
@@ -82,6 +82,6 @@ class Grid
*/
public function getGridUrl()
{
- return $this->getUrl('*/*/optionsimportgrid');
+ return $this->getUrl('catalog/*/optionsimportgrid');
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/AbstractType.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/AbstractType.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/AbstractType.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/AbstractType.php
index f302a4b08ec..d8b94b774f7 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/AbstractType.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/AbstractType.php
@@ -28,11 +28,11 @@
* customers defined options
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Type;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type;
class AbstractType extends \Magento\Adminhtml\Block\Widget
{
@@ -62,7 +62,10 @@ class AbstractType extends \Magento\Adminhtml\Block\Widget
protected function _prepareLayout()
{
$this->setChild('option_price_type',
- $this->getLayout()->addBlock('Magento\Adminhtml\Block\Html\Select', '', $this->getNameInLayout())
+ $this->getLayout()
+ ->addBlock('Magento\Adminhtml\Block\Html\Select',
+ $this->getNameInLayout() . '.option_price_type',
+ $this->getNameInLayout())
->setData(array(
'id' => 'product_option_${option_id}_price_type',
'class' => 'select product-option-price-type'
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php
similarity index 88%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php
index 4187d031db4..e45687b0b24 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php
@@ -28,14 +28,14 @@
* customers defined options
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Type;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type;
class Date extends
- \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Type\AbstractType
+ \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\AbstractType
{
protected $_template = 'catalog/product/edit/options/type/date.phtml';
}
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php
similarity index 88%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php
index 0c5450624a6..200cae49510 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php
@@ -28,14 +28,14 @@
* customers defined options
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Type;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type;
class File extends
- \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Type\AbstractType
+ \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\AbstractType
{
protected $_template = 'catalog/product/edit/options/type/file.phtml';
}
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php
index 6026b8120e2..15f01c6b401 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php
@@ -28,14 +28,14 @@
* customers defined options
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Type;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type;
class Select extends
- \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Type\AbstractType
+ \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\AbstractType
{
protected $_template = 'catalog/product/edit/options/type/select.phtml';
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php
similarity index 88%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php
index 9445dbce37c..ea7ce883b48 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php
@@ -28,14 +28,14 @@
* customers defined options
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Type;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type;
class Text extends
- \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Type\AbstractType
+ \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\AbstractType
{
protected $_template = 'catalog/product/edit/options/type/text.phtml';
}
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price.php
index 8c919ec54ab..c5b1bad6ed2 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Price.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price.php
@@ -27,7 +27,7 @@
/**
* Adminhtml product edit price block
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
class Price extends \Magento\Backend\Block\Widget\Form\Generic
{
@@ -54,9 +54,9 @@ class Price extends \Magento\Backend\Block\Widget\Form\Generic
));
$form->getElement('tier_price')->setRenderer(
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Price\Tier')
+ $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Tier')
);
$this->setForm($form);
}
-}// Class \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Price END
+}// Class \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price END
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group.php
index a1f674b7c63..65a597c451e 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group.php
@@ -29,13 +29,13 @@
* Adminhtml group price item renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Price;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price;
class Group
- extends \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Price\Group\AbstractGroup
+ extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Group\AbstractGroup
{
protected $_template = 'catalog/product/edit/price/group.phtml';
@@ -74,7 +74,7 @@ class Group
*
* Add "Add Group Price" button to layout
*
- * @return \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Price\Group
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Group
*/
protected function _prepareLayout()
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/AbstractGroup.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php
similarity index 98%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/AbstractGroup.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php
index 8e054a237e2..33352b03936 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group/AbstractGroup.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Group/AbstractGroup.php
@@ -28,10 +28,10 @@
* Adminhtml group price item abstract renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Price\Group;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Group;
abstract class AbstractGroup
extends \Magento\Adminhtml\Block\Widget
@@ -133,7 +133,7 @@ abstract class AbstractGroup
* Set form element instance
*
* @param \Magento\Data\Form\Element\AbstractElement $element
- * @return \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Price\Group\AbstractGroup
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Group\AbstractGroup
*/
public function setElement(\Magento\Data\Form\Element\AbstractElement $element)
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Recurring.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Recurring.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Recurring.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Recurring.php
index f0984ca81f2..be02daf35d7 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Recurring.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Recurring.php
@@ -27,10 +27,10 @@
/**
* Recurring profile attribute edit renderer
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Price;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price;
class Recurring
- extends \Magento\Adminhtml\Block\Catalog\Form\Renderer\Fieldset\Element
+ extends \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element
{
/**
* Core registry
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
index 07729dfe5c9..d5382d62b06 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
@@ -28,13 +28,13 @@
* Adminhtml tier price item renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Price;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price;
class Tier
- extends \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Price\Group\AbstractGroup
+ extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Group\AbstractGroup
{
protected $_template = 'catalog/product/edit/price/tier.phtml';
@@ -87,7 +87,7 @@ class Tier
* Prepare global layout
* Add "Add tier" button to layout
*
- * @return \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Price\Tier
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Tier
*/
protected function _prepareLayout()
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
index f6190e97553..84f15aff751 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
@@ -28,10 +28,10 @@
* Related products admin grid
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
class Related extends \Magento\Adminhtml\Block\Widget\Grid
{
@@ -144,7 +144,7 @@ class Related extends \Magento\Adminhtml\Block\Widget\Grid
* Add filter
*
* @param object $column
- * @return \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Related
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Related
*/
protected function _addColumnFilterToCollection($column)
{
@@ -316,7 +316,7 @@ class Related extends \Magento\Adminhtml\Block\Widget\Grid
{
return $this->getData('grid_url')
? $this->getData('grid_url')
- : $this->getUrl('*/*/relatedGrid', array('_current' => true));
+ : $this->getUrl('catalog/*/relatedGrid', array('_current' => true));
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Reviews.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Reviews.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Reviews.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Reviews.php
index 0e88a2f53ef..e2e16feddf4 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Reviews.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Reviews.php
@@ -28,17 +28,17 @@
* Reviews products admin grid
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
class Reviews extends \Magento\Adminhtml\Block\Review\Grid
{
/**
* Hide grid mass action elements
*
- * @return \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Reviews
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Reviews
*/
protected function _prepareMassaction()
{
@@ -52,6 +52,6 @@ class Reviews extends \Magento\Adminhtml\Block\Review\Grid
*/
public function getGridUrl()
{
- return $this->getUrl('*/*/reviews', array('_current' => true));
+ return $this->getUrl('catalog/*/reviews', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
index fe00553dc32..4e7c7a1b709 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
@@ -28,10 +28,10 @@
* Adminhtml catalog super product configurable tab
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super;
class Config
extends \Magento\Backend\Block\Widget
@@ -154,7 +154,7 @@ class Config
/**
* Prepare Layout data
*
- * @return \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config
*/
protected function _prepareLayout()
{
@@ -163,12 +163,12 @@ class Config
'class' => 'add',
'onclick' => 'superProduct.createEmptyProduct()'
));
- $this->addChild('super_settings', 'Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Settings');
+ $this->addChild('super_settings', 'Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Settings');
// @todo: Remove unused code and blocks
// if ($this->getProduct()->getId()) {
// $this->setChild('simple',
-// $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config\Simple',
+// $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config\Simple',
// 'catalog.product.edit.tab.super.config.simple')
// );
//
@@ -191,7 +191,7 @@ class Config
'event' => 'generate',
'target' => '#product-variations-matrix',
'eventData' => array(
- 'url' => $this->getUrl('*/*/generateVariations', array('_current' => true)),
+ 'url' => $this->getUrl('catalog/*/generateVariations', array('_current' => true)),
),
),
),
@@ -209,7 +209,7 @@ class Config
'mage-init' => array(
'configurableAttribute' => array(
'url' => $this->getUrl(
- '*/catalog_product_attribute/new',
+ 'catalog/product_attribute/new',
array(
'store' => $this->getProduct()->getStoreId(),
'product_tab' => 'variations',
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Attribute.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Attribute.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php
index a3d18f24863..f3892875dd3 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Attribute.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/Attribute.php
@@ -28,13 +28,13 @@
* Renderer for attribute block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config;
class Attribute
- extends \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config
+ extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config
{
/**
* Render block
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php
index b7fd6f4aa3d..606c95a1bf4 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/Grid/Filter/Inventory.php
@@ -29,10 +29,10 @@
* Configurable product associated products in stock filter
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config\Grid\Filter;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config\Grid\Filter;
class Inventory extends \Magento\Adminhtml\Block\Widget\Grid\Column\Filter\Select
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php
index 4b3442dbfd0..5da7411049b 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/Grid/Renderer/Checkbox.php
@@ -28,11 +28,11 @@
* Adminhtml catalog super product link grid checkbox renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config\Grid\Renderer;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config\Grid\Renderer;
class Checkbox extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Checkbox
{
@@ -94,4 +94,4 @@ class Checkbox extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Chec
return $this->_coreData->jsonEncode($result);
}
-}// Class \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config\Grid\Renderer\Checkbox END
+}// Class \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config\Grid\Renderer\Checkbox END
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php
index 43d154626c2..6f252d26789 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/Grid/Renderer/Inventory.php
@@ -29,10 +29,10 @@
* Configurable product assocciated products grid in stock renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config\Grid\Renderer;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config\Grid\Renderer;
class Inventory extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Matrix.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/Matrix.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Matrix.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/Matrix.php
index b5d0932e415..e1dcda84f92 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Matrix.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/Matrix.php
@@ -28,10 +28,10 @@
* Product variations matrix block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config;
class Matrix
extends \Magento\Backend\Block\Template
@@ -187,7 +187,7 @@ class Matrix
*/
public function getEditProductUrl($id)
{
- return $this->getUrl('*/*/edit', array('id' => $id));
+ return $this->getUrl('catalog/*/edit', array('id' => $id));
}
@@ -294,6 +294,6 @@ class Matrix
*/
public function getImageUploadUrl()
{
- return $this->getUrl('*/catalog_product_gallery/upload');
+ return $this->getUrl('catalog/product_gallery/upload');
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/Simple.php
similarity index 98%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/Simple.php
index 4ce77b98085..23e124308d3 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/Simple.php
@@ -28,13 +28,13 @@
* Quick simple product creation
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config;
class Simple
- extends \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Attributes
+ extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes
{
/**
* Link to currently editing product
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Settings.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Settings.php
index 7a7c57506ae..e4be2cfc6cb 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Settings.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Settings.php
@@ -28,10 +28,10 @@
* Create Configurable product Settings Tab Block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super;
class Settings extends \Magento\Backend\Block\Widget\Form\Generic
{
@@ -90,7 +90,7 @@ class Settings extends \Magento\Backend\Block\Widget\Form\Generic
/**
* Prepare form before rendering HTML
*
- * @return \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Settings
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Settings
*/
protected function _prepareForm()
{
@@ -150,6 +150,6 @@ class Settings extends \Magento\Backend\Block\Widget\Form\Generic
*/
public function getBackUrl()
{
- return $this->getUrl('*/*/', array('set' => null, 'type' => null));
+ return $this->getUrl('catalog/*/', array('set' => null, 'type' => null));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
index eedb954c1ab..ddecd88716b 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
@@ -28,10 +28,10 @@
* Upsell products admin grid
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
class Upsell extends \Magento\Adminhtml\Block\Widget\Grid
{
@@ -144,7 +144,7 @@ class Upsell extends \Magento\Adminhtml\Block\Widget\Grid
* Add filter
*
* @param object $column
- * @return \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Upsell
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Upsell
*/
protected function _addColumnFilterToCollection($column)
{
@@ -313,7 +313,7 @@ class Upsell extends \Magento\Adminhtml\Block\Widget\Grid
*/
public function getGridUrl()
{
- return $this->_getData('grid_url') ? $this->_getData('grid_url') : $this->getUrl('*/*/upsellGrid', array('_current'=>true));
+ return $this->_getData('grid_url') ? $this->_getData('grid_url') : $this->getUrl('catalog/*/upsellGrid', array('_current'=>true));
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php
similarity index 98%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php
index 798dfe724f8..ea8e21ac25c 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php
@@ -28,10 +28,10 @@
* Product Stores tab
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
class Websites extends \Magento\Backend\Block\Store\Switcher
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tabs.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
similarity index 87%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tabs.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
index d8e2dbb6af3..0ce48e8f4c6 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tabs.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
@@ -27,7 +27,7 @@
/**
* Admin product edit tabs
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit;
class Tabs extends \Magento\Backend\Block\Widget\Tabs
{
@@ -35,7 +35,7 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
const ADVANCED_TAB_GROUP_CODE = 'advanced';
/** @var string */
- protected $_attributeTabBlock = 'Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Attributes';
+ protected $_attributeTabBlock = 'Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes';
/** @var string */
protected $_template = 'Magento_Catalog::product/edit/tabs.phtml';
@@ -57,9 +57,9 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
/**
* Adminhtml catalog
*
- * @var \Magento\Adminhtml\Helper\Catalog
+ * @var \Magento\Catalog\Helper\Catalog
*/
- protected $_adminhtmlCatalog = null;
+ protected $_helperCatalog = null;
/**
* @var \Magento\Eav\Model\Resource\Entity\Attribute\Group\CollectionFactory
@@ -68,7 +68,7 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
/**
* @param \Magento\Eav\Model\Resource\Entity\Attribute\Group\CollectionFactory $collectionFactory
- * @param \Magento\Adminhtml\Helper\Catalog $adminhtmlCatalog
+ * @param \Magento\Catalog\Helper\Catalog $helperCatalog
* @param \Magento\Catalog\Helper\Data $catalogData
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
@@ -78,7 +78,7 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
*/
public function __construct(
\Magento\Eav\Model\Resource\Entity\Attribute\Group\CollectionFactory $collectionFactory,
- \Magento\Adminhtml\Helper\Catalog $adminhtmlCatalog,
+ \Magento\Catalog\Helper\Catalog $helperCatalog,
\Magento\Catalog\Helper\Data $catalogData,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
@@ -87,7 +87,7 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
array $data = array()
) {
$this->_collectionFactory = $collectionFactory;
- $this->_adminhtmlCatalog = $adminhtmlCatalog;
+ $this->_helperCatalog = $helperCatalog;
$this->_catalogData = $catalogData;
$this->_coreRegistry = $registry;
parent::__construct($coreData, $context, $authSession, $data);
@@ -160,7 +160,7 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
$this->addTab('websites', array(
'label' => __('Websites'),
'content' => $this->_translateHtml($this->getLayout()
- ->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Websites')->toHtml()),
+ ->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Websites')->toHtml()),
'group_code' => self::BASIC_TAB_GROUP_CODE,
));
}
@@ -174,20 +174,20 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
$this->addTab('advanced-inventory', array(
'label' => __('Advanced Inventory'),
'content' => $this->_translateHtml($this->getLayout()
- ->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Inventory')->toHtml()),
+ ->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Inventory')->toHtml()),
'group_code' => self::ADVANCED_TAB_GROUP_CODE,
));
}
/**
* Do not change this tab id
- * @see \Magento\Adminhtml\Block\Catalog\Product\Edit\Tabs\Configurable
+ * @see \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs\Configurable
* @see \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tabs
*/
if (!$product->isGrouped()) {
$this->addTab('customer_options', array(
'label' => __('Custom Options'),
- 'url' => $this->getUrl('*/*/options', array('_current' => true)),
+ 'url' => $this->getUrl('catalog/*/options', array('_current' => true)),
'class' => 'ajax',
'group_code' => self::ADVANCED_TAB_GROUP_CODE,
));
@@ -195,21 +195,21 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
$this->addTab('related', array(
'label' => __('Related Products'),
- 'url' => $this->getUrl('*/*/related', array('_current' => true)),
+ 'url' => $this->getUrl('catalog/*/related', array('_current' => true)),
'class' => 'ajax',
'group_code' => self::ADVANCED_TAB_GROUP_CODE,
));
$this->addTab('upsell', array(
'label' => __('Up-sells'),
- 'url' => $this->getUrl('*/*/upsell', array('_current' => true)),
+ 'url' => $this->getUrl('catalog/*/upsell', array('_current' => true)),
'class' => 'ajax',
'group_code' => self::ADVANCED_TAB_GROUP_CODE,
));
$this->addTab('crosssell', array(
'label' => __('Cross-sells'),
- 'url' => $this->getUrl('*/*/crosssell', array('_current' => true)),
+ 'url' => $this->getUrl('catalog/*/crosssell', array('_current' => true)),
'class' => 'ajax',
'group_code' => self::ADVANCED_TAB_GROUP_CODE,
));
@@ -225,7 +225,7 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
$this->addTab('product-alerts', array(
'label' => __('Product Alerts'),
'content' => $this->_translateHtml($this->getLayout()
- ->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Alerts', 'admin.alerts.products')
+ ->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Alerts', 'admin.alerts.products')
->toHtml()
),
'group_code' => self::ADVANCED_TAB_GROUP_CODE,
@@ -237,7 +237,7 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
if ($this->_authorization->isAllowed('Magento_Review::reviews_all')){
$this->addTab('product-reviews', array(
'label' => __('Product Reviews'),
- 'url' => $this->getUrl('*/*/reviews', array('_current' => true)),
+ 'url' => $this->getUrl('catalog/*/reviews', array('_current' => true)),
'class' => 'ajax',
'group_code' => self::ADVANCED_TAB_GROUP_CODE,
));
@@ -288,10 +288,10 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
*/
public function getAttributeTabBlock()
{
- if (is_null($this->_adminhtmlCatalog->getAttributeTabBlock())) {
+ if (is_null($this->_helperCatalog->getAttributeTabBlock())) {
return $this->_attributeTabBlock;
}
- return $this->_adminhtmlCatalog->getAttributeTabBlock();
+ return $this->_helperCatalog->getAttributeTabBlock();
}
public function setAttributeTabBlock($attributeTabBlock)
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs/Configurable.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs/Configurable.php
index e10c3ba32b8..477f488ad4b 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tabs/Configurable.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs/Configurable.php
@@ -31,21 +31,21 @@
* @package Magento_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tabs;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs;
-class Configurable extends \Magento\Adminhtml\Block\Catalog\Product\Edit\Tabs
+class Configurable extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs
{
/**
* Preparing layout
*
- * @return \Magento\Adminhtml\Block\Catalog\Product\Edit\Tabs\Configurable
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs\Configurable
*/
protected function _prepareLayout()
{
$this->addTab('super_settings', array(
'label' => __('Configurable Product Settings'),
'content' => $this->getLayout()
- ->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Settings')
+ ->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Settings')
->toHtml(),
'active' => true
));
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs/Grouped.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs/Grouped.php
index 22e8e45548a..717a4713b86 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tabs/Grouped.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs/Grouped.php
@@ -31,9 +31,9 @@
* @package Magento_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tabs;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs;
-class Grouped extends \Magento\Adminhtml\Block\Catalog\Product\Edit\Tabs
+class Grouped extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs
{
protected function _prepareLayout()
{
@@ -41,7 +41,7 @@ class Grouped extends \Magento\Adminhtml\Block\Catalog\Product\Edit\Tabs
$this->addTab('super', array(
'label' => __('Associated Products'),
- 'url' => $this->getUrl('*/*/superGroup', array('_current'=>true)),
+ 'url' => $this->getUrl('catalog/*/superGroup', array('_current'=>true)),
'class' => 'ajax',
));
}
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
similarity index 98%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
index 6c00f93036e..b7d9166ed12 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Frontend/Product/Watermark.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Frontend/Product/Watermark.php
@@ -28,10 +28,10 @@
* Fieldset config form element renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Frontend\Product;
+namespace Magento\Catalog\Block\Adminhtml\Product\Frontend\Product;
class Watermark
extends \Magento\Backend\Block\AbstractBlock
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Grid.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
index d8e40ef5d7b..1d7683e4829 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Grid.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
@@ -28,10 +28,10 @@
* Adminhtml customer grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product;
+namespace Magento\Catalog\Block\Adminhtml\Product;
class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
{
@@ -384,7 +384,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
$this->getMassactionBlock()->addItem('delete', array(
'label'=> __('Delete'),
- 'url' => $this->getUrl('*/*/massDelete'),
+ 'url' => $this->getUrl('catalog/*/massDelete'),
'confirm' => __('Are you sure?')
));
@@ -393,7 +393,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
array_unshift($statuses, array('label'=>'', 'value'=>''));
$this->getMassactionBlock()->addItem('status', array(
'label'=> __('Change status'),
- 'url' => $this->getUrl('*/*/massStatus', array('_current'=>true)),
+ 'url' => $this->getUrl('catalog/*/massStatus', array('_current'=>true)),
'additional' => array(
'visibility' => array(
'name' => 'status',
@@ -408,7 +408,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
if ($this->_authorization->isAllowed('Magento_Catalog::update_attributes')){
$this->getMassactionBlock()->addItem('attributes', array(
'label' => __('Update Attributes'),
- 'url' => $this->getUrl('*/catalog_product_action_attribute/edit', array('_current'=>true))
+ 'url' => $this->getUrl('catalog/product_action_attribute/edit', array('_current'=>true))
));
}
@@ -418,12 +418,12 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
public function getGridUrl()
{
- return $this->getUrl('*/*/grid', array('_current'=>true));
+ return $this->getUrl('catalog/*/grid', array('_current'=>true));
}
public function getRowUrl($row)
{
- return $this->getUrl('*/*/edit', array(
+ return $this->getUrl('catalog/*/edit', array(
'store'=>$this->getRequest()->getParam('store'),
'id'=>$row->getId())
);
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Apply.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Apply.php
index b00922bce58..4d968b0070d 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Apply.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Apply.php
@@ -28,10 +28,10 @@
* Attribute form apply element
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Helper\Form;
+namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
class Apply extends \Magento\Data\Form\Element\Multiselect
{
@@ -61,7 +61,7 @@ class Apply extends \Magento\Data\Form\Element\Multiselect
*
* @param bool $readonly
* @param bool $useDisabled
- * @return \Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Apply
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Apply
*/
public function setReadonly($readonly, $useDisabled = false)
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/BaseImage.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/BaseImage.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/BaseImage.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/BaseImage.php
index 52df6c65940..d260a037828 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/BaseImage.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/BaseImage.php
@@ -28,10 +28,10 @@
* Product form image field helper
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Helper\Form;
+namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
class BaseImage extends \Magento\Data\Form\Element\AbstractElement
{
@@ -170,7 +170,7 @@ HTML;
*/
protected function _getUploadUrl()
{
- return $this->_url->getUrl('adminhtml/catalog_product_gallery/upload');
+ return $this->_url->getUrl('catalog/product_gallery/upload');
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Boolean.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Boolean.php
index ce6203dfb0a..a9744319934 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Boolean.php
@@ -28,10 +28,10 @@
* Product form boolean field helper
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Helper\Form;
+namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
class Boolean extends \Magento\Data\Form\Element\Select
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Category.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Category.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
index ed24df7b181..ecb2feb2f32 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Category.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
@@ -28,10 +28,10 @@
* Product form category field helper
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Helper\Form;
+namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
class Category extends \Magento\Data\Form\Element\Multiselect
{
@@ -148,7 +148,7 @@ HTML;
{
return array(
'source' => $this->_backendData
- ->getUrl('adminhtml/catalog_category/suggestCategories'),
+ ->getUrl('catalog/category/suggestCategories'),
'valueField' => '#' . $this->getHtmlId(),
'className' => 'category-select',
'multiselect' => true,
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Config.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Config.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Config.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Config.php
index cfc9a0f0a65..4b72ea3776d 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Config.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Config.php
@@ -28,10 +28,10 @@
* Adminhtml additional helper block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Helper\Form;
+namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
class Config extends \Magento\Data\Form\Element\Select
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
index 5e618e123d0..a36f42c88c3 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
@@ -29,10 +29,10 @@
* Catalog product gallery attribute
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Helper\Form;
+namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
class Gallery extends \Magento\Data\Form\Element\AbstractElement
{
@@ -81,8 +81,8 @@ class Gallery extends \Magento\Data\Form\Element\AbstractElement
public function getContentHtml()
{
- /* @var $content \Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Gallery\Content */
- $content = $this->_layout->createBlock('Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Gallery\Content');
+ /* @var $content \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content */
+ $content = $this->_layout->createBlock('Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content');
$content->setId($this->getHtmlId() . '_content')->setElement($this);
$galleryJs = $content->getJsObjectName();
$content->getUploader()->getConfig()->setMegiaGallery($galleryJs);
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
index 251ec78c4d4..bed0f7f9245 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
@@ -29,12 +29,12 @@
* Catalog product form gallery content
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*
* @method \Magento\Data\Form\Element\AbstractElement getElement()
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Gallery;
+namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery;
class Content extends \Magento\Backend\Block\Widget
{
@@ -68,7 +68,7 @@ class Content extends \Magento\Backend\Block\Widget
$this->getUploader()->getConfig()
->setUrl(
$this->_urlBuilder->addSessionParam()
- ->getUrl('adminhtml/catalog_product_gallery/upload')
+ ->getUrl('catalog/product_gallery/upload')
)
->setFileField('image')
->setFilters(array(
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php
index 3c72c24d9fb..fde16f25ee2 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Image.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php
@@ -28,10 +28,10 @@
* Product form image field helper
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Helper\Form;
+namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
class Image extends \Magento\Data\Form\Element\Image
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Enabled.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Msrp/Enabled.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Enabled.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Msrp/Enabled.php
index 72c596894f0..8934bbb8661 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Enabled.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Msrp/Enabled.php
@@ -28,10 +28,10 @@
* Product form MAP Enabled field helper
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Msrp;
+namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Msrp;
class Enabled extends \Magento\Data\Form\Element\Select
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Price.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Msrp/Price.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Price.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Msrp/Price.php
index 6e3b11e9436..a089e8c2801 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Msrp/Price.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Msrp/Price.php
@@ -28,10 +28,10 @@
* Product form MSRP field helper
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Msrp;
+namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Msrp;
class Price extends \Magento\Data\Form\Element\Select
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Price.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Price.php
index 4ff2e982cf6..afc3be7f618 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Price.php
@@ -28,10 +28,10 @@
* Product form price field helper
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Helper\Form;
+namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
class Price extends \Magento\Data\Form\Element\Text
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
index cbe2c482476..4aa16d4d3ed 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
@@ -28,10 +28,10 @@
* Product form weight field helper
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Helper\Form;
+namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
class Weight extends \Magento\Data\Form\Element\Text
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Options/Ajax.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Options/Ajax.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Options/Ajax.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Options/Ajax.php
index ad57ac2c0ee..c8bfb58fc85 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Options/Ajax.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Options/Ajax.php
@@ -28,10 +28,10 @@
* JSON products custom options
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Options;
+namespace Magento\Catalog\Block\Adminhtml\Product\Options;
class Ajax extends \Magento\Backend\Block\AbstractBlock
{
@@ -82,9 +82,9 @@ class Ajax extends \Magento\Backend\Block\AbstractBlock
protected function _toHtml()
{
$results = array();
- /** @var $optionsBlock \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Option */
+ /** @var $optionsBlock \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Option */
$optionsBlock = $this->getLayout()
- ->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Option')
+ ->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Option')
->setIgnoreCaching(true);
$products = $this->_coreRegistry->registry('import_option_products');
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Price.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Price.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Price.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Price.php
index c0f7d878e65..221bf94db68 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Price.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Price.php
@@ -29,9 +29,9 @@
* Product price block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
*/
-namespace Magento\Adminhtml\Block\Catalog\Product;
+namespace Magento\Catalog\Block\Adminhtml\Product;
class Price extends \Magento\Catalog\Block\Product\Price
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Widget/Chooser.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Widget/Chooser.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser.php
index 1470809be5d..2cd46b3c388 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Widget/Chooser.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser.php
@@ -28,10 +28,10 @@
* Product Chooser for "Product Link" Cms Widget Plugin
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Widget;
+namespace Magento\Catalog\Block\Adminhtml\Product\Widget;
class Chooser extends \Magento\Adminhtml\Block\Widget\Grid
{
@@ -105,7 +105,7 @@ class Chooser extends \Magento\Adminhtml\Block\Widget\Grid
public function prepareElementHtml(\Magento\Data\Form\Element\AbstractElement $element)
{
$uniqId = $this->_coreData->uniqHash($element->getId());
- $sourceUrl = $this->getUrl('*/catalog_product_widget/chooser', array(
+ $sourceUrl = $this->getUrl('catalog/product_widget/chooser', array(
'uniq_id' => $uniqId,
'use_massaction' => false,
));
@@ -211,7 +211,7 @@ class Chooser extends \Magento\Adminhtml\Block\Widget\Grid
* Filter checked/unchecked rows in grid
*
* @param \Magento\Adminhtml\Block\Widget\Grid\Column $column
- * @return \Magento\Adminhtml\Block\Catalog\Product\Widget\Chooser
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser
*/
protected function _addColumnFilterToCollection($column)
{
@@ -314,7 +314,7 @@ class Chooser extends \Magento\Adminhtml\Block\Widget\Grid
*/
public function getGridUrl()
{
- return $this->getUrl('*/catalog_product_widget/chooser', array(
+ return $this->getUrl('catalog/product_widget/chooser', array(
'products_grid' => true,
'_current' => true,
'uniq_id' => $this->getId(),
@@ -327,7 +327,7 @@ class Chooser extends \Magento\Adminhtml\Block\Widget\Grid
* Setter
*
* @param array $selectedProducts
- * @return \Magento\Adminhtml\Block\Catalog\Product\Widget\Chooser
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser
*/
public function setSelectedProducts($selectedProducts)
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Product/Widget/Chooser/Container.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Catalog/Product/Widget/Chooser/Container.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php
index 4f3b765ec43..100c31670a9 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Product/Widget/Chooser/Container.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php
@@ -28,10 +28,10 @@
* Chooser Container for "Product Link" Cms Widget Plugin
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Widget\Chooser;
+namespace Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser;
class Container extends \Magento\Adminhtml\Block\Template
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Search.php b/app/code/Magento/Catalog/Block/Adminhtml/Search.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Catalog/Search.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Search.php
index a028eff7c22..020fe1a5b7b 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Search.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Search.php
@@ -29,11 +29,11 @@
*
* @category Magento
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog;
+namespace Magento\Catalog\Block\Adminhtml;
class Search extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Search/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Search/Edit.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Catalog/Search/Edit.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Search/Edit.php
index a3c52c8121e..02738604f83 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Search/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Search/Edit.php
@@ -28,7 +28,7 @@
* Admin tag edit block
*/
-namespace Magento\Adminhtml\Block\Catalog\Search;
+namespace Magento\Catalog\Block\Adminhtml\Search;
class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
{
@@ -58,7 +58,8 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
protected function _construct()
{
$this->_objectId = 'id';
- $this->_controller = 'catalog_search';
+ $this->_blockGroup = 'Magento_Catalog';
+ $this->_controller = 'adminhtml_search';
parent::_construct();
diff --git a/app/code/Magento/Adminhtml/Block/Catalog/Search/Edit/Form.php b/app/code/Magento/Catalog/Block/Adminhtml/Search/Edit/Form.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Catalog/Search/Edit/Form.php
rename to app/code/Magento/Catalog/Block/Adminhtml/Search/Edit/Form.php
index 4fd384bf627..a78b72bbfff 100644
--- a/app/code/Magento/Adminhtml/Block/Catalog/Search/Edit/Form.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Search/Edit/Form.php
@@ -28,11 +28,11 @@
* Adminhtml tag edit form
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Catalog\Search\Edit;
+namespace Magento\Catalog\Block\Adminhtml\Search\Edit;
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
@@ -75,7 +75,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
/**
* Prepare form fields
*
- * @return \Magento\Adminhtml\Block\Catalog\Search\Edit\Form
+ * @return \Magento\Catalog\Block\Adminhtml\Search\Edit\Form
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Catalog/Block/Category/View.php b/app/code/Magento/Catalog/Block/Category/View.php
index e7c724e26e4..60a8d233fa2 100644
--- a/app/code/Magento/Catalog/Block/Category/View.php
+++ b/app/code/Magento/Catalog/Block/Category/View.php
@@ -118,7 +118,7 @@ class View extends \Magento\Core\Block\Template
* want to show rss feed in the url
*/
if ($this->IsRssCatalogEnable() && $this->IsTopCategory()) {
- $title = __('%1 RSS Feed',$this->getCurrentCategory()->getName());
+ $title = __('%1 RSS Feed', $this->getCurrentCategory()->getName());
$headBlock->addRss($title, $this->getRssLink());
}
$pageMainTitle = $this->getLayout()->getBlock('page.main.title');
diff --git a/app/code/Magento/Catalog/Block/Product/Configurable/AttributeSelector.php b/app/code/Magento/Catalog/Block/Product/Configurable/AttributeSelector.php
index 247f31110af..83d510c0702 100644
--- a/app/code/Magento/Catalog/Block/Product/Configurable/AttributeSelector.php
+++ b/app/code/Magento/Catalog/Block/Product/Configurable/AttributeSelector.php
@@ -112,7 +112,7 @@ class AttributeSelector extends \Magento\Backend\Block\Template
*/
public function getAttributeSetCreationUrl()
{
- return $this->getUrl('*/catalog_product_set/save');
+ return $this->getUrl('*/product_set/save');
}
/**
@@ -123,7 +123,7 @@ class AttributeSelector extends \Magento\Backend\Block\Template
public function getSuggestWidgetOptions()
{
return array(
- 'source' => $this->getUrl('*/catalog_product_attribute/suggestConfigurableAttributes'),
+ 'source' => $this->getUrl('*/product_attribute/suggestConfigurableAttributes'),
'minLength' => 0,
'className' => 'category-select',
'showAll' => true,
diff --git a/app/code/Magento/Adminhtml/Controller/Catalog/Category.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Controller/Catalog/Category.php
rename to app/code/Magento/Catalog/Controller/Adminhtml/Category.php
index 54f1cc9aea8..064a24529f8 100644
--- a/app/code/Magento/Adminhtml/Controller/Catalog/Category.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category.php
@@ -27,9 +27,9 @@
/**
* Catalog category controller
*/
-namespace Magento\Adminhtml\Controller\Catalog;
+namespace Magento\Catalog\Controller\Adminhtml;
-class Category extends \Magento\Adminhtml\Controller\Action
+class Category extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Initialize requested category and put it into registry.
@@ -57,7 +57,7 @@ class Category extends \Magento\Adminhtml\Controller\Action
if ($getRootInstead) {
$category->load($rootId);
} else {
- $this->_redirect('*/*/', array('_current'=>true, 'id'=>null));
+ $this->_redirect('catalog/*/', array('_current'=>true, 'id'=>null));
return false;
}
}
@@ -120,7 +120,7 @@ class Category extends \Magento\Adminhtml\Controller\Action
}
if ($redirect) {
- $this->_redirect('*/*/edit', $params);
+ $this->_redirect('catalog/*/edit', $params);
return;
}
@@ -217,7 +217,7 @@ class Category extends \Magento\Adminhtml\Controller\Action
->getBaseUrl(\Magento\Core\Model\Store::URL_TYPE_MEDIA);
$content = $this->getLayout()->createBlock(
- 'Magento\Adminhtml\Block\Catalog\Helper\Form\Wysiwyg\Content',
+ 'Magento\Catalog\Block\Adminhtml\Helper\Form\Wysiwyg\Content',
'',
array(
'data' => array(
@@ -249,7 +249,7 @@ class Category extends \Magento\Adminhtml\Controller\Action
return;
}
$this->getResponse()->setBody(
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Category\Tree')
+ $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Category\Tree')
->getTreeJson($category)
);
}
@@ -372,7 +372,7 @@ class Category extends \Magento\Adminhtml\Controller\Action
'category' => $category->toArray(),
));
} else {
- $url = $this->getUrl('*/*/edit', array('_current' => true, 'id' => $category->getId()));
+ $url = $this->getUrl('catalog/*/edit', array('_current' => true, 'id' => $category->getId()));
$body = '<script type="text/javascript">parent.updateContent("'
. $url . '", {}, ' . $refreshTree . ');</script>';
}
@@ -447,15 +447,15 @@ class Category extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addSuccess(__('You deleted the category.'));
} catch (\Magento\Core\Exception $e){
$this->_getSession()->addError($e->getMessage());
- $this->getResponse()->setRedirect($this->getUrl('*/*/edit', array('_current' => true)));
+ $this->getResponse()->setRedirect($this->getUrl('catalog/*/edit', array('_current' => true)));
return;
} catch (\Exception $e){
$this->_getSession()->addError(__('Something went wrong while trying to delete the category.'));
- $this->getResponse()->setRedirect($this->getUrl('*/*/edit', array('_current' => true)));
+ $this->getResponse()->setRedirect($this->getUrl('catalog/*/edit', array('_current' => true)));
return;
}
}
- $this->getResponse()->setRedirect($this->getUrl('*/*/', array('_current' => true, 'id' => null)));
+ $this->getResponse()->setRedirect($this->getUrl('catalog/*/', array('_current' => true, 'id' => null)));
}
/**
@@ -469,7 +469,7 @@ class Category extends \Magento\Adminhtml\Controller\Action
return;
}
$this->getResponse()->setBody($this->getLayout()->createBlock(
- 'Magento\Adminhtml\Block\Catalog\Category\Tab\Product', 'category.product.grid'
+ 'Magento\Catalog\Block\Adminhtml\Category\Tab\Product', 'category.product.grid'
)->toHtml());
}
@@ -492,7 +492,7 @@ class Category extends \Magento\Adminhtml\Controller\Action
$category = $this->_initCategory(true);
- $block = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Category\Tree');
+ $block = $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Category\Tree');
$root = $block->getRoot();
$this->getResponse()->setBody($this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode(array(
'data' => $block->getTree(),
@@ -530,7 +530,7 @@ class Category extends \Magento\Adminhtml\Controller\Action
*/
public function suggestCategoriesAction()
{
- $this->getResponse()->setBody($this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Category\Tree')
+ $this->getResponse()->setBody($this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Category\Tree')
->getSuggestedCategoriesJson($this->getRequest()->getParam('label_part')));
}
diff --git a/app/code/Magento/Adminhtml/Controller/Catalog/Category/Widget.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Controller/Catalog/Category/Widget.php
rename to app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget.php
index e05d0b722bd..25e08961c82 100644
--- a/app/code/Magento/Adminhtml/Controller/Catalog/Category/Widget.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Widget.php
@@ -28,12 +28,12 @@
* Catalog category widgets controller for CMS WYSIWYG
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Catalog\Category;
+namespace Magento\Catalog\Controller\Adminhtml\Category;
-class Widget extends \Magento\Adminhtml\Controller\Action
+class Widget extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -85,7 +85,7 @@ class Widget extends \Magento\Adminhtml\Controller\Action
protected function _getCategoryTreeBlock()
{
- return $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Category\Widget\Chooser', '', array(
+ return $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Category\Widget\Chooser', '', array(
'data' => array(
'id' => $this->getRequest()->getParam('uniq_id'),
'use_massaction' => $this->getRequest()->getParam('use_massaction', false)
diff --git a/app/code/Magento/Adminhtml/Controller/Catalog/Product.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Controller/Catalog/Product.php
rename to app/code/Magento/Catalog/Controller/Adminhtml/Product.php
index 8911ad0d753..8af183bf159 100644
--- a/app/code/Magento/Adminhtml/Controller/Catalog/Product.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product.php
@@ -28,12 +28,12 @@
* Catalog product controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Catalog;
+namespace Magento\Catalog\Controller\Adminhtml;
-class Product extends \Magento\Adminhtml\Controller\Action
+class Product extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* The greatest value which could be stored in CatalogInventory Qty field
@@ -164,14 +164,14 @@ class Product extends \Magento\Adminhtml\Controller\Action
* @param string $inputName
* @param \Magento\Adminhtml\Block\Widget\Grid $gridBlock
* @param array $productsArray
- * @return \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Ajax\Serializer
+ * @return \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Ajax\Serializer
*/
protected function _createSerializerBlock(
$inputName,
\Magento\Adminhtml\Block\Widget\Grid $gridBlock,
$productsArray
) {
- return $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Ajax\Serializer')
+ return $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Ajax\Serializer')
->setGridBlock($gridBlock)
->setProducts($productsArray)
->setInputElementName($inputName);
@@ -235,7 +235,7 @@ class Product extends \Magento\Adminhtml\Controller\Action
$this->loadLayout(array(
'default',
strtolower($this->getFullActionName()),
- 'adminhtml_catalog_product_' . $product->getTypeId() . $_additionalLayoutPart
+ 'catalog_product_' . $product->getTypeId() . $_additionalLayoutPart
));
$this->_setActiveMenu('Magento_Catalog::catalog_products');
}
@@ -262,7 +262,7 @@ class Product extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addError(
__('This product no longer exists.')
);
- $this->_redirect('*/*/');
+ $this->_redirect('catalog/*/');
return;
}
@@ -280,7 +280,7 @@ class Product extends \Magento\Adminhtml\Controller\Action
$this->loadLayout(array(
'default',
strtolower($this->getFullActionName()),
- 'adminhtml_catalog_product_'.$product->getTypeId() . $additionalLayoutPart
+ 'catalog_product_'.$product->getTypeId() . $additionalLayoutPart
));
$this->_setActiveMenu('Magento_Catalog::catalog_products');
@@ -292,7 +292,7 @@ class Product extends \Magento\Adminhtml\Controller\Action
$switchBlock->setDefaultStoreName(__('Default Values'))
->setWebsiteIds($product->getWebsiteIds())
->setSwitchUrl(
- $this->getUrl('*/*/*', array(
+ $this->getUrl('catalog/*/*', array(
'_current' => true,
'active_tab' => null,
'tab' => null,
@@ -322,7 +322,7 @@ class Product extends \Magento\Adminhtml\Controller\Action
->getStore($storeId)->getBaseUrl(\Magento\Core\Model\Store::URL_TYPE_MEDIA);
$content = $this->getLayout()->createBlock(
- 'Magento\Adminhtml\Block\Catalog\Helper\Form\Wysiwyg\Content',
+ 'Magento\Catalog\Block\Adminhtml\Helper\Form\Wysiwyg\Content',
'',
array(
'data' => array(
@@ -357,7 +357,7 @@ class Product extends \Magento\Adminhtml\Controller\Action
$this->getResponse()->setBody(
$this->getLayout()
- ->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\\' . $blockClassSuffix)
+ ->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\\' . $blockClassSuffix)
->toHtml()
);
}
@@ -912,13 +912,13 @@ class Product extends \Magento\Adminhtml\Controller\Action
}
if ($redirectBack === 'new') {
- $this->_redirect('*/*/new', array(
+ $this->_redirect('catalog/*/new', array(
'set' => $product->getAttributeSetId(),
'type' => $product->getTypeId()
));
} elseif ($redirectBack === 'duplicate' && isset($newProduct)) {
$this->_redirect(
- '*/*/edit',
+ 'catalog/*/edit',
array(
'id' => $newProduct->getId(),
'back' => null,
@@ -926,18 +926,18 @@ class Product extends \Magento\Adminhtml\Controller\Action
)
);
} elseif ($redirectBack) {
- $this->_redirect('*/*/edit', array(
+ $this->_redirect('catalog/*/edit', array(
'id' => $productId,
'_current' => true
));
} elseif ($this->getRequest()->getParam('popup')) {
- $this->_redirect('*/*/created', array(
+ $this->_redirect('catalog/*/created', array(
'_current' => true,
'id' => $productId,
'edit' => $isEdit
));
} else {
- $this->_redirect('*/*/', array('store'=>$storeId));
+ $this->_redirect('catalog/*/', array('store'=>$storeId));
}
}
@@ -950,11 +950,11 @@ class Product extends \Magento\Adminhtml\Controller\Action
try {
$newProduct = $product->duplicate();
$this->_getSession()->addSuccess(__('You duplicated the product.'));
- $this->_redirect('*/*/edit', array('_current'=>true, 'id'=>$newProduct->getId()));
+ $this->_redirect('catalog/*/edit', array('_current'=>true, 'id'=>$newProduct->getId()));
} catch (\Exception $e) {
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
$this->_getSession()->addError($e->getMessage());
- $this->_redirect('*/*/edit', array('_current'=>true));
+ $this->_redirect('catalog/*/edit', array('_current'=>true));
}
}
@@ -981,7 +981,7 @@ class Product extends \Magento\Adminhtml\Controller\Action
$this->loadLayout('popup');
$this->_initProduct();
$this->_addContent(
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Product\Attribute\NewAttribute\Product\Created')
+ $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Product\Attribute\NewAttribute\Product\Created')
);
$this->renderLayout();
}
@@ -990,7 +990,7 @@ class Product extends \Magento\Adminhtml\Controller\Action
{
$this->loadLayout('popup');
$this->_addContent(
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Product\Created')
+ $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Product\Created')
);
$this->renderLayout();
}
@@ -1015,7 +1015,7 @@ class Product extends \Magento\Adminhtml\Controller\Action
}
}
}
- $this->_redirect('*/*/index');
+ $this->_redirect('catalog/*/index');
}
/**
@@ -1045,7 +1045,7 @@ class Product extends \Magento\Adminhtml\Controller\Action
->addException($e, __('Something went wrong while updating the product(s) status.'));
}
- $this->_redirect('*/*/', array('store'=> $storeId));
+ $this->_redirect('catalog/*/', array('store'=> $storeId));
}
/**
@@ -1087,7 +1087,7 @@ class Product extends \Magento\Adminhtml\Controller\Action
$session = $this->_objectManager->get('Magento\Adminhtml\Model\Session');
if ($session->hasCompositeProductResult()
&& $session->getCompositeProductResult() instanceof \Magento\Object) {
- $this->_objectManager->get('Magento\Adminhtml\Helper\Catalog\Product\Composite')
+ $this->_objectManager->get('Magento\Catalog\Helper\Product\Composite')
->renderUpdateResult($this, $session->getCompositeProductResult());
$session->unsCompositeProductResult();
} else {
@@ -1133,7 +1133,7 @@ class Product extends \Magento\Adminhtml\Controller\Action
public function suggestAttributesAction()
{
$this->getResponse()->setBody($this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode(
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Attributes\Search')
+ $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes\Search')
->getSuggestedAttributes($this->getRequest()->getParam('label_part'))
));
}
diff --git a/app/code/Magento/Adminhtml/Controller/Catalog/Product/Action/Attribute.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Controller/Catalog/Product/Action/Attribute.php
rename to app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
index bc3a862b3a5..d9eebd7f87e 100644
--- a/app/code/Magento/Adminhtml/Controller/Catalog/Product/Action/Attribute.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
@@ -29,12 +29,12 @@
* Adminhtml catalog product action attribute update controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Catalog\Product\Action;
+namespace Magento\Catalog\Controller\Adminhtml\Product\Action;
-class Attribute extends \Magento\Adminhtml\Controller\Action
+class Attribute extends \Magento\Backend\Controller\Adminhtml\Action
{
public function editAction()
{
@@ -177,7 +177,7 @@ class Attribute extends \Magento\Adminhtml\Controller\Action
->addException($e, __('Something went wrong while updating the product(s) attributes.'));
}
- $this->_redirect('*/catalog_product/', array('store'=>$this->_getHelper()->getSelectedStoreId()));
+ $this->_redirect('catalog/product/', array('store'=>$this->_getHelper()->getSelectedStoreId()));
}
/**
@@ -197,7 +197,7 @@ class Attribute extends \Magento\Adminhtml\Controller\Action
if ($error) {
$this->_getSession()->addError($error);
- $this->_redirect('*/catalog_product/', array('_current'=>true));
+ $this->_redirect('catalog/product/', array('_current'=>true));
}
return !$error;
@@ -206,11 +206,11 @@ class Attribute extends \Magento\Adminhtml\Controller\Action
/**
* Rertive data manipulation helper
*
- * @return \Magento\Adminhtml\Helper\Catalog\Product\Edit\Action\Attribute
+ * @return \Magento\Catalog\Helper\Product\Edit\Action\Attribute
*/
protected function _getHelper()
{
- return $this->_objectManager->get('Magento\Adminhtml\Helper\Catalog\Product\Edit\Action\Attribute');
+ return $this->_objectManager->get('Magento\Catalog\Helper\Product\Edit\Action\Attribute');
}
protected function _isAllowed()
diff --git a/app/code/Magento/Adminhtml/Controller/Catalog/Product/Attribute.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Controller/Catalog/Product/Attribute.php
rename to app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php
index cd552945d5b..9ea11f33d76 100644
--- a/app/code/Magento/Adminhtml/Controller/Catalog/Product/Attribute.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php
@@ -27,9 +27,9 @@
/**
* Catalog product attribute controller
*/
-namespace Magento\Adminhtml\Controller\Catalog\Product;
+namespace Magento\Catalog\Controller\Adminhtml\Product;
-class Attribute extends \Magento\Adminhtml\Controller\Action
+class Attribute extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* @var \Magento\Cache\FrontendInterface
@@ -97,7 +97,7 @@ class Attribute extends \Magento\Adminhtml\Controller\Action
public function indexAction()
{
$this->_initAction()
- ->_addContent($this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Product\Attribute'))
+ ->_addContent($this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Product\Attribute'))
->renderLayout();
}
@@ -118,7 +118,7 @@ class Attribute extends \Magento\Adminhtml\Controller\Action
if (! $model->getId()) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(
__('This attribute no longer exists.'));
- $this->_redirect('*/*/');
+ $this->_redirect('catalog/*/');
return;
}
@@ -126,7 +126,7 @@ class Attribute extends \Magento\Adminhtml\Controller\Action
if ($model->getEntityTypeId() != $this->_entityTypeId) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(
__('This attribute cannot be edited.'));
- $this->_redirect('*/*/');
+ $this->_redirect('catalog/*/');
return;
}
}
@@ -248,7 +248,7 @@ class Attribute extends \Magento\Adminhtml\Controller\Action
__('Attribute Set with name \'%1\' already exists.', $name)
);
$session->setAttributeData($data);
- $this->_redirect('*/*/edit', array('_current' => true));
+ $this->_redirect('catalog/*/edit', array('_current' => true));
return;
}
@@ -282,7 +282,7 @@ class Attribute extends \Magento\Adminhtml\Controller\Action
. 'numbers (0-9) or underscore(_) in this field, first character should be a letter.',
$attributeCode)
);
- $this->_redirect('*/*/edit', array('attribute_id' => $id, '_current' => true));
+ $this->_redirect('catalog/*/edit', array('attribute_id' => $id, '_current' => true));
return;
}
}
@@ -296,7 +296,7 @@ class Attribute extends \Magento\Adminhtml\Controller\Action
foreach ($inputType->getMessages() as $message) {
$session->addError($message);
}
- $this->_redirect('*/*/edit', array('attribute_id' => $id, '_current' => true));
+ $this->_redirect('catalog/*/edit', array('attribute_id' => $id, '_current' => true));
return;
}
}
@@ -306,7 +306,7 @@ class Attribute extends \Magento\Adminhtml\Controller\Action
if (!$model->getId()) {
$session->addError(
__('This attribute no longer exists.'));
- $this->_redirect('*/*/');
+ $this->_redirect('catalog/*/');
return;
}
// entity type check
@@ -314,7 +314,7 @@ class Attribute extends \Magento\Adminhtml\Controller\Action
$session->addError(
__('You can\'t update your attribute.'));
$session->setAttributeData($data);
- $this->_redirect('*/*/');
+ $this->_redirect('catalog/*/');
return;
}
@@ -391,21 +391,21 @@ class Attribute extends \Magento\Adminhtml\Controller\Action
if ($isNewAttributeSet) {
$requestParams['new_attribute_set_id'] = $attributeSet->getId();
}
- $this->_redirect('adminhtml/catalog_product/addAttribute', $requestParams);
+ $this->_redirect('catalog/product/addAttribute', $requestParams);
} elseif ($redirectBack) {
- $this->_redirect('*/*/edit', array('attribute_id' => $model->getId(),'_current'=>true));
+ $this->_redirect('catalog/*/edit', array('attribute_id' => $model->getId(),'_current'=>true));
} else {
- $this->_redirect('*/*/', array());
+ $this->_redirect('catalog/*/', array());
}
return;
} catch (\Exception $e) {
$session->addError($e->getMessage());
$session->setAttributeData($data);
- $this->_redirect('*/*/edit', array('attribute_id' => $id, '_current' => true));
+ $this->_redirect('catalog/*/edit', array('attribute_id' => $id, '_current' => true));
return;
}
}
- $this->_redirect('*/*/');
+ $this->_redirect('catalog/*/');
}
public function deleteAction()
@@ -419,7 +419,7 @@ class Attribute extends \Magento\Adminhtml\Controller\Action
if ($model->getEntityTypeId() != $this->_entityTypeId) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(
__('This attribute cannot be deleted.'));
- $this->_redirect('*/*/');
+ $this->_redirect('catalog/*/');
return;
}
@@ -427,17 +427,17 @@ class Attribute extends \Magento\Adminhtml\Controller\Action
$model->delete();
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addSuccess(
__('The product attribute has been deleted.'));
- $this->_redirect('*/*/');
+ $this->_redirect('catalog/*/');
return;
} catch (\Exception $e) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError($e->getMessage());
- $this->_redirect('*/*/edit', array('attribute_id' => $this->getRequest()->getParam('attribute_id')));
+ $this->_redirect('catalog/*/edit', array('attribute_id' => $this->getRequest()->getParam('attribute_id')));
return;
}
}
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(
__('We can\'t find an attribute to delete.'));
- $this->_redirect('*/*/');
+ $this->_redirect('catalog/*/');
}
/**
diff --git a/app/code/Magento/Adminhtml/Controller/Catalog/Product/Datafeeds.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Datafeeds.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Controller/Catalog/Product/Datafeeds.php
rename to app/code/Magento/Catalog/Controller/Adminhtml/Product/Datafeeds.php
index ee9a482c562..9044049c7f6 100644
--- a/app/code/Magento/Adminhtml/Controller/Catalog/Product/Datafeeds.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Datafeeds.php
@@ -25,9 +25,9 @@
*/
-namespace Magento\Adminhtml\Controller\Catalog\Product;
+namespace Magento\Catalog\Controller\Adminhtml\Product;
-class Datafeeds extends \Magento\Adminhtml\Controller\Action
+class Datafeeds extends \Magento\Backend\Controller\Adminhtml\Action
{
public function indexAction()
diff --git a/app/code/Magento/Adminhtml/Controller/Catalog/Product/Gallery.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Controller/Catalog/Product/Gallery.php
rename to app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery.php
index cd79a767b65..864e85c0d84 100644
--- a/app/code/Magento/Adminhtml/Controller/Catalog/Product/Gallery.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery.php
@@ -28,12 +28,12 @@
* Catalog product gallery controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Catalog\Product;
+namespace Magento\Catalog\Controller\Adminhtml\Product;
-class Gallery extends \Magento\Adminhtml\Controller\Action
+class Gallery extends \Magento\Backend\Controller\Adminhtml\Action
{
public function uploadAction()
{
diff --git a/app/code/Magento/Adminhtml/Controller/Catalog/Product/Group.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Group.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Controller/Catalog/Product/Group.php
rename to app/code/Magento/Catalog/Controller/Adminhtml/Product/Group.php
index 88f6afb75cd..4ac83da4829 100644
--- a/app/code/Magento/Adminhtml/Controller/Catalog/Product/Group.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Group.php
@@ -24,9 +24,9 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Controller\Catalog\Product;
+namespace Magento\Catalog\Controller\Adminhtml\Product;
-class Group extends \Magento\Adminhtml\Controller\Action
+class Group extends \Magento\Backend\Controller\Adminhtml\Action
{
public function saveAction()
{
diff --git a/app/code/Magento/Adminhtml/Controller/Catalog/Product/Review.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Review.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Controller/Catalog/Product/Review.php
rename to app/code/Magento/Catalog/Controller/Adminhtml/Product/Review.php
index 4b46d3310a3..42b4be11744 100644
--- a/app/code/Magento/Adminhtml/Controller/Catalog/Product/Review.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Review.php
@@ -27,9 +27,9 @@
/**
* Reviews admin controller
*/
-namespace Magento\Adminhtml\Controller\Catalog\Product;
+namespace Magento\Catalog\Controller\Adminhtml\Product;
-class Review extends \Magento\Adminhtml\Controller\Action
+class Review extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Array of actions which can be processed without secret key validation
@@ -170,11 +170,11 @@ class Review extends \Magento\Adminhtml\Controller\Action
$nextId = (int) $this->getRequest()->getParam('next_item');
$url = $this->getUrl($this->getRequest()->getParam('ret') == 'pending' ? '*/*/pending' : '*/*/');
if ($nextId) {
- $url = $this->getUrl('*/*/edit', array('id' => $nextId));
+ $url = $this->getUrl('adminhtml/*/edit', array('id' => $nextId));
}
return $this->getResponse()->setRedirect($url);
}
- $this->_redirect('*/*/');
+ $this->_redirect('catalog/*/');
}
public function deleteAction()
@@ -189,9 +189,9 @@ class Review extends \Magento\Adminhtml\Controller\Action
$session->addSuccess(__('The review has been deleted.'));
if( $this->getRequest()->getParam('ret') == 'pending' ) {
- $this->getResponse()->setRedirect($this->getUrl('*/*/pending'));
+ $this->getResponse()->setRedirect($this->getUrl('adminhtml/*/pending'));
} else {
- $this->getResponse()->setRedirect($this->getUrl('*/*/'));
+ $this->getResponse()->setRedirect($this->getUrl('adminhtml/*/'));
}
return;
} catch (\Magento\Core\Exception $e) {
@@ -200,7 +200,7 @@ class Review extends \Magento\Adminhtml\Controller\Action
$session->addException($e, __('Something went wrong deleting this review.'));
}
- $this->_redirect('*/*/edit/',array('id'=>$reviewId));
+ $this->_redirect('catalog/*/edit/',array('id'=>$reviewId));
}
public function massDeleteAction()
@@ -226,7 +226,7 @@ class Review extends \Magento\Adminhtml\Controller\Action
}
}
- $this->_redirect('*/*/' . $this->getRequest()->getParam('ret', 'index'));
+ $this->_redirect('catalog/*/' . $this->getRequest()->getParam('ret', 'index'));
}
public function massUpdateStatusAction()
@@ -256,7 +256,7 @@ class Review extends \Magento\Adminhtml\Controller\Action
}
}
- $this->_redirect('*/*/' . $this->getRequest()->getParam('ret', 'index'));
+ $this->_redirect('catalog/*/' . $this->getRequest()->getParam('ret', 'index'));
}
public function massVisibleInAction()
@@ -286,7 +286,7 @@ class Review extends \Magento\Adminhtml\Controller\Action
}
}
- $this->_redirect('*/*/pending');
+ $this->_redirect('catalog/*/pending');
}
public function productGridAction()
@@ -360,9 +360,9 @@ class Review extends \Magento\Adminhtml\Controller\Action
$session->addSuccess(__('You saved the review.'));
if( $this->getRequest()->getParam('ret') == 'pending' ) {
- $this->getResponse()->setRedirect($this->getUrl('*/*/pending'));
+ $this->getResponse()->setRedirect($this->getUrl('catalog/*/pending'));
} else {
- $this->getResponse()->setRedirect($this->getUrl('*/*/'));
+ $this->getResponse()->setRedirect($this->getUrl('catalog/*/'));
}
return;
@@ -372,7 +372,7 @@ class Review extends \Magento\Adminhtml\Controller\Action
$session->addException($e, __('An error occurred while saving review.'));
}
}
- $this->getResponse()->setRedirect($this->getUrl('*/*/'));
+ $this->getResponse()->setRedirect($this->getUrl('catalog/*/'));
return;
}
diff --git a/app/code/Magento/Adminhtml/Controller/Catalog/Product/Set.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Controller/Catalog/Product/Set.php
rename to app/code/Magento/Catalog/Controller/Adminhtml/Product/Set.php
index 0faf9b76550..b40a8ccbb1e 100644
--- a/app/code/Magento/Adminhtml/Controller/Catalog/Product/Set.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Set.php
@@ -28,13 +28,13 @@
* Adminhtml entity sets controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Catalog\Product;
+namespace Magento\Catalog\Controller\Adminhtml\Product;
-class Set extends \Magento\Adminhtml\Controller\Action
+class Set extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -81,7 +81,7 @@ class Set extends \Magento\Adminhtml\Controller\Action
->load($this->getRequest()->getParam('id'));
if (!$attributeSet->getId()) {
- $this->_redirect('*/*/index');
+ $this->_redirect('catalog/*/index');
return;
}
@@ -99,7 +99,7 @@ class Set extends \Magento\Adminhtml\Controller\Action
__('Manage Product Sets'));
$this->_addContent(
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Product\Attribute\Set\Main')
+ $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main')
);
$this->renderLayout();
@@ -183,9 +183,9 @@ class Set extends \Magento\Adminhtml\Controller\Action
$this->getResponse()->setBody($body);
} else {
if ($hasError) {
- $this->_redirect('*/*/add');
+ $this->_redirect('catalog/*/add');
} else {
- $this->_redirect('*/*/edit', array('id' => $model->getId()));
+ $this->_redirect('catalog/*/edit', array('id' => $model->getId()));
}
}
} else {
@@ -196,7 +196,7 @@ class Set extends \Magento\Adminhtml\Controller\Action
$response['message'] = $this->getLayout()->getMessagesBlock()->getGroupedHtml();
} else {
$response['error'] = 0;
- $response['url'] = $this->getUrl('*/*/');
+ $response['url'] = $this->getUrl('catalog/*/');
}
$this->getResponse()->setBody($this->_objectManager->get('Magento\Core\Helper\Data')
->jsonEncode($response));
@@ -214,7 +214,7 @@ class Set extends \Magento\Adminhtml\Controller\Action
$this->_addContent(
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Product\Attribute\Set\Toolbar\Add')
+ $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Toolbar\Add')
);
$this->renderLayout();
@@ -229,7 +229,7 @@ class Set extends \Magento\Adminhtml\Controller\Action
->delete();
$this->_getSession()->addSuccess(__('The attribute set has been removed.'));
- $this->getResponse()->setRedirect($this->getUrl('*/*/'));
+ $this->getResponse()->setRedirect($this->getUrl('catalog/*/'));
} catch (\Exception $e) {
$this->_getSession()->addError(__('An error occurred while deleting this set.'));
$this->_redirectReferer();
diff --git a/app/code/Magento/Adminhtml/Controller/Catalog/Product/Widget.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Widget.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Controller/Catalog/Product/Widget.php
rename to app/code/Magento/Catalog/Controller/Adminhtml/Product/Widget.php
index 5f23d1c3fe3..06ebd6ffd58 100644
--- a/app/code/Magento/Adminhtml/Controller/Catalog/Product/Widget.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Widget.php
@@ -29,12 +29,12 @@
* Catalog Product widgets controller for CMS WYSIWYG
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Catalog\Product;
+namespace Magento\Catalog\Controller\Adminhtml\Product;
-class Widget extends \Magento\Adminhtml\Controller\Action
+class Widget extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Chooser Source action
@@ -46,7 +46,7 @@ class Widget extends \Magento\Adminhtml\Controller\Action
$productTypeId = $this->getRequest()->getParam('product_type_id', null);
$productsGrid = $this->getLayout()->createBlock(
- 'Magento\Adminhtml\Block\Catalog\Product\Widget\Chooser',
+ 'Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser',
'',
array(
'data' => array(
@@ -62,7 +62,7 @@ class Widget extends \Magento\Adminhtml\Controller\Action
if (!$this->getRequest()->getParam('products_grid')) {
$categoriesTree = $this->getLayout()->createBlock(
- 'Magento\Adminhtml\Block\Catalog\Category\Widget\Chooser',
+ 'Magento\Catalog\Block\Adminhtml\Category\Widget\Chooser',
'',
array(
'data' => array(
@@ -73,7 +73,7 @@ class Widget extends \Magento\Adminhtml\Controller\Action
)
);
- $html = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Product\Widget\Chooser\Container')
+ $html = $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser\Container')
->setTreeHtml($categoriesTree->toHtml())
->setGridHtml($html)
->toHtml();
diff --git a/app/code/Magento/Adminhtml/Controller/Catalog/Search.php b/app/code/Magento/Catalog/Controller/Adminhtml/Search.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Controller/Catalog/Search.php
rename to app/code/Magento/Catalog/Controller/Adminhtml/Search.php
index df72cb1bf06..18954bfc8f2 100644
--- a/app/code/Magento/Adminhtml/Controller/Catalog/Search.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Search.php
@@ -24,9 +24,9 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Controller\Catalog;
+namespace Magento\Catalog\Controller\Adminhtml;
-class Search extends \Magento\Adminhtml\Controller\Action
+class Search extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -81,7 +81,7 @@ class Search extends \Magento\Adminhtml\Controller\Action
$model->load($id);
if (! $model->getId()) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(__('This search no longer exists.'));
- $this->_redirect('*/*');
+ $this->_redirect('catalog/*');
return;
}
}
@@ -101,7 +101,7 @@ class Search extends \Magento\Adminhtml\Controller\Action
$this->getLayout()->getBlock('head')->setCanLoadRulesJs(true);
$this->getLayout()->getBlock('adminhtml.catalog.search.edit')
- ->setData('action', $this->getUrl('*/catalog_search/save'));
+ ->setData('action', $this->getUrl('catalog/search/save'));
$this
->_addBreadcrumb($id ? __('Edit Search') : __('New Search'), $id ? __('Edit Search') : __('New Search'));
@@ -158,9 +158,9 @@ class Search extends \Magento\Adminhtml\Controller\Action
if ($hasError) {
$this->_getSession()->setPageData($data);
- $this->_redirect('*/*/edit', array('id' => $queryId));
+ $this->_redirect('catalog/*/edit', array('id' => $queryId));
} else {
- $this->_redirect('*/*');
+ $this->_redirect('catalog/*');
}
}
@@ -173,16 +173,16 @@ class Search extends \Magento\Adminhtml\Controller\Action
$model->setId($id);
$model->delete();
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addSuccess(__('You deleted the search.'));
- $this->_redirect('*/*/');
+ $this->_redirect('catalog/*/');
return;
} catch (\Exception $e) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError($e->getMessage());
- $this->_redirect('*/*/edit', array('id' => $this->getRequest()->getParam('id')));
+ $this->_redirect('catalog/*/edit', array('id' => $this->getRequest()->getParam('id')));
return;
}
}
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(__('We can\'t find a search term to delete.'));
- $this->_redirect('*/*/');
+ $this->_redirect('catalog/*/');
}
public function massDeleteAction()
@@ -204,7 +204,7 @@ class Search extends \Magento\Adminhtml\Controller\Action
}
}
- $this->_redirect('*/*/index');
+ $this->_redirect('catalog/*/index');
}
protected function _isAllowed()
diff --git a/app/code/Magento/Catalog/Controller/Category.php b/app/code/Magento/Catalog/Controller/Category.php
index a4c17cdc9d9..6a8c95c82a7 100644
--- a/app/code/Magento/Catalog/Controller/Category.php
+++ b/app/code/Magento/Catalog/Controller/Category.php
@@ -151,11 +151,18 @@ class Category extends \Magento\Core\Controller\Front\Action
$this->_catalogSession->setLastViewedCategoryId($category->getId());
$update = $this->getLayout()->getUpdate();
+ $update->addHandle('default');
if ($category->getIsAnchor()) {
$type = $category->hasChildren() ? 'layered' : 'layered_without_children';
} else {
$type = $category->hasChildren() ? 'default' : 'default_without_children';
}
+
+ if (!$category->hasChildren()) {
+ // Two levels removed from parent. Need to add default page type.
+ $parentType = strtok($type, '_');
+ $this->addPageLayoutHandles(array('type' => $parentType));
+ }
$this->addPageLayoutHandles(array('type' => $type, 'id' => $category->getId()));
$this->loadLayoutUpdates();
diff --git a/app/code/Magento/Adminhtml/Helper/Catalog.php b/app/code/Magento/Catalog/Helper/Catalog.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Helper/Catalog.php
rename to app/code/Magento/Catalog/Helper/Catalog.php
index aeed01f77e5..4a47c744013 100644
--- a/app/code/Magento/Adminhtml/Helper/Catalog.php
+++ b/app/code/Magento/Catalog/Helper/Catalog.php
@@ -28,10 +28,10 @@
* Adminhtml Catalog helper
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Helper;
+namespace Magento\Catalog\Helper;
class Catalog extends \Magento\Core\Helper\AbstractHelper
{
@@ -94,7 +94,7 @@ class Catalog extends \Magento\Core\Helper\AbstractHelper
* Set Custom Attribute Tab Block Name for Product Edit
*
* @param string $attributeTabBlock
- * @return \Magento\Adminhtml\Helper\Catalog
+ * @return \Magento\Catalog\Helper\Catalog
*/
public function setAttributeTabBlock($attributeTabBlock)
{
@@ -116,7 +116,7 @@ class Catalog extends \Magento\Core\Helper\AbstractHelper
* Set Custom Attribute Tab Block Name for Category Edit
*
* @param string $attributeTabBlock
- * @return \Magento\Adminhtml\Helper\Catalog
+ * @return \Magento\Catalog\Helper\Catalog
*/
public function setCategoryAttributeTabBlock($attributeTabBlock)
{
diff --git a/app/code/Magento/Catalog/Helper/Product/Compare.php b/app/code/Magento/Catalog/Helper/Product/Compare.php
index a4f36fba219..f7573eb245b 100644
--- a/app/code/Magento/Catalog/Helper/Product/Compare.php
+++ b/app/code/Magento/Catalog/Helper/Product/Compare.php
@@ -124,16 +124,6 @@ class Compare extends \Magento\Core\Helper\Url
parent::__construct($context, $storeManager);
}
- /**
- * Retrieve Catalog Session instance
- *
- * @return \Magento\Catalog\Model\Session
- */
- protected function _getSession()
- {
- return $this->_catalogSession;
- }
-
/**
* Retrieve compare list url
*
@@ -141,17 +131,17 @@ class Compare extends \Magento\Core\Helper\Url
*/
public function getListUrl()
{
- $itemIds = array();
- foreach ($this->getItemCollection() as $item) {
- $itemIds[] = $item->getId();
- }
+ $itemIds = array();
+ foreach ($this->getItemCollection() as $item) {
+ $itemIds[] = $item->getId();
+ }
- $params = array(
+ $params = array(
'items'=>implode(',', $itemIds),
\Magento\Core\Controller\Front\Action::PARAM_NAME_URL_ENCODED => $this->getEncodedUrl()
- );
+ );
- return $this->_getUrl('catalog/product_compare', $params);
+ return $this->_getUrl('catalog/product_compare', $params);
}
/**
@@ -276,7 +266,7 @@ class Compare extends \Magento\Core\Helper\Url
->load();
/* update compare items count */
- $this->_getSession()->setCatalogCompareItemsCount(count($this->_itemCollection));
+ $this->_catalogSession->setCatalogCompareItemsCount(count($this->_itemCollection));
}
return $this->_itemCollection;
@@ -291,7 +281,7 @@ class Compare extends \Magento\Core\Helper\Url
public function calculate($logout = false)
{
// first visit
- if (!$this->_getSession()->hasCatalogCompareItemsCount() && !$this->_customerId) {
+ if (!$this->_catalogSession->hasCatalogCompareItemsCount() && !$this->_customerId) {
$count = 0;
} else {
/** @var $collection \Magento\Catalog\Model\Resource\Product\Compare\Item\Collection */
@@ -312,7 +302,7 @@ class Compare extends \Magento\Core\Helper\Url
$count = $collection->getSize();
}
- $this->_getSession()->setCatalogCompareItemsCount($count);
+ $this->_catalogSession->setCatalogCompareItemsCount($count);
return $this;
}
@@ -324,11 +314,11 @@ class Compare extends \Magento\Core\Helper\Url
*/
public function getItemCount()
{
- if (!$this->_getSession()->hasCatalogCompareItemsCount()) {
+ if (!$this->_catalogSession->hasCatalogCompareItemsCount()) {
$this->calculate();
}
- return $this->_getSession()->getCatalogCompareItemsCount();
+ return $this->_catalogSession->getCatalogCompareItemsCount();
}
/**
diff --git a/app/code/Magento/Adminhtml/Helper/Catalog/Product/Composite.php b/app/code/Magento/Catalog/Helper/Product/Composite.php
similarity index 88%
rename from app/code/Magento/Adminhtml/Helper/Catalog/Product/Composite.php
rename to app/code/Magento/Catalog/Helper/Product/Composite.php
index 0f6dd29feb0..aa1eb73efe7 100644
--- a/app/code/Magento/Adminhtml/Helper/Catalog/Product/Composite.php
+++ b/app/code/Magento/Catalog/Helper/Product/Composite.php
@@ -28,10 +28,10 @@
* Adminhtml catalog product composite helper
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Helper\Catalog\Product;
+namespace Magento\Catalog\Helper\Product;
class Composite extends \Magento\Core\Helper\AbstractHelper
{
@@ -91,13 +91,13 @@ class Composite extends \Magento\Core\Helper\AbstractHelper
/**
* Init layout of product configuration update result
*
- * @param \Magento\Adminhtml\Controller\Action $controller
- * @return \Magento\Adminhtml\Helper\Catalog\Product\Composite
+ * @param \Magento\Backend\Controller\Adminhtml\Action $controller
+ * @return \Magento\Catalog\Helper\Product\Composite
*/
protected function _initUpdateResultLayout($controller)
{
$controller->getLayout()->getUpdate()
- ->addHandle('ADMINHTML_CATALOG_PRODUCT_COMPOSITE_UPDATE_RESULT');
+ ->addHandle('CATALOG_PRODUCT_COMPOSITE_UPDATE_RESULT');
$controller->loadLayoutUpdates()->generateLayoutXml()->generateLayoutBlocks();
return $this;
}
@@ -106,9 +106,9 @@ class Composite extends \Magento\Core\Helper\AbstractHelper
* Prepares and render result of composite product configuration update for a case
* when single configuration submitted
*
- * @param \Magento\Adminhtml\Controller\Action $controller
+ * @param \Magento\Backend\Controller\Adminhtml\Action $controller
* @param \Magento\Object $updateResult
- * @return \Magento\Adminhtml\Helper\Catalog\Product\Composite
+ * @return \Magento\Catalog\Helper\Product\Composite
*/
public function renderUpdateResult($controller, \Magento\Object $updateResult)
{
@@ -124,19 +124,19 @@ class Composite extends \Magento\Core\Helper\AbstractHelper
* $isOk - true or false, whether action was completed nicely or with some error
* If $isOk is FALSE (some error during configuration), so $productType must be null
*
- * @param \Magento\Adminhtml\Controller\Action $controller
+ * @param \Magento\Backend\Controller\Adminhtml\Action $controller
* @param bool $isOk
* @param string $productType
- * @return \Magento\Adminhtml\Helper\Catalog\Product\Composite
+ * @return \Magento\Catalog\Helper\Product\Composite
*/
protected function _initConfigureResultLayout($controller, $isOk, $productType)
{
$update = $controller->getLayout()->getUpdate();
if ($isOk) {
- $update->addHandle('ADMINHTML_CATALOG_PRODUCT_COMPOSITE_CONFIGURE')
+ $update->addHandle('CATALOG_PRODUCT_COMPOSITE_CONFIGURE')
->addHandle('catalog_product_view_type_' . $productType);
} else {
- $update->addHandle('ADMINHTML_CATALOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR');
+ $update->addHandle('CATALOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR');
}
$controller->loadLayoutUpdates()->generateLayoutXml()->generateLayoutBlocks();
return $this;
@@ -149,9 +149,9 @@ class Composite extends \Magento\Core\Helper\AbstractHelper
* - 'ok' = true, and 'product_id', 'buy_request', 'current_store_id', 'current_customer' or 'current_customer_id'
* - 'error' = true, and 'message' to show
*
- * @param \Magento\Adminhtml\Controller\Action $controller
+ * @param \Magento\Backend\Controller\Adminhtml\Action $controller
* @param \Magento\Object $configureResult
- * @return \Magento\Adminhtml\Helper\Catalog\Product\Composite
+ * @return \Magento\Catalog\Helper\Product\Composite
*/
public function renderConfigureResult($controller, \Magento\Object $configureResult)
{
diff --git a/app/code/Magento/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php b/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php
rename to app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
index 8c4f451926e..1d4ce6d2813 100644
--- a/app/code/Magento/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php
+++ b/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
@@ -27,7 +27,7 @@
/**
* Adminhtml catalog product action attribute update helper
*/
-namespace Magento\Adminhtml\Helper\Catalog\Product\Edit\Action;
+namespace Magento\Catalog\Helper\Product\Edit\Action;
class Attribute extends \Magento\Backend\Helper\Data
{
@@ -72,7 +72,7 @@ class Attribute extends \Magento\Backend\Helper\Data
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Core\Model\Config\Primary $primaryConfig
* @param \Magento\App\RouterList $routerList
- * @param \Magento\Core\Model\App\Proxy $app
+ * @param \Magento\Core\Model\AppInterface $app
* @param \Magento\Backend\Model\Url $backendUrl
* @param \Magento\Backend\Model\Auth $auth
* @param \Magento\Backend\App\Area\FrontNameResolver $frontNameResolver
@@ -85,7 +85,7 @@ class Attribute extends \Magento\Backend\Helper\Data
\Magento\Core\Helper\Data $coreData,
\Magento\Core\Model\Config\Primary $primaryConfig,
\Magento\App\RouterList $routerList,
- \Magento\Core\Model\App\Proxy $app,
+ \Magento\Core\Model\AppInterface $app,
\Magento\Backend\Model\Url $backendUrl,
\Magento\Backend\Model\Auth $auth,
\Magento\Backend\App\Area\FrontNameResolver $frontNameResolver,
diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
index 5b9e125519b..3e86645fd98 100644
--- a/app/code/Magento/Catalog/Helper/Product/View.php
+++ b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -137,6 +137,7 @@ class View extends \Magento\Core\Helper\AbstractHelper
}
$update = $controller->getLayout()->getUpdate();
+ $update->addHandle('default');
$controller->addPageLayoutHandles(
array('id' => $product->getId(), 'sku' => $product->getSku(), 'type' => $product->getTypeId())
);
diff --git a/app/code/Magento/Catalog/Model/Product/Media/Config.php b/app/code/Magento/Catalog/Model/Product/Media/Config.php
index 2717238980c..8f5690c6c86 100644
--- a/app/code/Magento/Catalog/Model/Product/Media/Config.php
+++ b/app/code/Magento/Catalog/Model/Product/Media/Config.php
@@ -34,7 +34,7 @@
*/
namespace Magento\Catalog\Model\Product\Media;
-class Config implements \Magento\Media\Model\Image\Config\ConfigInterface
+class Config implements ConfigInterface
{
/**
* Dir
diff --git a/app/code/Magento/Media/Model/Image/Config/ConfigInterface.php b/app/code/Magento/Catalog/Model/Product/Media/ConfigInterface.php
similarity index 87%
rename from app/code/Magento/Media/Model/Image/Config/ConfigInterface.php
rename to app/code/Magento/Catalog/Model/Product/Media/ConfigInterface.php
index abd1776bed0..d75edbb6414 100644
--- a/app/code/Magento/Media/Model/Image/Config/ConfigInterface.php
+++ b/app/code/Magento/Catalog/Model/Product/Media/ConfigInterface.php
@@ -18,25 +18,17 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package Magento_Media
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-
/**
* Media library image config interface
- *
- * @category Magento
- * @package Magento_Media
- * @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Media\Model\Image\Config;
+namespace Magento\Catalog\Model\Product\Media;
interface ConfigInterface
{
-
/**
* Retrive base url for media files
*
@@ -66,5 +58,4 @@ interface ConfigInterface
* @return string
*/
function getMediaPath($file);
-
}
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
index e522bf8d8a5..28f5bf1a18d 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
@@ -299,7 +299,7 @@ class DefaultType extends \Magento\Object
/**
* Return formatted option value ready to edit, ready to parse
- * (ex: Admin re-order, see \Magento\Adminhtml\Model\Sales\Order\Create)
+ * (ex: Admin re-order, see \Magento\Sales\Model\AdminOrder\Create)
*
* @param string $optionValue Prepared for cart option value
* @return string
diff --git a/app/code/Magento/Catalog/Model/Resource/Setup.php b/app/code/Magento/Catalog/Model/Resource/Setup.php
index 8b7ff9d7e64..7f6195a6c7d 100755
--- a/app/code/Magento/Catalog/Model/Resource/Setup.php
+++ b/app/code/Magento/Catalog/Model/Resource/Setup.php
@@ -346,7 +346,7 @@ class Setup extends \Magento\Eav\Model\Entity\Setup
'type' => 'varchar',
'label' => 'Custom Design',
'input' => 'select',
- 'source' => 'Magento\Core\Model\Design\Source\Design',
+ 'source' => 'Magento\Core\Model\Theme\Source\Theme',
'required' => false,
'sort_order' => 10,
'global' => \Magento\Catalog\Model\Resource\Eav\Attribute::SCOPE_STORE,
@@ -415,7 +415,8 @@ class Setup extends \Magento\Eav\Model\Entity\Setup
'source' => 'Magento\Catalog\Model\Category\Attribute\Source\Sortby',
'backend' => 'Magento\Catalog\Model\Category\Attribute\Backend\Sortby',
'sort_order' => 40,
- 'input_renderer' => 'Magento\Adminhtml\Block\Catalog\Category\Helper\Sortby\Available',
+ 'input_renderer' =>
+ 'Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby\Available',
'global' => \Magento\Catalog\Model\Resource\Eav\Attribute::SCOPE_STORE,
'group' => 'Display Settings',
),
@@ -426,7 +427,8 @@ class Setup extends \Magento\Eav\Model\Entity\Setup
'source' => 'Magento\Catalog\Model\Category\Attribute\Source\Sortby',
'backend' => 'Magento\Catalog\Model\Category\Attribute\Backend\Sortby',
'sort_order' => 50,
- 'input_renderer' => 'Magento\Adminhtml\Block\Catalog\Category\Helper\Sortby\DefaultSortby',
+ 'input_renderer' =>
+ 'Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby\DefaultSortby',
'global' => \Magento\Catalog\Model\Resource\Eav\Attribute::SCOPE_STORE,
'group' => 'Display Settings',
),
@@ -466,7 +468,7 @@ class Setup extends \Magento\Eav\Model\Entity\Setup
'input' => 'text',
'required' => false,
'sort_order' => 51,
- 'input_renderer' => 'Magento\Adminhtml\Block\Catalog\Category\Helper\Pricestep',
+ 'input_renderer' => 'Magento\Catalog\Block\Adminhtml\Category\Helper\Pricestep',
'global' => \Magento\Catalog\Model\Resource\Eav\Attribute::SCOPE_STORE,
'group' => 'Display Settings',
),
@@ -821,7 +823,7 @@ class Setup extends \Magento\Eav\Model\Entity\Setup
'type' => 'varchar',
'label' => 'Custom Design',
'input' => 'select',
- 'source' => 'Magento\Core\Model\Design\Source\Design',
+ 'source' => 'Magento\Core\Model\Theme\Source\Theme',
'required' => false,
'sort_order' => 1,
'global' => \Magento\Catalog\Model\Resource\Eav\Attribute::SCOPE_STORE,
@@ -878,7 +880,8 @@ class Setup extends \Magento\Eav\Model\Entity\Setup
'type' => 'varchar',
'label' => 'Display Product Options In',
'input' => 'select',
- 'source' => 'Magento\Catalog\Model\Entity\Product\Attribute\Design\Options\Container',
+ 'source' =>
+ 'Magento\Catalog\Model\Entity\Product\Attribute\Design\Options\Container',
'required' => false,
'default' => 'container2',
'sort_order' => 6,
diff --git a/app/code/Magento/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.17-1.6.0.0.18.php b/app/code/Magento/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.17-1.6.0.0.18.php
index a05ca8550fb..44316f2c7ea 100644
--- a/app/code/Magento/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.17-1.6.0.0.18.php
+++ b/app/code/Magento/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.17-1.6.0.0.18.php
@@ -35,7 +35,7 @@ if ($attribute) {
'input' => 'categories',
'group' => 'General Information',
'backend_model' => 'Magento\Catalog\Model\Product\Attribute\Backend\Category',
- 'frontend_input_renderer' => 'Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Category',
+ 'frontend_input_renderer' => 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Category',
);
foreach ($properties as $key => $value) {
$this->updateAttribute(
diff --git a/app/code/Magento/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.18-1.6.0.0.19.php b/app/code/Magento/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.18-1.6.0.0.19.php
index 450159a472b..47fcec5f458 100644
--- a/app/code/Magento/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.18-1.6.0.0.19.php
+++ b/app/code/Magento/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.18-1.6.0.0.19.php
@@ -41,6 +41,6 @@ if ($attribute) {
$attribute['entity_type_id'],
$attribute['attribute_id'],
'frontend_input_renderer',
- 'Magento\Adminhtml\Block\Catalog\Product\Helper\Form\BaseImage'
+ 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\BaseImage'
);
}
diff --git a/app/code/Magento/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.19-1.6.0.0.20.php b/app/code/Magento/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.19-1.6.0.0.20.php
index cab6dec8186..9c54a20d258 100644
--- a/app/code/Magento/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.19-1.6.0.0.20.php
+++ b/app/code/Magento/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.19-1.6.0.0.20.php
@@ -34,6 +34,6 @@ $this->updateAttribute(
\Magento\Catalog\Model\Product::ENTITY,
'weight',
'frontend_input_renderer',
- 'Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Weight\Renderer'
+ 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight\Renderer'
);
$this->updateAttribute(\Magento\Catalog\Model\Product::ENTITY, 'weight', 'apply_to', implode(',', $applyTo));
diff --git a/app/code/Magento/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.21-1.6.0.0.22.php b/app/code/Magento/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.21-1.6.0.0.22.php
index 32cf87af638..73c88ef62c9 100644
--- a/app/code/Magento/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.21-1.6.0.0.22.php
+++ b/app/code/Magento/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.21-1.6.0.0.22.php
@@ -54,5 +54,5 @@ $this->updateAttribute(
\Magento\Catalog\Model\Product::ENTITY,
'weight',
'frontend_input_renderer',
- 'Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Weight'
+ 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight'
);
diff --git a/app/code/Magento/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.23-1.6.0.0.24.php b/app/code/Magento/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.23-1.6.0.0.24.php
new file mode 100644
index 00000000000..ef08664b264
--- /dev/null
+++ b/app/code/Magento/Catalog/data/catalog_setup/data-upgrade-1.6.0.0.23-1.6.0.0.24.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category Magento
+ * @package Magento_Catalog
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+/** @var $this \Magento\Catalog\Model\Resource\Setup */
+
+$this->updateAttribute(
+ \Magento\Catalog\Model\Product::ENTITY,
+ 'category_ids',
+ 'frontend_input_renderer',
+ 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Category'
+);
+
+$this->updateAttribute(
+ \Magento\Catalog\Model\Product::ENTITY,
+ 'image',
+ 'frontend_input_renderer',
+ 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\BaseImage'
+);
+
+$this->updateAttribute(
+ \Magento\Catalog\Model\Product::ENTITY,
+ 'weight',
+ 'frontend_input_renderer',
+ 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight'
+);
+
+$this->updateAttribute(
+ \Magento\Catalog\Model\Product::ENTITY,
+ 'msrp_enabled',
+ 'frontend_input_renderer',
+ 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Msrp\Enabled'
+);
+
+$this->updateAttribute(
+ \Magento\Catalog\Model\Product::ENTITY,
+ 'msrp_display_actual_price_type',
+ 'frontend_input_renderer',
+ 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Msrp\Price'
+);
+
+$this->updateAttribute(
+ \Magento\Catalog\Model\Category::ENTITY,
+ 'available_sort_by',
+ 'frontend_input_renderer',
+ 'Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby\Available'
+);
+
+$this->updateAttribute(
+ \Magento\Catalog\Model\Category::ENTITY,
+ 'default_sort_by',
+ 'frontend_input_renderer',
+ 'Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby\DefaultSortby'
+);
+
+$this->updateAttribute(
+ \Magento\Catalog\Model\Category::ENTITY,
+ 'filter_price_range',
+ 'frontend_input_renderer',
+ 'Magento\Catalog\Block\Adminhtml\Category\Helper\Pricestep'
+);
diff --git a/app/code/Magento/Catalog/etc/adminhtml/di.xml b/app/code/Magento/Catalog/etc/adminhtml/di.xml
index 317bc373c5f..2b2384435b1 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/di.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/di.xml
@@ -24,6 +24,11 @@
*/
-->
<config>
+ <type name="Magento\Catalog\Controller\Adminhtml\Product\Attribute">
+ <param name="attributeLabelCache">
+ <instance type="Magento\Core\Model\Cache\Type\Translate" />
+ </param>
+ </type>
<type name="Magento\Catalog\Model\Session">
<param name="sessionName">
<value>adminhtml</value>
diff --git a/app/code/Magento/Catalog/etc/adminhtml/menu.xml b/app/code/Magento/Catalog/etc/adminhtml/menu.xml
index c524a045132..e05b83a4b70 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/menu.xml
@@ -28,10 +28,10 @@
<config>
<menu>
<add id="Magento_Catalog::catalog" title="Products" module="Magento_Catalog" sortOrder="20" dependsOnModule="Magento_Catalog" resource="Magento_Catalog::catalog"/>
- <add id="Magento_Catalog::catalog_products" title="Catalog" module="Magento_Catalog" sortOrder="10" parent="Magento_Catalog::inventory" action="adminhtml/catalog_product/" resource="Magento_Catalog::products"/>
- <add id="Magento_Catalog::catalog_categories" title="Categories" module="Magento_Catalog" sortOrder="20" parent="Magento_Catalog::inventory" action="adminhtml/catalog_category/" resource="Magento_Catalog::categories"/>
- <add id="Magento_Catalog::catalog_attributes_attributes" title="Product" module="Magento_Catalog" sortOrder="30" parent="Magento_Adminhtml::stores_attributes" action="adminhtml/catalog_product_attribute/" resource="Magento_Catalog::attributes_attributes"/>
- <add id="Magento_Catalog::catalog_attributes_sets" title="Product Template" module="Magento_Catalog" sortOrder="40" parent="Magento_Adminhtml::stores_attributes" action="adminhtml/catalog_product_set/" resource="Magento_Catalog::sets"/>
+ <add id="Magento_Catalog::catalog_products" title="Catalog" module="Magento_Catalog" sortOrder="10" parent="Magento_Catalog::inventory" action="catalog/product/" resource="Magento_Catalog::products"/>
+ <add id="Magento_Catalog::catalog_categories" title="Categories" module="Magento_Catalog" sortOrder="20" parent="Magento_Catalog::inventory" action="catalog/category/" resource="Magento_Catalog::categories"/>
+ <add id="Magento_Catalog::catalog_attributes_attributes" title="Product" module="Magento_Catalog" sortOrder="30" parent="Magento_Adminhtml::stores_attributes" action="catalog/product_attribute/" resource="Magento_Catalog::attributes_attributes"/>
+ <add id="Magento_Catalog::catalog_attributes_sets" title="Product Template" module="Magento_Catalog" sortOrder="40" parent="Magento_Adminhtml::stores_attributes" action="catalog/product_set/" resource="Magento_Catalog::sets"/>
<add id="Magento_Catalog::catalog_urlrewrite" title="URL Redirects" module="Magento_Catalog" sortOrder="20" parent="Magento_Adminhtml::marketing_seo" action="adminhtml/urlrewrite/index" resource="Magento_Catalog::urlrewrite"/>
</menu>
</config>
diff --git a/app/code/Magento/Catalog/etc/adminhtml/routes.xml b/app/code/Magento/Catalog/etc/adminhtml/routes.xml
new file mode 100644
index 00000000000..33206d6d588
--- /dev/null
+++ b/app/code/Magento/Catalog/etc/adminhtml/routes.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<config>
+ <router id="admin">
+ <route id="catalog" frontName="catalog">
+ <module name="Magento_Catalog_Adminhtml" before="Magento_Adminhtml" />
+ </route>
+ </router>
+</config>
diff --git a/app/code/Magento/Catalog/etc/adminhtml/system.xml b/app/code/Magento/Catalog/etc/adminhtml/system.xml
index 48536e7373f..f2d2bf2d3bf 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/system.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/system.xml
@@ -216,7 +216,7 @@
</field>
<field id="date_fields_order" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Date Fields Order</label>
- <frontend_model>Magento\Adminhtml\Block\Catalog\Form\Renderer\Config\DateFieldsOrder</frontend_model>
+ <frontend_model>Magento\Catalog\Block\Adminhtml\Form\Renderer\Config\DateFieldsOrder</frontend_model>
</field>
<field id="time_format" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Time Format</label>
@@ -225,7 +225,7 @@
<field id="year_range" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Year Range</label>
<comment>Please use a four-digit year format.</comment>
- <frontend_model>Magento\Adminhtml\Block\Catalog\Form\Renderer\Config\YearRange</frontend_model>
+ <frontend_model>Magento\Catalog\Block\Adminhtml\Form\Renderer\Config\YearRange</frontend_model>
</field>
</group>
</section>
diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
index 6ab78d7fa06..037247ce409 100644
--- a/app/code/Magento/Catalog/etc/di.xml
+++ b/app/code/Magento/Catalog/etc/di.xml
@@ -116,4 +116,12 @@
</value>
</param>
</type>
+ <type name="Magento\Catalog\Helper\Product\Compare">
+ <param name="customerSession">
+ <instance type="Magento\Customer\Model\Session\Proxy" />
+ </param>
+ <param name="catalogSession">
+ <instance type="Magento\Catalog\Model\Session\Proxy" />
+ </param>
+ </type>
</config>
diff --git a/app/code/Magento/Catalog/etc/module.xml b/app/code/Magento/Catalog/etc/module.xml
index 02e4ea34c2d..9d7b484d949 100755
--- a/app/code/Magento/Catalog/etc/module.xml
+++ b/app/code/Magento/Catalog/etc/module.xml
@@ -24,7 +24,7 @@
*/
-->
<config>
- <module name="Magento_Catalog" version="1.6.0.0.23" active="true">
+ <module name="Magento_Catalog" version="1.6.0.0.24" active="true">
<sequence>
<module name="Magento_Eav"/>
<module name="Magento_Cms"/>
@@ -51,7 +51,6 @@
<module name="Magento_Adminhtml"/>
<module name="Magento_Directory"/>
<module name="Magento_CatalogRule"/>
- <module name="Magento_Media"/>
<module name="Magento_Sales"/>
<module name="Magento_CatalogSearch"/>
<module name="Magento_Weee"/>
diff --git a/app/code/Magento/Catalog/etc/product_options.xml b/app/code/Magento/Catalog/etc/product_options.xml
index f550935804c..f76c637dd20 100644
--- a/app/code/Magento/Catalog/etc/product_options.xml
+++ b/app/code/Magento/Catalog/etc/product_options.xml
@@ -24,20 +24,20 @@
*/
-->
<config>
- <option name="text" label="Text" renderer="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Type\Text">
+ <option name="text" label="Text" renderer="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Text">
<inputType name="field" label="Field" />
<inputType name="area" label="Area" />
</option>
- <option name="file" label="File" renderer="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Type\File">
+ <option name="file" label="File" renderer="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\File">
<inputType name="file" label="File" />
</option>
- <option name="select" label="Select" renderer="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Type\Select">
+ <option name="select" label="Select" renderer="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Select">
<inputType name="drop_down" label="Drop-down" />
<inputType name="radio" label="Radio Buttons" />
<inputType name="checkbox" label="Checkbox" />
<inputType name="multiple" label="Multiple Select" />
</option>
- <option name="date" label="Date" renderer="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Type\Date">
+ <option name="date" label="Date" renderer="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Date">
<inputType name="date" label="Date" />
<inputType name="date_time" label="Date & Time" />
<inputType name="time" label="Time" />
diff --git a/app/code/Magento/Catalog/etc/widget.xml b/app/code/Magento/Catalog/etc/widget.xml
index ba77be07588..d5c0cff8ac0 100644
--- a/app/code/Magento/Catalog/etc/widget.xml
+++ b/app/code/Magento/Catalog/etc/widget.xml
@@ -111,7 +111,7 @@
<parameters>
<parameter name="id_path" xsi:type="block" visible="true" required="true" sort_order="10">
<label translate="true">Product</label>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Widget\Chooser">
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser">
<data>
<item name="button" xsi:type="array">
<item name="open" xsi:type="string">Select Product...</item>
@@ -150,7 +150,7 @@
<parameters>
<parameter name="id_path" xsi:type="block" visible="true" required="true" sort_order="10">
<label translate="true">Category</label>
- <block class="Magento\Adminhtml\Block\Catalog\Category\Widget\Chooser">
+ <block class="Magento\Catalog\Block\Adminhtml\Category\Widget\Chooser">
<data>
<item name="button" xsi:type="array">
<item name="open" xsi:type="string">Select Category...</item>
diff --git a/app/code/Magento/Catalog/sql/catalog_setup/upgrade-1.6.0.0-1.6.0.0.1.php b/app/code/Magento/Catalog/sql/catalog_setup/upgrade-1.6.0.0-1.6.0.0.1.php
index bf35669f50c..5868dfeb907 100644
--- a/app/code/Magento/Catalog/sql/catalog_setup/upgrade-1.6.0.0-1.6.0.0.1.php
+++ b/app/code/Magento/Catalog/sql/catalog_setup/upgrade-1.6.0.0-1.6.0.0.1.php
@@ -48,7 +48,7 @@ $installer->addAttribute(\Magento\Catalog\Model\Product::ENTITY, 'msrp_enabled',
'user_defined' => false,
'default' => '',
'apply_to' => $productTypes,
- 'input_renderer' => 'Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Msrp\Enabled',
+ 'input_renderer' => 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Msrp\Enabled',
'visible_on_front' => false,
'used_in_product_listing' => true
));
@@ -66,7 +66,7 @@ $installer->addAttribute(\Magento\Catalog\Model\Product::ENTITY, 'msrp_display_a
'user_defined' => false,
'default' => '',
'apply_to' => $productTypes,
- 'input_renderer' => 'Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Msrp\Price',
+ 'input_renderer' => 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Msrp\Price',
'visible_on_front' => false,
'used_in_product_listing' => true
));
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/base-image-uploader.js b/app/code/Magento/Catalog/view/adminhtml/catalog/base-image-uploader.js
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/base-image-uploader.js
rename to app/code/Magento/Catalog/view/adminhtml/catalog/base-image-uploader.js
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/category-selector.css b/app/code/Magento/Catalog/view/adminhtml/catalog/category-selector.css
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/category-selector.css
rename to app/code/Magento/Catalog/view/adminhtml/catalog/category-selector.css
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/category/checkboxes/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/category/checkboxes/tree.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/category/checkboxes/tree.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/category/checkboxes/tree.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/category/edit.js b/app/code/Magento/Catalog/view/adminhtml/catalog/category/edit.js
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/category/edit.js
rename to app/code/Magento/Catalog/view/adminhtml/catalog/category/edit.js
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/category/edit.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/category/edit.phtml
similarity index 99%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/category/edit.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/category/edit.phtml
index 39b487c0a6a..13004c2103f 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/category/edit.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/category/edit.phtml
@@ -26,7 +26,7 @@
?>
<?php
/**
- * Template for \Magento\Adminhtml\Block\Catalog\Category\Cointainer
+ * Template for \Magento\Catalog\Block\Adminhtml\Category\Cointainer
*/
?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/category/edit/form.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/category/edit/form.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/category/edit/form.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/category/edit/form.phtml
index fa4d4e8ce2f..b2cd4aa35a9 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/category/edit/form.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/category/edit/form.phtml
@@ -57,7 +57,7 @@
<script type="text/javascript">
(function($) {
$.mage.extend('categoryForm', 'form',
- '<?php echo $this->getViewFileUrl('Magento_Adminhtml::catalog/category/form.js') ?>');
+ '<?php echo $this->getViewFileUrl('Magento_Catalog::catalog/category/form.js') ?>');
$('#category_edit_form')
.mage('categoryForm', {refreshUrl: '<?php echo $this->getRefreshPathUrl() ?>'})
.mage('validation', {submitHandler: function(form){
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/category/form.js b/app/code/Magento/Catalog/view/adminhtml/catalog/category/form.js
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/category/form.js
rename to app/code/Magento/Catalog/view/adminhtml/catalog/category/form.js
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/category/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/category/tree.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/category/tree.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/category/tree.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/category/widget/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/category/widget/tree.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/category/widget/tree.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/category/widget/tree.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/form/renderer/fieldset/element.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/form/renderer/fieldset/element.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/form/renderer/fieldset/element.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/form/renderer/fieldset/element.phtml
index a1da64df0d0..174af2429ea 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/form/renderer/fieldset/element.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/form/renderer/fieldset/element.phtml
@@ -26,7 +26,7 @@
?>
<?php
/**
- * @see \Magento\Adminhtml\Block\Catalog\Form\Renderer\Fieldset\Element
+ * @see \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element
*/
?>
<?php
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/images/select2.png b/app/code/Magento/Catalog/view/adminhtml/catalog/images/select2.png
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/images/select2.png
rename to app/code/Magento/Catalog/view/adminhtml/catalog/images/select2.png
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/images/select2x2.png b/app/code/Magento/Catalog/view/adminhtml/catalog/images/select2x2.png
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/images/select2x2.png
rename to app/code/Magento/Catalog/view/adminhtml/catalog/images/select2x2.png
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/images/spinner.gif b/app/code/Magento/Catalog/view/adminhtml/catalog/images/spinner.gif
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/images/spinner.gif
rename to app/code/Magento/Catalog/view/adminhtml/catalog/images/spinner.gif
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product-variation.js b/app/code/Magento/Catalog/view/adminhtml/catalog/product-variation.js
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product-variation.js
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product-variation.js
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product.js b/app/code/Magento/Catalog/view/adminhtml/catalog/product.js
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product.js
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product.js
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product.phtml
similarity index 96%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product.phtml
index 7f8b6192005..e98a680fe34 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product.phtml
@@ -26,7 +26,7 @@
?>
<?php
/**
- * @see \Magento\Adminhtml\Block\Catalog\Product
+ * @see \Magento\Catalog\Block\Adminhtml\Product
*/
?>
<?php if( !$this->isSingleStoreMode() ): ?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/attribute/form.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/form.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/attribute/form.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/form.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/attribute/js.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/js.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/attribute/js.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/js.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/attribute/labels.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/labels.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/attribute/labels.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/labels.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/attribute/new/created.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/new/created.phtml
similarity index 96%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/attribute/new/created.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/new/created.phtml
index 451821c2f19..ff117173fa4 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/attribute/new/created.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/new/created.phtml
@@ -23,7 +23,7 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-/** @var $this \Magento\Adminhtml\Block\Catalog\Product\Attribute\NewAttribute\Product\Created */
+/** @var $this \Magento\Catalog\Block\Adminhtml\Product\Attribute\NewAttribute\Product\Created */
?>
<script type="text/javascript">
(function ($) {
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/attribute/options.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/options.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/attribute/options.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/options.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/attribute/set/main.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/set/main.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/attribute/set/main.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/set/main.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/attribute/set/main/tree/attribute.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/set/main/tree/attribute.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/attribute/set/main/tree/attribute.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/set/main/tree/attribute.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/attribute/set/main/tree/group.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/set/main/tree/group.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/attribute/set/main/tree/group.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/set/main/tree/group.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/attribute/set/toolbar/add.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/set/toolbar/add.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/attribute/set/toolbar/add.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/set/toolbar/add.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/attribute/set/toolbar/main.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/set/toolbar/main.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/attribute/set/toolbar/main.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/set/toolbar/main.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/configure.js b/app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/configure.js
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/configure.js
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/configure.js
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/configure.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/configure.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/configure.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/configurable.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/configurable.phtml
similarity index 97%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/configurable.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/configurable.phtml
index 2ff3d515cdc..b0ed1178c64 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/configurable.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/configurable.phtml
@@ -25,7 +25,7 @@
*/
?>
-<?php /* @var $this \Magento\Adminhtml\Block\Catalog\Product\Composite\Fieldset\Configurable */ ?>
+<?php /* @var $this \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Configurable */ ?>
<?php $_product = $this->getProduct(); ?>
<?php $_attributes = $this->helper('Magento\Core\Helper\Data')->decorateArray($this->getAllowAttributes()); ?>
<?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/grouped.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/grouped.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/grouped.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/grouped.phtml
index ef72b54a85a..ee844d9165a 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/grouped.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/grouped.phtml
@@ -25,7 +25,7 @@
*/
?>
-<?php /* @var $this \Magento\Adminhtml\Block\Catalog\Product\Composite\Fieldset\Grouped */ ?>
+<?php /* @var $this \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Grouped */ ?>
<?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
<div id="catalog_product_composite_configure_fields_grouped" class="grid <?php echo $this->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
<h4><?php echo __('Associated Products') ?></h4>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/options.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/options.phtml
similarity index 96%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/options.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/options.phtml
index 7299942e104..fd474b138e1 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/options.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/options.phtml
@@ -25,7 +25,7 @@
*/
?>
-<?php /* @var $this \Magento\Adminhtml\Block\Catalog\Product\Composite\Fieldset\Options */ ?>
+<?php /* @var $this \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options */ ?>
<?php $options = $this->helper('Magento\Core\Helper\Data')->decorateArray($this->getOptions()); ?>
<?php if (count($options)): ?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/options/js.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/options/js.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/options/js.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/options/js.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/options/type/date.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/options/type/date.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/options/type/date.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/options/type/date.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/options/type/default.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/options/type/default.phtml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/options/type/default.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/options/type/default.phtml
index 64ba6837008..bca0be41118 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/options/type/default.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/options/type/default.phtml
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php /* @var $this \Magento\Adminhtml\Block\Catalog\Product\Composite\Fieldset\Options */ ?>
+<?php /* @var $this \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options */ ?>
<?php $option = $this->getOption(); ?>
<div class="field">
<label class="label"><?php echo $this->escapeHtml($option->getTitle()) ?></label>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/options/type/file.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/options/type/file.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/options/type/file.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/options/type/file.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/options/type/select.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/options/type/select.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/options/type/select.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/options/type/select.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/options/type/text.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/options/type/text.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/options/type/text.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/options/type/text.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/qty.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/qty.phtml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/qty.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/qty.phtml
index 4c01289f582..e33320c5c5e 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/fieldset/qty.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/fieldset/qty.phtml
@@ -25,7 +25,7 @@
*/
?>
-<?php /* @var $this \Magento\Adminhtml\Block\Catalog\Product\Composite\Fieldset\Qty */ ?>
+<?php /* @var $this \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Qty */ ?>
<fieldset id="product_composite_configure_fields_qty" class="fieldset <?php echo $this->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
<div class="field">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/created.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/created.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/created.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/created.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit.phtml
similarity index 99%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/edit.phtml
index 26cea73ae9f..6e9f613df6b 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit.phtml
@@ -26,7 +26,7 @@
?>
<?php
/**
- * @var $this \Magento\Adminhtml\Block\Catalog\Product\Edit
+ * @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit
*/
?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/action/attribute.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/action/attribute.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/action/attribute.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/action/attribute.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/action/inventory.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/action/inventory.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/action/inventory.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/action/inventory.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/action/websites.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/action/websites.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/action/websites.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/action/websites.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/attribute_set.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/attribute_set.phtml
similarity index 97%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/attribute_set.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/attribute_set.phtml
index a60d21ad5dd..5eb370347f8 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/attribute_set.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/attribute_set.phtml
@@ -23,7 +23,7 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
- /* @var $this \Magento\Adminhtml\Block\Catalog\Product\Edit\AttributeSet */
+ /* @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\AttributeSet */
?>
<script id="product-template-selector-template" type="text/x-jquery-tmpl">
{{if !term && items.length && !$data.allShown()}}
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/category/new/form.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/category/new/form.phtml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/category/new/form.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/category/new/form.phtml
index 41bd0b9a2c2..72ec8871d08 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/category/new/form.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/category/new/form.phtml
@@ -23,7 +23,7 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-/* @var $this \Magento\Adminhtml\Block\Catalog\Product\Edit\NewCategory */
+/* @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\NewCategory */
?>
<div id="<?php echo $this->getNameInLayout() ?>" style="display:none">
<?php echo $this->getFormHtml();?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/options.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/options.phtml
similarity index 97%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/options.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/options.phtml
index cf556f41de1..70886abf281 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/options.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/options.phtml
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php /** @var $this \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options */ ?>
+<?php /** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options */ ?>
<div class="fieldset-wrapper collapsable-wrapper opened" id="product-custom-options-wrapper">
<div class="fieldset-wrapper-title">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/options/option.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/options/option.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/options/option.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/options/option.phtml
index 57cd2b0afdd..d23b08ebcef 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/options/option.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/options/option.phtml
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php /** @var $this \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Option */ ?>
+<?php /** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Option */ ?>
<?php echo $this->getTemplatesHtml() ?>
<script id="custom-option-base-template" type="text/x-jquery-tmpl">
<div class="fieldset-wrapper collapsable-wrapper opened" id="option_${id}">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/options/type/date.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/options/type/date.phtml
similarity index 97%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/options/type/date.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/options/type/date.phtml
index fa9fbd36e91..d2370005837 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/options/type/date.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/options/type/date.phtml
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php /** @var $this \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Type\Date */ ?>
+<?php /** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Date */ ?>
<script id="custom-option-date-type-template" type="text/x-jquery-tmpl">
<div id="product_option_${option_id}_type_${group}" class="fieldset">
<table class="data-table" cellspacing="0">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/options/type/file.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/options/type/file.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/options/type/file.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/options/type/file.phtml
index 0d9628ef11a..4dd85a962e4 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/options/type/file.phtml
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php /** @var $this \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Type\File */ ?>
+<?php /** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\File */ ?>
<script id="custom-option-file-type-template" type="text/x-jquery-tmpl">
<div id="product_option_${option_id}_type_${group}" class="fieldset">
<table class="data-table" cellspacing="0">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/options/type/select.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/options/type/select.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/options/type/select.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/options/type/select.phtml
index 3572f09582a..07064037fcb 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/options/type/select.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/options/type/select.phtml
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php /** @var $this \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Type\Select */ ?>
+<?php /** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Select */ ?>
<script id="custom-option-select-type-template" type="text/x-jquery-tmpl">
<div id="product_option_${option_id}_type_${group}" class="fieldset">
<table class="data-table">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/options/type/text.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/options/type/text.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/options/type/text.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/options/type/text.phtml
index 89bab4b7816..64d3eb562d9 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/options/type/text.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/options/type/text.phtml
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php /** @var $this \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Type\Text */ ?>
+<?php /** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Text */ ?>
<script id="custom-option-text-type-template" type="text/x-jquery-tmpl">
<div id="product_option_${option_id}_type_${group}" class="fieldset">
<table class="data-table" cellspacing="0">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/price/group.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/price/group.phtml
similarity index 99%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/price/group.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/price/group.phtml
index 1c9920c1de1..7cb368bb0cf 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/price/group.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/price/group.phtml
@@ -25,7 +25,7 @@
*/
?>
<?php
-/** @var $this \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Price\Group */
+/** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Group */
$element = $this->getElement();
$_htmlId = $this->getElement()->getHtmlId();
$_htmlClass = $this->getElement()->getClass();
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/price/tier.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/price/tier.phtml
similarity index 99%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/price/tier.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/price/tier.phtml
index f48b448e1ca..e65adb72e6b 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/price/tier.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/price/tier.phtml
@@ -23,7 +23,7 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-/* @var $this \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Price\Tier */
+/* @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Tier */
$element = $this->getElement();
?>
<?php $_htmlId = $this->getElement()->getHtmlId() ?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/serializer.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/serializer.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/serializer.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/serializer.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/super/attribute-js-template.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/super/attribute-js-template.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/super/attribute-js-template.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/super/attribute-js-template.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/super/attribute-template.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/super/attribute-template.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/super/attribute-template.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/super/attribute-template.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/super/config.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/super/config.phtml
similarity index 99%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/super/config.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/super/config.phtml
index c7a4d99002d..728f907a294 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/super/config.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/super/config.phtml
@@ -23,7 +23,7 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
- /** @var $this \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config */
+ /** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config */
?>
<div class="entry-edit form-inline" id="<?php echo $this->getId() ?>">
<div class="fieldset-wrapper collapsable-wrapper" id="<?php echo $this->getId() ?>-wrapper" data-panel="product-variations">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/super/generator.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/super/generator.phtml
similarity index 96%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/super/generator.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/super/generator.phtml
index d76cb4b9ef7..0416ae481bc 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/super/generator.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/super/generator.phtml
@@ -21,7 +21,7 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-/** @var $this \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config */
+/** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config */
?>
<div data-role="product-variations-generator">
<!-- Configurable Attributes list -->
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/super/matrix.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/super/matrix.phtml
similarity index 99%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/super/matrix.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/super/matrix.phtml
index 0f06fe2c6ea..af54d238e7e 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/super/matrix.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/super/matrix.phtml
@@ -23,7 +23,7 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-/** @var $this \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config\Matrix */
+/** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config\Matrix */
?>
<?php
$variations = $this->getVariations();
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/websites.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/websites.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/edit/websites.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/edit/websites.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/helper/gallery.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/helper/gallery.phtml
similarity index 99%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/helper/gallery.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/helper/gallery.phtml
index 20d81eac308..8589349c5b0 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/helper/gallery.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/helper/gallery.phtml
@@ -23,7 +23,7 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-/** @var $this \Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Gallery\Content */
+/** @var $this \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content */
$elementName = $this->getElement()->getName() . '[images]';
?>
<div id="<?php echo $this->getHtmlId() ?>"
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/js.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/js.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/js.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/js.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/price.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/price.phtml
similarity index 99%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/price.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/price.phtml
index 216d6cc4c4f..35ee008bcf8 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/price.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/price.phtml
@@ -29,7 +29,7 @@
/**
* Template for displaying product price in different places (products grid, product view page etc)
*
- * @var $this \Magento\Adminhtml\Block\Catalog\Product\Price
+ * @var $this \Magento\Catalog\Block\Adminhtml\Product\Price
*/
?>
<?php
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/tab/alert.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/tab/alert.phtml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/tab/alert.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/tab/alert.phtml
index 9a04b738441..2cbc11819db 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/tab/alert.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/tab/alert.phtml
@@ -26,7 +26,7 @@
?>
<?php
/**
- * Template for block \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Alerts
+ * Template for block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Alerts
*/
?>
<div id="alert_messages_block"><?php echo $this->getMessageHtml() ?></div>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/tab/inventory.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/tab/inventory.phtml
similarity index 99%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/tab/inventory.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/tab/inventory.phtml
index ee2cbf2eeed..33b3b4def2b 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/tab/inventory.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/tab/inventory.phtml
@@ -23,7 +23,7 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-/** @var $this \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Inventory */
+/** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Inventory */
?>
<?php if ($this->isReadonly()): ?>
<?php $_readonly = ' disabled="disabled" '; ?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/widget/chooser/container.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/widget/chooser/container.phtml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/product/widget/chooser/container.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/product/widget/chooser/container.phtml
index 350b6aad5bc..55a20ba0052 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/catalog/product/widget/chooser/container.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/widget/chooser/container.phtml
@@ -28,7 +28,7 @@
/**
* Container for product link widget chooser
*
- * @see \Magento\Adminhtml\Block\Catalog\Product\Widget\Chooser\Container
+ * @see \Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser\Container
*/
?>
<div class="columns">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/type-switcher.js b/app/code/Magento/Catalog/view/adminhtml/catalog/type-switcher.js
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/type-switcher.js
rename to app/code/Magento/Catalog/view/adminhtml/catalog/type-switcher.js
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/catalog/wysiwyg/js.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/wysiwyg/js.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/catalog/wysiwyg/js.phtml
rename to app/code/Magento/Catalog/view/adminhtml/catalog/wysiwyg/js.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/ADMINHTML_CATALOG_PRODUCT_COMPOSITE_CONFIGURE.xml b/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE.xml
similarity index 66%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/ADMINHTML_CATALOG_PRODUCT_COMPOSITE_CONFIGURE.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE.xml
index 05e22b5716f..e3ff5b3eb0f 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/ADMINHTML_CATALOG_PRODUCT_COMPOSITE_CONFIGURE.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE.xml
@@ -24,15 +24,15 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Composite\Fieldset" name="product.composite.fieldset" output="1">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Composite\Fieldset\Options" template="catalog/product/composite/fieldset/options.phtml">
- <block class="Magento\Catalog\Block\Product\View\Options\Type\DefaultType" as="default" template="Magento_Adminhtml::catalog/product/composite/fieldset/options/type/default.phtml"/>
- <block class="Magento\Catalog\Block\Product\View\Options\Type\Text" as="text" template="Magento_Adminhtml::catalog/product/composite/fieldset/options/type/text.phtml"/>
- <block class="Magento\Catalog\Block\Product\View\Options\Type\File" as="file" template="Magento_Adminhtml::catalog/product/composite/fieldset/options/type/file.phtml"/>
- <block class="Magento\Catalog\Block\Product\View\Options\Type\Select" as="select" template="Magento_Adminhtml::catalog/product/composite/fieldset/options/type/select.phtml"/>
- <block class="Magento\Catalog\Block\Product\View\Options\Type\Date" as="date" template="Magento_Adminhtml::catalog/product/composite/fieldset/options/type/date.phtml"/>
- <block class="Magento\Core\Block\Template" name="product.composite.fieldset.options.js" as="options_js" template="Magento_Adminhtml::catalog/product/composite/fieldset/options/js.phtml"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset" name="product.composite.fieldset" output="1">
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options" template="catalog/product/composite/fieldset/options.phtml">
+ <block class="Magento\Catalog\Block\Product\View\Options\Type\DefaultType" as="default" template="Magento_Catalog::catalog/product/composite/fieldset/options/type/default.phtml"/>
+ <block class="Magento\Catalog\Block\Product\View\Options\Type\Text" as="text" template="Magento_Catalog::catalog/product/composite/fieldset/options/type/text.phtml"/>
+ <block class="Magento\Catalog\Block\Product\View\Options\Type\File" as="file" template="Magento_Catalog::catalog/product/composite/fieldset/options/type/file.phtml"/>
+ <block class="Magento\Catalog\Block\Product\View\Options\Type\Select" as="select" template="Magento_Catalog::catalog/product/composite/fieldset/options/type/select.phtml"/>
+ <block class="Magento\Catalog\Block\Product\View\Options\Type\Date" as="date" template="Magento_Catalog::catalog/product/composite/fieldset/options/type/date.phtml"/>
+ <block class="Magento\Core\Block\Template" name="product.composite.fieldset.options.js" as="options_js" template="Magento_Catalog::catalog/product/composite/fieldset/options/js.phtml"/>
</block>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Composite\Fieldset\Qty" name="product.composite.fieldset.qty" template="catalog/product/composite/fieldset/qty.phtml"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Qty" name="product.composite.fieldset.qty" template="catalog/product/composite/fieldset/qty.phtml"/>
</block>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/ADMINHTML_CATALOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR.xml b/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/ADMINHTML_CATALOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR.xml
index 6765ce1e880..a730121fe39 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/ADMINHTML_CATALOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_CONFIGURE_ERROR.xml
@@ -24,5 +24,5 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Composite\Error" name="product.composite.error" output="1"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Composite\Error" name="product.composite.error" output="1"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/ADMINHTML_CATALOG_PRODUCT_COMPOSITE_UPDATE_RESULT.xml b/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_UPDATE_RESULT.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/ADMINHTML_CATALOG_PRODUCT_COMPOSITE_UPDATE_RESULT.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_UPDATE_RESULT.xml
index a0ebd1d92a0..f37fedb9070 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/ADMINHTML_CATALOG_PRODUCT_COMPOSITE_UPDATE_RESULT.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/CATALOG_PRODUCT_COMPOSITE_UPDATE_RESULT.xml
@@ -24,5 +24,5 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Composite\Update\Result" name="product.composite.update.result" output="1"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Composite\Update\Result" name="product.composite.update.result" output="1"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_category_edit.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_category_edit.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_category_edit.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_category_edit.xml
index a8c37ec23c7..cc8a9ef12d5 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_category_edit.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_category_edit.xml
@@ -58,12 +58,12 @@
</block>
</referenceBlock>
<referenceContainer name="left">
- <block class="Magento\Adminhtml\Block\Catalog\Category\Tree" name="category.tree" template="catalog/category/tree.phtml"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Category\Tree" name="category.tree" template="catalog/category/tree.phtml"/>
</referenceContainer>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Catalog\Category\Edit" name="category.edit" template="catalog/category/edit.phtml"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Category\Edit" name="category.edit" template="catalog/category/edit.phtml"/>
</referenceContainer>
<referenceContainer name="js">
- <block class="Magento\Core\Block\Template" template="Magento_Adminhtml::catalog/wysiwyg/js.phtml" name="catalog.wysiwyg.js"/>
+ <block class="Magento\Core\Block\Template" template="Magento_Catalog::catalog/wysiwyg/js.phtml" name="catalog.wysiwyg.js"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_action_attribute_edit.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_action_attribute_edit.xml
similarity index 88%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_action_attribute_edit.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_action_attribute_edit.xml
index f7444de152e..dad1febedb8 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_action_attribute_edit.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_action_attribute_edit.xml
@@ -26,10 +26,10 @@
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="left">
<block class="Magento\Backend\Block\Store\Switcher" name="store_switcher" template="store/switcher.phtml"/>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Action\Attribute\Tabs" name="attributes_tabs">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Action\Attribute\Tab\Attributes" name="tab_attributes"/>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Action\Attribute\Tab\Inventory" name="tab_inventory" template="catalog/product/edit/action/inventory.phtml"/>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Action\Attribute\Tab\Websites" name="tab_websites" template="catalog/product/edit/action/websites.phtml"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tabs" name="attributes_tabs">
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tab\Attributes" name="tab_attributes"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tab\Inventory" name="tab_inventory" template="catalog/product/edit/action/inventory.phtml"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tab\Websites" name="tab_websites" template="catalog/product/edit/action/websites.phtml"/>
<action method="addTab">
<argument name="name" xsi:type="string">attributes</argument>
<argument name="block" xsi:type="string">tab_attributes</argument>
@@ -45,6 +45,6 @@
</block>
</referenceContainer>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Action\Attribute" name="attribute" template="catalog/product/edit/action/attribute.phtml"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute" name="attribute" template="catalog/product/edit/action/attribute.phtml"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_alertspricegrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertspricegrid.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_alertspricegrid.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertspricegrid.xml
index ac43d951c5a..7f607bf99cc 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_alertspricegrid.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertspricegrid.xml
@@ -24,5 +24,5 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Alerts\Price" name="admin.product.edit.tab.alerts.price" output="1"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Alerts\Price" name="admin.product.edit.tab.alerts.price" output="1"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_alertsstockgrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertsstockgrid.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_alertsstockgrid.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertsstockgrid.xml
index 95983403151..03d622c9942 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_alertsstockgrid.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_alertsstockgrid.xml
@@ -24,5 +24,5 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Alerts\Stock" name="admin.product.edit.tab.alerts.stock" output="1"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Alerts\Stock" name="admin.product.edit.tab.alerts.stock" output="1"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_attribute_edit.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit.xml
similarity index 81%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_attribute_edit.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit.xml
index 4ded29d0536..c727fe8839b 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_attribute_edit.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit.xml
@@ -25,20 +25,20 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="left">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Attribute\Edit\Tabs" name="attribute_edit_tabs">
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tabs" name="attribute_edit_tabs">
<container label="Main" name="main">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Attribute\Edit\Tab\Main" as="base"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Main" as="base"/>
<block class="Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Options" as="advanced"/>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Attribute\Edit\Tab\Advanced" as="options"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Advanced" as="options"/>
</container>
<block class="Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Labels" as="labels"/>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Attribute\Edit\Tab\Front" as="front"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Front" as="front"/>
</block>
</referenceContainer>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Attribute\Edit" name="attribute_edit_content"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit" name="attribute_edit_content"/>
</referenceContainer>
<referenceContainer name="js">
- <block class="Magento\Adminhtml\Block\Template" name="attribute_edit_js" template="catalog/product/attribute/js.phtml"/>
+ <block class="Magento\Adminhtml\Block\Template" name="attribute_edit_js" template="Magento_Catalog::catalog/product/attribute/js.phtml"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_attribute_edit_popup.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit_popup.xml
similarity index 86%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_attribute_edit_popup.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit_popup.xml
index 254ada2b332..ac4bdaca942 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_attribute_edit_popup.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit_popup.xml
@@ -27,14 +27,14 @@
<remove name="left"/>
<referenceBlock name="attribute_edit_content">
<arguments>
- <argument name="template" xsi:type="string">Magento_Adminhtml::catalog/product/attribute/form.phtml</argument>
+ <argument name="template" xsi:type="string">Magento_Catalog::catalog/product/attribute/form.phtml</argument>
</arguments>
<container name="form" label="Form">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Attribute\Edit\Tab\Main" as="main"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Main" as="main"/>
<block class="Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Options" as="advanced-options"/>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Attribute\Edit\Tab\Advanced" as="options"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Advanced" as="options"/>
<block class="Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Labels" as="labels"/>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Attribute\Edit\Tab\Front" as="front-options"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Front" as="front-options"/>
</container>
</referenceBlock>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_configurable.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_configurable.xml
similarity index 60%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_configurable.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_configurable.xml
index 7a427c085e8..c6ec3494e61 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_configurable.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_configurable.xml
@@ -24,13 +24,13 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_catalog_product_superconfig_config"/>
+ <update handle="catalog_product_superconfig_config"/>
<referenceBlock name="product_tabs">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config" name="admin.product.edit.tab.super.config.grid.container">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config" template="Magento_Adminhtml::catalog/product/edit/super/generator.phtml" name="product-variations-generator" as="generator">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config" template="Magento_Adminhtml::catalog/product/edit/super/attribute-js-template.phtml" as="template"/>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config\Attribute" template="Magento_Adminhtml::catalog/product/edit/super/attribute-template.phtml" as="attribute-renderer"/>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config\Matrix" template="Magento_Adminhtml::catalog/product/edit/super/matrix.phtml" as="matrix"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config" name="admin.product.edit.tab.super.config.grid.container">
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config" template="Magento_Catalog::catalog/product/edit/super/generator.phtml" name="product-variations-generator" as="generator">
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config" template="Magento_Catalog::catalog/product/edit/super/attribute-js-template.phtml" as="template"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config\Attribute" template="Magento_Catalog::catalog/product/edit/super/attribute-template.phtml" as="attribute-renderer"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config\Matrix" template="Magento_Catalog::catalog/product/edit/super/matrix.phtml" as="matrix"/>
</block>
</block>
<action method="addTab">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_configurable_new.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_configurable_new.xml
similarity index 60%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_configurable_new.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_configurable_new.xml
index 7a427c085e8..c6ec3494e61 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_configurable_new.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_configurable_new.xml
@@ -24,13 +24,13 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_catalog_product_superconfig_config"/>
+ <update handle="catalog_product_superconfig_config"/>
<referenceBlock name="product_tabs">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config" name="admin.product.edit.tab.super.config.grid.container">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config" template="Magento_Adminhtml::catalog/product/edit/super/generator.phtml" name="product-variations-generator" as="generator">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config" template="Magento_Adminhtml::catalog/product/edit/super/attribute-js-template.phtml" as="template"/>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config\Attribute" template="Magento_Adminhtml::catalog/product/edit/super/attribute-template.phtml" as="attribute-renderer"/>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config\Matrix" template="Magento_Adminhtml::catalog/product/edit/super/matrix.phtml" as="matrix"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config" name="admin.product.edit.tab.super.config.grid.container">
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config" template="Magento_Catalog::catalog/product/edit/super/generator.phtml" name="product-variations-generator" as="generator">
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config" template="Magento_Catalog::catalog/product/edit/super/attribute-js-template.phtml" as="template"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config\Attribute" template="Magento_Catalog::catalog/product/edit/super/attribute-template.phtml" as="attribute-renderer"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config\Matrix" template="Magento_Catalog::catalog/product/edit/super/matrix.phtml" as="matrix"/>
</block>
</block>
<action method="addTab">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_crosssell.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml
similarity index 96%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_crosssell.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml
index ccad45b9599..10edc0b1511 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_crosssell.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssell.xml
@@ -25,7 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<container name="root" label="Root" output="1">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Crosssell" name="catalog.product.edit.tab.crosssell"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Crosssell" name="catalog.product.edit.tab.crosssell"/>
<block class="Magento\Adminhtml\Block\Widget\Grid\Serializer" name="crosssell_grid_serializer">
<arguments>
<argument name="input_names" xsi:type="string">position</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_crosssellgrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssellgrid.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_crosssellgrid.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssellgrid.xml
index 66bc18ba7dc..7c9efe94c01 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_crosssellgrid.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_crosssellgrid.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<container name="root" label="Root" output="1">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Crosssell" name="catalog.product.edit.tab.crosssell"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Crosssell" name="catalog.product.edit.tab.crosssell"/>
</container>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_customoptions.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_customoptions.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_customoptions.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_customoptions.xml
index b1cbd13525f..1cce401b1fe 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_customoptions.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_customoptions.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<container name="root" label="Root" output="1">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Options\Ajax" name="catalog.product.import.custom.options"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Options\Ajax" name="catalog.product.import.custom.options"/>
</container>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_edit.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_edit.xml
similarity index 96%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_edit.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_edit.xml
index 8998937dbc5..36e67319f7c 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_edit.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_edit.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_catalog_product_new"/>
+ <update handle="catalog_product_new"/>
<referenceBlock name="page-title">
<block class="Magento\Backend\Block\Store\Switcher" name="store_switcher">
<action method="setUseConfirm">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_generatevariations.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_generatevariations.xml
similarity index 58%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_generatevariations.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_generatevariations.xml
index cbed7ce8a24..bcd433ee664 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_generatevariations.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_generatevariations.xml
@@ -25,10 +25,10 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<container name="root" label="Root" output="1">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config" template="Magento_Adminhtml::catalog/product/edit/super/generator.phtml" name="product-variations-generator" as="generator">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config" template="Magento_Adminhtml::catalog/product/edit/super/attribute-js-template.phtml" as="template"/>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config\Attribute" template="Magento_Adminhtml::catalog/product/edit/super/attribute-template.phtml" as="attribute-renderer"/>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config\Matrix" template="Magento_Adminhtml::catalog/product/edit/super/matrix.phtml" as="matrix"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config" template="Magento_Catalog::catalog/product/edit/super/generator.phtml" name="product-variations-generator" as="generator">
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config" template="Magento_Catalog::catalog/product/edit/super/attribute-js-template.phtml" as="template"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config\Attribute" template="Magento_Catalog::catalog/product/edit/super/attribute-template.phtml" as="attribute-renderer"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config\Matrix" template="Magento_Catalog::catalog/product/edit/super/matrix.phtml" as="matrix"/>
</block>
</container>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_grid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grid.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_grid.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grid.xml
index b54c0599dd4..8e5e1ff36c2 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_grid.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grid.xml
@@ -26,6 +26,6 @@
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<update handle="formkey"/>
<container name="root" label="Root" output="1">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Grid" name="admin.product.grid"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Grid" name="admin.product.grid"/>
</container>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_grouped.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grouped.xml
similarity index 96%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_grouped.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grouped.xml
index 4a2e061b53a..ad8fc3e54c5 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_grouped.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grouped.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_catalog_product_grouped_grid_popup"/>
+ <update handle="catalog_product_grouped_grid_popup"/>
<referenceBlock name="product_tabs">
<block class="Magento\Catalog\Block\Product\Grouped\AssociatedProducts" name="catalog.product.edit.grouped.container" template="Magento_Catalog::product/grouped/container.phtml">
<block class="Magento\Core\Block\Template" name="catalog.product.edit.tab.super.container" template="Magento_Catalog::product/grouped/grouped.phtml">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_grouped_grid_popup.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grouped_grid_popup.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_grouped_grid_popup.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_grouped_grid_popup.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_index.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml
similarity index 96%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_index.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml
index d6f4694cddb..c6860ec0827 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_index.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml
@@ -40,6 +40,6 @@
</action>
</referenceBlock>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Catalog\Product" name="products_list"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product" name="products_list"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_new.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_new.xml
similarity index 89%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_new.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_new.xml
index 6024b65ec60..9f2bb088b3b 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_new.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_new.xml
@@ -63,7 +63,7 @@
</block>
<block class="Magento\Page\Block\Html\Head\Css" name="magento-adminhtml-catalog-category-selector-css">
<arguments>
- <argument name="file" xsi:type="string">Magento_Adminhtml::catalog/category-selector.css</argument>
+ <argument name="file" xsi:type="string">Magento_Catalog::catalog/category-selector.css</argument>
</arguments>
</block>
<block class="Magento\Page\Block\Html\Head\Script" name="jquery-jstree-jquery-hotkeys-js">
@@ -78,17 +78,17 @@
</block>
<block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-catalog-type-switcher-js">
<arguments>
- <argument name="file" xsi:type="string">Magento_Adminhtml::catalog/type-switcher.js</argument>
+ <argument name="file" xsi:type="string">Magento_Catalog::catalog/type-switcher.js</argument>
</arguments>
</block>
<block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-catalog-product-variation-js">
<arguments>
- <argument name="file" xsi:type="string">Magento_Adminhtml::catalog/product-variation.js</argument>
+ <argument name="file" xsi:type="string">Magento_Catalog::catalog/product-variation.js</argument>
</arguments>
</block>
<block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-catalog-base-image-uploader-js">
<arguments>
- <argument name="file" xsi:type="string">Magento_Adminhtml::catalog/base-image-uploader.js</argument>
+ <argument name="file" xsi:type="string">Magento_Catalog::catalog/base-image-uploader.js</argument>
</arguments>
</block>
<block class="Magento\Page\Block\Html\Head\Script" name="magento-catalog-js-product-gallery-js">
@@ -113,20 +113,20 @@
</block>
</referenceBlock>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit" name="product_edit">
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit" name="product_edit">
<container name="product-type-tabs" label="Tabs">
</container>
</block>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\AttributeSet" name="attribute-set-info" template="Magento_Adminhtml::catalog/product/edit/attribute_set.phtml"/>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\NewCategory" name="new-category" template="Magento_Adminhtml::catalog/product/edit/category/new/form.phtml"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\AttributeSet" name="attribute-set-info" template="Magento_Catalog::catalog/product/edit/attribute_set.phtml"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\NewCategory" name="new-category" template="Magento_Catalog::catalog/product/edit/category/new/form.phtml"/>
<block class="Magento\Core\Block\Template" name="affected-attribute-set-form" template="Magento_Catalog::product/configurable/affected-attribute-set-selector/form.phtml"/>
</referenceContainer>
<referenceContainer name="left">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tabs" name="product_tabs"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs" name="product_tabs"/>
</referenceContainer>
<referenceContainer name="js">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Js" name="catalog_product_js" template="catalog/product/js.phtml"/>
- <block class="Magento\Core\Block\Template" template="Magento_Adminhtml::catalog/wysiwyg/js.phtml"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Js" name="catalog_product_js" template="catalog/product/js.phtml"/>
+ <block class="Magento\Core\Block\Template" template="Magento_Catalog::catalog/wysiwyg/js.phtml"/>
<block class="Magento\Catalog\Block\Product\Configurable\AttributeSelector" template="Magento_Catalog::product/configurable/attribute-selector/js.phtml"/>
<block class="Magento\Catalog\Block\Product\Configurable\AttributeSelector" template="Magento_Catalog::product/configurable/affected-attribute-set-selector/js.phtml"/>
</referenceContainer>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_options.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_options.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_options.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_options.xml
index a6b0d4fea99..8897477f99b 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_options.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_options.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<container name="root" label="Root" output="1">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options" name="admin.product.options"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options" name="admin.product.options"/>
</container>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_optionsimportgrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_optionsimportgrid.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_optionsimportgrid.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_optionsimportgrid.xml
index 58449ea4846..06bbc52ee9e 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_optionsimportgrid.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_optionsimportgrid.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<container name="root" label="Root" output="1">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Popup\Grid" name="catalog.product.import.custom.options"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Popup\Grid" name="catalog.product.import.custom.options"/>
</container>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_related.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_related.xml
similarity index 96%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_related.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_related.xml
index c1f24145bd8..6f867353d45 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_related.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_related.xml
@@ -25,7 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<container name="root" label="Root" output="1">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Related" name="catalog.product.edit.tab.related"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Related" name="catalog.product.edit.tab.related"/>
<block class="Magento\Adminhtml\Block\Widget\Grid\Serializer" name="related_grid_serializer">
<arguments>
<argument name="input_names" xsi:type="string">position</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_relatedgrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_relatedgrid.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_relatedgrid.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_relatedgrid.xml
index 1daccfb18f2..de2f9d7b699 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_relatedgrid.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_relatedgrid.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<container name="root" label="Root" output="1">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Related" name="catalog.product.edit.tab.related"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Related" name="catalog.product.edit.tab.related"/>
</container>
</layout>
diff --git a/app/code/Magento/Centinel/view/adminhtml/layout/adminhtml_sales_order_create_start.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_review_edit.xml
similarity index 94%
rename from app/code/Magento/Centinel/view/adminhtml/layout/adminhtml_sales_order_create_start.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_review_edit.xml
index 3d581b90c38..74e8da46ef6 100644
--- a/app/code/Magento/Centinel/view/adminhtml/layout/adminhtml_sales_order_create_start.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_review_edit.xml
@@ -24,5 +24,5 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_sales_order_create_index"/>
+ <update handle="catalog_product_review_new"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_review_new.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_review_new.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_review_new.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_review_new.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_reviews.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_reviews.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_reviews.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_reviews.xml
index 29661f9f184..46936e8f709 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_reviews.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_reviews.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<container name="root" label="Root" output="1">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Reviews" name="admin.product.reviews"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Reviews" name="admin.product.reviews"/>
</container>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_set_block.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_block.xml
similarity index 97%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_set_block.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_block.xml
index 86d07fd0193..9f1c6a030b8 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_set_block.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_block.xml
@@ -37,7 +37,7 @@
<arguments>
<argument name="id" xsi:type="string">setGrid</argument>
<argument name="rowUrl" xsi:type="array">
- <item name="path" xsi:type="string">*/*/edit</item>
+ <item name="path" xsi:type="string">catalog/*/edit</item>
<item name="extraParamsTemplate" xsi:type="array">
<item name="id" xsi:type="string">getAttributeSetId</item>
</item>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_set_index.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_index.xml
similarity index 90%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_set_index.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_index.xml
index 26e79016218..8f8cecf8dcb 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_set_index.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_set_index.xml
@@ -25,8 +25,8 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<update handle="formkey"/>
- <update handle="adminhtml_catalog_product_set_block"/>
+ <update handle="catalog_product_set_block"/>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Attribute\Set\Toolbar\Main" name="adminhtml.catalog.product.set.container"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Toolbar\Main" name="adminhtml.catalog.product.set.container"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_simple.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_simple.xml
similarity index 60%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_simple.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_simple.xml
index 7a427c085e8..c6ec3494e61 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_simple.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_simple.xml
@@ -24,13 +24,13 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_catalog_product_superconfig_config"/>
+ <update handle="catalog_product_superconfig_config"/>
<referenceBlock name="product_tabs">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config" name="admin.product.edit.tab.super.config.grid.container">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config" template="Magento_Adminhtml::catalog/product/edit/super/generator.phtml" name="product-variations-generator" as="generator">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config" template="Magento_Adminhtml::catalog/product/edit/super/attribute-js-template.phtml" as="template"/>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config\Attribute" template="Magento_Adminhtml::catalog/product/edit/super/attribute-template.phtml" as="attribute-renderer"/>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config\Matrix" template="Magento_Adminhtml::catalog/product/edit/super/matrix.phtml" as="matrix"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config" name="admin.product.edit.tab.super.config.grid.container">
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config" template="Magento_Catalog::catalog/product/edit/super/generator.phtml" name="product-variations-generator" as="generator">
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config" template="Magento_Catalog::catalog/product/edit/super/attribute-js-template.phtml" as="template"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config\Attribute" template="Magento_Catalog::catalog/product/edit/super/attribute-template.phtml" as="attribute-renderer"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config\Matrix" template="Magento_Catalog::catalog/product/edit/super/matrix.phtml" as="matrix"/>
</block>
</block>
<action method="addTab">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_superconfig.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_superconfig.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_superconfig.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_superconfig.xml
index 8335c731f22..4686338ba7b 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_superconfig.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_superconfig.xml
@@ -24,6 +24,6 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_catalog_product_superconfig_config"/>
+ <update handle="catalog_product_superconfig_config"/>
<block class="Magento\Backend\Block\Widget\Grid\Container" name="admin.product.edit.tab.super.config.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml" output="1"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_superconfig_config.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_superconfig_config.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_superconfig_config.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_superconfig_config.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_supergroup.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_supergroup.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_supergroup.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_supergroup.xml
index b886537e75e..b43db1d1345 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_supergroup.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_supergroup.xml
@@ -24,6 +24,6 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_catalog_product_grouped"/>
+ <update handle="catalog_product_grouped"/>
<container output="1" name="catalog.product.edit.tab.super.grid.container" label="grid"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_supergrouppopup.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_supergrouppopup.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_supergrouppopup.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_supergrouppopup.xml
index 87e94cb87d6..0221a23b482 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_supergrouppopup.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_supergrouppopup.xml
@@ -24,6 +24,6 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_catalog_product_grouped"/>
+ <update handle="catalog_product_grouped"/>
<block class="Magento\Backend\Block\Widget\Grid\Container" name="catalog.product.edit.tab.super.grid.popup.container" template="Magento_Backend::widget/grid/container/empty.phtml" output="1"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_upsell.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsell.xml
similarity index 96%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_upsell.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsell.xml
index 094694e1504..1e6e631b560 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_upsell.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsell.xml
@@ -25,7 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<container name="root" label="Root" output="1">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Upsell" name="catalog.product.edit.tab.upsell"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Upsell" name="catalog.product.edit.tab.upsell"/>
<block class="Magento\Adminhtml\Block\Widget\Grid\Serializer" name="upsell_grid_serializer">
<arguments>
<argument name="input_names" xsi:type="string">position</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_upsellgrid.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsellgrid.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_upsellgrid.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsellgrid.xml
index e10cf2bce52..b6ec91b6f32 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_upsellgrid.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_upsellgrid.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<container name="root" label="Root" output="1">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Upsell" name="catalog.product.edit.tab.upsell"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Upsell" name="catalog.product.edit.tab.upsell"/>
</container>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/catalog_product_view_type_configurable.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_view_type_configurable.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/catalog_product_view_type_configurable.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_view_type_configurable.xml
index 2f70582a0b2..cc14a8bdeb0 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/catalog_product_view_type_configurable.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_view_type_configurable.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="product.composite.fieldset">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Composite\Fieldset\Configurable" name="product.composite.fieldset.configurable" before="product.composite.fieldset.options" template="catalog/product/composite/fieldset/configurable.phtml"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Configurable" name="product.composite.fieldset.configurable" before="product.composite.fieldset.options" template="catalog/product/composite/fieldset/configurable.phtml"/>
</referenceBlock>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/catalog_product_view_type_grouped.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_view_type_grouped.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/catalog_product_view_type_grouped.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_view_type_grouped.xml
index 5a5eb407729..36a170b558b 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/catalog_product_view_type_grouped.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_view_type_grouped.xml
@@ -25,7 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="product.composite.fieldset">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Composite\Fieldset\Grouped" name="product.composite.fieldset.grouped" before="product.composite.fieldset.options" template="catalog/product/composite/fieldset/grouped.phtml"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Grouped" name="product.composite.fieldset.grouped" before="product.composite.fieldset.options" template="catalog/product/composite/fieldset/grouped.phtml"/>
<remove name="product.composite.fieldset.qty"/>
</referenceBlock>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_virtual.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_virtual.xml
similarity index 60%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_virtual.xml
rename to app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_virtual.xml
index 7a427c085e8..c6ec3494e61 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_virtual.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_virtual.xml
@@ -24,13 +24,13 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_catalog_product_superconfig_config"/>
+ <update handle="catalog_product_superconfig_config"/>
<referenceBlock name="product_tabs">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config" name="admin.product.edit.tab.super.config.grid.container">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config" template="Magento_Adminhtml::catalog/product/edit/super/generator.phtml" name="product-variations-generator" as="generator">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config" template="Magento_Adminhtml::catalog/product/edit/super/attribute-js-template.phtml" as="template"/>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config\Attribute" template="Magento_Adminhtml::catalog/product/edit/super/attribute-template.phtml" as="attribute-renderer"/>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config\Matrix" template="Magento_Adminhtml::catalog/product/edit/super/matrix.phtml" as="matrix"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config" name="admin.product.edit.tab.super.config.grid.container">
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config" template="Magento_Catalog::catalog/product/edit/super/generator.phtml" name="product-variations-generator" as="generator">
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config" template="Magento_Catalog::catalog/product/edit/super/attribute-js-template.phtml" as="template"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config\Attribute" template="Magento_Catalog::catalog/product/edit/super/attribute-template.phtml" as="attribute-renderer"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config\Matrix" template="Magento_Catalog::catalog/product/edit/super/matrix.phtml" as="matrix"/>
</block>
</block>
<action method="addTab">
diff --git a/app/code/Magento/Catalog/view/adminhtml/product/edit/attribute/search.phtml b/app/code/Magento/Catalog/view/adminhtml/product/edit/attribute/search.phtml
index eb9a78639a1..efe816ce793 100644
--- a/app/code/Magento/Catalog/view/adminhtml/product/edit/attribute/search.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/product/edit/attribute/search.phtml
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-/** @var $this \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Attributes\Search */
+/** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes\Search */
?>
<div id="product-attribute-search-container" class="suggest-expandable attribute-selector">
<div class="actions-split">
diff --git a/app/code/Magento/Catalog/view/adminhtml/product/edit/tabs.phtml b/app/code/Magento/Catalog/view/adminhtml/product/edit/tabs.phtml
index 962d6b9487b..44d168e9e47 100644
--- a/app/code/Magento/Catalog/view/adminhtml/product/edit/tabs.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/product/edit/tabs.phtml
@@ -24,12 +24,12 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-/** @var $this \Magento\Adminhtml\Block\Catalog\Product\Edit\Tabs */
+/** @var $this \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs */
?>
<?php if (!empty($tabs)): ?>
<?php $tabGroups = array(
- \Magento\Adminhtml\Block\Catalog\Product\Edit\Tabs::BASIC_TAB_GROUP_CODE,
- \Magento\Adminhtml\Block\Catalog\Product\Edit\Tabs::ADVANCED_TAB_GROUP_CODE
+ \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs::BASIC_TAB_GROUP_CODE,
+ \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs::ADVANCED_TAB_GROUP_CODE
);?>
<div id="<?php echo $this->getId() ?>"
data-mage-init="{tabs:{
@@ -42,7 +42,7 @@
}}">
<?php foreach ($tabGroups as $tabGroupCode): ?>
<?php $tabGroupId = $this->getId() . '-' . $tabGroupCode; ?>
- <?php $isBasic = $tabGroupCode == \Magento\Adminhtml\Block\Catalog\Product\Edit\Tabs::BASIC_TAB_GROUP_CODE; ?>
+ <?php $isBasic = $tabGroupCode == \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs::BASIC_TAB_GROUP_CODE; ?>
<div id="<?php echo $tabGroupId ?>"
<?php if (!$isBasic): ?>
data-mage-init="{accordion: {active: <?php echo $this->isAdvancedTabGroupActive() ? '0' : 'false' ?>, collapsible: true}}"
diff --git a/app/code/Magento/Catalog/view/adminhtml/product/product.css b/app/code/Magento/Catalog/view/adminhtml/product/product.css
index ec3318df617..f0c9fcaa03d 100644
--- a/app/code/Magento/Catalog/view/adminhtml/product/product.css
+++ b/app/code/Magento/Catalog/view/adminhtml/product/product.css
@@ -24,9 +24,9 @@
*/
/* Action "Back" as cross */
-[class^=" adminhtml-catalog-product-"] .page-actions .action-back,
-[class^=" adminhtml-catalog-product-"] .page-actions .action-back:hover,
-[class^=" adminhtml-catalog-product-"] .page-actions .action-back:active,
+[class^=" catalog-product-"] .page-actions .action-back,
+[class^=" catalog-product-"] .page-actions .action-back:hover,
+[class^=" catalog-product-"] .page-actions .action-back:active,
[class^=" adminhtml-newsletter-"] .page-actions .action-back,
[class^=" adminhtml-newsletter-"] .page-actions .action-back:hover,
[class^=" adminhtml-newsletter-"] .page-actions .action-back:active {
@@ -36,17 +36,17 @@
color: #7a7976;;
}
-[class^=" adminhtml-catalog-product-"] .page-actions .action-back:hover,
+[class^=" catalog-product-"] .page-actions .action-back:hover,
[class^=" adminhtml-newsletter-"] .page-actions .action-back:hover {
color: #000;
}
-[class^=" adminhtml-catalog-product-"] .page-actions .action-back.mage-error,
+[class^=" catalog-product-"] .page-actions .action-back.mage-error,
[class^=" adminhtml-newsletter-"] .page-actions .action-back.mage-error {
color: #b57c72;
}
-[class^=" adminhtml-catalog-product-"] .page-actions .action-back:before,
+[class^=" catalog-product-"] .page-actions .action-back:before,
[class^=" adminhtml-newsletter-"] .page-actions .action-back:before {
display: inline-block;
font-family: 'MUI-Icons';
@@ -58,7 +58,7 @@
font-size: 16px;
}
-[class^=" adminhtml-catalog-product-"] .page-actions .action-back span,
+[class^=" catalog-product-"] .page-actions .action-back span,
[class^=" adminhtml-newsletter-"] .page-actions .action-back span {
display: inline-block;
overflow: hidden;
diff --git a/app/code/Magento/Catalog/view/frontend/category/view.phtml b/app/code/Magento/Catalog/view/frontend/category/view.phtml
index 874725d6f45..d576070d0a4 100644
--- a/app/code/Magento/Catalog/view/frontend/category/view.phtml
+++ b/app/code/Magento/Catalog/view/frontend/category/view.phtml
@@ -41,9 +41,6 @@
}
?>
<div class="page-title category-title">
- <?php if($this->isRssCatalogEnable() && $this->isTopCategory()): ?>
- <a href="<?php echo $this->getRssLink() ?>" class="link-rss"><?php echo __('Subscribe to RSS Feed') ?></a>
- <?php endif; ?>
<h1><?php echo $_helper->categoryAttribute($_category, $_category->getName(), 'name') ?></h1>
</div>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml
index b50c4bee0f1..0ec9847e783 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml
+++ b/app/code/Magento/Catalog/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Category" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Category" type="page">
<referenceContainer name="content">
<block class="Magento\Catalog\Block\Category\View" name="category.products" template="category/view.phtml">
<block class="Magento\Catalog\Block\Product\ListProduct" name="product_list" template="product/list.phtml">
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default.xml
index efd946d7d20..bb87f9a9785 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Non Anchor Catalog Category" type="page" parent="catalog_category_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Non Anchor Catalog Category" type="page">
<referenceContainer name="left">
<block class="Magento\Catalog\Block\Navigation" name="catalog.leftnav" after="currency" template="navigation/left.phtml"/>
</referenceContainer>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default_without_children.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default_without_children.xml
index b28b85038d1..111d382fc00 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default_without_children.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_default_without_children.xml
@@ -23,4 +23,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Non Anchor Catalog Category Without Subcategories" type="page" parent="catalog_category_view_type_default"/>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Non Anchor Catalog Category Without Subcategories" type="page"/>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_layered.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_layered.xml
index 92c0fd54538..d5fa2348805 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_layered.xml
+++ b/app/code/Magento/Catalog/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Anchor Catalog Category" type="page" parent="catalog_category_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Anchor Catalog Category" type="page">
<referenceContainer name="left">
<block class="Magento\Catalog\Block\Layer\View" name="catalog.leftnav" after="currency" template="layer/view.phtml"/>
</referenceContainer>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_layered_without_children.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_layered_without_children.xml
index f229ce4ec3b..12dc103d248 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_category_view_type_layered_without_children.xml
+++ b/app/code/Magento/Catalog/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Anchor Catalog Category Without Subcategories" type="page" parent="catalog_category_view_type_layered"/>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Anchor Catalog Category Without Subcategories" type="page"/>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_compare_index.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_compare_index.xml
index 1ef9c490c22..dc997ea0fc8 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_compare_index.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_compare_index.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product Compare List" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product Compare List" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">popup.phtml</argument>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_gallery.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_gallery.xml
index 38bd4b78217..d283fc501a3 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_gallery.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_gallery.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product Image Gallery Popup" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product Image Gallery Popup" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">popup.phtml</argument>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
index 7303b6ae2fe..1eb77704550 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
+++ b/app/code/Magento/Catalog/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Any)" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Any)" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">2columns-right.phtml</argument>
@@ -52,18 +52,12 @@
</action>
</block>
<block class="Magento\Catalog\Block\Product\View\Additional" name="product.info.additional" as="product_additional_data"/>
- <block class="Magento\Catalog\Block\Product\View\Description" name="product.description" as="description" template="product/view/description.phtml">
- <action method="addToParentGroup">
- <argument name="group" xsi:type="string">detailed_info</argument>
- </action>
+ <block class="Magento\Catalog\Block\Product\View\Description" name="product.description" as="description" template="product/view/description.phtml" group="detailed_info">
<action method="setTitle">
<argument translate="true" name="value" xsi:type="string">Details</argument>
</action>
</block>
- <block class="Magento\Catalog\Block\Product\View\Attributes" name="product.attributes" as="additional" template="product/view/attributes.phtml">
- <action method="addToParentGroup">
- <argument name="group" xsi:type="string">detailed_info</argument>
- </action>
+ <block class="Magento\Catalog\Block\Product\View\Attributes" name="product.attributes" as="additional" template="product/view/attributes.phtml" group="detailed_info">
<action method="setTitle">
<argument translate="true" name="value" xsi:type="string">Additional Information</argument>
</action>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_configurable.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_configurable.xml
index 2237ca32654..ca9becdfdc7 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_configurable.xml
+++ b/app/code/Magento/Catalog/view/frontend/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Configurable)" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Configurable)" type="page">
<referenceBlock name="product.info">
<block class="Magento\Catalog\Block\Product\View\Type\Configurable" name="product.info.configurable" as="product_type_data" template="product/view/type/default.phtml">
<container name="product.info.configurable.extra" as="product_type_data_extra" label="Product Extra Info"/>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_grouped.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_grouped.xml
index 4bd9ac9b79b..c4479ef8e4a 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_grouped.xml
+++ b/app/code/Magento/Catalog/view/frontend/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Grouped)" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Grouped)" type="page">
<referenceBlock name="product.info">
<block class="Magento\Catalog\Block\Product\View\Type\Grouped" name="product.info.grouped" as="product_type_data" template="product/view/type/grouped.phtml">
<container name="product.info.grouped.extra" as="product_type_data_extra" label="Product Extra Info"/>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_simple.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_simple.xml
index a5fd84295c8..46cb9990cf5 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_simple.xml
+++ b/app/code/Magento/Catalog/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Simple)" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Simple)" type="page">
<referenceBlock name="product.info">
<block class="Magento\Catalog\Block\Product\View\Type\Simple" name="product.info.simple" as="product_type_data" template="product/view/type/default.phtml">
<container name="product.info.simple.extra" as="product_type_data_extra" label="Product Extra Info"/>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_virtual.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_virtual.xml
index 064cfcb81a2..2f79465ff4d 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_virtual.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view_type_virtual.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Virtual)" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Virtual)" type="page">
<referenceBlock name="product.info">
<block class="Magento\Catalog\Block\Product\View\Type\Virtual" name="product.info.virtual" as="product_type_data" template="product/view/type/default.phtml">
<container name="product.info.virtual.extra" as="product_type_data_extra" label="Product Extra Info"/>
diff --git a/app/code/Magento/CatalogInventory/view/adminhtml/layout/adminhtml_catalog_product_superconfig_config.xml b/app/code/Magento/CatalogInventory/view/adminhtml/layout/catalog_product_superconfig_config.xml
similarity index 97%
rename from app/code/Magento/CatalogInventory/view/adminhtml/layout/adminhtml_catalog_product_superconfig_config.xml
rename to app/code/Magento/CatalogInventory/view/adminhtml/layout/catalog_product_superconfig_config.xml
index 2d416994179..a1b1994dbb7 100644
--- a/app/code/Magento/CatalogInventory/view/adminhtml/layout/adminhtml_catalog_product_superconfig_config.xml
+++ b/app/code/Magento/CatalogInventory/view/adminhtml/layout/catalog_product_superconfig_config.xml
@@ -39,7 +39,7 @@
<argument name="id" xsi:type="string">inventory_in_stock</argument>
<argument name="filter" xsi:type="string">0</argument>
<argument name="sortable" xsi:type="string">1</argument>
- <argument name="renderer" xsi:type="string">Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config\Grid\Renderer\Inventory</argument>
+ <argument name="renderer" xsi:type="string">Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config\Grid\Renderer\Inventory</argument>
</arguments>
</block>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="qty" after="admin.product.edit.tab.super.config.grid.sku">
diff --git a/app/code/Magento/CatalogSearch/etc/adminhtml/menu.xml b/app/code/Magento/CatalogSearch/etc/adminhtml/menu.xml
index d131f29aab6..9787c8ab7ae 100644
--- a/app/code/Magento/CatalogSearch/etc/adminhtml/menu.xml
+++ b/app/code/Magento/CatalogSearch/etc/adminhtml/menu.xml
@@ -27,6 +27,6 @@
-->
<config>
<menu>
- <add id="Magento_CatalogSearch::catalog_search" title="Search Terms" module="Magento_CatalogSearch" sortOrder="10" parent="Magento_Adminhtml::marketing_seo" action="adminhtml/catalog_search/" resource="Magento_CatalogSearch::search"/>
+ <add id="Magento_CatalogSearch::catalog_search" title="Search Terms" module="Magento_CatalogSearch" sortOrder="10" parent="Magento_Adminhtml::marketing_seo" action="catalog/search/" resource="Magento_CatalogSearch::search"/>
</menu>
</config>
diff --git a/app/code/Magento/CatalogSearch/etc/module.xml b/app/code/Magento/CatalogSearch/etc/module.xml
index d34272a4587..d1e2bd7c0ee 100755
--- a/app/code/Magento/CatalogSearch/etc/module.xml
+++ b/app/code/Magento/CatalogSearch/etc/module.xml
@@ -37,7 +37,6 @@
<module name="Magento_Index"/>
<module name="Magento_Eav"/>
<module name="Magento_Backend"/>
- <module name="Magento_Adminhtml"/>
<module name="Magento_Page"/>
</depends>
</module>
diff --git a/app/code/Magento/CatalogSearch/view/adminhtml/layout/adminhtml_catalog_search_edit.xml b/app/code/Magento/CatalogSearch/view/adminhtml/layout/catalog_search_edit.xml
similarity index 94%
rename from app/code/Magento/CatalogSearch/view/adminhtml/layout/adminhtml_catalog_search_edit.xml
rename to app/code/Magento/CatalogSearch/view/adminhtml/layout/catalog_search_edit.xml
index fc74a5beebb..e337eb3a9e9 100644
--- a/app/code/Magento/CatalogSearch/view/adminhtml/layout/adminhtml_catalog_search_edit.xml
+++ b/app/code/Magento/CatalogSearch/view/adminhtml/layout/catalog_search_edit.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Catalog\Search\Edit" name="adminhtml.catalog.search.edit"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Search\Edit" name="adminhtml.catalog.search.edit"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/CatalogSearch/view/adminhtml/layout/adminhtml_catalog_search_grid_block.xml b/app/code/Magento/CatalogSearch/view/adminhtml/layout/catalog_search_grid_block.xml
similarity index 100%
rename from app/code/Magento/CatalogSearch/view/adminhtml/layout/adminhtml_catalog_search_grid_block.xml
rename to app/code/Magento/CatalogSearch/view/adminhtml/layout/catalog_search_grid_block.xml
diff --git a/app/code/Magento/CatalogSearch/view/adminhtml/layout/adminhtml_catalog_search_index.xml b/app/code/Magento/CatalogSearch/view/adminhtml/layout/catalog_search_index.xml
similarity index 90%
rename from app/code/Magento/CatalogSearch/view/adminhtml/layout/adminhtml_catalog_search_index.xml
rename to app/code/Magento/CatalogSearch/view/adminhtml/layout/catalog_search_index.xml
index e7aa3557d71..faa6d899ed5 100644
--- a/app/code/Magento/CatalogSearch/view/adminhtml/layout/adminhtml_catalog_search_index.xml
+++ b/app/code/Magento/CatalogSearch/view/adminhtml/layout/catalog_search_index.xml
@@ -24,8 +24,8 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_catalog_search_grid_block"/>
+ <update handle="catalog_search_grid_block"/>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Catalog\Search" name="adminhtml.catalog.search.grid.container"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Search" name="adminhtml.catalog.search.grid.container"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_index.xml b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_index.xml
index efc202cc2c4..4b440e65a02 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_index.xml
+++ b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_index.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Advanced Search Form" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Advanced Search Form" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">2columns-right.phtml</argument>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_result.xml b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_result.xml
index d5a953b7b76..4abd838ba8b 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_advanced_result.xml
+++ b/app/code/Magento/CatalogSearch/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Advanced Search Result" type="page" parent="catalogsearch_advanced_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Advanced Search Result" type="page">
<update handle="page_two_columns_right"/>
<referenceContainer name="content">
<block class="Magento\CatalogSearch\Block\Advanced\Result" name="catalogsearch_advanced_result" template="advanced/result.phtml">
diff --git a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_ajax_suggest.xml b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_ajax_suggest.xml
index e0ecc34d49f..18e98ef4125 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_ajax_suggest.xml
+++ b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_ajax_suggest.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Quick Search Form Suggestions" type="fragment" owner="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Quick Search Form Suggestions" type="page">
<block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
<block class="Magento\CatalogSearch\Block\Autocomplete" name="autocomplete"/>
</block>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml
index 4b827ddbcfb..1513bfb4690 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_result_index.xml
+++ b/app/code/Magento/CatalogSearch/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Quick Search Form" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Quick Search Form" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">3columns.phtml</argument>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_term_popular.xml b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_term_popular.xml
index 6392cc44f1c..0d3329a3131 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_term_popular.xml
+++ b/app/code/Magento/CatalogSearch/view/frontend/layout/catalogsearch_term_popular.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Popular Search Terms" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Popular Search Terms" type="page">
<referenceBlock name="head">
<action method="setTitle">
<argument translate="true" name="title" xsi:type="string">Search Terms</argument>
diff --git a/app/code/Magento/Centinel/Block/Adminhtml/Validation.php b/app/code/Magento/Centinel/Block/Adminhtml/Validation.php
index d5f0c34b24d..691373c96a0 100644
--- a/app/code/Magento/Centinel/Block/Adminhtml/Validation.php
+++ b/app/code/Magento/Centinel/Block/Adminhtml/Validation.php
@@ -29,7 +29,7 @@
*/
namespace Magento\Centinel\Block\Adminhtml;
-class Validation extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+class Validation extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
/**
* construct
diff --git a/app/code/Magento/Centinel/Block/Adminhtml/Validation/Form.php b/app/code/Magento/Centinel/Block/Adminhtml/Validation/Form.php
index 83d0e9ded7a..331baac073e 100644
--- a/app/code/Magento/Centinel/Block/Adminhtml/Validation/Form.php
+++ b/app/code/Magento/Centinel/Block/Adminhtml/Validation/Form.php
@@ -34,7 +34,7 @@
namespace Magento\Centinel\Block\Adminhtml\Validation;
-class Form extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
/**
* Prepare validation and template parameters
diff --git a/app/code/Magento/Centinel/Controller/Adminhtml/Centinel/Index.php b/app/code/Magento/Centinel/Controller/Adminhtml/Centinel/Index.php
index 256957f506c..f915e5050c0 100644
--- a/app/code/Magento/Centinel/Controller/Adminhtml/Centinel/Index.php
+++ b/app/code/Magento/Centinel/Controller/Adminhtml/Centinel/Index.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Centinel\Controller\Adminhtml\Centinel;
-class Index extends \Magento\Adminhtml\Controller\Action
+class Index extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -123,7 +123,7 @@ class Index extends \Magento\Adminhtml\Controller\Action
*/
private function _getPayment()
{
- return $this->_objectManager->get('Magento\Adminhtml\Model\Sales\Order\Create')->getQuote()->getPayment();
+ return $this->_objectManager->get('Magento\Sales\Model\AdminOrder\Create')->getQuote()->getPayment();
}
/**
diff --git a/app/code/Magento/Centinel/Model/Service.php b/app/code/Magento/Centinel/Model/Service.php
index 8f9721f4ed1..6a934033724 100644
--- a/app/code/Magento/Centinel/Model/Service.php
+++ b/app/code/Magento/Centinel/Model/Service.php
@@ -199,7 +199,7 @@ class Service extends \Magento\Object
'isIframe' => true
);
if ($this->_storeManager->getStore()->isAdmin()) {
- return $this->_backendUrl->getUrl('*/centinel_index/' . $suffix, $params);
+ return $this->_backendUrl->getUrl('adminhtml/centinel_index/' . $suffix, $params);
} else {
return $this->_frontendUrl->getUrl('centinel/index/' . $suffix, $params);
}
diff --git a/app/code/Magento/Centinel/etc/adminhtml/di.xml b/app/code/Magento/Centinel/etc/adminhtml/di.xml
index a48080f8cdd..0d65b30b450 100644
--- a/app/code/Magento/Centinel/etc/adminhtml/di.xml
+++ b/app/code/Magento/Centinel/etc/adminhtml/di.xml
@@ -43,4 +43,4 @@
<instance type="Magento\Core\Model\Session" />
</param>
</type>
-</config>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/Centinel/etc/module.xml b/app/code/Magento/Centinel/etc/module.xml
index 191c9d3f22b..d7211898798 100755
--- a/app/code/Magento/Centinel/etc/module.xml
+++ b/app/code/Magento/Centinel/etc/module.xml
@@ -32,7 +32,6 @@
<depends>
<module name="Magento_Checkout"/>
<module name="Magento_Core"/>
- <module name="Magento_Adminhtml"/>
<module name="Magento_Backend"/>
<module name="Magento_Page"/>
</depends>
diff --git a/app/code/Magento/Centinel/view/adminhtml/layout/adminhtml_sales_order_create_index.xml b/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_index.xml
similarity index 97%
rename from app/code/Magento/Centinel/view/adminhtml/layout/adminhtml_sales_order_create_index.xml
rename to app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_index.xml
index 8c4b82624fe..b293f7a8d09 100644
--- a/app/code/Magento/Centinel/view/adminhtml/layout/adminhtml_sales_order_create_index.xml
+++ b/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_index.xml
@@ -32,7 +32,7 @@
</block>
</referenceBlock>
<referenceBlock name="data">
- <block class="Magento\Centinel\Block\Adminhtml\Validation" as="card_validation" name="card_validation" template="Magento_Adminhtml::sales/order/create/abstract.phtml">
+ <block class="Magento\Centinel\Block\Adminhtml\Validation" as="card_validation" name="card_validation" template="Magento_Sales::order/create/abstract.phtml">
<block class="Magento\Centinel\Block\Adminhtml\Validation\Form" template="validation/form.phtml" name="centinel.validation.form" as="form"/>
</block>
</referenceBlock>
diff --git a/app/code/Magento/Centinel/view/adminhtml/layout/adminhtml_sales_order_create_load_block_card_validation.xml b/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_load_block_card_validation.xml
similarity index 96%
rename from app/code/Magento/Centinel/view/adminhtml/layout/adminhtml_sales_order_create_load_block_card_validation.xml
rename to app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_load_block_card_validation.xml
index 5fc0db9326a..05e50a65967 100644
--- a/app/code/Magento/Centinel/view/adminhtml/layout/adminhtml_sales_order_create_load_block_card_validation.xml
+++ b/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_load_block_card_validation.xml
@@ -25,7 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Centinel\Block\Adminhtml\Validation" as="card_validation" name="card_validation" template="Magento_Adminhtml::sales/order/create/abstract.phtml">
+ <block class="Magento\Centinel\Block\Adminhtml\Validation" as="card_validation" name="card_validation" template="Magento_Sales::order/create/abstract.phtml">
<block class="Magento\Centinel\Block\Adminhtml\Validation\Form" template="validation/form.phtml" name="form"/>
</block>
</referenceContainer>
diff --git a/app/code/Magento/Centinel/view/adminhtml/layout/adminhtml_sales_order_create_load_block_data.xml b/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_load_block_data.xml
similarity index 96%
rename from app/code/Magento/Centinel/view/adminhtml/layout/adminhtml_sales_order_create_load_block_data.xml
rename to app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_load_block_data.xml
index 3b19e5d2428..32f77f88e89 100644
--- a/app/code/Magento/Centinel/view/adminhtml/layout/adminhtml_sales_order_create_load_block_data.xml
+++ b/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_load_block_data.xml
@@ -25,7 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="data">
- <block class="Magento\Centinel\Block\Adminhtml\Validation" as="card_validation" name="card_validation" template="Magento_Adminhtml::sales/order/create/abstract.phtml">
+ <block class="Magento\Centinel\Block\Adminhtml\Validation" as="card_validation" name="card_validation" template="Magento_Sales::order/create/abstract.phtml">
<block class="Magento\Centinel\Block\Adminhtml\Validation\Form" template="validation/form.phtml" name="form"/>
</block>
</referenceBlock>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_edit_index.xml b/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_start.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_edit_index.xml
rename to app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_start.xml
index 3d581b90c38..f46279b1652 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_edit_index.xml
+++ b/app/code/Magento/Centinel/view/adminhtml/layout/sales_order_create_start.xml
@@ -24,5 +24,5 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_sales_order_create_index"/>
+ <update handle="sales_order_create_index"/>
</layout>
diff --git a/app/code/Magento/Centinel/view/frontend/layout/centinel_index_authenticationcomplete.xml b/app/code/Magento/Centinel/view/frontend/layout/centinel_index_authenticationcomplete.xml
index cde4cc0a64e..09b149fe682 100644
--- a/app/code/Magento/Centinel/view/frontend/layout/centinel_index_authenticationcomplete.xml
+++ b/app/code/Magento/Centinel/view/frontend/layout/centinel_index_authenticationcomplete.xml
@@ -23,8 +23,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Centinel Authentication Finish" type="fragment" owner="checkout_onepage_index">
- <block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
- <block class="Magento\Centinel\Block\Authentication\Complete" template="authentication/complete.phtml"/>
- </block>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <block class="Magento\Centinel\Block\Authentication\Complete" output="1" template="authentication/complete.phtml"/>
</layout>
diff --git a/app/code/Magento/Centinel/view/frontend/layout/centinel_index_authenticationstart.xml b/app/code/Magento/Centinel/view/frontend/layout/centinel_index_authenticationstart.xml
index 910ae7e8c41..1e2ce8dc255 100644
--- a/app/code/Magento/Centinel/view/frontend/layout/centinel_index_authenticationstart.xml
+++ b/app/code/Magento/Centinel/view/frontend/layout/centinel_index_authenticationstart.xml
@@ -23,8 +23,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Centinel Authentication Start" type="fragment" owner="checkout_onepage_index">
- <block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
- <block class="Magento\Centinel\Block\Authentication\Start" template="authentication/start.phtml"/>
- </block>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <block class="Magento\Centinel\Block\Authentication\Start" output="1" template="authentication/start.phtml"/>
</layout>
diff --git a/app/code/Magento/Checkout/view/frontend/js/payment.js b/app/code/Magento/Checkout/view/frontend/js/payment.js
index e0028755b9b..fbc1983892d 100644
--- a/app/code/Magento/Checkout/view/frontend/js/payment.js
+++ b/app/code/Magento/Checkout/view/frontend/js/payment.js
@@ -72,8 +72,8 @@
var element = $(e.target),
parentsDl = element.closest('dl');
parentsDl.find('dt input:radio').prop('checked', false);
- parentsDl.find('dd ul').hide().find('[name^="payment["]').prop('disabled', true);
- element.prop('checked', true).parent().nextUntil('dt').find('ul').show().find('[name^="payment["]').prop('disabled', false);
+ parentsDl.find('.items').hide().find('[name^="payment["]').prop('disabled', true);
+ element.prop('checked', true).parent().nextUntil('dt').find('.items').show().find('[name^="payment["]').prop('disabled', false);
},
/**
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure.xml
index 164f20a198a..ab88c16ef53 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Cart Item (Any)" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Cart Item (Any)" type="page">
<update handle="catalog_product_view"/>
<referenceBlock name="product.info">
<block class="Magento\Checkout\Block\Cart\Item\Configure" name="checkout.cart.item.configure.block"/>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure_type_configurable.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure_type_configurable.xml
index 96525af34d7..294fdeb8432 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure_type_configurable.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure_type_configurable.xml
@@ -23,6 +23,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Cart Item (Configurable)" type="page" parent="checkout_cart_configure">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Cart Item (Configurable)" type="page">
<update handle="catalog_product_view_type_configurable"/>
</layout>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure_type_simple.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure_type_simple.xml
index 1a99947cefb..24d2eb57566 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure_type_simple.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_configure_type_simple.xml
@@ -23,6 +23,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Cart Item (Simple)" type="page" parent="checkout_cart_configure">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Cart Item (Simple)" type="page">
<update handle="catalog_product_view_type_simple"/>
</layout>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml
index 5ed950a15c7..11b2ce0248a 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml
+++ b/app/code/Magento/Checkout/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Shopping Cart" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Shopping Cart" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping.xml
index d6646dfb23f..31b449b274f 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout" type="page" parent="checkout_cart_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_editaddress.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_editaddress.xml
index baba7cdf7e9..15998cc52ef 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_editaddress.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_editaddress.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout One Address Edit Form" type="page" parent="checkout_multishipping_customer_address">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout One Address Edit Form" type="page">
<update handle="checkout_multishipping"/>
<update handle="checkout_multishipping_customer_address"/>
</layout>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_editbilling.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_editbilling.xml
index 629020e4a70..796fb88cd3c 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_editbilling.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_editbilling.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Billing Address Edit Form" type="page" parent="checkout_multishipping_billing">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Billing Address Edit Form" type="page">
<update handle="checkout_multishipping"/>
<update handle="checkout_multishipping_customer_address"/>
</layout>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_editshipping.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_editshipping.xml
index c59bd272737..25d5a6c7b28 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_editshipping.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_editshipping.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Shipping Address Edit Form" type="page" parent="checkout_multishipping_shipping">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Shipping Address Edit Form" type="page">
<update handle="checkout_multishipping"/>
<update handle="checkout_multishipping_customer_address"/>
</layout>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_newbilling.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_newbilling.xml
index 6583faa1179..0762e7332c2 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_newbilling.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_newbilling.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Billing Address Creation" type="page" parent="checkout_multishipping_billing">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Billing Address Creation" type="page">
<update handle="checkout_multishipping"/>
<update handle="checkout_multishipping_customer_address"/>
</layout>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_newshipping.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_newshipping.xml
index ceb18c65fc5..064edc3dcfa 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_newshipping.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_newshipping.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Shipping Address Creation" type="page" parent="checkout_multishipping_shipping">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Shipping Address Creation" type="page">
<update handle="checkout_multishipping"/>
<update handle="checkout_multishipping_customer_address"/>
</layout>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_select.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_select.xml
index 3ef80e95c2e..3aafd119cc2 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_select.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_select.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Shipping Address Selection" type="page" parent="checkout_multishipping_addresses">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Shipping Address Selection" type="page">
<update handle="checkout_multishipping"/>
<referenceContainer name="content">
<block class="Magento\Checkout\Block\Multishipping\Address\Select" name="checkout_address_select" template="multishipping/address/select.phtml"/>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_selectbilling.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_selectbilling.xml
index 83b7d25dbd4..35b1c6f0075 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_selectbilling.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_address_selectbilling.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Billing Address Selection" type="page" parent="checkout_multishipping_address_select">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Billing Address Selection" type="page">
<update handle="checkout_multishipping"/>
<referenceContainer name="content">
<block class="Magento\Checkout\Block\Multishipping\Address\Select" name="checkout_address_select" template="multishipping/address/select.phtml"/>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_addresses.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_addresses.xml
index 2d586390e9c..6175c3397f4 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_addresses.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_addresses.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Address (Any) Form" type="page" parent="checkout_multishipping">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Address (Any) Form" type="page">
<update handle="checkout_multishipping"/>
<referenceContainer name="content">
<block class="Magento\Checkout\Block\Multishipping\Addresses" name="checkout_addresses" template="multishipping/addresses.phtml">
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_billing.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_billing.xml
index 09ec81c14d4..c1d420f5d0c 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_billing.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_billing.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Billing Information Step" type="page" parent="checkout_multishipping">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Billing Information Step" type="page">
<update handle="checkout_multishipping"/>
<referenceContainer name="content">
<block class="Magento\Checkout\Block\Multishipping\Billing" name="checkout_billing" template="multishipping/billing.phtml">
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_customer_address.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_customer_address.xml
index 6da4a26de1c..dbb444e2c8f 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_customer_address.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_customer_address.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Customer Address Edit Form" type="page" parent="customer_address_form">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Customer Address Edit Form" type="page">
<referenceContainer name="content">
<block class="Magento\Customer\Block\Address\Edit" name="customer_address_edit" template="address/edit.phtml"/>
</referenceContainer>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_login.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_login.xml
index 0beca31d434..eb4a8ecfe02 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_login.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_login.xml
@@ -23,6 +23,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Login User Form" type="page" parent="customer_account_login">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Login User Form" type="page">
<update handle="customer_account_login"/>
</layout>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_overview.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_overview.xml
index b297438dcdd..4849cdb8495 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_overview.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_overview.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Overview" type="page" parent="checkout_multishipping">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Overview" type="page">
<update handle="checkout_multishipping"/>
<referenceContainer name="content">
<block class="Magento\Checkout\Block\Multishipping\Overview" name="checkout_overview" template="multishipping/overview.phtml">
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_register.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_register.xml
index 0eca00284ae..648b74594f9 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_register.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_register.xml
@@ -23,6 +23,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Register User Form" type="page" parent="customer_account_create">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Register User Form" type="page">
<update handle="customer_account_create"/>
</layout>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_shipping.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_shipping.xml
index 28ca66a41d8..2d0133bafe9 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_shipping.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_shipping.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Shipping Information Step" type="page" parent="checkout_multishipping">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Shipping Information Step" type="page">
<update handle="checkout_multishipping"/>
<referenceContainer name="content">
<block class="Magento\Checkout\Block\Multishipping\Shipping" name="checkout_shipping" template="multishipping/shipping.phtml">
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_success.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_success.xml
index 9488f0869c6..8e0419a5964 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_success.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_multishipping_success.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Success" type="page" parent="checkout_multishipping">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Success" type="page">
<update handle="checkout_multishipping"/>
<referenceContainer name="content">
<block class="Magento\Checkout\Block\Multishipping\Success" name="checkout_success" template="multishipping/success.phtml"/>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_additional.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_additional.xml
index 10316b14bda..7784b3f5619 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_additional.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_additional.xml
@@ -23,12 +23,10 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="One Page Checkout Additional Address Form" type="fragment" owner="checkout_onepage_index">
- <block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
- <block class="Magento\Checkout\Block\Onepage\Shipping\Method\Additional" name="shipping_method_additional" template="onepage/shipping_method/additional.phtml">
- <action method="setDontDisplayContainer">
- <argument name="param" xsi:type="string">1</argument>
- </action>
- </block>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <block class="Magento\Checkout\Block\Onepage\Shipping\Method\Additional" name="shipping_method_additional" output="1" template="onepage/shipping_method/additional.phtml">
+ <action method="setDontDisplayContainer">
+ <argument name="param" xsi:type="string">1</argument>
+ </action>
</block>
</layout>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_failure.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_failure.xml
index 61d83542814..d77f3489ac4 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_failure.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_failure.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="One Page Checkout Failure" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="One Page Checkout Failure" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">2columns-right.phtml</argument>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_index.xml
index cb11d740731..59e213fa734 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_index.xml
+++ b/app/code/Magento/Checkout/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="One Page Checkout" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="One Page Checkout" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">2columns-right.phtml</argument>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_paymentmethod.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_paymentmethod.xml
index 776b3c90e69..08648cb20f1 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_paymentmethod.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_paymentmethod.xml
@@ -22,8 +22,8 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="One Page Checkout Choose Payment Method" type="fragment" owner="checkout_onepage_index">
+ -->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="One Page Checkout Choose Payment Method" type="page">
<block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
<block class="Magento\Checkout\Block\Onepage\Payment\Methods" name="payment_method" template="onepage/payment/methods.phtml">
<action method="setMethodFormTemplate">
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_progress.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_progress.xml
index 42f3c09970f..80228f5a508 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_progress.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_progress.xml
@@ -23,15 +23,13 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="One Page Checkout Progress" type="fragment" owner="checkout_onepage_index">
- <block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
- <block class="Magento\Checkout\Block\Onepage\Progress" name="progress" template="onepage/progress.phtml">
- <block class="Magento\Checkout\Block\Onepage\Payment\Info" name="payment_info">
- <action method="setInfoTemplate">
- <argument name="method" xsi:type="string"/>
- <argument name="template" xsi:type="string"/>
- </action>
- </block>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <block class="Magento\Checkout\Block\Onepage\Progress" name="progress" output="1" template="onepage/progress.phtml">
+ <block class="Magento\Checkout\Block\Onepage\Payment\Info" name="payment_info">
+ <action method="setInfoTemplate">
+ <argument name="method" xsi:type="string"/>
+ <argument name="template" xsi:type="string"/>
+ </action>
</block>
</block>
</layout>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review.xml
index be72de76cc0..27d4d6e5ab7 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review.xml
+++ b/app/code/Magento/Checkout/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="One Page Checkout Overview" type="fragment" owner="checkout_onepage_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="One Page Checkout Overview" type="page">
<block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
<block class="Magento\Checkout\Block\Onepage\Review\Info" name="order_review" template="onepage/review/info.phtml">
<block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="onepage/review/item.phtml"/>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_shippingmethod.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_shippingmethod.xml
index bd73726adbf..6e27ca6cc78 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_shippingmethod.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_shippingmethod.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="One Page Checkout Choose Shipping Method" type="fragment" owner="checkout_onepage_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="One Page Checkout Choose Shipping Method" type="page">
<block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
<block class="Magento\Checkout\Block\Onepage\Shipping\Method\Available" name="shipping_method" template="onepage/shipping_method/available.phtml"/>
</block>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml
index b08736d3951..11bccea76e1 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml
+++ b/app/code/Magento/Checkout/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="One Page Checkout Success" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="One Page Checkout Success" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">2columns-right.phtml</argument>
diff --git a/app/code/Magento/Cms/Helper/Page.php b/app/code/Magento/Cms/Helper/Page.php
index 54ea4f7f1a9..e539a22f2d3 100644
--- a/app/code/Magento/Cms/Helper/Page.php
+++ b/app/code/Magento/Cms/Helper/Page.php
@@ -184,6 +184,7 @@ class Page extends \Magento\Core\Helper\AbstractHelper
$this->_design->setDesignTheme($this->_page->getCustomTheme());
}
}
+ $action->getLayout()->getUpdate()->addHandle('default')->addHandle('cms_page_view');
$action->addPageLayoutHandles(array('id' => $this->_page->getIdentifier()));
$action->addActionLayoutHandles();
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Config.php b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
index 986d88a6707..4105a7246dd 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Config.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
@@ -160,7 +160,7 @@ class Config extends \Magento\Object
'no_display' => false,
'translator' => $this->_cmsData,
'encode_directives' => true,
- 'directives_url' => $this->_backendUrl->getUrl('*/cms_wysiwyg/directive'),
+ 'directives_url' => $this->_backendUrl->getUrl('adminhtml/cms_wysiwyg/directive'),
'popup_css' =>
$viewUrl->getViewFileUrl('mage/adminhtml/wysiwyg/tiny_mce/themes/advanced/skins/default/dialog.css'),
'content_css' =>
@@ -174,7 +174,7 @@ class Config extends \Magento\Object
if ($this->_authorization->isAllowed('Magento_Cms::media_gallery')) {
$config->addData(array(
'add_images' => true,
- 'files_browser_window_url' => $this->_backendUrl->getUrl('*/cms_wysiwyg_images/index'),
+ 'files_browser_window_url' => $this->_backendUrl->getUrl('adminhtml/cms_wysiwyg_images/index'),
'files_browser_window_width' => $this->_windowSize['width'],
'files_browser_window_height'=> $this->_windowSize['height'],
));
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index a4b3a4cd28c..35f29ec38e0 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -303,7 +303,7 @@ class Storage extends \Magento\Object
$thumbUrl = $this->getThumbnailUrl($item->getFilename(), true);
// generate thumbnail "on the fly" if it does not exists
if (!$thumbUrl) {
- $thumbUrl = $this->_backendUrl->getUrl('*/*/thumbnail', array('file' => $item->getId()));
+ $thumbUrl = $this->_backendUrl->getUrl('adminhtml/*/thumbnail', array('file' => $item->getId()));
}
$size = @getimagesize($item->getFilename());
diff --git a/app/code/Magento/Cms/view/frontend/content_heading.phtml b/app/code/Magento/Cms/view/frontend/content_heading.phtml
index 4bb4b239282..198f81a38ba 100644
--- a/app/code/Magento/Cms/view/frontend/content_heading.phtml
+++ b/app/code/Magento/Cms/view/frontend/content_heading.phtml
@@ -25,7 +25,7 @@
*/
?>
<?php if($_heading = $this->getContentHeading()): ?>
- <div class="page-title">
- <h1><?php echo $_heading; ?></h1>
+ <div class="page title">
+ <h1><span class="base"><?php echo $_heading; ?></span></h1>
</div>
<?php endif; ?>
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 f22fbaecda2..d31d02e0cf0 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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="CMS Home Default Page" type="page" parent="cms_page_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="CMS Home Default Page" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
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 17686508a1b..ce767032b8b 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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="CMS No-Route Default Page" type="page" parent="cms_page_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="CMS No-Route Default Page" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
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 f434f79873f..78fe6c29336 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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="CMS Home Page" type="page" parent="cms_page_view"/>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="CMS Home Page" type="page"/>
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 0fd11e8a725..1d9f85fc7a8 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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="CMS No-Cookies Page" type="page" parent="cms_page_view"/>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="CMS No-Cookies Page" type="page"/>
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 da7de95ffb7..be6695ade5b 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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="CMS No-Route Page" type="page" parent="cms_page_view"/>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="CMS No-Route Page" type="page"/>
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 3dbff459f59..0b7d0143e8b 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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="CMS Pages (All)" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="CMS Pages (All)" type="page">
<referenceContainer name="content">
<block class="Magento\Core\Block\Template" name="page_content_heading" template="Magento_Cms::content_heading.phtml"/>
<container name="cms.wrapper" label="CMS Content Wrapper" htmlTag="div" htmlClass="std">
diff --git a/app/code/Magento/Cms/view/frontend/layout/default.xml b/app/code/Magento/Cms/view/frontend/layout/default.xml
index d5b7d2f834c..85d511a027c 100644
--- a/app/code/Magento/Cms/view/frontend/layout/default.xml
+++ b/app/code/Magento/Cms/view/frontend/layout/default.xml
@@ -24,22 +24,13 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="head">
- <block class="Magento\Page\Block\Html\Head\Css" name="magento-cms-widgets-css">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Cms::widgets.css</argument>
- </arguments>
- </block>
- </referenceBlock>
- <referenceBlock name="footer">
- <block class="Magento\Cms\Block\Block" name="cms_footer_links" before="footer_links">
- <!--
- The content of this block is taken from the database by its block_id.
- You can manage it in admin CMS -> Static Blocks
- -->
- <action method="setBlockId">
- <argument name="block_id" xsi:type="string">footer_links</argument>
- </action>
- </block>
- </referenceBlock>
+ <referenceContainer name="footer">
+ <container name="cms_footer_links_container" label="CMS Footer Links" htmlTag="div" htmlClass="links" before="footer_links">
+ <block class="Magento\Cms\Block\Block" name="cms_footer_links">
+ <arguments>
+ <argument name="block_id" xsi:type="string">footer_links</argument>
+ </arguments>
+ </block>
+ </container>
+ </referenceContainer>
</layout>
diff --git a/app/code/Magento/Cms/view/frontend/layout/print.xml b/app/code/Magento/Cms/view/frontend/layout/print.xml
index ba0a322322b..6c60196129d 100644
--- a/app/code/Magento/Cms/view/frontend/layout/print.xml
+++ b/app/code/Magento/Cms/view/frontend/layout/print.xml
@@ -23,12 +23,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="head">
- <block class="Magento\Page\Block\Html\Head\Css" name="magento-cms-widgets-css">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Cms::widgets.css</argument>
- </arguments>
- </block>
- </referenceBlock>
-</layout>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
diff --git a/app/code/Magento/Cms/view/frontend/widget/static_block/default.phtml b/app/code/Magento/Cms/view/frontend/widget/static_block/default.phtml
index 77b50f85a70..9ede2e8f5fb 100644
--- a/app/code/Magento/Cms/view/frontend/widget/static_block/default.phtml
+++ b/app/code/Magento/Cms/view/frontend/widget/static_block/default.phtml
@@ -24,4 +24,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<div class="widget widget-static-block"><?php echo $this->getText(); ?></div>
+<div class="widget static block"><?php echo $this->getText(); ?></div>
diff --git a/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit.php b/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit.php
index 88a60529eaf..c30152131a6 100644
--- a/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit.php
+++ b/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit.php
@@ -90,6 +90,6 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
*/
public function getFormActionUrl()
{
- return $this->getUrl('*/*/save');
+ return $this->getUrl('adminhtml/*/save');
}
}
diff --git a/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Grid.php b/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Grid.php
index 25451f83673..1a69b01315d 100644
--- a/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Grid.php
+++ b/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Grid.php
@@ -131,7 +131,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
if (!isset($params['_current'])) {
$params['_current'] = true;
}
- return $this->getUrl('*/*/grid', $params);
+ return $this->getUrl('adminhtml/*/grid', $params);
}
/**
@@ -141,6 +141,6 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
*/
public function getRowUrl($row)
{
- return $this->getUrl('*/*/load', array('id' => strtr(base64_encode($row->getFilenameId()), '+/=', '-_,')));
+ return $this->getUrl('adminhtml/*/load', array('id' => strtr(base64_encode($row->getFilenameId()), '+/=', '-_,')));
}
}
diff --git a/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Local.php b/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Local.php
index f417d56f5c8..7695b00a906 100644
--- a/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Local.php
+++ b/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Local.php
@@ -44,7 +44,7 @@ class Local
*/
public function getTabUrl()
{
- return $this->getUrl('*/*/loadtab', array('_current' => true));
+ return $this->getUrl('adminhtml/*/loadtab', array('_current' => true));
}
/**
diff --git a/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tabs.php b/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tabs.php
index 11bc34a0820..28ec8af8096 100644
--- a/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tabs.php
+++ b/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tabs.php
@@ -82,7 +82,7 @@ class Tabs extends \Magento\Adminhtml\Block\Widget\Tabs
// $this->addTab('load', array(
// 'label' => __('Load local Package'),
// 'class' => 'ajax',
-// 'url' => $this->getUrl('*/*/loadtab', array('_current' => true)),
+// 'url' => $this->getUrl('adminhtml/*/loadtab', array('_current' => true)),
// ));
return parent::_beforeToHtml();
diff --git a/app/code/Magento/Connect/Controller/Adminhtml/Extension/Custom.php b/app/code/Magento/Connect/Controller/Adminhtml/Extension/Custom.php
index 8decaf98f65..da99cdca2f2 100644
--- a/app/code/Magento/Connect/Controller/Adminhtml/Extension/Custom.php
+++ b/app/code/Magento/Connect/Controller/Adminhtml/Extension/Custom.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Connect\Controller\Adminhtml\Extension;
-class Custom extends \Magento\Adminhtml\Controller\Action
+class Custom extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Redirect to edit Extension Package action
@@ -66,7 +66,7 @@ class Custom extends \Magento\Adminhtml\Controller\Action
public function resetAction()
{
$this->_objectManager->get('Magento\Connect\Model\Session')->unsCustomExtensionPackageFormData();
- $this->_redirect('*/*/edit');
+ $this->_redirect('adminhtml/*/edit');
}
/**
@@ -92,7 +92,7 @@ class Custom extends \Magento\Adminhtml\Controller\Action
$session->addError($e->getMessage());
}
}
- $this->_redirect('*/*/edit');
+ $this->_redirect('adminhtml/*/edit');
}
/**
@@ -122,19 +122,19 @@ class Custom extends \Magento\Adminhtml\Controller\Action
$session->addSuccess(__('The package data has been saved.'));
} else {
$session->addError(__('Something went wrong saving the package data.'));
- $this->_redirect('*/*/edit');
+ $this->_redirect('adminhtml/*/edit');
}
if (empty($create)) {
- $this->_redirect('*/*/edit');
+ $this->_redirect('adminhtml/*/edit');
} else {
$this->_forward('create');
}
} catch (\Magento\Core\Exception $e){
$session->addError($e->getMessage());
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
} catch (\Exception $e){
$session->addException($e, __('Something went wrong saving the package.'));
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
}
}
@@ -159,13 +159,13 @@ class Custom extends \Magento\Adminhtml\Controller\Action
$ext->createPackageV1x();
}
}
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
} catch(\Magento\Core\Exception $e){
$session->addError($e->getMessage());
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
} catch(\Exception $e){
$session->addException($e, __('Something went wrong creating the package.'));
- $this->_redirect('*/*');
+ $this->_redirect('adminhtml/*');
}
}
diff --git a/app/code/Magento/Connect/Controller/Adminhtml/Extension/Local.php b/app/code/Magento/Connect/Controller/Adminhtml/Extension/Local.php
index 3cbf38101a5..6d4448187b2 100644
--- a/app/code/Magento/Connect/Controller/Adminhtml/Extension/Local.php
+++ b/app/code/Magento/Connect/Controller/Adminhtml/Extension/Local.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Connect\Controller\Adminhtml\Extension;
-class Local extends \Magento\Adminhtml\Controller\Action
+class Local extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Redirect to Magento Connect
diff --git a/app/code/Magento/Contacts/etc/module.xml b/app/code/Magento/Contacts/etc/module.xml
index 4a8b8e7c1c6..4604f1c853b 100755
--- a/app/code/Magento/Contacts/etc/module.xml
+++ b/app/code/Magento/Contacts/etc/module.xml
@@ -33,7 +33,6 @@
<module name="Magento_Customer"/>
<module name="Magento_Backend"/>
<module name="Magento_Cms"/>
- <module name="Magento_Page"/>
</depends>
</module>
</config>
diff --git a/app/code/Magento/Contacts/view/frontend/form.phtml b/app/code/Magento/Contacts/view/frontend/form.phtml
index 91f06ee1dd6..660b62b74f4 100644
--- a/app/code/Magento/Contacts/view/frontend/form.phtml
+++ b/app/code/Magento/Contacts/view/frontend/form.phtml
@@ -19,52 +19,44 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<div id="messages_product_view"><?php echo $this->getMessagesBlock()->getGroupedHtml() ?></div>
-<div class="page-title">
- <h1><?php echo __('Contact Us') ?></h1>
-</div>
-<form action="<?php echo $this->getFormAction(); ?>" id="contact-form" method="post">
- <div class="fieldset">
- <h2 class="legend"><?php echo __('Contact Information') ?></h2>
- <ul class="form-list">
- <li class="fields">
- <div class="field">
- <label for="name" class="required"><em>*</em><?php echo __('Name') ?></label>
- <div class="input-box">
- <input name="name" id="name" title="<?php echo __('Name') ?>" value="<?php echo $this->escapeHtml($this->helper('Magento\Contacts\Helper\Data')->getUserName()) ?>" class="input-text" type="text" data-validate="{required:true}"/>
- </div>
- </div>
- <div class="field">
- <label for="email" class="required"><em>*</em><?php echo __('Email') ?></label>
- <div class="input-box">
- <input name="email" id="email" title="<?php echo __('Email') ?>" value="<?php echo $this->escapeHtml($this->helper('Magento\Contacts\Helper\Data')->getUserEmail()) ?>" class="input-text" type="text" data-validate="{required:true, 'validate-email':true}"/>
- </div>
- </div>
- </li>
- <li>
- <label for="telephone"><?php echo __('Telephone') ?></label>
- <div class="input-box">
- <input name="telephone" id="telephone" title="<?php echo __('Telephone') ?>" value="" class="input-text" type="text" />
- </div>
- </li>
- <li class="wide">
- <label for="comment" class="required"><em>*</em><?php echo __('Comment') ?></label>
- <div class="input-box">
- <textarea name="comment" id="comment" title="<?php echo __('Comment') ?>" class="input-text" cols="5" rows="3" data-validate="{required:true}"></textarea>
- </div>
- </li>
+<form class="form contact" action="<?php echo $this->getFormAction(); ?>" id="contact-form" method="post" data-hasrequired="<?php echo __('* Required Fields') ?>">
+ <fieldset class="fieldset">
+ <legend class="legend"><span><?php echo __('Contact Information') ?></span></legend><br />
+ <div class="field name required">
+ <label class="label" for="name"><span><?php echo __('Name') ?></span></label>
+ <div class="control">
+ <input name="name" id="name" title="<?php echo __('Name') ?>" value="<?php echo $this->escapeHtml($this->helper('Magento\Contacts\Helper\Data')->getUserName()) ?>" class="input-text" type="text" data-validate="{required:true}"/>
+ </div>
+ </div>
+ <div class="field email required">
+ <label class="label" for="email"><span><?php echo __('Email') ?></span></label>
+ <div class="control">
+ <input name="email" id="email" title="<?php echo __('Email') ?>" value="<?php echo $this->escapeHtml($this->helper('Magento\Contacts\Helper\Data')->getUserEmail()) ?>" class="input-text" type="text" data-validate="{required:true, 'validate-email':true}"/>
+ </div>
+ </div>
+ <div class="field telephone">
+ <label class="label" for="telephone"><span><?php echo __('Telephone') ?></span></label>
+ <div class="control">
+ <input name="telephone" id="telephone" title="<?php echo __('Telephone') ?>" value="" class="input-text" type="text" />
+ </div>
+ </div>
+ <div class="field comment required">
+ <label class="label" for="comment"><span><?php echo __('Comment') ?></span></label>
+ <div class="control">
+ <textarea name="comment" id="comment" title="<?php echo __('Comment') ?>" class="input-text" cols="5" rows="3" data-validate="{required:true}"></textarea>
+ </div>
<?php echo $this->getChildHtml('form.additional.info'); ?>
- </ul>
- </div>
- <div class="buttons-set">
- <p class="required"><?php echo __('* Required Fields') ?></p>
- <input type="text" name="hideit" id="hideit" value="" style="display:none !important;" />
- <button type="submit" title="<?php echo __('Submit') ?>" class="button"><span><span><?php echo __('Submit') ?></span></span></button>
+ </div>
+ </fieldset>
+ <div class="actions">
+ <input type="hidden" name="hideit" id="hideit" value="" />
+ <button type="submit" title="<?php echo __('Submit') ?>" class="action submit">
+ <span><?php echo __('Submit') ?></span>
+ </button>
</div>
</form>
<script type="text/javascript">
diff --git a/app/code/Magento/Contacts/view/frontend/layout/contacts_index_index.xml b/app/code/Magento/Contacts/view/frontend/layout/contacts_index_index.xml
index 3c4dd0863aa..a88f05e557d 100644
--- a/app/code/Magento/Contacts/view/frontend/layout/contacts_index_index.xml
+++ b/app/code/Magento/Contacts/view/frontend/layout/contacts_index_index.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Contact Us Form" type="page" parent="cms_page_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Contact Us Form" type="page">
<referenceBlock name="head">
<action method="setTitle">
<argument translate="true" name="title" xsi:type="string">Contact Us</argument>
diff --git a/app/code/Magento/Contacts/view/frontend/layout/default.xml b/app/code/Magento/Contacts/view/frontend/layout/default.xml
index a8e016e8ff8..e0ef5232e6c 100644
--- a/app/code/Magento/Contacts/view/frontend/layout/default.xml
+++ b/app/code/Magento/Contacts/view/frontend/layout/default.xml
@@ -25,7 +25,8 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="footer_links">
- <block class="Magento\Page\Block\Link\Current" ifconfig="contacts/contacts/enabled" name="catalog-search-term-popular-link">
+ <block class="Magento\Page\Block\Link" ifconfig="contacts/contacts/enabled"
+ name="contact-us-link">
<arguments>
<argument name="label" xsi:type="string">Contact Us</argument>
<argument name="path" xsi:type="string">contacts</argument>
diff --git a/app/code/Magento/Core/Block/AbstractBlock.php b/app/code/Magento/Core/Block/AbstractBlock.php
index 452e3172fc8..0c49aefc14b 100644
--- a/app/code/Magento/Core/Block/AbstractBlock.php
+++ b/app/code/Magento/Core/Block/AbstractBlock.php
@@ -327,6 +327,7 @@ abstract class AbstractBlock extends \Magento\Object implements BlockInterface
if ($block instanceof self) {
$block = $block->getNameInLayout();
}
+
$layout->setChild($thisName, $block, $alias);
return $this;
@@ -554,23 +555,6 @@ abstract class AbstractBlock extends \Magento\Object implements BlockInterface
return $this->insert($element, null, true, $alias);
}
- /**
- * Add self to the specified group of parent block
- *
- * @param string $groupName
- * @return \Magento\Core\Block\AbstractBlock|bool
- */
- public function addToParentGroup($groupName)
- {
- $layout = $this->getLayout();
- if (!$layout) {
- return false;
- }
- $layout->addToParentGroup($this->getNameInLayout(), $groupName);
-
- return $this;
- }
-
/**
* Get a group of child blocks
*
diff --git a/app/code/Magento/Core/Block/Template.php b/app/code/Magento/Core/Block/Template.php
index 0de003c13e9..f067fcbb201 100644
--- a/app/code/Magento/Core/Block/Template.php
+++ b/app/code/Magento/Core/Block/Template.php
@@ -45,8 +45,14 @@ class Template extends \Magento\Core\Block\AbstractBlock
*/
protected $_viewVars = array();
+ /**
+ * @var string
+ */
protected $_baseUrl;
+ /**
+ * @var string
+ */
protected $_jsUrl;
/**
@@ -84,9 +90,9 @@ class Template extends \Magento\Core\Block\AbstractBlock
protected $_template;
/**
- * @var \Magento\Core\Model\TemplateEngine\Pool
+ * @var \Magento\View\TemplateEngineFactory
*/
- protected $_templateEnginePool;
+ protected $_templateEngineFactory;
/**
* Core data
@@ -116,7 +122,7 @@ class Template extends \Magento\Core\Block\AbstractBlock
$this->_logger = $context->getLogger();
$this->_filesystem = $context->getFilesystem();
$this->_viewFileSystem = $context->getViewFileSystem();
- $this->_templateEnginePool = $context->getEnginePool();
+ $this->_templateEngineFactory = $context->getEngineFactory();
$this->_storeManager = $context->getApp();
parent::__construct($context, $data);
}
@@ -225,7 +231,7 @@ class Template extends \Magento\Core\Block\AbstractBlock
|| $this->_getAllowSymlinks()) && $this->_filesystem->isFile($fileName)
) {
$extension = pathinfo($fileName, PATHINFO_EXTENSION);
- $templateEngine = $this->_templateEnginePool->get($extension);
+ $templateEngine = $this->_templateEngineFactory->get($extension);
$html = $templateEngine->render($this, $fileName, $this->_viewVars);
} else {
$html = '';
diff --git a/app/code/Magento/Core/Block/Template/Context.php b/app/code/Magento/Core/Block/Template/Context.php
index 38a6fa12191..4e5852162c8 100644
--- a/app/code/Magento/Core/Block/Template/Context.php
+++ b/app/code/Magento/Core/Block/Template/Context.php
@@ -38,9 +38,9 @@ class Context extends \Magento\Core\Block\Context
protected $_viewFileSystem;
/**
- * @var \Magento\Core\Model\TemplateEngine\Pool
+ * @var \Magento\View\TemplateEngineFactory
*/
- protected $_enginePool;
+ protected $_engineFactory;
/**
* @param \Magento\App\RequestInterface $request
@@ -61,7 +61,7 @@ class Context extends \Magento\Core\Block\Context
* @param \Magento\Core\Model\Logger $logger
* @param \Magento\Filesystem $filesystem
* @param \Magento\Core\Model\View\FileSystem $viewFileSystem
- * @param \Magento\Core\Model\TemplateEngine\Pool $enginePool
+ * @param \Magento\View\TemplateEngineFactory $engineFactory
* @param \Magento\Core\Model\App $app
*/
public function __construct(
@@ -83,7 +83,7 @@ class Context extends \Magento\Core\Block\Context
\Magento\Core\Model\Logger $logger,
\Magento\Filesystem $filesystem,
\Magento\Core\Model\View\FileSystem $viewFileSystem,
- \Magento\Core\Model\TemplateEngine\Pool $enginePool,
+ \Magento\View\TemplateEngineFactory $engineFactory,
\Magento\Core\Model\App $app
) {
parent::__construct(
@@ -95,7 +95,7 @@ class Context extends \Magento\Core\Block\Context
$this->_logger = $logger;
$this->_filesystem = $filesystem;
$this->_viewFileSystem = $viewFileSystem;
- $this->_enginePool = $enginePool;
+ $this->_engineFactory = $engineFactory;
}
/**
@@ -140,10 +140,10 @@ class Context extends \Magento\Core\Block\Context
/**
* Get the template engine pool instance
*
- * @return \Magento\Core\Model\TemplateEngine\Pool
+ * @return \Magento\View\TemplateEngineFactory
*/
- public function getEnginePool()
+ public function getEngineFactory()
{
- return $this->_enginePool;
+ return $this->_engineFactory;
}
}
diff --git a/app/code/Magento/Core/Controller/Varien/Action.php b/app/code/Magento/Core/Controller/Varien/Action.php
index 664f1570b50..98c72360509 100644
--- a/app/code/Magento/Core/Controller/Varien/Action.php
+++ b/app/code/Magento/Core/Controller/Varien/Action.php
@@ -293,7 +293,8 @@ class Action extends \Magento\App\Action\AbstractAction
foreach ($parameters as $key => $value) {
$pageHandles[] = $handle . '_' . $key . '_' . $value;
}
- return $this->getLayout()->getUpdate()->addPageHandles(array_reverse($pageHandles));
+ // Do not sort array going into add page handles. Ensure default layout handle is added first.
+ return $this->getLayout()->getUpdate()->addPageHandles($pageHandles);
}
/**
diff --git a/app/code/Magento/Core/Model/App.php b/app/code/Magento/Core/Model/App.php
index 5ae9baef6c9..4cd0af35142 100644
--- a/app/code/Magento/Core/Model/App.php
+++ b/app/code/Magento/Core/Model/App.php
@@ -51,7 +51,7 @@ class App implements \Magento\Core\Model\AppInterface
/**
* Magento version
*/
- const VERSION = '2.0.0.0-dev49';
+ const VERSION = '2.0.0.0-dev50';
/**
* Custom application dirs
@@ -836,7 +836,7 @@ class App implements \Magento\Core\Model\AppInterface
'revision' => '0',
'patch' => '0',
'stability' => 'dev',
- 'number' => '49',
+ 'number' => '50',
);
}
}
diff --git a/app/code/Magento/Core/Model/Design/Fallback/Factory.php b/app/code/Magento/Core/Model/Design/Fallback/Factory.php
deleted file mode 100644
index 684b41d6ddf..00000000000
--- a/app/code/Magento/Core/Model/Design/Fallback/Factory.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-
-/**
- * Factory that produces all sorts of fallback rules
- */
-namespace Magento\Core\Model\Design\Fallback;
-
-class Factory
-{
- /**
- * @var \Magento\App\Dir
- */
- private $_dirs;
-
- /**
- * Constructor
- *
- * @param \Magento\App\Dir $dirs
- */
- public function __construct(\Magento\App\Dir $dirs)
- {
- $this->_dirs = $dirs;
- }
-
- /**
- * Retrieve newly created fallback rule for locale files, such as CSV translation maps
- *
- * @return \Magento\Core\Model\Design\Fallback\Rule\RuleInterface
- */
- public function createLocaleFileRule()
- {
- $themesDir = $this->_dirs->getDir(\Magento\App\Dir::THEMES);
- return new \Magento\Core\Model\Design\Fallback\Rule\Theme(
- new \Magento\Core\Model\Design\Fallback\Rule\Simple("$themesDir/<area>/<theme_path>/i18n/<locale>")
- );
- }
-
- /**
- * Retrieve newly created fallback rule for dynamic view files, such as layouts and templates
- *
- * @return \Magento\Core\Model\Design\Fallback\Rule\RuleInterface
- */
- public function createFileRule()
- {
- $themesDir = $this->_dirs->getDir(\Magento\App\Dir::THEMES);
- $modulesDir = $this->_dirs->getDir(\Magento\App\Dir::MODULES);
- return new \Magento\Core\Model\Design\Fallback\Rule\ModularSwitch(
- new \Magento\Core\Model\Design\Fallback\Rule\Theme(
- new \Magento\Core\Model\Design\Fallback\Rule\Simple(
- "$themesDir/<area>/<theme_path>"
- )
- ),
- new \Magento\Core\Model\Design\Fallback\Rule\Composite(array(
- new \Magento\Core\Model\Design\Fallback\Rule\Theme(
- new \Magento\Core\Model\Design\Fallback\Rule\Simple(
- "$themesDir/<area>/<theme_path>/<namespace>_<module>"
- )
- ),
- new \Magento\Core\Model\Design\Fallback\Rule\Simple(
- "$modulesDir/<namespace>/<module>/view/<area>"
- ),
- ))
- );
- }
-
- /**
- * Retrieve newly created fallback rule for static view files, such as CSS, JavaScript, images, etc.
- *
- * @return \Magento\Core\Model\Design\Fallback\Rule\RuleInterface
- */
- public function createViewFileRule()
- {
- $themesDir = $this->_dirs->getDir(\Magento\App\Dir::THEMES);
- $modulesDir = $this->_dirs->getDir(\Magento\App\Dir::MODULES);
- $pubLibDir = $this->_dirs->getDir(\Magento\App\Dir::PUB_LIB);
- return new \Magento\Core\Model\Design\Fallback\Rule\ModularSwitch(
- new \Magento\Core\Model\Design\Fallback\Rule\Composite(array(
- new \Magento\Core\Model\Design\Fallback\Rule\Theme(
- new \Magento\Core\Model\Design\Fallback\Rule\Composite(array(
- new \Magento\Core\Model\Design\Fallback\Rule\Simple(
- "$themesDir/<area>/<theme_path>/i18n/<locale>", array('locale')
- ),
- new \Magento\Core\Model\Design\Fallback\Rule\Simple(
- "$themesDir/<area>/<theme_path>"
- ),
- ))
- ),
- new \Magento\Core\Model\Design\Fallback\Rule\Simple($pubLibDir),
- )),
- new \Magento\Core\Model\Design\Fallback\Rule\Composite(array(
- new \Magento\Core\Model\Design\Fallback\Rule\Theme(
- new \Magento\Core\Model\Design\Fallback\Rule\Composite(array(
- new \Magento\Core\Model\Design\Fallback\Rule\Simple(
- "$themesDir/<area>/<theme_path>/i18n/<locale>/<namespace>_<module>", array('locale')
- ),
- new \Magento\Core\Model\Design\Fallback\Rule\Simple(
- "$themesDir/<area>/<theme_path>/<namespace>_<module>"
- ),
- ))
- ),
- new \Magento\Core\Model\Design\Fallback\Rule\Simple(
- "$modulesDir/<namespace>/<module>/view/<area>/i18n/<locale>", array('locale')
- ),
- new \Magento\Core\Model\Design\Fallback\Rule\Simple(
- "$modulesDir/<namespace>/<module>/view/<area>"
- ),
- ))
- );
- }
-}
diff --git a/app/code/Magento/Core/Model/Design/FileResolution/Strategy/Fallback/CachingProxy.php b/app/code/Magento/Core/Model/Design/FileResolution/Strategy/Fallback/CachingProxy.php
deleted file mode 100644
index f46081438d6..00000000000
--- a/app/code/Magento/Core/Model/Design/FileResolution/Strategy/Fallback/CachingProxy.php
+++ /dev/null
@@ -1,292 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category Magento
- * @package Magento_Core
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-
-/**
- * A proxy for the Fallback resolver. This proxy processes fallback resolution calls by either using map of cached
- * paths, or passing resolution to the Fallback resolver.
- */
-namespace Magento\Core\Model\Design\FileResolution\Strategy\Fallback;
-
-class CachingProxy implements
- \Magento\Core\Model\Design\FileResolution\Strategy\FileInterface,
- \Magento\Core\Model\Design\FileResolution\Strategy\LocaleInterface,
- \Magento\Core\Model\Design\FileResolution\Strategy\ViewInterface,
- \Magento\Core\Model\Design\FileResolution\Strategy\View\NotifiableInterface
-{
- /**
- * Proxied fallback model
- *
- * @var \Magento\Core\Model\Design\FileResolution\Strategy\Fallback
- */
- protected $_fallback;
-
- /**
- * @var \Magento\Filesystem
- */
- protected $_filesystem;
-
- /**
- * Path to maps directory
- *
- * @var string
- */
- protected $_mapDir;
-
- /**
- * Path to Magento base directory
- *
- * @var string
- */
- protected $_baseDir;
-
- /**
- * Whether object can save map changes upon destruction
- *
- * @var bool
- */
- protected $_canSaveMap;
-
- /**
- * Cached fallback map sections
- *
- * @var array
- */
- protected $_sections = array();
-
- /**
- * @param \Magento\Core\Model\Design\FileResolution\Strategy\Fallback $fallback
- * @param \Magento\Filesystem $filesystem
- * @param string $mapDir
- * @param string $baseDir
- * @param bool $canSaveMap
- * @throws \InvalidArgumentException
- */
- public function __construct(
- \Magento\Core\Model\Design\FileResolution\Strategy\Fallback $fallback,
- \Magento\Filesystem $filesystem,
- $mapDir,
- $baseDir,
- $canSaveMap = true
- ) {
- $this->_fallback = $fallback;
- $this->_filesystem = $filesystem;
- if (!$filesystem->isDirectory($baseDir)) {
- throw new \InvalidArgumentException("Wrong base directory specified: '{$baseDir}'");
- }
- $this->_baseDir = $baseDir;
- $this->_mapDir = $mapDir;
- $this->_canSaveMap = $canSaveMap;
- }
-
- /**
- * Write the serialized map to the section files
- */
- public function __destruct()
- {
- if (!$this->_canSaveMap) {
- return;
- }
- if (!$this->_filesystem->isDirectory($this->_mapDir)) {
- $this->_filesystem->createDirectory($this->_mapDir, 0777);
- }
- foreach ($this->_sections as $sectionFile => $section) {
- if (!$section['is_changed']) {
- continue;
- }
- $filePath = $this->_mapDir . DIRECTORY_SEPARATOR . $sectionFile;
- $this->_filesystem->write($filePath, serialize($section['data']));
- }
- }
-
- /**
- * Proxy to \Magento\Core\Model\Design\FileResolution\Strategy\Fallback::getFile()
- *
- * @param string $area
- * @param \Magento\View\Design\ThemeInterface $themeModel
- * @param string $file
- * @param string|null $module
- * @return string
- */
- public function getFile($area, \Magento\View\Design\ThemeInterface $themeModel, $file, $module = null)
- {
- $result = $this->_getFromMap('file', $area, $themeModel, null, $module, $file);
- if (!$result) {
- $result = $this->_fallback->getFile($area, $themeModel, $file, $module);
- $this->_setToMap('file', $area, $themeModel, null, $module, $file, $result);
- }
- return $result;
- }
-
- /**
- * Proxy to \Magento\Core\Model\Design\FileResolution\Strategy\Fallback::getLocaleFile()
- *
- * @param string $area
- * @param \Magento\View\Design\ThemeInterface $themeModel
- * @param string $locale
- * @param string $file
- * @return string
- */
- public function getLocaleFile($area, \Magento\View\Design\ThemeInterface $themeModel, $locale, $file)
- {
- $result = $this->_getFromMap('locale', $area, $themeModel, $locale, null, $file);
- if (!$result) {
- $result = $this->_fallback->getLocaleFile($area, $themeModel, $locale, $file);
- $this->_getFromMap('locale', $area, $themeModel, $locale, null, $file, $result);
- }
- return $result;
- }
-
- /**
- * Proxy to \Magento\Core\Model\Design\FileResolution\Strategy\Fallback::getViewFile()
- *
- * @param string $area
- * @param \Magento\View\Design\ThemeInterface $themeModel
- * @param string $locale
- * @param string $file
- * @param string|null $module
- * @return string
- */
- public function getViewFile($area, \Magento\View\Design\ThemeInterface $themeModel, $locale, $file, $module = null)
- {
- $result = $this->_getFromMap('view', $area, $themeModel, $locale, $module, $file);
- if (!$result) {
- $result = $this->_fallback->getViewFile($area, $themeModel, $locale, $file, $module);
- $this->_getFromMap('view', $area, $themeModel, $locale, $module, $file, $result);
- }
- return $result;
- }
-
- /**
- * Get stored full file path
- *
- * @param string $fileType
- * @param string $area
- * @param \Magento\View\Design\ThemeInterface $theme
- * @param string|null $locale
- * @param string|null $module
- * @param string $file
- * @return null|string
- */
- protected function _getFromMap(
- $fileType, $area, \Magento\View\Design\ThemeInterface $theme, $locale, $module, $file
- ) {
- $sectionKey = $this->_loadSection($area, $theme, $locale);
- $fileKey = "$fileType|$file|$module";
- if (isset($this->_sections[$sectionKey]['data'][$fileKey])) {
- $value = $this->_sections[$sectionKey]['data'][$fileKey];
- if ('' !== (string)$value) {
- $value = $this->_baseDir . DIRECTORY_SEPARATOR . $value;
- }
- return $value;
- }
- return null;
- }
-
- /**
- * Set stored full file path
- *
- * @param string $fileType
- * @param string $area
- * @param \Magento\View\Design\ThemeInterface $theme
- * @param string|null $locale
- * @param string|null $module
- * @param string $file
- * @param string $filePath
- * @throws \Magento\Exception
- */
- protected function _setToMap(
- $fileType, $area, \Magento\View\Design\ThemeInterface $theme, $locale, $module, $file, $filePath
- ) {
- $pattern = $this->_baseDir . DIRECTORY_SEPARATOR;
- if (0 !== strpos($filePath, $pattern)) {
- throw new \Magento\Exception(
- "Attempt to store fallback path '{$filePath}', which is not within '{$pattern}'"
- );
- }
- $value = substr($filePath, strlen($pattern));
-
- $sectionKey = $this->_loadSection($area, $theme, $locale);
- $fileKey = "$fileType|$file|$module";
- $this->_sections[$sectionKey]['data'][$fileKey] = $value;
- $this->_sections[$sectionKey]['is_changed'] = true;
- }
-
- /**
- * Compose section file name
- *
- * @param string $area
- * @param \Magento\View\Design\ThemeInterface $themeModel
- * @param string|null $locale
- * @return string
- */
- protected function _getSectionFile($area, \Magento\View\Design\ThemeInterface $themeModel, $locale)
- {
- $theme = $themeModel->getId() ?: md5($themeModel->getThemePath());
- return "{$area}_{$theme}_{$locale}.ser";
- }
-
- /**
- * Load section and return its key
- *
- * @param string $area
- * @param \Magento\View\Design\ThemeInterface $themeModel
- * @param string|null $locale
- * @return string
- */
- protected function _loadSection($area, \Magento\View\Design\ThemeInterface $themeModel, $locale)
- {
- $sectionFile = $this->_getSectionFile($area, $themeModel, $locale);
- if (!isset($this->_sections[$sectionFile])) {
- $filePath = $this->_mapDir . DIRECTORY_SEPARATOR . $sectionFile;
- $this->_sections[$sectionFile] = array(
- 'data' => array(),
- 'is_changed' => false,
- );
- if ($this->_filesystem->isFile($filePath)) {
- $this->_sections[$sectionFile]['data'] = unserialize($this->_filesystem->read($filePath));
- }
- }
- return $sectionFile;
- }
-
- /**
- * Set file path to map.
- *
- * @param string $area
- * @param \Magento\View\Design\ThemeInterface $themeModel
- * @param string $locale
- * @param string|null $module
- * @param string $file
- * @param string $newFilePath
- * @return \Magento\Core\Model\Design\FileResolution\Strategy\Fallback\CachingProxy
- */
- public function setViewFilePathToMap(
- $area, \Magento\View\Design\ThemeInterface $themeModel, $locale, $module, $file, $newFilePath
- ) {
- $this->_setToMap('view', $area, $themeModel, $locale, $module, $file, $newFilePath);
- return $this;
- }
-}
diff --git a/app/code/Magento/Core/Model/Design/FileResolution/StrategyPool.php b/app/code/Magento/Core/Model/Design/FileResolution/StrategyPool.php
deleted file mode 100644
index 0f18e0351ef..00000000000
--- a/app/code/Magento/Core/Model/Design/FileResolution/StrategyPool.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category Magento
- * @package Magento_Core
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-
-/**
- * Class for choosing the strategy for file resolution
- */
-namespace Magento\Core\Model\Design\FileResolution;
-
-class StrategyPool
-{
- /**
- * Sub-directory where to store maps of view files fallback (if used)
- */
- const FALLBACK_MAP_DIR = 'maps/fallback';
-
- /**
- * @var \Magento\ObjectManager
- */
- protected $_objectManager;
-
- /**
- * @var string
- */
- protected $_appState;
-
- /**
- * @var \Magento\Filesystem
- */
- protected $_filesystem;
-
- /**
- * @var \Magento\App\Dir
- */
- protected $_dirs;
-
- /**
- * Pool of strategy objects
- *
- * @var array
- */
- protected $_strategyPool = array();
-
- /**
- * Settings for strategies that are used to resolve file paths
- *
- * @var array
- */
- protected $_strategies = array(
- 'production_mode' => array(
- 'file' => 'Magento\Core\Model\Design\FileResolution\Strategy\Fallback\CachingProxy',
- 'locale' => 'Magento\Core\Model\Design\FileResolution\Strategy\Fallback',
- 'view' => 'Magento\Core\Model\Design\FileResolution\Strategy\Fallback',
- ),
- 'caching_map' => array(
- 'file' => 'Magento\Core\Model\Design\FileResolution\Strategy\Fallback\CachingProxy',
- 'locale' => 'Magento\Core\Model\Design\FileResolution\Strategy\Fallback\CachingProxy',
- 'view' => 'Magento\Core\Model\Design\FileResolution\Strategy\Fallback\CachingProxy',
- ),
- 'full_check' => array(
- 'file' => 'Magento\Core\Model\Design\FileResolution\Strategy\Fallback',
- 'locale' => 'Magento\Core\Model\Design\FileResolution\Strategy\Fallback',
- 'view' => 'Magento\Core\Model\Design\FileResolution\Strategy\Fallback',
- ),
- );
-
- /**
- * @param \Magento\ObjectManager $objectManager
- * @param \Magento\App\State $appState
- * @param \Magento\App\Dir $dirs
- * @param \Magento\Filesystem $filesystem
- */
- public function __construct(
- \Magento\ObjectManager $objectManager,
- \Magento\App\State $appState,
- \Magento\App\Dir $dirs,
- \Magento\Filesystem $filesystem
- ) {
- $this->_objectManager = $objectManager;
- $this->_appState = $appState;
- $this->_filesystem = $filesystem;
- $this->_dirs = $dirs;
- }
-
- /**
- * Get strategy to resolve dynamic files (e.g. templates)
- *
- * @param bool $skipProxy
- * @return \Magento\Core\Model\Design\FileResolution\Strategy\FileInterface
- */
- public function getFileStrategy($skipProxy = false)
- {
- return $this->_getStrategy('file', $skipProxy);
- }
-
- /**
- * * Get strategy to resolve locale files (e.g. locale settings)
- *
- * @param bool $skipProxy
- * @return \Magento\Core\Model\Design\FileResolution\Strategy\LocaleInterface
- */
- public function getLocaleStrategy($skipProxy = false)
- {
- return $this->_getStrategy('locale', $skipProxy);
- }
-
- /**
- * Get strategy to resolve static view files (e.g. javascripts)
- *
- * @param bool $skipProxy
- * @return \Magento\Core\Model\Design\FileResolution\Strategy\ViewInterface
- */
- public function getViewStrategy($skipProxy = false)
- {
- return $this->_getStrategy('view', $skipProxy);
- }
-
- /**
- * Determine the strategy to be used. Create or get it from the pool.
- *
- * @param string $fileType
- * @param bool $skipProxy
- * @return mixed
- */
- protected function _getStrategy($fileType, $skipProxy = false)
- {
- $strategyClass = $this->_getStrategyClass($fileType, $skipProxy);
- if (!isset($this->_strategyPool[$strategyClass])) {
- $this->_strategyPool[$strategyClass] = $this->_createStrategy($strategyClass);
- }
- return $this->_strategyPool[$strategyClass];
- }
-
- /**
- * Find the class of strategy, that must be used to resolve files of $fileType
- *
- * @param string $fileType
- * @param bool $skipProxy
- * @return string
- * @throws \Magento\Core\Exception
- */
- protected function _getStrategyClass($fileType, $skipProxy = false)
- {
- $mode = $this->_appState->getMode();
- if ($mode == \Magento\App\State::MODE_PRODUCTION) {
- $strategyClasses = $this->_strategies['production_mode'];
- } else if (($mode == \Magento\App\State::MODE_DEVELOPER) || $skipProxy) {
- $strategyClasses = $this->_strategies['full_check'];
- } else if ($mode == \Magento\App\State::MODE_DEFAULT) {
- $strategyClasses = $this->_strategies['caching_map'];
- } else {
- throw new \Magento\Core\Exception("Unknown mode to choose strategy: {$mode}");
- }
- return $strategyClasses[$fileType];
- }
-
- /**
- * Create strategy by its class name
- *
- * @param string $className
- * @return mixed
- */
- protected function _createStrategy($className)
- {
- switch ($className) {
- case 'Magento\Core\Model\Design\FileResolution\Strategy\Fallback\CachingProxy':
- $mapDir = $this->_dirs->getDir(\Magento\App\Dir::VAR_DIR) . DIRECTORY_SEPARATOR
- . self::FALLBACK_MAP_DIR;
- $arguments = array(
- 'mapDir' => str_replace('/', DIRECTORY_SEPARATOR, $mapDir),
- 'baseDir' => $this->_dirs->getDir(\Magento\App\Dir::ROOT),
- );
- break;
- default:
- $arguments = array();
- break;
- }
- return $this->_objectManager->create($className, $arguments);
- }
-}
diff --git a/app/code/Magento/Core/Model/Factory/Helper.php b/app/code/Magento/Core/Model/Factory/Helper.php
index 7059b3e9482..d8d98b7af59 100644
--- a/app/code/Magento/Core/Model/Factory/Helper.php
+++ b/app/code/Magento/Core/Model/Factory/Helper.php
@@ -64,7 +64,7 @@ class Helper
if (false === ($helper instanceof \Magento\Core\Helper\AbstractHelper)) {
throw new \LogicException(
- $className . ' doesn\'t extends Magento\Core\Helper\AbstractHelper'
+ $className . ' doesn\'t extends Magento\App\Helper'
);
}
diff --git a/app/code/Magento/Core/Model/Layout.php b/app/code/Magento/Core/Model/Layout.php
index 559ae3853da..e8d706d5671 100644
--- a/app/code/Magento/Core/Model/Layout.php
+++ b/app/code/Magento/Core/Model/Layout.php
@@ -867,12 +867,18 @@ class Layout extends \Magento\Simplexml\Config implements \Magento\View\LayoutIn
throw new \Magento\Exception("Unexpected element type specified for generating block: {$type}.");
}
+
$configPath = (string)$node->getAttribute('ifconfig');
if (!empty($configPath) && !$this->_coreStoreConfig->getConfigFlag($configPath)) {
$this->_scheduledStructure->unsetElement($elementName);
return;
}
+ $group = (string)$node->getAttribute('group');
+ if (!empty($group)) {
+ $this->_structure->addToParentGroup($elementName, $group);
+ }
+
// create block
$className = (string)$node['class'];
diff --git a/app/code/Magento/Core/Model/Layout/File/Source/Aggregated.php b/app/code/Magento/Core/Model/Layout/File/Source/Aggregated.php
deleted file mode 100644
index 89c4ad29fe2..00000000000
--- a/app/code/Magento/Core/Model/Layout/File/Source/Aggregated.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-
-/**
- * Source of layout files aggregated from a theme and its parents according to merging and overriding conventions
- */
-namespace Magento\Core\Model\Layout\File\Source;
-
-class Aggregated implements \Magento\Core\Model\Layout\File\SourceInterface
-{
- /**
- * @var \Magento\Core\Model\Layout\File\FileList\Factory
- */
- private $_fileListFactory;
-
- /**
- * @var \Magento\Core\Model\Layout\File\SourceInterface
- */
- private $_baseFiles;
-
- /**
- * @var \Magento\Core\Model\Layout\File\SourceInterface
- */
- private $_themeFiles;
-
- /**
- * @var \Magento\Core\Model\Layout\File\SourceInterface
- */
- private $_overridingBaseFiles;
-
- /**
- * @var \Magento\Core\Model\Layout\File\SourceInterface
- */
- private $_overridingThemeFiles;
-
- /**
- * @param \Magento\Core\Model\Layout\File\FileList\Factory $fileListFactory
- * @param \Magento\Core\Model\Layout\File\SourceInterface $baseFiles
- * @param \Magento\Core\Model\Layout\File\SourceInterface $themeFiles
- * @param \Magento\Core\Model\Layout\File\SourceInterface $overridingBaseFiles
- * @param \Magento\Core\Model\Layout\File\SourceInterface $overridingThemeFiles
- */
- public function __construct(
- \Magento\Core\Model\Layout\File\FileList\Factory $fileListFactory,
- \Magento\Core\Model\Layout\File\SourceInterface $baseFiles,
- \Magento\Core\Model\Layout\File\SourceInterface $themeFiles,
- \Magento\Core\Model\Layout\File\SourceInterface $overridingBaseFiles,
- \Magento\Core\Model\Layout\File\SourceInterface $overridingThemeFiles
- ) {
- $this->_fileListFactory = $fileListFactory;
- $this->_baseFiles = $baseFiles;
- $this->_themeFiles = $themeFiles;
- $this->_overridingBaseFiles = $overridingBaseFiles;
- $this->_overridingThemeFiles = $overridingThemeFiles;
- }
-
- /**
- * Aggregate layout files from modules and a theme and its ancestors
- *
- * {@inheritdoc}
- */
- public function getFiles(\Magento\View\Design\ThemeInterface $theme)
- {
- $list = $this->_fileListFactory->create();
- $list->add($this->_baseFiles->getFiles($theme));
- foreach ($this->_getInheritedThemes($theme) as $currentTheme) {
- $list->add($this->_themeFiles->getFiles($currentTheme));
- $list->replace($this->_overridingBaseFiles->getFiles($currentTheme));
- $list->replace($this->_overridingThemeFiles->getFiles($currentTheme));
- }
- return $list->getAll();
- }
-
- /**
- * Return the full theme inheritance sequence, from the root theme till a specified one
- *
- * @param \Magento\View\Design\ThemeInterface $theme
- * @return \Magento\View\Design\ThemeInterface[] Format: array([<root_theme>, ..., <parent_theme>,] <current_theme>)
- */
- protected function _getInheritedThemes(\Magento\View\Design\ThemeInterface $theme)
- {
- $result = array();
- while ($theme) {
- $result[] = $theme;
- $theme = $theme->getParentTheme();
- }
- return array_reverse($result);
- }
-}
diff --git a/app/code/Magento/Core/Model/Layout/File/Source/Base.php b/app/code/Magento/Core/Model/Layout/File/Source/Base.php
deleted file mode 100644
index 2276624f22f..00000000000
--- a/app/code/Magento/Core/Model/Layout/File/Source/Base.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-
-/**
- * Source of base layout files introduced by modules
- */
-namespace Magento\Core\Model\Layout\File\Source;
-
-class Base implements \Magento\Core\Model\Layout\File\SourceInterface
-{
- /**
- * @var \Magento\Filesystem
- */
- private $_filesystem;
-
- /**
- * @var \Magento\App\Dir
- */
- private $_dirs;
-
- /**
- * @var \Magento\Core\Model\Layout\File\Factory
- */
- private $_fileFactory;
-
- /**
- * @param \Magento\Filesystem $filesystem
- * @param \Magento\App\Dir $dirs
- * @param \Magento\Core\Model\Layout\File\Factory $fileFactory
- */
- public function __construct(
- \Magento\Filesystem $filesystem,
- \Magento\App\Dir $dirs,
- \Magento\Core\Model\Layout\File\Factory $fileFactory
- ) {
- $this->_filesystem = $filesystem;
- $this->_dirs = $dirs;
- $this->_fileFactory = $fileFactory;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getFiles(\Magento\View\Design\ThemeInterface $theme)
- {
- $namespace = $module = '*';
- $area = $theme->getArea();
- $files = $this->_filesystem->searchKeys(
- $this->_dirs->getDir(\Magento\App\Dir::MODULES),
- "{$namespace}/{$module}/view/{$area}/layout/*.xml"
- );
- $result = array();
- foreach ($files as $filename) {
- $moduleDir = dirname(dirname(dirname(dirname($filename))));
- $module = basename($moduleDir);
- $namespace = basename(dirname($moduleDir));
- $moduleFull = "{$namespace}_{$module}";
- $result[] = $this->_fileFactory->create($filename, $moduleFull);
- }
- return $result;
- }
-}
diff --git a/app/code/Magento/Core/Model/Layout/Merge.php b/app/code/Magento/Core/Model/Layout/Merge.php
index 7c7927de903..98b69109e8c 100644
--- a/app/code/Magento/Core/Model/Layout/Merge.php
+++ b/app/code/Magento/Core/Model/Layout/Merge.php
@@ -29,13 +29,12 @@
*/
namespace Magento\Core\Model\Layout;
-class Merge implements \Magento\View\Layout\ProcessorInterface
+class Merge implements \Magento\View\Layout\ProcessorInterface
{
/**#@+
* Available item type names
*/
const TYPE_PAGE = 'page';
- const TYPE_FRAGMENT = 'fragment';
/**#@-*/
/**
@@ -89,7 +88,7 @@ class Merge implements \Magento\View\Layout\ProcessorInterface
protected $_subst = null;
/**
- * @var \Magento\Core\Model\Layout\File\SourceInterface
+ * @var \Magento\View\Layout\File\SourceInterface
*/
private $_fileSource;
@@ -123,7 +122,7 @@ class Merge implements \Magento\View\Layout\ProcessorInterface
*
* @param \Magento\View\DesignInterface $design
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Core\Model\Layout\File\SourceInterface $fileSource,
+ * @param \Magento\View\Layout\File\SourceInterface $fileSource,
* @param \Magento\Core\Model\Resource\Layout\Update $resource
* @param \Magento\App\State $appState
* @param \Magento\Cache\FrontendInterface $cache
@@ -134,7 +133,7 @@ class Merge implements \Magento\View\Layout\ProcessorInterface
public function __construct(
\Magento\View\DesignInterface $design,
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Core\Model\Layout\File\SourceInterface $fileSource,
+ \Magento\View\Layout\File\SourceInterface $fileSource,
\Magento\Core\Model\Resource\Layout\Update $resource,
\Magento\App\State $appState,
\Magento\Cache\FrontendInterface $cache,
@@ -233,47 +232,17 @@ class Merge implements \Magento\View\Layout\ProcessorInterface
*/
public function addPageHandles(array $handlesToTry)
{
+ $handlesAdded = false;
foreach ($handlesToTry as $handleName) {
if (!$this->pageHandleExists($handleName)) {
continue;
}
- $handles = $this->getPageHandleParents($handleName);
$handles[] = $handleName;
-
- /* replace existing page handles with the new ones */
- foreach ($this->_pageHandles as $pageHandleName) {
- $this->removeHandle($pageHandleName);
- }
$this->_pageHandles = $handles;
$this->addHandle($handles);
- return true;
- }
- return false;
- }
-
- /**
- * Retrieve the all parent handles ordered from parent to child. The $isPageTypeOnly parameters controls,
- * whether only page type parent relation is processed.
- *
- * @param string $handleName
- * @param bool $isPageTypeOnly
- * @return array
- */
- public function getPageHandleParents($handleName, $isPageTypeOnly = true)
- {
- $result = array();
- $node = $this->_getPageHandleNode($handleName);
- while ($node) {
- $parentItem = $node->getAttribute('parent');
- if (!$parentItem && !$isPageTypeOnly) {
- $parentItem = $node->getAttribute('owner');
- }
- $node = $this->_getPageHandleNode($parentItem);
- if ($node) {
- $result[] = $parentItem;
- }
+ $handlesAdded = true;
}
- return array_reverse($result);
+ return $handlesAdded;
}
/**
@@ -303,7 +272,7 @@ class Merge implements \Magento\View\Layout\ProcessorInterface
if (empty($handles)) {
return null;
}
- $condition = '@type="' . self::TYPE_PAGE . '" or @type="' . self::TYPE_FRAGMENT . '"';
+ $condition = '@type="' . self::TYPE_PAGE . '"';
$nodes = $this->getFileLayoutUpdatesXml()->xpath("/layouts/handle[@id=\"{$handleName}\" and ($condition)]");
return $nodes ? reset($nodes) : null;
}
@@ -319,51 +288,27 @@ class Merge implements \Magento\View\Layout\ProcessorInterface
}
/**
- * Retrieve full hierarchy of types and fragment types in the system
+ * Retrieve all page and fragment types that exist in the system.
*
* Result format:
* array(
* 'handle_name_1' => array(
* 'name' => 'handle_name_1',
* 'label' => 'Handle Name 1',
- * 'children' => array(
- * 'handle_name_2' => array(
- * 'name' => 'handle_name_2',
- * 'label' => 'Handle Name 2',
- * 'type' => self::TYPE_PAGE or self::TYPE_FRAGMENT,
- * 'children' => array(
- * // ...
- * )
- * ),
- * // ...
- * )
+ * 'type' => self::TYPE_PAGE,
* ),
* // ...
* )
*
* @return array
*/
- public function getPageHandlesHierarchy()
- {
- return $this->_getPageHandleChildren('');
- }
-
- /**
- * Retrieve recursively all children of a page handle
- *
- * @param string $parentName
- * @return array
- */
- protected function _getPageHandleChildren($parentName)
+ public function getAllPageHandles()
{
$result = array();
$conditions = array(
- '(@type="' . self::TYPE_PAGE . '" and ' . ($parentName ? "@parent='$parentName'" : 'not(@parent)') . ')'
+ '(@type="' . self::TYPE_PAGE . '")'
);
- if ($parentName) {
- $conditions[] = '(@type="' . self::TYPE_FRAGMENT . '" and @owner="' . $parentName . '")';
- }
$xpath = '/layouts/*[' . implode(' or ', $conditions) . ']';
$nodes = $this->getFileLayoutUpdatesXml()->xpath($xpath) ?: array();
/** @var $node \Magento\View\Layout\Element */
@@ -373,11 +318,7 @@ class Merge implements \Magento\View\Layout\ProcessorInterface
'name' => $name,
'label' => __((string)$node->getAttribute('label')),
'type' => $node->getAttribute('type'),
- 'children' => array()
);
- if ($info['type'] == self::TYPE_PAGE) {
- $info['children'] = $this->_getPageHandleChildren($name);
- }
$result[$name] = $info;
}
return $result;
diff --git a/app/code/Magento/Core/Model/Store/StorageFactory.php b/app/code/Magento/Core/Model/Store/StorageFactory.php
index ac28d5c395d..4abf47facef 100644
--- a/app/code/Magento/Core/Model/Store/StorageFactory.php
+++ b/app/code/Magento/Core/Model/Store/StorageFactory.php
@@ -65,7 +65,7 @@ class StorageFactory
protected $_config;
/**
- * @var \Magento\Core\Model\App\Proxy
+ * @var \Magento\Core\Model\AppInterface
*/
protected $_app;
@@ -79,7 +79,7 @@ class StorageFactory
* @param \Magento\Event\ManagerInterface $eventManager
* @param \Magento\Core\Model\Logger $log
* @param \Magento\Core\Model\ConfigInterface $config
- * @param \Magento\Core\Model\App\Proxy $app
+ * @param \Magento\Core\Model\AppInterface $app
* @param \Magento\App\State $appState
* @param string $defaultStorageClassName
* @param string $installedStoreClassName
@@ -89,7 +89,7 @@ class StorageFactory
\Magento\Event\ManagerInterface $eventManager,
\Magento\Core\Model\Logger $log,
\Magento\Core\Model\ConfigInterface $config,
- \Magento\Core\Model\App\Proxy $app,
+ \Magento\Core\Model\AppInterface $app,
\Magento\App\State $appState,
$defaultStorageClassName = 'Magento\Core\Model\Store\Storage\DefaultStorage',
$installedStoreClassName = 'Magento\Core\Model\Store\Storage\Db'
diff --git a/app/code/Magento/Core/Model/TemplateEngine/Decorator/DebugHints.php b/app/code/Magento/Core/Model/TemplateEngine/Decorator/DebugHints.php
index c7569483920..17546d991bc 100644
--- a/app/code/Magento/Core/Model/TemplateEngine/Decorator/DebugHints.php
+++ b/app/code/Magento/Core/Model/TemplateEngine/Decorator/DebugHints.php
@@ -25,10 +25,10 @@
*/
namespace Magento\Core\Model\TemplateEngine\Decorator;
-class DebugHints implements \Magento\Core\Model\TemplateEngine\EngineInterface
+class DebugHints implements \Magento\View\TemplateEngineInterface
{
/**
- * @var \Magento\Core\Model\TemplateEngine\EngineInterface
+ * @var \Magento\View\TemplateEngineInterface
*/
private $_subject;
@@ -38,11 +38,11 @@ class DebugHints implements \Magento\Core\Model\TemplateEngine\EngineInterface
private $_showBlockHints;
/**
- * @param \Magento\Core\Model\TemplateEngine\EngineInterface $subject
+ * @param \Magento\View\TemplateEngineInterface $subject
* @param bool $showBlockHints Whether to include block into the debugging information or not
*/
public function __construct(
- \Magento\Core\Model\TemplateEngine\EngineInterface $subject,
+ \Magento\View\TemplateEngineInterface $subject,
$showBlockHints
) {
$this->_subject = $subject;
diff --git a/app/code/Magento/Core/Model/TemplateEngine/Plugin/DebugHints.php b/app/code/Magento/Core/Model/TemplateEngine/Plugin/DebugHints.php
index cb0e63a238c..ac913ed7382 100644
--- a/app/code/Magento/Core/Model/TemplateEngine/Plugin/DebugHints.php
+++ b/app/code/Magento/Core/Model/TemplateEngine/Plugin/DebugHints.php
@@ -67,10 +67,10 @@ class DebugHints
/**
* Wrap template engine instance with the debugging hints decorator, depending of the store configuration
*
- * @param \Magento\Core\Model\TemplateEngine\EngineInterface $invocationResult
- * @return \Magento\Core\Model\TemplateEngine\EngineInterface
+ * @param \Magento\View\TemplateEngineInterface $invocationResult
+ * @return \Magento\View\TemplateEngineInterface
*/
- public function afterCreate(\Magento\Core\Model\TemplateEngine\EngineInterface $invocationResult)
+ public function afterCreate(\Magento\View\TemplateEngineInterface $invocationResult)
{
if ($this->_storeConfig->getConfig(self::XML_PATH_DEBUG_TEMPLATE_HINTS) && $this->_coreData->isDevAllowed()) {
$showBlockHints = $this->_storeConfig->getConfig(self::XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS);
diff --git a/app/code/Magento/Core/Model/Design/Source/Design.php b/app/code/Magento/Core/Model/Theme/Source/Theme.php
similarity index 74%
rename from app/code/Magento/Core/Model/Design/Source/Design.php
rename to app/code/Magento/Core/Model/Theme/Source/Theme.php
index 4d9318b89ef..5a65bd8d86b 100644
--- a/app/code/Magento/Core/Model/Design/Source/Design.php
+++ b/app/code/Magento/Core/Model/Theme/Source/Theme.php
@@ -27,21 +27,29 @@
/**
* Source model for eav attribute custom_design
*/
-namespace Magento\Core\Model\Design\Source;
+namespace Magento\Core\Model\Theme\Source;
-class Design extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
+use Magento\Core\Model\Theme\Label;
+use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
+
+/**
+ * Design
+ *
+ * @package Magento\View
+ */
+class Theme extends AbstractSource
{
/**
- * @var \Magento\Core\Model\Theme\Label
+ * @var Label
*/
- protected $_themeLabel;
+ protected $themeLabel;
/**
- * @param \Magento\Core\Model\Theme\Label $themeLabel
+ * @param Label $themeLabel
*/
- public function __construct(\Magento\Core\Model\Theme\Label $themeLabel)
+ public function __construct(Label $themeLabel)
{
- $this->_themeLabel = $themeLabel;
+ $this->themeLabel = $themeLabel;
}
/**
@@ -53,6 +61,6 @@ class Design extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
public function getAllOptions($withEmpty = true)
{
$label = $withEmpty ? __('-- Please Select --') : $withEmpty;
- return $this->_options = $this->_themeLabel->getLabelsCollection($label);
+ return $this->_options = $this->themeLabel->getLabelsCollection($label);
}
}
diff --git a/app/code/Magento/Core/Model/View/FileSystem.php b/app/code/Magento/Core/Model/View/FileSystem.php
index 513f0273284..2985cfdbb15 100644
--- a/app/code/Magento/Core/Model/View/FileSystem.php
+++ b/app/code/Magento/Core/Model/View/FileSystem.php
@@ -34,7 +34,7 @@ class FileSystem
/**
* Model, used to resolve the file paths
*
- * @var \Magento\Core\Model\Design\FileResolution\StrategyPool
+ * @var \Magento\View\Design\FileResolution\StrategyPool
*/
protected $_resolutionPool = null;
@@ -46,11 +46,11 @@ class FileSystem
/**
* View files system model
*
- * @param \Magento\Core\Model\Design\FileResolution\StrategyPool $resolutionPool
+ * @param \Magento\View\Design\FileResolution\StrategyPool $resolutionPool
* @param \Magento\Core\Model\View\Service $viewService
*/
public function __construct(
- \Magento\Core\Model\Design\FileResolution\StrategyPool $resolutionPool,
+ \Magento\View\Design\FileResolution\StrategyPool $resolutionPool,
\Magento\Core\Model\View\Service $viewService
) {
$this->_resolutionPool = $resolutionPool;
@@ -115,8 +115,8 @@ class FileSystem
{
$skipProxy = isset($params['skipProxy']) && $params['skipProxy'];
$strategy = $this->_resolutionPool->getViewStrategy($skipProxy);
- if ($strategy instanceof \Magento\Core\Model\Design\FileResolution\Strategy\View\NotifiableInterface) {
- /** @var $strategy \Magento\Core\Model\Design\FileResolution\Strategy\View\NotifiableInterface */
+ if ($strategy instanceof \Magento\View\Design\FileResolution\Strategy\View\NotifiableInterface) {
+ /** @var $strategy \Magento\View\Design\FileResolution\Strategy\View\NotifiableInterface */
$filePath = $this->_viewService->extractScope($fileId, $params);
$this->_viewService->updateDesignParams($params);
$strategy->setViewFilePathToMap(
diff --git a/app/code/Magento/Core/etc/di.xml b/app/code/Magento/Core/etc/di.xml
index 6da0b5e55b8..4fbddcb7a2b 100644
--- a/app/code/Magento/Core/etc/di.xml
+++ b/app/code/Magento/Core/etc/di.xml
@@ -156,7 +156,7 @@
</type>
<type name="Magento\Core\Model\Layout\Merge">
<param name="fileSource">
- <instance type="Magento\Core\Model\Layout\File\Source\Aggregated" />
+ <instance type="Magento\View\Layout\File\Source\Aggregated" />
</param>
<param name="cache">
<instance type="Magento\Core\Model\Cache\Type\Layout" />
@@ -167,57 +167,57 @@
<instance type="Magento\Core\Model\Cache\Type\Layout" />
</param>
</type>
- <virtualType name="layoutFileSourceBaseFiltered" type="Magento\Core\Model\Layout\File\Source\Decorator\ModuleOutput">
+ <virtualType name="layoutFileSourceBaseFiltered" type="Magento\View\Layout\File\Source\Decorator\ModuleOutput">
<param name="subject">
- <instance type="Magento\Core\Model\Layout\File\Source\Base" />
+ <instance type="Magento\View\Layout\File\Source\Base" />
</param>
</virtualType>
- <virtualType name="layoutFileSourceBaseSorted" type="Magento\Core\Model\Layout\File\Source\Decorator\ModuleDependency">
+ <virtualType name="layoutFileSourceBaseSorted" type="Magento\View\Layout\File\Source\Decorator\ModuleDependency">
<param name="subject">
<instance type="layoutFileSourceBaseFiltered" />
</param>
</virtualType>
- <virtualType name="layoutFileSourceThemeFiltered" type="Magento\Core\Model\Layout\File\Source\Decorator\ModuleOutput">
+ <virtualType name="layoutFileSourceThemeFiltered" type="Magento\View\Layout\File\Source\Decorator\ModuleOutput">
<param name="subject">
- <instance type="Magento\Core\Model\Layout\File\Source\Theme" />
+ <instance type="Magento\View\Layout\File\Source\Theme" />
</param>
</virtualType>
- <virtualType name="layoutFileSourceThemeSorted" type="Magento\Core\Model\Layout\File\Source\Decorator\ModuleDependency">
+ <virtualType name="layoutFileSourceThemeSorted" type="Magento\View\Layout\File\Source\Decorator\ModuleDependency">
<param name="subject">
<instance type="layoutFileSourceThemeFiltered" />
</param>
</virtualType>
- <virtualType name="layoutFileSourceOverrideBaseFiltered" type="Magento\Core\Model\Layout\File\Source\Decorator\ModuleOutput">
+ <virtualType name="layoutFileSourceOverrideBaseFiltered" type="Magento\View\Layout\File\Source\Decorator\ModuleOutput">
<param name="subject">
- <instance type="Magento\Core\Model\Layout\File\Source\Override\Base" />
+ <instance type="Magento\View\Layout\File\Source\Override\Base" />
</param>
</virtualType>
- <virtualType name="layoutFileSourceOverrideBaseSorted" type="Magento\Core\Model\Layout\File\Source\Decorator\ModuleDependency">
+ <virtualType name="layoutFileSourceOverrideBaseSorted" type="Magento\View\Layout\File\Source\Decorator\ModuleDependency">
<param name="subject">
<instance type="layoutFileSourceOverrideBaseFiltered" />
</param>
</virtualType>
- <virtualType name="layoutFileSourceOverrideThemeFiltered" type="Magento\Core\Model\Layout\File\Source\Decorator\ModuleOutput">
+ <virtualType name="layoutFileSourceOverrideThemeFiltered" type="Magento\View\Layout\File\Source\Decorator\ModuleOutput">
<param name="subject">
- <instance type="Magento\Core\Model\Layout\File\Source\Override\Theme" />
+ <instance type="Magento\View\Layout\File\Source\Override\Theme" />
</param>
</virtualType>
- <virtualType name="layoutFileSourceOverrideThemeSorted" type="Magento\Core\Model\Layout\File\Source\Decorator\ModuleDependency">
+ <virtualType name="layoutFileSourceOverrideThemeSorted" type="Magento\View\Layout\File\Source\Decorator\ModuleDependency">
<param name="subject">
<instance type="layoutFileSourceOverrideThemeFiltered" />
</param>
</virtualType>
- <type name="Magento\Core\Model\Layout\File\Source\Aggregated">
+ <type name="Magento\View\Layout\File\Source\Aggregated">
<param name="baseFiles">
<instance type="layoutFileSourceBaseSorted" />
</param>
<param name="themeFiles">
<instance type="layoutFileSourceThemeSorted" />
</param>
- <param name="overridingBaseFiles">
+ <param name="overrideBaseFiles">
<instance type="layoutFileSourceOverrideBaseSorted" />
</param>
- <param name="overridingThemeFiles">
+ <param name="overrideThemeFiles">
<instance type="layoutFileSourceOverrideThemeSorted" />
</param>
</type>
@@ -419,12 +419,7 @@
<instance type="Magento\Core\Model\View\Design\Proxy" />
</param>
</type>
- <type name="Magento\Core\Model\TemplateEngine\Factory">
+ <type name="Magento\View\TemplateEngineFactory">
<plugin name="debug_hints" type="Magento\Core\Model\TemplateEngine\Plugin\DebugHints" sortOrder="10"/>
- <param name="engines">
- <value>
- <phtml>Magento\Core\Model\TemplateEngine\Php</phtml>
- </value>
- </param>
</type>
</config>
diff --git a/app/code/Magento/Core/etc/layouts.xsd b/app/code/Magento/Core/etc/layouts.xsd
index 420274c0494..a4c8593c6b4 100644
--- a/app/code/Magento/Core/etc/layouts.xsd
+++ b/app/code/Magento/Core/etc/layouts.xsd
@@ -135,7 +135,6 @@
<xs:simpleType name="handlePageType">
<xs:restriction base="xs:string">
<xs:enumeration value="page"/>
- <xs:enumeration value="fragment"/>
</xs:restriction>
</xs:simpleType>
@@ -229,6 +228,7 @@
<xs:attribute type="elementOutputType" name="output" use="optional"/>
<xs:attribute type="xs:string" name="acl" use="optional"/>
<xs:attribute type="xs:string" name="ifconfig" use="optional"/>
+ <xs:attribute type="xs:string" name="group" use="optional" />
</xs:complexType>
<xs:complexType name="dataType">
diff --git a/app/code/Magento/Core/etc/module.xml b/app/code/Magento/Core/etc/module.xml
index b531638f0ed..d1fc5a109bb 100755
--- a/app/code/Magento/Core/etc/module.xml
+++ b/app/code/Magento/Core/etc/module.xml
@@ -47,7 +47,6 @@
<module name="Magento_PaypalUk"/>
<module name="Magento_ProductAlert"/>
<module name="Magento_SalesRule"/>
- <module name="Magento_Eav"/>
<module name="Magento_Page"/>
<extension name="spl"/>
<extension name="dom"/>
diff --git a/app/code/Magento/Core/view/frontend/prototype/magento.css b/app/code/Magento/Core/view/frontend/prototype/magento.css
index 11a5aa8ba79..564b5c2b1eb 100644
--- a/app/code/Magento/Core/view/frontend/prototype/magento.css
+++ b/app/code/Magento/Core/view/frontend/prototype/magento.css
@@ -23,72 +23,214 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-.dialog { border:1px solid #555; }
-.dialog .bot { display:none !important; }
-.overlay_magento { background-color:#000; filter:alpha(opacity=60); -moz-opacity:.6; opacity:.6; -webkit-opacity:.6; }
-.top.table_window { border-bottom:1px solid #e6e6e6; background:#6a838b url(magento/top_bg.gif) 0 100% repeat-x; }
-
-.magento_nw { width:6px; height:28px; }
-.magento_n { height:28px; }
-.magento_ne { width:6px; height:28px; }
-
-.magento_w { width:6px; }
-.magento_e { width:6px; }
-.magento_w,
-.magento_e,
-.magento_content { background: #fafafa url(magento/content_bg.gif) 0 0 repeat-x; }
-
-.magento_sw { background:#deebf0; width:5px; height:3px; }
-.magento_s { background:#deebf0; height:3px; }
-.magento_se,
-
-.magento_sizer { background:#deebf0; width:5px; height:3px; }
-.magento_sizer { cursor:se-resize; }
-
-.magento_close { width:16px; height:16px; background:url(magento/window_close.png) no-repeat 0 0; position:absolute; top:5px; right:7px; cursor:pointer; z-index:1000; }
-
-.magento_title { float:left; width:100%; font:bold 12px/28px Arial, Helvetica, sans-serif; color:#fff; text-align:left; }
-
-.magento_content { overflow:auto; font-size:12px; }
-.magento_content,
-.magento_content label { color:#333; font-family:Arial, sans-serif; }
-
-.magento_buttons { padding:10px; text-align:right; }
-.magento_buttons input.button { border-width:1px; border-style:solid; border-color:#ed6502 #a04300 #a04300 #ed6502; background:#ffac47 url(magento/btn_bg.gif) 0 100% repeat-x; padding:0 7px 1px 7px; font:bold 12px/18px Arial, Helvetica, sans-serif; color:#fff; cursor:pointer; text-align:center; white-space:nowrap; }
-.magento_buttons button.button span span span { display:inline; background:none; padding:0; height:auto; }
-
-/* FOR IE */
-* html .magento_close { background-image:none; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/magento/window_close.png", sizingMethod="crop"); }
-
-
-.dialog.ui-dialog, .ui-dialog .ui-dialog-titlebar, .ui-dialog .ui-dialog-buttonset button.button { -webkit-border-radius: 0px; border-radius: 0px; }
-.dialog.ui-dialog { border:1px solid #555; display: none; padding: 0; }
-.ui-widget-overlay { background:#000; filter:alpha(opacity=60); -moz-opacity:.6; opacity:.6; -webkit-opacity:.6; position: absolute; left:0px; top:0px; }
-.ui-dialog .ui-dialog-titlebar { border-bottom:1px solid #e6e6e6; background:#6a838b url(magento/top_bg.gif) 0 100% repeat-x; height:28px; border: none; }
-.ui-dialog .ui-dialog-titlebar span { margin: 0px; }
-.ui-dialog .ui-dialog-title { float:left; width:100%; font:bold 12px/28px Arial, Helvetica, sans-serif; color:#fff; text-align:left; cursor: move; }
-.ui-dialog .ui-dialog-content, .ui-dialog .ui-dialog-titlebar, .ui-dialog .ui-dialog-buttonset { padding: 0 6px; }
-.ui-dialog .ui-icon { text-indent: -99999px; }
-.ui-dialog .ui-dialog-titlebar-close { width:16px; height:16px; background:url(magento/window_close.png) no-repeat 0 0; position:absolute; top:5px; right:7px; cursor:pointer; z-index:1000; margin: 0px; padding: 0; }
-.ui-dialog .ui-dialog-titlebar-close .ui-icon { display: none; }
-.ui-dialog .ui-dialog-titlebar-close.ui-state-hover { border: none; }
-.ui-dialog .ui-dialog-content form { display: block; overflow: hidden; }
-.ui-dialog .ui-dialog-content { background: #fafafa url(magento/content_bg.gif) 0 0 repeat-x; overflow: auto; }
-.ui-dialog .ui-dialog-buttonpane { background: #fafafa; margin: 0; padding: 0; border: none;}
-.ui-dialog .ui-dialog-buttonset { padding:10px; text-align:right; }
-.ui-dialog .ui-dialog-buttonset input.button { border-width:1px; border-style:solid; border-color:#ed6502 #a04300 #a04300 #ed6502; background:#ffac47 url(magento/btn_bg.gif) 0 100% repeat-x; padding:0 7px 1px 7px; font:bold 12px/18px Arial, Helvetica, sans-serif; color:#fff; cursor:pointer; text-align:center; white-space:nowrap; margin-left: 5px; }
-.ui-dialog .ui-dialog-buttonset button.button { margin-left: 5px; background: #FFAC47; border-color: #ED6502 #A04300 #A04300 #ED6502; border-style: solid; border-width: 1px; color: #FFFFFF; cursor: pointer; font: bold 12px arial,helvetica,sans-serif; padding: 0; }
-.ui-dialog .ui-dialog-buttonset button.button span { padding: 0 7px 1px; text-align: center !important; white-space: nowrap; display: block; background: transparent; height: auto; color:#ffffff; }
-.ui-dialog .ui-dialog-buttonset button.button span span span { display:inline; background:none; padding:0; height:auto; }
-
-.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; }
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
-.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
-.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: 0px; left: 0; }
-.ui-resizable-e { cursor: e-resize; width: 7px; right: 0px; top: 0; height: 100%; }
-.ui-resizable-w { cursor: w-resize; width: 7px; left: -7px; top: 0; height: 100%; }
-.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
-.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: 0px; }
-.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: 0px; top: -5px;}
+.ui-dialog {
+ background: #fff;
+ -webkit-box-shadow: 0 3px 6px rgba(0, 0, 0, .4);
+ box-shadow: 0 3px 6px rgba(0, 0, 0, .4);
+}
+
+.dialog.ui-dialog {
+ border: 1px solid #555;
+ display: none;
+ padding: 0;
+}
+
+.ui-widget-overlay {
+ background: #000;
+ filter: alpha(opacity = 60);
+ -moz-opacity: .44;
+ -webkit-opacity: .44;
+ opacity: .44;
+ position: absolute;
+ left: 0;
+ top: 0;
+}
+
+.ui-dialog .ui-dialog-titlebar {
+ background: #f3efea;
+ height: 58px;
+}
+
+.ui-dialog .ui-dialog-title {
+ color: #676056;
+ font: normal 20px/1 'sourcesanspro';
+ display: block;
+ padding: 19px 0 19px 20px;
+ cursor: move;
+}
+
+.ui-dialog .ui-icon {
+ text-indent: -99999px;
+}
+
+.ui-dialog .ui-dialog-titlebar-close {
+ background: none;
+ cursor: pointer;
+ margin: 0;
+ padding: 0;
+ position: absolute;
+ top: 22px;
+ right: 16px;
+ height: 16px;
+ width: 16px;
+ z-index: 1000;
+ text-decoration: none;
+}
+
+.ui-dialog .ui-dialog-titlebar-close:before {
+ color: #676056;
+ content: "\e012";
+ font-family: 'icons';
+ font-style: normal;
+ speak: none;
+ font-weight: normal;
+ -webkit-font-smoothing: antialiased;
+}
+
+.ui-dialog .ui-dialog-titlebar-close .ui-icon {
+ display: none;
+}
+
+.ui-dialog .ui-dialog-titlebar-close.ui-state-hover {
+ border: none;
+}
+
+.ui-dialog .ui-dialog-content {
+ padding: 10px 10px 0;
+}
+
+.ui-dialog .ui-dialog-content .fieldset {
+ border-radius: 0;
+ border: none;
+}
+
+.ui-dialog .ui-dialog-content {
+ overflow: auto;
+ padding: 25px 25px 0;
+}
+
+.ui-dialog .ui-dialog-content label.mage-error {
+ margin: 0;
+}
+
+.ui-dialog .ui-dialog-content form {
+ display: block;
+ overflow: hidden;
+}
+
+.ui-dialog .ui-dialog-buttonpane {
+ margin: 0;
+ padding: 25px;
+ border: none;
+}
+
+.ui-dialog .ui-dialog-buttonset button {
+ border: none;
+ border-radius: 0;
+ font: 600 14px/16px;
+ text-transform: uppercase;
+ margin: 0 10px 0 0;
+ padding: 9px 11px 9px;
+ box-shadow: none;
+ text-shadow: none;
+ outline: none;
+ text-decoration: none;
+}
+
+.ui-resizable {
+ position: relative;
+}
+
+.ui-resizable-handle {
+ position: absolute;
+ font-size: 0.1px;
+ display: block;
+}
+
+.ui-resizable-disabled .ui-resizable-handle,
+.ui-resizable-autohide .ui-resizable-handle {
+ display: none;
+}
+
+.ui-resizable-n {
+ cursor: n-resize;
+ height: 7px;
+ width: 100%;
+ top: -5px;
+ left: 0;
+}
+
+.ui-resizable-s {
+ cursor: s-resize;
+ height: 7px;
+ width: 100%;
+ bottom: 0;
+ left: 0;
+}
+
+.ui-resizable-e {
+ cursor: e-resize;
+ width: 7px;
+ right: 0;
+ top: 0;
+ height: 100%;
+}
+
+.ui-resizable-w {
+ cursor: w-resize;
+ width: 7px;
+ left: -7px;
+ top: 0;
+ height: 100%;
+}
+
+.ui-resizable-se {
+ cursor: se-resize;
+ width: 12px;
+ height: 12px;
+ right: 1px;
+ bottom: 1px;
+}
+
+.ui-resizable-sw {
+ cursor: sw-resize;
+ width: 9px;
+ height: 9px;
+ left: -5px;
+ bottom: 0;
+}
+
+.ui-resizable-nw {
+ cursor: nw-resize;
+ width: 9px;
+ height: 9px;
+ left: -5px;
+ top: -5px;
+}
+
+.ui-resizable-ne {
+ cursor: ne-resize;
+ width: 9px;
+ height: 9px;
+ right: 0;
+ top: -5px;
+}
+
+.ui-dialog ul.form-list,
+.ui-dialog ul.options-list {
+ list-style: none;
+ padding: 0;
+}
+
+.action.translate {
+ display: block;
+ line-height: 25px;
+ height: 25px;
+ width: 25px;
+}
+
+.action.translate:after {
+ font-family: 'icons';
+ font-size: 24px;
+ content: '\e006';
+}
diff --git a/app/design/frontend/magento_plushe/Magento_Core/text.phtml b/app/code/Magento/Core/view/frontend/text.phtml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Core/text.phtml
rename to app/code/Magento/Core/view/frontend/text.phtml
diff --git a/app/code/Magento/Core/view/frontend/translate_inline.phtml b/app/code/Magento/Core/view/frontend/translate_inline.phtml
index 3675b14f271..8eee3d794ac 100644
--- a/app/code/Magento/Core/view/frontend/translate_inline.phtml
+++ b/app/code/Magento/Core/view/frontend/translate_inline.phtml
@@ -24,32 +24,24 @@
*/
?>
-<script type="text/javascript" src="<?php echo $this->getViewFileUrl('prototype/window.js') ?>"></script>
-<link rel="stylesheet" type="text/css" href="<?php echo $this->getViewFileUrl('prototype/windows/themes/default.css') ?>"/>
<link rel="stylesheet" type="text/css" href="<?php echo $this->getViewFileUrl('Magento_Core::prototype/magento.css') ?>"/>
+<link rel="stylesheet" type="text/css" href="<?php echo $this->getViewFileUrl('mage/translate-inline.css') ?>"/>
<script type="text/javascript" src="<?php echo $this->getViewFileUrl('mage/edit-trigger.js') ?>"></script>
<script type="text/javascript" src="<?php echo $this->getViewFileUrl('mage/translate-inline.js') ?>"></script>
-<link rel="stylesheet" type="text/css" href="<?php echo $this->getViewFileUrl('mage/translate-inline.css') ?>"/>
<script id="translate-inline-icon" type="text/x-jQuery-tmpl">
- <img src="${img}" height="16" width="16" class="translate-edit-icon">
+ <span class="action translate"></span>
</script>
<script id="translate-form-template" type="text/x-jquery-tmpl">
<form id="${id}">
{{each(i, item) items}}
- <div class="magento_table_container"><table cellspacing="0">
+ <div class="data table translate"><table cellspacing="0">
{{each item}}
<tr>
<th class="label" style="text-transform: capitalize;">${$index}:</th>
<td class="value">${$value}</td>
</tr>
{{/each}}
- <tr>
- <th class="label"><label for="perstore_${i}">Store View Specific:</label></th>
- <td class="value">
- <input id="perstore_${i}" name="translate[${i}][perstore]" type="checkbox" value="1"/>
- </td>
- </tr>
<tr>
<th class="label"><label for="custom_${i}">Custom:</label></th>
<td class="value">
@@ -57,6 +49,11 @@
<input id="custom_${i}" name="translate[${i}][custom]" class="input-text" value="${escape(item.translated)}" />
</td>
</tr>
+ <tr>
+ <td colspan="2">
+ <label for="perstore_${i}"><input id="perstore_${i}" name="translate[${i}][perstore]" type="checkbox" value="1"/> Store View Specific</label>
+ </td>
+ </tr>
</table></div>
{{/each}}
</form>
@@ -66,7 +63,6 @@
<div data-role="translate-dialog" data-mage-init="{translateInline: {ajaxUrl:"<?php echo $this->getAjaxUrl() ?>"}, loader: {}}"></div>
<script type="text/javascript">
(function($){
- $('body').editTrigger({img: '<?php echo $this->getViewFileUrl('Magento_Core::fam_book_open.png') ?>', alwaysShown:true, singleElement:false});
- $('body').addClass('trnslate-inline-area');
+ $('body').editTrigger({alwaysShown:true, singleElement:false}).addClass('trnslate-inline-area');
})(jQuery);
</script>
diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php
index 4b646536479..fcfd964fc01 100644
--- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php
+++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php
@@ -99,7 +99,7 @@ class Currency extends \Magento\Backend\Block\Template
public function getImportFormAction()
{
- return $this->getUrl('*/*/fetchRates');
+ return $this->getUrl('adminhtml/*/fetchRates');
}
}
diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php
index 6a51e1c9381..000a9fb6a18 100644
--- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php
+++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php
@@ -100,7 +100,7 @@ class Matrix extends \Magento\Backend\Block\Template
public function getRatesFormAction()
{
- return $this->getUrl('*/*/saveRates');
+ return $this->getUrl('adminhtml/*/saveRates');
}
protected function _prepareRates($array)
diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php
index 72a97d8e1c8..eb36be1c003 100644
--- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php
+++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php
@@ -122,7 +122,7 @@ class Currencysymbol extends \Magento\Backend\Block\Widget\Form
*/
public function getFormActionUrl()
{
- return $this->getUrl('*/*/save');
+ return $this->getUrl('adminhtml/*/save');
}
/**
diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency.php
index e740ea06402..29e0ef0fee1 100644
--- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency.php
+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency.php
@@ -33,7 +33,7 @@
*/
namespace Magento\CurrencySymbol\Controller\Adminhtml\System;
-class Currency extends \Magento\Adminhtml\Controller\Action
+class Currency extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -114,7 +114,7 @@ class Currency extends \Magento\Adminhtml\Controller\Action
catch (\Exception $e){
$backendSession->addError($e->getMessage());
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
public function saveRatesAction()
@@ -146,7 +146,7 @@ class Currency extends \Magento\Adminhtml\Controller\Action
}
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
protected function _isAllowed()
diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol.php
index 361ff68b87a..54665f5c2ec 100644
--- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol.php
+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol.php
@@ -33,7 +33,7 @@
*/
namespace Magento\CurrencySymbol\Controller\Adminhtml\System;
-class Currencysymbol extends \Magento\Adminhtml\Controller\Action
+class Currencysymbol extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Show Currency Symbols Management dialog
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
index fbffc29b51c..6ceee87de25 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account (All Pages)" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account (All Pages)" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">2columns-left.phtml</argument>
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_confirmation.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_confirmation.xml
index 08a1998d0b2..7713da2330f 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account_confirmation.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_confirmation.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Account Confirmation" type="page" parent="customer_account">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Account Confirmation" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml
index dc47589f947..215203399e6 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account_create.xml
+++ b/app/code/Magento/Customer/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Account Registration Form" type="page" parent="customer_account">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Account Registration Form" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_createpassword.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_createpassword.xml
index c054bbc162f..804c22a1843 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account_createpassword.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_createpassword.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Reset a Password" type="page" parent="customer_account">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Reset a Password" type="page">
<referenceBlock name="head">
<action method="setTitle">
<argument translate="true" name="title" xsi:type="string">Reset a Password</argument>
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_edit.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_edit.xml
index 316a49a9c7d..23ed447c98d 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account_edit.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_edit.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Account Edit Form" type="page" parent="customer_account">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Account Edit Form" type="page">
<update handle="customer_account"/>
<referenceBlock name="root">
<action method="setHeaderTitle">
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_forgotpassword.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_forgotpassword.xml
index 40f1992c97b..a8debcfed93 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account_forgotpassword.xml
+++ b/app/code/Magento/Customer/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Forgot Password Form" type="page" parent="customer_account">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Forgot Password Form" type="page">
<referenceBlock name="head">
<action method="setTitle">
<argument translate="true" name="title" xsi:type="string">Forgot Your Password</argument>
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml
index e8d53dd42ed..503459ec40e 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_index.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Dashboard" type="page" parent="customer_account">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Dashboard" type="page">
<update handle="customer_account"/>
<referenceBlock name="root">
<action method="setTemplate">
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_login.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_login.xml
index 961576dc508..42532503f04 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account_login.xml
+++ b/app/code/Magento/Customer/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Account Login Form" type="page" parent="customer_account">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Account Login Form" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account_logoutsuccess.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account_logoutsuccess.xml
index 4a298fe8a53..90ea6202ed8 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account_logoutsuccess.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account_logoutsuccess.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Account Logout Success" type="page" parent="customer_account">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Account Logout Success" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml b/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml
index 2500830848f..13d538470a2 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_address_form.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Address Edit Form" type="page" parent="customer_address_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Address Edit Form" type="page">
<update handle="customer_account"/>
<referenceContainer name="my.account.wrapper">
<block class="Magento\Customer\Block\Address\Edit" name="customer_address_edit" template="address/edit.phtml"/>
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml b/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml
index b0ba77a2278..560c899a7cd 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_address_index.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Address Book" type="page" parent="customer_account_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Address Book" type="page">
<update handle="customer_account"/>
<referenceContainer name="my.account.wrapper">
<block class="Magento\Customer\Block\Address\Book" name="address_book" template="address/book.phtml"/>
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Container.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Container.php
index 59462ec0e78..db14d679947 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Container.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Container.php
@@ -47,7 +47,7 @@ class Container extends \Magento\Backend\Block\Widget\Container
{
$this->addButton('back_button', array(
'label' => __('Back'),
- 'onclick' => 'setLocation(\'' . $this->getUrl('*/*') . '\')',
+ 'onclick' => 'setLocation(\'' . $this->getUrl('adminhtml/*') . '\')',
'class' => 'back'
));
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/BackgroundUploader.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/BackgroundUploader.php
index e68c12fd9c4..c7ebf6667f8 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/BackgroundUploader.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/BackgroundUploader.php
@@ -67,7 +67,7 @@ class BackgroundUploader
*/
public function getImageUploadUrl()
{
- return $this->getUrl('*/system_design_editor_tools/uploadQuickStyleImage',
+ return $this->getUrl('adminhtml/system_design_editor_tools/uploadQuickStyleImage',
array('theme_id' => $this->_themeContext->getEditableTheme()->getId())
);
}
@@ -79,7 +79,7 @@ class BackgroundUploader
*/
public function getImageRemoveUrl()
{
- return $this->getUrl('*/system_design_editor_tools/removeQuickStyleImage',
+ return $this->getUrl('adminhtml/system_design_editor_tools/removeQuickStyleImage',
array('theme_id' => $this->_themeContext->getEditableTheme()->getId())
);
}
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/LogoUploader.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/LogoUploader.php
index 5451af3312b..3034970e9a0 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/LogoUploader.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/LogoUploader.php
@@ -87,7 +87,7 @@ class LogoUploader
*/
public function getLogoUploadUrl($store)
{
- return $this->getUrl('*/system_design_editor_tools/uploadStoreLogo',
+ return $this->getUrl('adminhtml/system_design_editor_tools/uploadStoreLogo',
array('theme_id' => $this->_themeContext->getEditableTheme()->getId(), 'store_id' => $store->getId())
);
}
@@ -100,7 +100,7 @@ class LogoUploader
*/
public function getLogoRemoveUrl($store)
{
- return $this->getUrl('*/system_design_editor_tools/removeStoreLogo',
+ return $this->getUrl('adminhtml/system_design_editor_tools/removeStoreLogo',
array('theme_id' => $this->_themeContext->getEditableTheme()->getId(), 'store_id' => $store->getId())
);
}
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/Edit.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/Edit.php
index a3ebf1ad542..7b459b7adcc 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/Edit.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/Edit.php
@@ -138,7 +138,7 @@ class Edit
*/
public function getRevertUrl($revertType)
{
- return $this->getUrl('*/system_design_editor/revert', array(
+ return $this->getUrl('adminhtml/system_design_editor/revert', array(
'theme_id' => $this->_themeContext->getEditableTheme()->getId(),
'revert_to' => $revertType
));
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/Save.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/Save.php
index 2e9050e5962..651b99b56f0 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/Save.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Toolbar/Buttons/Save.php
@@ -125,7 +125,7 @@ class Save
*/
public function getSaveUrl()
{
- return $this->getUrl('*/system_design_editor/save', array('theme_id' => $this->getTheme()->getId()));
+ return $this->getUrl('adminhtml/system_design_editor/save', array('theme_id' => $this->getTheme()->getId()));
}
/**
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools.php
index 1098ef955b9..c479fdeec53 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools.php
@@ -148,7 +148,7 @@ class Tools extends \Magento\Backend\Block\Template
*/
public function getSaveUrl()
{
- return $this->getUrl('*/system_design_editor_tools/saveQuickStyles',
+ return $this->getUrl('adminhtml/system_design_editor_tools/saveQuickStyles',
array('theme_id' => $this->_themeContext->getEditableTheme()->getId())
);
}
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Css/Group.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Css/Group.php
index e6f6b4ce2fa..620d166b038 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Css/Group.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Css/Group.php
@@ -40,7 +40,7 @@ class Group extends \Magento\Backend\Block\Widget\Form
*/
public function getDownloadUrl($fileId, $themeId)
{
- return $this->getUrl('*/system_design_theme/downloadCss', array(
+ return $this->getUrl('adminhtml/system_design_theme/downloadCss', array(
'theme_id' => $themeId,
'file' => $this->_helperFactory->get('Magento\DesignEditor\Helper\Data')->urlEncode($fileId)
));
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Custom.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Custom.php
index 5dde246aea6..8f87707be62 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Custom.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Custom.php
@@ -100,7 +100,7 @@ class Custom extends \Magento\Backend\Block\Widget\Form\Generic
*/
public function getDownloadCustomCssUrl()
{
- return $this->getUrl('*/system_design_theme/downloadCustomCss',
+ return $this->getUrl('adminhtml/system_design_theme/downloadCustomCss',
array('theme_id' => $this->_themeContext->getEditableTheme()->getId()));
}
@@ -111,7 +111,7 @@ class Custom extends \Magento\Backend\Block\Widget\Form\Generic
*/
public function getUploadUrl()
{
- return $this->getUrl('*/system_design_editor_tools/upload',
+ return $this->getUrl('adminhtml/system_design_editor_tools/upload',
array('theme_id' => $this->_themeContext->getEditableTheme()->getId()));
}
@@ -122,7 +122,7 @@ class Custom extends \Magento\Backend\Block\Widget\Form\Generic
*/
public function getSaveCustomCssUrl()
{
- return $this->getUrl('*/system_design_editor_tools/saveCssContent',
+ return $this->getUrl('adminhtml/system_design_editor_tools/saveCssContent',
array('theme_id' => $this->_themeContext->getEditableTheme()->getId()));
}
@@ -135,7 +135,7 @@ class Custom extends \Magento\Backend\Block\Widget\Form\Generic
*/
public function getMediaBrowserUrl($targetElementId, $contentType)
{
- return $this->getUrl('*/system_design_editor_files/index', array(
+ return $this->getUrl('adminhtml/system_design_editor_files/index', array(
'target_element_id' => $targetElementId,
\Magento\Theme\Helper\Storage::PARAM_THEME_ID => $this->_themeContext->getEditableTheme()->getId(),
\Magento\Theme\Helper\Storage::PARAM_CONTENT_TYPE => $contentType
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/ImageSizing.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/ImageSizing.php
index a773754fb64..ffcabe79c5d 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/ImageSizing.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/ImageSizing.php
@@ -81,7 +81,7 @@ class ImageSizing extends \Magento\Backend\Block\Widget\Form\Generic
*/
public function getImageSizingUrl()
{
- return $this->getUrl('*/system_design_editor_tools/saveImageSizing',
+ return $this->getUrl('adminhtml/system_design_editor_tools/saveImageSizing',
array('theme_id' => $this->_themeContext->getEditableTheme()->getId()));
}
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Js.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Js.php
index 0099fdb6bbb..64d7886d5aa 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Js.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Js.php
@@ -120,7 +120,7 @@ class Js extends \Magento\Backend\Block\Widget\Form\Generic
*/
public function getJsUploadUrl()
{
- return $this->getUrl('*/system_design_editor_tools/uploadjs',
+ return $this->getUrl('adminhtml/system_design_editor_tools/uploadjs',
array('theme_id' => $this->_themeContext->getEditableTheme()->getId()));
}
@@ -131,7 +131,7 @@ class Js extends \Magento\Backend\Block\Widget\Form\Generic
*/
public function getJsReorderUrl()
{
- return $this->getUrl('*/system_design_editor_tools/reorderjs',
+ return $this->getUrl('adminhtml/system_design_editor_tools/reorderjs',
array('theme_id' => $this->_themeContext->getEditableTheme()->getId()));
}
@@ -142,7 +142,7 @@ class Js extends \Magento\Backend\Block\Widget\Form\Generic
*/
public function getJsDeleteUrl()
{
- return $this->getUrl('*/system_design_editor_tools/deleteCustomFiles', array(
+ return $this->getUrl('adminhtml/system_design_editor_tools/deleteCustomFiles', array(
'theme_id' => $this->_themeContext->getEditableTheme()->getId()
));
}
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/AbstractSelectorList.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/AbstractSelectorList.php
index 322f003f054..e1fcc816a2e 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/AbstractSelectorList.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/AbstractSelectorList.php
@@ -101,7 +101,7 @@ abstract class AbstractSelectorList
'title' => __('Duplicate'),
'label' => __('Duplicate'),
'class' => 'action-duplicate',
- 'href' => $this->getUrl('*/*/duplicate', array('theme_id' => $themeId))
+ 'href' => $this->getUrl('adminhtml/*/duplicate', array('theme_id' => $themeId))
));
$themeBlock->addButton($assignButton);
@@ -185,7 +185,7 @@ abstract class AbstractSelectorList
*/
protected function _getPreviewUrl($themeId)
{
- return $this->getUrl('*/*/launch', array(
+ return $this->getUrl('adminhtml/*/launch', array(
'theme_id' => $themeId,
'mode' => \Magento\DesignEditor\Model\State::MODE_NAVIGATION
));
@@ -199,7 +199,7 @@ abstract class AbstractSelectorList
*/
protected function _getEditUrl($themeId)
{
- return $this->getUrl('*/*/launch', array(
+ return $this->getUrl('adminhtml/*/launch', array(
'theme_id' => $themeId,
'mode' => \Magento\DesignEditor\Model\State::MODE_NAVIGATION
));
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Available.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Available.php
index 7c1e68afb03..5fd89da92cd 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Available.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Available.php
@@ -53,7 +53,7 @@ class Available
public function getNextPageUrl()
{
return $this->getNextPage() <= $this->getCollection()->getLastPageNumber()
- ? $this->getUrl('*/*/*', array('page' => $this->getNextPage()))
+ ? $this->getUrl('adminhtml/*/*', array('page' => $this->getNextPage()))
: '';
}
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/StoreView.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/StoreView.php
index 7dfed3471ba..73a3ebd7b2b 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/StoreView.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/StoreView.php
@@ -205,10 +205,10 @@ class StoreView extends \Magento\Backend\Block\Template
{
$options = array();
$options['storesByThemes'] = $this->_getStoresByThemes();
- $options['assignUrl'] = $this->getUrl('*/*/assignThemeToStore', array(
+ $options['assignUrl'] = $this->getUrl('adminhtml/*/assignThemeToStore', array(
'theme_id' => $this->getThemeId()
));
- $options['afterAssignUrl'] = $this->getUrl('*/*/index');
+ $options['afterAssignUrl'] = $this->getUrl('adminhtml/*/index');
$options['hasMultipleStores'] = $this->_hasMultipleStores();
$options['actionOnAssign'] = $this->getData('actionOnAssign');
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/Tabs.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/Tabs.php
index c84d7eb7bcf..836a1808131 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/Tabs.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/Tabs.php
@@ -64,7 +64,7 @@ class Tabs extends \Magento\Backend\Block\Widget\Tabs
(function ($) {
$('.themes-customizations .theme').themeControl({url: '%s'});
})(jQuery);",
- $this->getUrl('*/*/quickEdit')
+ $this->getUrl('adminhtml/*/quickEdit')
);
return sprintf('<script type="text/javascript">%s</script>', $script);
}
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor.php
index cc45e215ef3..2000b054019 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor.php
@@ -31,7 +31,7 @@ namespace Magento\DesignEditor\Controller\Adminhtml\System\Design;
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class Editor extends \Magento\Adminhtml\Controller\Action
+class Editor extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* @var \Magento\Theme\Model\Config
@@ -116,7 +116,7 @@ class Editor extends \Magento\Adminhtml\Controller\Action
if ($launchedTheme->isPhysical()) {
$launchedTheme = $launchedTheme->getDomainModel(\Magento\Core\Model\Theme::TYPE_PHYSICAL)
->createVirtualTheme($launchedTheme);
- $this->_redirect($this->getUrl('*/*/*', array('theme_id' => $launchedTheme->getId())));
+ $this->_redirect($this->getUrl('adminhtml/*/*', array('theme_id' => $launchedTheme->getId())));
return;
}
$editableTheme = $themeContext->getStagingTheme();
@@ -141,12 +141,12 @@ class Editor extends \Magento\Adminhtml\Controller\Action
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addException($e, $e->getMessage());
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
} catch (\Exception $e) {
$this->_getSession()->addException($e, __('Sorry, there was an unknown error.'));
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
}
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools.php
index 3340589ee83..fa3939438d0 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/Tools.php
@@ -31,7 +31,7 @@ namespace Magento\DesignEditor\Controller\Adminhtml\System\Design\Editor;
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class Tools extends \Magento\Adminhtml\Controller\Action
+class Tools extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Initialize theme context model
diff --git a/app/code/Magento/DesignEditor/Model/Observer.php b/app/code/Magento/DesignEditor/Model/Observer.php
index b8bcf058f48..7ef1c94d7a8 100644
--- a/app/code/Magento/DesignEditor/Model/Observer.php
+++ b/app/code/Magento/DesignEditor/Model/Observer.php
@@ -61,7 +61,7 @@ class Observer
*/
public function clearJs(\Magento\Event\Observer $event)
{
- /** @var $layout \Magento\Core\Model\Layout */
+ /** @var $layout \Magento\View\LayoutInterface */
$layout = $event->getEvent()->getLayout();
$blockHead = $layout->getBlock('head');
if (!$blockHead || !$blockHead->getData('vde_design_mode')) {
diff --git a/app/code/Magento/DesignEditor/etc/module.xml b/app/code/Magento/DesignEditor/etc/module.xml
index 64a58d4fb19..7eac055567c 100755
--- a/app/code/Magento/DesignEditor/etc/module.xml
+++ b/app/code/Magento/DesignEditor/etc/module.xml
@@ -26,12 +26,10 @@
<config>
<module name="Magento_DesignEditor" version="1.0.0.3" active="true">
<sequence>
- <module name="Magento_Adminhtml"/>
<module name="Magento_Page"/>
<module name="Magento_Theme"/>
</sequence>
<depends>
- <module name="Magento_Adminhtml"/>
<module name="Magento_Theme"/>
<module name="Magento_Backend"/>
<module name="Magento_Core"/>
diff --git a/app/code/Magento/Adminhtml/Controller/Json.php b/app/code/Magento/Directory/Controller/Adminhtml/Json.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Controller/Json.php
rename to app/code/Magento/Directory/Controller/Adminhtml/Json.php
index bc0242693b1..ef66c1561dd 100644
--- a/app/code/Magento/Adminhtml/Controller/Json.php
+++ b/app/code/Magento/Directory/Controller/Adminhtml/Json.php
@@ -31,9 +31,9 @@
* @package Magento_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller;
+namespace Magento\Directory\Controller\Adminhtml;
-class Json extends \Magento\Adminhtml\Controller\Action
+class Json extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Return JSON-encoded array of country regions
diff --git a/app/code/Magento/Directory/etc/adminhtml/routes.xml b/app/code/Magento/Directory/etc/adminhtml/routes.xml
new file mode 100644
index 00000000000..a0aab3848c0
--- /dev/null
+++ b/app/code/Magento/Directory/etc/adminhtml/routes.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<config>
+ <router id="admin">
+ <route id="directory" frontName="directory">
+ <module name="Magento_Directory" before="Magento_Adminhtml" />
+ </route>
+ </router>
+</config>
diff --git a/app/code/Magento/Directory/view/frontend/currency.phtml b/app/code/Magento/Directory/view/frontend/currency.phtml
index 93bda8e1fe4..297b1b5bb3f 100644
--- a/app/code/Magento/Directory/view/frontend/currency.phtml
+++ b/app/code/Magento/Directory/view/frontend/currency.phtml
@@ -31,19 +31,25 @@
* @see \Magento\Directory\Block\Currency
*/
?>
-<?php if($this->getCurrencyCount()>1): ?>
-<div class="block block-currency">
- <div class="block-title">
- <strong><span><?php echo __('Select Your Currency') ?></span></strong>
- </div>
- <div class="block-content">
- <select name="currency" title="<?php echo __('Select Your Currency') ?>" onchange="setLocation(this.value)">
- <?php foreach ($this->getCurrencies() as $_code => $_name): ?>
- <option value="<?php echo $this->getSwitchCurrencyUrl($_code) ?>"<?php if($_code==$this->getCurrentCurrencyCode()): ?> selected="selected"<?php endif; ?>>
- <?php echo $_name ?> - <?php echo $_code ?>
- </option>
- <?php endforeach; ?>
- </select>
+<?php if ($this->getCurrencyCount() > 1): ?>
+<?php $currencies = $this->getCurrencies(); ?>
+<?php $currentCurrencyCode = $this->getCurrentCurrencyCode(); ?>
+<div class="switcher currency">
+ <strong class="label"><span><?php echo __('Currency') ?></span></strong>
+ <div class="options">
+ <strong class="language-<?php echo $this->escapeHtml($this->getCurrentCurrencyCode()) ?>">
+ <span><?php echo $this->escapeHtml($currentCurrencyCode) ?> - <?php echo @$this->escapeHtml($currencies[$currentCurrencyCode]) ?></span>
+ </strong>
+ <button type="button" data-toggle="dropdown" class="action switch"><span><?php echo __('Change')?></span></button>
+ <ul data-target="dropdown">
+ <?php foreach ($currencies as $_code => $_name): ?>
+ <?php if($_code != $currentCurrencyCode): ?>
+ <li class="currency-<?php echo $_code ?>">
+ <a href="<?php echo $this->getSwitchCurrencyUrl($_code) ?>"><?php echo $_code ?> - <?php echo $_name ?></a>
+ </li>
+ <?php endif; ?>
+ <?php endforeach; ?>
+ </ul>
</div>
</div>
-<?php endif; ?>
+<?php endif; ?>
\ No newline at end of file
diff --git a/app/code/Magento/Directory/view/frontend/currency/switch.phtml b/app/code/Magento/Directory/view/frontend/currency/switch.phtml
index 8fa890d6df2..ce29ef36280 100644
--- a/app/code/Magento/Directory/view/frontend/currency/switch.phtml
+++ b/app/code/Magento/Directory/view/frontend/currency/switch.phtml
@@ -19,13 +19,10 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
+ * @package magento_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<div class="page-title">
- <h1><?php echo __('Currency') ?></h1>
-</div>
<p><?php echo __('Your current currency is: %1.', $currency->getCode()) ?></p>
-<p><a href="<?php echo $this->getBaseUrl(); ?>"><?php echo __('Continue »') ?></a></p>
+<p><a href="<?php echo $this->getBaseUrl(); ?>" class="action continue"><span><?php echo __('Continue') ?></span></a></p>
diff --git a/app/code/Magento/Directory/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/Directory/view/frontend/layout/catalog_category_view.xml
index 9d64de3d1e7..bd274919f46 100644
--- a/app/code/Magento/Directory/view/frontend/layout/catalog_category_view.xml
+++ b/app/code/Magento/Directory/view/frontend/layout/catalog_category_view.xml
@@ -23,8 +23,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="left">
- <block class="Magento\Directory\Block\Currency" name="currency" before="catalog.leftnav" template="currency.phtml"/>
- </referenceContainer>
-</layout>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" />
diff --git a/app/code/Magento/Directory/view/frontend/layout/catalogsearch_advanced_index.xml b/app/code/Magento/Directory/view/frontend/layout/catalogsearch_advanced_index.xml
index b0d82dc10a0..a84384b8109 100644
--- a/app/code/Magento/Directory/view/frontend/layout/catalogsearch_advanced_index.xml
+++ b/app/code/Magento/Directory/view/frontend/layout/catalogsearch_advanced_index.xml
@@ -23,8 +23,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="left">
- <block class="Magento\Directory\Block\Currency" name="right_currency" before="-" template="currency.phtml"/>
- </referenceContainer>
-</layout>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" />
\ No newline at end of file
diff --git a/app/code/Magento/Directory/view/frontend/layout/catalogsearch_advanced_result.xml b/app/code/Magento/Directory/view/frontend/layout/catalogsearch_advanced_result.xml
index 7ea5d0eb50c..bd274919f46 100644
--- a/app/code/Magento/Directory/view/frontend/layout/catalogsearch_advanced_result.xml
+++ b/app/code/Magento/Directory/view/frontend/layout/catalogsearch_advanced_result.xml
@@ -23,8 +23,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="right">
- <block class="Magento\Directory\Block\Currency" name="right_currency" before="-" template="currency.phtml"/>
- </referenceContainer>
-</layout>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" />
diff --git a/app/code/Magento/Directory/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/Directory/view/frontend/layout/catalogsearch_result_index.xml
index 4c71dc1b48a..6c60196129d 100644
--- a/app/code/Magento/Directory/view/frontend/layout/catalogsearch_result_index.xml
+++ b/app/code/Magento/Directory/view/frontend/layout/catalogsearch_result_index.xml
@@ -23,8 +23,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="left">
- <block class="Magento\Directory\Block\Currency" name="currency" before="-" template="currency.phtml"/>
- </referenceContainer>
-</layout>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
diff --git a/app/code/Magento/Directory/view/frontend/layout/default.xml b/app/code/Magento/Directory/view/frontend/layout/default.xml
index 1c797e95c04..3c1ec65a882 100644
--- a/app/code/Magento/Directory/view/frontend/layout/default.xml
+++ b/app/code/Magento/Directory/view/frontend/layout/default.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="head">
- <block class="Magento\Core\Block\Template" name="optional_zip_countries" as="optional_zip_countries" template="Magento_Directory::js/optional_zip_countries.phtml"/>
- </referenceBlock>
+ <referenceContainer name="header.panel">
+ <block class="Magento\Directory\Block\Currency" name="currency" before="store_language" template="currency.phtml"/>
+ </referenceContainer>
</layout>
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
index 23c6efc70ca..c4855296498 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
@@ -135,7 +135,7 @@ class Downloadable
*/
public function getGroupCode()
{
- return \Magento\Adminhtml\Block\Catalog\Product\Edit\Tabs::ADVANCED_TAB_GROUP_CODE;
+ return \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs::ADVANCED_TAB_GROUP_CODE;
}
/**
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index 33751b4a6a3..2cf96009ce8 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -280,7 +280,7 @@ class Links
if ($item->getLinkFile() && is_file($file)) {
$name = '<a href="'
- . $this->getUrl('*/downloadable_product_edit/link', array(
+ . $this->getUrl('adminhtml/downloadable_product_edit/link', array(
'id' => $item->getId(),
'_secure' => true
)) . '">' . $fileHelper->getFileFromPathFile($item->getLinkFile()) . '</a>';
@@ -384,7 +384,7 @@ class Links
public function getUploadUrl($type)
{
return $this->_urlFactory->create()->addSessionParam()
- ->getUrl('*/downloadable_file/upload', array('type' => $type, '_secure' => true));
+ ->getUrl('adminhtml/downloadable_file/upload', array('type' => $type, '_secure' => true));
}
/**
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
index 9b10c92c9b4..e6e03dc6075 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
@@ -250,7 +250,7 @@ class Samples
{
$url = $this->_urlFactory->create()
->addSessionParam()
- ->getUrl('*/downloadable_file/upload', array('type' => 'samples', '_secure' => true));
+ ->getUrl('adminhtml/downloadable_file/upload', array('type' => 'samples', '_secure' => true));
$this->getConfig()->setUrl($url);
$this->getConfig()->setParams(array('form_key' => $this->getFormKey()));
$this->getConfig()->setFileField('samples');
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php b/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
index f844bdbb342..fad3f209c3c 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
@@ -34,7 +34,7 @@
*/
namespace Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable;
-class Name extends \Magento\Adminhtml\Block\Sales\Items\Column\Name
+class Name extends \Magento\Sales\Block\Adminhtml\Items\Column\Name
{
protected $_purchased = null;
diff --git a/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php b/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
index 6c3227e1950..13933ef70c8 100644
--- a/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
+++ b/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
@@ -175,7 +175,8 @@ class Links extends \Magento\Catalog\Block\Product\AbstractProduct
public function getLinkSamlpeUrl($link)
{
- return $this->getUrl('downloadable/download/linkSample', array('link_id' => $link->getId()));
+ $store = $this->getProduct()->getStore();
+ return $store->getUrl('downloadable/download/linkSample', array('link_id' => $link->getId()));
}
/**
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File.php
index 39dbcda120b..e7fe03499a8 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/File.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Downloadable\Controller\Adminhtml\Downloadable;
-class File extends \Magento\Adminhtml\Controller\Action
+class File extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* @var \Magento\Downloadable\Model\Link
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit.php
index f6105fbd366..df8023646fe 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit.php
@@ -33,8 +33,7 @@
*/
namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product;
-class Edit
- extends \Magento\Adminhtml\Controller\Catalog\Product
+class Edit extends \Magento\Catalog\Controller\Adminhtml\Product
{
/**
* Load downloadable tab fieldsets
diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_catalog_product_downloadable.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_downloadable.xml
similarity index 62%
rename from app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_catalog_product_downloadable.xml
rename to app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_downloadable.xml
index 3d79f6727ee..d502c2eaba2 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_catalog_product_downloadable.xml
+++ b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_downloadable.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_catalog_product_superconfig_config"/>
+ <update handle="catalog_product_superconfig_config"/>
<referenceBlock name="product_tabs">
<action method="addTab">
<argument name="name" xsi:type="string">downloadable_items</argument>
@@ -32,11 +32,11 @@
</action>
</referenceBlock>
<referenceContainer name="product-type-tabs">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config" name="admin.product.edit.tab.super.config.grid.container">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config" template="Magento_Adminhtml::catalog/product/edit/super/generator.phtml" name="product-variations-generator" as="generator">
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config" template="Magento_Adminhtml::catalog/product/edit/super/attribute-js-template.phtml" as="template"/>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config\Attribute" template="Magento_Adminhtml::catalog/product/edit/super/attribute-template.phtml" as="attribute-renderer"/>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config\Matrix" template="Magento_Adminhtml::catalog/product/edit/super/matrix.phtml" as="matrix"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config" name="admin.product.edit.tab.super.config.grid.container">
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config" template="Magento_Catalog::catalog/product/edit/super/generator.phtml" name="product-variations-generator" as="generator">
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config" template="Magento_Catalog::catalog/product/edit/super/attribute-js-template.phtml" as="template"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config\Attribute" template="Magento_Catalog::catalog/product/edit/super/attribute-template.phtml" as="attribute-renderer"/>
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config\Matrix" template="Magento_Catalog::catalog/product/edit/super/matrix.phtml" as="matrix"/>
</block>
</block>
</referenceContainer>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_catalog_product_simple.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_simple.xml
similarity index 100%
rename from app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_catalog_product_simple.xml
rename to app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_simple.xml
diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_catalog_product_virtual.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_virtual.xml
similarity index 100%
rename from app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_catalog_product_virtual.xml
rename to app/code/Magento/Downloadable/view/adminhtml/layout/catalog_product_virtual.xml
diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_sales_order_creditmemo_new.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_creditmemo_new.xml
similarity index 72%
rename from app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_sales_order_creditmemo_new.xml
rename to app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_creditmemo_new.xml
index 6487c0d38ee..6382d4b1e78 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_sales_order_creditmemo_new.xml
+++ b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_creditmemo_new.xml
@@ -25,11 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="order_items">
- <block class="Magento\Adminhtml\Block\Sales\Items\Renderer\DefaultRenderer" as="downloadable" template="Magento_Downloadable::sales/order/creditmemo/create/items/renderer/downloadable.phtml"/>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">downloadable</argument>
- <argument name="block" xsi:type="string">Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name</argument>
- <argument name="template" xsi:type="string">sales/items/column/downloadable/creditmemo/name.phtml</argument>
- </action>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" as="downloadable" template="Magento_Downloadable::sales/order/creditmemo/create/items/renderer/downloadable.phtml"/>
+ <block class="Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name" name="column_downloadable" template="sales/items/column/downloadable/creditmemo/name.phtml" group="column"/>
</referenceBlock>
</layout>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_sales_order_creditmemo_updateqty.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
similarity index 72%
rename from app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_sales_order_creditmemo_updateqty.xml
rename to app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
index 6487c0d38ee..6382d4b1e78 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_sales_order_creditmemo_updateqty.xml
+++ b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
@@ -25,11 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="order_items">
- <block class="Magento\Adminhtml\Block\Sales\Items\Renderer\DefaultRenderer" as="downloadable" template="Magento_Downloadable::sales/order/creditmemo/create/items/renderer/downloadable.phtml"/>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">downloadable</argument>
- <argument name="block" xsi:type="string">Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name</argument>
- <argument name="template" xsi:type="string">sales/items/column/downloadable/creditmemo/name.phtml</argument>
- </action>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" as="downloadable" template="Magento_Downloadable::sales/order/creditmemo/create/items/renderer/downloadable.phtml"/>
+ <block class="Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name" name="column_downloadable" template="sales/items/column/downloadable/creditmemo/name.phtml" group="column"/>
</referenceBlock>
</layout>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_sales_order_creditmemo_view.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_creditmemo_view.xml
similarity index 72%
rename from app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_sales_order_creditmemo_view.xml
rename to app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_creditmemo_view.xml
index f1a5be2ac72..5165db57baa 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_sales_order_creditmemo_view.xml
+++ b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_creditmemo_view.xml
@@ -25,11 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="creditmemo_items">
- <block class="Magento\Adminhtml\Block\Sales\Items\Renderer\DefaultRenderer" as="downloadable" template="Magento_Downloadable::sales/order/creditmemo/view/items/renderer/downloadable.phtml"/>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">downloadable</argument>
- <argument name="block" xsi:type="string">Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name</argument>
- <argument name="template" xsi:type="string">sales/items/column/downloadable/creditmemo/name.phtml</argument>
- </action>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" as="downloadable" template="Magento_Downloadable::sales/order/creditmemo/view/items/renderer/downloadable.phtml"/>
+ <block class="Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name" name="column_downloadable" template="sales/items/column/downloadable/creditmemo/name.phtml" group="column"/>
</referenceBlock>
</layout>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_sales_order_invoice_new.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_invoice_new.xml
similarity index 72%
rename from app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_sales_order_invoice_new.xml
rename to app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_invoice_new.xml
index b4b9fe9c6da..75c342951c2 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_sales_order_invoice_new.xml
+++ b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_invoice_new.xml
@@ -25,11 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="order_items">
- <block class="Magento\Adminhtml\Block\Sales\Items\Renderer\DefaultRenderer" as="downloadable" template="Magento_Downloadable::sales/order/invoice/create/items/renderer/downloadable.phtml"/>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">downloadable</argument>
- <argument name="block" xsi:type="string">Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name</argument>
- <argument name="template" xsi:type="string">sales/items/column/downloadable/invoice/name.phtml</argument>
- </action>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" as="downloadable" template="Magento_Downloadable::sales/order/invoice/create/items/renderer/downloadable.phtml"/>
+ <block class="Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name" name="column_downloadable" template="sales/items/column/downloadable/invoice/name.phtml" group="column"/>
</referenceBlock>
</layout>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_sales_order_invoice_updateqty.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_invoice_updateqty.xml
similarity index 72%
rename from app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_sales_order_invoice_updateqty.xml
rename to app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_invoice_updateqty.xml
index b4b9fe9c6da..75c342951c2 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_sales_order_invoice_updateqty.xml
+++ b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_invoice_updateqty.xml
@@ -25,11 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="order_items">
- <block class="Magento\Adminhtml\Block\Sales\Items\Renderer\DefaultRenderer" as="downloadable" template="Magento_Downloadable::sales/order/invoice/create/items/renderer/downloadable.phtml"/>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">downloadable</argument>
- <argument name="block" xsi:type="string">Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name</argument>
- <argument name="template" xsi:type="string">sales/items/column/downloadable/invoice/name.phtml</argument>
- </action>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" as="downloadable" template="Magento_Downloadable::sales/order/invoice/create/items/renderer/downloadable.phtml"/>
+ <block class="Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name" name="column_downloadable" template="sales/items/column/downloadable/invoice/name.phtml" group="column"/>
</referenceBlock>
</layout>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_sales_order_invoice_view.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_invoice_view.xml
similarity index 72%
rename from app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_sales_order_invoice_view.xml
rename to app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_invoice_view.xml
index d1455f91ac4..8f59f5f13de 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_sales_order_invoice_view.xml
+++ b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_invoice_view.xml
@@ -25,11 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="invoice_items">
- <block class="Magento\Adminhtml\Block\Sales\Items\Renderer\DefaultRenderer" as="downloadable" template="Magento_Downloadable::sales/order/invoice/view/items/renderer/downloadable.phtml"/>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">downloadable</argument>
- <argument name="block" xsi:type="string">Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name</argument>
- <argument name="template" xsi:type="string">sales/items/column/downloadable/invoice/name.phtml</argument>
- </action>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" as="downloadable" template="Magento_Downloadable::sales/order/invoice/view/items/renderer/downloadable.phtml"/>
+ <block class="Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name" name="column_downloadable" template="sales/items/column/downloadable/invoice/name.phtml" group="column"/>
</referenceBlock>
</layout>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_sales_order_view.xml b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_view.xml
similarity index 72%
rename from app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_sales_order_view.xml
rename to app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_view.xml
index 9c12bc28acb..ec349d56a30 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/layout/adminhtml_sales_order_view.xml
+++ b/app/code/Magento/Downloadable/view/adminhtml/layout/sales_order_view.xml
@@ -25,11 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="order_items">
- <block class="Magento\Adminhtml\Block\Sales\Order\View\Items\Renderer\DefaultRenderer" as="downloadable" template="Magento_Downloadable::sales/order/view/items/renderer/downloadable.phtml"/>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">downloadable</argument>
- <argument name="block" xsi:type="string">Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name</argument>
- <argument name="template" xsi:type="string">sales/items/column/downloadable/name.phtml</argument>
- </action>
+ <block class="Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer\DefaultRenderer" as="downloadable" template="Magento_Downloadable::sales/order/view/items/renderer/downloadable.phtml"/>
+ <block class="Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name" name="column_downloadable" template="sales/items/column/downloadable/name.phtml" group="column"/>
</referenceBlock>
</layout>
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/catalog_product_view_type_downloadable.xml b/app/code/Magento/Downloadable/view/frontend/layout/catalog_product_view_type_downloadable.xml
index 77cb4dae692..a9b5612b219 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/catalog_product_view_type_downloadable.xml
+++ b/app/code/Magento/Downloadable/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Downloadable)" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Downloadable)" type="page">
<referenceBlock name="product.info">
<block class="Magento\Downloadable\Block\Catalog\Product\View\Type" name="product.info.downloadable" as="product_type_data" template="catalog/product/type.phtml">
<block class="Magento\Downloadable\Block\Catalog\Product\Samples" name="product.info.downloadable.samples" as="samples" template="catalog/product/samples.phtml"/>
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_configure_type_downloadable.xml b/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_configure_type_downloadable.xml
index af7b3944457..a5b223b8e4f 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_configure_type_downloadable.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_configure_type_downloadable.xml
@@ -23,6 +23,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Cart Item" type="page" parent="checkout_cart_configure">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Cart Item" type="page">
<update handle="catalog_product_view_type_downloadable"/>
</layout>
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/downloadable_customer_products.xml b/app/code/Magento/Downloadable/view/frontend/layout/downloadable_customer_products.xml
index 3d2a34f38c4..d4d70ebe0f4 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/downloadable_customer_products.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/downloadable_customer_products.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Downloadable Items" type="page" parent="customer_account">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Downloadable Items" type="page">
<update handle="customer_account"/>
<referenceContainer name="my.account.wrapper">
<block class="Magento\Downloadable\Block\Customer\Products\ListProducts" name="downloadable_customer_products_list" template="customer/products/list.phtml"/>
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Labels.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Labels.php
index b9f09387757..4fc003d727c 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Labels.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Labels.php
@@ -44,7 +44,7 @@ class Labels extends \Magento\Backend\Block\Template
/**
* @inheritdoc
*/
- protected $_template = 'Magento_Adminhtml::catalog/product/attribute/labels.phtml';
+ protected $_template = 'Magento_Catalog::catalog/product/attribute/labels.phtml';
/**
* @param \Magento\Core\Helper\Data $coreData
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php
index 4ca0065142c..42ae3f037c8 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php
@@ -47,7 +47,7 @@ class Options extends \Magento\Backend\Block\Template
/**
* @inheritdoc
*/
- protected $_template = 'Magento_Adminhtml::catalog/product/attribute/options.phtml';
+ protected $_template = 'Magento_Catalog::catalog/product/attribute/options.phtml';
/**
* @var \Magento\Validator\UniversalFactory $universalFactory
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Grid/AbstractGrid.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Grid/AbstractGrid.php
index b474cf9024e..98d9c8719bd 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Grid/AbstractGrid.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Grid/AbstractGrid.php
@@ -35,6 +35,12 @@ namespace Magento\Eav\Block\Adminhtml\Attribute\Grid;
abstract class AbstractGrid extends \Magento\Adminhtml\Block\Widget\Grid
{
+ /**
+ * Block Module
+ *
+ * @var string
+ */
+ protected $_module = 'adminhtml';
protected function _construct()
{
@@ -101,11 +107,12 @@ abstract class AbstractGrid extends \Magento\Adminhtml\Block\Widget\Grid
/**
* Return url of given row
*
+ * @param \Magento\Object $row
* @return string
*/
public function getRowUrl($row)
{
- return $this->getUrl('*/*/edit', array('attribute_id' => $row->getAttributeId()));
+ return $this->getUrl($this->_module . '/*/edit', array('attribute_id' => $row->getAttributeId()));
}
}
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php
index 01d0995a292..bd589ddfec4 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php
@@ -34,7 +34,7 @@
namespace Magento\GiftMessage\Block\Adminhtml\Product\Helper\Form;
class Config
- extends \Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Config
+ extends \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Config
{
/**
* Core store config
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php
index 826058a8ac6..d89bab46301 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Items.php
@@ -68,7 +68,7 @@ class Items extends \Magento\Adminhtml\Block\Template
*/
public function getFormHtml()
{
- return $this->getLayout()->createBlock('Magento\Adminhtml\Block\Sales\Order\Create\Giftmessage\Form')
+ return $this->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Order\Create\Giftmessage\Form')
->setEntity($this->getItem())
->setEntityType('item')
->toHtml();
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
index d4a162e7ab3..7131415fe4a 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
@@ -172,7 +172,7 @@ class Items extends \Magento\Adminhtml\Block\Template
*/
public function getSaveUrl()
{
- return $this->getUrl('*/sales_order_view_giftmessage/save', array(
+ return $this->getUrl('sales/order_view_giftmessage/save', array(
'entity' => $this->getItem()->getId(),
'type' => 'order_item',
'reload' => true
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/form.phtml b/app/code/Magento/GiftMessage/view/adminhtml/form.phtml
index 3df12bfa57c..c4c70d58746 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/form.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/form.phtml
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php echo $this->helper('Magento\Core\Helper\Js')->includeScript('Magento_Adminhtml::sales/order/create/giftmessage.js') ?>
+<?php echo $this->helper('Magento\Core\Helper\Js')->includeScript('Magento_Sales::order/create/giftmessage.js') ?>
<?php if(!$this->getSaveMode()): ?>
<form action="<?php echo $this->getSaveUrl() ?>" id="message-form" method="post" class="a-left">
<?php echo $this->getBlockHtml('formkey')?>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/helper.phtml b/app/code/Magento/GiftMessage/view/adminhtml/helper.phtml
index 4dd870255ea..bd5852294c1 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/helper.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/helper.phtml
@@ -25,7 +25,7 @@
*/
?>
<?php if($this->getType()!== 'main' && !$this->getScriptIncluded() && $this->getCanDisplayContainer()): ?>
-<?php echo $this->helper('Magento\Core\Helper\Js')->includeScript('Magento_Adminhtml::sales/order/create/giftmessage.js') ?>
+<?php echo $this->helper('Magento\Core\Helper\Js')->includeScript('Magento_Sales::order/create/giftmessage.js') ?>
<?php $this->setScriptIncluded(true); ?>
<?php endif; ?>
<?php if($this->getCanDisplayContainer()): ?>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/layout/adminhtml_sales_order_create_index.xml b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_index.xml
similarity index 100%
rename from app/code/Magento/GiftMessage/view/adminhtml/layout/adminhtml_sales_order_create_index.xml
rename to app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_index.xml
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/layout/adminhtml_sales_order_create_load_block_data.xml b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_data.xml
similarity index 100%
rename from app/code/Magento/GiftMessage/view/adminhtml/layout/adminhtml_sales_order_create_load_block_data.xml
rename to app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_data.xml
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/layout/adminhtml_sales_order_create_load_block_items.xml b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_items.xml
similarity index 100%
rename from app/code/Magento/GiftMessage/view/adminhtml/layout/adminhtml_sales_order_create_load_block_items.xml
rename to app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_items.xml
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/layout/adminhtml_sales_order_view.xml b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml
similarity index 100%
rename from app/code/Magento/GiftMessage/view/adminhtml/layout/adminhtml_sales_order_view.xml
rename to app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml
diff --git a/app/code/Magento/GoogleCheckout/Controller/Redirect.php b/app/code/Magento/GoogleCheckout/Controller/Redirect.php
index e0f55915ab9..6d8e7c9b39c 100644
--- a/app/code/Magento/GoogleCheckout/Controller/Redirect.php
+++ b/app/code/Magento/GoogleCheckout/Controller/Redirect.php
@@ -53,7 +53,7 @@ class Redirect extends \Magento\Core\Controller\Front\Action
}
$storeQuote = $this->_objectManager->create('Magento\Sales\Model\Quote')->setStoreId(
- $this->_objectManager->get('Magento\Core\Model\StoreManger')->getStore()->getId()
+ $this->_objectManager->get('Magento\Core\Model\StoreManager')->getStore()->getId()
);
$storeQuote->merge($quote);
$storeQuote
diff --git a/app/code/Magento/GoogleCheckout/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/GoogleCheckout/view/frontend/layout/checkout_cart_index.xml
index 12efb313611..2f823abff42 100644
--- a/app/code/Magento/GoogleCheckout/view/frontend/layout/checkout_cart_index.xml
+++ b/app/code/Magento/GoogleCheckout/view/frontend/layout/checkout_cart_index.xml
@@ -24,9 +24,6 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="checkout.cart.top_methods">
- <block class="Magento\GoogleCheckout\Block\Link" name="checkout.cart.methods.googlecheckout.top" template="link.phtml" before="-"/>
- </referenceContainer>
<referenceContainer name="checkout.cart.methods">
<block class="Magento\GoogleCheckout\Block\Link" name="checkout.cart.methods.googlecheckout.bottom" template="link.phtml"/>
</referenceContainer>
diff --git a/app/code/Magento/GoogleCheckout/view/frontend/layout/googlecheckout_redirect_redirect.xml b/app/code/Magento/GoogleCheckout/view/frontend/layout/googlecheckout_redirect_redirect.xml
index aff3e7ce9a4..146a9d6b7f2 100644
--- a/app/code/Magento/GoogleCheckout/view/frontend/layout/googlecheckout_redirect_redirect.xml
+++ b/app/code/Magento/GoogleCheckout/view/frontend/layout/googlecheckout_redirect_redirect.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="GoogleCheckout Redirect" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="GoogleCheckout Redirect" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">2columns-right.phtml</argument>
diff --git a/app/code/Magento/GoogleCheckout/view/frontend/link.phtml b/app/code/Magento/GoogleCheckout/view/frontend/link.phtml
index 694917f1788..eb217a37503 100644
--- a/app/code/Magento/GoogleCheckout/view/frontend/link.phtml
+++ b/app/code/Magento/GoogleCheckout/view/frontend/link.phtml
@@ -28,10 +28,10 @@
<?php if ($this->getIsDisabled()): ?>
<img src="<?php echo $this->escapeHtml($this->getImageUrl())?>" alt="<?php echo __('Fast checkout through Google');?>" title="<?php echo __('Fast Checkout through Google');?>" />
<?php else: ?>
-<form method="post" action="<?php echo $this->getCheckoutUrl();?>"<?php if ($this->getOnsubmitJs()):?> onsubmit="<?php echo $this->getOnsubmitJs() ?>"<?php endif;?>>
- <fieldset>
- <input type="hidden" name="analyticsdata" value="" />
- <input type="image" src="<?php echo $this->escapeHtml($this->getImageUrl())?>" title="<?php echo __('Fast checkout through Google');?>" alt="<?php echo __('Fast Checkout through Google');?>" />
- </fieldset>
-</form>
+<div class="google checkout">
+ <form method="post" action="<?php echo $this->getCheckoutUrl();?>"<?php if ($this->getOnsubmitJs()):?> onsubmit="<?php echo $this->getOnsubmitJs() ?>"<?php endif;?>>
+ <input type="hidden" name="analyticsdata" value="" />
+ <input type="image" src="<?php echo $this->escapeHtml($this->getImageUrl())?>" title="<?php echo __('Fast checkout through Google');?>" alt="<?php echo __('Fast Checkout through Google');?>" />
+ </form>
+</div>
<?php endif; ?>
diff --git a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Catalog/Category/Edit/Tab/Googleoptimizer.php b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Catalog/Category/Edit/Tab/Googleoptimizer.php
index 0e52ca13aa2..58e78b918e4 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Catalog/Category/Edit/Tab/Googleoptimizer.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Catalog/Category/Edit/Tab/Googleoptimizer.php
@@ -26,7 +26,7 @@
namespace Magento\GoogleOptimizer\Block\Adminhtml\Catalog\Category\Edit\Tab;
class Googleoptimizer
- extends \Magento\Adminhtml\Block\Catalog\Form
+ extends \Magento\Catalog\Block\Adminhtml\Form
{
/**
* @var \Magento\Core\Model\Registry
diff --git a/app/code/Magento/GoogleOptimizer/Model/Observer/Block/Category/Tab.php b/app/code/Magento/GoogleOptimizer/Model/Observer/Block/Category/Tab.php
index f2087c54e58..681619e4e82 100644
--- a/app/code/Magento/GoogleOptimizer/Model/Observer/Block/Category/Tab.php
+++ b/app/code/Magento/GoogleOptimizer/Model/Observer/Block/Category/Tab.php
@@ -62,7 +62,7 @@ class Tab
'google-experiment-form'
);
- /** @var $tabs \Magento\Adminhtml\Block\Catalog\Category\Tabs */
+ /** @var $tabs \Magento\Catalog\Block\Adminhtml\Category\Tabs */
$tabs = $observer->getEvent()->getTabs();
$tabs->addTab('google-experiment-tab', array(
'label' => __('Category View Optimization'),
diff --git a/app/code/Magento/GoogleOptimizer/etc/module.xml b/app/code/Magento/GoogleOptimizer/etc/module.xml
index b01f10d1075..8a1cf790f02 100755
--- a/app/code/Magento/GoogleOptimizer/etc/module.xml
+++ b/app/code/Magento/GoogleOptimizer/etc/module.xml
@@ -36,7 +36,6 @@
<module name="Magento_Cms"/>
<module name="Magento_Core"/>
<module name="Magento_Backend"/>
- <module name="Magento_Adminhtml"/>
</depends>
</module>
</config>
diff --git a/app/code/Magento/GoogleOptimizer/view/adminhtml/layout/adminhtml_catalog_product_new.xml b/app/code/Magento/GoogleOptimizer/view/adminhtml/layout/catalog_product_new.xml
similarity index 100%
rename from app/code/Magento/GoogleOptimizer/view/adminhtml/layout/adminhtml_catalog_product_new.xml
rename to app/code/Magento/GoogleOptimizer/view/adminhtml/layout/catalog_product_new.xml
diff --git a/app/code/Magento/GoogleShopping/Block/Adminhtml/Captcha.php b/app/code/Magento/GoogleShopping/Block/Adminhtml/Captcha.php
index 6221902bbda..eb1d9ad3683 100644
--- a/app/code/Magento/GoogleShopping/Block/Adminhtml/Captcha.php
+++ b/app/code/Magento/GoogleShopping/Block/Adminhtml/Captcha.php
@@ -51,7 +51,7 @@ class Captcha extends \Magento\Adminhtml\Block\Template
'label' => __('Confirm'),
'onclick' => "if($('user_confirm').value != '')
{
- setLocation('".$this->getUrl('*/*/confirmCaptcha', array('_current'=>true))."' + 'user_confirm/' + $('user_confirm').value + '/');
+ setLocation('".$this->getUrl('adminhtml/*/confirmCaptcha', array('_current'=>true))."' + 'user_confirm/' + $('user_confirm').value + '/');
}",
'class' => 'task'
));
diff --git a/app/code/Magento/GoogleShopping/Block/Adminhtml/Items.php b/app/code/Magento/GoogleShopping/Block/Adminhtml/Items.php
index 6906793142e..36680cc9012 100644
--- a/app/code/Magento/GoogleShopping/Block/Adminhtml/Items.php
+++ b/app/code/Magento/GoogleShopping/Block/Adminhtml/Items.php
@@ -127,6 +127,6 @@ class Items extends \Magento\Adminhtml\Block\Widget\Grid\Container
*/
public function getStatusUrl()
{
- return $this->getUrl('*/*/status');
+ return $this->getUrl('adminhtml/*/status');
}
}
diff --git a/app/code/Magento/GoogleShopping/Block/Adminhtml/Items/Item.php b/app/code/Magento/GoogleShopping/Block/Adminhtml/Items/Item.php
index e5490ac95aa..650bafa54f0 100644
--- a/app/code/Magento/GoogleShopping/Block/Adminhtml/Items/Item.php
+++ b/app/code/Magento/GoogleShopping/Block/Adminhtml/Items/Item.php
@@ -122,13 +122,13 @@ class Item extends \Magento\Backend\Block\Widget\Grid\Extended
$this->getMassactionBlock()->addItem('delete', array(
'label' => __('Delete'),
- 'url' => $this->getUrl('*/*/massDelete', array('_current'=>true)),
+ 'url' => $this->getUrl('adminhtml/*/massDelete', array('_current'=>true)),
'confirm' => __('Are you sure?')
));
$this->getMassactionBlock()->addItem('refresh', array(
'label' => __('Synchronize'),
- 'url' => $this->getUrl('*/*/refresh', array('_current'=>true)),
+ 'url' => $this->getUrl('adminhtml/*/refresh', array('_current'=>true)),
'confirm' => __('This action will update items\' attributes and remove items that are not available in Google Content. If an attribute was deleted from the mapping, it will also be deleted from Google. Do you want to continue?')
));
return $this;
@@ -141,6 +141,6 @@ class Item extends \Magento\Backend\Block\Widget\Grid\Extended
*/
public function getGridUrl()
{
- return $this->getUrl('*/*/grid', array('_current'=>true));
+ return $this->getUrl('adminhtml/*/grid', array('_current'=>true));
}
}
diff --git a/app/code/Magento/GoogleShopping/Block/Adminhtml/Items/Product.php b/app/code/Magento/GoogleShopping/Block/Adminhtml/Items/Product.php
index f157f389b80..4bc78c52d07 100644
--- a/app/code/Magento/GoogleShopping/Block/Adminhtml/Items/Product.php
+++ b/app/code/Magento/GoogleShopping/Block/Adminhtml/Items/Product.php
@@ -213,7 +213,7 @@ class Product extends \Magento\Backend\Block\Widget\Grid\Extended
$this->getMassactionBlock()->addItem('add', array(
'label' => __('Add to Google Content'),
- 'url' => $this->getUrl('*/*/massAdd', array('_current'=>true)),
+ 'url' => $this->getUrl('adminhtml/*/massAdd', array('_current'=>true)),
));
return $this;
}
@@ -225,7 +225,7 @@ class Product extends \Magento\Backend\Block\Widget\Grid\Extended
*/
public function getGridUrl()
{
- return $this->getUrl('*/googleshopping_selection/grid', array('index' => $this->getIndex(),'_current'=>true));
+ return $this->getUrl('adminhtml/googleshopping_selection/grid', array('index' => $this->getIndex(),'_current'=>true));
}
/**
diff --git a/app/code/Magento/GoogleShopping/Block/Adminhtml/Store/Switcher.php b/app/code/Magento/GoogleShopping/Block/Adminhtml/Store/Switcher.php
index 10ac5857a30..d8099511b1b 100644
--- a/app/code/Magento/GoogleShopping/Block/Adminhtml/Store/Switcher.php
+++ b/app/code/Magento/GoogleShopping/Block/Adminhtml/Store/Switcher.php
@@ -48,6 +48,6 @@ class Switcher extends \Magento\Backend\Block\Store\Switcher
protected function _construct()
{
parent::_construct();
- $this->setUseConfirm(false)->setSwitchUrl($this->getUrl('*/*/*', array('store' => null)));
+ $this->setUseConfirm(false)->setSwitchUrl($this->getUrl('adminhtml/*/*', array('store' => null)));
}
}
diff --git a/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Form.php b/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Form.php
index 5e21bdfa9b6..98f84db3b08 100644
--- a/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Form.php
+++ b/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Form.php
@@ -279,6 +279,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
*/
public function getSaveUrl()
{
- return $this->getUrl('*/*/save', array('type_id' => $this->getItemType()->getId()));
+ return $this->getUrl('adminhtml/*/save', array('type_id' => $this->getItemType()->getId()));
}
}
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php
index ecfb87b44df..cac7b2f22e4 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php
@@ -34,7 +34,7 @@
*/
namespace Magento\GoogleShopping\Controller\Adminhtml\Googleshopping;
-class Items extends \Magento\Adminhtml\Controller\Action
+class Items extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Initialize general settings for action
@@ -58,7 +58,7 @@ class Items extends \Magento\Adminhtml\Controller\Action
$this->_title(__('Google Content Items'));
if (0 === (int)$this->getRequest()->getParam('store')) {
- $this->_redirect('*/*/', array(
+ $this->_redirect('adminhtml/*/', array(
'store' => $this->_objectManager->get('Magento\Core\Model\StoreManagerInterface')
->getAnyStoreView()->getId(),
'_current' => true)
@@ -273,7 +273,7 @@ class Items extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addError(__('Something went wrong during Captcha confirmation.'));
}
- $this->_redirect('*/*/index', array('store'=>$storeId));
+ $this->_redirect('adminhtml/*/index', array('store'=>$storeId));
}
/**
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Selection.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Selection.php
index 5c597312e5d..654e54bef45 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Selection.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Selection.php
@@ -33,7 +33,7 @@
*/
namespace Magento\GoogleShopping\Controller\Adminhtml\Googleshopping;
-class Selection extends \Magento\Adminhtml\Controller\Action
+class Selection extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Search result grid with available products for Google Content
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types.php
index 4d58f1aebd2..15b5a068b38 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types.php
@@ -29,7 +29,7 @@
*/
namespace Magento\GoogleShopping\Controller\Adminhtml\Googleshopping;
-class Types extends \Magento\Adminhtml\Controller\Action
+class Types extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -132,7 +132,7 @@ class Types extends \Magento\Adminhtml\Controller\Action
} catch (\Exception $e) {
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
$this->_getSession()->addError(__("We can't create Attribute Set Mapping."));
- $this->_redirect('*/*/index', array('store' => $this->_getStore()->getId()));
+ $this->_redirect('adminhtml/*/index', array('store' => $this->_getStore()->getId()));
}
}
@@ -167,7 +167,7 @@ class Types extends \Magento\Adminhtml\Controller\Action
} catch (\Exception $e) {
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
$this->_getSession()->addError(__("We can't edit Attribute Set Mapping."));
- $this->_redirect('*/*/index');
+ $this->_redirect('adminhtml/*/index');
}
}
@@ -228,7 +228,7 @@ class Types extends \Magento\Adminhtml\Controller\Action
$this->_objectManager->get('Magento\Adminhtml\Model\Session')
->addError(__("We can't save Attribute Set Mapping."));
}
- $this->_redirect('*/*/index', array('store' => $this->_getStore()->getId()));
+ $this->_redirect('adminhtml/*/index', array('store' => $this->_getStore()->getId()));
}
/**
@@ -248,7 +248,7 @@ class Types extends \Magento\Adminhtml\Controller\Action
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
$this->_getSession()->addError(__("We can't delete Attribute Set Mapping."));
}
- $this->_redirect('*/*/index', array('store' => $this->_getStore()->getId()));
+ $this->_redirect('adminhtml/*/index', array('store' => $this->_getStore()->getId()));
}
/**
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit/Form.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit/Form.php
index d1cc85802a0..bf142951f05 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit/Form.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit/Form.php
@@ -79,7 +79,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
$form = $this->_formFactory->create(array(
'attributes' => array(
'id' => 'edit_form',
- 'action' => $this->getUrl('*/*/getFilter'),
+ 'action' => $this->getUrl('adminhtml/*/getFilter'),
'method' => 'post',
))
);
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
index 06c6c06660a..0f8cacae83a 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit/Form.php
@@ -89,7 +89,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
$form = $this->_formFactory->create(array(
'attributes' => array(
'id' => 'edit_form',
- 'action' => $this->getUrl('*/*/validate'),
+ 'action' => $this->getUrl('adminhtml/*/validate'),
'method' => 'post',
'enctype' => 'multipart/form-data',
))
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php
index a63237352f4..990008557d6 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php
@@ -162,7 +162,7 @@ class Result extends \Magento\Adminhtml\Block\Template
*/
public function getImportStartUrl()
{
- return $this->getUrl('*/*/start');
+ return $this->getUrl('adminhtml/*/start');
}
/**
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export.php
index dba20d43312..85b12aa26a7 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export.php
@@ -33,7 +33,7 @@
*/
namespace Magento\ImportExport\Controller\Adminhtml;
-class Export extends \Magento\Adminhtml\Controller\Action
+class Export extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Initialize layout.
@@ -86,7 +86,7 @@ class Export extends \Magento\Adminhtml\Controller\Action
} else {
$this->_getSession()->addError(__('Please correct the data sent.'));
}
- return $this->_redirect('*/*/index');
+ return $this->_redirect('adminhtml/*/index');
}
/**
@@ -134,6 +134,6 @@ class Export extends \Magento\Adminhtml\Controller\Action
} else {
$this->_getSession()->addError(__('Please correct the data sent.'));
}
- $this->_redirect('*/*/index');
+ $this->_redirect('adminhtml/*/index');
}
}
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import.php
index 5337f0a6394..31bf54ec3cc 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import.php
@@ -33,7 +33,7 @@
*/
namespace Magento\ImportExport\Controller\Adminhtml;
-class Import extends \Magento\Adminhtml\Controller\Action
+class Import extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Initialize layout.
@@ -97,7 +97,7 @@ class Import extends \Magento\Adminhtml\Controller\Action
->addSuccess(__('Import successfully done'));
$this->renderLayout();
} else {
- $this->_redirect('*/*/index');
+ $this->_redirect('adminhtml/*/index');
}
}
@@ -160,7 +160,7 @@ class Import extends \Magento\Adminhtml\Controller\Action
$this->renderLayout();
} else {
$this->_getSession()->addError(__('Data is invalid or file is not uploaded'));
- $this->_redirect('*/*/index');
+ $this->_redirect('adminhtml/*/index');
}
}
diff --git a/app/code/Magento/Index/Block/Adminhtml/Process/Grid.php b/app/code/Magento/Index/Block/Adminhtml/Process/Grid.php
index 309ebc29872..6724e973069 100644
--- a/app/code/Magento/Index/Block/Adminhtml/Process/Grid.php
+++ b/app/code/Magento/Index/Block/Adminhtml/Process/Grid.php
@@ -289,7 +289,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
*/
public function getRowUrl($row)
{
- return $this->getUrl('*/*/edit', array('process' => $row->getId()));
+ return $this->getUrl('adminhtml/*/edit', array('process' => $row->getId()));
}
/**
@@ -306,7 +306,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
$this->getMassactionBlock()->addItem('change_mode', array(
'label' => __('Change Index Mode'),
- 'url' => $this->getUrl('*/*/massChangeMode'),
+ 'url' => $this->getUrl('adminhtml/*/massChangeMode'),
'additional' => array(
'mode' => array(
'name' => 'index_mode',
@@ -320,7 +320,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
$this->getMassactionBlock()->addItem('reindex', array(
'label' => __('Reindex Data'),
- 'url' => $this->getUrl('*/*/massReindex'),
+ 'url' => $this->getUrl('adminhtml/*/massReindex'),
'selected' => true,
));
diff --git a/app/code/Magento/Index/Controller/Adminhtml/Process.php b/app/code/Magento/Index/Controller/Adminhtml/Process.php
index b5b1ed37f47..c78ca4d13f5 100644
--- a/app/code/Magento/Index/Controller/Adminhtml/Process.php
+++ b/app/code/Magento/Index/Controller/Adminhtml/Process.php
@@ -25,7 +25,7 @@
*/
namespace Magento\Index\Controller\Adminhtml;
-class Process extends \Magento\Adminhtml\Controller\Action
+class Process extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -114,7 +114,7 @@ class Process extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addError(
__('Cannot initialize the indexer process.')
);
- $this->_redirect('*/*/list');
+ $this->_redirect('adminhtml/*/list');
}
}
@@ -142,12 +142,12 @@ class Process extends \Magento\Adminhtml\Controller\Action
__('There was a problem with saving process.')
);
}
- $this->_redirect('*/*/list');
+ $this->_redirect('adminhtml/*/list');
} else {
$this->_getSession()->addError(
__('Cannot initialize the indexer process.')
);
- $this->_redirect('*/*/list');
+ $this->_redirect('adminhtml/*/list');
}
}
@@ -180,7 +180,7 @@ class Process extends \Magento\Adminhtml\Controller\Action
);
}
- $this->_redirect('*/*/list');
+ $this->_redirect('adminhtml/*/list');
}
/**
@@ -229,7 +229,7 @@ class Process extends \Magento\Adminhtml\Controller\Action
}
}
- $this->_redirect('*/*/list');
+ $this->_redirect('adminhtml/*/list');
}
/**
@@ -263,7 +263,7 @@ class Process extends \Magento\Adminhtml\Controller\Action
}
}
- $this->_redirect('*/*/list');
+ $this->_redirect('adminhtml/*/list');
}
/**
diff --git a/app/code/Magento/Install/Model/Installer.php b/app/code/Magento/Install/Model/Installer.php
index 74c5037923e..2931e96ed3e 100644
--- a/app/code/Magento/Install/Model/Installer.php
+++ b/app/code/Magento/Install/Model/Installer.php
@@ -343,9 +343,9 @@ class Installer extends \Magento\Object
}
if (!empty($data['enable_charts'])) {
- $setupModel->setConfigData(\Magento\Adminhtml\Block\Dashboard::XML_PATH_ENABLE_CHARTS, 1);
+ $setupModel->setConfigData(\Magento\Backend\Block\Dashboard::XML_PATH_ENABLE_CHARTS, 1);
} else {
- $setupModel->setConfigData(\Magento\Adminhtml\Block\Dashboard::XML_PATH_ENABLE_CHARTS, 0);
+ $setupModel->setConfigData(\Magento\Backend\Block\Dashboard::XML_PATH_ENABLE_CHARTS, 0);
}
if (!empty($data['admin_no_form_key'])) {
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 d4f2da41f1a..275de31d64f 100644
--- a/app/code/Magento/Install/view/install/layout/install_wizard.xml
+++ b/app/code/Magento/Install/view/install/layout/install_wizard.xml
@@ -28,6 +28,7 @@
<action method="setTemplate">
<argument name="template" xsi:type="string">Magento_Install::page.phtml</argument>
</action>
+ <block class="Magento\Backend\Block\Page\Copyright" name="copyright" as="copyright"/>
<container name="left" as="left" label="Left Column"/>
<container name="content" as="content" label="Content"/>
</block>
diff --git a/app/code/Magento/Install/view/install/page.phtml b/app/code/Magento/Install/view/install/page.phtml
index 663d35b5873..fffeb7ee9ba 100644
--- a/app/code/Magento/Install/view/install/page.phtml
+++ b/app/code/Magento/Install/view/install/page.phtml
@@ -114,7 +114,7 @@
href="http://www.magentocommerce.com/bug-tracking"
target="varien_external"><strong><?php echo __('Report All Bugs') ?></strong></a> <?php echo __('(ver. %1)', \Magento\Core\Model\App::VERSION) ?>
<br/>
- <?php echo __('Magento® is a trademark of X.commerce, Inc. Copyright © %1 X.commerce, Inc.', date('Y')) ?>
+ <?php echo $this->getChildHtml('copyright');?>
</p>
</div>
</div>
diff --git a/app/code/Magento/Media/Model/File/Image.php b/app/code/Magento/Media/Model/File/Image.php
deleted file mode 100644
index 36d454fb945..00000000000
--- a/app/code/Magento/Media/Model/File/Image.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category Magento
- * @package Magento_Media
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-
-
-/**
- * Media library file image resource model
- *
- * @category Magento
- * @package Magento_Media
- * @author Magento Core Team <core@magentocommerce.com>
- */
-namespace Magento\Media\Model\File;
-
-class Image extends \Magento\Core\Model\Resource\AbstractResource
-{
- /**
- * Resource initialization
- */
- protected function _construct()
- {
- return $this;
- }
-
- /**
- * Retrieve connection for read data
- */
- protected function _getReadAdapter()
- {
- return false;
- }
-
- /**
- * Retrieve connection for write data
- */
- protected function _getWriteAdapter()
- {
- return false;
- }
-
- public function load(\Magento\Media\Model\Image $object, $file, $field=null)
- {
- // Do some implementation
- return $this;
- }
-
- public function save(\Magento\Media\Model\Image $object)
- {
- // Do some implementation
- return $this;
- }
-
- public function delete(\Magento\Media\Model\Image $object)
- {
- return $this;
- }
-
- /**
- * Create image resource for operation from file
- *
- * @param \Magento\Media\Model\Image $object
- * @throws \Magento\Core\Exception
- * @return \Magento\Media\Model\File\Image
- */
- public function getImage(\Magento\Media\Model\Image $object)
- {
- $resource = false;
- switch (strtolower($object->getExtension())) {
- case 'jpg':
- case 'jpeg':
- $resource = imagecreatefromjpeg($object->getFilePath());
- break;
-
- case 'gif':
- $resource = imagecreatefromgif($object->getFilePath());
- break;
-
- case 'png':
- $resource = imagecreatefrompng($object->getFilePath());
- break;
- }
- if (!$resource) {
- throw new \Magento\Core\Exception(__('The image does not exist or is invalid.'));
- }
- return $resource;
- }
-
- /**
- * Create tmp image resource for operations
- *
- * @param \Magento\Media\Model\Image $object
- * @return \Magento\Media\Model\File\Image
- */
- public function getTmpImage(\Magento\Media\Model\Image $object)
- {
- $resource = imagecreatetruecolor($object->getDestanationDimensions()->getWidth(), $object->getDestanationDimensions()->getHeight());
- return $resource;
- }
-
- /**
- * Resize image
- *
- * @param \Magento\Media\Model\Image $object
- * @return \Magento\Media\Model\File\Image
- */
- public function resize(\Magento\Media\Model\Image $object)
- {
- $tmpImage = $object->getTmpImage();
- $sourceImage = $object->getImage();
-
- imagecopyresampled(
- $tmpImage,
- $sourceImage,
- 0, 0, 0, 0,
- $object->getDestanationDimensions()->getWidth(),
- $object->getDestanationDimensions()->getHeight(),
- $object->getDimensions()->getWidth(),
- $object->getDimensions()->getHeight()
- );
-
- return $this;
- }
-
- /**
- * Add watermark for image
- *
- * @param \Magento\Media\Model\Image $object
- * @return \Magento\Media\Model\File\Image
- */
- public function watermark(\Magento\Media\Model\Image $object)
- {
- return $this;
- }
-
- /**
- * Creates image
- *
- * @param \Magento\Media\Model\Image $object
- * @param string|null $extension
- * @throws \Magento\Core\Exception
- * @return \Magento\Media\Model\File\Image
- */
- public function saveAs(\Magento\Media\Model\Image $object, $extension=null)
- {
- if (is_null($extension)) {
- $extension = $object->getExtension();
- }
-
- $result = false;
- switch (strtolower($extension)) {
- case 'jpg':
- case 'jpeg':
- $result = imagejpeg($object->getTmpImage(), $object->getFilePath(true), 80);
- break;
- case 'gif':
- $result = imagegif($object->getTmpImage(), $object->getFilePath(true));
- break;
- case 'png':
- $result = imagepng($object->getTmpImage(), $object->getFilePath(true));
- break;
- }
- if (!$result) {
- throw new \Magento\Core\Exception(__('Something went wrong while creating the image.'));
- }
- return $this;
- }
-
- /**
- * Retrive image dimensions
- *
- * @param \Magento\Media\Model\Image $object
- * @throws \Magento\Core\Exception
- * @return \Magento\Object
- */
- public function getDimensions(\Magento\Media\Model\Image $object)
- {
- $info = @getimagesize($object->getFilePath());
- if (!$info) {
- throw new \Magento\Core\Exception(__('The image does not exist or is invalid.'));
- }
- $info = array('width'=>$info[0], 'height'=>$info[1], 'type'=>$info[2]);
- return new \Magento\Object($info);
- }
-
- /**
- * Destroys resource object
- *
- * @param resource $resource
- */
- public function destroyResource(&$resource)
- {
- imagedestroy($resource);
- return $this;
- }
-
- /**
- * Destroys resource object
- *
- * @param resource $resource
- */
- public function hasSpecialImage(\Magento\Media\Model\Image $object)
- {
- if(file_exists($object->getFilePath(true))) {
- return true;
- }
-
- return false;
- }
-
-
-}
diff --git a/app/code/Magento/Media/Model/Image.php b/app/code/Magento/Media/Model/Image.php
deleted file mode 100644
index e2b934f9133..00000000000
--- a/app/code/Magento/Media/Model/Image.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category Magento
- * @package Magento_Media
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-
-
-/**
- * Media library Image model
- *
- * @category Magento
- * @package Magento_Media
- * @author Magento Core Team <core@magentocommerce.com>
- */
-namespace Magento\Media\Model;
-
-class Image extends \Magento\Core\Model\AbstractModel
-{
- /**
- * Image config instance
- *
- * @var \Magento\Media\Model\Image\Config\ConfigInterface
- */
- protected $_config;
-
- /**
- * Image resource
- *
- * @var resource
- */
- protected $_image;
-
- /**
- * Tmp image resource
- *
- * @var resource
- */
- protected $_tmpImage;
-
- /**
- * Params for filename generation
- *
- * @var array
- */
- protected $_params = array();
-
-
- protected function _construct()
- {
- $this->_init('Magento\Media\Model\File\Image');
- }
-
- /**
- * Set media image config instance
- *
- * @param \Magento\Media\Model\Image\Config\ConfigInterface $config
- * @return unknown
- */
- public function setConfig(\Magento\Media\Model\Image\Config\ConfigInterface $config)
- {
- $this->_config = $config;
- return $this;
- }
-
- /**
- * Retrive media image config instance
- *
- * @return \Magento\Media\Model\Image\Config\ConfigInterface
- */
- public function getConfig()
- {
- return $this->_config;
- }
-
- public function getImage()
- {
- if (is_null($this->_image)) {
- $this->_image = $this->_getResource()->getImage($this);
- }
-
- return $this->_image;
- }
-
- public function getTmpImage()
- {
- if (is_null($this->_image)) {
- $this->_tmpImage = $this->_getResource()->getTmpImage($this);
- }
-
- return $this->_tmpImage;
- }
-
- /**
- * Retrive source dimensions object
- *
- * @return \Magento\Object
- */
- public function getDimensions()
- {
- if (!$this->getData('dimensions')) {
- $this->setData('dimensions', $this->_getResource()->getDimensions($this));
- }
- return $this->getData('dimensions');
- }
-
- /**
- * Retrive destanation dimensions object
- *
- * @return \Magento\Object
- */
- public function getDestanationDimensions()
- {
- if (!$this->getData('destanation_dimensions')) {
- $this->setData('destanation_dimensions', clone $this->getDimensions());
- }
-
- return $this->getData('destanation_dimensions');
- }
-
- public function getExtension()
- {
- return substr($this->getFileName(), strrpos($this->getFileName(), '.') + 1);
- }
-
- public function getFilePath($useParams = false)
- {
- if ($useParams && sizeof($this->getParams())) {
- $changes = '.' . $this->getParamsSum();
- } else {
- $changes = '';
- }
-
- return $this->getConfig()->getBaseMediaPath() . DS . $this->getName() . $changes . '.'
- . ( ( $useParams && $this->getParam('extension')) ? $this->getParam('extension') : $this->getExtension() );
- }
-
- public function getFileUrl($useParams = false)
- {
- if ($useParams && sizeof($this->getParams())) {
- $changes = '.' . $this->getParamsSum();
- } else {
- $changes = '';
- }
-
- return $this->getConfig()->getBaseMediaUrl() . '/' . $this->getName() . $changes . '.'
- . ( ( $useParams && $this->getParam('extension')) ? $this->getParam('extension') : $this->getExtension() );
- }
-
- public function getName()
- {
- return substr($this->getFileName(), 0, strrpos($this->getFileName(), '.'));
- }
-
- public function addParam($param, $value = null)
- {
- if (is_array($param)) {
- $this->_params = array_merge($this->_params, $param);
- } else {
- $this->_params[$param] = $value;
- }
-
- return $this;
- }
-
- public function setParam($param, $value = null)
- {
- if (is_array($param)) {
- $this->_params = $param;
- } else {
- $this->_params[$param] = $value;
- }
-
- return $this;
- }
-
- public function getParam($param)
- {
- if (isset($this->_params[$param])) {
- return $this->_params[$param];
- }
-
- return null;
- }
-
- public function getParams()
- {
- return $this->_params;
- }
-
- public function getParamsSum()
- {
- return md5(serialize($this->_params));
- }
-
- /**
- * Return special link (with creating image if not exists)
- *
- * @param string $file
- * @param string $size
- * @param string $extension
- * @param string $watermark
- * @return string
- */
- public function getSpecialLink($file, $size, $extension=null, $watermark=null)
- {
- $this->_removeResources();
- $this->setData(array());
- $this->setParam(array());
- $this->setFileName($file);
-
- $this->addParam('size', $size);
- $this->addParam('watermark', $watermark);
- $this->addParam('extension', $extension);
-
- if (!$this->hasSpecialImage()) {
- if (strpos($size, 'x') !== false) {
- list($width, $height) = explode('x', $size);
- } else {
- $width = $size;
- $height = $this->getDimensions()->getHeight();
- }
-
- $sizeHRate = $width / $this->getDimensions()->getWidth();
- $sizeVRate = $height / $this->getDimensions()->getHeight();
-
- $rate = min($sizeHRate, $sizeVRate);
-
- if ($rate > 1) { // If image smaller than needed
- $rate = 1;
- }
-
- $this->getDestanationDimensions()
- ->setWidth($rate*$this->getDimensions()->getWidth())
- ->setHeight($rate*$this->getDimensions()->getHeight());
-
-
- $this->_getResource()->resize($this);
- $this->_getResource()->watermark($this);
- $this->_getResource()->saveAs($this, $extension);
- $this->_removeResources();
- }
-
- return $this->getFileUrl(true);
- }
-
- public function hasSpecialImage()
- {
- return $this->_getResource()->hasSpecialImage($this);
- }
-
- protected function _removeResources()
- {
- if ($this->_image) {
- $this->_getResource()->destroyResource($this->_image);
- $this->_image = null;
- }
-
- if ($this->_tmpImage) {
- $this->_getResource()->destroyResource($this->_tmpImage);
- $this->_tmpImage = null;
- }
- }
-
-}
diff --git a/app/code/Magento/Media/etc/module.xml b/app/code/Magento/Media/etc/module.xml
deleted file mode 100755
index 0862c2a7a47..00000000000
--- a/app/code/Magento/Media/etc/module.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<config>
- <module name="Magento_Media" version="1.6.0.0" active="true">
- <sequence>
- <module name="Magento_Core"/>
- </sequence>
- <depends>
- <module name="Magento_Core"/>
- </depends>
- </module>
-</config>
diff --git a/app/code/Magento/Media/i18n/de_DE.csv b/app/code/Magento/Media/i18n/de_DE.csv
deleted file mode 100644
index 084d8a17695..00000000000
--- a/app/code/Magento/Media/i18n/de_DE.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-"An error occurred while creating the image.","Ein Fehler trat auf während der Erstellung des Bildes."
-"The image does not exist or is invalid.","Das Bild ist nicht vorhanden oder ungültig."
-"This content requires last version of Adobe Flash Player. <a href=""%s"">Get Flash</a>","Dieser Inhalt erfordert die neueste Version des Adobe Flash Players. <a href=""%s"">Flash herunterladen</a>
-"
diff --git a/app/code/Magento/Media/i18n/en_US.csv b/app/code/Magento/Media/i18n/en_US.csv
deleted file mode 100644
index 110331bab7b..00000000000
--- a/app/code/Magento/Media/i18n/en_US.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"An error occurred while creating the image.","An error occurred while creating the image."
-"The image does not exist or is invalid.","The image does not exist or is invalid."
-"This content requires last version of Adobe Flash Player. <a href=""%s"">Get Flash</a>","This content requires last version of Adobe Flash Player. <a href=""%s"">Get Flash</a>"
diff --git a/app/code/Magento/Media/i18n/es_ES.csv b/app/code/Magento/Media/i18n/es_ES.csv
deleted file mode 100644
index c779e04fad7..00000000000
--- a/app/code/Magento/Media/i18n/es_ES.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"An error occurred while creating the image.","Se ha producido un error al crear la imagen."
-"The image does not exist or is invalid.","La imagen no existe o no es válida."
-"This content requires last version of Adobe Flash Player. <a href=""%s"">Get Flash</a>","Este contenido requiere la última versión de Adobe Flash Player. <a href=""%s"">Obtener Flash</a>"
diff --git a/app/code/Magento/Media/i18n/fr_FR.csv b/app/code/Magento/Media/i18n/fr_FR.csv
deleted file mode 100644
index 23845f271fb..00000000000
--- a/app/code/Magento/Media/i18n/fr_FR.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"An error occurred while creating the image.","Une erreur est survenue lors de la création de l'image."
-"The image does not exist or is invalid.","L'image n'existe pas ou est invalide."
-"This content requires last version of Adobe Flash Player. <a href=""%s"">Get Flash</a>","Ce contenu requiert la dernière version d’Adobe Flash Player. <a href=""%s"">Télécharger Flash</a>"
diff --git a/app/code/Magento/Media/i18n/nl_NL.csv b/app/code/Magento/Media/i18n/nl_NL.csv
deleted file mode 100644
index c99a85d4312..00000000000
--- a/app/code/Magento/Media/i18n/nl_NL.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"An error occurred while creating the image.","Er is een fout opgetreden tijdens het aanmaken van het plaatje."
-"The image does not exist or is invalid.","De afbeelding bestaat niet of is niet valide."
-"This content requires last version of Adobe Flash Player. <a href=""%s"">Get Flash</a>","Deze inhoud vereist de meest recente versie van Adobe Flash Player. <a href=""%s"">Get Flash</a>"
diff --git a/app/code/Magento/Media/i18n/pt_BR.csv b/app/code/Magento/Media/i18n/pt_BR.csv
deleted file mode 100644
index d70e96c3afd..00000000000
--- a/app/code/Magento/Media/i18n/pt_BR.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"An error occurred while creating the image.","Ocorreu um erro durante a criação da imagem."
-"The image does not exist or is invalid.","A imagem não existe ou não é válida."
-"This content requires last version of Adobe Flash Player. <a href=""%s"">Get Flash</a>","Este conteúdo requer a última versão do Adobe Flash Player. <a href=""%s"">Obter Flash</a>"
diff --git a/app/code/Magento/Media/i18n/zh_CN.csv b/app/code/Magento/Media/i18n/zh_CN.csv
deleted file mode 100644
index 3a2b3674672..00000000000
--- a/app/code/Magento/Media/i18n/zh_CN.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"An error occurred while creating the image.","创建图åƒæ—¶é‡åˆ°äº†é”™è¯¯ã€‚"
-"The image does not exist or is invalid.","该图åƒä¸å˜åœ¨æˆ–æ— æ•ˆã€‚"
-"This content requires last version of Adobe Flash Player. <a href=""%s"">Get Flash</a>","该内容需è¦æœ€æ–°ç‰ˆAdobe Flash Player。<a href=""%s"">获å–Flash</a>"
diff --git a/app/code/Magento/Newsletter/view/frontend/layout/newsletter_manage_index.xml b/app/code/Magento/Newsletter/view/frontend/layout/newsletter_manage_index.xml
index 51d34aa16fb..8b568d45f27 100644
--- a/app/code/Magento/Newsletter/view/frontend/layout/newsletter_manage_index.xml
+++ b/app/code/Magento/Newsletter/view/frontend/layout/newsletter_manage_index.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Newsletter Subscriptions" type="page" parent="customer_account_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Newsletter Subscriptions" type="page">
<update handle="customer_account"/>
<referenceContainer name="my.account.wrapper">
<block class="Magento\Customer\Block\Newsletter" name="customer_newsletter">
diff --git a/app/code/Magento/Oauth/Block/Adminhtml/Oauth/Consumer/Edit/Form.php b/app/code/Magento/Oauth/Block/Adminhtml/Oauth/Consumer/Edit/Form.php
index e66342ee3b0..d37f368ee77 100644
--- a/app/code/Magento/Oauth/Block/Adminhtml/Oauth/Consumer/Edit/Form.php
+++ b/app/code/Magento/Oauth/Block/Adminhtml/Oauth/Consumer/Edit/Form.php
@@ -49,7 +49,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
$form = $this->_formFactory->create(array(
'attributes' => array(
'id' => 'edit_form',
- 'action' => $this->getUrl('*/*/save',
+ 'action' => $this->getUrl('adminhtml/*/save',
$consumerData[self::DATA_ENTITY_ID]
? array('id' => $consumerData[self::DATA_ENTITY_ID]) : array()),
'method' => 'post'
diff --git a/app/code/Magento/Oauth/Block/Adminhtml/Oauth/Consumer/Grid.php b/app/code/Magento/Oauth/Block/Adminhtml/Oauth/Consumer/Grid.php
index f783936b62a..1ad491a445b 100644
--- a/app/code/Magento/Oauth/Block/Adminhtml/Oauth/Consumer/Grid.php
+++ b/app/code/Magento/Oauth/Block/Adminhtml/Oauth/Consumer/Grid.php
@@ -127,7 +127,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
*/
public function getGridUrl()
{
- return $this->getUrl('*/*/grid', array('_current' => true));
+ return $this->getUrl('adminhtml/*/grid', array('_current' => true));
}
/**
@@ -139,7 +139,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
public function getRowUrl($row)
{
if ($this->_editAllow) {
- return $this->getUrl('*/*/edit', array('id' => $row->getId()));
+ return $this->getUrl('adminhtml/*/edit', array('id' => $row->getId()));
}
return null;
}
diff --git a/app/code/Magento/Oauth/Controller/Adminhtml/Oauth/Consumer.php b/app/code/Magento/Oauth/Controller/Adminhtml/Oauth/Consumer.php
index 143680ca355..2c97ca24372 100644
--- a/app/code/Magento/Oauth/Controller/Adminhtml/Oauth/Consumer.php
+++ b/app/code/Magento/Oauth/Controller/Adminhtml/Oauth/Consumer.php
@@ -130,7 +130,7 @@ class Consumer extends \Magento\Backend\Controller\AbstractAction
if (!$consumerId) {
$this->_getSession()->addError(__('Invalid ID parameter.'));
- $this->_redirect('*/*/index');
+ $this->_redirect('adminhtml/*/index');
return $consumer;
}
@@ -139,7 +139,7 @@ class Consumer extends \Magento\Backend\Controller\AbstractAction
if (!$consumer->getId()) {
$this->_getSession()
->addError(__('An add-on with ID %1 was not found.', $consumerId));
- $this->_redirect('*/*/index');
+ $this->_redirect('adminhtml/*/index');
}
return $consumer;
@@ -221,9 +221,9 @@ class Consumer extends \Magento\Backend\Controller\AbstractAction
private function _redirectToEditOrNew($consumerId)
{
if ($consumerId) {
- $this->_redirect('*/*/edit', array(self::PARAM_CONSUMER_ID => $consumerId));
+ $this->_redirect('adminhtml/*/edit', array(self::PARAM_CONSUMER_ID => $consumerId));
} else {
- $this->_redirect('*/*/new');
+ $this->_redirect('adminhtml/*/new');
}
}
@@ -279,11 +279,11 @@ class Consumer extends \Magento\Backend\Controller\AbstractAction
//$this->_redirect('<Add-On Website URL>', array(
//'oauth_consumer_key' => $consumerData[self::DATA_KEY],
//'oauth_verifier' => $verifier[self::DATA_VERIFIER],
- //'callback_url' => $this->getUrl('*/*/index')
+ //'callback_url' => $this->getUrl('adminhtml/*/index')
//));
- $this->_redirect('*/*/index');
+ $this->_redirect('adminhtml/*/index');
} else {
- $this->_redirect('*/*/index');
+ $this->_redirect('adminhtml/*/index');
}
}
@@ -352,6 +352,6 @@ class Consumer extends \Magento\Backend\Controller\AbstractAction
->addException($e, __('An error occurred while deleting the add-on.'));
}
}
- $this->_redirect('*/*/index');
+ $this->_redirect('adminhtml/*/index');
}
}
diff --git a/app/code/Magento/Ogone/view/frontend/layout/ogone_api_paypage.xml b/app/code/Magento/Ogone/view/frontend/layout/ogone_api_paypage.xml
index 394ef857cc6..869871ab8d5 100644
--- a/app/code/Magento/Ogone/view/frontend/layout/ogone_api_paypage.xml
+++ b/app/code/Magento/Ogone/view/frontend/layout/ogone_api_paypage.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Ogone Paygate Payment" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Ogone Paygate Payment" type="page">
<remove name="catalog.topnav"/>
<referenceBlock name="header">
<remove name="top.links"/>
diff --git a/app/code/Magento/Ogone/view/frontend/layout/ogone_api_placeform.xml b/app/code/Magento/Ogone/view/frontend/layout/ogone_api_placeform.xml
index 43d3d7a2282..17f0118b461 100644
--- a/app/code/Magento/Ogone/view/frontend/layout/ogone_api_placeform.xml
+++ b/app/code/Magento/Ogone/view/frontend/layout/ogone_api_placeform.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Ogone Paygate Payment Place" type="page" parent="ogone_api_paypage">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Ogone Paygate Payment Place" type="page">
<referenceContainer name="content">
<block class="Magento\Ogone\Block\Placeform" name="ogone_placeform" template="placeform.phtml"/>
</referenceContainer>
diff --git a/app/code/Magento/Page/view/frontend/1column.phtml b/app/code/Magento/Page/view/frontend/1column.phtml
index c3ead493844..8ab698c3416 100644
--- a/app/code/Magento/Page/view/frontend/1column.phtml
+++ b/app/code/Magento/Page/view/frontend/1column.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -28,31 +27,34 @@
/**
* Template for \Magento\Page\Block\Html
*/
+$bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
+<!doctype html>
+<html lang="<?php echo $this->getLang() ?>" class="no-js">
<head>
-<?php echo $this->getChildHtml('head') ?>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width">
+ <?php echo $this->getChildHtml('head') ?>
</head>
-<body<?php echo $this->getBodyClass()?' class="'.$this->getBodyClass().'"':'' ?> data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
-<?php echo $this->getChildHtml('after_body_start') ?>
-<div class="wrapper">
- <?php echo $this->getChildHtml('global_notices') ?>
- <div class="page">
- <?php echo $this->getChildHtml('header') ?>
- <div class="main-container col1-layout">
- <div class="main">
- <?php echo $this->getChildHtml('breadcrumbs') ?>
- <div class="col-main">
- <?php echo $this->getChildHtml('global_messages') ?>
- <?php echo $this->getChildHtml('content') ?>
- </div>
+<body class="col1-layout<?php echo $bodyCss ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+ <?php echo $this->getChildHtml('after_body_start') ?>
+ <div class="page wrapper">
+ <?php echo $this->getChildHtml('global_notices') ?>
+ <?php echo $this->getChildHtml('header-container') ?>
+ <?php echo $this->getChildHtml('page_top') ?>
+ <section class="page main">
+ <?php echo $this->getChildHtml('columns_top') ?>
+ <div class="columns">
+ <?php echo $this->getChildHtml('main') ?>
</div>
- </div>
+ </section>
+ <?php echo $this->getChildHtml('page_bottom') ?>
+
<?php echo $this->getChildHtml('footer') ?>
+
<?php echo $this->getChildHtml('before_body_end') ?>
</div>
-</div>
-<?php echo $this->getAbsoluteFooter() ?>
+ <?php echo $this->getAbsoluteFooter() ?>
</body>
</html>
diff --git a/app/code/Magento/Page/view/frontend/2columns-left.phtml b/app/code/Magento/Page/view/frontend/2columns-left.phtml
index 9047209145d..d5b79afb517 100644
--- a/app/code/Magento/Page/view/frontend/2columns-left.phtml
+++ b/app/code/Magento/Page/view/frontend/2columns-left.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -28,32 +27,40 @@
/**
* Template for \Magento\Page\Block\Html
*/
+$bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
+<!doctype html>
+<html lang="<?php echo $this->getLang() ?>" class="no-js">
<head>
-<?php echo $this->getChildHtml('head') ?>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width">
+ <?php echo $this->getChildHtml('head') ?>
</head>
-<body<?php echo $this->getBodyClass()?' class="'.$this->getBodyClass().'"':'' ?> data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
-<?php echo $this->getChildHtml('after_body_start') ?>
-<div class="wrapper">
- <?php echo $this->getChildHtml('global_notices') ?>
- <div class="page">
- <?php echo $this->getChildHtml('header') ?>
- <div class="main-container col2-left-layout">
- <div class="main">
- <?php echo $this->getChildHtml('breadcrumbs') ?>
- <div class="col-main">
- <?php echo $this->getChildHtml('global_messages') ?>
- <?php echo $this->getChildHtml('content') ?>
- </div>
- <div class="col-left sidebar"><?php echo $this->getChildHtml('left') ?></div>
+<body class="col2-left-layout<?php echo $bodyCss ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+ <?php echo $this->getChildHtml('after_body_start') ?>
+ <div class="page wrapper">
+ <?php echo $this->getChildHtml('global_notices') ?>
+ <?php echo $this->getChildHtml('header-container') ?>
+ <?php echo $this->getChildHtml('page_top') ?>
+ <section class="page main">
+ <?php echo $this->getChildHtml('columns_top') ?>
+ <div class="columns">
+ <?php
+ echo $this->getChildHtml('main');
+ // Inside of <php> to avoid spaces between tags
+ echo '<div class="column left sidebar">';
+ echo $this->getChildHtml('left');
+ echo '</div>';
+ ?>
</div>
- </div>
+ </section>
+ <?php echo $this->getChildHtml('page_bottom') ?>
+
<?php echo $this->getChildHtml('footer') ?>
+
<?php echo $this->getChildHtml('before_body_end') ?>
</div>
-</div>
-<?php echo $this->getAbsoluteFooter() ?>
+ <?php echo $this->getAbsoluteFooter() ?>
</body>
</html>
diff --git a/app/code/Magento/Page/view/frontend/2columns-right.phtml b/app/code/Magento/Page/view/frontend/2columns-right.phtml
index ea929a0ebbc..c96f684a0cf 100644
--- a/app/code/Magento/Page/view/frontend/2columns-right.phtml
+++ b/app/code/Magento/Page/view/frontend/2columns-right.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -28,32 +27,40 @@
/**
* Template for \Magento\Page\Block\Html
*/
+$bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
+<!doctype html>
+<html lang="<?php echo $this->getLang() ?>" class="no-js">
<head>
-<?php echo $this->getChildHtml('head') ?>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width">
+ <?php echo $this->getChildHtml('head') ?>
</head>
-<body<?php echo $this->getBodyClass()?' class="'.$this->getBodyClass().'"':'' ?> data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
-<?php echo $this->getChildHtml('after_body_start') ?>
-<div class="wrapper">
- <?php echo $this->getChildHtml('global_notices') ?>
- <div class="page">
- <?php echo $this->getChildHtml('header') ?>
- <div class="main-container col2-right-layout">
- <div class="main">
- <?php echo $this->getChildHtml('breadcrumbs') ?>
- <div class="col-main">
- <?php echo $this->getChildHtml('global_messages') ?>
- <?php echo $this->getChildHtml('content') ?>
- </div>
- <div class="col-right sidebar"><?php echo $this->getChildHtml('right') ?></div>
+<body class="col2-right-layout<?php echo $bodyCss ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+ <?php echo $this->getChildHtml('after_body_start') ?>
+ <div class="page wrapper">
+ <?php echo $this->getChildHtml('global_notices') ?>
+ <?php echo $this->getChildHtml('header-container') ?>
+ <?php echo $this->getChildHtml('page_top') ?>
+ <section class="page main">
+ <?php echo $this->getChildHtml('columns_top') ?>
+ <div class="columns">
+ <?php
+ echo $this->getChildHtml('main');
+ // Inside of <php> to avoid spaces between tags
+ echo '<div class="column right sidebar">';
+ echo $this->getChildHtml('right');
+ echo '</div>';
+ ?>
</div>
- </div>
+ </section>
+ <?php echo $this->getChildHtml('page_bottom') ?>
+
<?php echo $this->getChildHtml('footer') ?>
+
<?php echo $this->getChildHtml('before_body_end') ?>
</div>
-</div>
-<?php echo $this->getAbsoluteFooter() ?>
+ <?php echo $this->getAbsoluteFooter() ?>
</body>
</html>
diff --git a/app/code/Magento/Page/view/frontend/3columns.phtml b/app/code/Magento/Page/view/frontend/3columns.phtml
index 12db04dc545..4b87500e5c2 100644
--- a/app/code/Magento/Page/view/frontend/3columns.phtml
+++ b/app/code/Magento/Page/view/frontend/3columns.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -28,35 +27,43 @@
/**
* Template for \Magento\Page\Block\Html
*/
+$bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
+<!doctype html>
+<html lang="<?php echo $this->getLang() ?>" class="no-js">
<head>
-<?php echo $this->getChildHtml('head') ?>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width">
+ <?php echo $this->getChildHtml('head') ?>
</head>
-<body<?php echo $this->getBodyClass()?' class="'.$this->getBodyClass().'"':'' ?> data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
-<?php echo $this->getChildHtml('after_body_start') ?>
-<div class="wrapper">
- <?php echo $this->getChildHtml('global_notices') ?>
- <div class="page">
- <?php echo $this->getChildHtml('header') ?>
- <div class="main-container col3-layout">
- <div class="main">
- <?php echo $this->getChildHtml('breadcrumbs') ?>
- <div class="col-wrapper">
- <div class="col-main">
- <?php echo $this->getChildHtml('global_messages') ?>
- <?php echo $this->getChildHtml('content') ?>
- </div>
- <div class="col-left sidebar"><?php echo $this->getChildHtml('left') ?></div>
- </div>
- <div class="col-right sidebar"><?php echo $this->getChildHtml('right') ?></div>
+<body class="col3-layout<?php echo $bodyCss ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+ <?php echo $this->getChildHtml('after_body_start') ?>
+ <div class="page wrapper">
+ <?php echo $this->getChildHtml('global_notices') ?>
+ <?php echo $this->getChildHtml('header-container') ?>
+ <?php echo $this->getChildHtml('page_top') ?>
+ <section class="page main">
+ <?php echo $this->getChildHtml('columns_top') ?>
+ <div class="columns">
+ <?php
+ echo $this->getChildHtml('main');
+ // Inside of <php> to avoid spaces between tags
+ echo '<div class="column left sidebar">';
+ echo $this->getChildHtml('left');
+ echo '</div>';
+ echo '<div class="column right sidebar">';
+ echo $this->getChildHtml('right');
+ echo '</div>';
+ ?>
</div>
- </div>
+ </section>
+ <?php echo $this->getChildHtml('page_bottom') ?>
+
<?php echo $this->getChildHtml('footer') ?>
+
<?php echo $this->getChildHtml('before_body_end') ?>
</div>
-</div>
-<?php echo $this->getAbsoluteFooter() ?>
+ <?php echo $this->getAbsoluteFooter() ?>
</body>
</html>
diff --git a/app/design/frontend/magento_plushe/Magento_Page/blank.phtml b/app/code/Magento/Page/view/frontend/blank.phtml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Page/blank.phtml
rename to app/code/Magento/Page/view/frontend/blank.phtml
diff --git a/app/code/Magento/Page/view/frontend/empty.phtml b/app/code/Magento/Page/view/frontend/empty.phtml
index 112112b6795..cf2775f7e9e 100644
--- a/app/code/Magento/Page/view/frontend/empty.phtml
+++ b/app/code/Magento/Page/view/frontend/empty.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -28,19 +27,29 @@
/**
* Template for \Magento\Page\Block\Html
*/
+$bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
+<!doctype html>
+<html lang="<?php echo $this->getLang() ?>" class="no-js">
<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width">
<?php echo $this->getChildHtml('head') ?>
</head>
-<body class="page-empty <?php echo $this->getBodyClass()?$this->getBodyClass():'' ?>">
- <div>
- <?php echo $this->getChildHtml('after_body_start') ?>
- <?php echo $this->getChildHtml('global_messages') ?>
- <?php echo $this->getChildHtml('content') ?>
+<body class="page-empty<?php echo $bodyCss ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+ <?php echo $this->getChildHtml('after_body_start') ?>
+ <div class="page wrapper">
+ <?php echo $this->getChildHtml('global_notices') ?>
+ <section class="page main">
+ <?php echo $this->getChildHtml('columns_top') ?>
+ <div class="columns">
+ <?php echo $this->getChildHtml('main') ?>
+ </div>
+ </section>
+ <?php echo $this->getChildHtml('page_bottom') ?>
<?php echo $this->getChildHtml('before_body_end') ?>
- <?php echo $this->getAbsoluteFooter() ?>
</div>
+ <?php echo $this->getAbsoluteFooter() ?>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/app/design/frontend/magento_plushe/Magento_Page/html/block.phtml b/app/code/Magento/Page/view/frontend/html/block.phtml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Page/html/block.phtml
rename to app/code/Magento/Page/view/frontend/html/block.phtml
diff --git a/app/code/Magento/Page/view/frontend/html/breadcrumbs.phtml b/app/code/Magento/Page/view/frontend/html/breadcrumbs.phtml
index b1e9df03aa7..5bfd6768190 100644
--- a/app/code/Magento/Page/view/frontend/html/breadcrumbs.phtml
+++ b/app/code/Magento/Page/view/frontend/html/breadcrumbs.phtml
@@ -19,16 +19,15 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php if($crumbs && is_array($crumbs)): ?>
<div class="breadcrumbs">
- <ul>
+ <ul class="items">
<?php foreach($crumbs as $_crumbName=>$_crumbInfo): ?>
- <li class="<?php echo $_crumbName ?>">
+ <li class="item <?php echo $_crumbName ?>">
<?php if($_crumbInfo['link']): ?>
<a href="<?php echo $_crumbInfo['link'] ?>" title="<?php echo $this->escapeHtml($_crumbInfo['title']) ?>"><?php echo $this->escapeHtml($_crumbInfo['label']) ?></a>
<?php elseif($_crumbInfo['last']): ?>
@@ -36,9 +35,6 @@
<?php else: ?>
<?php echo $this->escapeHtml($_crumbInfo['label']) ?>
<?php endif; ?>
- <?php if(!$_crumbInfo['last']): ?>
- <span>/ </span>
- <?php endif; ?>
</li>
<?php endforeach; ?>
</ul>
diff --git a/app/code/Magento/Page/view/frontend/html/bugreport.phtml b/app/code/Magento/Page/view/frontend/html/bugreport.phtml
new file mode 100644
index 00000000000..8cdcccadd05
--- /dev/null
+++ b/app/code/Magento/Page/view/frontend/html/bugreport.phtml
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<p class="bugs">
+ <span><?php echo __('Help Us to Keep Magento Healthy') ?></span>
+ <a href="http://www.magentocommerce.com/bug-tracking"
+ target="_blank">
+ <?php echo __('Report All Bugs') ?>
+ </a>
+ <strong><?php echo __('(ver. %1)', \Magento\Core\Model\App::VERSION) ?></strong>
+</p>
diff --git a/app/design/frontend/magento_plushe/Magento_Page/html/copyright.phtml b/app/code/Magento/Page/view/frontend/html/copyright.phtml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Page/html/copyright.phtml
rename to app/code/Magento/Page/view/frontend/html/copyright.phtml
diff --git a/app/code/Magento/Page/view/frontend/html/head.phtml b/app/code/Magento/Page/view/frontend/html/head.phtml
index d14d1bbde6e..9254ba1971d 100644
--- a/app/code/Magento/Page/view/frontend/html/head.phtml
+++ b/app/code/Magento/Page/view/frontend/html/head.phtml
@@ -19,12 +19,9 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-
-/** @var $this \Magento\Page\Block\Html\Head */
?>
<meta http-equiv="Content-Type" content="<?php echo $this->getContentType() ?>"/>
<title><?php echo $this->getTitle() ?></title>
@@ -33,7 +30,6 @@
<meta name="robots" content="<?php echo $this->escapeHtml($this->getRobots())?>"/>
<link rel="icon" href="<?php echo $this->getFaviconFile(); ?>" type="image/x-icon"/>
<link rel="shortcut icon" href="<?php echo $this->getFaviconFile(); ?>" type="image/x-icon"/>
-<link rel="stylesheet" href="<?php echo $this->getViewFileUrl('Magento_Page::css/validate.css') ?>" type="text/css" media="all"/>
<?php echo $this->getCssJsHtml() ?>
<?php echo $this->getChildHtml() ?>
<?php echo $this->getIncludes() ?>
diff --git a/app/code/Magento/Page/view/frontend/html/header.phtml b/app/code/Magento/Page/view/frontend/html/header.phtml
index ec10346c9f4..d7747717eee 100644
--- a/app/code/Magento/Page/view/frontend/html/header.phtml
+++ b/app/code/Magento/Page/view/frontend/html/header.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -27,20 +26,27 @@
* @var \Magento\Page\Block\Html\Header $this
*/
?>
-<div class="header-container">
- <div class="header">
+
+<?php switch($this->getShowPart()):
+ case 'logo': ?>
+ <?php $storeName = $this->getThemeName() ? $this->getThemeName() : $this->getLogoAlt();?>
<?php if ($this->getIsHomePage()):?>
- <h1 class="logo"><strong><?php echo $this->getLogoAlt() ?></strong><a href="<?php echo $this->getUrl('') ?>" title="<?php echo $this->getLogoAlt() ?>" class="logo"><img src="<?php echo $this->getLogoSrc() ?>" alt="<?php echo $this->getLogoAlt() ?>" /></a></h1>
+ <strong class="logo">
+ <img src="<?php echo $this->getLogoSrc() ?>" alt="<?php echo $this->getLogoAlt() ?>" />
+ </strong>
<?php else:?>
- <a href="<?php echo $this->getUrl('') ?>" title="<?php echo $this->getLogoAlt() ?>" class="logo"><strong><?php echo $this->getLogoAlt() ?></strong><img src="<?php echo $this->getLogoSrc() ?>" alt="<?php echo $this->getLogoAlt() ?>" /></a>
+ <a class="logo" href="<?php echo $this->getUrl(''); ?>" title="<?php echo $storeName ?>">
+ <img src="<?php echo $this->getLogoSrc() ?>" alt="<?php echo $storeName ?>" />
+ </a>
<?php endif?>
- <div class="quick-access">
- <?php echo $this->getChildHtml('topSearch') ?>
- <p class="welcome-msg"><?php echo $this->getWelcome() ?> <?php echo $this->getAdditionalHtml() ?></p>
- <?php echo $this->getChildHtml('topLinks') ?>
- <?php echo $this->getChildHtml('store_language') ?>
- </div>
- <?php echo $this->getChildHtml('topContainer'); ?>
- </div>
-</div>
-<?php echo $this->getChildHtml('topMenu') ?>
+ <?php break; ?>
+
+ <?php case 'welcome': ?>
+ <p class="welcome"><?php echo $this->getWelcome() ?></p>
+ <?php break; ?>
+
+ <?php case 'other': ?>
+ <?php echo $this->getChildHtml(); ?>
+ <?php break; ?>
+
+<?php endswitch; ?>
diff --git a/app/code/Magento/Page/view/frontend/html/notices.phtml b/app/code/Magento/Page/view/frontend/html/notices.phtml
index 0df537f82bd..7814e18e1c7 100644
--- a/app/code/Magento/Page/view/frontend/html/notices.phtml
+++ b/app/code/Magento/Page/view/frontend/html/notices.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -31,26 +30,27 @@
?>
<?php if ($this->displayNoscriptNotice()): ?>
<noscript>
- <div class="global-site-notice noscript">
- <div class="notice-inner">
+ <div class="notice global site noscript">
+ <div class="content">
<p>
<strong><?php echo __('JavaScript seems to be disabled in your browser.'); ?></strong><br />
- <?php echo __('To use this website you must first enable JavaScript in your browser.'); ?>
+ <?php echo __('Enable JavaScript in your browser to get the best experience on our website!'); ?>
</p>
</div>
</div>
</noscript>
<?php endif; ?>
<?php if ($this->displayDemoNotice()): ?>
- <div class="global-site-notice demo-notice">
- <div class="notice-inner"><p><?php echo __('This is only a demo store. You can browse and place orders, but nothing will be processed.') ?></p></div>
+ <div class="notice global site demo">
+ <div class="content"><p><?php echo __('This is just a demo store. You can browse and place orders, but nothing will be processed.') ?></p></div>
</div>
+ <?php $noticePosion = true; ?>
<?php endif; ?>
<?php if ($this->helper('Magento\Core\Helper\Cookie')->isUserNotAllowSaveCookie()): ?>
- <div class="global-site-notice notice-cookie" id="notice-cookie-block" style="display: none">
- <div class="notice-inner">
+ <div class="notice global site cookie" id="notice-cookie-block" style="display: none">
+ <div class="content">
<p><?php echo __('This store uses cookies to make shopping more enjoyable. Learn how cookies work in our <a href="%1">privacy policy</a>.', $this->getPrivacyPolicyLink()) ?></p>
- <div class="actions"><button id="btn-cookie-allow" class="button"><span><span><?php echo __('Allow');?></span></span></button></div>
+ <div class="actions"><button id="btn-cookie-allow" class="action allow"><span><?php echo __('Allow Cookies');?></span></button></div>
</div>
</div>
<script type="text/javascript">
@@ -69,4 +69,22 @@
})(jQuery);
// ]]>
</script>
+ <?php $noticePosion = true; ?>
+<?php endif; ?>
+<?php if (isset($noticePosion)): ?>
+ <script type="text/javascript">
+ // <![CDATA[
+ (function($) {
+ $(document).ready(function() {
+ var notices = $('.notice.global.site'),
+ top = 0;
+ for (var i=0; i < notices.length; i++) {
+ $(notices[i]).css('top',top);
+ top += $(notices[i]).outerHeight();
+ $('body').css('paddingTop', top );
+ };
+ });
+ })(jQuery);
+ // ]]>
+ </script>
<?php endif; ?>
diff --git a/app/code/Magento/Page/view/frontend/html/pager.phtml b/app/code/Magento/Page/view/frontend/html/pager.phtml
index 41e7c480ac8..689cd83158f 100644
--- a/app/code/Magento/Page/view/frontend/html/pager.phtml
+++ b/app/code/Magento/Page/view/frontend/html/pager.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -41,81 +40,77 @@
<p class="amount">
<?php if($this->getLastPageNum()>1): ?>
<?php echo __('Items %1 to %2 of %3 total', $this->getFirstNum(), $this->getLastNum(), $this->getTotalNum()) ?>
+ <?php elseif ($this->getLastPageNum() == 1): ?>
+ <?php echo __('%1 Item', $this->getTotalNum()) ?>
<?php else: ?>
- <strong><?php echo __('%1 Item(s)', $this->getTotalNum()) ?></strong>
+ <?php echo __('%1 Item(s)', $this->getTotalNum()) ?>
<?php endif; ?>
</p>
<?php endif ?>
- <?php if($this->getShowPerPage()): ?>
- <div class="limiter">
- <label><?php echo __('Show') ?></label>
- <select onchange="setLocation(this.value)">
- <?php foreach ($this->getAvailableLimit() as $_key=>$_limit): ?>
- <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if($this->isLimitCurrent($_key)): ?> selected="selected"<?php endif ?>>
- <?php echo $_limit ?>
- </option>
- <?php endforeach; ?>
- </select> <?php echo __('per page') ?>
- </div>
- <?php endif ?>
-
- <?php if($this->getLastPageNum()>1): ?>
- <div class="pages">
- <strong><?php echo __('Page:') ?></strong>
- <ol>
- <?php if (!$this->isFirstPage()): ?>
- <li>
- <a class="previous<?php if(!$this->getAnchorTextForPrevious()): ?> i-previous<?php endif;?>" href="<?php echo $this->getPreviousPageUrl() ?>" title="<?php echo __('Previous') ?>">
- <?php if(!$this->getAnchorTextForPrevious()): ?>
- <img src="<?php echo $this->getViewFileUrl('images/pager_arrow_left.gif') ?>" alt="<?php echo __('Previous') ?>" class="v-middle" />
- <?php else: ?>
- <?php echo $this->getAnchorTextForPrevious() ?>
- <?php endif;?>
- </a>
- </li>
- <?php endif;?>
+ <?php if($this->getShowPerPage()): ?>
+ <div class="limiter">
+ <strong class="label"><?php echo __('Show') ?></strong>
+ <select id="limiter" data-mage-redirect="{'event':'change'}">
+ <?php foreach ($this->getAvailableLimit() as $_key => $_limit): ?>
+ <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if ($this->isLimitCurrent($_key)): ?>
+ selected="selected"<?php endif ?>>
+ <?php echo $_limit ?>
+ </option>
+ <?php endforeach; ?>
+ </select>
+ <span class="text"><?php echo __('per page') ?></span>
+ </div>
+ <?php endif ?>
- <?php if ($this->canShowFirst()): ?>
- <li><a class="first" href="<?php echo $this->getFirstPageUrl() ?>">1</a></li>
- <?php endif;?>
-
- <?php if ($this->canShowPreviousJump()): ?>
- <li><a class="previous_jump" title="" href="<?php echo $this->getPreviousJumpUrl() ?>">...</a></li>
- <?php endif;?>
+ <?php if($this->getLastPageNum()>1): ?>
+ <div class="pages">
+ <strong class="label"><?php echo __('Page') ?></strong>
+ <ol class="items">
+ <?php if (!$this->isFirstPage()): ?>
+ <li class="item">
+ <?php $text = $this->getAnchorTextForPrevious() ? $this->getAnchorTextForPrevious() : '';?>
+ <a class="<?php echo $text ? 'link ' : 'action '?> previous" href="<?php echo $this->getPreviousPageUrl() ?>" title="<?php echo $text ? $text : __('Previous') ?>">
+ <span><?php echo $text ? $text : __('Previous') ?></span>
+ </a>
+ </li>
+ <?php endif;?>
- <?php foreach ($this->getFramePages() as $_page): ?>
- <?php if ($this->isPageCurrent($_page)): ?>
- <li class="current"><?php echo $_page ?></li>
- <?php else: ?>
- <li><a href="<?php echo $this->getPageUrl($_page) ?>"><?php echo $_page ?></a></li>
+ <?php if ($this->canShowFirst()): ?>
+ <li class="item"><a class="first" href="<?php echo $this->getFirstPageUrl() ?>"><span>1</span></a></li>
<?php endif;?>
- <?php endforeach;?>
+ <?php if ($this->canShowPreviousJump()): ?>
+ <li class="item"><a class="previous jump" title="" href="<?php echo $this->getPreviousJumpUrl() ?>"><span>...</span></a></li>
+ <?php endif;?>
- <?php if ($this->canShowNextJump()): ?>
- <li><a class="next_jump" title="" href="<?php echo $this->getNextJumpUrl() ?>">...</a></li>
- <?php endif;?>
+ <?php foreach ($this->getFramePages() as $_page): ?>
+ <?php if ($this->isPageCurrent($_page)): ?>
+ <li class="item current"><strong><span><?php echo $_page ?></span></strong></li>
+ <?php else: ?>
+ <li class="item"><a href="<?php echo $this->getPageUrl($_page) ?>"><span><?php echo $_page ?></span></a></li>
+ <?php endif;?>
+ <?php endforeach;?>
- <?php if ($this->canShowLast()): ?>
- <li><a class="last" href="<?php echo $this->getLastPageUrl() ?>"><?php echo $this->getLastPageNum() ?></a></li>
- <?php endif;?>
+ <?php if ($this->canShowNextJump()): ?>
+ <li class="item"><a class="next jump" title="" href="<?php echo $this->getNextJumpUrl() ?>"><span>...</span></a></li>
+ <?php endif;?>
- <?php if (!$this->isLastPage()): ?>
- <li>
- <a class="next<?php if(!$this->getAnchorTextForNext()): ?> i-next<?php endif; ?>" href="<?php echo $this->getNextPageUrl() ?>" title="<?php echo __('Next') ?>">
- <?php if(!$this->getAnchorTextForNext()): ?>
- <img src="<?php echo $this->getViewFileUrl('images/pager_arrow_right.gif') ?>" alt="<?php echo __('Next') ?>" class="v-middle" />
- <?php else: ?>
- <?php echo $this->getAnchorTextForNext() ?>
- <?php endif;?>
- </a>
- </li>
- <?php endif;?>
- </ol>
+ <?php if ($this->canShowLast()): ?>
+ <li class="item"><a class="last" href="<?php echo $this->getLastPageUrl() ?>"><span><?php echo $this->getLastPageNum() ?></span></a></li>
+ <?php endif;?>
- </div>
- <?php endif; ?>
+ <?php if (!$this->isLastPage()): ?>
+ <li class="item">
+ <?php $text = $this->getAnchorTextForNext() ? $this->getAnchorTextForNext() : '';?>
+ <a class="<?php echo $text ? 'link ' : 'action '?> next" href="<?php echo $this->getNextPageUrl() ?>" title="<?php echo $text ? $text : __('Next') ?>">
+ <span><?php echo $text ? $text : __('Next') ?></span>
+ </a>
+ </li>
+ <?php endif;?>
+ </ol>
+ </div>
+ <?php endif; ?>
<?php if($this->getUseContainer()): ?>
</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Page/html/title.phtml b/app/code/Magento/Page/view/frontend/html/title.phtml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Page/html/title.phtml
rename to app/code/Magento/Page/view/frontend/html/title.phtml
diff --git a/app/code/Magento/Page/view/frontend/html/topmenu.phtml b/app/code/Magento/Page/view/frontend/html/topmenu.phtml
index c14eeceb25d..98335cf91d3 100644
--- a/app/code/Magento/Page/view/frontend/html/topmenu.phtml
+++ b/app/code/Magento/Page/view/frontend/html/topmenu.phtml
@@ -18,7 +18,7 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
+ * @category design
* @package Magento_Page
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
@@ -31,18 +31,12 @@
* @see \Magento\Page\Block\Html\Topmenu
*/
?>
-<?php $_menu = $this->getHtml('level-top') ?>
+<?php $columnsLimit = $this->getColumnsLimit() ? : 0; ?>
+<?php $_menu = $this->getHtml('level-top','submenu', $columnsLimit) ?>
<?php if ($_menu): ?>
-<div class="nav-container">
- <ul id="nav">
- <?php echo $_menu ?>
+<nav class="navigation" role="navigation">
+ <ul>
+ <?php echo $_menu; ?>
</ul>
-</div>
-<script type="text/javascript">
- (function($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_Page::js/menu.js') ?>", function() {
- $('#nav .parent').menu();
- });
- })(jQuery);
-</script>
-<?php endif ?>
+</nav>
+<?php endif; ?>
diff --git a/app/code/Magento/Page/view/frontend/layout/default.xml b/app/code/Magento/Page/view/frontend/layout/default.xml
index 6c7845cf541..747454accd3 100644
--- a/app/code/Magento/Page/view/frontend/layout/default.xml
+++ b/app/code/Magento/Page/view/frontend/layout/default.xml
@@ -29,39 +29,68 @@
<block class="Magento\Page\Block\Js\Cookie" name="js_cookies" template="js/cookie.phtml"/>
</block>
<container name="after_body_start" as="after_body_start" label="Page Top"/>
- <block class="Magento\Page\Block\Html\Notices" name="global_notices" as="global_notices" template="html/notices.phtml"/>
- <block class="Magento\Page\Block\Html\Header" name="header" as="header">
- <block class="Magento\Page\Block\Links" name="top.links" as="topLinks">
- <arguments>
- <argument name="css_class" xsi:type="string">links</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Switcher" name="store_language" as="store_language" template="switch/languages.phtml"/>
- <container name="top.menu" as="topMenu" label="Navigation Bar">
- <block class="Magento\Page\Block\Html\Topmenu" name="catalog.topnav" template="html/topmenu.phtml"/>
+ <container name="header-container" label="Page Header Container" as="header-container" htmlTag="header" htmlClass="header">
+ <container name="header.panel" label="Page Header Panel" htmlTag="div" htmlClass="panel">
+ <block class="Magento\Page\Block\Switcher" name="store_language" as="store_language" template="switch/languages.phtml"/>
</container>
+ <container name="header" label="Page Header" as="header" htmlTag="div" htmlClass="content">
+ <block class="Magento\Page\Block\Html\Header" name="logo">
+ <arguments>
+ <argument name="show_part" xsi:type="string">logo</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Links" name="top.links"/>
+ </container>
+ </container>
+ <container name="page_top" as="page_top" label="After Page Header">
+ <block class="Magento\Page\Block\Html\Topmenu" name="catalog.topnav" template="html/topmenu.phtml"/>
<container name="top.container" as="topContainer" label="Page Header" htmlTag="div" htmlClass="top-container"/>
- </block>
- <block class="Magento\Page\Block\Html\Breadcrumbs" name="breadcrumbs" as="breadcrumbs"/>
+ <block class="Magento\Page\Block\Html\Breadcrumbs" name="breadcrumbs" as="breadcrumbs"/>
+ </container>
+ <!--
+ <container name="page_main" as="page_main" label="Page main" htmlTag="div" htmlClass="columns">
+ <container name="main" as="main" label="Main Content Container" htmlTag="div" htmlClass="column main">
+ <container name="content-top" label="Main Content Top" />
+ <container name="content" label="Main Content Area" />
+ <container name="content-aside" label="Main Content Aside" />
+ <container name="content-bottom" label="Main Content Bottom" />
+ </container>
+ </container>
+ -->
+ <container name="columns.top" label="Before Main Columns" as="columns_top">
+ <block class="Magento\Page\Block\Html\Title" name="page.main.title" template="html/title.phtml"/>
+ <container name="page.messages" label="invisible" htmlTag="div" htmlClass="page messages">
+ <block class="Magento\Core\Block\Messages" name="global_messages" as="global_messages"/>
+ <block class="Magento\Core\Block\Messages" name="messages" as="messages"/>
+ </container>
+ </container>
+ <container name="main" as="main" label="Main Content Container" htmlTag="div" htmlClass="column main">
+ <container name="content.top" label="Main Content Top"/>
+ <container name="content" label="Main Content Area"/>
+ <container name="content.aside" label="Main Content Aside"/>
+ <container name="content.bottom" label="Main Content Bottom"/>
+ </container>
<container name="left" as="left" label="Left Column"/>
- <block class="Magento\Core\Block\Messages" name="global_messages" as="global_messages"/>
- <block class="Magento\Core\Block\Messages" name="messages" as="messages"/>
- <container name="content" as="content" label="Main Content Area"/>
<container name="right" as="right" label="Right Column"/>
- <block class="Magento\Page\Block\Html\Footer" name="footer" as="footer" template="html/footer.phtml">
- <container name="bottom.container" as="bottomContainer" label="Page Footer" htmlTag="div" htmlClass="bottom-container"/>
- <block class="Magento\Page\Block\Switcher" name="store_switcher" as="store_switcher" template="switch/stores.phtml"/>
- <block class="Magento\Page\Block\Links" name="footer_links" as="footer_links"/>
- </block>
- <container name="before_body_end" as="before_body_end" label="Page Bottom"/>
+ <container name="page.bottom.container" as="page_bottom" label="Before Page Footer Container" htmlTag="div" htmlClass="page bottom">
+ <container name="page.bottom" label="Before Page Footer" htmlTag="div" htmlClass="content"/>
+ </container>
+ <container name="footer-container" as="footer" label="Page Footer Container" htmlTag="footer" htmlClass="footer">
+ <container name="footer" as="footer" label="Page Footer" htmlTag="div" htmlClass="content">
+ <block class="Magento\Page\Block\Switcher" name="store_switcher" as="store_switcher" template="switch/stores.phtml"/>
+ <block class="Magento\Page\Block\Links" name="footer_links"/>
+ <block class="Magento\Page\Block\Html\Footer" name="copyright" template="html/copyright.phtml"/>
+ <block class="Magento\Core\Block\Template" name="report.bugs" template="Magento_Page::html/bugreport.phtml" />
+ </container>
+ </container>
+ <container name="before_body_end" as="before_body_end" label="Page Bottom">
+ <block class="Magento\Page\Block\Html\Notices" name="global_notices" template="html/notices.phtml"/>
+ </container>
</block>
<referenceBlock name="head">
- <block class="Magento\Page\Block\Html\Head\Css" name="magento-calendar-css">
+ <block class="Magento\Page\Block\Html\Head\Css" name="mage-calendar-css">
<arguments>
<argument name="file" xsi:type="string">mage/calendar.css</argument>
- <argument name="properties" xsi:type="array">
- <item name="attributes" xsi:type="string"/>
- </argument>
</arguments>
</block>
<block class="Magento\Page\Block\Html\Head\Script" name="jquery-jquery-js">
@@ -69,7 +98,7 @@
<argument name="file" xsi:type="string">jquery/jquery.js</argument>
</arguments>
</block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-jquery-no-conflict-js">
+ <block class="Magento\Page\Block\Html\Head\Script" name="mage-jquery-no-conflict-js">
<arguments>
<argument name="file" xsi:type="string">mage/jquery-no-conflict.js</argument>
</arguments>
@@ -79,22 +108,22 @@
<argument name="file" xsi:type="string">head.load.min.js</argument>
</arguments>
</block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-magento-js">
+ <block class="Magento\Page\Block\Html\Head\Script" name="mage-mage-js">
<arguments>
<argument name="file" xsi:type="string">mage/mage.js</argument>
</arguments>
</block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-decorate-js">
+ <block class="Magento\Page\Block\Html\Head\Script" name="mage-decorate-js">
<arguments>
<argument name="file" xsi:type="string">mage/decorate.js</argument>
</arguments>
</block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-translate-js">
+ <block class="Magento\Page\Block\Html\Head\Script" name="mage-translate-js">
<arguments>
<argument name="file" xsi:type="string">mage/translate.js</argument>
</arguments>
</block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-cookies-js">
+ <block class="Magento\Page\Block\Html\Head\Script" name="mage-cookies-js">
<arguments>
<argument name="file" xsi:type="string">mage/cookies.js</argument>
</arguments>
@@ -109,7 +138,7 @@
<argument name="file" xsi:type="string">jquery/jquery.tmpl.min.js</argument>
</arguments>
</block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-bootstrap-js">
+ <block class="Magento\Page\Block\Html\Head\Script" name="mage-bootstrap-js">
<arguments>
<argument name="file" xsi:type="string">mage/bootstrap.js</argument>
</arguments>
@@ -119,35 +148,21 @@
<argument name="file" xsi:type="string">Magento_Page::js/truncate.js</argument>
</arguments>
</block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-common-js">
+ <block class="Magento\Page\Block\Html\Head\Script" name="mage-common-js">
<arguments>
<argument name="file" xsi:type="string">mage/common.js</argument>
</arguments>
</block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-toggle-js">
+ <block class="Magento\Page\Block\Html\Head\Script" name="mage-toggle-js">
<arguments>
<argument name="file" xsi:type="string">mage/toggle.js</argument>
</arguments>
</block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-popup-window-js">
+ <block class="Magento\Page\Block\Html\Head\Script" name="mage-popup-window-js">
<arguments>
<argument name="file" xsi:type="string">mage/popup-window.js</argument>
</arguments>
</block>
- <block class="Magento\Page\Block\Html\Head\Css" name="magento-page-css-tabs-css">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Page::css/tabs.css</argument>
- <argument name="properties" xsi:type="array">
- <item name="attributes" xsi:type="string"/>
- </argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-loader-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/loader.js</argument>
- </arguments>
- </block>
- <!-- Preload resources for widgets -->
- <block class="Magento\Page\Block\Js\Components" name="head.components" as="components" template="Magento_Page::js/components.phtml"/>
+ <block class="Magento\Core\Block\Template" name="head.components" as="components" template="Magento_Page::js/components.phtml"/>
</referenceBlock>
</layout>
diff --git a/app/code/Magento/Page/view/frontend/layout/page_empty.xml b/app/code/Magento/Page/view/frontend/layout/page_empty.xml
index 1a2f0f3d703..a1edaed6518 100644
--- a/app/code/Magento/Page/view/frontend/layout/page_empty.xml
+++ b/app/code/Magento/Page/view/frontend/layout/page_empty.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="All Empty Layout Pages" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="All Empty Layout Pages" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">empty.phtml</argument>
diff --git a/app/code/Magento/Page/view/frontend/layout/page_one_column.xml b/app/code/Magento/Page/view/frontend/layout/page_one_column.xml
index a7f33dc64a2..14703c9c3bc 100644
--- a/app/code/Magento/Page/view/frontend/layout/page_one_column.xml
+++ b/app/code/Magento/Page/view/frontend/layout/page_one_column.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="All One-Column Layout Pages" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="All One-Column Layout Pages" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
diff --git a/app/code/Magento/Page/view/frontend/layout/page_three_columns.xml b/app/code/Magento/Page/view/frontend/layout/page_three_columns.xml
index 94c5187ff54..dfa9dd0b38a 100644
--- a/app/code/Magento/Page/view/frontend/layout/page_three_columns.xml
+++ b/app/code/Magento/Page/view/frontend/layout/page_three_columns.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="All Three-Column Layout Pages" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="All Three-Column Layout Pages" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">3columns.phtml</argument>
diff --git a/app/code/Magento/Page/view/frontend/layout/page_two_columns_left.xml b/app/code/Magento/Page/view/frontend/layout/page_two_columns_left.xml
index a73b8c66c87..d7e9f322dac 100644
--- a/app/code/Magento/Page/view/frontend/layout/page_two_columns_left.xml
+++ b/app/code/Magento/Page/view/frontend/layout/page_two_columns_left.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="All Two-Column Layout Pages (Left Column)" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="All Two-Column Layout Pages (Left Column)" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">2columns-left.phtml</argument>
diff --git a/app/code/Magento/Page/view/frontend/layout/page_two_columns_right.xml b/app/code/Magento/Page/view/frontend/layout/page_two_columns_right.xml
index 9cd6f75d646..5b2d6f4f17c 100644
--- a/app/code/Magento/Page/view/frontend/layout/page_two_columns_right.xml
+++ b/app/code/Magento/Page/view/frontend/layout/page_two_columns_right.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="All Two-Column Layout Pages (Right Column)" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="All Two-Column Layout Pages (Right Column)" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">2columns-right.phtml</argument>
diff --git a/app/code/Magento/Page/view/frontend/layout/print.xml b/app/code/Magento/Page/view/frontend/layout/print.xml
index f6b5a91cb98..befe0f664c0 100644
--- a/app/code/Magento/Page/view/frontend/layout/print.xml
+++ b/app/code/Magento/Page/view/frontend/layout/print.xml
@@ -27,12 +27,12 @@
<block class="Magento\Page\Block\Html" name="root" output="1" template="print.phtml">
<block class="Magento\Page\Block\Html\Head" name="head" as="head"/>
<container name="after_body_start" as="after_body_start" label="Page Top"/>
- <container name="content" as="content" label="Main Content Area (Print Version)"/>
+ <container name="content" as="content" label="Main Content Area"/>
</block>
<referenceBlock name="head">
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-translate-js">
+ <block class="Magento\Page\Block\Html\Head\Css" name="css-print-css">
<arguments>
- <argument name="file" xsi:type="string">mage/translate.js</argument>
+ <argument name="file" xsi:type="string">css/print.css</argument>
</arguments>
</block>
</referenceBlock>
diff --git a/app/code/Magento/Page/view/frontend/link/current.phtml b/app/code/Magento/Page/view/frontend/link/current.phtml
index 7ad6578648c..d8e6268840b 100644
--- a/app/code/Magento/Page/view/frontend/link/current.phtml
+++ b/app/code/Magento/Page/view/frontend/link/current.phtml
@@ -26,11 +26,11 @@
*/
?>
<?php if ($this->isCurrent()):?>
-<li class="current">
+<li class="nav item current">
<strong><?php echo $this->escapeHtml(__($this->getLabel()))?></strong>
</li>
<?php else:?>
-<li>
+<li class="nav item">
<a href="<?php echo $this->escapeHtml($this->getHref())?>"
<?php if ($title = $this->getTitle()):?> title="<?php echo $this->escapeHtml(__($title))?>"<?php endif;?>
>
diff --git a/app/design/frontend/magento_plushe/Magento_Page/page.phtml b/app/code/Magento/Page/view/frontend/page.phtml
similarity index 94%
rename from app/design/frontend/magento_plushe/Magento_Page/page.phtml
rename to app/code/Magento/Page/view/frontend/page.phtml
index 8a143569665..b2cfc58945d 100644
--- a/app/design/frontend/magento_plushe/Magento_Page/page.phtml
+++ b/app/code/Magento/Page/view/frontend/page.phtml
@@ -37,7 +37,7 @@ $bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
<meta name="viewport" content="width=device-width">
<?php echo $this->getChildHtml('head') ?>
</head>
-<body class="<?php echo $bodyCss ?>">
+<body class="<?php echo $bodyCss ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
<?php echo $this->getChildHtml('after_body_start') ?>
<div class="page wrapper">
<?php echo $this->getChildHtml('global_notices') ?>
diff --git a/app/code/Magento/Page/view/frontend/popup.phtml b/app/code/Magento/Page/view/frontend/popup.phtml
index 5d23527f833..8f7006b44d3 100644
--- a/app/code/Magento/Page/view/frontend/popup.phtml
+++ b/app/code/Magento/Page/view/frontend/popup.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -28,18 +27,22 @@
/**
* Template for \Magento\Page\Block\Html
*/
+$bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
+<!doctype html>
+<html lang="<?php echo $this->getLang() ?>" class="no-js">
<head>
-<?php echo $this->getChildHtml('head') ?>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width">
+ <?php echo $this->getChildHtml('head') ?>
</head>
-<body class="page-popup<?php echo $this->getBodyClass()?$this->getBodyClass() : ''?>">
-<div>
+<body class="page popup<?php echo $bodyCss ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
<?php echo $this->getChildHtml('after_body_start') ?>
- <?php echo $this->getChildHtml('content') ?>
+ <div class="page wrapper">
+ <?php echo $this->getChildHtml('main') ?>
+ </div>
<?php echo $this->getChildHtml('before_body_end') ?>
-</div>
-<?php echo $this->getAbsoluteFooter() ?>
+ <?php echo $this->getAbsoluteFooter() ?>
</body>
</html>
diff --git a/app/code/Magento/Page/view/frontend/print.phtml b/app/code/Magento/Page/view/frontend/print.phtml
index bc05952d3d1..d16f0a93241 100644
--- a/app/code/Magento/Page/view/frontend/print.phtml
+++ b/app/code/Magento/Page/view/frontend/print.phtml
@@ -34,19 +34,23 @@
<head>
<?php echo $this->getChildHtml('head') ?>
</head>
-<body class="page-print<?php echo $this->getBodyClass()?$this->getBodyClass():'' ?>">
+<body class="page print<?php echo $this->getBodyClass()?$this->getBodyClass():'' ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
<?php echo $this->getChildHtml('after_body_start') ?>
-<div>
- <div class="print-head">
- <img src="<?php echo $this->getPrintLogoUrl() ? $this->getPrintLogoUrl() : $this->getViewFileUrl('images/logo_print.gif') ?>" class="logo" alt="" />
+<div class="page print wrapper">
+ <header class="header print">
+ <img src="<?php echo $this->getPrintLogoUrl() ? $this->getPrintLogoUrl() : $this->getViewFileUrl('images/logo.gif') ?>" class="logo" alt="" />
<?php if ($this->getPrintLogoText()):?>
<address><?php echo nl2br($this->escapeHtml($this->getPrintLogoText())) ?></address>
<?php endif;?>
+ </header>
+ <div class="page print main">
+ <?php echo $this->getChildHtml('content') ?>
</div>
- <?php echo $this->getChildHtml('content') ?>
- <div class="buttons-set">
- <button type="button" title="<?php echo __('Close Window') ?>" class="button" onclick="window.close();"><span><span><?php echo __('Close Window') ?></span></span></button>
- </div>
+ <footer class="page print footer">
+ <div class="actions">
+ <button type="button" title="<?php echo __('Close Window') ?>" class="action close" onclick="window.close();"><span><?php echo __('Close Window') ?></span></button>
+ </div>
+ </footer>
<?php echo $this->getAbsoluteFooter() ?>
</div>
</body>
diff --git a/app/code/Magento/Page/view/frontend/switch/languages.phtml b/app/code/Magento/Page/view/frontend/switch/languages.phtml
index 95e60198fd5..3b6a76e6cb6 100644
--- a/app/code/Magento/Page/view/frontend/switch/languages.phtml
+++ b/app/code/Magento/Page/view/frontend/switch/languages.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -28,17 +27,28 @@
/**
* Language switcher template
*
- * @see \Magento\Page\Block\Switcher
+ * @see \Magento\Page\Block\Switch
*/
?>
+
<?php if(count($this->getStores())>1): ?>
-<div class="form-language">
- <label for="select-language"><?php echo __('Your Language:') ?></label>
- <select id="select-language" title="<?php echo __('Your Language') ?>" onchange="window.location.href=this.value">
- <?php foreach ($this->getStores() as $_lang): ?>
- <?php $_selected = ($_lang->getId() == $this->getCurrentStoreId()) ? ' selected="selected"' : '' ?>
- <option value="<?php echo $_lang->getCurrentUrl() ?>"<?php echo $_selected ?>><?php echo $this->escapeHtml($_lang->getName()) ?></option>
- <?php endforeach; ?>
- </select>
+<div class="switcher language">
+ <strong class="label"><span><?php echo __('Language') ?></span></strong>
+ <div class="options">
+ <strong class="view-<?php echo $this->escapeHtml($this->getCurrentStoreCode()) ?>">
+ <span><?php echo $this->escapeHtml($this->getStoreName()) ?></span>
+ </strong>
+ <button type="button" data-toggle="dropdown" class="action switch"><span><?php echo __('Change')?></span></button>
+ <ul data-target="dropdown">
+ <?php foreach ($this->getStores() as $_lang): ?>
+ <?php if($_lang->getId()!=$this->getCurrentStoreId()): ?>
+ <li class="view-<?php echo $this->escapeHtml($_lang->getCode()); ?>">
+ <a href="<?php echo $_lang->getCurrentUrl() ?>"><?php echo $this->escapeHtml($_lang->getName()) ?></a>
+ </li>
+ <?php endif; ?>
+ <?php endforeach; ?>
+ </ul>
+ </div>
</div>
<?php endif; ?>
+
diff --git a/app/code/Magento/Page/view/frontend/switch/stores.phtml b/app/code/Magento/Page/view/frontend/switch/stores.phtml
index f6c35103437..e990f325f0f 100644
--- a/app/code/Magento/Page/view/frontend/switch/stores.phtml
+++ b/app/code/Magento/Page/view/frontend/switch/stores.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -32,16 +31,16 @@
*/
?>
<?php if(count($this->getGroups())>1): ?>
-<div class="store-switcher">
- <label for="select-store"><?php echo __('Select Store:') ?></label>
- <select id="select-store" title="<?php echo __('Select Store') ?>" onchange="location.href=this.value">
- <?php /*foreach ($this->getStores() as $_store): ?>
- <option value="<?php echo $_store->getUrl('') ?>"<?php if($_store->getId()==$this->getCurrentStoreId()): ?> selected="selected"<?php endif; ?>><?php echo $_store->getName() ?></option>
- <?php endforeach;*/ ?>
+<div class="switcher-store">
+ <label><?php echo __('Select Store') ?>:</label>
+ <ul id="select-store">
<?php foreach ($this->getGroups() as $_group): ?>
- <?php $_selected = ($_group->getId()==$this->getCurrentGroupId()) ? ' selected="selected"' : '' ?>
- <option value="<?php echo $_group->getHomeUrl() ?>"<?php echo $_selected ?>><?php echo $this->escapeHtml($_group->getName()) ?></option>
+ <?php if ($_group->getId()==$this->getCurrentGroupId()): ?>
+ <li class="current"><strong><?php echo $this->escapeHtml($_group->getName()) ?></strong></li>
+ <?php else: ?>
+ <li><a href="<?php echo $_group->getHomeUrl() ?>"><?php echo $this->escapeHtml($_group->getName()) ?></a></li>
+ <?php endif; ?>
<?php endforeach; ?>
- </select>
+ </ul>
</div>
<?php endif; ?>
diff --git a/app/code/Magento/PageCache/Block/Adminhtml/Cache/Additional.php b/app/code/Magento/PageCache/Block/Adminhtml/Cache/Additional.php
index 6ddfa8805a3..b738778674b 100644
--- a/app/code/Magento/PageCache/Block/Adminhtml/Cache/Additional.php
+++ b/app/code/Magento/PageCache/Block/Adminhtml/Cache/Additional.php
@@ -65,7 +65,7 @@ class Additional extends \Magento\Backend\Block\Template
*/
public function getCleanExternalCacheUrl()
{
- return $this->getUrl('*/pageCache/clean');
+ return $this->getUrl('adminhtml/pageCache/clean');
}
/**
diff --git a/app/code/Magento/PageCache/Controller/Adminhtml/PageCache.php b/app/code/Magento/PageCache/Controller/Adminhtml/PageCache.php
index c14d8ac2d71..f0f4723ffa6 100644
--- a/app/code/Magento/PageCache/Controller/Adminhtml/PageCache.php
+++ b/app/code/Magento/PageCache/Controller/Adminhtml/PageCache.php
@@ -33,7 +33,7 @@
*/
namespace Magento\PageCache\Controller\Adminhtml;
-class PageCache extends \Magento\Adminhtml\Controller\Action
+class PageCache extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Clean external cache action
@@ -60,7 +60,7 @@ class PageCache extends \Magento\Adminhtml\Controller\Action
__('Something went wrong while clearing the external full page cache.')
);
}
- $this->_redirect('*/cache/index');
+ $this->_redirect('adminhtml/cache/index');
}
/**
diff --git a/app/code/Magento/PageCache/etc/module.xml b/app/code/Magento/PageCache/etc/module.xml
index 68875feff87..1ad3c949ac2 100755
--- a/app/code/Magento/PageCache/etc/module.xml
+++ b/app/code/Magento/PageCache/etc/module.xml
@@ -30,7 +30,6 @@
</sequence>
<depends>
<module name="Magento_Core"/>
- <module name="Magento_Adminhtml"/>
<module name="Magento_Backend"/>
</depends>
</module>
diff --git a/app/code/Magento/Paygate/Controller/Adminhtml/Paygate/Authorizenet/Payment.php b/app/code/Magento/Paygate/Controller/Adminhtml/Paygate/Authorizenet/Payment.php
index 810b0b93318..dc6eb3ea7f7 100644
--- a/app/code/Magento/Paygate/Controller/Adminhtml/Paygate/Authorizenet/Payment.php
+++ b/app/code/Magento/Paygate/Controller/Adminhtml/Paygate/Authorizenet/Payment.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Paygate\Controller\Adminhtml\Paygate\Authorizenet;
-class Payment extends \Magento\Adminhtml\Controller\Action
+class Payment extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Session quote
diff --git a/app/code/Magento/Payment/view/frontend/catalog/product/view/profile/options.phtml b/app/code/Magento/Payment/view/frontend/catalog/product/view/profile/options.phtml
index 8093dce4eb2..28fee96ff6d 100644
--- a/app/code/Magento/Payment/view/frontend/catalog/product/view/profile/options.phtml
+++ b/app/code/Magento/Payment/view/frontend/catalog/product/view/profile/options.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -30,12 +29,8 @@
*/
?>
<?php if ($dateHtml = $this->getDateHtml()): ?>
-<dl>
- <dt>
- <label for="<?php echo $this->getDateHtmlId() ?>"><?php echo __('Recurring Profile Start Date') ?></label>
- </dt>
- <dd>
- <?php echo $dateHtml ?>
- </dd>
+<dl class="payment product options">
+ <dt class="title"><label for="<?php echo $this->getDateHtmlId() ?>"><?php echo __('Recurring Profile Start Date') ?></label></dt>
+ <dd class="content"><?php echo $dateHtml ?></dd>
</dl>
<?php endif; ?>
diff --git a/app/code/Magento/Payment/view/frontend/catalog/product/view/profile/schedule.phtml b/app/code/Magento/Payment/view/frontend/catalog/product/view/profile/schedule.phtml
index 1c41afb6785..ab49db7b226 100644
--- a/app/code/Magento/Payment/view/frontend/catalog/product/view/profile/schedule.phtml
+++ b/app/code/Magento/Payment/view/frontend/catalog/product/view/profile/schedule.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -29,11 +28,11 @@
* @see \Magento\Payment\Block\Catalog\Product\View\Profile
*/
?>
-<dl>
+<dl class="payment product schedule">
<?php foreach($this->getScheduleInfo() as $term => $definitions): ?>
- <dt><?php echo $this->escapeHtml($term); ?></dt>
-<?php foreach ($definitions as $definition):?>
- <dd><?php echo $this->escapeHtml($definition)?></dd>
-<?php endforeach;?>
+ <dt class="title"><?php echo $this->escapeHtml($term); ?></dt>
+ <?php foreach ($definitions as $definition):?>
+ <dd class="content"><?php echo $this->escapeHtml($definition)?></dd>
+ <?php endforeach;?>
<?php endforeach;?>
</dl>
diff --git a/app/code/Magento/Payment/view/frontend/form/banktransfer.phtml b/app/code/Magento/Payment/view/frontend/form/banktransfer.phtml
index 11e895dc221..5c17a272fae 100644
--- a/app/code/Magento/Payment/view/frontend/form/banktransfer.phtml
+++ b/app/code/Magento/Payment/view/frontend/form/banktransfer.phtml
@@ -19,17 +19,12 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Payment
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php if ($instructions = $this->getInstructions()): ?>
- <ul class="form-list checkout-agreements" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
- <li>
- <div class="<?php echo $this->getMethodCode() ?>-instructions-content agreement-content">
- <?php echo nl2br($instructions) ?>
- </div>
- </li>
- </ul>
+ <div class="items <?php echo $this->getMethodCode() ?> instructions agreement content" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display: none;">
+ <?php echo nl2br($instructions) ?>
+ </div>
<?php endif; ?>
diff --git a/app/code/Magento/Payment/view/frontend/form/cashondelivery.phtml b/app/code/Magento/Payment/view/frontend/form/cashondelivery.phtml
index f6581f70ae5..80dc3198282 100644
--- a/app/code/Magento/Payment/view/frontend/form/cashondelivery.phtml
+++ b/app/code/Magento/Payment/view/frontend/form/cashondelivery.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Payment
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -29,11 +28,7 @@
*/
?>
<?php if ($this->getInstructions()): ?>
- <ul class="form-list checkout-agreements" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
- <li>
- <div class="<?php echo $this->getMethodCode() ?>-instructions-content agreement-content">
- <?php echo nl2br($this->getInstructions()) ?>
- </div>
- </li>
- </ul>
+ <div class="items <?php echo $this->getMethodCode() ?> instructions agreement" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display: none;">
+ <?php echo nl2br($this->getInstructions()) ?>
+ </div>
<?php endif; ?>
diff --git a/app/code/Magento/Payment/view/frontend/form/cc.phtml b/app/code/Magento/Payment/view/frontend/form/cc.phtml
index 39f14f5862f..55366ba1761 100644
--- a/app/code/Magento/Payment/view/frontend/form/cc.phtml
+++ b/app/code/Magento/Payment/view/frontend/form/cc.phtml
@@ -19,25 +19,16 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php $_code=$this->getMethodCode() ?>
-<ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none;">
-<?php /*
- <li>
- <div class="input-box">
- <label for="<?php echo $_code ?>_cc_owner" class="required"><em>*</em><?php echo __('Name on Card') ?></label>
- <input type="text" title="<?php echo __('Name on Card') ?>" class="input-text required-entry" id="<?php echo $_code ?>_cc_owner" name="payment[cc_owner]" value="<?php echo $this->escapeHtml($this->getInfoData('cc_owner')) ?>" />
- </div>
- </li>
-*/ ?>
- <li>
- <label for="<?php echo $_code ?>_cc_type" class="required"><em>*</em><?php echo __('Credit Card Type') ?></label>
- <div class="input-box">
- <select id="<?php echo $_code ?>_cc_type" name="payment[cc_type]" data-validate='{required:true, "validate-cc-type-select":"#<?php echo $_code ?>_cc_number"}'>
+<fieldset class="fieldset items" id="payment_form_<?php echo $_code ?>" style="display: none;">
+ <div class="field type required">
+ <label for="<?php echo $_code ?>_cc_type" class="label"><span><?php echo __('Credit Card Type') ?></span></label>
+ <div class="control">
+ <select id="<?php echo $_code ?>_cc_type" name="payment[cc_type]" data-validate='{required:true, "validate-cc-type-select":"#<?php echo $_code ?>_cc_number"}' class="select">
<option value=""><?php echo __('--Please Select--')?></option>
<?php $_ccType = $this->getInfoData('cc_type') ?>
<?php foreach ($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
@@ -45,83 +36,86 @@
<?php endforeach ?>
</select>
</div>
- </li>
- <li>
- <label for="<?php echo $_code ?>_cc_number" class="required"><em>*</em><?php echo __('Credit Card Number') ?></label>
- <div class="input-box">
+ </div>
+ <div class="field number required">
+ <label for="<?php echo $_code ?>_cc_number" class="label"><span><?php echo __('Credit Card Number') ?></span></label>
+ <div class="control">
<input type="text" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo __('Credit Card Number') ?>" class="input-text" value="" data-validate='{required:true, "validate-cc-number":"#<?php echo $_code ?>_cc_type", "validate-cc-type":"#<?php echo $_code ?>_cc_type"}'/>
</div>
- </li>
- <li id="<?php echo $_code ?>_cc_type_exp_div">
- <label for="<?php echo $_code ?>_expiration" class="required"><em>*</em><?php echo __('Expiration Date') ?></label>
- <div class="input-box">
- <div class="v-fix">
- <select id="<?php echo $_code ?>_expiration" name="payment[cc_exp_month]" class="month" data-validate='{required:true, "validate-cc-exp":"#<?php echo $_code ?>_expiration_yr"}'>
- <?php $_ccExpMonth = $this->getInfoData('cc_exp_month') ?>
- <?php foreach ($this->getCcMonths() as $k=>$v): ?>
- <option value="<?php echo $k?$k:'' ?>"<?php if($k==$_ccExpMonth): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
- <?php endforeach ?>
+ </div>
+ <div class="field date required" id="<?php echo $_code ?>_cc_type_exp_div">
+ <label for="<?php echo $_code ?>_expiration" class="label"><span><?php echo __('Expiration Date') ?></span></label>
+ <div class="control">
+ <div class="nested">
+ <select id="<?php echo $_code ?>_expiration" name="payment[cc_exp_month]" class="select month" data-validate='{required:true, "validate-cc-exp":"#<?php echo $_code ?>_expiration_yr"}'>
+ <?php $_ccExpMonth = $this->getInfoData('cc_exp_month') ?>
+ <?php foreach ($this->getCcMonths() as $k=>$v): ?>
+ <option value="<?php echo $k?$k:'' ?>"<?php if($k==$_ccExpMonth): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+ <?php endforeach ?>
</select>
</div>
- <div class="v-fix">
- <?php $_ccExpYear = $this->getInfoData('cc_exp_year') ?>
- <select id="<?php echo $_code ?>_expiration_yr" name="payment[cc_exp_year]" class="year" data-validate='{required:true}'>
- <?php foreach ($this->getCcYears() as $k=>$v): ?>
- <option value="<?php echo $k?$k:'' ?>"<?php if($k==$_ccExpYear): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
- <?php endforeach ?>
+ <?php $_ccExpYear = $this->getInfoData('cc_exp_year') ?>
+ <div class="nested">
+ <select id="<?php echo $_code ?>_expiration_yr" name="payment[cc_exp_year]" class="select year" data-validate='{required:true}'>
+ <?php foreach ($this->getCcYears() as $k=>$v): ?>
+ <option value="<?php echo $k?$k:'' ?>"<?php if($k==$_ccExpYear): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+ <?php endforeach ?>
</select>
</div>
</div>
- </li>
+ </div>
<?php echo $this->getChildHtml() ?>
<?php if($this->hasVerification()): ?>
- <li id="<?php echo $_code ?>_cc_type_cvv_div">
- <label for="<?php echo $_code ?>_cc_cid" class="required"><em>*</em><?php echo __('Card Verification Number') ?></label>
- <div class="input-box">
- <div class="v-fix">
- <input type="text" title="<?php echo __('Card Verification Number') ?>" class="input-text cvv" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" data-validate='{required:true, "validate-cc-cvn":"#<?php echo $_code ?>_cc_type"}' />
+ <div class="field cvv required" id="<?php echo $_code ?>_cc_type_cvv_div">
+ <label for="<?php echo $_code ?>_cc_cid" class="label"><span><?php echo __('Card Verification Number') ?></span></label>
+ <div class="control">
+ <input type="text" title="<?php echo __('Card Verification Number') ?>" class="input-text cvv" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" data-validate='{required:true, "validate-cc-cvn":"#<?php echo $_code ?>_cc_type"}' />
+ <div class="note">
+ <a href="#" class="action cvv" data-mage-init='{toggleAdvanced: {toggleContainers: "#<?php echo $_code ?>_cc_type_cvv_div .tooltip"}}'><span><?php echo __('What is this?') ?></span></a>
</div>
- <a href="#" class="cvv-what-is-this" data-mage-init='{toggleAdvanced: {toggleContainers: "#<?php echo $_code ?>_cc_type_cvv_div .tool-tip"}}'><?php echo __('What is this?') ?></a>
- <div class="tool-tip hidden">
- <div class="btn-close"><a data-mage-init='{toggleAdvanced: {toggleContainers: "#<?php echo $_code ?>_cc_type_cvv_div .tool-tip"}}' href="#" title="<?php echo __('Close') ?>"><img src="<?php echo $this->getViewFileUrl('images/btn_window_close.gif') ?>" alt="<?php echo __('Close') ?>" title="<?php echo __('Close') ?>" /></a></div>
- <div class="tool-tip-content"><img src="<?php echo $this->getViewFileUrl('Magento_Checkout::cvv.gif') ?>" alt="<?php echo __('Card Verification Number Visual Reference') ?>" title="<?php echo __('Card Verification Number Visual Reference') ?>" /></div>
+ <div class="tooltip hidden">
+ <a data-mage-init='{toggleAdvanced: {toggleContainers: "#<?php echo $_code ?>_cc_type_cvv_div .tooltip"}}' href="#" title="<?php echo __('Close') ?>" class="action close"><span><?php echo __('Close') ?></span></a>
+ <div class="content">
+ <img src="<?php echo $this->getViewFileUrl('Magento_Checkout::cvv.gif') ?>" alt="<?php echo __('Card Verification Number Visual Reference') ?>" title="<?php echo __('Card Verification Number Visual Reference') ?>" />
+ </div>
</div>
</div>
- </li>
+ </div>
<?php endif; ?>
-
<?php if ($this->hasSsCardType()): ?>
- <li id="<?php echo $_code ?>_cc_type_ss_div">
- <ul class="inner-form">
- <li class="form-alt"><label for="<?php echo $_code ?>_cc_issue" class="required"><em>*</em><?php echo __('Switch/Solo/Maestro Only') ?></label></li>
- <li>
- <label for="<?php echo $_code ?>_cc_issue"><?php echo __('Issue Number') ?>:</label>
- <span class="input-box">
+ <div class="field switch solo required" id="<?php echo $_code ?>_cc_type_ss_div">
+ <div class="nested">
+ <div class="field switch solo required">
+ <label for="<?php echo $_code ?>_cc_issue" class="label"><span><?php echo __('Switch/Solo/Maestro Only') ?></span></label>
+ </div>
+ <div class="field number required">
+ <label for="<?php echo $_code ?>_cc_issue" class="label"><span><?php echo __('Issue Number') ?></span></label>
+ <div class="control">
<input type="text" title="<?php echo __('Issue Number') ?>" class="input-text cvv" id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" data-validate='{"validate-cc-ukss":true}'/>
- </span>
- </li>
+ </div>
+ </div>
- <li>
- <label for="<?php echo $_code ?>_start_month"><?php echo __('Start Date') ?>:</label>
- <div class="input-box">
- <div class="v-fix">
- <select id="<?php echo $_code ?>_start_month" name="payment[cc_ss_start_month]" class="month" data-validate='{"validate-cc-ukss":true}'>
+ <div class="field date required">
+ <label for="<?php echo $_code ?>_start_month" class="label"><span><?php echo __('Start Date') ?></span></label>
+ <div class="control">
+ <div class="nested">
+ <select id="<?php echo $_code ?>_start_month" name="payment[cc_ss_start_month]" class="select month" data-validate='{"validate-cc-ukss":true}'>
<?php foreach ($this->getCcMonths() as $k=>$v): ?>
<option value="<?php echo $k?$k:'' ?>"<?php if($k==$this->getInfoData('cc_ss_start_month')): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
<?php endforeach ?>
</select>
</div>
- <div class="v-fix">
- <select id="<?php echo $_code ?>_start_year" name="payment[cc_ss_start_year]" class="year" data-validate='{"validate-cc-ukss":true}'>
+ <div class="nested">
+ <select id="<?php echo $_code ?>_start_year" name="payment[cc_ss_start_year]" class="select year" data-validate='{"validate-cc-ukss":true}'>
<?php foreach ($this->getSsStartYears() as $k=>$v): ?>
<option value="<?php echo $k?$k:'' ?>"<?php if($k==$this->getInfoData('cc_ss_start_year')): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
<?php endforeach ?>
</select>
</div>
</div>
- </li>
- <li class="adv-container" data-validation-msg="validate-cc-ukss"> </li>
- </ul>
+ </div>
+ <div class="adv container" data-validation-msg="validate-cc-ukss"> </div>
+ </div>
<script type="text/javascript">
head.js("<?php echo $this->getViewFileUrl('Magento_Payment::cc-type.js')?>", function() {
jQuery('#<?php echo $_code ?>_cc_type').creditCardType({
@@ -129,6 +123,6 @@
});
});
</script>
- </li>
+ </div>
<?php endif; ?>
-</ul>
+</fieldset>
diff --git a/app/code/Magento/Payment/view/frontend/form/ccsave.phtml b/app/code/Magento/Payment/view/frontend/form/ccsave.phtml
index c93732d4564..0513f139d28 100644
--- a/app/code/Magento/Payment/view/frontend/form/ccsave.phtml
+++ b/app/code/Magento/Payment/view/frontend/form/ccsave.phtml
@@ -19,23 +19,22 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php $_code=$this->getMethodCode() ?>
-<ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none;">
- <li>
- <label for="<?php echo $_code ?>_cc_owner" class="required"><em>*</em><?php echo __('Name on Card') ?></label>
- <div class="input-box">
+<fieldset class="fieldset items" id="payment_form_<?php echo $_code ?>" style="display:none;">
+ <div class="field name required">
+ <label for="<?php echo $_code ?>_cc_owner" class="label"><span><?php echo __('Name on Card') ?></span></label>
+ <div class="control">
<input type="text" title="<?php echo __('Name on Card') ?>" class="input-text" id="<?php echo $_code ?>_cc_owner" name="payment[cc_owner]" value="<?php echo $this->escapeHtml($this->getInfoData('cc_owner')) ?>" data-validate='{required:true}'/>
</div>
- </li>
- <li>
- <label for="<?php echo $_code ?>_cc_type" class="required"><em>*</em><?php echo __('Credit Card Type') ?></label>
- <div class="input-box">
- <select id="<?php echo $_code ?>_cc_type" name="payment[cc_type]" title="<?php echo __('Credit Card Type') ?>" data-validate='{required:true, "validate-cc-type-select":"#<?php echo $_code ?>_cc_number"}'>
+ </div>
+ <div class="field type required">
+ <label for="<?php echo $_code ?>_cc_type" class="label"><span><?php echo __('Credit Card Type') ?></span></label>
+ <div class="control">
+ <select id="<?php echo $_code ?>_cc_type" name="payment[cc_type]" title="<?php echo __('Credit Card Type') ?>" data-validate='{required:true, "validate-cc-type-select":"#<?php echo $_code ?>_cc_number"}' class="select">
<option value=""><?php echo __('--Please Select--') ?></option>
<?php $_ccType = $this->getInfoData('cc_type') ?>
<?php foreach ($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
@@ -43,17 +42,17 @@
<?php endforeach ?>
</select>
</div>
- </li>
- <li>
- <label for="<?php echo $_code ?>_cc_number" class="required"><em>*</em><?php echo __('Credit Card Number') ?></label>
- <div class="input-box">
+ </div>
+ <div class="field number required">
+ <label for="<?php echo $_code ?>_cc_number" class="label"><span><?php echo __('Credit Card Number') ?></span></label>
+ <div class="control">
<input type="text" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo __('Credit Card Number') ?>" class="input-text" value="" data-validate='{required:true, "validate-cc-number":"#<?php echo $_code ?>_cc_type", "validate-cc-type":"#<?php echo $_code ?>_cc_type"}'/>
</div>
- </li>
- <li>
- <label for="<?php echo $_code ?>_expiration" class="required"><em>*</em><?php echo __('Expiration Date') ?></label>
- <div class="input-box">
- <div class="v-fix">
+ </div>
+ <div class="field date required">
+ <label for="<?php echo $_code ?>_expiration" class="label"><span><?php echo __('Expiration Date') ?></span></label>
+ <div class="control">
+ <div class="nested">
<select id="<?php echo $_code ?>_expiration" name="payment[cc_exp_month]" class="month" data-validate='{required:true, "validate-cc-exp":"#<?php echo $_code ?>_expiration_yr"}'>
<?php $_ccExpMonth = $this->getInfoData('cc_exp_month') ?>
<?php foreach ($this->getCcMonths() as $k=>$v): ?>
@@ -61,7 +60,7 @@
<?php endforeach ?>
</select>
</div>
- <div class="v-fix">
+ <div class="nested">
<?php $_ccExpYear = $this->getInfoData('cc_exp_year') ?>
<select id="<?php echo $_code ?>_expiration_yr" name="payment[cc_exp_year]" class="year" data-validate='{required:true}'>
<?php foreach ($this->getCcYears() as $k=>$v): ?>
@@ -70,45 +69,50 @@
</select>
</div>
</div>
- </li>
+ </div>
<?php echo $this->getChildHtml() ?>
<?php if($this->hasVerification()): ?>
- <li>
- <label for="<?php echo $_code ?>_cc_cid" class="required"><em>*</em><?php echo __('Card Verification Number') ?></label>
- <div class="input-box">
- <div class="v-fix">
+ <div class="field cvv required">
+ <label for="<?php echo $_code ?>_cc_cid" class="label"><span><?php echo __('Card Verification Number') ?></span></label>
+ <div class="control">
<input type="text" title="<?php echo __('Card Verification Number') ?>" class="input-text cvv" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" data-validate='{required:true, "validate-cc-cvn":"#<?php echo $_code ?>_cc_type"}'/>
+ <div class="note">
+ <a href="#" class="action cvv" data-mage-init='{toggleAdvanced: {toggleContainers:"#ccv-save-tooltip"}}'><span><?php echo __('What is this?') ?></span></a>
</div>
- <a href="#" class="cvv-what-is-this" data-mage-init='{toggleAdvanced: {toggleContainers:"#ccv-save-tooltip"}}'><?php echo __('What is this?') ?></a>
- <div class="tool-tip hidden" id="ccv-save-tooltip">
- <div class="btn-close"><a data-mage-init='{toggleAdvanced: {toggleContainers:"#ccv-save-tooltip"}}' href="#" title="<?php echo __('Close') ?>"><img src="<?php echo $this->getViewFileUrl('images/btn_window_close.gif') ?>" alt="<?php echo __('Close') ?>" title="<?php echo __('Close') ?>" /></a></div>
- <div class="tool-tip-content"><img src="<?php echo $this->getViewFileUrl('Magento_Checkout::cvv.gif') ?>" alt="<?php echo __('Card Verification Number Visual Reference') ?>" title="<?php echo __('Card Verification Number Visual Reference') ?>" /></div>
+ <div class="tooltip hidden" id="ccv-save-tooltip">
+ <a data-mage-init='{toggleAdvanced: {toggleContainers:"#ccv-save-tooltip"}}' href="#" title="<?php echo __('Close') ?>" class="action close"><span><?php echo __('Close') ?></span></a>
+ <div class="content">
+ <img src="<?php echo $this->getViewFileUrl('Magento_Checkout::cvv.gif') ?>" alt="<?php echo __('Card Verification Number Visual Reference') ?>" title="<?php echo __('Card Verification Number Visual Reference') ?>" />
+ </div>
</div>
</div>
- </li>
+ </div>
<?php endif; ?>
+
<?php if ($this->hasSsCardType()): ?>
- <li id="<?php echo $_code ?>_cc_type_ss_div">
- <ul class="inner-form">
- <li class="form-alt"><label for="<?php echo $_code ?>_cc_issue" class="required"><em>*</em><?php echo __('Switch/Solo/Maestro Only') ?></label></li>
- <li>
- <label for="<?php echo $_code ?>_cc_issue"><?php echo __('Issue Number') ?>:</label>
- <span class="input-box">
+ <div class="field switch solo required" id="<?php echo $_code ?>_cc_type_ss_div">
+ <div class="nested">
+ <div class="field switch solo required">
+ <label for="<?php echo $_code ?>_cc_issue" class="label"><span><?php echo __('Switch/Solo/Maestro Only') ?></span></label>
+ </div>
+ <div class="field number required">
+ <label for="<?php echo $_code ?>_cc_issue" class="label"><span><?php echo __('Issue Number') ?></span></label>
+ <div class="control">
<input type="text" title="<?php echo __('Issue Number') ?>" class="input-text cvv" id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" data-validate='{"validate-cc-ukss":true}'/>
- </span>
- </li>
+ </div>
+ </div>
- <li>
- <label for="<?php echo $_code ?>_start_month"><?php echo __('Start Date') ?>:</label>
- <div class="input-box">
- <div class="v-fix">
+ <div class="field date required">
+ <label for="<?php echo $_code ?>_start_month" class="label"><span><?php echo __('Start Date') ?></span></label>
+ <div class="control">
+ <div class="nested">
<select id="<?php echo $_code ?>_start_month" name="payment[cc_ss_start_month]" class="month" data-validate='{"validate-cc-ukss":true}'>
<?php foreach ($this->getCcMonths() as $k=>$v): ?>
<option value="<?php echo $k?$k:'' ?>"<?php if($k==$this->getInfoData('cc_ss_start_month')): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
<?php endforeach ?>
</select>
</div>
- <div class="v-fix">
+ <div class="nested">
<select id="<?php echo $_code ?>_start_year" name="payment[cc_ss_start_year]" class="year" data-validate='{"validate-cc-ukss":true}'>
<?php foreach ($this->getSsStartYears() as $k=>$v): ?>
<option value="<?php echo $k?$k:'' ?>"<?php if($k==$this->getInfoData('cc_ss_start_year')): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
@@ -116,9 +120,9 @@
</select>
</div>
</div>
- </li>
- <li class="adv-container" data-validation-msg="validate-cc-ukss"> </li>
- </ul>
+ </div>
+ <div class="adv container" data-validation-msg="validate-cc-ukss"> </div>
+ </div>
<script type="text/javascript">
head.js("<?php echo $this->getViewFileUrl('Magento_Payment::cc-type.js')?>", function() {
jQuery('#<?php echo $_code ?>_cc_type').creditCardType({
@@ -126,6 +130,6 @@
});
});
</script>
- </li>
+ </div>
<?php endif; ?>
-</ul>
+</fieldset>
diff --git a/app/code/Magento/Payment/view/frontend/form/checkmo.phtml b/app/code/Magento/Payment/view/frontend/form/checkmo.phtml
index 1e98b9826fc..da5255a58a5 100644
--- a/app/code/Magento/Payment/view/frontend/form/checkmo.phtml
+++ b/app/code/Magento/Payment/view/frontend/form/checkmo.phtml
@@ -19,26 +19,23 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php if ($this->getMethod()->getMailingAddress() || $this->getMethod()->getPayableTo()): ?>
- <ul class="form-list checkmo-list" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
+ <dl class="items check payable" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
<?php if ($this->getMethod()->getPayableTo()): ?>
- <li>
- <label><?php echo __('Make Check payable to:') ?></label>
- <?php echo $this->escapeHtml($this->getMethod()->getPayableTo()) ?>
- </li>
+ <dt class="title"><?php echo __('Make Check payable to:') ?></dt>
+ <dd class="content"><?php echo $this->escapeHtml($this->getMethod()->getPayableTo()) ?></dd>
<?php endif; ?>
<?php if ($this->getMethod()->getMailingAddress()): ?>
- <li>
- <label><?php echo __('Send Check to:') ?></label>
- <address class="checkmo-mailing-address">
- <?php echo nl2br($this->escapeHtml($this->getMethod()->getMailingAddress())) ?>
- </address>
- </li>
+ <dt class="title"><?php echo __('Send Check to:') ?></dt>
+ <dd class="content">
+ <address class="checkmo mailing address">
+ <?php echo nl2br($this->escapeHtml($this->getMethod()->getMailingAddress())) ?>
+ </address>
+ </dd>
<?php endif; ?>
- </ul>
+ </dl>
<?php endif; ?>
diff --git a/app/code/Magento/Payment/view/frontend/form/purchaseorder.phtml b/app/code/Magento/Payment/view/frontend/form/purchaseorder.phtml
index f5fc7ae1b00..3c0dead5af6 100644
--- a/app/code/Magento/Payment/view/frontend/form/purchaseorder.phtml
+++ b/app/code/Magento/Payment/view/frontend/form/purchaseorder.phtml
@@ -19,16 +19,15 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<ul class="form-list" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
- <li>
- <label for="po_number" class="required"><em>*</em><?php echo __('Purchase Order Number') ?></label>
- <div class="input-box">
+<fieldset class="fieldset items" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display: none">
+ <div class="field number required">
+ <label for="po_number" class="label"><span><?php echo __('Purchase Order Number') ?></span></label>
+ <div class="control">
<input type="text" id="po_number" name="payment[po_number]" title="<?php echo __('Purchase Order Number') ?>" class="input-text required-entry" value="<?php echo $this->escapeHtml($this->getInfoData('po_number')) ?>" />
</div>
- </li>
-</ul>
+ </div>
+</fieldset>
diff --git a/app/code/Magento/Payment/view/frontend/info/checkmo.phtml b/app/code/Magento/Payment/view/frontend/info/checkmo.phtml
index 3021359b08a..aa29e95d4f5 100644
--- a/app/code/Magento/Payment/view/frontend/info/checkmo.phtml
+++ b/app/code/Magento/Payment/view/frontend/info/checkmo.phtml
@@ -19,20 +19,26 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<p><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></p>
-<?php if($this->getInfo()->getAdditionalData()): ?>
- <?php if($this->getPayableTo()): ?>
- <p><strong><?php echo __('Make Check payable to:') ?></strong> <?php echo $this->escapeHtml($this->getPayableTo()) ?></p>
+<dl class="payment method checkmemo">
+ <dt class="title"><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></dt>
+ <?php if($this->getInfo()->getAdditionalData()): ?>
+ <?php if($this->getPayableTo()): ?>
+ <dd class="content">
+ <strong><?php echo __('Make Check payable to') ?></strong>
+ <?php echo $this->escapeHtml($this->getPayableTo()) ?>
+ </dd>
+ <?php endif; ?>
+ <?php if($this->getMailingAddress()): ?>
+ <dd class="content">
+ <strong><?php echo __('Send Check to') ?></strong>
+ <address class="checkmo mailing address">
+ <?php echo nl2br($this->escapeHtml($this->getMailingAddress())) ?>
+ </address>
+ </dd>
+ <?php endif; ?>
<?php endif; ?>
- <?php if($this->getMailingAddress()): ?>
- <p><strong><?php echo __('Send Check to:') ?></strong></p>
- <address class="checkmo-mailing-address">
- <?php echo nl2br($this->escapeHtml($this->getMailingAddress())) ?>
- </address>
- <?php endif; ?>
-<?php endif; ?>
+</dl>
diff --git a/app/code/Magento/Payment/view/frontend/info/default.phtml b/app/code/Magento/Payment/view/frontend/info/default.phtml
index aa4e7d58fa4..6d06ec5b419 100644
--- a/app/code/Magento/Payment/view/frontend/info/default.phtml
+++ b/app/code/Magento/Payment/view/frontend/info/default.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -29,21 +28,19 @@
* @see \Magento\Payment\Block\Info
*/
?>
-<p><strong><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></strong></p>
-
+<dl class="payment method">
+ <dt class="title"><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></dt>
<?php if ($_specificInfo = $this->getSpecificInformation()):?>
-<table>
- <tbody>
- <?php foreach ($_specificInfo as $_label => $_value):?>
- <tr>
- <th><strong><?php echo $this->escapeHtml($_label)?>:</strong></th>
- </tr>
- <tr>
- <td><?php echo nl2br(implode($this->getValueAsArray($_value, true), "\n"))?></td>
- </tr>
- <?php endforeach; ?>
- </tbody>
-</table>
+ <dd class="content">
+ <table class="data table">
+ <?php foreach ($_specificInfo as $_label => $_value):?>
+ <tr>
+ <th><?php echo $this->escapeHtml($_label)?></th>
+ <td><?php echo nl2br(implode($this->getValueAsArray($_value, true), "\n"))?></td>
+ </tr>
+ <?php endforeach; ?>
+ </table>
+ </dd>
<?php endif;?>
-
+</dl>
<?php echo $this->getChildHtml()?>
diff --git a/app/code/Magento/Payment/view/frontend/info/instructions.phtml b/app/code/Magento/Payment/view/frontend/info/instructions.phtml
index 5e66f337d24..386e23419f7 100644
--- a/app/code/Magento/Payment/view/frontend/info/instructions.phtml
+++ b/app/code/Magento/Payment/view/frontend/info/instructions.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Payment
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -29,13 +28,9 @@
* @see \Magento\Payment\Block\Info
*/
?>
-<p><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></p>
+<dl class="payment method">
+ <dt class="title"><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></dt>
<?php if ($this->getInstructions()): ?>
-<table>
- <tbody>
- <tr>
- <td><?php echo nl2br($this->getInstructions()) ?></td>
- </tr>
- </tbody>
-</table>
+ <dd class="content"><?php echo nl2br($this->getInstructions()) ?></dd>
<?php endif; ?>
+</dl>
\ No newline at end of file
diff --git a/app/code/Magento/Payment/view/frontend/info/purchaseorder.phtml b/app/code/Magento/Payment/view/frontend/info/purchaseorder.phtml
index 22502d154a3..ad97adc9496 100644
--- a/app/code/Magento/Payment/view/frontend/info/purchaseorder.phtml
+++ b/app/code/Magento/Payment/view/frontend/info/purchaseorder.phtml
@@ -19,10 +19,14 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<p><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></p>
-<p><strong><?php echo __('Purchase Order Number:') ?></strong> <span class="nobr"><?php echo $this->escapeHtml($this->getInfo()->getPoNumber()) ?></span></p>
+<dl class="payment method purchase order">
+ <dt class="title"><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></dt>
+ <dd class="content">
+ <strong><?php echo __('Purchase Order Number') ?></strong>
+ <span class="number"><?php echo $this->escapeHtml($this->getInfo()->getPoNumber()) ?></span>
+ </dd>
+</dl>
diff --git a/app/code/Magento/Payment/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Payment/view/frontend/layout/catalog_product_view.xml
index f6c33575cee..7155d46d979 100644
--- a/app/code/Magento/Payment/view/frontend/layout/catalog_product_view.xml
+++ b/app/code/Magento/Payment/view/frontend/layout/catalog_product_view.xml
@@ -25,10 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="product.info">
- <block class="Magento\Payment\Block\Catalog\Product\View\Profile" name="product.info.additional.recurring.schedule" as="recurring_info" template="catalog/product/view/profile/schedule.phtml">
- <action method="addToParentGroup">
- <argument name="group" xsi:type="string">detailed_info</argument>
- </action>
+ <block class="Magento\Payment\Block\Catalog\Product\View\Profile" name="product.info.additional.recurring.schedule" as="recurring_info" template="catalog/product/view/profile/schedule.phtml" group="detailed_info">
<action method="setTitle">
<argument translate="true" name="value" xsi:type="string">Recurring Profile</argument>
</action>
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Report.php b/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Report.php
index 2e7834c1783..e711089eb58 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Report.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Settlement/Report.php
@@ -49,7 +49,7 @@ class Report extends \Magento\Backend\Block\Widget\Grid\Container
if (true == $this->_authorization->isAllowed('Magento_Paypal::fetch')) {
$this->_addButton('fetch', array(
'label' => __('Fetch Updates'),
- 'onclick' => "confirmSetLocation('{$message}', '{$this->getUrl('*/*/fetch')}')",
+ 'onclick' => "confirmSetLocation('{$message}', '{$this->getUrl('adminhtml/*/fetch')}')",
'class' => 'task'
));
}
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php
index a6a302c1d4c..bdbdd660353 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php
@@ -112,7 +112,7 @@ class Payment
. (empty($groupConfig['paypal_ec_separate']) ? '' : ' paypal-ec-separate')
. $disabledClassString . '" id="' . $htmlId
. '-head" onclick="paypalToggleSolution.call(this, \'' . $htmlId . "', '"
- . $this->getUrl('*/*/state') . '\'); return false;"><span class="state-closed">'
+ . $this->getUrl('adminhtml/*/state') . '\'); return false;"><span class="state-closed">'
. __('Configure') . '</span><span class="state-opened">'
. __('Close') . '</span></button>';
diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports.php b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports.php
index 54a70bfc47b..f3a8d93ff9c 100644
--- a/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports.php
+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Paypal/Reports.php
@@ -29,7 +29,7 @@
*/
namespace Magento\Paypal\Controller\Adminhtml\Paypal;
-class Reports extends \Magento\Adminhtml\Controller\Action
+class Reports extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -97,7 +97,7 @@ class Reports extends \Magento\Adminhtml\Controller\Action
$rowId = $this->getRequest()->getParam('id');
$row = $this->_rowFactory->create()->load($rowId);
if (!$row->getId()) {
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
$this->_coreRegistry->register('current_transaction', $row);
@@ -143,7 +143,7 @@ class Reports extends \Magento\Adminhtml\Controller\Action
} catch (\Exception $e) {
$this->_logger->logException($e);
}
- $this->_redirect('*/*/index');
+ $this->_redirect('adminhtml/*/index');
}
/**
diff --git a/app/code/Magento/Paypal/view/frontend/express/review.phtml b/app/code/Magento/Paypal/view/frontend/express/review.phtml
index d02d0dc97ea..4da5cd85e50 100644
--- a/app/code/Magento/Paypal/view/frontend/express/review.phtml
+++ b/app/code/Magento/Paypal/view/frontend/express/review.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -28,73 +27,78 @@
$billingBlock = $this->getChildBlock('billing')->setFieldNamePrefix('billing')->setHideEmailAddress(true);
$shippingAddress = $this->getShippingAddress();
?>
-<div class="page-title">
- <h1><?php echo __('Review Order') ?></h1>
-</div>
-<?php echo $this->getLayout()->renderElement('messages') ?>
-<h2 class="sub-title">
- Please confirm your addresses
-</h2>
-<div class="paypal-review-order">
- <form method="post" id="order-review-form" action="<?php echo $this->getPlaceOrderUrl() ?>">
- <?php if(!$billingBlock->isCustomerLoggedIn()): ?>
- <div class="info-set col2-set">
- <h2 class="legend"><?php echo __('Customer Information') ?></h2>
- <ul class="form-list form-list-narrow">
- <li id="customer-info-form" class="address-form">
- <div class="field">
- <label for="customer:email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
- <div class="input-box">
- <input type="text" name="customer-email" id="customer:email" value="<?php echo $this->escapeHtml($billingBlock->getAddress()->getEmail()) ?>" title="<?php echo __('Email Address') ?>" class="input-text validate-email required-entry" />
- </div>
+<hgroup class="page title">
+ <h1 class="title"><span class="base"><?php echo __('Review Order') ?></span></h1>
+</hgroup>
+<?php echo $this->getMessagesBlock()->toHtml() ?>
+<div class="paypal review view">
+ <div class="paypal subtitle caption"><strong>Please confirm your addresses</strong></div>
+
+ <form method="post" id="order-review-form" action="<?php echo $this->getPlaceOrderUrl() ?>"
+ class="form paypal review">
+ <?php if (!$billingBlock->isCustomerLoggedIn()): ?>
+ <fieldset class="fieldset customer email">
+ <legend class="legend"><span><?php echo __('Customer Information') ?></span></legend>
+ <br>
+
+ <div id="customer-info-form" class="field email required">
+ <label for="customer:email" class="label"><?php echo __('Email Address') ?></label>
+
+ <div class="control">
+ <input type="text" name="customer-email" id="customer:email"
+ value="<?php echo $this->escapeHtml($billingBlock->getAddress()->getEmail()) ?>"
+ title="<?php echo __('Email Address') ?>" class="input-text"/>
</div>
- </li>
- </ul>
- </div>
- <?php endif ?>
- <div class="info-set col2-set">
- <div class="col-1" id="billing-address">
- <h2 class="legend"><?php echo __('Billing Address') ?></h2>
+ </div>
+ </fieldset>
+ <?php endif ?>
+
+ <fieldset class="fieldset billing address" id="billing-address">
+ <legend class="legend"><span><?php echo __('Billing Address') ?></span></legend>
+ <br>
<?php if ($shippingAddress): ?>
<?php echo $billingBlock->setShowAsShippingCheckbox(true)->toHtml(); ?>
<?php else: ?>
<?php echo $billingBlock->toHtml(); ?>
<?php endif; ?>
- </div>
- <?php if ($shippingAddress): ?>
- <div class="col-2" id="shipping-address">
- <h2 class="legend"><?php echo __('Shipping Address') ?></h2>
- <?php echo $this->getChildBlock('shipping')->setFieldNamePrefix('shipping')->setHideEmailAddress(true)->toHtml(); ?>
- </div>
- </div>
+ </fieldset>
- <div class="info-set col2-set">
- <div class="col-2">
- <div class="box paypal-shipping-method">
- <div class="box-title">
- <h3><?php echo __('Shipping Method') ?></h3>
- </div>
- <div class="box-content">
- <?php echo $this->getChildBlock('shipping_method')->toHtml(); ?>
- </div>
+ <?php if ($shippingAddress): ?>
+ <fieldset class="fieldset shipping address" id="shipping-address">
+ <legend class="legend"><span><?php echo __('Shipping Address') ?></span></legend>
+ <br>
+ <?php echo $this->getChildBlock('shipping')->setFieldNamePrefix('shipping')->setHideEmailAddress(true)->toHtml(); ?>
+ </fieldset>
+
+ <fieldset class="fieldset shipping method">
+ <legend class="legend"><span><?php echo __('Shipping Method') ?></span></legend>
+ <br>
+ <?php echo $this->getChildBlock('shipping_method')->toHtml(); ?>
+ </fieldset>
+ <?php endif; ?>
+
+ <div class="paypal review items">
+ <div class="paypal subtitle caption">
+ <strong><?php echo __('Items in Your Shopping Cart') ?></strong>
+ <a href="<?php echo $this->getUrl('checkout/cart') ?>"
+ class="action edit"><?php echo __('Edit Shopping Cart') ?></a>
</div>
- </div>
- <?php endif; ?>
- </div>
- <div class="info-set">
- <h2 class="legend"><?php echo __('Items in Your Shopping Cart') ?><span class="separator"> | </span><a href="<?php echo $this->getUrl('checkout/cart') ?>"><?php echo __('Edit Shopping Cart') ?></a></h2>
- <div id="details-reload">
- <?php echo $this->getChildHtml('details') ?>
+ <div id="details-reload">
+ <?php echo $this->getChildHtml('details') ?>
+ </div>
</div>
- </div>
+
<?php echo $this->getChildHtml('agreements'); ?>
- <div class="buttons-set buttons-set-order" id="review-buttons-container">
- <button type="button" id="review-button" value="<?php echo __('Place Order') ?>" class="button btn-checkout"><span><span><?php echo __('Place Order') ?></span></span></button>
- <button type="button" id="review-submit" value="<?php echo __('Place Order') ?>" class="button btn-checkout"><span><span><?php echo __('Place Order') ?></span></span></button>
- <button type="button" id="update-order" class="button btn-checkout"><span><span><?php echo __('Update Order Data') ?></span></span></button>
- <span class="please-wait" id="review-please-wait" style="display:none;">
- <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo __('Submitting order information') ?>" title="<?php echo __('Submitting order information') ?>" class="v-middle" /> <?php echo __('Submitting order information') ?>
+ <div class="actions" id="review-buttons-container">
+ <button type="button" id="review-button" value="<?php echo __('Place Order') ?>" class="action checkout">
+ <span><?php echo __('Place Order') ?></span></button>
+ <button type="button" id="review-submit" value="<?php echo __('Place Order') ?>" class="action checkout">
+ <span><?php echo __('Place Order') ?></span></button>
+ <button type="button" id="update-order" class="action update">
+ <span><?php echo __('Update Order Data') ?></span></button>
+ <span class="please-wait load indicator" id="review-please-wait" style="display:none;">
+ <span><?php echo __('Submitting order information...') ?></span>
</span>
</div>
</form>
@@ -105,7 +109,7 @@ $shippingAddress = $this->getShippingAddress();
"<?php echo $this->getViewFileUrl('mage/validation.js')?>",
"<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
"<?php echo $this->getViewFileUrl('Magento_Paypal::order-review.js') ?>",
- function() {
+ function () {
jQuery('#order-review-form').validation().orderReview({
shippingMethodUpdateUrl: '<?php echo $this->escapeHtml($this->getUpdateShippingMethodsUrl()) ?>',
updateOrderSubmitUrl: '<?php echo $this->escapeHtml($this->getUpdateOrderSubmitUrl()) ?>',
diff --git a/app/code/Magento/Paypal/view/frontend/express/review/address.phtml b/app/code/Magento/Paypal/view/frontend/express/review/address.phtml
index 6f282dd71c3..e6e944ceaf0 100644
--- a/app/code/Magento/Paypal/view/frontend/express/review/address.phtml
+++ b/app/code/Magento/Paypal/view/frontend/express/review/address.phtml
@@ -18,131 +18,164 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package Magento_Paypal
+ * @category design
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php $prefix = $this->getFieldNamePrefix();?>
-<fieldset>
- <ul class="form-list form-list-narrow">
- <li id="<?php echo $prefix ?>-address-form" class="address-form">
- <fieldset>
- <input type="hidden" name="<?php echo $prefix ?>[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="<?php echo $prefix ?>:address_id" />
- <ul>
- <li class="fields"><?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getQuote()->getCustomer())->setForceUseCustomerRequiredAttributes(!$this->isCustomerLoggedIn())->setFieldIdFormat($prefix . ':%s')->setFieldNameFormat($prefix . '[%s]')->toHtml() ?></li>
- <li class="fields">
- <div class="field">
- <label for="<?php echo $prefix ?>:company"><?php echo __('Company') ?></label>
- <div class="input-box">
- <input type="text" id="<?php echo $prefix ?>:company" name="<?php echo $prefix ?>[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo __('Company') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>" />
- </div>
- </div>
- <?php if(!$this->isCustomerLoggedIn() && !$this->getHideEmailAddress()): ?>
- <div class="field">
- <label for="<?php echo $prefix ?>:email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
- <div class="input-box">
- <input type="text" name="<?php echo $prefix ?>[email]" id="<?php echo $prefix ?>:email" value="<?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?>" title="<?php echo __('Email Address') ?>" class="input-text validate-email required-entry" />
- </div>
- </div>
- <?php endif; ?>
- </li>
- <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
- <li class="wide">
- <label for="<?php echo $prefix ?>:street1" class="required"><em>*</em><?php echo __('Address') ?></label>
- <div class="input-box">
- <input type="text" title="<?php echo __('Street Address') ?>" name="<?php echo $prefix ?>[street][]" id="<?php echo $prefix ?>:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
- </div>
- </li>
+<?php $prefix = $this->getFieldNamePrefix(); ?>
+<input type="hidden" name="<?php echo $prefix ?>[address_id]" value="<?php echo $this->getAddress()->getId() ?>"
+ id="<?php echo $prefix ?>:address_id"/>
+<?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getQuote()->getCustomer())->setForceUseCustomerRequiredAttributes(!$this->isCustomerLoggedIn())->setFieldIdFormat($prefix . ':%s')->setFieldNameFormat($prefix . '[%s]')->toHtml() ?>
+
+<div class="field company">
+ <label for="<?php echo $prefix ?>:company" class="label"><span><?php echo __('Company') ?></span></label>
+
+ <div class="control">
+ <input type="text" id="<?php echo $prefix ?>:company" name="<?php echo $prefix ?>[company]"
+ value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>"
+ title="<?php echo __('Company') ?>"
+ class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>"/>
+ </div>
+</div>
+
+<?php if (!$this->isCustomerLoggedIn() && !$this->getHideEmailAddress()): ?>
+ <div class="field email required">
+ <label for="<?php echo $prefix ?>:email" class="label"><span><?php echo __('Email Address') ?></span></label>
+
+ <div class="control">
+ <input type="text" name="<?php echo $prefix ?>[email]" id="<?php echo $prefix ?>:email"
+ value="<?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?>"
+ title="<?php echo __('Email Address') ?>" class="input-text validate-email required-entry"/>
+ </div>
+ </div>
+<?php endif; ?>
+
+<?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
+<div class="field street required">
+ <label for="<?php echo $prefix ?>:street1" class="label"><span><?php echo __('Address') ?></span></label>
+
+ <div class="control">
+ <input type="text" title="<?php echo __('Street Address') ?>" name="<?php echo $prefix ?>[street][]"
+ id="<?php echo $prefix ?>:street1"
+ value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>"
+ class="input-text required-entry <?php echo $_streetValidationClass ?>"/>
<?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
<?php for ($_i = 2, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i <= $_n; $_i++): ?>
- <li class="add-field">
- <div class="input-box">
- <input type="text" title="<?php echo __('Street Address %1', $_i) ?>" name="<?php echo $prefix ?>[street][]" id="<?php echo $prefix ?>:street<?php echo $_i?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
- </div>
- </li>
+ <div class="nested">
+ <input type="text" title="<?php echo __('Street Address %1', $_i) ?>"
+ name="<?php echo $prefix ?>[street][]" id="<?php echo $prefix ?>:street<?php echo $_i ?>"
+ value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>"
+ class="input-text <?php echo $_streetValidationClass ?>"/>
+ </div>
<?php endfor; ?>
- <?php if ($this->helper('Magento\Customer\Helper\Address')->isVatAttributeVisible()) : ?>
- <li class="wide">
- <label for="<?php echo $prefix ?>:vat_id"><?php echo __('VAT Number') ?></label>
- <div class="input-box">
- <input type="text" id="<?php echo $prefix ?>:vat_id" name="<?php echo $prefix ?>[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo __('VAT Number') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id') ?>" />
- </div>
- </li>
- <?php endif; ?>
- <li class="fields">
- <div class="field">
- <label for="<?php echo $prefix ?>:city" class="required"><em>*</em><?php echo __('City') ?></label>
- <div class="input-box">
- <input type="text" title="<?php echo __('City') ?>" name="<?php echo $prefix ?>[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="<?php echo $prefix ?>:city" />
- </div>
- </div>
- <div class="field">
- <label for="<?php echo $prefix ?>:region_id" class="required"><em>*</em><?php echo __('State/Province') ?></label>
- <div class="input-box">
- <select id="<?php echo $prefix ?>:region_id" name="<?php echo $prefix ?>[region_id]" title="<?php echo __('State/Province') ?>" class="validate-select" style="display:none;">
- <option value=""><?php echo __('Please select a region, state or province.') ?></option>
- </select>
- <input type="text" id="<?php echo $prefix ?>:region" name="<?php echo $prefix ?>[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo __('State/Province') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>" style="display:none;" />
- </div>
- </div>
- </li>
- <li class="fields">
- <div class="field">
- <label for="<?php echo $prefix ?>:postcode" class="required"><em>*</em><?php echo __('Zip/Postal Code') ?></label>
- <div class="input-box">
- <input type="text" title="<?php echo __('Zip/Postal Code') ?>" name="<?php echo $prefix ?>[postcode]" id="<?php echo $prefix ?>:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" />
- </div>
- </div>
- <div class="field">
- <label for="<?php echo $prefix ?>:country_id" class="required"><em>*</em><?php echo __('Country') ?></label>
- <div class="input-box">
- <?php echo $this->getCountryHtmlSelect($prefix) ?>
- </div>
- </div>
- </li>
- <li class="fields">
- <div class="field">
- <label for="<?php echo $prefix ?>:telephone" class="required"><em>*</em><?php echo __('Telephone') ?></label>
- <div class="input-box">
- <input type="text" name="<?php echo $prefix ?>[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo __('Telephone') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>" id="<?php echo $prefix ?>:telephone" />
- </div>
- </div>
- <div class="field">
- <label for="<?php echo $prefix ?>:fax"><?php echo __('Fax') ?></label>
- <div class="input-box">
- <input type="text" name="<?php echo $prefix ?>[fax]" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo __('Fax') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>" id="<?php echo $prefix ?>:fax" />
- </div>
- </div>
- </li>
- <?php echo $this->getChildHtml('form.additional.info'); ?>
- <?php if ($this->getShowAsShippingCheckbox()): ?>
- <li class="control">
- <div class="field">
- <div class="input-box">
- <input type="checkbox" name="<?php echo $prefix ?>[as_shipping]" class="checkbox" value="1" title="<?php echo __('Same as shipping') ?>" id="<?php echo $prefix ?>:as_shipping" <?php if ($this->getAddress()->getSameAsBilling()):?>checked="checked"<?php endif;?>/>
- </div>
- <label for="<?php echo $prefix ?>:as_shipping"><?php echo __('Same as shipping') ?></label>
- </div>
- </li>
- <?php endif; ?>
- </ul>
- </fieldset>
- </li>
- </ul>
-</fieldset>
+ </div>
+</div>
+
+<?php if ($this->helper('Magento\Customer\Helper\Address')->isVatAttributeVisible()) : ?>
+ <div class="field vat">
+ <label for="<?php echo $prefix ?>:vat_id" class="label"><span><?php echo __('VAT Number') ?></span></label>
+
+ <div class="control">
+ <input type="text" id="<?php echo $prefix ?>:vat_id" name="<?php echo $prefix ?>[vat_id]"
+ value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>"
+ title="<?php echo __('VAT Number') ?>"
+ class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id') ?>"/>
+ </div>
+ </div>
+<?php endif; ?>
+
+<div class="field city required">
+ <label for="<?php echo $prefix ?>:city" class="label"><span><?php echo __('City') ?></span></label>
+
+ <div class="control">
+ <input type="text" title="<?php echo __('City') ?>" name="<?php echo $prefix ?>[city]"
+ value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>"
+ class="input-text required-entry <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>"
+ id="<?php echo $prefix ?>:city"/>
+ </div>
+</div>
+
+<div class="field regionid required">
+ <label for="<?php echo $prefix ?>:region_id" class="label"><span><?php echo __('State/Province') ?></span></label>
+
+ <div class="control">
+ <select id="<?php echo $prefix ?>:region_id" name="<?php echo $prefix ?>[region_id]"
+ title="<?php echo __('State/Province') ?>" class="validate-select required-entry" style="display:none;">
+ <option value=""><?php echo __('Please select region, state or province') ?></option>
+ </select>
+ <input type="text" id="<?php echo $prefix ?>:region" name="<?php echo $prefix ?>[region]"
+ value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>"
+ title="<?php echo __('State/Province') ?>"
+ class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>"
+ style="display:none;"/>
+ </div>
+</div>
+
+<div class="field postcode required">
+ <label for="<?php echo $prefix ?>:postcode" class="label"><span><?php echo __('Zip/Postal Code') ?></span></label>
+
+ <div class="control">
+ <input type="text" title="<?php echo __('Zip/Postal Code') ?>" name="<?php echo $prefix ?>[postcode]"
+ id="<?php echo $prefix ?>:postcode"
+ value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>"
+ class="input-text validate-zip-international required-entry <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>"/>
+ </div>
+</div>
+
+<div class="field country_id required">
+ <label for="<?php echo $prefix ?>:country_id" class="label"><span><?php echo __('Country') ?></span></label>
+
+ <div class="control">
+ <?php echo $this->getCountryHtmlSelect($prefix) ?>
+ </div>
+</div>
+
+<div class="field telephone required">
+ <label for="<?php echo $prefix ?>:telephone" class="label"><span><?php echo __('Telephone') ?></span></label>
+
+ <div class="control">
+ <input type="text" name="<?php echo $prefix ?>[telephone]"
+ value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>"
+ title="<?php echo __('Telephone') ?>"
+ class="input-text required-entry <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>"
+ id="<?php echo $prefix ?>:telephone"/>
+ </div>
+</div>
+
+<div class="field fax">
+ <label for="<?php echo $prefix ?>:fax" class="label"><span><?php echo __('Fax') ?></span></label>
+
+ <div class="control">
+ <input type="text" name="<?php echo $prefix ?>[fax]"
+ value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo __('Fax') ?>"
+ class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>"
+ id="<?php echo $prefix ?>:fax"/>
+ </div>
+</div>
+
+<?php echo $this->getChildHtml('form.additional.info'); ?>
+<?php if ($this->getShowAsShippingCheckbox()): ?>
+ <div class="field choice as_shipping">
+ <input type="checkbox" name="<?php echo $prefix ?>[as_shipping]" class="checkbox" value="1"
+ title="<?php echo __('Same as shipping') ?>" id="<?php echo $prefix ?>:as_shipping"
+ <?php if ($this->getAddress()->getSameAsBilling()): ?>checked="checked"<?php endif; ?>/>
+ <label for="<?php echo $prefix ?>:as_shipping"
+ class="label"><span><?php echo __('Same as shipping') ?></span></label>
+ </div>
+<?php endif; ?>
+
<script type="text/javascript">
- (function($) {
+ (function ($) {
head.js(
"<?php echo $this->getViewFileUrl('Magento_Checkout::js/region-updater.js') ?>",
"<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
"<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js') ?>",
"<?php echo $this->getViewFileUrl('mage/validation.js')?>",
"<?php echo $this->getViewFileUrl('mage/validation/validation.js') ?>",
- function() {
+ function () {
$('#<?php echo $prefix ?>\\:country_id').regionUpdater({
- optionalRegionAllowed: <?php echo ($this->getConfig('general/region/display_all') ? 'true' : 'false'); ?>,
+ optionalRegionAllowed: <?php echo ($this->getConfig('general/region/display_all')? 'true' : 'false'); ?>,
regionListId: '#<?php echo $prefix ?>\\:region_id',
regionInputId: '#<?php echo $prefix ?>\\:region',
postcodeId: '#<?php echo $prefix ?>\\:postcode',
diff --git a/app/code/Magento/Paypal/view/frontend/express/review/details.phtml b/app/code/Magento/Paypal/view/frontend/express/review/details.phtml
index f6da6571d36..753e5e2b122 100644
--- a/app/code/Magento/Paypal/view/frontend/express/review/details.phtml
+++ b/app/code/Magento/Paypal/view/frontend/express/review/details.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -28,37 +27,28 @@
* @see \Magento\Paypal\Block\Express\Review\Details
*/
?>
-<table id="details-table" class="data-table">
+<table id="details-table" class="data table paypal review items">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): $colspan = $rowspan = 2; else: $colspan = $rowspan = 1; endif; ?>
- <col />
- <col width="1" />
- <col width="1" />
- <col width="1" />
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <col width="1" />
- <col width="1" />
- <?php endif; ?>
<thead>
+ <tr>
+ <th rowspan="<?php echo $rowspan ?>" class="col name"><?php echo __('Product Name') ?></th>
+ <th colspan="<?php echo $colspan ?>" class="col price"><?php echo __('Price') ?></th>
+ <th rowspan="<?php echo $rowspan ?>" class="col qty"><?php echo __('Qty') ?></th>
+ <th colspan="<?php echo $colspan ?>" class="col subtotal"><?php echo __('Subtotal') ?></th>
+ </tr>
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
<tr>
- <th rowspan="<?php echo $rowspan ?>"><?php echo __('Product Name') ?></th>
- <th colspan="<?php echo $colspan ?>" class="a-center"><?php echo __('Price') ?></th>
- <th rowspan="<?php echo $rowspan ?>" class="a-center"><?php echo __('Qty') ?></th>
- <th colspan="<?php echo $colspan ?>" class="a-center"><?php echo __('Subtotal') ?></th>
+ <th class="col price excl tax"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(false) ?></th>
+ <th class="col price incl tax"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(true) ?></th>
+ <th class="col subtotal excl tax"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(false) ?></th>
+ <th class="col subtotal incl tax"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(true) ?></th>
</tr>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <tr>
- <th class="a-right"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(false) ?></th>
- <th><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(true) ?></th>
- <th class="a-right"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(false) ?></th>
- <th><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(true) ?></th>
- </tr>
- <?php endif; ?>
+ <?php endif; ?>
</thead>
-<?php echo $this->getChildHtml('totals'); ?>
+ <?php echo $this->getChildHtml('totals'); ?>
<tbody>
- <?php foreach($this->getItems() as $_item): ?>
- <?php echo $this->getItemHtml($_item) ?>
- <?php endforeach ?>
+ <?php foreach ($this->getItems() as $_item): ?>
+ <?php echo $this->getItemHtml($_item) ?>
+ <?php endforeach ?>
</tbody>
</table>
-<script type="text/javascript">(function($) {$('#details-table').decorate('table')})(jQuery)</script>
diff --git a/app/code/Magento/Paypal/view/frontend/express/review/shipping/method.phtml b/app/code/Magento/Paypal/view/frontend/express/review/shipping/method.phtml
index f98d878c6ff..ba91a15845b 100644
--- a/app/code/Magento/Paypal/view/frontend/express/review/shipping/method.phtml
+++ b/app/code/Magento/Paypal/view/frontend/express/review/shipping/method.phtml
@@ -19,35 +19,38 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
/** @var $this \Magento\Paypal\Block\Express\Review */
?>
-<fieldset id="shipping-method-container">
-<?php if ($this->getCanEditShippingMethod() || !$this->getCurrentShippingRate()):?>
- <?php if ($groups = $this->getShippingRateGroups()):?>
+<div id="shipping-method-container">
+ <?php if ($this->getCanEditShippingMethod() || !$this->getCurrentShippingRate()): ?>
+ <?php if ($groups = $this->getShippingRateGroups()): ?>
<?php $currentRate = $this->getCurrentShippingRate(); ?>
- <select name="shipping_method" id="shipping_method" style="width:250px;" class="required-entry">
- <?php if (!$currentRate):?>
- <option value=""><?php echo __('Please select a shipping method.') ?></option>
- <?php endif;?>
- <?php foreach ($groups as $code => $rates):?>
- <optgroup label="<?php echo $this->escapeHtml($this->getCarrierName($code)) ?>" style="font-style:normal;">
- <?php foreach ($rates as $rate):?>
- <option value="<?php echo $this->renderShippingRateValue($rate)?>"<?php echo ($currentRate === $rate) ? ' selected="selected"' : '' ;?>>
- <?php echo $this->renderShippingRateOption($rate)?>
- </option>
- <?php endforeach;?>
- </optgroup>
- <?php endforeach;?>
+ <select name="shipping_method" id="shipping_method" class="required-entry">
+ <?php if (!$currentRate): ?>
+ <option value=""><?php echo __('Please select a shipping method...') ?></option>
+ <?php endif; ?>
+ <?php foreach ($groups as $code => $rates): ?>
+ <optgroup label="<?php echo $this->escapeHtml($this->getCarrierName($code)) ?>"
+ style="font-style:normal;">
+ <?php foreach ($rates as $rate): ?>
+ <option
+ value="<?php echo $this->renderShippingRateValue($rate) ?>"<?php echo ($currentRate === $rate) ? ' selected="selected"' : ''; ?>>
+ <?php echo $this->renderShippingRateOption($rate) ?>
+ </option>
+ <?php endforeach; ?>
+ </optgroup>
+ <?php endforeach; ?>
</select>
<?php else: ?>
- <p><strong><?php echo __('Sorry, no quotes are available for this order.') ?></strong></p>
- <?php endif;?>
-<?php else: ?>
- <p><strong><?php echo $this->renderShippingRateOption($this->getCurrentShippingRate())?></strong></p>
-<?php endif; ?>
-</fieldset>
-<div style="display:none" id="shipping_method_update"><p><?php echo __('Please update order data to get shipping methods and rates') ?></p></div>
+ <p><strong><?php echo __('Sorry, no quotes are available for this order at this time.') ?></strong></p>
+ <?php endif; ?>
+ <?php else: ?>
+ <p><strong><?php echo $this->renderShippingRateOption($this->getCurrentShippingRate()) ?></strong></p>
+ <?php endif; ?>
+</div>
+<div style="display:none" id="shipping_method_update">
+ <p><?php echo __('Please update order data to get shipping methods and rates') ?></p>
+</div>
diff --git a/app/code/Magento/Paypal/view/frontend/express/shortcut.phtml b/app/code/Magento/Paypal/view/frontend/express/shortcut.phtml
index 69c23895ed5..4bbf6636819 100644
--- a/app/code/Magento/Paypal/view/frontend/express/shortcut.phtml
+++ b/app/code/Magento/Paypal/view/frontend/express/shortcut.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -29,32 +28,34 @@
* @var $this \Magento\Paypal\Block\Express\Shortcut
*/
?>
-<p class="paypal-logo">
+<?php
+$labelPosition = '';
+if ($this->isOrPositionBefore()) {
+ $labelPosition = ' before';
+} elseif ($this->isOrPositionAfter()) {
+ $labelPosition = ' after';
+}
+?>
+<div data-label="or" class="paypal checkout <?php echo $labelPosition ?> paypal-logo">
<?php $shortcutHtmlId = $this->getShortcutHtmlId() ?>
- <?php if ($this->isOrPositionBefore()): ?>
- <span class="paypal-or"><?php echo __('-OR-');?></span>
- <?php endif; ?>
- <input type="image" data-action="checkout-form-submit" data-checkout-url="<?php echo $this->getCheckoutUrl()?>"
- src="<?php echo $this->getImageUrl()?>"
- alt="<?php echo __('Checkout with PayPal');?>"
- title="<?php echo __('Checkout with PayPal');?>"/>
- <?php if ($this->isOrPositionAfter()): ?>
- <span class="paypal-or"><?php echo __('-OR-');?></span>
- <?php endif; ?>
+ <input type="image" data-action="checkout-form-submit" data-checkout-url="<?php echo $this->getCheckoutUrl() ?>"
+ src="<?php echo $this->getImageUrl() ?>"
+ alt="<?php echo __('Checkout with PayPal'); ?>"
+ title="<?php echo __('Checkout with PayPal'); ?>"/>
<?php if ($this->getConfirmationUrl() || $this->getIsInCatalogProduct()): ?>
- <?php if ($this->getIsInCatalogProduct()): ?>
- <input type="hidden" id="pp-checkout-url" name="return_url" value=""/>
+ <?php if ($this->getIsInCatalogProduct()): ?>
+ <input type="hidden" id="pp-checkout-url" name="return_url" value=""/>
<?php endif; ?>
- <?php
- $confirmationUrl = $this->getConfirmationUrl();
- $isInCatalogProduct = $this->getIsInCatalogProduct();
-endif; ?>
+ <?php
+ $confirmationUrl = $this->getConfirmationUrl();
+ $isInCatalogProduct = $this->getIsInCatalogProduct();
+ endif; ?>
<script type="text/javascript">
- (function($) {
+ (function ($) {
head.js(
"<?php echo $this->getViewFileUrl('Magento_Paypal::js/paypal-checkout.js') ?>",
- function() {
+ function () {
$('.paypal-logo').paypalCheckout({
confirmMessage: "<?php echo $this->helper('Magento\Core\Helper\Data')->jsQuoteEscape($this->getConfirmationMessage())?>",
confirmUrl: "<?php echo !empty($confirmationUrl) ? $confirmationUrl : false ?>",
@@ -65,4 +66,4 @@ endif; ?>
});
})(jQuery);
</script>
-</p>
+</div>
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/view/frontend/hss/form.phtml b/app/code/Magento/Paypal/view/frontend/hss/form.phtml
index e67b386db86..cf5cc8cd83a 100644
--- a/app/code/Magento/Paypal/view/frontend/hss/form.phtml
+++ b/app/code/Magento/Paypal/view/frontend/hss/form.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -30,17 +29,17 @@
?>
<html>
<head>
- <script type="text/javascript" src="<?php echo $this->getViewFileUrl('jquery/jquery.js')?>"></script>
+ <script type="text/javascript" src="<?php echo $this->getViewFileUrl('jquery/jquery.js') ?>"></script>
</head>
<body>
- <form id="token_form" method="POST" action="<?php echo $this->getTransactionUrl() ?>">
- <input type="hidden" name="SECURETOKEN" value="<?php echo $this->getSecureToken(); ?>" />
- <input type="hidden" name="SECURETOKENID" value="<?php echo $this->getSecureTokenId(); ?>" />
- <input type="hidden" name="MODE" value="<?php echo $this->isTestMode() ? 'TEST' : 'LIVE'; ?>" />
- </form>
- <script type="text/javascript">
- // this is NOT tested.
- jQuery('#token_form').submit();
- </script>
+<form id="token_form" method="POST" action="<?php echo $this->getTransactionUrl() ?>">
+ <input type="hidden" name="SECURETOKEN" value="<?php echo $this->getSecureToken(); ?>"/>
+ <input type="hidden" name="SECURETOKENID" value="<?php echo $this->getSecureTokenId(); ?>"/>
+ <input type="hidden" name="MODE" value="<?php echo $this->isTestMode() ? 'TEST' : 'LIVE'; ?>"/>
+</form>
+<script type="text/javascript">
+ // this is NOT tested.
+ jQuery('#token_form').submit();
+</script>
</body>
</html>
diff --git a/app/code/Magento/Paypal/view/frontend/hss/iframe.phtml b/app/code/Magento/Paypal/view/frontend/hss/iframe.phtml
index 7c3aa2dfe57..5ecc07213cd 100644
--- a/app/code/Magento/Paypal/view/frontend/hss/iframe.phtml
+++ b/app/code/Magento/Paypal/view/frontend/hss/iframe.phtml
@@ -19,13 +19,13 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<div id="iframe-warning" class="warning-message">
- <?php echo __('Please do not refresh the page until you complete payment.') ?>
+<div id="iframe-warning" class="notice-msg">
+ <span><?php echo __('Please do not refresh the page until you complete payment.') ?></span>
</div>
-<iframe id="hss-iframe" data-container="paypal-iframe" class="no-display" scrolling="no" frameborder="0" border="0" src="<?php echo $this->getFrameActionUrl() ?>" height="610" width="570"></iframe>
+<iframe id="hss-iframe" data-container="paypal-iframe" class="paypal iframe" scrolling="no" frameborder="0" border="0"
+ src="<?php echo $this->getFrameActionUrl() ?>" height="610" width="570"></iframe>
diff --git a/app/code/Magento/Paypal/view/frontend/hss/info.phtml b/app/code/Magento/Paypal/view/frontend/hss/info.phtml
index 7fffe8e2647..318bd6b06ce 100644
--- a/app/code/Magento/Paypal/view/frontend/hss/info.phtml
+++ b/app/code/Magento/Paypal/view/frontend/hss/info.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -28,8 +27,6 @@
* @see \Magento\Paypal\Block\Payflow\Link\Info
*/
?>
-<ul id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none" class="form-list">
- <li>
+<div id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none" class="hss items">
<?php echo __('You will be required to enter your payment details after you place an order.') ?>
- </li>
-</ul>
+</div>
diff --git a/app/code/Magento/Paypal/view/frontend/hss/js.phtml b/app/code/Magento/Paypal/view/frontend/hss/js.phtml
index 9a0408fe524..4872e69d749 100644
--- a/app/code/Magento/Paypal/view/frontend/hss/js.phtml
+++ b/app/code/Magento/Paypal/view/frontend/hss/js.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
diff --git a/app/code/Magento/Paypal/view/frontend/hss/redirect.phtml b/app/code/Magento/Paypal/view/frontend/hss/redirect.phtml
index 1816db2ed47..98cca6a4a75 100644
--- a/app/code/Magento/Paypal/view/frontend/hss/redirect.phtml
+++ b/app/code/Magento/Paypal/view/frontend/hss/redirect.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -30,33 +29,33 @@
?>
<html>
<head>
- <script type="text/javascript" src="<?php echo $this->getViewFileUrl('jquery/jquery.js')?>"></script>
+ <script type="text/javascript" src="<?php echo $this->getViewFileUrl('jquery/jquery.js') ?>"></script>
</head>
<body>
- <script type="text/javascript">
- // this code is NOT tested!
- if (window.top == window.self) {
- window.location = "<?php echo $this->getUrl('checkout/cart') ?>";
+<script type="text/javascript">
+ // this code is NOT tested!
+ if (window.top == window.self) {
+ window.location = "<?php echo $this->getUrl('checkout/cart') ?>";
+ }
+ <?php if ($this->getGotoSection()): ?>
+ parent.jQuery.each(parent.jQuery('[id^="opc-"]'), function () {
+ var step = parent.jQuery(this).attr('id').substring(4);
+ if (step === '<?php echo $this->getGotoSection() ?>') {
+ return;
}
- <?php if ($this->getGotoSection()): ?>
- parent.jQuery.each(parent.jQuery('[id^="opc-"]'), function() {
- var step = parent.jQuery(this).attr('id').substring(4);
- if (step === '<?php echo $this->getGotoSection() ?>') {
- return;
- }
- step.addClass('allow');
- });
- parent.jQuery('#checkoutSteps').trigger('gotoSection', '<?php echo $this->getGotoSection() ?>');
- parent.jQuery('#checkout-review-submit').show();
- parent.jQuery('#iframe-warning').hide();
- <?php if ($this->getErrorMsg()): ?>
- alert('<?php echo $this->getErrorMsg() ?>');
- <?php endif; ?>
- <?php elseif ($this->getGotoSuccessPage()) : ?>
- window.top.location = "<?php echo $this->getUrl('checkout/onepage/success') ?>";
- <?php else : ?>
- window.top.location = "<?php echo $this->getUrl('checkout/cart') ?>";
- <?php endif; ?>
- </script>
+ step.addClass('allow');
+ });
+ parent.jQuery('#checkoutSteps').trigger('gotoSection', '<?php echo $this->getGotoSection() ?>');
+ parent.jQuery('#checkout-review-submit').show();
+ parent.jQuery('#iframe-warning').hide();
+ <?php if ($this->getErrorMsg()): ?>
+ alert('<?php echo $this->getErrorMsg() ?>');
+ <?php endif; ?>
+ <?php elseif ($this->getGotoSuccessPage()) : ?>
+ window.top.location = "<?php echo $this->getUrl('checkout/onepage/success') ?>";
+ <?php else : ?>
+ window.top.location = "<?php echo $this->getUrl('checkout/cart') ?>";
+ <?php endif; ?>
+</script>
</body>
</html>
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/view/frontend/hss/review/button.phtml b/app/code/Magento/Paypal/view/frontend/hss/review/button.phtml
index 19163379e1a..d946216ec2b 100644
--- a/app/code/Magento/Paypal/view/frontend/hss/review/button.phtml
+++ b/app/code/Magento/Paypal/view/frontend/hss/review/button.phtml
@@ -19,9 +19,9 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<button type="submit" data-role="review-save" title="<?php echo __('Continue') ?>" class="button btn-checkout"><span><span><?php echo __('Continue') ?></span></span></button>
+<button type="submit" data-role="review-save" title="<?php echo __('Continue') ?>" class="action checkout">
+ <span><?php echo __('Continue') ?></span></button>
diff --git a/app/code/Magento/Paypal/view/frontend/js/paypal-checkout.js b/app/code/Magento/Paypal/view/frontend/js/paypal-checkout.js
index c04d8b80e48..5cc52540078 100644
--- a/app/code/Magento/Paypal/view/frontend/js/paypal-checkout.js
+++ b/app/code/Magento/Paypal/view/frontend/js/paypal-checkout.js
@@ -23,15 +23,15 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
/*jshint browser:true jquery:true*/
-(function($, window) {
+(function ($, window) {
"use strict";
$.widget('mage.paypalCheckout', {
/**
* Initialize store credit events
* @private
*/
- _create: function() {
- this.element.on('click', '[data-action="checkout-form-submit"]', $.proxy(function(e) {
+ _create: function () {
+ this.element.on('click', '[data-action="checkout-form-submit"]', $.proxy(function (e) {
var returnUrl = $(e.target).data('checkout-url');
if (this.options.confirmUrl && this.options.confirmMessage) {
if (window.confirm(this.options.confirmMessage)) {
diff --git a/app/code/Magento/Paypal/view/frontend/layout/SHORTCUT_popup.xml b/app/code/Magento/Paypal/view/frontend/layout/SHORTCUT_popup.xml
index 9b50d93483b..6b0de198ecd 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/SHORTCUT_popup.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/SHORTCUT_popup.xml
@@ -25,8 +25,10 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="product.tooltip">
- <container name="product.info.addtocart.paypal.wrapper" label="PayPal Express Checkout Shortcut Wrapper" htmlTag="div">
- <block class="Magento\Paypal\Block\Express\Shortcut" name="product.info.addtocart.paypal" template="express/shortcut.phtml">
+ <container name="product.info.addtocart.paypal.wrapper" label="PayPal Express Checkout Shortcut Wrapper"
+ htmlTag="div">
+ <block class="Magento\Paypal\Block\Express\Shortcut" name="product.info.addtocart.paypal"
+ template="express/shortcut.phtml">
<action method="setIsInCatalogProduct">
<argument name="value" xsi:type="string">1</argument>
</action>
diff --git a/app/code/Magento/Paypal/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Paypal/view/frontend/layout/catalog_product_view.xml
index 63c98253310..c9367eca83e 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/catalog_product_view.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/catalog_product_view.xml
@@ -25,8 +25,9 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="product.info.addtocart">
- <container name="product.info.addtocart.paypal.wrapper" label="PayPal Express Checkout Shortcut Wrapper" htmlTag="div">
- <block class="Magento\Paypal\Block\Express\Shortcut" name="product.info.addtocart.paypal" template="express/shortcut.phtml">
+ <container name="product.info.addtocart.paypal.wrapper" label="PayPal Express Checkout Shortcut Wrapper">
+ <block class="Magento\Paypal\Block\Express\Shortcut" name="product.info.addtocart.paypal"
+ template="express/shortcut.phtml">
<action method="setIsInCatalogProduct">
<argument name="value" xsi:type="string">1</argument>
</action>
diff --git a/app/code/Magento/Paypal/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Paypal/view/frontend/layout/checkout_cart_index.xml
index 4b92177880b..86e197beb35 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/checkout_cart_index.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/checkout_cart_index.xml
@@ -25,14 +25,16 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="checkout.cart.top_methods">
- <block class="Magento\Paypal\Block\Express\Shortcut" name="checkout.cart.methods.paypal_express.top" before="-" template="express/shortcut.phtml">
+ <block class="Magento\Paypal\Block\Express\Shortcut" name="checkout.cart.methods.paypal_express.top" before="-"
+ template="express/shortcut.phtml">
<action method="setIsQuoteAllowed">
<argument name="value" xsi:type="string">1</argument>
</action>
</block>
</referenceContainer>
<referenceContainer name="checkout.cart.methods">
- <block class="Magento\Paypal\Block\Express\Shortcut" name="checkout.cart.methods.paypal_express.bottom" before="-" template="express/shortcut.phtml">
+ <block class="Magento\Paypal\Block\Express\Shortcut" name="checkout.cart.methods.paypal_express.bottom"
+ before="-" template="express/shortcut.phtml">
<action method="setIsQuoteAllowed">
<argument name="value" xsi:type="string">1</argument>
</action>
diff --git a/app/code/Magento/Paypal/view/frontend/layout/default.xml b/app/code/Magento/Paypal/view/frontend/layout/default.xml
index 52284c4a385..73c63948fe0 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/default.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/default.xml
@@ -24,7 +24,12 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="topCart.extra_actions">
+ <block class="Magento\Paypal\Block\Express\Shortcut" name="paypal.partner.top_cart.shortcut"
+ template="express/shortcut.phtml"/>
+ </referenceContainer>
<referenceContainer name="cart_sidebar.extra_actions">
- <block class="Magento\Paypal\Block\Express\Shortcut" name="paypal.partner.cart_sidebar.shortcut" template="express/shortcut.phtml"/>
+ <block class="Magento\Paypal\Block\Express\Shortcut" name="paypal.partner.cart_sidebar.shortcut"
+ template="express/shortcut.phtml"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review.xml
index 79bed2bc45e..42ba54058d0 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review.xml
+++ b/app/code/Magento/Paypal/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="PayPal Express Order Review Form" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="PayPal Express Order Review Form" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
@@ -31,16 +31,25 @@
</referenceBlock>
<referenceContainer name="content">
<block class="Magento\Paypal\Block\Express\Review" name="paypal.express.review" template="express/review.phtml">
- <block class="Magento\Paypal\Block\Express\Review\Billing" name="express.review.billing" as="billing" template="express/review/address.phtml"/>
- <block class="Magento\Paypal\Block\Express\Review\Shipping" name="express.review.shipping" as="shipping" template="express/review/address.phtml"/>
- <block class="Magento\Paypal\Block\Express\Review" name="express.review.shipping.method" as="shipping_method" template="express/review/shipping/method.phtml"/>
- <block class="Magento\Paypal\Block\Express\Review\Details" name="paypal.express.review.details" as="details" template="express/review/details.phtml">
- <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="onepage/review/item.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="onepage/review/item.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="onepage/review/item.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals" as="totals" template="onepage/review/totals.phtml"/>
+ <block class="Magento\Paypal\Block\Express\Review\Billing" name="express.review.billing" as="billing"
+ template="express/review/address.phtml"/>
+ <block class="Magento\Paypal\Block\Express\Review\Shipping" name="express.review.shipping" as="shipping"
+ template="express/review/address.phtml"/>
+ <block class="Magento\Paypal\Block\Express\Review" name="express.review.shipping.method"
+ as="shipping_method" template="express/review/shipping/method.phtml"/>
+ <block class="Magento\Paypal\Block\Express\Review\Details" name="paypal.express.review.details" as="details"
+ template="express/review/details.phtml">
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default"
+ template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped"
+ template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable"
+ template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals"
+ as="totals" template="onepage/review/totals.phtml"/>
</block>
- <block class="Magento\Checkout\Block\Agreements" name="paypal.express.review.details.agreements" as="agreements" template="onepage/agreements.phtml"/>
+ <block class="Magento\Checkout\Block\Agreements" name="paypal.express.review.details.agreements"
+ as="agreements" template="onepage/agreements.phtml"/>
</block>
</referenceContainer>
<container name="additional.product.info" label="Additional Product Info"/>
diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review_details.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review_details.xml
index 1dc38ee592b..6de51a8c3a0 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review_details.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review_details.xml
@@ -23,13 +23,11 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Express Review Details" type="fragment" owner="checkout_onepage_index">
- <block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
- <block class="Magento\Paypal\Block\Express\Review\Details" name="paypal.express.review.details" template="express/review/details.phtml">
- <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="onepage/review/item.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="onepage/review/item.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="onepage/review/item.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals" as="totals" template="onepage/review/totals.phtml"/>
- </block>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <block class="Magento\Paypal\Block\Express\Review\Details" output="1" name="paypal.express.review.details" template="express/review/details.phtml">
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals" as="totals" template="onepage/review/totals.phtml"/>
</block>
</layout>
diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_hostedpro_cancel.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_hostedpro_cancel.xml
index e352282b84f..bcdd5b3d58a 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/paypal_hostedpro_cancel.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_hostedpro_cancel.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Hosted Pro Frame" type="fragment" owner="checkout_onepage_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Hosted Pro Frame" type="page">
<block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
<block class="Magento\Paypal\Block\Hosted\Pro\Iframe" name="hosted.pro.iframe" template="hss/redirect.phtml"/>
</block>
diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_cancelpayment.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_cancelpayment.xml
index 2a34c7bd1b1..8903d93d453 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_cancelpayment.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_cancelpayment.xml
@@ -23,8 +23,9 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Payflow Cancel Payment" type="fragment" owner="checkout_onepage_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Payflow Cancel Payment" type="page">
<block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
- <block class="Magento\Paypal\Block\Payflow\Link\Iframe" name="payflow.link.iframe" template="payflowlink/redirect.phtml"/>
+ <block class="Magento\Paypal\Block\Payflow\Link\Iframe" name="payflow.link.iframe"
+ template="payflowlink/redirect.phtml"/>
</block>
</layout>
diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_form.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_form.xml
index 99c31495e9f..1ce93f586de 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_form.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_form.xml
@@ -23,8 +23,9 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Payflow Form" type="fragment" owner="checkout_onepage_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Payflow Form" type="page">
<block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
- <block class="Magento\Paypal\Block\Payflow\Link\Iframe" name="payflow.link.iframe" template="payflowlink/form.phtml"/>
+ <block class="Magento\Paypal\Block\Payflow\Link\Iframe" name="payflow.link.iframe"
+ template="payflowlink/form.phtml"/>
</block>
</layout>
diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_returnurl.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_returnurl.xml
index 86678e84748..aa16a52ef33 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_returnurl.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflow_returnurl.xml
@@ -23,8 +23,9 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Payflow Return URL" type="fragment" owner="checkout_onepage_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Payflow Return URL" type="page">
<block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
- <block class="Magento\Paypal\Block\Payflow\Link\Iframe" name="payflow.link.iframe" template="payflowlink/redirect.phtml"/>
+ <block class="Magento\Paypal\Block\Payflow\Link\Iframe" name="payflow.link.iframe"
+ template="payflowlink/redirect.phtml"/>
</block>
</layout>
diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_cancelpayment.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_cancelpayment.xml
index 62c833198a0..f6282dcfa94 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_cancelpayment.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_cancelpayment.xml
@@ -23,8 +23,9 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Payflow Advanced Cancel Payment" type="fragment" owner="checkout_onepage_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Payflow Advanced Cancel Payment" type="page">
<block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
- <block class="Magento\Paypal\Block\Payflow\Advanced\Iframe" name="payflow.advanced.iframe" template="payflowadvanced/redirect.phtml"/>
+ <block class="Magento\Paypal\Block\Payflow\Advanced\Iframe" name="payflow.advanced.iframe"
+ template="payflowadvanced/redirect.phtml"/>
</block>
</layout>
diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_form.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_form.xml
index d9e470ec52d..8c2a6b505ea 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_form.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_form.xml
@@ -23,8 +23,9 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Payflow Advanced Form" type="fragment" owner="checkout_onepage_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Payflow Advanced Form" type="page">
<block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
- <block class="Magento\Paypal\Block\Payflow\Advanced\Iframe" name="payflow.advanced.iframe" template="payflowadvanced/form.phtml"/>
+ <block class="Magento\Paypal\Block\Payflow\Advanced\Iframe" name="payflow.advanced.iframe"
+ template="payflowadvanced/form.phtml"/>
</block>
</layout>
diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_returnurl.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_returnurl.xml
index b2b689befd6..f92c3490b3c 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_returnurl.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowadvanced_returnurl.xml
@@ -23,8 +23,9 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Payflow Advanced Return URL" type="fragment" owner="checkout_onepage_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Payflow Advanced Return URL" type="page">
<block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
- <block class="Magento\Paypal\Block\Payflow\Advanced\Iframe" name="payflow.advanced.iframe" template="payflowadvanced/redirect.phtml"/>
+ <block class="Magento\Paypal\Block\Payflow\Advanced\Iframe" name="payflow.advanced.iframe"
+ template="payflowadvanced/redirect.phtml"/>
</block>
</layout>
diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_standard_redirect.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_standard_redirect.xml
index a54da22883e..e0e8e47f62a 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/paypal_standard_redirect.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/paypal_standard_redirect.xml
@@ -23,8 +23,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Standard Redirect" type="fragment" owner="checkout_onepage_index">
- <block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
- <block class="Magento\Paypal\Block\Standard\Redirect" name="standard.redirect"/>
- </block>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <block class="Magento\Paypal\Block\Standard\Redirect" output="1" name="standard.redirect"/>
</layout>
diff --git a/app/code/Magento/Paypal/view/frontend/order-review.js b/app/code/Magento/Paypal/view/frontend/order-review.js
index 9b1446f7baf..d66aeb9519e 100644
--- a/app/code/Magento/Paypal/view/frontend/order-review.js
+++ b/app/code/Magento/Paypal/view/frontend/order-review.js
@@ -17,14 +17,13 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category PayPal Express
- * @package Mage
+ * @category design
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
/*jshint browser:true jquery:true*/
/*global alert*/
-(function($) {
+(function ($) {
"use strict";
$.widget('mage.orderReview', {
@@ -50,7 +49,7 @@
triggerPropertyChange: true,
isShippingSubmitForm: false,
- _create: function() {
+ _create: function () {
//change handler for ajaxEnabled
if (this.options.isAjax) {
this._submitOrder = this._ajaxSubmitOrder;
@@ -67,7 +66,7 @@
this.isShippingSubmitForm = true;
$(this.options.shippingSubmitFormSelector).find(this.options.updateShippingMethodSubmitSelector).hide().end()
.on('change',
- this.options.shippingSelector, $.proxy(this._submitUpdateOrder, this, $(this.options.shippingSubmitFormSelector).prop('action'), this.options.updateContainerSelector));
+ this.options.shippingSelector, $.proxy(this._submitUpdateOrder, this, $(this.options.shippingSubmitFormSelector).prop('action'), this.options.updateContainerSelector));
this._updateOrderSubmit(!$(this.options.shippingSubmitFormSelector).find(this.options.shippingSelector).val());
} else {
this.element.on('input propertychange', ":input[name]", $.proxy(this._updateOrderSubmit, this, true, this._onShippingChange))
@@ -80,35 +79,35 @@
/**
* show ajax loader
*/
- _ajaxBeforeSend: function() {
+ _ajaxBeforeSend: function () {
this.element.find(this.options.waitLoadingContainer).show();
},
/**
* hide ajax loader
*/
- _ajaxComplete: function() {
+ _ajaxComplete: function () {
this.element.find(this.options.waitLoadingContainer).hide();
},
/**
* trigger propertychange for input type select
*/
- _propertyChange: function() {
+ _propertyChange: function () {
$(this).trigger('propertychange');
},
/**
* trigger change for the update of shippping methods from server
*/
- _updateOrderHandler: function() {
+ _updateOrderHandler: function () {
$(this.options.shippingSelector).trigger('change');
},
/**
* Attempt to submit order
*/
- _submitOrder: function() {
+ _submitOrder: function () {
if (this._validateForm()) {
this.element.find(this.options.updateOrderSelector).fadeTo(0, 0.5)
.end().find(this.options.waitLoadingContainer).show()
@@ -120,7 +119,7 @@
/**
* Attempt to ajax submit order
*/
- _ajaxSubmitOrder: function() {
+ _ajaxSubmitOrder: function () {
if (this.element.find(this.options.waitLoadingContainer).is(":visible")) {
return false;
}
@@ -132,7 +131,7 @@
dataType: 'json',
beforeSend: this._ajaxBeforeSend,
complete: this._ajaxComplete,
- success: function(response) {
+ success: function (response) {
if ($.type(response) === 'object' && !$.isEmptyObject(response)) {
if (response.error_messages) {
this._ajaxComplete();
@@ -157,7 +156,7 @@
alert($.mage.__('Sorry, something went wrong.'));
}
},
- error: function() {
+ error: function () {
alert($.mage.__('Sorry, something went wrong. Please try again later.'));
this._ajaxComplete();
}
@@ -167,7 +166,7 @@
/**
* Validate Order form
*/
- _validateForm: function() {
+ _validateForm: function () {
if (this.element.data('validation')) {
return this.element.validation().valid();
}
@@ -180,7 +179,7 @@
* @param optional function for shipping change handler
* @param optional if true the property change will be set to true
*/
- _updateOrderSubmit: function(shouldDisable, fn) {
+ _updateOrderSubmit: function (shouldDisable, fn) {
this._toggleButton(this.options.orderReviewSubmitSelector, shouldDisable);
if ($.type(fn) === 'function') {
fn.call(this);
@@ -192,7 +191,7 @@
* @param button button selector to be toggled
* @param disable boolean for toggling
*/
- _toggleButton: function(button, disable) {
+ _toggleButton: function (button, disable) {
$(button).prop({"disabled": disable}).toggleClass('no-checkout', disable).fadeTo(0, disable ? 0.5 : 1);
},
@@ -200,7 +199,7 @@
* Copy element value from shipping to billing address
* @param e optional
*/
- _shippingTobilling: function(e) {
+ _shippingTobilling: function (e) {
if (this.options.shippingSubmitFormSelector) {
return false;
}
@@ -209,7 +208,7 @@
if (isChecked) {
this.element.validation("clearError", ':input[name^="billing"]');
}
- $(':input[name^="shipping"]', this.element).each($.proxy(function(key, value) {
+ $(':input[name^="shipping"]', this.element).each($.proxy(function (key, value) {
var fieldObj = $(value.id.replace('shipping:', '#billing\\:'));
if (isChecked) {
fieldObj = fieldObj.val($(value).val());
@@ -231,7 +230,7 @@
* @param url - url where to submit shipping method
* @param resultId - id of element to be updated
*/
- _submitUpdateOrder: function(url, resultId) {
+ _submitUpdateOrder: function (url, resultId) {
if (this.element.find(this.options.waitLoadingContainer).is(":visible")) {
return false;
}
@@ -246,14 +245,14 @@
// form data and callBack updated based on the shippping Form element
if (this.isShippingSubmitForm) {
formData = $(this.options.shippingSubmitFormSelector).serialize() + "&isAjax=true";
- callBackResponseHandler = function(response) {
+ callBackResponseHandler = function (response) {
$(resultId).html(response);
this._updateOrderSubmit(false);
this._ajaxComplete();
};
} else {
formData = this.element.serialize() + "&isAjax=true";
- callBackResponseHandler = function(response) {
+ callBackResponseHandler = function (response) {
$(resultId).html(response);
this._ajaxShippingUpdate(shippingMethod);
};
@@ -276,13 +275,13 @@
* Update Shipping Methods Element from server
* @param shippingMethod
*/
- _ajaxShippingUpdate: function(shippingMethod) {
+ _ajaxShippingUpdate: function (shippingMethod) {
$.ajax({
url: this.options.shippingMethodUpdateUrl,
data: {isAjax: true, shipping_method: shippingMethod},
type: 'post',
context: this,
- success: function(response) {
+ success: function (response) {
$(this.options.shippingMethodContainer).parent().html(response);
this._toggleButton(this.options.updateOrderSelector, false);
this._updateOrderSubmit(false);
@@ -295,7 +294,7 @@
/**
* Actions on change Shipping Address data
*/
- _onShippingChange: function() {
+ _onShippingChange: function () {
if (this.triggerPropertyChange && $.trim($(this.options.shippingSelector).val())) {
this.element.find(this.options.shippingSelector).hide().end()
.find(this.options.shippingSelector + '_update').show();
diff --git a/app/code/Magento/Paypal/view/frontend/partner/logo.phtml b/app/code/Magento/Paypal/view/frontend/partner/logo.phtml
index 8980cad2e42..6bb77b067f7 100644
--- a/app/code/Magento/Paypal/view/frontend/partner/logo.phtml
+++ b/app/code/Magento/Paypal/view/frontend/partner/logo.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -29,6 +28,10 @@
* @see \Magento\Paypal\Block\Logo
*/
?>
-<div class="paypal-logo">
- <a href="#" title="<?php echo __('Additional Options') ?>" onclick="javascript:window.open('<?php echo $this->getAboutPaypalPageUrl() ?>','paypal','width=600,height=350,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'); return false;"><img src="<?php echo $this->escapeHtml($this->getLogoImageUrl()) ?>" alt="<?php echo __('Additional Options') ?>" title="<?php echo __('Additional Options') ?>" /></a>
+<div class="paypal acceptance">
+ <a href="#" title="<?php echo __('Additional Options') ?>"
+ onclick="javascript:window.open('<?php echo $this->getAboutPaypalPageUrl() ?>','paypal','width=600,height=350,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'); return false;"
+ class="action paypal additional"><img src="<?php echo $this->escapeHtml($this->getLogoImageUrl()) ?>"
+ alt="<?php echo __('Additional Options') ?>"
+ title="<?php echo __('Additional Options') ?>"/></a>
</div>
diff --git a/app/code/Magento/Paypal/view/frontend/payflowadvanced/form.phtml b/app/code/Magento/Paypal/view/frontend/payflowadvanced/form.phtml
index e458fcf9c59..9e5c6fd16e8 100644
--- a/app/code/Magento/Paypal/view/frontend/payflowadvanced/form.phtml
+++ b/app/code/Magento/Paypal/view/frontend/payflowadvanced/form.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -30,17 +29,17 @@
?>
<html>
<head>
- <script type="text/javascript" src="<?php echo $this->getViewFileUrl('jquery/jquery.js')?>"></script>
+ <script type="text/javascript" src="<?php echo $this->getViewFileUrl('jquery/jquery.js') ?>"></script>
</head>
<body>
- <form id="token_form" method="POST" action="<?php echo $this->getTransactionUrl() ?>">
- <input type="hidden" name="SECURETOKEN" value="<?php echo $this->getSecureToken(); ?>" />
- <input type="hidden" name="SECURETOKENID" value="<?php echo $this->getSecureTokenId(); ?>" />
- <input type="hidden" name="MODE" value="<?php echo $this->isTestMode() ? 'TEST' : 'LIVE'; ?>" />
- </form>
- <script type="text/javascript">
- // this is NOT tested.
- jQuery('#token_form').submit();
- </script>
+<form id="token_form" method="POST" action="<?php echo $this->getTransactionUrl() ?>">
+ <input type="hidden" name="SECURETOKEN" value="<?php echo $this->getSecureToken(); ?>"/>
+ <input type="hidden" name="SECURETOKENID" value="<?php echo $this->getSecureTokenId(); ?>"/>
+ <input type="hidden" name="MODE" value="<?php echo $this->isTestMode() ? 'TEST' : 'LIVE'; ?>"/>
+</form>
+<script type="text/javascript">
+ // this is NOT tested.
+ jQuery('#token_form').submit();
+</script>
</body>
</html>
diff --git a/app/code/Magento/Paypal/view/frontend/payflowadvanced/iframe.phtml b/app/code/Magento/Paypal/view/frontend/payflowadvanced/iframe.phtml
index 800b4f167a0..d119b6b5345 100644
--- a/app/code/Magento/Paypal/view/frontend/payflowadvanced/iframe.phtml
+++ b/app/code/Magento/Paypal/view/frontend/payflowadvanced/iframe.phtml
@@ -19,13 +19,13 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
/** @var $this \Magento\Paypal\Block\Payflow\Advanced\Form */
?>
-<div id="iframe-warning" class="warning-message">
- <?php echo __('Please do not refresh the page until you complete payment.') ?>
+<div id="iframe-warning" class="notice-msg">
+ <span><?php echo __('Please do not refresh the page until you complete payment.') ?></span>
</div>
-<iframe id="payflow-advanced-iframe" data-container="paypal-iframe" class="no-display" scrolling="no" frameborder="0" border="0" src="<?php echo $this->getFrameActionUrl() ?>" height="610" width="570"></iframe>
+<iframe id="payflow-advanced-iframe" data-container="paypal-iframe" class="paypal iframe" scrolling="no" frameborder="0"
+ border="0" src="<?php echo $this->getFrameActionUrl() ?>" height="610" width="570"></iframe>
diff --git a/app/code/Magento/Paypal/view/frontend/payflowadvanced/info.phtml b/app/code/Magento/Paypal/view/frontend/payflowadvanced/info.phtml
index e281cce7906..a956f5ad010 100644
--- a/app/code/Magento/Paypal/view/frontend/payflowadvanced/info.phtml
+++ b/app/code/Magento/Paypal/view/frontend/payflowadvanced/info.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -28,8 +27,6 @@
* @var $this \Magento\Paypal\Block\Payflow\Advanced\Form
*/
?>
-<ul id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none" class="form-list">
- <li>
+<div id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none" class="payflowadvanced items">
<?php echo __('You will be required to enter your payment details after you place an order.') ?>
- </li>
-</ul>
+</div>
diff --git a/app/code/Magento/Paypal/view/frontend/payflowadvanced/redirect.phtml b/app/code/Magento/Paypal/view/frontend/payflowadvanced/redirect.phtml
index caf7a3ea339..ba663e552fb 100644
--- a/app/code/Magento/Paypal/view/frontend/payflowadvanced/redirect.phtml
+++ b/app/code/Magento/Paypal/view/frontend/payflowadvanced/redirect.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -30,38 +29,38 @@
?>
<html>
<head>
- <script type="text/javascript" src="<?php echo $this->getViewFileUrl('jquery/jquery.js')?>"></script>
+ <script type="text/javascript" src="<?php echo $this->getViewFileUrl('jquery/jquery.js') ?>"></script>
</head>
<body>
- <script type="text/javascript">
- if (window.top == window.self) {
- window.location = "<?php echo $this->getUrl('checkout/cart') ?>";
+<script type="text/javascript">
+ if (window.top == window.self) {
+ window.location = "<?php echo $this->getUrl('checkout/cart') ?>";
+ }
+ <?php if ($this->getGotoSection()): ?>
+ var steps = [];
+ try {
+ steps = parent.jQuery('[id^="opc-"]');
+ } catch (e) {
+ window.top.location = "<?php echo $this->getUrl('checkout/cart') ?>";
+ }
+ parent.jQuery.each(steps, function () {
+ var step = parent.jQuery(this).attr('id').substring(4);
+ if (step === '<?php echo $this->getGotoSection() ?>') {
+ return;
}
- <?php if ($this->getGotoSection()): ?>
- var steps = [];
- try{
- steps = parent.jQuery('[id^="opc-"]');
- }catch(e){
- window.top.location="<?php echo $this->getUrl('checkout/cart') ?>";
- }
- parent.jQuery.each(steps, function() {
- var step = parent.jQuery(this).attr('id').substring(4);
- if (step === '<?php echo $this->getGotoSection() ?>') {
- return;
- }
- parent.jQuery(this).addClass('allow');
- });
- parent.jQuery('#checkoutSteps').trigger('gotoSection', '<?php echo $this->getGotoSection() ?>');
- parent.jQuery('#checkout-review-submit').show();
- parent.jQuery('#iframe-warning').hide();
- <?php if ($this->getErrorMsg()): ?>
- alert('<?php echo $this->getErrorMsg() ?>');
- <?php endif; ?>
- <?php elseif ($this->getGotoSuccessPage()) : ?>
- window.top.location = "<?php echo $this->getUrl('checkout/onepage/success') ?>";
- <?php else : ?>
- window.top.location = "<?php echo $this->getUrl('checkout/cart') ?>";
- <?php endif; ?>
- </script>
- </body>
+ parent.jQuery(this).addClass('allow');
+ });
+ parent.jQuery('#checkoutSteps').trigger('gotoSection', '<?php echo $this->getGotoSection() ?>');
+ parent.jQuery('#checkout-review-submit').show();
+ parent.jQuery('#iframe-warning').hide();
+ <?php if ($this->getErrorMsg()): ?>
+ alert('<?php echo $this->getErrorMsg() ?>');
+ <?php endif; ?>
+ <?php elseif ($this->getGotoSuccessPage()) : ?>
+ window.top.location = "<?php echo $this->getUrl('checkout/onepage/success') ?>";
+ <?php else : ?>
+ window.top.location = "<?php echo $this->getUrl('checkout/cart') ?>";
+ <?php endif; ?>
+</script>
+</body>
</html>
diff --git a/app/code/Magento/Paypal/view/frontend/payflowlink/form.phtml b/app/code/Magento/Paypal/view/frontend/payflowlink/form.phtml
index e67b386db86..cf5cc8cd83a 100644
--- a/app/code/Magento/Paypal/view/frontend/payflowlink/form.phtml
+++ b/app/code/Magento/Paypal/view/frontend/payflowlink/form.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -30,17 +29,17 @@
?>
<html>
<head>
- <script type="text/javascript" src="<?php echo $this->getViewFileUrl('jquery/jquery.js')?>"></script>
+ <script type="text/javascript" src="<?php echo $this->getViewFileUrl('jquery/jquery.js') ?>"></script>
</head>
<body>
- <form id="token_form" method="POST" action="<?php echo $this->getTransactionUrl() ?>">
- <input type="hidden" name="SECURETOKEN" value="<?php echo $this->getSecureToken(); ?>" />
- <input type="hidden" name="SECURETOKENID" value="<?php echo $this->getSecureTokenId(); ?>" />
- <input type="hidden" name="MODE" value="<?php echo $this->isTestMode() ? 'TEST' : 'LIVE'; ?>" />
- </form>
- <script type="text/javascript">
- // this is NOT tested.
- jQuery('#token_form').submit();
- </script>
+<form id="token_form" method="POST" action="<?php echo $this->getTransactionUrl() ?>">
+ <input type="hidden" name="SECURETOKEN" value="<?php echo $this->getSecureToken(); ?>"/>
+ <input type="hidden" name="SECURETOKENID" value="<?php echo $this->getSecureTokenId(); ?>"/>
+ <input type="hidden" name="MODE" value="<?php echo $this->isTestMode() ? 'TEST' : 'LIVE'; ?>"/>
+</form>
+<script type="text/javascript">
+ // this is NOT tested.
+ jQuery('#token_form').submit();
+</script>
</body>
</html>
diff --git a/app/code/Magento/Paypal/view/frontend/payflowlink/iframe.phtml b/app/code/Magento/Paypal/view/frontend/payflowlink/iframe.phtml
index 81294e08878..76ec40de0db 100644
--- a/app/code/Magento/Paypal/view/frontend/payflowlink/iframe.phtml
+++ b/app/code/Magento/Paypal/view/frontend/payflowlink/iframe.phtml
@@ -19,13 +19,13 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
/** @var $this \Magento\Paypal\Block\Payflow\Link\Form */
?>
-<div id="iframe-warning" class="warning-message">
- <?php echo __('Please do not refresh the page until you complete payment.') ?>
+<div id="iframe-warning" class="notice-msg">
+ <span><?php echo __('Please do not refresh the page until you complete payment.') ?></span>
</div>
-<iframe id="payflow-link-iframe" data-container="paypal-iframe" class="no-display" scrolling="no" frameborder="0" border="0" src="<?php echo $this->getFrameActionUrl() ?>" height="610" width="570"></iframe>
+<iframe id="payflow-link-iframe" data-container="paypal-iframe" class="paypal iframe" scrolling="no" frameborder="0"
+ border="0" src="<?php echo $this->getFrameActionUrl() ?>" height="610" width="570"></iframe>
diff --git a/app/code/Magento/Paypal/view/frontend/payflowlink/info.phtml b/app/code/Magento/Paypal/view/frontend/payflowlink/info.phtml
index 39cd781e790..0f783ae392f 100644
--- a/app/code/Magento/Paypal/view/frontend/payflowlink/info.phtml
+++ b/app/code/Magento/Paypal/view/frontend/payflowlink/info.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -28,8 +27,6 @@
* @var $this \Magento\Paypal\Block\Payflow\Link\Form
*/
?>
-<ul id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none" class="form-list">
- <li>
+<div class="payflowlink items" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none">
<?php echo __('You will be required to enter your payment details after you place an order.') ?>
- </li>
-</ul>
+</div>
diff --git a/app/code/Magento/Paypal/view/frontend/payflowlink/redirect.phtml b/app/code/Magento/Paypal/view/frontend/payflowlink/redirect.phtml
index 72c0ea59bbd..cfb9daca72e 100644
--- a/app/code/Magento/Paypal/view/frontend/payflowlink/redirect.phtml
+++ b/app/code/Magento/Paypal/view/frontend/payflowlink/redirect.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -37,29 +36,29 @@
window.location = "<?php echo $this->getUrl('checkout/cart') ?>";
}
<?php if ($this->getGotoSection()): ?>
- var steps = [];
- try{
- steps = parent.jQuery('[id^="opc-"]');
- }catch(e){
- window.top.location = "<?php echo $this->getUrl('checkout/cart') ?>";
+ var steps = [];
+ try {
+ steps = parent.jQuery('[id^="opc-"]');
+ } catch (e) {
+ window.top.location = "<?php echo $this->getUrl('checkout/cart') ?>";
+ }
+ parent.jQuery.each(steps, function () {
+ var step = parent.jQuery(this).attr('id').substring(4);
+ if (step === '<?php echo $this->getGotoSection() ?>') {
+ return;
}
- parent.jQuery.each(steps, function() {
- var step = parent.jQuery(this).attr('id').substring(4);
- if (step === '<?php echo $this->getGotoSection() ?>') {
- return;
- }
- parent.jQuery(this).addClass('allow');
- });
- parent.jQuery('#checkoutSteps').trigger('gotoSection', '<?php echo $this->getGotoSection() ?>');
- parent.jQuery('#checkout-review-submit').show();
- parent.jQuery('#iframe-warning').hide();
- <?php if ($this->getErrorMsg()): ?>
- alert('<?php echo $this->getErrorMsg() ?>');
- <?php endif; ?>
+ parent.jQuery(this).addClass('allow');
+ });
+ parent.jQuery('#checkoutSteps').trigger('gotoSection', '<?php echo $this->getGotoSection() ?>');
+ parent.jQuery('#checkout-review-submit').show();
+ parent.jQuery('#iframe-warning').hide();
+ <?php if ($this->getErrorMsg()): ?>
+ alert('<?php echo $this->getErrorMsg() ?>');
+ <?php endif; ?>
<?php elseif ($this->getGotoSuccessPage()) : ?>
- window.top.location = "<?php echo $this->getUrl('checkout/onepage/success') ?>";
+ window.top.location = "<?php echo $this->getUrl('checkout/onepage/success') ?>";
<?php else : ?>
- window.top.location = "<?php echo $this->getUrl('checkout/cart') ?>";
+ window.top.location = "<?php echo $this->getUrl('checkout/cart') ?>";
<?php endif; ?>
</script>
</body>
diff --git a/app/code/Magento/Paypal/view/frontend/payment/mark.phtml b/app/code/Magento/Paypal/view/frontend/payment/mark.phtml
index 9206539044d..676e48166aa 100644
--- a/app/code/Magento/Paypal/view/frontend/payment/mark.phtml
+++ b/app/code/Magento/Paypal/view/frontend/payment/mark.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -31,6 +30,9 @@
*/
?>
<!-- PayPal Logo -->
-<img src="<?php echo $this->escapeHtml($this->getPaymentAcceptanceMarkSrc())?>" alt="<?php echo __('Acceptance Mark') ?>" class="v-middle" />
-<a href="<?php echo $this->getPaymentAcceptanceMarkHref()?>" onclick="javascript:window.open('<?php echo $this->getPaymentAcceptanceMarkHref()?>','olcwhatispaypal','toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,left=0, top=0, width=400, height=350'); return false;"><?php echo __('What is PayPal?') ?></a>
+<img src="<?php echo $this->escapeHtml($this->getPaymentAcceptanceMarkSrc()) ?>"
+ alt="<?php echo __('Acceptance Mark') ?>" class="paypal icon"/>
+<a href="<?php echo $this->getPaymentAcceptanceMarkHref() ?>"
+ onclick="javascript:window.open('<?php echo $this->getPaymentAcceptanceMarkHref() ?>','olcwhatispaypal','toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,left=0, top=0, width=400, height=350'); return false;"
+ class="action paypal about"><?php echo __('What is PayPal?') ?></a>
<!-- PayPal Logo -->
diff --git a/app/code/Magento/Paypal/view/frontend/payment/redirect.phtml b/app/code/Magento/Paypal/view/frontend/payment/redirect.phtml
index 56556be6084..fb4c265fddb 100644
--- a/app/code/Magento/Paypal/view/frontend/payment/redirect.phtml
+++ b/app/code/Magento/Paypal/view/frontend/payment/redirect.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -30,12 +29,12 @@
* @see \Magento\PayPal\Block\Standard\Form
*/
?>
-<ul class="form-list" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
- <li class="form-alt"><?php echo $this->getRedirectMessage() ?></li>
+<div class="paypal choice field items" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
+ <p><?php echo $this->getRedirectMessage() ?></p>
<?php if ($code = $this->getCreateBACode()): ?>
- <li class="form-alt">
- <label for="<?php echo $code ?>"><input type="checkbox" id="<?php echo $code ?>" value="1" name="payment[<?php echo $code ?>]" class="checkbox" />
- <?php echo __('Sign a billing agreement to streamline further purchases with PayPal.') ?></label>
- </li>
+ <input type="checkbox" id="<?php echo $code ?>" value="1" name="payment[<?php echo $code ?>]" class="checkbox">
+ <label for="<?php echo $code ?>" class="label">
+ <span><?php echo __('Sign a billing agreement to streamline further purchases with PayPal.') ?></span>
+ </label>
<?php endif; ?>
-</ul>
+</div>
diff --git a/app/code/Magento/PaypalUk/view/frontend/express/review.phtml b/app/code/Magento/PaypalUk/view/frontend/express/review.phtml
index 2b97afa0f9f..dc32c7cfe2a 100644
--- a/app/code/Magento/PaypalUk/view/frontend/express/review.phtml
+++ b/app/code/Magento/PaypalUk/view/frontend/express/review.phtml
@@ -19,127 +19,145 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
/** @var $this \Magento\Paypal\Block\Express\Review */
?>
-<div class="page-title">
- <h1><?php echo __('Review Order') ?></h1>
-</div>
-<?php echo $this->getLayout()->renderElement('messages') ?>
+<hgroup class="page title">
+ <h1 class="title"><span class="base"><?php echo __('Review Order') ?></span></h1>
+</hgroup>
+<div class="paypal review view">
+ <?php if ($this->getShippingAddress()): ?>
+ <div class="block shipping information">
+ <div class="title"><strong><?php echo __('Shipping Information') ?></strong></div>
+ <div class="content">
+ <div class="box shipping address">
+ <strong class="subtitle">
+ <?php echo __('Shipping Address') ?>
+ <?php if ($this->getCanEditShippingAddress()): ?>
+ <a href="<?php echo $this->getEditUrl() ?>"
+ class="action edit"><span><?php echo __('Change Shipping Address') ?></span></a>
+ <?php endif; ?>
+ </strong>
-<?php if ($this->getShippingAddress()): ?>
-<div class="info-set col2-set">
- <h2 class="legend"><?php echo __('Shipping Information') ?></h2>
- <div class="col-1">
- <div class="box">
- <div class="box-title">
- <h3><?php echo __('Shipping Address') ?><span class="separator"><?php if ($this->getCanEditShippingAddress()):?> | </span><a href="<?php echo $this->getEditUrl() ?>"><?php echo __('Change Shipping Address') ?></a><?php endif;?></h3>
- </div>
- <div class="box-content">
- <address><?php echo $this->renderAddress($this->getShippingAddress())?></address>
+ <div class="content">
+ <address><?php echo $this->renderAddress($this->getShippingAddress()) ?></address>
+ </div>
+ </div>
+
+ <div class="box shipping method">
+ <strong class="subtitle"><?php echo __('Shipping Method') ?></strong>
+
+ <div class="content">
+ <form method="post" id="shipping-method-form"
+ action="<?php echo $this->escapeHtml($this->getShippingMethodSubmitUrl()) ?>"
+ class="form">
+ <?php if ($this->getCanEditShippingMethod() || !$this->getCurrentShippingRate()): ?>
+ <?php if ($groups = $this->getShippingRateGroups()): ?>
+ <?php $currentRate = $this->getCurrentShippingRate(); ?>
+ <div class="field shipping required">
+ <select name="shipping_method" id="shipping-method" class="select">
+ <?php if (!$currentRate): ?>
+ <option value="">
+ <?php echo __('Please select a shipping method...') ?>
+ </option>
+ <?php endif; ?>
+ <?php foreach ($groups as $code => $rates): ?>
+ <optgroup
+ label="<?php echo $this->escapeHtml($this->getCarrierName($code)) ?>">
+ <?php foreach ($rates as $rate): ?>
+ <option
+ value="<?php echo $this->renderShippingRateValue($rate) ?>"<?php echo ($currentRate === $rate) ? ' selected="selected"' : ''; ?>>
+ <?php echo $this->renderShippingRateOption($rate) ?>
+ </option>
+ <?php endforeach; ?>
+ </optgroup>
+ <?php endforeach; ?>
+ </select>
+ </div>
+ <div class="actions">
+ <button id="update-shipping-method-submit" type="submit" class="action update">
+ <span><?php echo __('Update Shipping Method') ?></span></button>
+ </div>
+ <?php else: ?>
+ <p><?php echo __('Sorry, no quotes are available for this order at this time.') ?></p>
+ <?php endif; ?>
+ <?php else: ?>
+ <p><?php echo $this->renderShippingRateOption($this->getCurrentShippingRate()) ?></p>
+ <?php endif; ?>
+ </form>
+ </div>
+ </div>
</div>
</div>
- </div>
- <div class="col-2">
- <div class="box">
- <div class="box-title">
- <h3><?php echo __('Shipping Method') ?></h3>
+ <?php endif; ?>
+
+ <div class="block billing information">
+ <div class="title"><strong><?php echo __('Billing Information') ?></strong></div>
+ <div class="content">
+ <div class="box billing">
+ <strong class="subtitle">
+ <?php echo __('Payment Method') ?>
+ <?php if ($this->getEditUrl()): ?><a href="<?php echo $this->getEditUrl() ?>" class="action edit">
+ <span><?php echo __('Change Payment Method') ?></span></a><?php endif ?>
+ </strong>
+
+ <div class="content">
+ <?php echo $this->escapeHtml($this->getPaymentMethodTitle()) ?>
+ </div>
</div>
- <div class="box-content">
- <form method="post" id="shipping-method-form" action="<?php echo $this->escapeHtml($this->getShippingMethodSubmitUrl()) ?>">
- <?php if ($this->getCanEditShippingMethod() || !$this->getCurrentShippingRate()):?>
- <?php if ($groups = $this->getShippingRateGroups()):?>
- <?php $currentRate = $this->getCurrentShippingRate(); ?>
- <fieldset>
- <select name="shipping_method" id="shipping-method" style="width:250px;" class="required-entry">
- <?php if (!$currentRate):?>
- <option value=""><?php echo __('Please select a shipping method...') ?></option>
- <?php endif;?>
- <?php foreach ($groups as $code => $rates):?>
- <optgroup label="<?php echo $this->escapeHtml($this->getCarrierName($code)) ?>" style="font-style:normal;">
- <?php foreach ($rates as $rate):?>
- <option value="<?php echo $this->renderShippingRateValue($rate)?>"<?php echo ($currentRate === $rate) ? ' selected="selected"' : '' ;?>>
- <?php echo $this->renderShippingRateOption($rate)?>
- </option>
- <?php endforeach;?>
- </optgroup>
- <?php endforeach;?>
- </select>
- </fieldset>
- <p class="actions">
- <button id="update-shipping-method-submit" type="submit" class="button"><span><span><?php echo __('Update Shipping Method') ?></span></span></button>
- </p>
- <?php else: ?>
- <p><strong><?php echo __('Sorry, no quotes are available for this order at this time.') ?></strong></p>
- <?php endif;?>
- <?php else: ?>
- <p><strong><?php echo $this->renderShippingRateOption($this->getCurrentShippingRate())?></strong></p>
- <?php endif; ?>
- </form>
+
+ <div class="box billing">
+ <strong class="subtitle"><?php echo __('Billing Address') ?></strong>
+
+ <div class="content">
+ <address>
+ <?php echo $this->renderAddress($this->getBillingAddress()) ?><br/>
+ <?php echo __('Payer Email: %1', $this->getBillingAddress()->getEmail()) ?>
+ </address>
+ </div>
</div>
</div>
</div>
-</div>
-<?php endif; ?>
-<div class="info-set col2-set">
- <h2 class="legend"><?php echo __('Billing Information') ?></h2>
- <div class="col-1">
- <div class="box">
- <div class="box-title">
- <h3><?php echo __('Payment Method') ?> <span class="separator">|</span>
- <?php if($this->getEditUrl()):?><a href="<?php echo $this->getEditUrl() ?>"><?php echo __('Change Payment Method') ?></a> <?php endif ?>
- </h3>
- </div>
- <div class="box-content">
- <?php echo $this->escapeHtml($this->getPaymentMethodTitle()) ?>
- </div>
+ <div class="paypal review items">
+ <div class="paypal subtitle caption">
+ <strong><?php echo __('Items in Your Shopping Cart') ?></strong>
+ <a href="<?php echo $this->getUrl('checkout/cart') ?>"
+ class="action edit"><span><?php echo __('Edit Shopping Cart') ?></span></a>
</div>
- </div>
- <div class="col-2">
- <div class="box">
- <div class="box-title">
- <h3><?php echo __('Billing Address') ?></h3>
- </div>
- <div class="box-content">
- <address>
- <?php echo $this->renderAddress($this->getBillingAddress()) ?><br />
- <?php echo __('Payer Email: %1', $this->getBillingAddress()->getEmail()) ?>
- </address>
- </div>
+
+ <div id="details-reload">
+ <?php echo $this->getChildHtml('details') ?>
</div>
- </div>
-</div>
-<div class="info-set">
- <h2 class="legend"><?php echo __('Items in Your Shopping Cart') ?><span class="separator"> | </span><a href="<?php echo $this->getUrl('checkout/cart') ?>"><?php echo __('Edit Shopping Cart') ?></a></h2>
- <div id="details-reload">
- <?php echo $this->getChildHtml('details') ?>
+ <form method="post" id="order-review-form" action="<?php echo $this->getPlaceOrderUrl() ?>" class="form">
+ <?php echo $this->getChildHtml('agreements'); ?>
+ <div class="actions" id="review-buttons-container">
+ <button type="button" id="review-button" value="<?php echo __('Place Order') ?>"
+ class="action checkout"><span><?php echo __('Place Order') ?></span></button>
+ <button type="button" id="review-submit" value="<?php echo __('Place Order') ?>"
+ class="action checkout"><span><?php echo __('Place Order') ?></span></button>
+ <button type="button" id="update-order" class="action update">
+ <span><?php echo __('Update Order Data') ?></span></button>
+ <span class="please-wait load indicator" id="review-please-wait" style="display:none;">
+ <span><?php echo __('Submitting order information...') ?></span>
+ </span>
+ </div>
+ </form>
</div>
</div>
-<form method="post" id="order-review-form" action="<?php echo $this->getPlaceOrderUrl() ?>">
- <?php echo $this->getChildHtml('agreements'); ?>
- <div class="buttons-set buttons-set-order" id="review-buttons-container">
- <button type="button" id="review-button" value="<?php echo __('Place Order') ?>" class="button btn-checkout"><span><span><?php echo __('Place Order') ?></span></span></button>
- <button type="button" id="review-submit" value="<?php echo __('Place Order') ?>" class="button btn-checkout"><span><span><?php echo __('Place Order') ?></span></span></button>
- <span class="please-wait" id="review-please-wait" style="display:none;">
- <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo __('Submitting order information...') ?>" title="<?php echo __('Submitting order information...') ?>" class="v-middle" /> <?php echo __('Submitting order information...') ?>
- </span>
- </div>
-</form>
<script type="text/javascript">
head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
"<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
"<?php echo $this->getViewFileUrl('mage/validation.js')?>",
"<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
"<?php echo $this->getViewFileUrl('Magento_Paypal::order-review.js') ?>",
- function() {
+ function () {
jQuery('#order-review-form').validation().orderReview({
shippingSubmitFormSelector: '#shipping-method-form',
- shippingSelector:'#shipping-method',
+ shippingSelector: '#shipping-method',
shippingMethodUpdateUrl: '<?php echo $this->escapeHtml($this->getUpdateShippingMethodsUrl()) ?>',
updateOrderSubmitUrl: '<?php echo $this->escapeHtml($this->getUpdateOrderSubmitUrl()) ?>',
isAjax: <?php echo $this->getUseAjax() ? 'true' : 'false' ?>
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/SHORTCUT_uk_popup.xml b/app/code/Magento/PaypalUk/view/frontend/layout/SHORTCUT_uk_popup.xml
index 2dfff90ee1e..e54a1eb1427 100644
--- a/app/code/Magento/PaypalUk/view/frontend/layout/SHORTCUT_uk_popup.xml
+++ b/app/code/Magento/PaypalUk/view/frontend/layout/SHORTCUT_uk_popup.xml
@@ -25,8 +25,10 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="product.tooltip">
- <container name="product.info.addtocart.paypaluk.wrapper" label="PayPal Express Checkout (Payflow Edition) Shortcut Wrapper" htmlTag="div">
- <block class="Magento\PaypalUk\Block\Express\Shortcut" name="product.info.addtocart.paypaluk" template="Magento_Paypal::express/shortcut.phtml">
+ <container name="product.info.addtocart.paypaluk.wrapper"
+ label="PayPal Express Checkout (Payflow Edition) Shortcut Wrapper" htmlTag="div">
+ <block class="Magento\PaypalUk\Block\Express\Shortcut" name="product.info.addtocart.paypaluk"
+ template="Magento_Paypal::express/shortcut.phtml">
<action method="setIsInCatalogProduct">
<argument name="value" xsi:type="string">1</argument>
</action>
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/PaypalUk/view/frontend/layout/catalog_product_view.xml
index 1246781afc3..cdf57ac3810 100644
--- a/app/code/Magento/PaypalUk/view/frontend/layout/catalog_product_view.xml
+++ b/app/code/Magento/PaypalUk/view/frontend/layout/catalog_product_view.xml
@@ -25,8 +25,11 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="product.info.addtocart">
- <container name="product.info.addtocart.paypaluk.wrapper" label="PayPal Express Checkout (Payflow Edition) Shortcut Wrapper" htmlTag="p" htmlClass="paypal-logo">
- <block class="Magento\PaypalUk\Block\Express\Shortcut" name="product.info.addtocart.paypaluk" template="Magento_Paypal::express/shortcut.phtml">
+ <container name="product.info.addtocart.paypaluk.wrapper"
+ label="PayPal Express Checkout (Payflow Edition) Shortcut Wrapper" htmlTag="p"
+ htmlClass="paypal-logo">
+ <block class="Magento\PaypalUk\Block\Express\Shortcut" name="product.info.addtocart.paypaluk"
+ template="Magento_Paypal::express/shortcut.phtml">
<action method="setIsInCatalogProduct">
<argument name="value" xsi:type="string">1</argument>
</action>
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/PaypalUk/view/frontend/layout/checkout_cart_index.xml
index c856db24932..dcd21e8b257 100644
--- a/app/code/Magento/PaypalUk/view/frontend/layout/checkout_cart_index.xml
+++ b/app/code/Magento/PaypalUk/view/frontend/layout/checkout_cart_index.xml
@@ -25,14 +25,16 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="checkout.cart.top_methods">
- <block class="Magento\PaypalUk\Block\Express\Shortcut" name="checkout.cart.methods.paypaluk_express.top" before="-" template="Magento_Paypal::express/shortcut.phtml">
+ <block class="Magento\PaypalUk\Block\Express\Shortcut" name="checkout.cart.methods.paypaluk_express.top"
+ before="-" template="Magento_Paypal::express/shortcut.phtml">
<action method="setIsQuoteAllowed">
<argument name="value" xsi:type="string">1</argument>
</action>
</block>
</referenceContainer>
<referenceContainer name="checkout.cart.methods">
- <block class="Magento\PaypalUk\Block\Express\Shortcut" name="checkout.cart.methods.paypaluk_express.bottom" before="-" template="Magento_Paypal::express/shortcut.phtml">
+ <block class="Magento\PaypalUk\Block\Express\Shortcut" name="checkout.cart.methods.paypaluk_express.bottom"
+ before="-" template="Magento_Paypal::express/shortcut.phtml">
<action method="setIsQuoteAllowed">
<argument name="value" xsi:type="string">1</argument>
</action>
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/default.xml b/app/code/Magento/PaypalUk/view/frontend/layout/default.xml
index 8ccbb0f0f28..b1b01df4492 100644
--- a/app/code/Magento/PaypalUk/view/frontend/layout/default.xml
+++ b/app/code/Magento/PaypalUk/view/frontend/layout/default.xml
@@ -25,6 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="cart_sidebar.extra_actions">
- <block class="Magento\PaypalUk\Block\Express\Shortcut" name="paypaluk.partner.cart_sidebar.shortcut" template="Magento_Paypal::express/shortcut.phtml"/>
+ <block class="Magento\PaypalUk\Block\Express\Shortcut" name="paypaluk.partner.cart_sidebar.shortcut"
+ template="Magento_Paypal::express/shortcut.phtml"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/paypal_express_review_details.xml b/app/code/Magento/PaypalUk/view/frontend/layout/paypal_express_review_details.xml
index e60382310ed..8b5fee65e7c 100644
--- a/app/code/Magento/PaypalUk/view/frontend/layout/paypal_express_review_details.xml
+++ b/app/code/Magento/PaypalUk/view/frontend/layout/paypal_express_review_details.xml
@@ -25,11 +25,15 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
- <block class="Magento\Paypal\Block\Express\Review\Details" name="paypal.express.review.details" template="express/review/details.phtml">
+ <block class="Magento\Paypal\Block\Express\Review\Details" name="paypal.express.review.details"
+ template="express/review/details.phtml">
<block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="onepage/review/item.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="onepage/review/item.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="onepage/review/item.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals" as="totals" template="onepage/review/totals.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped"
+ template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable"
+ template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals" as="totals"
+ template="onepage/review/totals.phtml"/>
</block>
</block>
</layout>
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/paypaluk_express_review.xml b/app/code/Magento/PaypalUk/view/frontend/layout/paypaluk_express_review.xml
index b33ead123ac..9cab13fe4b8 100644
--- a/app/code/Magento/PaypalUk/view/frontend/layout/paypaluk_express_review.xml
+++ b/app/code/Magento/PaypalUk/view/frontend/layout/paypaluk_express_review.xml
@@ -23,24 +23,31 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="PayPal Express Order Review Form" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="PayPal Express Order Review Form" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
</action>
</referenceBlock>
<referenceContainer name="content">
- <block class="Magento\Paypal\Block\Express\Review" name="paypal.express.review" template="Magento_PaypalUk::express/review.phtml">
+ <block class="Magento\Paypal\Block\Express\Review" name="paypal.express.review"
+ template="Magento_PaypalUk::express/review.phtml">
<action method="setPaypalActionPrefix">
<argument name="prefix" xsi:type="string">paypaluk</argument>
</action>
- <block class="Magento\Paypal\Block\Express\Review\Details" name="paypal.express.review.details" as="details" template="express/review/details.phtml">
- <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="onepage/review/item.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="onepage/review/item.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="onepage/review/item.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals" as="totals" template="onepage/review/totals.phtml"/>
+ <block class="Magento\Paypal\Block\Express\Review\Details" name="paypal.express.review.details" as="details"
+ template="express/review/details.phtml">
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default"
+ template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped"
+ template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable"
+ template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals"
+ as="totals" template="onepage/review/totals.phtml"/>
</block>
- <block class="Magento\Checkout\Block\Agreements" name="paypal.express.review.details.agreements" as="agreements" template="onepage/agreements.phtml"/>
+ <block class="Magento\Checkout\Block\Agreements" name="paypal.express.review.details.agreements"
+ as="agreements" template="onepage/agreements.phtml"/>
</block>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/PaypalUk/view/frontend/layout/paypaluk_express_review_details.xml b/app/code/Magento/PaypalUk/view/frontend/layout/paypaluk_express_review_details.xml
index 44b00a871f0..4f46c82923b 100644
--- a/app/code/Magento/PaypalUk/view/frontend/layout/paypaluk_express_review_details.xml
+++ b/app/code/Magento/PaypalUk/view/frontend/layout/paypaluk_express_review_details.xml
@@ -23,6 +23,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal UK Express Review Details" type="fragment" owner="checkout_onepage_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/Block/Rating/Edit.php b/app/code/Magento/Rating/Block/Adminhtml/Edit.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Rating/Edit.php
rename to app/code/Magento/Rating/Block/Adminhtml/Edit.php
index ebd8a46267c..52c2c97435f 100644
--- a/app/code/Magento/Adminhtml/Block/Rating/Edit.php
+++ b/app/code/Magento/Rating/Block/Adminhtml/Edit.php
@@ -27,7 +27,7 @@
/**
* Rating edit form
*/
-namespace Magento\Adminhtml\Block\Rating;
+namespace Magento\Rating\Block\Adminhtml;
class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
{
@@ -44,6 +44,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
* @var \Magento\Rating\Model\RatingFactory
*/
protected $_ratingFactory;
+ protected $_blockGroup = 'Magento_Rating';
/**
* @param \Magento\Rating\Model\RatingFactory $ratingFactory
@@ -68,7 +69,8 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
{
parent::_construct();
$this->_objectId = 'id';
- $this->_controller = 'rating';
+ $this->_controller = 'adminhtml';
+ $this->_blockGroup = 'Magento_Rating';
$this->_updateButton('save', 'label', __('Save Rating'));
$this->_updateButton('delete', 'label', __('Delete Rating'));
diff --git a/app/code/Magento/Adminhtml/Block/Rating/Edit/Form.php b/app/code/Magento/Rating/Block/Adminhtml/Edit/Form.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Rating/Edit/Form.php
rename to app/code/Magento/Rating/Block/Adminhtml/Edit/Form.php
index 3a47982f45a..a77bf8dbb5d 100644
--- a/app/code/Magento/Adminhtml/Block/Rating/Edit/Form.php
+++ b/app/code/Magento/Rating/Block/Adminhtml/Edit/Form.php
@@ -32,7 +32,7 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Rating\Edit;
+namespace Magento\Rating\Block\Adminhtml\Edit;
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
@@ -42,7 +42,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
$form = $this->_formFactory->create(array(
'attributes' => array(
'id' => 'edit_form',
- 'action' => $this->getUrl('*/*/save', array('id' => $this->getRequest()->getParam('id'))),
+ 'action' => $this->getUrl('rating/*/save', array('id' => $this->getRequest()->getParam('id'))),
'method' => 'post',
))
);
diff --git a/app/code/Magento/Adminhtml/Block/Rating/Edit/Tab/Form.php b/app/code/Magento/Rating/Block/Adminhtml/Edit/Tab/Form.php
similarity index 98%
rename from app/code/Magento/Adminhtml/Block/Rating/Edit/Tab/Form.php
rename to app/code/Magento/Rating/Block/Adminhtml/Edit/Tab/Form.php
index f8888759bb3..84c914747dc 100644
--- a/app/code/Magento/Adminhtml/Block/Rating/Edit/Tab/Form.php
+++ b/app/code/Magento/Rating/Block/Adminhtml/Edit/Tab/Form.php
@@ -25,7 +25,7 @@
*/
-namespace Magento\Adminhtml\Block\Rating\Edit\Tab;
+namespace Magento\Rating\Block\Adminhtml\Edit\Tab;
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
@@ -90,7 +90,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
/**
* Prepare rating edit form
*
- * @return \Magento\Adminhtml\Block\Rating\Edit\Tab\Form
+ * @return \Magento\Rating\Block\Adminhtml\Edit\Tab\Form
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Adminhtml/Block/Rating/Edit/Tab/Options.php b/app/code/Magento/Rating/Block/Adminhtml/Edit/Tab/Options.php
similarity index 98%
rename from app/code/Magento/Adminhtml/Block/Rating/Edit/Tab/Options.php
rename to app/code/Magento/Rating/Block/Adminhtml/Edit/Tab/Options.php
index c737a6ae1e1..93f43f79378 100644
--- a/app/code/Magento/Adminhtml/Block/Rating/Edit/Tab/Options.php
+++ b/app/code/Magento/Rating/Block/Adminhtml/Edit/Tab/Options.php
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Rating\Edit\Tab;
+namespace Magento\Rating\Block\Adminhtml\Edit\Tab;
class Options extends \Magento\Backend\Block\Widget\Form\Generic
{
diff --git a/app/code/Magento/Adminhtml/Block/Rating/Edit/Tabs.php b/app/code/Magento/Rating/Block/Adminhtml/Edit/Tabs.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Rating/Edit/Tabs.php
rename to app/code/Magento/Rating/Block/Adminhtml/Edit/Tabs.php
index 1d630c09912..f4b8e81db56 100644
--- a/app/code/Magento/Adminhtml/Block/Rating/Edit/Tabs.php
+++ b/app/code/Magento/Rating/Block/Adminhtml/Edit/Tabs.php
@@ -31,7 +31,7 @@
* @package Magento_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Rating\Edit;
+namespace Magento\Rating\Block\Adminhtml\Edit;
class Tabs extends \Magento\Adminhtml\Block\Widget\Tabs
{
@@ -49,15 +49,15 @@ class Tabs extends \Magento\Adminhtml\Block\Widget\Tabs
$this->addTab('form_section', array(
'label' => __('Rating Information'),
'title' => __('Rating Information'),
- 'content' => $this->getLayout()->createBlock('Magento\Adminhtml\Block\Rating\Edit\Tab\Form')->toHtml(),
+ 'content' => $this->getLayout()->createBlock('Magento\Rating\Block\Adminhtml\Edit\Tab\Form')->toHtml(),
))
;
/*
$this->addTab('answers_section', array(
'label' => __('Rating Options'),
'title' => __('Rating Options'),
- 'content' => $this->getLayout()->createBlock('Magento\Adminhtml\Block\Rating\Edit\Tab\Options')
- ->append($this->getLayout()->createBlock('Magento\Adminhtml\Block\Rating\Edit\Tab\Options'))
+ 'content' => $this->getLayout()->createBlock('Magento\Rating\Block\Adminhtml\Edit\Tab\Options')
+ ->append($this->getLayout()->createBlock('Magento\Rating\Block\Adminhtml\Edit\Tab\Options'))
->toHtml(),
));*/
return parent::_beforeToHtml();
diff --git a/app/code/Magento/Adminhtml/Block/Rating/Rating.php b/app/code/Magento/Rating/Block/Adminhtml/Rating.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Rating/Rating.php
rename to app/code/Magento/Rating/Block/Adminhtml/Rating.php
index 047450c334c..37664b5f8da 100644
--- a/app/code/Magento/Adminhtml/Block/Rating/Rating.php
+++ b/app/code/Magento/Rating/Block/Adminhtml/Rating.php
@@ -31,13 +31,14 @@
* @package Magento_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Rating;
+namespace Magento\Rating\Block\Adminhtml;
class Rating extends \Magento\Backend\Block\Widget\Grid\Container
{
protected function _construct()
{
- $this->_controller = 'rating';
+ $this->_controller = 'adminhtml';
+ $this->_blockGroup = 'Magento_Rating';
$this->_headerText = __('Manage Ratings');
$this->_addButtonLabel = __('Add New Rating');
parent::_construct();
diff --git a/app/code/Magento/Adminhtml/Controller/Rating.php b/app/code/Magento/Rating/Controller/Adminhtml/Index.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Controller/Rating.php
rename to app/code/Magento/Rating/Controller/Adminhtml/Index.php
index cfc0d8d216f..da9cd113724 100644
--- a/app/code/Magento/Adminhtml/Controller/Rating.php
+++ b/app/code/Magento/Rating/Controller/Adminhtml/Index.php
@@ -27,9 +27,9 @@
/**
* Admin ratings controller
*/
-namespace Magento\Adminhtml\Controller;
+namespace Magento\Rating\Controller\Adminhtml;
-class Rating extends \Magento\Adminhtml\Controller\Action
+class Index extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -76,8 +76,8 @@ class Rating extends \Magento\Adminhtml\Controller\Action
$this->_setActiveMenu('Magento_Review::catalog_reviews_ratings_ratings');
$this->_addBreadcrumb(__('Manage Ratings'), __('Manage Ratings'));
- $this->_addContent($this->getLayout()->createBlock('Magento\Adminhtml\Block\Rating\Edit'))
- ->_addLeft($this->getLayout()->createBlock('Magento\Adminhtml\Block\Rating\Edit\Tabs'));
+ $this->_addContent($this->getLayout()->createBlock('Magento\Rating\Block\Adminhtml\Edit'))
+ ->_addLeft($this->getLayout()->createBlock('Magento\Rating\Block\Adminhtml\Edit\Tabs'));
$this->renderLayout();
}
@@ -132,16 +132,16 @@ class Rating extends \Magento\Adminhtml\Controller\Action
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addSuccess(__('You saved the rating.'));
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->setRatingData(false);
- $this->_redirect('*/*/');
+ $this->_redirect('rating/*/');
return;
} catch (\Exception $e) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError($e->getMessage());
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->setRatingData($this->getRequest()->getPost());
- $this->_redirect('*/*/edit', array('id' => $this->getRequest()->getParam('id')));
+ $this->_redirect('rating/*/edit', array('id' => $this->getRequest()->getParam('id')));
return;
}
}
- $this->_redirect('*/*/');
+ $this->_redirect('rating/*/');
}
public function deleteAction()
@@ -153,13 +153,13 @@ class Rating extends \Magento\Adminhtml\Controller\Action
$model->load($this->getRequest()->getParam('id'))
->delete();
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addSuccess(__('You deleted the rating.'));
- $this->_redirect('*/*/');
+ $this->_redirect('rating/*/');
} catch (\Exception $e) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError($e->getMessage());
- $this->_redirect('*/*/edit', array('id' => $this->getRequest()->getParam('id')));
+ $this->_redirect('rating/*/edit', array('id' => $this->getRequest()->getParam('id')));
}
}
- $this->_redirect('*/*/');
+ $this->_redirect('rating/*/');
}
protected function _initEnityId()
diff --git a/app/code/Magento/Rating/etc/adminhtml/di.xml b/app/code/Magento/Rating/etc/adminhtml/di.xml
new file mode 100644
index 00000000000..f9988e03e27
--- /dev/null
+++ b/app/code/Magento/Rating/etc/adminhtml/di.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<config>
+ <type name="Magento\Rating\Block\Adminhtml\Edit\Tab\Form">
+ <param name="session">
+ <instance type="Magento\Adminhtml\Model\Session" />
+ </param>
+ </type>
+</config>
diff --git a/app/code/Magento/Rating/etc/adminhtml/routes.xml b/app/code/Magento/Rating/etc/adminhtml/routes.xml
new file mode 100644
index 00000000000..527d9d205ff
--- /dev/null
+++ b/app/code/Magento/Rating/etc/adminhtml/routes.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<config>
+ <router id="admin">
+ <route id="rating" frontName="rating">
+ <module name="Magento_Rating" before="Magento_Adminhtml" />
+ </route>
+ </router>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_rating_block.xml b/app/code/Magento/Rating/view/adminhtml/layout/rating_block.xml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_rating_block.xml
rename to app/code/Magento/Rating/view/adminhtml/layout/rating_block.xml
index 4138fd587b2..8c719c1f378 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_rating_block.xml
+++ b/app/code/Magento/Rating/view/adminhtml/layout/rating_block.xml
@@ -36,7 +36,7 @@
<block class="Magento\Backend\Block\Widget\Grid\ColumnSet" name="adminhtml.rating.grid.columnSet" as="grid.columnSet">
<arguments>
<argument name="rowUrl" xsi:type="array">
- <item name="path" xsi:type="string">*/*/edit</item>
+ <item name="path" xsi:type="string">rating/*/edit</item>
<item name="extraParamsTemplate" xsi:type="array">
<item name="id" xsi:type="string">getId</item>
</item>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_rating_index.xml b/app/code/Magento/Rating/view/adminhtml/layout/rating_index_index.xml
similarity index 91%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_rating_index.xml
rename to app/code/Magento/Rating/view/adminhtml/layout/rating_index_index.xml
index fcb1095189d..8dacd070394 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_rating_index.xml
+++ b/app/code/Magento/Rating/view/adminhtml/layout/rating_index_index.xml
@@ -25,8 +25,8 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<update handle="formkey"/>
- <update handle="adminhtml_rating_block"/>
+ <update handle="rating_block"/>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Rating\Rating" name="adminhtml.rating.container"/>
+ <block class="Magento\Rating\Block\Adminhtml\Rating" name="adminhtml.rating.container"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/rating/detailed.phtml b/app/code/Magento/Rating/view/adminhtml/rating/detailed.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/rating/detailed.phtml
rename to app/code/Magento/Rating/view/adminhtml/rating/detailed.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/rating/options.phtml b/app/code/Magento/Rating/view/adminhtml/rating/options.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/rating/options.phtml
rename to app/code/Magento/Rating/view/adminhtml/rating/options.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/rating/stars/detailed.phtml b/app/code/Magento/Rating/view/adminhtml/rating/stars/detailed.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/rating/stars/detailed.phtml
rename to app/code/Magento/Rating/view/adminhtml/rating/stars/detailed.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/rating/stars/summary.phtml b/app/code/Magento/Rating/view/adminhtml/rating/stars/summary.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/rating/stars/summary.phtml
rename to app/code/Magento/Rating/view/adminhtml/rating/stars/summary.phtml
diff --git a/app/code/Magento/Rating/view/frontend/detailed.phtml b/app/code/Magento/Rating/view/frontend/detailed.phtml
index dab3092a662..74645a2bc69 100644
--- a/app/code/Magento/Rating/view/frontend/detailed.phtml
+++ b/app/code/Magento/Rating/view/frontend/detailed.phtml
@@ -19,22 +19,19 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php if(!empty($collection) && $collection->getSize()): ?>
- <table class="ratings-table">
- <col width="1" />
- <col />
+ <table class="data table ratings review summary">
<tbody>
<?php foreach ($collection as $_rating): ?>
<?php if($_rating->getSummary()): ?>
<tr>
- <th><?php echo __($this->escapeHtml($_rating->getRatingCode())) ?></th>
- <td>
- <div class="rating-box">
+ <th class="label"><?php echo __($this->escapeHtml($_rating->getRatingCode())) ?></th>
+ <td class="value">
+ <div class="rating box">
<div class="rating" style="width:<?php echo ceil($_rating->getSummary()) ?>%;"></div>
</div>
</td>
diff --git a/app/code/Magento/Review/Controller/Product.php b/app/code/Magento/Review/Controller/Product.php
index c502941b829..31ab87e6b2b 100644
--- a/app/code/Magento/Review/Controller/Product.php
+++ b/app/code/Magento/Review/Controller/Product.php
@@ -391,6 +391,7 @@ class Product extends \Magento\Core\Controller\Front\Action
protected function _initProductLayout($product)
{
$update = $this->getLayout()->getUpdate();
+ $update->addHandle('default');
$this->addPageLayoutHandles(
array('id' => $product->getId(), 'sku' => $product->getSku(), 'type' => $product->getTypeId())
);
diff --git a/app/code/Magento/Review/etc/adminhtml/menu.xml b/app/code/Magento/Review/etc/adminhtml/menu.xml
index 183d6ccb304..24995635f0e 100644
--- a/app/code/Magento/Review/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Review/etc/adminhtml/menu.xml
@@ -27,8 +27,8 @@
-->
<config>
<menu>
- <add id="Magento_Review::catalog_reviews_ratings_ratings" title="Rating" module="Magento_Review" sortOrder="60" parent="Magento_Adminhtml::stores_attributes" action="adminhtml/rating/" resource="Magento_Rating::ratings"/>
- <add id="Magento_Review::catalog_reviews_ratings_reviews_all" title="Reviews" module="Magento_Review" parent="Magento_Adminhtml::marketing_user_content" sortOrder="10" action="adminhtml/catalog_product_review/" resource="Magento_Review::reviews_all"/>
+ <add id="Magento_Review::catalog_reviews_ratings_ratings" title="Rating" module="Magento_Review" sortOrder="60" parent="Magento_Adminhtml::stores_attributes" action="rating/index/" resource="Magento_Rating::ratings"/>
+ <add id="Magento_Review::catalog_reviews_ratings_reviews_all" title="Reviews" module="Magento_Review" parent="Magento_Adminhtml::marketing_user_content" sortOrder="10" action="catalog/product_review/" resource="Magento_Review::reviews_all"/>
<add id="Magento_Review::report_review" title="Reviews" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report" resource="Magento_Reports::review"/>
<add id="Magento_Review::report_review_customer" title="By Customers" sortOrder="10" module="Magento_Review" parent="Magento_Review::report_review" action="adminhtml/report_review/customer" resource="Magento_Reports::review_customer"/>
<add id="Magento_Review::report_review_product" title="By Products" sortOrder="20" module="Magento_Review" parent="Magento_Review::report_review" action="adminhtml/report_review/product" resource="Magento_Reports::review_product"/>
diff --git a/app/code/Magento/Review/view/frontend/customer/list.phtml b/app/code/Magento/Review/view/frontend/customer/list.phtml
index 9550332092f..2aec52fe7bd 100644
--- a/app/code/Magento/Review/view/frontend/customer/list.phtml
+++ b/app/code/Magento/Review/view/frontend/customer/list.phtml
@@ -19,46 +19,62 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<div class="page-title">
- <h1><?php echo __('My Product Reviews') ?></h1>
-</div>
<?php if( $this->getCollection() && $this->count()): ?>
- <?php echo $this->getToolbarHtml() ?>
- <table class="data-table" id="my-reviews-table">
- <col width="1" />
- <col width="210" />
- <col width="1" />
- <col />
- <col width="1" />
- <tbody>
- <?php foreach ($this->getCollection() as $_review): ?>
- <tr>
- <td><span class="nobr"><?php echo $this->dateFormat($_review->getReviewCreatedAt()); ?></span></td>
- <td><h2 class="product-name"><a href="<?php echo $this->getProductLink() ?>id/<?php echo $_review->getEntityPkValue() ?>"><?php echo $this->escapeHtml($_review->getName()) ?></a></h2></td>
- <td>
- <?php if($_review->getSum()): ?>
- <div class="rating-box">
- <div class="rating" style="width:<?php echo ( $_review->getSum() / $_review->getCount() ) ?>%;"></div>
- </div>
- <?php endif; ?>
- </td>
- <td><?php echo $this->helper('Magento\Review\Helper\Data')->getDetailHtml($_review->getDetail()) ?></td>
- <td><a href="<?php echo $this->getReviewLink() ?>id/<?php echo $_review->getReviewId() ?>" class="nobr"><?php echo __('View Details') ?></a></td>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
- <script type="text/javascript">(function($) {$('#my-reviews-table').decorate('table')})(jQuery)</script>
- <?php echo $this->getToolbarHtml() ?>
+ <div class="toolbar reviews">
+ <?php echo $this->getToolbarHtml() ?>
+ </div>
+ <table class="data table reviews" id="my-reviews-table">
+ <thead>
+ <tr>
+ <th class="col date"><?php echo __('Created') ?></th>
+ <th class="col item"><?php echo __('Product Name') ?></th>
+ <th class="col summary"><?php echo __('Summary') ?></th>
+ <th class="col description"><?php echo __('Description') ?></th>
+ <th class="col actions"> </th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach ($this->getCollection() as $_review): ?>
+ <tr>
+ <td class="col date"><?php echo $this->dateFormat($_review->getReviewCreatedAt()); ?></td>
+ <td class="col item">
+ <strong class="product name">
+ <a href="<?php echo $this->getProductLink() ?>id/<?php echo $_review->getEntityPkValue() ?>"><?php echo $this->escapeHtml($_review->getName()) ?></a>
+ </strong>
+ </td>
+ <td class="col summary">
+ <?php if($_review->getSum()): ?>
+ <div class="rating">
+ <span style="width:<?php echo ( $_review->getSum() / $_review->getCount() ) ?>%;"></span>
+ </div>
+ <?php endif; ?>
+ </td>
+ <td class="col description">
+ <?php echo $this->helper('Magento\Review\Helper\Data')->getDetailHtml($_review->getDetail()) ?>
+ </td>
+ <td class="col actions">
+ <a href="<?php echo $this->getReviewLink() ?>id/<?php echo $_review->getReviewId() ?>" class="action more">
+ <span><?php echo __('View Details') ?></span>
+ </a>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ <div class="toolbar reviews bottom">
+ <?php echo $this->getToolbarHtml() ?>
+ </div>
<?php else: ?>
- <p><?php echo __('You have submitted no reviews.') ?></p>
+ <p class="empty"><?php echo __('You have submitted no reviews.') ?></p>
<?php endif; ?>
-<div class="buttons-set">
- <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>« </small><?php echo __('Back') ?></a></p>
+<div class="actions">
+ <div class="secondary">
+ <a class="action back" href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>">
+ <span><?php echo __('Back') ?></span>
+ </a>
+ </div>
</div>
diff --git a/app/code/Magento/Review/view/frontend/customer/recent.phtml b/app/code/Magento/Review/view/frontend/customer/recent.phtml
index 89d647e1389..3b25d298b0e 100644
--- a/app/code/Magento/Review/view/frontend/customer/recent.phtml
+++ b/app/code/Magento/Review/view/frontend/customer/recent.phtml
@@ -19,36 +19,32 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php if( $this->getCollection() && $this->count()): ?>
-<div class="box-account box-reviews">
- <div class="box-head">
- <h2><?php echo __('My Recent Reviews') ?></h2>
- <a href="<?php echo $this->getAllReviewsUrl() ?>"><?php echo __('View All Reviews') ?></a>
+<div class="block reviews dashboard">
+ <div class="title">
+ <strong><?php echo __('My Recent Reviews') ?></strong>
+ <a class="action view" href="<?php echo $this->getAllReviewsUrl() ?>"><span><?php echo __('View All Reviews') ?></span></a>
</div>
- <ol id="my_recent_reviews">
- <?php $iterator = 0 ?>
- <?php foreach ($this->getCollection() as $_review): ?>
- <li class="item">
- <span class="number"><?php echo ++$iterator ?></span>
- <div class="details">
- <h3 class="product-name"><a href="<?php echo $this->getReviewUrl($_review->getReviewId()) ?>"><?php echo $this->escapeHtml($_review->getName()) ?></a></h3>
+ <div class="content">
+ <ol class="items">
+ <?php foreach ($this->getCollection() as $_review): ?>
+ <li class="item">
+ <strong class="product name"><a href="<?php echo $this->getReviewUrl($_review->getReviewId()) ?>"><?php echo $this->escapeHtml($_review->getName()) ?></a></strong>
<?php if($_review->getSum()): ?>
- <div class="ratings">
- <strong><?php echo __('Rating:') ?></strong>
- <div class="rating-box">
- <div class="rating" style="width:<?php echo ( $_review->getSum() / $_review->getCount() ) ?>%;"></div>
- </div>
+ <?php $rating = $_review->getSum() / $_review->getCount() ?>
+ <div class="rating" title="<?php echo $rating; ?>%">
+ <span style="width:<?php echo $rating; ?>%">
+ <?php echo $rating; ?>
+ </span>
</div>
<?php endif; ?>
- </div>
- </li>
- <?php endforeach; ?>
- </ol>
- <script type="text/javascript">(function($) {$('#my_recent_reviews').decorate('list')})(jQuery)</script>
+ </li>
+ <?php endforeach; ?>
+ </ol>
+ </div>
</div>
<?php endif; ?>
diff --git a/app/code/Magento/Review/view/frontend/customer/view.phtml b/app/code/Magento/Review/view/frontend/customer/view.phtml
index fb5ff833437..9de45828993 100644
--- a/app/code/Magento/Review/view/frontend/customer/view.phtml
+++ b/app/code/Magento/Review/view/frontend/customer/view.phtml
@@ -19,57 +19,60 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php if($this->getProductData()->getId()): ?>
-<div class="product-review">
- <div class="page-title">
- <h1><?php echo __('Review Details') ?></h1>
- </div>
- <div class="product-img-box">
- <a href="<?php echo $this->getProductData()->getProductUrl() ?>" title="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" class="product-image"><img src="<?php echo $this->getSmallImageUrl($this->getProductData()); ?>" width="125" height="125" alt="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" /></a>
+<?php $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image'); ?>
+<div class="customer review view">
+ <h2 class="product name"><?php echo $this->escapeHtml($this->getProductData()->getName()) ?></h2>
+ <div class="product details">
+ <a class="product photo" href="<?php echo $this->getProductData()->getProductUrl() ?>">
+ <?php /* customer_account_product_review_page */ ?>
+ <?php echo $imageBlock->init($this->getProductData(), 'customer_account_product_review_page')->toHtml() ?>
+ </a>
<?php if( $this->getRating() && $this->getRating()->getSize()): ?>
- <p class="label"><?php echo __('Average Customer Rating:') ?></p>
- <?php echo $this->getReviewsSummaryHtml($this->getProductData()) ?>
+ <p><?php echo __('Average Customer Rating:') ?></p>
+ <?php echo $this->getReviewsSummaryHtml($this->getProductData()) ?>
<?php endif; ?>
</div>
- <div class="product-details">
- <h2 class="product-name"><?php echo $this->escapeHtml($this->getProductData()->getName()) ?></h2>
+ <div class="review details">
+
<?php if( $this->getRating() && $this->getRating()->getSize()): ?>
- <h3><?php echo ($this->isReviewOwner()) ? __('Your Rating:') : __('Rating:'); ?></h3>
- <table class="ratings-table">
- <?php foreach ($this->getRating() as $_rating): ?>
- <?php if($_rating->getPercent()): ?>
- <tr>
- <th><?php echo $this->escapeHtml($_rating->getRatingCode()) ?></th>
- <td>
- <div class="rating-box">
- <div class="rating" style="width:<?php echo ceil($_rating->getPercent()) ?>%;"></div>
+ <div class="ratings summary">
+ <strong><?php echo ($this->isReviewOwner()) ? __('Your Rating:') : __('Rating:'); ?></strong>
+
+ <?php foreach ($this->getRating() as $_rating): ?>
+ <?php if($_rating->getPercent()): ?>
+ <?php $rating = ceil($_rating->getPercent()) ?>
+ <div class="reviews summary item">
+ <div class="label"><?php echo $this->escapeHtml($_rating->getRatingCode()) ?></div>
+ <div class="rating" title="<?php echo $rating; ?>%">
+ <span style="width:<?php echo $rating; ?>%">
+ <?php echo $rating; ?>
+ </span>
</div>
- </td>
- </tr>
- <?php endif; ?>
- <?php endforeach; ?>
- </table>
+ </div>
+ <?php endif; ?>
+ <?php endforeach; ?>
+ </div>
<?php endif; ?>
- <dl>
- <dt>
- <?php if ($this->isReviewOwner()): ?>
- <?php echo __('Your Review (submitted on %1):', $this->dateFormat($this->getReviewData()->getCreatedAt())) ?>
- <?php else :?>
- <?php echo __('Review (submitted on %1):', $this->dateFormat($this->getReviewData()->getCreatedAt())) ?>
- <?php endif;?>
- </dt>
- <dd>
- <?php echo nl2br($this->escapeHtml($this->getReviewData()->getDetail())) ?>
- </dd>
- </dl>
+
+ <div class="review title"><?php echo $this->escapeHtml($this->getReviewData()->getTitle()) ?></div>
+ <p class="review date">
+ <?php if ($this->isReviewOwner()): ?>
+ <?php echo __('Your Review (submitted on %1):', '<time class="date">' . $this->dateFormat($this->getReviewData()->getCreatedAt()) . '</time>') ?>
+ <?php else :?>
+ <?php echo __('Review (submitted on %1):', '<time class="date">' . $this->dateFormat($this->getReviewData()->getCreatedAt()) . '</time>') ?>
+ <?php endif;?>
+ </p>
+ <div class="review content"><?php echo nl2br($this->escapeHtml($this->getReviewData()->getDetail())) ?></div>
</div>
- <div class="buttons-set">
- <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo __('Back to My Reviews') ?></a></p>
+</div>
+<div class="actions">
+ <div class="secondary">
+ <a class="action back" href="<?php echo $this->getBackUrl() ?>"><span><?php echo __('Back to My Reviews') ?></span></a>
</div>
</div>
<?php endif; ?>
diff --git a/app/code/Magento/Review/view/frontend/form.phtml b/app/code/Magento/Review/view/frontend/form.phtml
index b100e03a94c..16724df55f4 100644
--- a/app/code/Magento/Review/view/frontend/form.phtml
+++ b/app/code/Magento/Review/view/frontend/form.phtml
@@ -19,100 +19,92 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<div class="form-add">
- <h2><?php echo __('Write Your Own Review') ?></h2>
- <?php if ($this->getAllowWriteReviewFlag()): ?>
- <form action="<?php echo $this->getAction() ?>" method="post" id="review-form">
- <fieldset>
- <?php echo $this->getChildHtml('form_fields_before')?>
- <h3><?php echo __("You're reviewing:"); ?> <span><?php echo $this->escapeHtml($this->getProductInfo()->getName()) ?></span></h3>
- <?php if( $this->getRatings() && $this->getRatings()->getSize()): ?>
- <h4><?php echo __('How do you rate this product?') ?> <em class="required">*</em></h4>
- <span id="input-message-box"></span>
- <table class="data-table" id="product-review-table">
- <col />
- <col width="1" />
- <col width="1" />
- <col width="1" />
- <col width="1" />
- <col width="1" />
- <thead>
- <tr>
- <th> </th>
- <th><span class="nobr"><?php echo __('1 star') ?></span></th>
- <th><span class="nobr"><?php echo __('2 stars') ?></span></th>
- <th><span class="nobr"><?php echo __('3 stars') ?></span></th>
- <th><span class="nobr"><?php echo __('4 stars') ?></span></th>
- <th><span class="nobr"><?php echo __('5 stars') ?></span></th>
- </tr>
- </thead>
- <tbody>
+<div class="block add review">
+ <div class="title"><strong><?php echo __('Write Your Own Review') ?></strong></div>
+<div class="content">
+<?php if ($this->getAllowWriteReviewFlag()): ?>
+<form action="<?php echo $this->getAction() ?>" method="post" id="review-form">
+ <?php echo $this->getChildHtml('form_fields_before')?>
+ <fieldset class="fieldset" data-hasrequired="<?php __('* Required Fields'); ?>">
+ <legend class="legend"><span><?php echo __("You're reviewing:"); ?></span><strong><?php echo $this->escapeHtml($this->getProductInfo()->getName()) ?></strong></legend><br />
+ <?php if ($this->getRatings() && $this->getRatings()->getSize()): ?>
+ <span id="input-message-box"></span>
+ <div class="field ratings required">
+ <label class="label"><span><?php echo __('How do you rate this product?') ?></span></label>
+ <div class="control">
+ <div class="nested" id="product-review-table">
<?php foreach ($this->getRatings() as $_rating): ?>
- <tr>
- <th><?php echo $this->escapeHtml($_rating->getRatingCode()) ?></th>
- <?php foreach ($_rating->getOptions() as $_option): ?>
- <td class="value"><input type="radio" name="ratings[<?php echo $_rating->getId() ?>]" id="<?php echo $this->escapeHtml($_rating->getRatingCode()) ?>_<?php echo $_option->getValue() ?>" value="<?php echo $_option->getId() ?>" class="radio" data-validate="{required:true, messages:{required:'Please select one of each of the ratings above.'}}" /></td>
- <?php endforeach; ?>
- </tr>
+ <div class="field rating">
+ <label class="label"><span><?php echo $this->escapeHtml($_rating->getRatingCode()) ?></span></label>
+ <div class="control">
+ <?php $options = $_rating->getOptions();?>
+ <?php $iterator = 1; foreach ($options as $_option): ?>
+ <input type="radio" name="ratings[<?php echo $_rating->getId() ?>]" id="<?php echo $this->escapeHtml($_rating->getRatingCode()) ?>_<?php echo $_option->getValue() ?>" value="<?php echo $_option->getId() ?>" class="radio" data-validate="{required:true, messages:{required:'Please select one of each of the ratings above.'}}" />
+ <label class="rating-<?php echo $iterator; ?>" for="<?php echo $this->escapeHtml($_rating->getRatingCode()) ?>_<?php echo $_option->getValue() ?>" title="<?php echo __('%1 %2', $iterator, $iterator > 1 ? 'stars' : 'star') ?>">
+ <span><?php echo __('%1 %2', $iterator, $iterator > 1 ? 'stars' : 'star') ?></span>
+ </label>
+ <?php $iterator++; ?>
+ <?php endforeach; ?>
+ </div>
+ </div>
<?php endforeach; ?>
- </tbody>
- </table>
+ </div>
<input type="hidden" name="validate_rating" class="validate-rating" value="" />
- <script type="text/javascript">(function($) {$('#product-review-table').decorate('table')})(jQuery)</script>
- <?php endif; ?>
- <ul class="form-list">
- <li>
- <label for="nickname_field" class="required"><em>*</em><?php echo __('Nickname') ?></label>
- <div class="input-box">
- <input type="text" name="nickname" id="nickname_field" class="input-text" data-validate="{required:true}" value="<?php echo $this->escapeHtml($data->getNickname()) ?>" />
- </div>
- </li>
- <li>
- <label for="summary_field" class="required"><em>*</em><?php echo __('Summary of Your Review') ?></label>
- <div class="input-box">
- <input type="text" name="title" id="summary_field" class="input-text" data-validate="{required:true}" value="<?php echo $this->escapeHtml($data->getTitle()) ?>" />
- </div>
- </li>
- <li>
- <label for="review_field" class="required"><em>*</em><?php echo __('Review') ?></label>
- <div class="input-box">
- <textarea name="detail" id="review_field" cols="5" rows="3" data-validate="{required:true}"><?php echo $this->escapeHtml($data->getDetail()) ?></textarea>
- </div>
- </li>
- </ul>
- </fieldset>
- <div class="buttons-set">
- <button type="submit" title="<?php echo __('Submit Review') ?>" class="button"><span><span><?php echo __('Submit Review') ?></span></span></button>
</div>
- </form>
- <script>
- (function($) {
- head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
- "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
- "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
- "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
- function() {
- $('#review-form').validation({
- errorPlacement: function (error, element) {
- if (element.parents('#product-review-table').length) {
- $('#product-review-table').siblings(this.errorElement + '.' + this.errorClass).remove();
- $('#product-review-table').after(error);
- } else {
- element.after(error);
- }
+ </div>
+ <?php endif ?>
+ <div class="field nickname required">
+ <label for="nickname_field" class="label"><span><?php echo __('Nickname') ?></span></label>
+ <div class="control">
+ <input type="text" name="nickname" id="nickname_field" class="input-text" data-validate="{required:true}" value="<?php echo $this->escapeHtml($data->getNickname()) ?>" />
+ </div>
+ </div>
+ <div class="field summary required">
+ <label for="summary_field" class="label"><span><?php echo __('Summary of Your Review') ?></span></label>
+ <div class="control">
+ <input type="text" name="title" id="summary_field" class="input-text" data-validate="{required:true}" value="<?php echo $this->escapeHtml($data->getTitle()) ?>" />
+ </div>
+ </div>
+ <div class="field text required">
+ <label for="review_field" class="label"><span><?php echo __('Review') ?></span></label>
+ <div class="control">
+ <textarea name="detail" id="review_field" cols="5" rows="3" data-validate="{required:true}"><?php echo $this->escapeHtml($data->getDetail()) ?></textarea>
+ </div>
+ </div>
+ </fieldset>
+ <div class="actions form">
+ <button type="submit" class="action submit"><span><?php echo __('Submit Review') ?></span></button>
+ <!-- <button type="button" class="action cancel"><span><?php echo __('Cancel') ?></span></button> -->
+ </div>
+</form>
+<script>
+ (function($) {
+ head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
+ "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
+ "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
+ "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
+ function() {
+ $('#review-form').validation({
+ errorPlacement: function (error, element) {
+ if (element.parents('#product-review-table').length) {
+ $('#product-review-table').siblings(this.errorElement + '.' + this.errorClass).remove();
+ $('#product-review-table').after(error);
+ } else {
+ element.after(error);
}
- });
+ }
});
- })(jQuery);
- </script>
- <?php else: ?>
- <p class="review-nologged" id="review-form">
- <?php echo __('Only registered users can write reviews. Please, <a href="%1">log in</a> or <a href="%2">sign up</a>.', $this->getLoginLink(), $this->helper('Magento\Customer\Helper\Data')->getRegisterUrl()) ?>
+ });
+ })(jQuery);
+</script>
+<?php else: ?>
+ <p class="review notlogged" id="review-form">
+ <?php echo __('Only registered users can write reviews. Please, <a href="%1">log in</a> or <a href="%2">register</a>', $this->getLoginLink(), $this->helper('Magento\Customer\Helper\Data')->getRegisterUrl()) ?>
</p>
- <?php endif ?>
+<?php endif ?>
+</div>
</div>
diff --git a/app/code/Magento/Review/view/frontend/helper/summary.phtml b/app/code/Magento/Review/view/frontend/helper/summary.phtml
index 8df9aa10d6e..188e339d57e 100644
--- a/app/code/Magento/Review/view/frontend/helper/summary.phtml
+++ b/app/code/Magento/Review/view/frontend/helper/summary.phtml
@@ -19,24 +19,47 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
+<?php $url = $this->getReviewsUrl(); ?>
+<?php $urlForm = $this->getReviewsUrl() . '#review-form'; ?>
+<?php //$url = $this->getProduct()->getProductUrl() . '#info-product_reviews' ?>
+<?php //$urlForm = $this->getProduct()->getProductUrl() . '#info-product_reviews' ?>
<?php if ($this->getReviewsCount()): ?>
- <div class="ratings">
- <?php if ($this->getRatingSummary()):?>
- <div class="rating-box">
- <div class="rating" style="width:<?php echo $this->getRatingSummary() ?>%"></div>
- </div>
- <?php endif;?>
- <p class="rating-links">
- <a href="<?php echo $this->getReviewsUrl() ?>"><?php echo __('%1 Review(s)', $this->getReviewsCount()) ?></a>
- <span class="separator">|</span>
- <a href="<?php echo $this->getReviewsUrl() ?>#review-form"><?php echo __('Add Your Review') ?></a>
- </p>
+<?php $rating = $this->getRatingSummary(); ?>
+<div class="product reviews summary<?php echo !$rating ? ' no-rating' :''?>">
+ <?php if ($rating):?>
+ <div class="rating" title="<?php echo $rating; ?>%">
+ <span style="width:<?php echo $rating; ?>%">
+ <?php echo $rating; ?>
+ </span>
</div>
+ <?php endif;?>
+ <div class="reviews actions">
+ <a class="action view" href="<?php echo $url ?>"><?php echo $this->getReviewsCount() ?><span><?php echo __('Review(s)') ?></span></a>
+ <a class="action add" href="<?php echo $urlForm ?>"><?php echo __('Add Your Review') ?></a>
+ </div>
+</div>
<?php elseif ($this->getDisplayIfEmpty()): ?>
- <p class="no-rating"><a href="<?php echo $this->getReviewsUrl() ?>#review-form"><?php echo __('Be the first to review this product') ?></a></p>
+<div class="product reviews summary empty">
+ <a class="action add" href="<?php echo $urlForm; ?>">
+ <?php echo __('Be the first to review this product') ?>
+ </a>
+</div>
<?php endif; ?>
+<script type="text/javascript">
+ (function($) {
+ $(document).ready(function() {
+ $('.reviews.summary .action').click(function(evt){
+ if($('#product_reviews').length > 0) {
+ evt.preventDefault();
+ $('[data-sections]').terms({start:'product_reviews'});
+ } else {
+ return
+ }
+ })
+ });
+ })(jQuery);
+</script>
\ No newline at end of file
diff --git a/app/code/Magento/Review/view/frontend/helper/summary_short.phtml b/app/code/Magento/Review/view/frontend/helper/summary_short.phtml
index 9c36b10f00f..c264072ecb4 100644
--- a/app/code/Magento/Review/view/frontend/helper/summary_short.phtml
+++ b/app/code/Magento/Review/view/frontend/helper/summary_short.phtml
@@ -19,20 +19,46 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
+<?php $url = $this->getReviewsUrl(); ?>
+<?php $urlForm = $this->getReviewsUrl() . '#review-form'; ?>
+<?php //$url = $this->getProduct()->getProductUrl() . '#info-product_reviews' ?>
+<?php //$urlForm = $this->getProduct()->getProductUrl() . '#info-product_reviews' ?>
<?php if ($this->getReviewsCount()): ?>
- <div class="ratings">
- <?php if ($this->getRatingSummary()):?>
- <div class="rating-box">
- <div class="rating" style="width:<?php echo $this->getRatingSummary() ?>%"></div>
- </div>
- <?php endif;?>
- <span class="amount"><a href="#" onclick="var t = opener ? opener.window : window; t.location.href='<?php echo $this->getReviewsUrl() ?>'; return false;"><?php echo __('%1 Review(s)', $this->getReviewsCount()) ?></a></span>
+<?php $rating = $this->getRatingSummary(); ?>
+<div class="product reviews summary short<?php echo !$rating ? ' no-rating' :''?>">
+ <?php if ($rating):?>
+ <div class="rating" title="<?php echo $rating; ?>%">
+ <span style="width:<?php echo $rating; ?>%">
+ <?php echo $rating; ?>
+ </span>
</div>
+ <?php endif;?>
+ <div class="reviews actions">
+ <a class="action view" href="<?php echo $urlForm ?>"><?php echo $this->getReviewsCount() ?><span><?php echo __('Review(s)') ?></span></a>
+ </div>
+</div>
<?php elseif ($this->getDisplayIfEmpty()): ?>
- <p class="no-rating"><a href="<?php echo $this->getReviewsUrl() ?>#review-form"><?php echo __('Be the first to review this product') ?></a></p>
+<div class="product reviews summary short empty">
+ <a class="action add" href="<?php echo $urlForm; ?>">
+ <?php echo __('Be the first to review this product') ?>
+ </a>
+</div>
<?php endif; ?>
+<script type="text/javascript">
+ (function($) {
+ $(document).ready(function() {
+ $('.reviews.summary .action').click(function(evt){
+ if($('#product_reviews').length > 0) {
+ evt.preventDefault();
+ $('[data-sections]').terms({start:'product_reviews'});
+ } else {
+ return
+ }
+ })
+ });
+ })(jQuery);
+</script>
diff --git a/app/code/Magento/Review/view/frontend/layout/customer_account_index.xml b/app/code/Magento/Review/view/frontend/layout/customer_account_index.xml
index afb6111eeee..8df4eb25e23 100644
--- a/app/code/Magento/Review/view/frontend/layout/customer_account_index.xml
+++ b/app/code/Magento/Review/view/frontend/layout/customer_account_index.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="customer_account_dashboard">
- <block class="Magento\Review\Block\Customer\Recent" name="customer_account_dashboard_info1" as="info1" template="customer/recent.phtml"/>
+ <referenceBlock name="my.account.wrapper">
+ <block class="Magento\Review\Block\Customer\Recent" name="customer_account_dashboard_info1" template="customer/recent.phtml" after="customer_account_dashboard_address"/>
</referenceBlock>
</layout>
diff --git a/app/code/Magento/Review/view/frontend/layout/review_customer_index.xml b/app/code/Magento/Review/view/frontend/layout/review_customer_index.xml
index 83355bf1fbb..93c414fd9df 100644
--- a/app/code/Magento/Review/view/frontend/layout/review_customer_index.xml
+++ b/app/code/Magento/Review/view/frontend/layout/review_customer_index.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Product Reviews" type="page" parent="customer_account_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Product Reviews" type="page">
<update handle="customer_account"/>
<referenceContainer name="my.account.wrapper">
<block class="Magento\Review\Block\Customer\ListCustomer" name="review_customer_list" template="customer/list.phtml"/>
diff --git a/app/code/Magento/Review/view/frontend/layout/review_customer_view.xml b/app/code/Magento/Review/view/frontend/layout/review_customer_view.xml
index 9cd26a3391e..fa0935bb3e2 100644
--- a/app/code/Magento/Review/view/frontend/layout/review_customer_view.xml
+++ b/app/code/Magento/Review/view/frontend/layout/review_customer_view.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Review Details" type="page" parent="review_customer_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Review Details" type="page">
<update handle="customer_account"/>
<referenceContainer name="my.account.wrapper">
<block class="Magento\Review\Block\Customer\View" name="customers_review"/>
diff --git a/app/code/Magento/Review/view/frontend/layout/review_product_list.xml b/app/code/Magento/Review/view/frontend/layout/review_product_list.xml
index 5a266febd3a..a8d3ceb6279 100644
--- a/app/code/Magento/Review/view/frontend/layout/review_product_list.xml
+++ b/app/code/Magento/Review/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product Reviews List" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product Reviews List" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">2columns-right.phtml</argument>
diff --git a/app/code/Magento/Review/view/frontend/layout/review_product_view.xml b/app/code/Magento/Review/view/frontend/layout/review_product_view.xml
index fc9a2028e47..ec04beb4727 100644
--- a/app/code/Magento/Review/view/frontend/layout/review_product_view.xml
+++ b/app/code/Magento/Review/view/frontend/layout/review_product_view.xml
@@ -23,10 +23,10 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product Review View" type="page" parent="review_product_list">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product Review View" type="page">
<referenceBlock name="root">
<action method="setTemplate">
- <argument name="template" xsi:type="string">2columns-right.phtml</argument>
+ <argument name="template" xsi:type="string">1column.phtml</argument>
</action>
</referenceBlock>
<referenceContainer name="content">
diff --git a/app/code/Magento/Review/view/frontend/product/view/list.phtml b/app/code/Magento/Review/view/frontend/product/view/list.phtml
index dda634ca062..430edf986c0 100644
--- a/app/code/Magento/Review/view/frontend/product/view/list.phtml
+++ b/app/code/Magento/Review/view/frontend/product/view/list.phtml
@@ -19,48 +19,53 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php $_items = $this->getReviewsCollection()->getItems();?>
-<div class="box-collateral box-reviews" id="customer-reviews">
- <?php if (count($_items)):?>
- <h2><?php echo __('Customer Reviews') ?></h2>
- <?php echo $this->getChildHtml('toolbar') ?>
- <dl>
- <?php foreach ($_items as $_review):?>
- <dt>
- <a href="<?php echo $this->getReviewUrl($_review->getId()) ?>"><?php echo $this->escapeHtml($_review->getTitle()) ?></a> <?php echo __('Review by <span>%1</span>', $this->escapeHtml($_review->getNickname())) ?>
- </dt>
- <dd>
- <?php $_votes = $_review->getRatingVotes(); ?>
- <?php if (count($_votes)): ?>
- <table class="ratings-table">
- <col width="1" />
- <col />
- <tbody>
- <?php foreach ($_votes as $_vote): ?>
- <tr>
- <th><?php echo $this->escapeHtml($_vote->getRatingCode()) ?></th>
- <td>
- <div class="rating-box">
- <div class="rating" style="width:<?php echo $_vote->getPercent() ?>%;"></div>
- </div>
- </td>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
- <?php endif; ?>
+<?php
+ $_items = $this->getReviewsCollection()->getItems();
+ $format = $this->getDateFormat() ?: 'short';
+?>
+<?php if (count($_items)):?>
+<div class="block reviews list" id="customer-reviews">
+ <div class="title">
+ <strong><?php echo __('Customer Reviews') ?></strong>
+ </div>
+ <div class="content">
+ <?php echo $this->getChildHtml('toolbar') ?>
+ <ol class="reviews items">
+ <?php foreach ($_items as $_review):?>
+ <li class="item review">
+ <div class="reviews summary">
+ <?php foreach ($_review->getRatingVotes() as $_vote): ?>
+ <span class="label"><?php echo $this->escapeHtml($_vote->getRatingCode()) ?></span>
+ <div class="rating" title="<?php echo $_vote->getPercent() ?>%">
+ <span style="width:<?php echo $_vote->getPercent() ?>%">
+ <?php echo $_vote->getPercent() ?>
+ </span>
+ </div>
+ <?php endforeach; ?>
+ </div>
+ <div class="review details">
+ <p class="author">
+ <span><?php echo __('Review by')?></span>
+ <strong class="nickname"><?php echo $this->escapeHtml($_review->getNickname()) ?></strong>
+ </p>
+ <p class="review date">
+ <span><?php echo __('Posted on') ?></span>
+ <time class="date"><?php echo $this->formatDate($_review->getCreatedAt(), $format) ?></time>
+ </p>
+ </div>
+ <div class="review title"><?php echo $this->escapeHtml($_review->getTitle()) ?></div>
+ <div class="review content">
<?php echo nl2br($this->escapeHtml($_review->getDetail())) ?>
- <small class="date"><?php echo __('(Posted on %1)', $this->formatDate($_review->getCreatedAt())) ?></small>
- </dd>
- <?php endforeach; ?>
- </dl>
- <?php echo $this->getChildHtml('toolbar') ?>
- <?php endif;?>
- <?php echo $this->getChildHtml('review_form') ?>
+ </div>
+ </li>
+ <?php endforeach; ?>
+ </ol>
+ <?php echo $this->getChildHtml('toolbar') ?>
+ </div>
</div>
+<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_Review/redirect.phtml b/app/code/Magento/Review/view/frontend/redirect.phtml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Review/redirect.phtml
rename to app/code/Magento/Review/view/frontend/redirect.phtml
diff --git a/app/code/Magento/Review/view/frontend/view.phtml b/app/code/Magento/Review/view/frontend/view.phtml
index 01fa89847fe..e75d946912a 100644
--- a/app/code/Magento/Review/view/frontend/view.phtml
+++ b/app/code/Magento/Review/view/frontend/view.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -30,40 +29,33 @@
<h1><?php echo __('Review Details') ?></h1>
</div>
<div class="product-img-box">
- <a href="<?php echo $this->getProductData()->getProductUrl() ?>" title="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" class="product-image"><img src="<?php echo $this->getSmallImageUrl($this->getProductData()); ?>" height="125" width="125" alt="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" /></a>
+ <a href="<?php echo $this->getProductData()->getProductUrl() ?>"><img src="<?php echo $this->getBaseImageUrl($this->getProductData()); ?>" height="<?php echo $this->getBaseImageSize()?>" width="<?php echo $this->getBaseImageSize()?>" alt="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" class="product-image" /></a>
<?php if( $this->getRating() && $this->getRating()->getSize()): ?>
- <p class="label"><?php echo __('Average Customer Rating') ?>:</p>
- <?php echo $this->getReviewsSummaryHtml($this->getProductData()) ?>
+ <p><?php echo __('Average Customer Rating') ?>:</p>
+ <?php echo $this->getReviewsSummaryHtml($this->getProductData()) ?>
<?php endif; ?>
</div>
- <div class="product-details">
- <h2 class="product-name"><?php echo $this->escapeHtml($this->getProductData()->getName()) ?></h2>
+ <div class="details">
+ <h3 class="product-name"><?php echo $this->escapeHtml($this->getProductData()->getName()) ?></h3>
<?php if( $this->getRating() && $this->getRating()->getSize()): ?>
- <h3><?php echo __('Product Rating:') ?></h3>
- <table class="ratings-table">
+ <h4><?php echo __('Product Rating:') ?></h4>
+
+ <table class="data-table review-summary-table">
<?php foreach ($this->getRating() as $_rating): ?>
- <?php if($_rating->getPercent()): ?>
- <tr>
- <th><?php echo __($this->escapeHtml($_rating->getRatingCode())) ?></th>
- <td>
- <div class="rating-box">
- <div class="rating" style="width:<?php echo ceil($_rating->getPercent()) ?>%;"></div>
- </div>
- </td>
- </tr>
- <?php endif; ?>
+ <?php if($_rating->getPercent()): ?>
+ <tr>
+ <td class="label"><?php echo __($this->escapeHtml($_rating->getRatingCode())) ?></td>
+ <td class="value">
+ <div class="rating-box">
+ <div class="rating" style="width:<?php echo ceil($_rating->getPercent()) ?>%;"></div>
+ </div></td>
+ </tr>
+ <?php endif; ?>
<?php endforeach; ?>
</table>
- </dl>
<?php endif; ?>
- <dl>
- <dt>
- <?php echo __('Product Review (submitted on %1):', $this->dateFormat($this->getReviewData()->getCreatedAt())) ?>
- </dt>
- <dd>
- <?php echo nl2br($this->escapeHtml($this->getReviewData()->getDetail())) ?>
- </dd>
- </dl>
+ <p class="date"><?php echo __('Product Review (submitted on %1):', $this->dateFormat($this->getReviewData()->getCreatedAt())) ?></p>
+ <p><?php echo nl2br($this->escapeHtml($this->getReviewData()->getDetail())) ?></p>
</div>
<div class="buttons-set">
<p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo __('Back to Product Reviews') ?></a></p>
diff --git a/app/code/Magento/Rss/Block/Catalog/NotifyStock.php b/app/code/Magento/Rss/Block/Catalog/NotifyStock.php
index 46f65668f71..eb89ad8bbe8 100644
--- a/app/code/Magento/Rss/Block/Catalog/NotifyStock.php
+++ b/app/code/Magento/Rss/Block/Catalog/NotifyStock.php
@@ -167,7 +167,7 @@ class NotifyStock extends \Magento\Core\Block\AbstractBlock
/* @var $product \Magento\Catalog\Model\Product */
$product = $args['product'];
$product->setData($args['row']);
- $url = $this->_adminhtmlData->getUrl('adminhtml/catalog_product/edit/',
+ $url = $this->_adminhtmlData->getUrl('catalog/product/edit/',
array('id' => $product->getId(), '_secure' => true, '_nosecret' => true));
$qty = 1 * $product->getQty();
$description = __('%1 has reached a quantity of %2.', $product->getName(), $qty);
diff --git a/app/code/Magento/Rss/Block/Catalog/Review.php b/app/code/Magento/Rss/Block/Catalog/Review.php
index f74fbb72d45..34270e271c8 100644
--- a/app/code/Magento/Rss/Block/Catalog/Review.php
+++ b/app/code/Magento/Rss/Block/Catalog/Review.php
@@ -146,7 +146,7 @@ class Review extends \Magento\Core\Block\AbstractBlock
$store = $this->_storeManager->getStore($row['store_id']);
$productUrl = $store->getUrl('catalog/product/view', array('id' => $row['entity_id']));
$reviewUrl = $this->_adminhtmlData->getUrl(
- 'adminhtml/catalog_product_review/edit/',
+ 'catalog/product_review/edit/',
array('id' => $row['review_id'], '_secure' => true, '_nosecret' => true)
);
$storeName = $store->getName();
diff --git a/app/code/Magento/Rss/Block/Order/NewOrder.php b/app/code/Magento/Rss/Block/Order/NewOrder.php
index 303a7d1e6ea..de10f9deb93 100644
--- a/app/code/Magento/Rss/Block/Order/NewOrder.php
+++ b/app/code/Magento/Rss/Block/Order/NewOrder.php
@@ -122,7 +122,7 @@ class NewOrder extends \Magento\Core\Block\AbstractBlock
if ($order && $order->getId()) {
$title = __('Order #%1 created at %2', $order->getIncrementId(), $this->formatDate($order->getCreatedAt()));
$url = $this->_adminhtmlData->getUrl(
- 'adminhtml/sales_order/view',
+ 'sales/order/view',
array(
'_secure' => true,
'order_id' => $order->getId(),
diff --git a/app/code/Magento/Rss/view/frontend/category/link.phtml b/app/code/Magento/Rss/view/frontend/category/link.phtml
new file mode 100644
index 00000000000..baaf3135059
--- /dev/null
+++ b/app/code/Magento/Rss/view/frontend/category/link.phtml
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php if($this->isRssCatalogEnable() && $this->isTopCategory()): ?>
+ <a href="<?php echo $this->getRssLink() ?>" class="action link rss"><span><?php echo __('Subscribe to RSS Feed') ?></span></a>
+<?php endif; ?>
diff --git a/app/code/Magento/Rss/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/Rss/view/frontend/layout/catalog_category_view.xml
new file mode 100644
index 00000000000..5118b46bfec
--- /dev/null
+++ b/app/code/Magento/Rss/view/frontend/layout/catalog_category_view.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceBlock name="page.main.title">
+ <block class="Magento\Catalog\Block\Category\View" name="rss.link" template="Magento_Rss::category/link.phtml"/>
+ </referenceBlock>
+</layout>
diff --git a/app/code/Magento/Rss/view/frontend/layout/rss_index_index.xml b/app/code/Magento/Rss/view/frontend/layout/rss_index_index.xml
index 9a5e7d62403..7102a6805b5 100644
--- a/app/code/Magento/Rss/view/frontend/layout/rss_index_index.xml
+++ b/app/code/Magento/Rss/view/frontend/layout/rss_index_index.xml
@@ -23,12 +23,17 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="RSS Feeds List" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="RSS Feeds List" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">2columns-right.phtml</argument>
</action>
</referenceBlock>
+ <referenceBlock name="page.main.title">
+ <action method="setPageTitle">
+ <argument name="title" translate="true" xsi:type="string">RSS Feeds</argument>
+ </action>
+ </referenceBlock>
<referenceContainer name="content">
<block class="Magento\Rss\Block\ListBlock" name="rss.list" template="list.phtml"/>
</referenceContainer>
diff --git a/app/code/Magento/Rss/view/frontend/list.phtml b/app/code/Magento/Rss/view/frontend/list.phtml
index 69eb0f01a0c..915977bc4b8 100644
--- a/app/code/Magento/Rss/view/frontend/list.phtml
+++ b/app/code/Magento/Rss/view/frontend/list.phtml
@@ -24,18 +24,13 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<div class="page-title rss-title">
- <h1><?php echo __('RSS Feeds') ?></h1>
-</div>
<?php
$_categories = $this->getRssCatalogFeeds();
$_misc = $this->getRssMiscFeeds();
?>
<?php if ($_categories || $_misc): ?>
<?php if($_misc): ?>
-<table class="data-table rss-table" id="rss-table-misc">
- <col />
- <col width="1" />
+<table class="data table rss">
<thead>
<tr>
<th colspan="2"><?php echo __('Miscellaneous Feeds') ?></th>
@@ -44,20 +39,15 @@
<tbody>
<?php foreach ($_misc as $_feed): ?>
<tr>
- <td><?php echo $_feed->getLabel() ?></td>
- <td><a href="<?php echo $_feed->getUrl() ?>" class="link-rss"><?php echo __('Get Feed'); ?></a></td>
+ <td class="col feed"><?php echo $_feed->getLabel() ?></td>
+ <td class="col action"><a href="<?php echo $_feed->getUrl() ?>" class="action get"><span><?php echo __('Get Feed'); ?></span></a></td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
<?php endif; ?>
-<?php if ($_categories && $_misc): ?>
-<br />
-<?php endif ?>
<?php if($_categories): ?>
-<table class="data-table rss-table" id="rss-table-category">
- <col />
- <col width="1" />
+<table class="data table category rss">
<thead>
<tr>
<th colspan="2"><?php echo __('Category Feeds') ?></th>
@@ -66,19 +56,13 @@
<tbody>
<?php foreach ($_categories as $_category): ?>
<tr>
- <td><?php echo $_category->getLabel() ?></td>
- <td><a href="<?php echo $_category->getUrl() ?>" class="link-rss"><?php echo __('Get Feed'); ?></a></td>
+ <td class="col feed"><?php echo $_category->getLabel() ?></td>
+ <td class="col action"><a href="<?php echo $_category->getUrl() ?>" class="action get"><span><?php echo __('Get Feed'); ?></span></a></td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
<?php endif; ?>
-<script type="text/javascript">
- (function($) {
- $('#rss-table-misc').decorate('table');
- $('#rss-table-category').decorate('table');
- })(jQuery);
-</script>
<?php else: ?>
<p><?php echo __('There are no Rss Feeds.'); ?></p>
<?php endif; ?>
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/Grid.php
index d4ebbdbce6f..7cae051afb9 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/Grid.php
@@ -96,7 +96,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
*/
public function getGridUrl()
{
- return $this->getUrl('*/sales_billing_agreement/grid', array('_current' => true));
+ return $this->getUrl('sales/billing_agreement/grid', array('_current' => true));
}
/**
@@ -107,7 +107,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
*/
public function getRowUrl($item)
{
- return $this->getUrl('*/sales_billing_agreement/view', array('agreement' => $item->getAgreementId()));
+ return $this->getUrl('sales/billing_agreement/view', array('agreement' => $item->getAgreementId()));
}
/**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/View.php b/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/View.php
index 0d0f050873c..29e0d142361 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/View.php
@@ -112,7 +112,7 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
*/
protected function _getCancelUrl()
{
- return $this->getUrl('*/*/cancel', array('agreement' => $this->_getBillingAgreement()->getAgreementId()));
+ return $this->getUrl('adminhtml/*/cancel', array('agreement' => $this->_getBillingAgreement()->getAgreementId()));
}
/**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php b/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php
index 46327258996..7638bd3efa6 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/View/Tab/Info.php
@@ -130,7 +130,7 @@ class Info extends \Magento\Backend\Block\Template
$this->setReferenceId($agreement->getReferenceId());
$customer = $this->_customerFactory->create()->load($agreement->getCustomerId());
$this->setCustomerUrl(
- $this->getUrl('*/customer/edit', array('id' => $customer->getId()))
+ $this->getUrl('adminhtml/customer/edit', array('id' => $customer->getId()))
);
$this->setCustomerEmail($customer->getEmail());
$this->setStatus($agreement->getStatusLabel());
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Creditmemo.php b/app/code/Magento/Sales/Block/Adminhtml/Creditmemo.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Sales/Creditmemo.php
rename to app/code/Magento/Sales/Block/Adminhtml/Creditmemo.php
index dbefaadd95a..46f75c7d50c 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Creditmemo.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Creditmemo.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,18 +28,19 @@
* Adminhtml sales creditmemos block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales;
+namespace Magento\Sales\Block\Adminhtml;
class Creditmemo extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
protected function _construct()
{
- $this->_controller = 'sales_creditmemo';
+ $this->_controller = 'adminhtml_creditmemo';
+ $this->_blockGroup = 'Magento_Sales';
$this->_headerText = __('Credit Memos');
parent::_construct();
$this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Creditmemo/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Creditmemo/Grid.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Sales/Creditmemo/Grid.php
rename to app/code/Magento/Sales/Block/Adminhtml/Creditmemo/Grid.php
index 4c0003d87f8..bb414e6450b 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Creditmemo/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Creditmemo/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,7 +29,7 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Creditmemo;
+namespace Magento\Sales\Block\Adminhtml\Creditmemo;
class Grid extends \Magento\Adminhtml\Block\Widget\Grid
{
@@ -149,7 +149,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
'actions' => array(
array(
'caption' => __('View'),
- 'url' => array('base'=>'*/sales_creditmemo/view'),
+ 'url' => array('base'=>'sales/creditmemo/view'),
'field' => 'creditmemo_id'
)
),
@@ -174,7 +174,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
$this->getMassactionBlock()->addItem('pdfcreditmemos_order', array(
'label'=> __('PDF Credit Memos'),
- 'url' => $this->getUrl('*/sales_creditmemo/pdfcreditmemos'),
+ 'url' => $this->getUrl('sales/creditmemo/pdfcreditmemos'),
));
return $this;
@@ -186,7 +186,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
return false;
}
- return $this->getUrl('*/sales_creditmemo/view',
+ return $this->getUrl('sales/creditmemo/view',
array(
'creditmemo_id'=> $row->getId(),
)
@@ -195,7 +195,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
public function getGridUrl()
{
- return $this->getUrl('*/*/*', array('_current' => true));
+ return $this->getUrl('sales/*/*', array('_current' => true));
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php b/app/code/Magento/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php
index ff55b19ad04..a91b35a808c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php
@@ -137,7 +137,7 @@ class Agreement
public function getGridUrl()
{
- return $this->getUrl('*/sales_billing_agreement/customerGrid', array('_current' => true));
+ return $this->getUrl('sales/billing_agreement/customerGrid', array('_current' => true));
}
/**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Customer/Edit/Tab/Recurring/Profile.php b/app/code/Magento/Sales/Block/Adminhtml/Customer/Edit/Tab/Recurring/Profile.php
index 86f80930e14..82100228ec1 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Customer/Edit/Tab/Recurring/Profile.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Customer/Edit/Tab/Recurring/Profile.php
@@ -161,6 +161,6 @@ class Profile
*/
public function getGridUrl()
{
- return $this->getUrl('*/sales_recurring_profile/customerGrid', array('_current' => true));
+ return $this->getUrl('sales/recurring_profile/customerGrid', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Invoice.php b/app/code/Magento/Sales/Block/Adminhtml/Invoice.php
similarity index 87%
rename from app/code/Magento/Adminhtml/Block/Sales/Invoice.php
rename to app/code/Magento/Sales/Block/Adminhtml/Invoice.php
index 0b910d952de..f62526dedeb 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Invoice.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Invoice.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,18 +28,19 @@
* Adminhtml sales invoices block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales;
+namespace Magento\Sales\Block\Adminhtml;
class Invoice extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
protected function _construct()
{
- $this->_controller = 'sales_invoice';
+ $this->_controller = 'adminhtml_invoice';
+ $this->_blockGroup = 'Magento_Sales';
$this->_headerText = __('Invoices');
parent::_construct();
$this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Invoice/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Invoice/Grid.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Sales/Invoice/Grid.php
rename to app/code/Magento/Sales/Block/Adminhtml/Invoice/Grid.php
index 6625a458c69..7e2e8e98456 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Invoice/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Invoice/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,7 +29,7 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Invoice;
+namespace Magento\Sales\Block\Adminhtml\Invoice;
class Grid extends \Magento\Adminhtml\Block\Widget\Grid
{
@@ -162,7 +162,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
'actions' => array(
array(
'caption' => __('View'),
- 'url' => array('base'=>'*/sales_invoice/view'),
+ 'url' => array('base'=>'sales/invoice/view'),
'field' => 'invoice_id'
)
),
@@ -187,7 +187,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
$this->getMassactionBlock()->addItem('pdfinvoices_order', array(
'label'=> __('PDF Invoices'),
- 'url' => $this->getUrl('*/sales_invoice/pdfinvoices'),
+ 'url' => $this->getUrl('sales/invoice/pdfinvoices'),
));
return $this;
@@ -199,7 +199,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
return false;
}
- return $this->getUrl('*/sales_invoice/view',
+ return $this->getUrl('sales/invoice/view',
array(
'invoice_id'=> $row->getId(),
)
@@ -208,7 +208,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
public function getGridUrl()
{
- return $this->getUrl('*/*/grid', array('_current' => true));
+ return $this->getUrl('sales/*/grid', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Items/AbstractItems.php b/app/code/Magento/Sales/Block/Adminhtml/Items/AbstractItems.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Sales/Items/AbstractItems.php
rename to app/code/Magento/Sales/Block/Adminhtml/Items/AbstractItems.php
index 2c924b57e1c..0f72f8e7233 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Items/AbstractItems.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/AbstractItems.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -27,7 +27,7 @@
/**
* Abstract items renderer
*/
-namespace Magento\Adminhtml\Block\Sales\Items;
+namespace Magento\Sales\Block\Adminhtml\Items;
class AbstractItems extends \Magento\Backend\Block\Template
{
@@ -85,35 +85,20 @@ class AbstractItems extends \Magento\Backend\Block\Template
}
/**
- * Init block
+ * Add column renderers
*
- */
- protected function _construct()
- {
- $this->addColumnRender('qty', 'Magento\Adminhtml\Block\Sales\Items\Column\Qty', 'sales/items/column/qty.phtml');
- $this->addColumnRender('name', 'Magento\Adminhtml\Block\Sales\Items\Column\Name', 'sales/items/column/name.phtml');
- parent::_construct();
- }
-
- /**
- * Add column renderer
- *
- * @param string $column
- * @param string $block
- * @param string $template
- * @param string|null $type
+ * @param array $blocks
* @return $this
*/
- public function addColumnRender($column, $block, $template, $type = null)
+ public function setColumnRenders(array $blocks)
{
- if (isset($type)) {
- $column .= '_' . $type;
+ foreach ($blocks as $blockName) {
+ $block = $this->getLayout()->getBlock($blockName);
+ if ($block->getRenderedBlock() === null) {
+ $block->setRenderedBlock($this);
+ }
+ $this->_columnRenders[$blockName] = $block;
}
- $this->_columnRenders[$column] = array(
- 'block' => $block,
- 'template' => $template,
- 'renderer' => null
- );
return $this;
}
@@ -126,17 +111,13 @@ class AbstractItems extends \Magento\Backend\Block\Template
*/
public function getItemRenderer($type)
{
+ /** @var $renderer \Magento\Sales\Block\Adminhtml\Items\AbstractItems */
$renderer = $this->getChildBlock($type) ?: $this->getChildBlock(self::DEFAULT_TYPE);
if (!$renderer instanceof \Magento\View\Element\BlockInterface) {
throw new \RuntimeException('Renderer for type "' . $type . '" does not exist.');
}
- foreach ($this->_columnRenders as $columnType => $columnRenderer) {
- $renderer->addColumnRender(
- $columnType,
- $columnRenderer['block'],
- $columnRenderer['template']
- );
- }
+ $renderer->setColumnRenders($this->getLayout()->getGroupChildNames($this->getNameInLayout(), 'column'));
+
return $renderer;
}
@@ -147,21 +128,16 @@ class AbstractItems extends \Magento\Backend\Block\Template
* @param string $compositePart
* @return \Magento\Core\Block\AbstractBlock
*/
- public function getColumnRenderer($column, $compositePart='')
+ public function getColumnRenderer($column, $compositePart = '')
{
+ $column = 'column_' . $column;
if (isset($this->_columnRenders[$column . '_' . $compositePart])) {
$column .= '_' . $compositePart;
}
if (!isset($this->_columnRenders[$column])) {
return false;
}
- if (is_null($this->_columnRenders[$column]['renderer'])) {
- $this->_columnRenders[$column]['renderer'] = $this->getLayout()
- ->createBlock($this->_columnRenders[$column]['block'])
- ->setTemplate($this->_columnRenders[$column]['template'])
- ->setRenderedBlock($this);
- }
- return $this->_columnRenders[$column]['renderer'];
+ return $this->_columnRenders[$column];
}
/**
@@ -239,6 +215,7 @@ class AbstractItems extends \Magento\Backend\Block\Template
/**
* Retrieve available order
*
+ * @throws \Magento\Core\Exception
* @return \Magento\Sales\Model\Order
*/
public function getOrder()
@@ -291,7 +268,7 @@ class AbstractItems extends \Magento\Backend\Block\Template
{
if ($code == 'tax_amount' && $this->getOrder()->getRowTaxDisplayPrecision()) {
return $this->displayRoundedPrices(
- $this->getPriceDataObject()->getData('base_'.$code),
+ $this->getPriceDataObject()->getData('base_' . $code),
$this->getPriceDataObject()->getData($code),
$this->getOrder()->getRowTaxDisplayPrecision(),
$strong,
@@ -299,7 +276,7 @@ class AbstractItems extends \Magento\Backend\Block\Template
);
} else {
return $this->displayPrices(
- $this->getPriceDataObject()->getData('base_'.$code),
+ $this->getPriceDataObject()->getData('base_' . $code),
$this->getPriceDataObject()->getData($code),
$strong,
$separator
@@ -335,13 +312,13 @@ class AbstractItems extends \Magento\Backend\Block\Template
{
if ($this->getOrder()->isCurrencyDifferent()) {
$res = '';
- $res.= $this->getOrder()->formatBasePricePrecision($basePrice, $precision);
- $res.= $separator;
- $res.= $this->getOrder()->formatPricePrecision($price, $precision, true);
+ $res .= $this->getOrder()->formatBasePricePrecision($basePrice, $precision);
+ $res .= $separator;
+ $res .= $this->getOrder()->formatPricePrecision($price, $precision, true);
} else {
$res = $this->getOrder()->formatPricePrecision($price, $precision);
if ($strong) {
- $res = '<strong>'.$res.'</strong>';
+ $res = '<strong>' . $res . '</strong>';
}
}
return $res;
@@ -367,8 +344,8 @@ class AbstractItems extends \Magento\Backend\Block\Template
$priceTax = 0;
if (floatval($qty)) {
- $basePriceTax = $item->getBasePrice()+$baseTax/$qty;
- $priceTax = $item->getPrice()+$tax/$qty;
+ $basePriceTax = $item->getBasePrice() + $baseTax / $qty;
+ $priceTax = $item->getPrice() + $tax / $qty;
}
return $this->displayPrices(
@@ -393,8 +370,8 @@ class AbstractItems extends \Magento\Backend\Block\Template
: ($item->getBaseTaxAmount() ? $item->getBaseTaxAmount() : 0);
return $this->displayPrices(
- $item->getBaseRowTotal()+$baseTax,
- $item->getRowTotal()+$tax
+ $item->getBaseRowTotal() + $baseTax,
+ $item->getRowTotal() + $tax
);
}
@@ -408,7 +385,7 @@ class AbstractItems extends \Magento\Backend\Block\Template
{
if ($item->getTaxPercent() && $item->getTaxString() == '') {
$percents = array($item->getTaxPercent());
- } else if ($item->getTaxString()) {
+ } elseif ($item->getTaxString()) {
$percents = explode(\Magento\Tax\Model\Config::CALCULATION_STRING_SEPARATOR, $item->getTaxString());
} else {
return '0%';
@@ -457,7 +434,8 @@ class AbstractItems extends \Magento\Backend\Block\Template
/**
* Setter for flag _canEditQty
*
- * @return \Magento\Adminhtml\Block\Sales\Items\AbstractItems
+ * @param bool $value
+ * @return \Magento\Sales\Block\Adminhtml\Items\AbstractItems
* @see self::_canEditQty
* @see self::canEditQty
*/
@@ -533,7 +511,8 @@ class AbstractItems extends \Magento\Backend\Block\Template
* CREDITMEMO
*/
- public function canReturnToStock() {
+ public function canReturnToStock()
+ {
if ($this->_storeConfig->getConfig(\Magento\CatalogInventory\Model\Stock\Item::XML_PATH_CAN_SUBTRACT)) {
return true;
} else {
@@ -554,7 +533,7 @@ class AbstractItems extends \Magento\Backend\Block\Template
if (!is_null($item)) {
if (!$item->hasCanReturnToStock()) {
$product = $this->_productFactory->create()->load($item->getOrderItem()->getProductId());
- if ( $product->getId() && $product->getStockItem()->getManageStock() ) {
+ if ($product->getId() && $product->getStockItem()->getManageStock()) {
$item->setCanReturnToStock(true);
} else {
$item->setCanReturnToStock(false);
@@ -576,10 +555,10 @@ class AbstractItems extends \Magento\Backend\Block\Template
\Magento\CatalogInventory\Model\Stock\Item::XML_PATH_CAN_SUBTRACT
);
if (!is_null($item)) {
- if ( $item->getCreditmemo()->getOrder()->hasCanReturnToStock() ) {
+ if ($item->getCreditmemo()->getOrder()->hasCanReturnToStock()) {
$canReturnToStock = $item->getCreditmemo()->getOrder()->getCanReturnToStock();
}
- } elseif ( $this->getOrder()->hasCanReturnToStock() ) {
+ } elseif ($this->getOrder()->hasCanReturnToStock()) {
$canReturnToStock = $this->getOrder()->getCanReturnToStock();
}
return $canReturnToStock;
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Items/Column/DefaultColumn.php b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Sales/Items/Column/DefaultColumn.php
rename to app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php
index 8c82f722d43..1423103c048 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Items/Column/DefaultColumn.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,10 +29,10 @@
* Adminhtml sales order column renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Items\Column;
+namespace Magento\Sales\Block\Adminhtml\Items\Column;
class DefaultColumn extends \Magento\Adminhtml\Block\Template
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Items/Column/Name.php b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Sales/Items/Column/Name.php
rename to app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php
index f37c5a91a49..280c401694e 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Items/Column/Name.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,12 +29,12 @@
* Sales Order items name column renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Items\Column;
+namespace Magento\Sales\Block\Adminhtml\Items\Column;
-class Name extends \Magento\Adminhtml\Block\Sales\Items\Column\DefaultColumn
+class Name extends \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn
{
/**
* Core string
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Items/Column/Name/Grouped.php b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name/Grouped.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Sales/Items/Column/Name/Grouped.php
rename to app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name/Grouped.php
index ee35e7e7c59..fda9d9e1544 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Items/Column/Name/Grouped.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name/Grouped.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,12 +29,12 @@
* Sales Order items name column renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Items\Column\Name;
+namespace Magento\Sales\Block\Adminhtml\Items\Column\Name;
-class Grouped extends \Magento\Adminhtml\Block\Sales\Items\Column\Name
+class Grouped extends \Magento\Sales\Block\Adminhtml\Items\Column\Name
{
/**
* Prepare item html
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Items/Column/Qty.php b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Qty.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Sales/Items/Column/Qty.php
rename to app/code/Magento/Sales/Block/Adminhtml/Items/Column/Qty.php
index c6e2a6e40b9..93093a36909 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Items/Column/Qty.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Qty.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,11 +29,11 @@
* Sales Order items qty column renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Items\Column;
+namespace Magento\Sales\Block\Adminhtml\Items\Column;
-class Qty extends \Magento\Adminhtml\Block\Sales\Items\Column\DefaultColumn
+class Qty extends \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn
{}
?>
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Items/Renderer/Configurable.php b/app/code/Magento/Sales/Block/Adminhtml/Items/Renderer/Configurable.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Sales/Items/Renderer/Configurable.php
rename to app/code/Magento/Sales/Block/Adminhtml/Items/Renderer/Configurable.php
index 2e3fa81b2bd..70089692a09 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Items/Renderer/Configurable.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/Renderer/Configurable.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,12 +29,12 @@
* Adminhtml sales order item renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Items\Renderer;
+namespace Magento\Sales\Block\Adminhtml\Items\Renderer;
-class Configurable extends \Magento\Adminhtml\Block\Sales\Items\AbstractItems
+class Configurable extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
{
public function getItem()
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Items/Renderer/DefaultRenderer.php b/app/code/Magento/Sales/Block/Adminhtml/Items/Renderer/DefaultRenderer.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Sales/Items/Renderer/DefaultRenderer.php
rename to app/code/Magento/Sales/Block/Adminhtml/Items/Renderer/DefaultRenderer.php
index 3a74e665a16..edf0578d6a6 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Items/Renderer/DefaultRenderer.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/Renderer/DefaultRenderer.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,12 +29,12 @@
* Adminhtml sales order item renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Items\Renderer;
+namespace Magento\Sales\Block\Adminhtml\Items\Renderer;
-class DefaultRenderer extends \Magento\Adminhtml\Block\Sales\Items\AbstractItems
+class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
{
public function getItem()
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order.php b/app/code/Magento/Sales/Block/Adminhtml/Order.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Sales/Order.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order.php
index 3fa3394e06f..a74a449f049 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,16 +28,17 @@
* Adminhtml sales orders block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales;
+namespace Magento\Sales\Block\Adminhtml;
class Order extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
protected function _construct()
{
- $this->_controller = 'sales_order';
+ $this->_controller = 'adminhtml_order';
+ $this->_blockGroup = 'Magento_Sales';
$this->_headerText = __('Orders');
$this->_addButtonLabel = __('Create New Order');
parent::_construct();
@@ -53,6 +54,6 @@ class Order extends \Magento\Adminhtml\Block\Widget\Grid\Container
*/
public function getCreateUrl()
{
- return $this->getUrl('*/sales_order_create/start');
+ return $this->getUrl('sales/order_create/start');
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/AbstractOrder.php b/app/code/Magento/Sales/Block/Adminhtml/Order/AbstractOrder.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/AbstractOrder.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/AbstractOrder.php
index d9d955b8cc9..7d309cc6872 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/AbstractOrder.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/AbstractOrder.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Adminhtml order abstract block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order;
+namespace Magento\Sales\Block\Adminhtml\Order;
class AbstractOrder extends \Magento\Adminhtml\Block\Widget
{
@@ -88,12 +88,12 @@ class AbstractOrder extends \Magento\Adminhtml\Block\Widget
public function displayPriceAttribute($code, $strong = false, $separator = '<br/>')
{
- return $this->helper('Magento\Adminhtml\Helper\Sales')->displayPriceAttribute($this->getPriceDataObject(), $code, $strong, $separator);
+ return $this->helper('Magento\Sales\Helper\Admin')->displayPriceAttribute($this->getPriceDataObject(), $code, $strong, $separator);
}
public function displayPrices($basePrice, $price, $strong = false, $separator = '<br/>')
{
- return $this->helper('Magento\Adminhtml\Helper\Sales')->displayPrices($this->getPriceDataObject(), $basePrice, $price, $strong, $separator);
+ return $this->helper('Magento\Sales\Helper\Admin')->displayPrices($this->getPriceDataObject(), $basePrice, $price, $strong, $separator);
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Address.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Address.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Address.php
index e3958ac2821..1b118ed2b7e 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Address.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -27,7 +27,7 @@
/**
* Edit order address form container block
*/
-namespace Magento\Adminhtml\Block\Sales\Order;
+namespace Magento\Sales\Block\Adminhtml\Order;
class Address extends \Magento\Adminhtml\Block\Widget\Form\Container
{
@@ -56,8 +56,9 @@ class Address extends \Magento\Adminhtml\Block\Widget\Form\Container
protected function _construct()
{
- $this->_controller = 'sales_order';
+ $this->_controller = 'adminhtml_order';
$this->_mode = 'address';
+ $this->_blockGroup = 'Magento_Sales';
parent::_construct();
$this->_updateButton('save', 'label', __('Save Order Address'));
$this->_removeButton('delete');
@@ -89,7 +90,7 @@ class Address extends \Magento\Adminhtml\Block\Widget\Form\Container
{
$address = $this->_coreRegistry->registry('order_address');
return $this->getUrl(
- '*/*/view',
+ 'sales/*/view',
array('order_id' => $address ? $address->getOrder()->getId() : null)
);
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Address/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Address/Form.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
index d597ecec320..8b3838ba241 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Address/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,15 +28,15 @@
* Adminhtml sales order edit address block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Address;
+namespace Magento\Sales\Block\Adminhtml\Order\Address;
class Form
- extends \Magento\Adminhtml\Block\Sales\Order\Create\Form\Address
+ extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
{
- protected $_template = 'sales/order/address/form.phtml';
+ protected $_template = 'order/address/form.phtml';
/**
* Core registry
@@ -51,7 +51,7 @@ class Form
* @param \Magento\Adminhtml\Helper\Addresses $adminhtmlAddresses
* @param \Magento\Data\Form\Factory $formFactory
* @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Core\Model\Registry $registry
@@ -65,7 +65,7 @@ class Form
\Magento\Adminhtml\Helper\Addresses $adminhtmlAddresses,
\Magento\Data\Form\Factory $formFactory,
\Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
\Magento\Core\Model\Registry $registry,
@@ -91,14 +91,14 @@ class Form
/**
* Define form attributes (id, method, action)
*
- * @return \Magento\Adminhtml\Block\Sales\Order\Create\Billing\Address
+ * @return \Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address
*/
protected function _prepareForm()
{
parent::_prepareForm();
$this->_form->setId('edit_form');
$this->_form->setMethod('post');
- $this->_form->setAction($this->getUrl('*/*/addressSave', array('address_id'=>$this->_getAddress()->getId())));
+ $this->_form->setAction($this->getUrl('sales/*/addressSave', array('address_id'=>$this->_getAddress()->getId())));
$this->_form->setUseContainer(true);
return $this;
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Comments/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Comments/View.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Comments/View.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Comments/View.php
index cacc0a71581..7fb87d63161 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Comments/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Comments/View.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Invoice view comments form
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Comments;
+namespace Magento\Sales\Block\Adminhtml\Order\Comments;
class View extends \Magento\Adminhtml\Block\Template
{
@@ -73,7 +73,7 @@ class View extends \Magento\Adminhtml\Block\Template
/**
* Prepare child blocks
*
- * @return \Magento\Adminhtml\Block\Sales\Order\Invoice\Create\Items
+ * @return \Magento\Sales\Block\Adminhtml\Order\Invoice\Create\Items
*/
protected function _prepareLayout()
{
@@ -87,7 +87,7 @@ class View extends \Magento\Adminhtml\Block\Template
public function getSubmitUrl()
{
- return $this->getUrl('*/*/addComment', array('id' => $this->getEntity()->getId()));
+ return $this->getUrl('sales/*/addComment', array('id' => $this->getEntity()->getId()));
}
public function canSendCommentEmail()
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create.php
index 662e390d81f..0ab92824892 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,11 +28,11 @@
* Adminhtml sales order create
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order;
+namespace Magento\Sales\Block\Adminhtml\Order;
class Create extends \Magento\Adminhtml\Block\Widget\Form\Container
{
@@ -60,7 +60,7 @@ class Create extends \Magento\Adminhtml\Block\Widget\Form\Container
protected function _construct()
{
$this->_objectId = 'order_id';
- $this->_controller = 'sales_order';
+ $this->_controller = 'order';
$this->_mode = 'create';
parent::_construct();
@@ -98,7 +98,7 @@ class Create extends \Magento\Adminhtml\Block\Widget\Form\Container
$this->_updateButton('reset', 'class', 'cancel');
$this->_updateButton('reset', 'onclick', 'deleteConfirm(\''.$confirm.'\', \'' . $this->getCancelUrl() . '\')');
- $pageTitle = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Sales\Order\Create\Header')->toHtml();
+ $pageTitle = $this->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Order\Create\Header')->toHtml();
if (is_object($this->getLayout()->getBlock('page-title'))) {
$this->getLayout()->getBlock('page-title')->setPageTitle($pageTitle);
}
@@ -112,7 +112,7 @@ class Create extends \Magento\Adminhtml\Block\Widget\Form\Container
public function getHeaderHtml()
{
$out = '<div id="order-header">'
- . $this->getLayout()->createBlock('Magento\Adminhtml\Block\Sales\Order\Create\Header')->toHtml()
+ . $this->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Order\Create\Header')->toHtml()
. '</div>';
return $out;
}
@@ -146,11 +146,11 @@ class Create extends \Magento\Adminhtml\Block\Widget\Form\Container
public function getCancelUrl()
{
if ($this->_sessionQuote->getOrder()->getId()) {
- $url = $this->getUrl('*/sales_order/view', array(
+ $url = $this->getUrl('sales/order/view', array(
'order_id' => $this->_sessionQuote->getOrder()->getId()
));
} else {
- $url = $this->getUrl('*/*/cancel');
+ $url = $this->getUrl('sales/*/cancel');
}
return $url;
@@ -163,6 +163,6 @@ class Create extends \Magento\Adminhtml\Block\Widget\Form\Container
*/
public function getBackUrl()
{
- return $this->getUrl('*/' . $this->_controller . '/');
+ return $this->getUrl('sales/' . $this->_controller . '/');
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/AbstractCreate.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/AbstractCreate.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
index 2cfd1abd5cc..136078057a0 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/AbstractCreate.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Adminhtml sales order create abstract block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Create;
abstract class AbstractCreate extends \Magento\Backend\Block\Widget
{
@@ -41,13 +41,13 @@ abstract class AbstractCreate extends \Magento\Backend\Block\Widget
protected $_sessionQuote;
/**
- * @var \Magento\Adminhtml\Model\Sales\Order\Create
+ * @var \Magento\Sales\Model\AdminOrder\Create
*/
protected $_orderCreate;
public function __construct(
\Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
array $data = array()
@@ -60,7 +60,7 @@ abstract class AbstractCreate extends \Magento\Backend\Block\Widget
/**
* Retrieve create order model object
*
- * @return \Magento\Adminhtml\Model\Sales\Order\Create
+ * @return \Magento\Sales\Model\AdminOrder\Create
*/
public function getCreateOrderModel()
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Billing/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Billing/Address.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php
index 878b1d682e9..26ec5888ed7 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Billing/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,13 +29,13 @@
* Adminhtml sales order create billing address block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Billing;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Billing;
class Address
- extends \Magento\Adminhtml\Block\Sales\Order\Create\Form\Address
+ extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
{
/**
* Return header text
@@ -60,7 +60,7 @@ class Address
/**
* Prepare Form and add elements to form
*
- * @return \Magento\Adminhtml\Block\Sales\Order\Create\Billing\Address
+ * @return \Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Billing/Method.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method.php
similarity index 88%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Billing/Method.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method.php
index 1e0ae5dc861..8fdc6bca2fc 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Billing/Method.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Adminhtml sales order create payment method block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Billing;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Billing;
-class Method extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+class Method extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
protected function _construct()
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method/Form.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method/Form.php
index 532e47c3cd5..4fea531412e 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Billing/Method/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Adminhtml sales order create payment method form block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Billing\Method;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Billing\Method;
class Form extends \Magento\Payment\Block\Form\Container
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Comment.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Comment.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Comment.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Comment.php
index 39483b2432d..344b60603ba 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Comment.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Comment.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,9 +29,9 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Create;
-class Comment extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+class Comment extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
protected $_form;
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Coupons.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Coupons.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons.php
index cf13220351a..66d20e30004 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Coupons.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Adminhtml sales order create coupons block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Create;
-class Coupons extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+class Coupons extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
protected function _construct()
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons/Form.php
similarity index 87%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons/Form.php
index 8239200ac9d..a52d8a8d945 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Adminhtml sales order create coupons form block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Coupons;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Coupons;
-class Form extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
protected function _construct()
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Customer.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Customer.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Customer.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Customer.php
index b6e78c11610..bc9a4dfbb3e 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Customer.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Customer.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Adminhtml sales order create block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Create;
-class Customer extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+class Customer extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
protected function _construct()
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Data.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Data.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Data.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Data.php
index 711802a0df8..bc6ad105fb7 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Data.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Data.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Order create data
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Create;
-class Data extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+class Data extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
/**
* @var \Magento\Directory\Model\CurrencyFactory
@@ -43,7 +43,7 @@ class Data extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
/**
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
* @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
* @param array $data
@@ -51,7 +51,7 @@ class Data extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
public function __construct(
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
\Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
array $data = array()
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Form.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php
index d7e4de3c5f8..70ab2f74d0d 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Adminhtml sales order create sidebar
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Create;
-class Form extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
/**
* @var \Magento\Customer\Model\FormFactory
@@ -44,7 +44,7 @@ class Form extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
/**
* @param \Magento\Customer\Model\FormFactory $customerFormFactory
* @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
* @param array $data
@@ -52,7 +52,7 @@ class Form extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
public function __construct(
\Magento\Customer\Model\FormFactory $customerFormFactory,
\Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
array $data = array()
@@ -73,7 +73,7 @@ class Form extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
*/
public function getLoadBlockUrl()
{
- return $this->getUrl('*/*/loadBlock');
+ return $this->getUrl('sales/*/loadBlock');
}
/**
@@ -82,7 +82,7 @@ class Form extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
*/
public function getSaveUrl()
{
- return $this->getUrl('*/*/save');
+ return $this->getUrl('sales/*/save');
}
public function getCustomerSelectorDisplay()
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Form/AbstractForm.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Form/AbstractForm.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
index 6803577d809..fc4149e0ce2 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Form/AbstractForm.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,13 +29,13 @@
* Sales Order Create Form Abstract Block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Form;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
abstract class AbstractForm
- extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+ extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
/**
* @var \Magento\Data\Form\Factory
@@ -52,7 +52,7 @@ abstract class AbstractForm
/**
* @param \Magento\Data\Form\Factory $formFactory
* @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
* @param array $data
@@ -60,7 +60,7 @@ abstract class AbstractForm
public function __construct(
\Magento\Data\Form\Factory $formFactory,
\Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
array $data = array()
@@ -73,7 +73,7 @@ abstract class AbstractForm
* Prepare global layout
* Add renderers to \Magento\Data\Form
*
- * @return \Magento\Adminhtml\Block\Sales\Order\Create\Form\AbstractForm
+ * @return \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm
*/
protected function _prepareLayout()
{
@@ -118,7 +118,7 @@ abstract class AbstractForm
/**
* Prepare Form and add elements to form
*
- * @return \Magento\Adminhtml\Block\Sales\Order\Create\Form\AbstractForm
+ * @return \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm
*/
abstract protected function _prepareForm();
@@ -152,7 +152,7 @@ abstract class AbstractForm
* Add additional data to form element
*
* @param \Magento\Data\Form\Element\AbstractElement $element
- * @return \Magento\Adminhtml\Block\Sales\Order\Create\Form\AbstractForm
+ * @return \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm
*/
protected function _addAdditionalFormElementData(\Magento\Data\Form\Element\AbstractElement $element)
{
@@ -164,7 +164,7 @@ abstract class AbstractForm
*
* @param array|\Magento\Data\Collection $attributes
* @param \Magento\Data\Form\AbstractForm $form
- * @return \Magento\Adminhtml\Block\Sales\Order\Create\Form\AbstractForm
+ * @return \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm
*/
protected function _addAttributesToForm($attributes, \Magento\Data\Form\AbstractForm $form)
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Form/Account.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Form/Account.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
index b23e1a32854..253b286b722 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Form/Account.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,9 +29,9 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Form;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
-class Account extends \Magento\Adminhtml\Block\Sales\Order\Create\Form\AbstractForm
+class Account extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm
{
/**
* @var \Magento\Customer\Model\CustomerFactory
@@ -48,7 +48,7 @@ class Account extends \Magento\Adminhtml\Block\Sales\Order\Create\Form\AbstractF
* @param \Magento\Customer\Model\FormFactory $customerFormFactory
* @param \Magento\Data\Form\Factory $formFactory
* @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
* @param array $data
@@ -58,7 +58,7 @@ class Account extends \Magento\Adminhtml\Block\Sales\Order\Create\Form\AbstractF
\Magento\Customer\Model\FormFactory $customerFormFactory,
\Magento\Data\Form\Factory $formFactory,
\Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
array $data = array()
@@ -91,7 +91,7 @@ class Account extends \Magento\Adminhtml\Block\Sales\Order\Create\Form\AbstractF
/**
* Prepare Form and add elements to form
*
- * @return \Magento\Adminhtml\Block\Sales\Order\Create\Form\Account
+ * @return \Magento\Sales\Block\Adminhtml\Order\Create\Form\Account
*/
protected function _prepareForm()
{
@@ -139,7 +139,7 @@ class Account extends \Magento\Adminhtml\Block\Sales\Order\Create\Form\AbstractF
* Add additional data to form element
*
* @param \Magento\Data\Form\Element\AbstractElement $element
- * @return \Magento\Adminhtml\Block\Sales\Order\Create\Form\AbstractForm
+ * @return \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm
*/
protected function _addAdditionalFormElementData(\Magento\Data\Form\Element\AbstractElement $element)
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Form/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Form/Address.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
index f84c4f2057e..70b06cb9662 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Form/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Order create address form
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Form;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
class Address
- extends \Magento\Adminhtml\Block\Sales\Order\Create\Form\AbstractForm
+ extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm
{
/**
* Customer Address Form instance
@@ -66,7 +66,7 @@ class Address
* @param \Magento\Adminhtml\Helper\Addresses $adminhtmlAddresses
* @param \Magento\Data\Form\Factory $formFactory
* @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
* @param array $data
@@ -77,7 +77,7 @@ class Address
\Magento\Adminhtml\Helper\Addresses $adminhtmlAddresses,
\Magento\Data\Form\Factory $formFactory,
\Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
array $data = array()
@@ -151,7 +151,7 @@ class Address
/**
* Prepare Form and add elements to form
*
- * @return \Magento\Adminhtml\Block\Sales\Order\Create\Form\Address
+ * @return \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
*/
protected function _prepareForm()
{
@@ -246,7 +246,7 @@ class Address
* Add additional data to form element
*
* @param \Magento\Data\Form\Element\AbstractElement $element
- * @return \Magento\Adminhtml\Block\Sales\Order\Create\Form\AbstractForm
+ * @return \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm
*/
protected function _addAdditionalFormElementData(\Magento\Data\Form\Element\AbstractElement $element)
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Giftmessage.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Giftmessage.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php
index 25697342374..d6449a662ea 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Giftmessage.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,12 +29,12 @@
* Adminhtml order create gift message block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Create;
-class Giftmessage extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+class Giftmessage extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
/**
* @var \Magento\Adminhtml\Model\Giftmessage\Save
@@ -44,7 +44,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCr
/**
* @param \Magento\Adminhtml\Model\Giftmessage\Save $giftMessageSave
* @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
* @param array $data
@@ -52,7 +52,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCr
public function __construct(
\Magento\Adminhtml\Model\Giftmessage\Save $giftMessageSave,
\Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
array $data = array()
@@ -70,7 +70,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCr
*/
public function getFormHtml(\Magento\Object $entity, $entityType='quote') {
return $this->getLayout()
- ->createBlock('Magento\Adminhtml\Block\Sales\Order\Create\Giftmessage\Form')
+ ->createBlock('Magento\Sales\Block\Adminhtml\Order\Create\Giftmessage\Form')
->setEntity($entity)
->setEntityType($entityType)
->toHtml();
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php
index 9d51ef26bf8..2841261a3f0 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,10 +29,10 @@
* Adminhtml order creating gift message item form
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Giftmessage;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Giftmessage;
/**
* @SuppressWarnings(PHPMD.DepthOfInheritance)
@@ -82,7 +82,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
* Set entity for form
*
* @param \Magento\Object $entity
- * @return \Magento\Adminhtml\Block\Sales\Order\Create\Giftmessage\Form
+ * @return \Magento\Sales\Block\Adminhtml\Order\Create\Giftmessage\Form
*/
public function setEntity(\Magento\Object $entity)
{
@@ -162,7 +162,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
/**
* Prepares form
*
- * @return \Magento\Adminhtml\Block\Sales\Order\Create\Giftmessage\Form
+ * @return \Magento\Sales\Block\Adminhtml\Order\Create\Giftmessage\Form
*/
public function _prepareForm()
{
@@ -209,7 +209,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
*
* @param \Magento\Data\Form\Element\Fieldset $fieldset
*
- * @return \Magento\Adminhtml\Block\Sales\Order\Create\Giftmessage\Form
+ * @return \Magento\Sales\Block\Adminhtml\Order\Create\Giftmessage\Form
*/
protected function _prepareHiddenFields(\Magento\Data\Form\Element\Fieldset $fieldset)
{
@@ -238,7 +238,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
*
* @param \Magento\Data\Form\Element\Fieldset $fieldset
*
- * @return \Magento\Adminhtml\Block\Sales\Order\Create\Giftmessage\Form
+ * @return \Magento\Sales\Block\Adminhtml\Order\Create\Giftmessage\Form
*/
protected function _prepareVisibleFields(\Magento\Data\Form\Element\Fieldset $fieldset)
{
@@ -271,7 +271,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
/**
* Initialize gift message for entity
*
- * @return \Magento\Adminhtml\Block\Sales\Order\Create\Giftmessage\Form
+ * @return \Magento\Sales\Block\Adminhtml\Order\Create\Giftmessage\Form
*/
protected function _initMessage()
{
@@ -330,7 +330,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
/**
* Aplies posted data to gift message
*
- * @return \Magento\Adminhtml\Block\Sales\Order\Create\Giftmessage\Form
+ * @return \Magento\Sales\Block\Adminhtml\Order\Create\Giftmessage\Form
*/
protected function _applyPostData()
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Header.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Header.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Header.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Header.php
index b7312203076..6b88f6375b6 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Header.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Header.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,9 +29,9 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Create;
-class Header extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+class Header extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
protected function _toHtml()
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Items.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Items.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items.php
index 11e6fb8e891..82ccf3b85b1 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Items.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Adminhtml sales order create items block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Create;
-class Items extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+class Items extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
/**
* Contains button descriptions to be shown at the top of accordion
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Items/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Items/Grid.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
index 2ede9689ba2..ffcc0bb9a87 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Items/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Adminhtml sales order create items grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Items;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Items;
-class Grid extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
/**
* Flag to check can items be move to customer storage
@@ -70,7 +70,7 @@ class Grid extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
* @param \Magento\Tax\Model\Config $taxConfig
* @param \Magento\Tax\Helper\Data $taxData
* @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
* @param array $data
@@ -81,7 +81,7 @@ class Grid extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
\Magento\Tax\Model\Config $taxConfig,
\Magento\Tax\Helper\Data $taxData,
\Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
array $data = array()
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Load.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Load.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Load.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Load.php
index fd6b80ce872..ea339ba48e7 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Load.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Load.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,10 +29,10 @@
* Adminhtml sales order create newsletter block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Create;
class Load extends \Magento\Core\Block\Template
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Messages.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Messages.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Messages.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Messages.php
index c5404d0d74b..357ffd8e4db 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Messages.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Messages.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Order create errors block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Create;
class Messages extends \Magento\Adminhtml\Block\Messages
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Newsletter.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Newsletter.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php
index 80ab4a1128c..4e65d81c4ae 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Newsletter.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Adminhtml sales order create newsletter block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Create;
-class Newsletter extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+class Newsletter extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
protected function _construct()
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter/Form.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter/Form.php
index f95a92383d6..2ad7d58ebc8 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,11 +28,11 @@
* Adminhtml sales order create newsletter form block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Newsletter;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Newsletter;
class Form extends \Magento\Adminhtml\Block\Widget
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Search.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Search.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php
index b0afeec69a1..9d97f76fee7 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Search.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Adminhtml sales order create search block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Create;
-class Search extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+class Search extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
protected function _construct()
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Search/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Search/Grid.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
index bc67afea171..0338775e1ae 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Search/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Adminhtml sales order create search products block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Search;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Search;
class Grid extends \Magento\Adminhtml\Block\Widget\Grid
{
@@ -140,7 +140,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
/**
* Prepare collection to be displayed in the grid
*
- * @return \Magento\Adminhtml\Block\Sales\Order\Create\Search\Grid
+ * @return \Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid
*/
protected function _prepareCollection()
{
@@ -162,7 +162,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
/**
* Prepare columns
*
- * @return \Magento\Adminhtml\Block\Sales\Order\Create\Search\Grid
+ * @return \Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid
*/
protected function _prepareColumns()
{
@@ -174,7 +174,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
));
$this->addColumn('name', array(
'header' => __('Product'),
- 'renderer' => 'Magento\Adminhtml\Block\Sales\Order\Create\Search\Grid\Renderer\Product',
+ 'renderer' => 'Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid\Renderer\Product',
'index' => 'name'
));
$this->addColumn('sku', array(
@@ -190,7 +190,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
'currency_code' => $this->getStore()->getCurrentCurrencyCode(),
'rate' => $this->getStore()->getBaseCurrency()->getRate($this->getStore()->getCurrentCurrencyCode()),
'index' => 'price',
- 'renderer' => 'Magento\Adminhtml\Block\Sales\Order\Create\Search\Grid\Renderer\Price',
+ 'renderer' => 'Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid\Renderer\Price',
));
$this->addColumn('in_products', array(
@@ -208,7 +208,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
'filter' => false,
'sortable' => false,
'header' => __('Quantity'),
- 'renderer' => 'Magento\Adminhtml\Block\Sales\Order\Create\Search\Grid\Renderer\Qty',
+ 'renderer' => 'Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid\Renderer\Qty',
'name' => 'qty',
'inline_css'=> 'qty',
'align' => 'center',
@@ -223,7 +223,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
public function getGridUrl()
{
- return $this->getUrl('*/*/loadBlock', array('block'=>'search_grid', '_current' => true, 'collapse' => null));
+ return $this->getUrl('sales/*/loadBlock', array('block'=>'search_grid', '_current' => true, 'collapse' => null));
}
protected function _getSelectedProducts()
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Price.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Price.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Price.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Price.php
index 63bb33086d0..f90613e52c2 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Price.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Price.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Adminhtml sales create order product search grid price column renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Search\Grid\Renderer;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid\Renderer;
class Price extends
\Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Price
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Product.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Product.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Product.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Product.php
index e1c606c2152..862299255b2 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Product.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Product.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Adminhtml sales create order product search grid product name column renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Search\Grid\Renderer;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid\Renderer;
class Product extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Text
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Qty.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Qty.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Qty.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Qty.php
index 7366243331b..4338c1fc568 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Search/Grid/Renderer/Qty.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Qty.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Renderer for Qty field in sales create new order search grid
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Search\Grid\Renderer;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid\Renderer;
class Qty
extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Input
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php
index 32333445d59..faf866c4022 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,13 +29,13 @@
* Adminhtml sales order create shipping address block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Shipping;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Shipping;
class Address
- extends \Magento\Adminhtml\Block\Sales\Order\Create\Form\Address
+ extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
{
/**
* Return header text
@@ -60,7 +60,7 @@ class Address
/**
* Prepare Form and add elements to form
*
- * @return \Magento\Adminhtml\Block\Sales\Order\Create\Shipping\Address
+ * @return \Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method.php
similarity index 88%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method.php
index 7556c86eb32..072cf005ad2 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Adminhtml sales order create shipping method block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Shipping;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Shipping;
-class Method extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+class Method extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
protected function _construct()
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
index dc03913d509..4df2017d3b5 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Adminhtml sales order create shipping method form block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Shipping\Method;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method;
class Form
- extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+ extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
protected $_rates;
@@ -48,7 +48,7 @@ class Form
/**
* @param \Magento\Tax\Helper\Data $taxData
* @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
* @param array $data
@@ -56,7 +56,7 @@ class Form
public function __construct(
\Magento\Tax\Helper\Data $taxData,
\Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
array $data = array()
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar.php
index e6acad9f324..f8f69f60a0f 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Adminhtml sales order create sidebar
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Create;
-class Sidebar extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+class Sidebar extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
protected function _prepareLayout()
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/AbstractSidebar.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/AbstractSidebar.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php
index 2399e888e80..39e93009ad1 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/AbstractSidebar.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Adminhtml sales order create sidebar block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Sidebar;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Sidebar;
-class AbstractSidebar extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+class AbstractSidebar extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
/**
* Default Storage action on selected item
@@ -49,7 +49,7 @@ class AbstractSidebar extends \Magento\Adminhtml\Block\Sales\Order\Create\Abstra
/**
* @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Sales\Model\Config $salesConfig
@@ -57,7 +57,7 @@ class AbstractSidebar extends \Magento\Adminhtml\Block\Sales\Order\Create\Abstra
*/
public function __construct(
\Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
\Magento\Sales\Model\Config $salesConfig,
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
index e3c4b36680c..dbadf6ac65b 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/Cart.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Adminhtml sales order create sidebar cart block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Sidebar;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Sidebar;
class Cart
- extends \Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\AbstractSidebar
+ extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar
{
/**
* Storage action on selected item
@@ -102,7 +102,7 @@ class Cart
*
* Add button that clears customer's shopping cart
*
- * @return \Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Cart
+ * @return \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Cart
*/
protected function _prepareLayout()
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Compared.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Compared.php
index eb644605252..9372cbb9ae3 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/Compared.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Compared.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Adminhtml sales order create sidebar compared block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Sidebar;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Sidebar;
-class Compared extends \Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\AbstractSidebar
+class Compared extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar
{
protected function _construct()
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pcompared.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pcompared.php
index efcbcefcf3c..7b96ff1e80b 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/Pcompared.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pcompared.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Adminhtml sales order create sidebar recently compared block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Sidebar;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Sidebar;
-class Pcompared extends \Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\AbstractSidebar
+class Pcompared extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar
{
/**
* @var \Magento\Catalog\Model\ProductFactory
@@ -50,7 +50,7 @@ class Pcompared extends \Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Abst
* @param \Magento\Reports\Model\Resource\Event $event
* @param \Magento\Catalog\Model\ProductFactory $productFactory
* @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Sales\Model\Config $salesConfig
@@ -60,7 +60,7 @@ class Pcompared extends \Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Abst
\Magento\Reports\Model\Resource\Event $event,
\Magento\Catalog\Model\ProductFactory $productFactory,
\Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
\Magento\Sales\Model\Config $salesConfig,
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pviewed.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pviewed.php
index 748b73b8850..8f00cc5af3d 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/Pviewed.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pviewed.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Adminhtml sales order create sidebar recently view block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Sidebar;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Sidebar;
-class Pviewed extends \Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\AbstractSidebar
+class Pviewed extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar
{
/**
* @var \Magento\Catalog\Model\ProductFactory
@@ -50,7 +50,7 @@ class Pviewed extends \Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Abstra
* @param \Magento\Reports\Model\EventFactory $eventFactory
* @param \Magento\Catalog\Model\ProductFactory $productFactory
* @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Sales\Model\Config $salesConfig
@@ -60,7 +60,7 @@ class Pviewed extends \Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Abstra
\Magento\Reports\Model\EventFactory $eventFactory,
\Magento\Catalog\Model\ProductFactory $productFactory,
\Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
\Magento\Sales\Model\Config $salesConfig,
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Reorder.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Reorder.php
index c529dc036a6..e60e675b2c0 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Reorder.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Adminhtml sales order create sidebar cart block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Sidebar;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Sidebar;
-class Reorder extends \Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\AbstractSidebar
+class Reorder extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar
{
/**
* Storage action on selected item
@@ -50,7 +50,7 @@ class Reorder extends \Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Abstra
/**
* @param \Magento\Sales\Model\Resource\Order\CollectionFactory $ordersFactory
* @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Sales\Model\Config $salesConfig
@@ -59,7 +59,7 @@ class Reorder extends \Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\Abstra
public function __construct(
\Magento\Sales\Model\Resource\Order\CollectionFactory $ordersFactory,
\Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
\Magento\Sales\Model\Config $salesConfig,
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Viewed.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Viewed.php
index 2a63bf0cd7e..067b5667f85 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/Viewed.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Viewed.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Adminhtml sales order create sidebar viewed block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Sidebar;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Sidebar;
-class Viewed extends \Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\AbstractSidebar
+class Viewed extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar
{
protected function _construct()
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Wishlist.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Wishlist.php
index 952965fed61..44185d1daf6 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Sidebar/Wishlist.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Wishlist.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Adminhtml sales order create sidebar wishlist block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Sidebar;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Sidebar;
class Wishlist
- extends \Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\AbstractSidebar
+ extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar
{
/**
* Storage action on selected item
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Store.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store.php
similarity index 87%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Store.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store.php
index dd341e1e549..878be987946 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Store.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Adminhtml sales order create select store block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Create;
-class Store extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+class Store extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
protected function _construct()
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Store/Select.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store/Select.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Store/Select.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store/Select.php
index 9e4e14935d7..d2d26a82385 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Store/Select.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store/Select.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -30,7 +30,7 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Store;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Store;
class Select extends \Magento\Backend\Block\Store\Switcher
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php
index 5a40606d530..84444706e47 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,16 +28,16 @@
* Adminhtml sales order create totals block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Create;
-class Totals extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
+class Totals extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
protected $_totalRenderers;
- protected $_defaultRenderer = 'Magento\Adminhtml\Block\Sales\Order\Create\Totals\DefaultTotals';
+ protected $_defaultRenderer = 'Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals';
/**
* Sales data
@@ -54,7 +54,7 @@ class Totals extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
/**
* @param \Magento\Sales\Helper\Data $salesData
* @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Sales\Model\Config $salesConfig
@@ -63,7 +63,7 @@ class Totals extends \Magento\Adminhtml\Block\Sales\Order\Create\AbstractCreate
public function __construct(
\Magento\Sales\Helper\Data $salesData,
\Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
\Magento\Sales\Model\Config $salesConfig,
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals/DefaultTotals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/DefaultTotals.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals/DefaultTotals.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/DefaultTotals.php
index a8035851ecf..dad7ff60978 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals/DefaultTotals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/DefaultTotals.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -30,11 +30,11 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Totals;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Totals;
-class DefaultTotals extends \Magento\Adminhtml\Block\Sales\Order\Create\Totals
+class DefaultTotals extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals
{
- protected $_template = 'Magento_Adminhtml::sales/order/create/totals/default.phtml';
+ protected $_template = 'Magento_Sales::order/create/totals/default.phtml';
/**
* Retrieve quote session object
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals/Discount.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php
similarity index 88%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals/Discount.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php
index 4701ac9980d..e90e8ce8d10 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals/Discount.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Discount.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -30,9 +30,9 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Totals;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Totals;
-class Discount extends \Magento\Adminhtml\Block\Sales\Order\Create\Totals\DefaultTotals
+class Discount extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
{
//protected $_template = 'tax/checkout/subtotal.phtml';
@@ -45,7 +45,7 @@ class Discount extends \Magento\Adminhtml\Block\Sales\Order\Create\Totals\Defaul
* @param \Magento\Tax\Model\Config $taxConfig
* @param \Magento\Sales\Helper\Data $salesData
* @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Sales\Model\Config $salesConfig
@@ -55,7 +55,7 @@ class Discount extends \Magento\Adminhtml\Block\Sales\Order\Create\Totals\Defaul
\Magento\Tax\Model\Config $taxConfig,
\Magento\Sales\Helper\Data $salesData,
\Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
\Magento\Sales\Model\Config $salesConfig,
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals/Grandtotal.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals/Grandtotal.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php
index cbbc02383a9..af595e7afb4 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals/Grandtotal.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -30,11 +30,11 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Totals;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Totals;
-class Grandtotal extends \Magento\Adminhtml\Block\Sales\Order\Create\Totals\DefaultTotals
+class Grandtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
{
- protected $_template = 'sales/order/create/totals/grandtotal.phtml';
+ protected $_template = 'order/create/totals/grandtotal.phtml';
/**
* @var \Magento\Tax\Model\Config
@@ -45,7 +45,7 @@ class Grandtotal extends \Magento\Adminhtml\Block\Sales\Order\Create\Totals\Defa
* @param \Magento\Tax\Model\Config $taxConfig
* @param \Magento\Sales\Helper\Data $salesData
* @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Sales\Model\Config $salesConfig
@@ -55,7 +55,7 @@ class Grandtotal extends \Magento\Adminhtml\Block\Sales\Order\Create\Totals\Defa
\Magento\Tax\Model\Config $taxConfig,
\Magento\Sales\Helper\Data $salesData,
\Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
\Magento\Sales\Model\Config $salesConfig,
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals/Shipping.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals/Shipping.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
index db05d3605c1..07e051782bf 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals/Shipping.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -30,12 +30,12 @@
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Totals;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Totals;
class Shipping
- extends \Magento\Adminhtml\Block\Sales\Order\Create\Totals\DefaultTotals
+ extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
{
- protected $_template = 'sales/order/create/totals/shipping.phtml';
+ protected $_template = 'order/create/totals/shipping.phtml';
/**
* @var \Magento\Tax\Model\Config
@@ -46,7 +46,7 @@ class Shipping
* @param \Magento\Tax\Model\Config $taxConfig
* @param \Magento\Sales\Helper\Data $salesData
* @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Sales\Model\Config $salesConfig
@@ -56,7 +56,7 @@ class Shipping
\Magento\Tax\Model\Config $taxConfig,
\Magento\Sales\Helper\Data $salesData,
\Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
\Magento\Sales\Model\Config $salesConfig,
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals/Subtotal.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals/Subtotal.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php
index dce501b253f..fa1aca5861e 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals/Subtotal.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Subtotal.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -30,11 +30,11 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Totals;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Totals;
-class Subtotal extends \Magento\Adminhtml\Block\Sales\Order\Create\Totals\DefaultTotals
+class Subtotal extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
{
- protected $_template = 'sales/order/create/totals/subtotal.phtml';
+ protected $_template = 'order/create/totals/subtotal.phtml';
/**
* @var \Magento\Tax\Model\Config
@@ -45,7 +45,7 @@ class Subtotal extends \Magento\Adminhtml\Block\Sales\Order\Create\Totals\Defaul
* @param \Magento\Tax\Model\Config $taxConfig
* @param \Magento\Sales\Helper\Data $salesData
* @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Sales\Model\Config $salesConfig
@@ -55,7 +55,7 @@ class Subtotal extends \Magento\Adminhtml\Block\Sales\Order\Create\Totals\Defaul
\Magento\Tax\Model\Config $taxConfig,
\Magento\Sales\Helper\Data $salesData,
\Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Adminhtml\Model\Sales\Order\Create $orderCreate,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
\Magento\Core\Helper\Data $coreData,
\Magento\Backend\Block\Template\Context $context,
\Magento\Sales\Model\Config $salesConfig,
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals/Table.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals/Table.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php
index 9f0f5de6eb2..1c38d8b9a45 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals/Table.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,11 +28,11 @@
* Adminhtml sales order create totals table block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Totals;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Totals;
class Table extends \Magento\Adminhtml\Block\Template
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php
similarity index 82%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php
index 1e9cdef1a90..940b95c2326 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Create/Totals/Tax.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -30,9 +30,9 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Totals;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Totals;
-class Tax extends \Magento\Adminhtml\Block\Sales\Order\Create\Totals\DefaultTotals
+class Tax extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
{
- protected $_template = 'sales/order/create/totals/tax.phtml';
+ protected $_template = 'order/create/totals/tax.phtml';
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/Create.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/Create.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create.php
index fdbd5a6ca3d..9ac7b065b7b 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/Create.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Adminhtml creditmemo create
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Creditmemo;
+namespace Magento\Sales\Block\Adminhtml\Order\Creditmemo;
class Create extends \Magento\Adminhtml\Block\Widget\Form\Container
{
@@ -58,7 +58,7 @@ class Create extends \Magento\Adminhtml\Block\Widget\Form\Container
protected function _construct()
{
$this->_objectId = 'order_id';
- $this->_controller = 'sales_order_creditmemo';
+ $this->_controller = 'adminhtml_order_creditmemo';
$this->_mode = 'create';
parent::_construct();
@@ -91,7 +91,7 @@ class Create extends \Magento\Adminhtml\Block\Widget\Form\Container
public function getBackUrl()
{
return $this->getUrl(
- '*/sales_order/view',
+ 'sales/order/view',
array('order_id' => $this->getCreditmemo() ? $this->getCreditmemo()->getOrderId() : null)
);
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/Create/Adjustments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/Create/Adjustments.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
index d12707a5908..09276f0da24 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/Create/Adjustments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
@@ -19,11 +19,11 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Creditmemo\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create;
class Adjustments extends \Magento\Adminhtml\Block\Template
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Form.php
similarity index 87%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Form.php
index 40fc88025f7..b402810d8a7 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,9 +28,9 @@
* Adminhtml creditmemo create form
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Creditmemo\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create;
-class Form extends \Magento\Adminhtml\Block\Sales\Order\AbstractOrder
+class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
{
/**
* Retrieve invoice order
@@ -64,6 +64,6 @@ class Form extends \Magento\Adminhtml\Block\Sales\Order\AbstractOrder
public function getSaveUrl()
{
- return $this->getUrl('*/*/save', array('_current' => true));
+ return $this->getUrl('sales/*/save', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Items.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Items.php
index 3895f7c714e..dc102d6a13a 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Items.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -27,9 +27,9 @@
/**
* Adminhtml creditmemo items grid
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Creditmemo\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create;
-class Items extends \Magento\Adminhtml\Block\Sales\Items\AbstractItems
+class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
{
protected $_canReturnToStock;
@@ -63,7 +63,7 @@ class Items extends \Magento\Adminhtml\Block\Sales\Items\AbstractItems
/**
* Prepare child blocks
*
- * @return \Magento\Adminhtml\Block\Sales\Order\Creditmemo\Create\Items
+ * @return \Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Items
*/
protected function _prepareLayout()
{
@@ -172,7 +172,7 @@ class Items extends \Magento\Adminhtml\Block\Sales\Items\AbstractItems
public function getUpdateUrl()
{
- return $this->getUrl('*/*/updateQty', array(
+ return $this->getUrl('sales/*/updateQty', array(
'order_id' => $this->getCreditmemo()->getOrderId(),
'invoice_id' => $this->getRequest()->getParam('invoice_id', null),
));
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Totals.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/Totals.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Totals.php
index 26c59c1fc92..58f20993507 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Totals.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Adminhtml order creditmemo totals block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Creditmemo;
+namespace Magento\Sales\Block\Adminhtml\Order\Creditmemo;
-class Totals extends \Magento\Adminhtml\Block\Sales\Totals
+class Totals extends \Magento\Sales\Block\Adminhtml\Totals
{
protected $_creditmemo;
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/View.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php
index f26f6a9d65f..95f53817a50 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Adminhtml creditmemo view
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Creditmemo;
+namespace Magento\Sales\Block\Adminhtml\Order\Creditmemo;
class View extends \Magento\Adminhtml\Block\Widget\Form\Container
{
@@ -65,7 +65,7 @@ class View extends \Magento\Adminhtml\Block\Widget\Form\Container
protected function _construct()
{
$this->_objectId = 'creditmemo_id';
- $this->_controller = 'sales_order_creditmemo';
+ $this->_controller = 'adminhtml_order_creditmemo';
$this->_mode = 'view';
parent::_construct();
@@ -156,7 +156,7 @@ class View extends \Magento\Adminhtml\Block\Widget\Form\Container
*/
public function getBackUrl()
{
- return $this->getUrl('*/sales_order/view', array(
+ return $this->getUrl('sales/order/view', array(
'order_id' => $this->getCreditmemo() ? $this->getCreditmemo()->getOrderId() : null,
'active_tab'=> 'order_creditmemos'
));
@@ -169,7 +169,7 @@ class View extends \Magento\Adminhtml\Block\Widget\Form\Container
*/
public function getCaptureUrl()
{
- return $this->getUrl('*/*/capture', array('creditmemo_id'=>$this->getCreditmemo()->getId()));
+ return $this->getUrl('sales/*/capture', array('creditmemo_id'=>$this->getCreditmemo()->getId()));
}
/**
@@ -179,7 +179,7 @@ class View extends \Magento\Adminhtml\Block\Widget\Form\Container
*/
public function getVoidUrl()
{
- return $this->getUrl('*/*/void', array('creditmemo_id'=>$this->getCreditmemo()->getId()));
+ return $this->getUrl('sales/*/void', array('creditmemo_id'=>$this->getCreditmemo()->getId()));
}
/**
@@ -189,7 +189,7 @@ class View extends \Magento\Adminhtml\Block\Widget\Form\Container
*/
public function getCancelUrl()
{
- return $this->getUrl('*/*/cancel', array('creditmemo_id'=>$this->getCreditmemo()->getId()));
+ return $this->getUrl('sales/*/cancel', array('creditmemo_id'=>$this->getCreditmemo()->getId()));
}
/**
@@ -199,7 +199,7 @@ class View extends \Magento\Adminhtml\Block\Widget\Form\Container
*/
public function getEmailUrl()
{
- return $this->getUrl('*/*/email', array(
+ return $this->getUrl('sales/*/email', array(
'creditmemo_id' => $this->getCreditmemo()->getId(),
'order_id' => $this->getCreditmemo()->getOrderId()
));
@@ -212,7 +212,7 @@ class View extends \Magento\Adminhtml\Block\Widget\Form\Container
*/
public function getPrintUrl()
{
- return $this->getUrl('*/*/print', array(
+ return $this->getUrl('sales/*/print', array(
'creditmemo_id' => $this->getCreditmemo()->getId()
));
}
@@ -220,7 +220,7 @@ class View extends \Magento\Adminhtml\Block\Widget\Form\Container
/**
* Update 'back' button url
*
- * @return \Magento\Adminhtml\Block\Widget\Container | \Magento\Adminhtml\Block\Sales\Order\Creditmemo\View
+ * @return \Magento\Adminhtml\Block\Widget\Container | \Magento\Sales\Block\Adminhtml\Order\Creditmemo\View
*/
public function updateBackButtonUrl($flag)
{
@@ -236,7 +236,7 @@ class View extends \Magento\Adminhtml\Block\Widget\Form\Container
return $this->_updateButton(
'back',
'onclick',
- 'setLocation(\'' . $this->getUrl('*/sales_creditmemo/') . '\')'
+ 'setLocation(\'' . $this->getUrl('sales/creditmemo/') . '\')'
);
}
return $this;
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php
index c82dcdf7d95..44f4e418c60 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/View/Comments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,10 +29,10 @@
* Adminhtml sales shipment comment view block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Creditmemo\View;
+namespace Magento\Sales\Block\Adminhtml\Order\Creditmemo\View;
class Comments extends \Magento\Adminhtml\Block\Text\ListText
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Form.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Form.php
index 5e18956e4fb..ebe2f27e9fc 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/View/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Creditmemo view form
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Creditmemo\View;
+namespace Magento\Sales\Block\Adminhtml\Order\Creditmemo\View;
-class Form extends \Magento\Adminhtml\Block\Sales\Order\AbstractOrder
+class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
{
/**
* Retrieve invoice order
@@ -79,6 +79,6 @@ class Form extends \Magento\Adminhtml\Block\Sales\Order\AbstractOrder
public function getOrderUrl()
{
- return $this->getUrl('*/sales_order/view', array('order_id' => $this->getCreditmemo()->getOrderId()));
+ return $this->getUrl('sales/order/view', array('order_id' => $this->getCreditmemo()->getOrderId()));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Items.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Items.php
index 20568b7c0cd..a42d561fda8 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/View/Items.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Items.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,12 +29,12 @@
* Adminhtml sales item renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Creditmemo\View;
+namespace Magento\Sales\Block\Adminhtml\Order\Creditmemo\View;
-class Items extends \Magento\Adminhtml\Block\Sales\Items\AbstractItems
+class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
{
/**
* Retrieve invoice order
@@ -80,6 +80,6 @@ class Items extends \Magento\Adminhtml\Block\Sales\Items\AbstractItems
public function getOrderUrl()
{
- return $this->getUrl('*/sales_order/view', array('order_id' => $this->getCreditmemo()->getOrderId()));
+ return $this->getUrl('sales/order/view', array('order_id' => $this->getCreditmemo()->getOrderId()));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Grid.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Grid.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Grid.php
index 17a12e9e68e..17ac8cb70d6 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Adminhtml sales orders grid
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order;
+namespace Magento\Sales\Block\Adminhtml\Order;
class Grid extends \Magento\Backend\Block\Widget\Grid
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/Create.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/Create.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create.php
index 5643e2ba1d7..5e18b9a4206 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/Create.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Adminhtml invoice create
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Invoice;
+namespace Magento\Sales\Block\Adminhtml\Order\Invoice;
class Create extends \Magento\Adminhtml\Block\Widget\Form\Container
{
@@ -58,7 +58,7 @@ class Create extends \Magento\Adminhtml\Block\Widget\Form\Container
protected function _construct()
{
$this->_objectId = 'order_id';
- $this->_controller = 'sales_order_invoice';
+ $this->_controller = 'adminhtml_order_invoice';
$this->_mode = 'create';
parent::_construct();
@@ -97,7 +97,7 @@ class Create extends \Magento\Adminhtml\Block\Widget\Form\Container
public function getBackUrl()
{
return $this->getUrl(
- '*/sales_order/view',
+ 'sales/order/view',
array('order_id' => $this->getInvoice() ? $this->getInvoice()->getOrderId() : null)
);
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Form.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Form.php
index bec5148a03c..c823b6bd7c2 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/Create/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Adminhtml invoice create form
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Invoice\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Invoice\Create;
-class Form extends \Magento\Adminhtml\Block\Sales\Order\AbstractOrder
+class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
{
/**
* Retrieve invoice order
@@ -67,14 +67,14 @@ class Form extends \Magento\Adminhtml\Block\Sales\Order\AbstractOrder
protected function _prepareLayout()
{
- $trackingBlock = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Sales\Order\Invoice\Create\Tracking');
+ $trackingBlock = $this->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Order\Invoice\Create\Tracking');
$this->setChild('tracking', $trackingBlock);
return parent::_prepareLayout();
}
public function getSaveUrl()
{
- return $this->getUrl('*/*/save', array('order_id' => $this->getInvoice()->getOrderId()));
+ return $this->getUrl('sales/*/save', array('order_id' => $this->getInvoice()->getOrderId()));
}
public function canCreateShipment()
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Items.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Items.php
index 8ff0ec502f2..26a8ed45659 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/Create/Items.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Items.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -27,9 +27,9 @@
/**
* Adminhtml invoice items grid
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Invoice\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Invoice\Create;
-class Items extends \Magento\Adminhtml\Block\Sales\Items\AbstractItems
+class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
{
protected $_disableSubmitButton = false;
@@ -63,7 +63,7 @@ class Items extends \Magento\Adminhtml\Block\Sales\Items\AbstractItems
/**
* Prepare child blocks
*
- * @return \Magento\Adminhtml\Block\Sales\Order\Invoice\Create\Items
+ * @return \Magento\Sales\Block\Adminhtml\Order\Invoice\Create\Items
*/
protected function _beforeToHtml()
{
@@ -180,7 +180,7 @@ class Items extends \Magento\Adminhtml\Block\Sales\Items\AbstractItems
public function getUpdateUrl()
{
- return $this->getUrl('*/*/updateQty', array('order_id'=>$this->getInvoice()->getOrderId()));
+ return $this->getUrl('sales/*/updateQty', array('order_id'=>$this->getInvoice()->getOrderId()));
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Tracking.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Tracking.php
index 18682d4972d..989f685f535 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/Create/Tracking.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Tracking.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Shipment tracking control form
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Invoice\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Invoice\Create;
class Tracking extends \Magento\Adminhtml\Block\Template
{
@@ -68,13 +68,13 @@ class Tracking extends \Magento\Adminhtml\Block\Template
public function _construct()
{
- $this->setTemplate('sales/order/invoice/create/tracking.phtml');
+ $this->setTemplate('order/invoice/create/tracking.phtml');
}
/**
* Prepares layout of block
*
- * @return \Magento\Adminhtml\Block\Sales\Order\View\Giftmessage
+ * @return \Magento\Sales\Block\Adminhtml\Order\View\Giftmessage
*/
protected function _prepareLayout()
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Totals.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/Totals.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Totals.php
index 142cd21add9..42af6c4a364 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Totals.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Adminhtml order invoice totals block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Invoice;
+namespace Magento\Sales\Block\Adminhtml\Order\Invoice;
-class Totals extends \Magento\Adminhtml\Block\Sales\Totals
+class Totals extends \Magento\Sales\Block\Adminhtml\Totals
{
protected $_invoice = null;
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/View.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
index 926f7e1847e..2b0fbbcbac0 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Adminhtml invoice create
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Invoice;
+namespace Magento\Sales\Block\Adminhtml\Order\Invoice;
class View extends \Magento\Adminhtml\Block\Widget\Form\Container
{
@@ -76,7 +76,7 @@ class View extends \Magento\Adminhtml\Block\Widget\Form\Container
protected function _construct()
{
$this->_objectId = 'invoice_id';
- $this->_controller = 'sales_order_invoice';
+ $this->_controller = 'adminhtml_order_invoice';
$this->_mode = 'view';
$this->_session = $this->_backendSession;
@@ -187,7 +187,7 @@ class View extends \Magento\Adminhtml\Block\Widget\Form\Container
public function getBackUrl()
{
return $this->getUrl(
- '*/sales_order/view',
+ 'sales/order/view',
array(
'order_id' => $this->getInvoice() ? $this->getInvoice()->getOrderId() : null,
'active_tab'=> 'order_invoices'
@@ -196,22 +196,22 @@ class View extends \Magento\Adminhtml\Block\Widget\Form\Container
public function getCaptureUrl()
{
- return $this->getUrl('*/*/capture', array('invoice_id'=>$this->getInvoice()->getId()));
+ return $this->getUrl('sales/*/capture', array('invoice_id'=>$this->getInvoice()->getId()));
}
public function getVoidUrl()
{
- return $this->getUrl('*/*/void', array('invoice_id'=>$this->getInvoice()->getId()));
+ return $this->getUrl('sales/*/void', array('invoice_id'=>$this->getInvoice()->getId()));
}
public function getCancelUrl()
{
- return $this->getUrl('*/*/cancel', array('invoice_id'=>$this->getInvoice()->getId()));
+ return $this->getUrl('sales/*/cancel', array('invoice_id'=>$this->getInvoice()->getId()));
}
public function getEmailUrl()
{
- return $this->getUrl('*/*/email', array(
+ return $this->getUrl('sales/*/email', array(
'order_id' => $this->getInvoice()->getOrder()->getId(),
'invoice_id'=> $this->getInvoice()->getId(),
));
@@ -219,7 +219,7 @@ class View extends \Magento\Adminhtml\Block\Widget\Form\Container
public function getCreditMemoUrl()
{
- return $this->getUrl('*/sales_order_creditmemo/start', array(
+ return $this->getUrl('sales/order_creditmemo/start', array(
'order_id' => $this->getInvoice()->getOrder()->getId(),
'invoice_id'=> $this->getInvoice()->getId(),
));
@@ -227,7 +227,7 @@ class View extends \Magento\Adminhtml\Block\Widget\Form\Container
public function getPrintUrl()
{
- return $this->getUrl('*/*/print', array(
+ return $this->getUrl('sales/*/print', array(
'invoice_id' => $this->getInvoice()->getId()
));
}
@@ -238,7 +238,7 @@ class View extends \Magento\Adminhtml\Block\Widget\Form\Container
if ($this->getInvoice()->getBackUrl()) {
return $this->_updateButton('back', 'onclick', 'setLocation(\'' . $this->getInvoice()->getBackUrl() . '\')');
}
- return $this->_updateButton('back', 'onclick', 'setLocation(\'' . $this->getUrl('*/sales_invoice/') . '\')');
+ return $this->_updateButton('back', 'onclick', 'setLocation(\'' . $this->getUrl('sales/invoice/') . '\')');
}
return $this;
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php
index 0e7d678d8c4..d022228a754 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/View/Comments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,10 +29,10 @@
* Adminhtml sales shipment comment view block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Invoice\View;
+namespace Magento\Sales\Block\Adminhtml\Order\Invoice\View;
class Comments extends \Magento\Adminhtml\Block\Text\ListText
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/View/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Form.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/View/Form.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Form.php
index eb9666640b5..d204105bbc3 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/View/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Invoice view form
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Invoice\View;
+namespace Magento\Sales\Block\Adminhtml\Order\Invoice\View;
-class Form extends \Magento\Adminhtml\Block\Sales\Order\AbstractOrder
+class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
{
/**
* Retrieve invoice order
@@ -70,7 +70,7 @@ class Form extends \Magento\Adminhtml\Block\Sales\Order\AbstractOrder
*/
public function getOrderUrl()
{
- return $this->getUrl('*/sales_order/view', array('order_id' => $this->getInvoice()->getOrderId()));
+ return $this->getUrl('sales/order/view', array('order_id' => $this->getInvoice()->getOrderId()));
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/View/Items.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Items.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/View/Items.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Items.php
index aa34305e252..5465f2bc064 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/View/Items.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Items.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,12 +29,12 @@
* Adminhtml sales item renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Invoice\View;
+namespace Magento\Sales\Block\Adminhtml\Order\Invoice\View;
-class Items extends \Magento\Adminhtml\Block\Sales\Items\AbstractItems
+class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
{
/**
* Retrieve invoice order
@@ -71,7 +71,7 @@ class Items extends \Magento\Adminhtml\Block\Sales\Items\AbstractItems
*/
public function getOrderUrl()
{
- return $this->getUrl('*/sales_order/view', array('order_id' => $this->getInvoice()->getOrderId()));
+ return $this->getUrl('sales/order/view', array('order_id' => $this->getInvoice()->getOrderId()));
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Payment.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Payment.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php
index 6017b00ebba..06472bbf98b 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Payment.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Adminhtml sales order payment information
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order;
+namespace Magento\Sales\Block\Adminhtml\Order;
class Payment extends \Magento\Adminhtml\Block\Template
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/Create.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Create.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/Create.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Create.php
index 35668dac703..6a5ee296de0 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/Create.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Create.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Adminhtml shipment create
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Shipment;
+namespace Magento\Sales\Block\Adminhtml\Order\Shipment;
class Create extends \Magento\Adminhtml\Block\Widget\Form\Container
{
@@ -58,7 +58,7 @@ class Create extends \Magento\Adminhtml\Block\Widget\Form\Container
protected function _construct()
{
$this->_objectId = 'order_id';
- $this->_controller = 'sales_order_shipment';
+ $this->_controller = 'adminhtml_order_shipment';
$this->_mode = 'create';
parent::_construct();
@@ -86,7 +86,7 @@ class Create extends \Magento\Adminhtml\Block\Widget\Form\Container
public function getBackUrl()
{
return $this->getUrl(
- '*/sales_order/view',
+ 'sales/order/view',
array('order_id' => $this->getShipment() ? $this->getShipment()->getOrderId() : null)
);
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Create/Form.php
similarity index 82%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Create/Form.php
index 1a05b6f897f..04bafb850c5 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Create/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,9 +28,9 @@
* Adminhtml shipment create form
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Shipment\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Shipment\Create;
-class Form extends \Magento\Adminhtml\Block\Sales\Order\AbstractOrder
+class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
{
/**
* Retrieve invoice order
@@ -64,8 +64,8 @@ class Form extends \Magento\Adminhtml\Block\Sales\Order\AbstractOrder
protected function _prepareLayout()
{
- $this->addChild('items', 'Magento\Adminhtml\Block\Sales\Order\Shipment\Create\Items');
- $this->addChild('tracking', 'Magento\Adminhtml\Block\Sales\Order\Shipment\Create\Tracking');
+ $this->addChild('items', 'Magento\Sales\Block\Adminhtml\Order\Shipment\Create\Items');
+ $this->addChild('tracking', 'Magento\Sales\Block\Adminhtml\Order\Shipment\Create\Tracking');
return parent::_prepareLayout();
}
@@ -81,6 +81,6 @@ class Form extends \Magento\Adminhtml\Block\Sales\Order\AbstractOrder
public function getSaveUrl()
{
- return $this->getUrl('*/*/save', array('order_id' => $this->getShipment()->getOrderId()));
+ return $this->getUrl('sales/*/save', array('order_id' => $this->getShipment()->getOrderId()));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Create/Items.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Create/Items.php
index a9cde4f171b..cb507b61100 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Create/Items.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -27,9 +27,9 @@
/**
* Adminhtml shipment items grid
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Shipment\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Shipment\Create;
-class Items extends \Magento\Adminhtml\Block\Sales\Items\AbstractItems
+class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
{
/**
* Sales data
@@ -130,7 +130,7 @@ class Items extends \Magento\Adminhtml\Block\Sales\Items\AbstractItems
*/
public function getUpdateUrl()
{
- return $this->getUrl('*/*/updateQty', array('order_id'=>$this->getShipment()->getOrderId()));
+ return $this->getUrl('sales/*/updateQty', array('order_id'=>$this->getShipment()->getOrderId()));
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Create/Tracking.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Create/Tracking.php
index e03baa81879..2680a4bee33 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/Create/Tracking.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Create/Tracking.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Shipment tracking control form
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Shipment\Create;
+namespace Magento\Sales\Block\Adminhtml\Order\Shipment\Create;
class Tracking extends \Magento\Adminhtml\Block\Template
{
@@ -69,7 +69,7 @@ class Tracking extends \Magento\Adminhtml\Block\Template
/**
* Prepares layout of block
*
- * @return \Magento\Adminhtml\Block\Sales\Order\View\Giftmessage
+ * @return \Magento\Sales\Block\Adminhtml\Order\View\Giftmessage
*/
protected function _prepareLayout()
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/Packaging.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/Packaging.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging.php
index 8414e023f50..7df64ccb179 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/Packaging.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Adminhtml shipment packaging
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Shipment;
+namespace Magento\Sales\Block\Adminhtml\Order\Shipment;
class Packaging extends \Magento\Adminhtml\Block\Template
{
@@ -92,8 +92,8 @@ class Packaging extends \Magento\Adminhtml\Block\Template
if ($shipmentId) {
$urlParams['shipment_id'] = $shipmentId;
- $createLabelUrl = $this->getUrl('*/sales_order_shipment/createLabel', $urlParams);
- $itemsGridUrl = $this->getUrl('*/sales_order_shipment/getShippingItemsGrid', $urlParams);
+ $createLabelUrl = $this->getUrl('sales/order_shipment/createLabel', $urlParams);
+ $itemsGridUrl = $this->getUrl('sales/order_shipment/getShippingItemsGrid', $urlParams);
foreach ($this->getShipment()->getAllItems() as $item) {
$itemsQty[$item->getId()] = $item->getQty();
$itemsPrice[$item->getId()] = $item->getPrice();
@@ -104,8 +104,8 @@ class Packaging extends \Magento\Adminhtml\Block\Template
}
} else if ($orderId) {
$urlParams['order_id'] = $orderId;
- $createLabelUrl = $this->getUrl('*/sales_order_shipment/save', $urlParams);
- $itemsGridUrl = $this->getUrl('*/sales_order_shipment/getShippingItemsGrid', $urlParams);
+ $createLabelUrl = $this->getUrl('sales/order_shipment/save', $urlParams);
+ $itemsGridUrl = $this->getUrl('sales/order_shipment/getShippingItemsGrid', $urlParams);
foreach ($this->getShipment()->getAllItems() as $item) {
$itemsQty[$item->getOrderItemId()] = $item->getQty()*1;
@@ -302,7 +302,7 @@ class Packaging extends \Magento\Adminhtml\Block\Template
public function getPrintButton()
{
$data['shipment_id'] = $this->getShipment()->getId();
- $url = $this->getUrl('*/sales_order_shipment/printPackage', $data);
+ $url = $this->getUrl('sales/order_shipment/printPackage', $data);
return $this->getLayout()
->createBlock('Magento\Adminhtml\Block\Widget\Button')
->setData(array(
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging/Grid.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging/Grid.php
index 038441862a4..a82f082f5b3 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging/Grid.php
@@ -28,15 +28,15 @@
* Grid of packaging shipment
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Shipment\Packaging;
+namespace Magento\Sales\Block\Adminhtml\Order\Shipment\Packaging;
class Grid extends \Magento\Adminhtml\Block\Template
{
- protected $_template = 'sales/order/shipment/packaging/grid.phtml';
+ protected $_template = 'order/shipment/packaging/grid.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Tracking/Info.php
similarity index 84%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Tracking/Info.php
index 1e029b535a4..c50d2cf93e2 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Tracking/Info.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Shipment tracking control form
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Shipment\Tracking;
+namespace Magento\Sales\Block\Adminhtml\Order\Shipment\Tracking;
class Info extends \Magento\Adminhtml\Block\Template
{
- protected $_template = 'sales/order/shipment/tracking/info.phtml';
+ protected $_template = 'order/shipment/tracking/info.phtml';
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/View.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View.php
index d7776b38408..05a1e5611d1 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Adminhtml shipment create
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Shipment;
+namespace Magento\Sales\Block\Adminhtml\Order\Shipment;
class View extends \Magento\Adminhtml\Block\Widget\Form\Container
{
@@ -61,7 +61,7 @@ class View extends \Magento\Adminhtml\Block\Widget\Form\Container
protected function _construct()
{
$this->_objectId = 'shipment_id';
- $this->_controller = 'sales_order_shipment';
+ $this->_controller = 'adminhtml_order_shipment';
$this->_mode = 'view';
parent::_construct();
@@ -114,7 +114,7 @@ class View extends \Magento\Adminhtml\Block\Widget\Form\Container
public function getBackUrl()
{
return $this->getUrl(
- '*/sales_order/view',
+ 'sales/order/view',
array(
'order_id' => $this->getShipment() ? $this->getShipment()->getOrderId() : null,
'active_tab' => 'order_shipments'
@@ -123,12 +123,12 @@ class View extends \Magento\Adminhtml\Block\Widget\Form\Container
public function getEmailUrl()
{
- return $this->getUrl('*/sales_order_shipment/email', array('shipment_id' => $this->getShipment()->getId()));
+ return $this->getUrl('sales/order_shipment/email', array('shipment_id' => $this->getShipment()->getId()));
}
public function getPrintUrl()
{
- return $this->getUrl('*/*/print', array(
+ return $this->getUrl('sales/*/print', array(
'invoice_id' => $this->getShipment()->getId()
));
}
@@ -139,7 +139,7 @@ class View extends \Magento\Adminhtml\Block\Widget\Form\Container
if ($this->getShipment()->getBackUrl()) {
return $this->_updateButton('back', 'onclick', 'setLocation(\'' . $this->getShipment()->getBackUrl() . '\')');
}
- return $this->_updateButton('back', 'onclick', 'setLocation(\'' . $this->getUrl('*/sales_shipment/') . '\')');
+ return $this->_updateButton('back', 'onclick', 'setLocation(\'' . $this->getUrl('sales/shipment/') . '\')');
}
return $this;
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Comments.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Comments.php
index 3a9efcfb00e..d17c363c221 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/View/Comments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Comments.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,10 +29,10 @@
* Adminhtml sales shipment comment view block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Shipment\View;
+namespace Magento\Sales\Block\Adminhtml\Order\Shipment\View;
class Comments extends \Magento\Adminhtml\Block\Text\ListText
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/View/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Form.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/View/Form.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Form.php
index 766457f3c00..0d78d792a06 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/View/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Shipment view form
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Shipment\View;
+namespace Magento\Sales\Block\Adminhtml\Order\Shipment\View;
-class Form extends \Magento\Adminhtml\Block\Sales\Order\AbstractOrder
+class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
{
/**
* Retrieve shipment model instance
@@ -73,7 +73,7 @@ class Form extends \Magento\Adminhtml\Block\Sales\Order\AbstractOrder
public function getCreateLabelButton()
{
$data['shipment_id'] = $this->getShipment()->getId();
- $url = $this->getUrl('*/sales_order_shipment/createLabel', $data);
+ $url = $this->getUrl('sales/order_shipment/createLabel', $data);
return $this->getLayout()
->createBlock('Magento\Adminhtml\Block\Widget\Button')
->setData(array(
@@ -91,7 +91,7 @@ class Form extends \Magento\Adminhtml\Block\Sales\Order\AbstractOrder
public function getPrintLabelButton()
{
$data['shipment_id'] = $this->getShipment()->getId();
- $url = $this->getUrl('*/sales_order_shipment/printLabel', $data);
+ $url = $this->getUrl('sales/order_shipment/printLabel', $data);
return $this->getLayout()
->createBlock('Magento\Adminhtml\Block\Widget\Button')
->setData(array(
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/View/Items.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Items.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/View/Items.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Items.php
index 61f8faf9e58..fbbd7669773 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/View/Items.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Items.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,12 +29,12 @@
* Adminhtml sales item renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Shipment\View;
+namespace Magento\Sales\Block\Adminhtml\Order\Shipment\View;
-class Items extends \Magento\Adminhtml\Block\Sales\Items\AbstractItems
+class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
{
/**
* Retrieve shipment model instance
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Tracking.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Tracking.php
index 53412f3a90f..5586fa558c8 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Tracking.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Shipment tracking control form
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Shipment\View;
+namespace Magento\Sales\Block\Adminhtml\Order\Shipment\View;
class Tracking extends \Magento\Adminhtml\Block\Template
{
@@ -69,7 +69,7 @@ class Tracking extends \Magento\Adminhtml\Block\Template
/**
* Prepares layout of block
*
- * @return \Magento\Adminhtml\Block\Sales\Order\View\Giftmessage
+ * @return \Magento\Sales\Block\Adminhtml\Order\View\Giftmessage
*/
protected function _prepareLayout()
{
@@ -98,7 +98,7 @@ class Tracking extends \Magento\Adminhtml\Block\Template
*/
public function getSubmitUrl()
{
- return $this->getUrl('*/*/addTrack/', array('shipment_id'=>$this->getShipment()->getId()));
+ return $this->getUrl('sales/*/addTrack/', array('shipment_id'=>$this->getShipment()->getId()));
}
/**
@@ -118,7 +118,7 @@ class Tracking extends \Magento\Adminhtml\Block\Template
*/
public function getRemoveUrl($track)
{
- return $this->getUrl('*/*/removeTrack/', array(
+ return $this->getUrl('sales/*/removeTrack/', array(
'shipment_id' => $this->getShipment()->getId(),
'track_id' => $track->getId()
));
@@ -131,7 +131,7 @@ class Tracking extends \Magento\Adminhtml\Block\Template
*/
public function getTrackInfoUrl($track)
{
- return $this->getUrl('*/*/viewTrack/', array(
+ return $this->getUrl('sales/*/viewTrack/', array(
'shipment_id' => $this->getShipment()->getId(),
'track_id' => $track->getId()
));
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Status.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Status.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Status.php
index 7c7637254e3..f4fd51322ae 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Status.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Adminhtml sales order's status management block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order;
+namespace Magento\Sales\Block\Adminhtml\Order;
class Status extends \Magento\Backend\Block\Widget\Grid\Container
{
@@ -40,7 +40,7 @@ class Status extends \Magento\Backend\Block\Widget\Grid\Container
*/
protected function _construct()
{
- $this->_controller = 'sales_order_status';
+ $this->_controller = 'adminhtml_order_status';
$this->_headerText = __('Order Statuses');
$this->_addButtonLabel = __('Create New Status');
$this->_addButton('assign', array(
@@ -58,7 +58,7 @@ class Status extends \Magento\Backend\Block\Widget\Grid\Container
*/
public function getCreateUrl()
{
- return $this->getUrl('*/sales_order_status/new');
+ return $this->getUrl('sales/order_status/new');
}
/**
@@ -68,6 +68,6 @@ class Status extends \Magento\Backend\Block\Widget\Grid\Container
*/
public function getAssignUrl()
{
- return $this->getUrl('*/sales_order_status/assign');
+ return $this->getUrl('sales/order_status/assign');
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Status/Assign.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Status/Assign.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php
index 4090f5cb0d7..6f1cc5b1714 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Status/Assign.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php
@@ -19,19 +19,19 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Status;
+namespace Magento\Sales\Block\Adminhtml\Order\Status;
class Assign extends \Magento\Adminhtml\Block\Widget\Form\Container
{
protected function _construct()
{
- $this->_controller = 'sales_order_status';
+ $this->_controller = 'adminhtml_order_status';
$this->_mode = 'assign';
parent::_construct();
$this->_updateButton('save', 'label', __('Save Status Assignment'));
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Status/Assign/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign/Form.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Status/Assign/Form.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign/Form.php
index 8eb07dee9d5..c806582f6a1 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Status/Assign/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -27,7 +27,7 @@
/**
* Assign order status to order state form
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Status\Assign;
+namespace Magento\Sales\Block\Adminhtml\Order\Status\Assign;
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
@@ -124,7 +124,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
);
- $form->setAction($this->getUrl('*/sales_order_status/assignPost'));
+ $form->setAction($this->getUrl('sales/order_status/assignPost'));
$form->setUseContainer(true);
$this->setForm($form);
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Status/Edit.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Status/Edit.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php
index b58eed3a0b6..e65b3c7d3a2 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Status/Edit.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php
@@ -19,14 +19,14 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Status;
+namespace Magento\Sales\Block\Adminhtml\Order\Status;
-class Edit extends \Magento\Adminhtml\Block\Sales\Order\Status\NewStatus
+class Edit extends \Magento\Sales\Block\Adminhtml\Order\Status\NewStatus
{
protected function _construct()
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Status/Edit/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit/Form.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Status/Edit/Form.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit/Form.php
index b74890c2293..f2a18669192 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Status/Edit/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -27,9 +27,9 @@
/**
* Edit status form
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Status\Edit;
+namespace Magento\Sales\Block\Adminhtml\Order\Status\Edit;
-class Form extends \Magento\Adminhtml\Block\Sales\Order\Status\NewStatus\Form
+class Form extends \Magento\Sales\Block\Adminhtml\Order\Status\NewStatus\Form
{
protected function _construct()
{
@@ -49,7 +49,7 @@ class Form extends \Magento\Adminhtml\Block\Sales\Order\Status\NewStatus\Form
$form->getElement('base_fieldset')->removeField('is_new');
$form->getElement('base_fieldset')->removeField('status');
$form->setAction(
- $this->getUrl('*/sales_order_status/save', array('status'=>$this->getRequest()->getParam('status')))
+ $this->getUrl('sales/order_status/save', array('status'=>$this->getRequest()->getParam('status')))
);
return $this;
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Status/NewStatus.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Status/NewStatus.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus.php
index a73b1b1100a..68c2545f524 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Status/NewStatus.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus.php
@@ -19,12 +19,12 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Status;
+namespace Magento\Sales\Block\Adminhtml\Order\Status;
class NewStatus extends \Magento\Adminhtml\Block\Widget\Form\Container
{
@@ -32,7 +32,7 @@ class NewStatus extends \Magento\Adminhtml\Block\Widget\Form\Container
protected function _construct()
{
$this->_objectId = 'status';
- $this->_controller = 'sales_order_status';
+ $this->_controller = 'adminhtml_order_status';
$this->_mode = 'new';
parent::_construct();
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Status/NewStatus/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus/Form.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Status/NewStatus/Form.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus/Form.php
index fe0d341635e..c4c588b11fb 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Status/NewStatus/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -27,7 +27,7 @@
/**
* Create order status form
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Status\NewStatus;
+namespace Magento\Sales\Block\Adminhtml\Order\Status\NewStatus;
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
@@ -84,7 +84,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
if ($model) {
$form->addValues($model->getData());
}
- $form->setAction($this->getUrl('*/sales_order_status/save'));
+ $form->setAction($this->getUrl('sales/order_status/save'));
$form->setUseContainer(true);
$this->setForm($form);
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Totalbar.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Totalbar.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php
index 72e0827a616..d06b0aaad41 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Totalbar.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Adminhtml creditmemo bar
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order;
+namespace Magento\Sales\Block\Adminhtml\Order;
-class Totalbar extends \Magento\Adminhtml\Block\Sales\Order\AbstractOrder
+class Totalbar extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
{
protected $_totals = array();
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Totals.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php
index fea1015b9a1..74f6800c73f 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Adminhtml order totals block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order;
+namespace Magento\Sales\Block\Adminhtml\Order;
-class Totals extends \Magento\Adminhtml\Block\Sales\Totals//\Magento\Adminhtml\Block\Sales\Order\AbstractOrder
+class Totals extends \Magento\Sales\Block\Adminhtml\Totals//\Magento\Sales\Block\Adminhtml\Order\AbstractOrder
{
/**
* Initialize order totals array
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Totals/Item.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Item.php
similarity index 83%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Totals/Item.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Item.php
index 7905cdeaa4c..891888757cf 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Totals/Item.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Item.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -27,14 +27,14 @@
/**
* Totals item block
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Totals;
+namespace Magento\Sales\Block\Adminhtml\Order\Totals;
-class Item extends \Magento\Adminhtml\Block\Sales\Order\Totals
+class Item extends \Magento\Sales\Block\Adminhtml\Order\Totals
{
/**
* Determine display parameters before rendering HTML
*
- * @return \Magento\Adminhtml\Block\Sales\Order\Totals\Item
+ * @return \Magento\Sales\Block\Adminhtml\Order\Totals\Item
*/
protected function _beforeToHtml()
{
@@ -50,7 +50,7 @@ class Item extends \Magento\Adminhtml\Block\Sales\Order\Totals
/**
* Initialize totals object
*
- * @return \Magento\Adminhtml\Block\Sales\Order\Totals\Item
+ * @return \Magento\Sales\Block\Adminhtml\Order\Totals\Item
*/
public function initTotals()
{
@@ -77,7 +77,7 @@ class Item extends \Magento\Adminhtml\Block\Sales\Order\Totals
*/
public function displayPrices($baseAmount, $amount)
{
- return $this->helper('Magento\Adminhtml\Helper\Sales')->displayPrices($this->getOrder(), $baseAmount, $amount);
+ return $this->helper('Magento\Sales\Helper\Admin')->displayPrices($this->getOrder(), $baseAmount, $amount);
}
/**
@@ -90,7 +90,7 @@ class Item extends \Magento\Adminhtml\Block\Sales\Order\Totals
*/
public function displayPriceAttribute($code, $strong = false, $separator = '<br/>')
{
- return $this->helper('Magento\Adminhtml\Helper\Sales')->displayPriceAttribute($this->getSource(), $code, $strong, $separator);
+ return $this->helper('Magento\Sales\Helper\Admin')->displayPriceAttribute($this->getSource(), $code, $strong, $separator);
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/Totals/Tax.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/Totals/Tax.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php
index 1ee068c599d..d1562b4f729 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/Totals/Tax.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Adminhtml order tax totals block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Totals;
+namespace Magento\Sales\Block\Adminhtml\Order\Totals;
class Tax extends \Magento\Tax\Block\Sales\Order\Tax
{
@@ -111,7 +111,7 @@ class Tax extends \Magento\Tax\Block\Sales\Order\Tax
*/
public function displayAmount($amount, $baseAmount)
{
- return $this->_helperFactory->get('Magento\Adminhtml\Helper\Sales')->displayPrices(
+ return $this->_helperFactory->get('Magento\Sales\Helper\Admin')->displayPrices(
$this->getSource(), $baseAmount, $amount, false, '<br />'
);
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/View.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/View.php
index 181a162c3ee..3affddbf457 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,17 +28,17 @@
* Adminhtml sales order view
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order;
+namespace Magento\Sales\Block\Adminhtml\Order;
class View extends \Magento\Backend\Block\Widget\Form\Container
{
/**
* @var string
*/
- protected $_blockGroup = 'Magento_Adminhtml';
+ protected $_blockGroup = 'Magento_Sales';
/**
* Core registry
@@ -74,7 +74,7 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
protected function _construct()
{
$this->_objectId = 'order_id';
- $this->_controller = 'sales_order';
+ $this->_controller = 'adminhtml_order';
$this->_mode = 'view';
parent::_construct();
@@ -255,52 +255,52 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
public function getEditUrl()
{
- return $this->getUrl('*/sales_order_edit/start');
+ return $this->getUrl('sales/order_edit/start');
}
public function getEmailUrl()
{
- return $this->getUrl('*/*/email');
+ return $this->getUrl('sales/*/email');
}
public function getCancelUrl()
{
- return $this->getUrl('*/*/cancel');
+ return $this->getUrl('sales/*/cancel');
}
public function getInvoiceUrl()
{
- return $this->getUrl('*/sales_order_invoice/start');
+ return $this->getUrl('sales/order_invoice/start');
}
public function getCreditmemoUrl()
{
- return $this->getUrl('*/sales_order_creditmemo/start');
+ return $this->getUrl('sales/order_creditmemo/start');
}
public function getHoldUrl()
{
- return $this->getUrl('*/*/hold');
+ return $this->getUrl('sales/*/hold');
}
public function getUnholdUrl()
{
- return $this->getUrl('*/*/unhold');
+ return $this->getUrl('sales/*/unhold');
}
public function getShipUrl()
{
- return $this->getUrl('*/sales_order_shipment/start');
+ return $this->getUrl('sales/order_shipment/start');
}
public function getCommentUrl()
{
- return $this->getUrl('*/*/comment');
+ return $this->getUrl('sales/*/comment');
}
public function getReorderUrl()
{
- return $this->getUrl('*/sales_order_create/reorder');
+ return $this->getUrl('sales/order_create/reorder');
}
/**
@@ -308,7 +308,7 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
*/
public function getVoidPaymentUrl()
{
- return $this->getUrl('*/*/voidPayment');
+ return $this->getUrl('sales/*/voidPayment');
}
protected function _isAllowedAction($resourceId)
@@ -327,11 +327,11 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
return $this->getOrder()->getBackUrl();
}
- return $this->getUrl('*/*/');
+ return $this->getUrl('sales/*/');
}
public function getReviewPaymentUrl($action)
{
- return $this->getUrl('*/*/reviewPayment', array('action' => $action));
+ return $this->getUrl('sales/*/reviewPayment', array('action' => $action));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/View/Form.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php
index a93bc2e3035..9fee36cbd40 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,14 +28,13 @@
* Adminhtml sales order view plane
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\View;
+namespace Magento\Sales\Block\Adminhtml\Order\View;
class Form extends \Magento\Adminhtml\Block\Template
{
-
- protected $_template = 'sales/order/view/form.phtml';
+ protected $_template = 'order/view/form.phtml';
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Giftmessage.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/View/Giftmessage.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php
index 1434eb6b6eb..433065c6f69 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Giftmessage.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Edit order giftmessage block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\View;
+namespace Magento\Sales\Block\Adminhtml\Order\View;
class Giftmessage extends \Magento\Adminhtml\Block\Widget
{
@@ -101,7 +101,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
/**
* Prepares layout of block
*
- * @return \Magento\Adminhtml\Block\Sales\Order\View\Giftmessage
+ * @return \Magento\Sales\Block\Adminhtml\Order\View\Giftmessage
*/
protected function _prepareLayout()
{
@@ -131,7 +131,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
* Set entity for form
*
* @param \Magento\Object $entity
- * @return \Magento\Adminhtml\Block\Sales\Order\View\Giftmessage
+ * @return \Magento\Sales\Block\Adminhtml\Order\View\Giftmessage
*/
public function setEntity(\Magento\Object $entity)
{
@@ -234,7 +234,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
/**
* Initialize gift message for entity
*
- * @return \Magento\Adminhtml\Block\Sales\Order\View\Giftmessage
+ * @return \Magento\Sales\Block\Adminhtml\Order\View\Giftmessage
*/
protected function _initMessage()
{
@@ -269,7 +269,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
public function getSaveUrl()
{
- return $this->getUrl('*/sales_order_view_giftmessage/save',
+ return $this->getUrl('sales/order_view_giftmessage/save',
array(
'entity'=>$this->getEntity()->getId(),
'type' =>'order',
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/View/History.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/View/History.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
index ab5083cb0ee..0dee2b79693 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/View/History.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Order history block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\View;
+namespace Magento\Sales\Block\Adminhtml\Order\View;
class History extends \Magento\Adminhtml\Block\Template
{
@@ -111,7 +111,7 @@ class History extends \Magento\Adminhtml\Block\Template
public function getSubmitUrl()
{
- return $this->getUrl('*/*/addComment', array('order_id'=>$this->getOrder()->getId()));
+ return $this->getUrl('sales/*/addComment', array('order_id'=>$this->getOrder()->getId()));
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Info.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/View/Info.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php
index a8a471e8e8b..4a865a7f871 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Info.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Order history block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\View;
+namespace Magento\Sales\Block\Adminhtml\Order\View;
-class Info extends \Magento\Adminhtml\Block\Sales\Order\AbstractOrder
+class Info extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
{
/**
* @var \Magento\Customer\Model\GroupFactory
@@ -134,12 +134,12 @@ class Info extends \Magento\Adminhtml\Block\Sales\Order\AbstractOrder
if ($this->getOrder()->getCustomerIsGuest() || !$this->getOrder()->getCustomerId()) {
return false;
}
- return $this->getUrl('*/customer/edit', array('id' => $this->getOrder()->getCustomerId()));
+ return $this->getUrl('adminhtml/customer/edit', array('id' => $this->getOrder()->getCustomerId()));
}
public function getViewUrl($orderId)
{
- return $this->getUrl('*/sales_order/view', array('order_id'=>$orderId));
+ return $this->getUrl('sales/order/view', array('order_id'=>$orderId));
}
/**
@@ -208,7 +208,7 @@ class Info extends \Magento\Adminhtml\Block\Sales\Order\AbstractOrder
if (empty($label)) {
$label = __('Edit');
}
- $url = $this->getUrl('*/sales_order/address', array('address_id'=>$address->getId()));
+ $url = $this->getUrl('sales/order/address', array('address_id'=>$address->getId()));
return '<a href="'.$url.'">' . $label . '</a>';
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Items.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/View/Items.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/View/Items.php
index 5fd1b6fffab..84a15450434 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Items.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Adminhtml order items grid
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\View;
+namespace Magento\Sales\Block\Adminhtml\Order\View;
-class Items extends \Magento\Adminhtml\Block\Sales\Items\AbstractItems
+class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
{
/**
* Retrieve required options from parent
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Items/Renderer/DefaultRenderer.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/View/Items/Renderer/DefaultRenderer.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php
index 54411ea36fb..72eda211795 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Items/Renderer/DefaultRenderer.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,11 +29,11 @@
* Adminhtml sales order item renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
*/
-namespace Magento\Adminhtml\Block\Sales\Order\View\Items\Renderer;
+namespace Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer;
-class DefaultRenderer extends \Magento\Adminhtml\Block\Sales\Items\AbstractItems
+class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
{
public function getItem()
{
@@ -138,7 +138,7 @@ class DefaultRenderer extends \Magento\Adminhtml\Block\Sales\Items\AbstractItems
/**
* Initialize gift message for entity
*
- * @return \Magento\Adminhtml\Block\Sales\Order\View\Giftmessage
+ * @return \Magento\Sales\Block\Adminhtml\Order\View\Giftmessage
*/
protected function _initMessage()
{
@@ -177,7 +177,7 @@ class DefaultRenderer extends \Magento\Adminhtml\Block\Sales\Items\AbstractItems
*/
public function getSaveUrl()
{
- return $this->getUrl('*/sales_order_view_giftmessage/save', array(
+ return $this->getUrl('sales/order_view_giftmessage/save', array(
'entity' => $this->getItem()->getId(),
'type' => 'order_item',
'reload' => true
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Messages.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/View/Messages.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php
index ecf942b0989..1b16d9cdfd3 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Messages.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Order view messages
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\View;
+namespace Magento\Sales\Block\Adminhtml\Order\View;
class Messages extends \Magento\Adminhtml\Block\Messages
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Creditmemos.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Creditmemos.php
index fca72081627..133318058db 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Creditmemos.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Order Credit Memos grid
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\View\Tab;
+namespace Magento\Sales\Block\Adminhtml\Order\View\Tab;
class Creditmemos
extends \Magento\Adminhtml\Block\Widget\Grid
@@ -175,7 +175,7 @@ class Creditmemos
public function getRowUrl($row)
{
return $this->getUrl(
- '*/sales_order_creditmemo/view',
+ '*/order_creditmemo/view',
array(
'creditmemo_id' => $row->getId(),
'order_id' => $row->getOrderId()
@@ -184,7 +184,7 @@ class Creditmemos
public function getGridUrl()
{
- return $this->getUrl('*/*/creditmemos', array('_current' => true));
+ return $this->getUrl('sales/*/creditmemos', array('_current' => true));
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Tab/History.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/View/Tab/History.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
index 9bc42a262c2..7224aa1439d 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Tab/History.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,17 +28,17 @@
* Order history tab
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\View\Tab;
+namespace Magento\Sales\Block\Adminhtml\Order\View\Tab;
class History
extends \Magento\Adminhtml\Block\Template
implements \Magento\Adminhtml\Block\Widget\Tab\TabInterface
{
- protected $_template = 'sales/order/view/tab/history.phtml';
+ protected $_template = 'order/view/tab/history.phtml';
/**
* Core registry
@@ -279,7 +279,7 @@ class History
*/
public function getTabUrl()
{
- return $this->getUrl('*/*/commentsHistory', array('_current' => true));
+ return $this->getUrl('sales/*/commentsHistory', array('_current' => true));
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Tab/Info.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Info.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/View/Tab/Info.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Info.php
index c329d16effb..cc5b656cd6c 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Tab/Info.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Info.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Order information tab
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\View\Tab;
+namespace Magento\Sales\Block\Adminhtml\Order\View\Tab;
class Info
- extends \Magento\Adminhtml\Block\Sales\Order\AbstractOrder
+ extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
implements \Magento\Adminhtml\Block\Widget\Tab\TabInterface
{
/**
@@ -105,7 +105,7 @@ class Info
public function getViewUrl($orderId)
{
- return $this->getUrl('*/*/*', array('order_id'=>$orderId));
+ return $this->getUrl('sales/*/*', array('order_id'=>$orderId));
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Invoices.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Invoices.php
index e65c0d8ac70..5cd897248ad 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Invoices.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Order Invoices grid
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\View\Tab;
+namespace Magento\Sales\Block\Adminhtml\Order\View\Tab;
class Invoices
extends \Magento\Adminhtml\Block\Widget\Grid
@@ -174,7 +174,7 @@ class Invoices
public function getRowUrl($row)
{
- return $this->getUrl('*/sales_order_invoice/view',
+ return $this->getUrl('sales/order_invoice/view',
array(
'invoice_id'=> $row->getId(),
'order_id' => $row->getOrderId()
@@ -184,7 +184,7 @@ class Invoices
public function getGridUrl()
{
- return $this->getUrl('*/*/invoices', array('_current' => true));
+ return $this->getUrl('sales/*/invoices', array('_current' => true));
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Shipments.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Shipments.php
index b56957c06e0..89768475eb2 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Shipments.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -27,7 +27,7 @@
/**
* Order Shipments grid
*/
-namespace Magento\Adminhtml\Block\Sales\Order\View\Tab;
+namespace Magento\Sales\Block\Adminhtml\Order\View\Tab;
class Shipments
extends \Magento\Adminhtml\Block\Widget\Grid
@@ -147,7 +147,7 @@ class Shipments
public function getRowUrl($row)
{
return $this->getUrl(
- '*/sales_order_shipment/view',
+ '*/order_shipment/view',
array(
'shipment_id'=> $row->getId(),
'order_id' => $row->getOrderId()
@@ -156,7 +156,7 @@ class Shipments
public function getGridUrl()
{
- return $this->getUrl('*/*/shipments', array('_current' => true));
+ return $this->getUrl('sales/*/shipments', array('_current' => true));
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Tab/Transactions.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Transactions.php
similarity index 84%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/View/Tab/Transactions.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Transactions.php
index 8128a907772..85a6c3aebdb 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Tab/Transactions.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/Transactions.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Order transactions tab
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Order\View\Tab;
+namespace Magento\Sales\Block\Adminhtml\Order\View\Tab;
class Transactions
- extends \Magento\Adminhtml\Block\Sales\Transactions\Grid
+ extends \Magento\Sales\Block\Adminhtml\Transactions\Grid
implements \Magento\Adminhtml\Block\Widget\Tab\TabInterface
{
@@ -45,7 +45,7 @@ class Transactions
*/
public function getGridUrl()
{
- return $this->getUrl('*/sales_order/transactions', array('_current' => true));
+ return $this->getUrl('sales/order/transactions', array('_current' => true));
}
/**
@@ -55,7 +55,7 @@ class Transactions
*/
public function getRowUrl($item)
{
- return $this->getUrl('*/sales_transactions/view', array('_current' => true, 'txn_id' => $item->getId()));
+ return $this->getUrl('sales/transactions/view', array('_current' => true, 'txn_id' => $item->getId()));
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Tabs.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tabs.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Sales/Order/View/Tabs.php
rename to app/code/Magento/Sales/Block/Adminhtml/Order/View/Tabs.php
index 52fc46d33b5..3632f9c70a9 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Order/View/Tabs.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tabs.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -27,7 +27,7 @@
/**
* Order view tabs
*/
-namespace Magento\Adminhtml\Block\Sales\Order\View;
+namespace Magento\Sales\Block\Adminhtml\Order\View;
class Tabs extends \Magento\Backend\Block\Widget\Tabs
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php
index 397a668abf1..450f3aafecd 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/Edit/Form.php
@@ -137,7 +137,7 @@ class Form extends \Magento\Backend\Block\AbstractBlock
$this->getLayout()->createBlock('Magento\Adminhtml\Block\Widget\Form\Renderer\Fieldset')
);
$form->setFieldsetElementRenderer(
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Catalog\Form\Renderer\Fieldset\Element')
+ $this->getLayout()->createBlock('Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element')
);
/**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/Grid.php
index 48cbd32b0b8..cc30f4d76f8 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/Grid.php
@@ -178,7 +178,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
*/
public function getRowUrl($row)
{
- return $this->getUrl('*/sales_recurring_profile/view', array('profile' => $row->getId()));
+ return $this->getUrl('sales/recurring_profile/view', array('profile' => $row->getId()));
}
/**
@@ -188,6 +188,6 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
*/
public function getGridUrl()
{
- return $this->getUrl('*/*/grid', array('_current'=>true));
+ return $this->getUrl('adminhtml/*/grid', array('_current'=>true));
}
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View.php b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View.php
index db474c6e272..ff704fd7b9c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View.php
@@ -63,7 +63,7 @@ class View extends \Magento\Backend\Block\Widget\Container
{
$this->_addButton('back', array(
'label' => __('Back'),
- 'onclick' => "setLocation('{$this->getUrl('*/*/')}')",
+ 'onclick' => "setLocation('{$this->getUrl('adminhtml/*/')}')",
'class' => 'back',
));
@@ -72,7 +72,7 @@ class View extends \Magento\Backend\Block\Widget\Container
// cancel
if ($profile->canCancel()) {
- $url = $this->getUrl('*/*/updateState', array('profile' => $profile->getId(), 'action' => 'cancel'));
+ $url = $this->getUrl('adminhtml/*/updateState', array('profile' => $profile->getId(), 'action' => 'cancel'));
$this->_addButton('cancel', array(
'label' => __('Cancel'),
'onclick' => "confirmSetLocation('{$comfirmationMessage}', '{$url}')",
@@ -82,7 +82,7 @@ class View extends \Magento\Backend\Block\Widget\Container
// suspend
if ($profile->canSuspend()) {
- $url = $this->getUrl('*/*/updateState', array('profile' => $profile->getId(), 'action' => 'suspend'));
+ $url = $this->getUrl('adminhtml/*/updateState', array('profile' => $profile->getId(), 'action' => 'suspend'));
$this->_addButton('suspend', array(
'label' => __('Suspend'),
'onclick' => "confirmSetLocation('{$comfirmationMessage}', '{$url}')",
@@ -92,7 +92,7 @@ class View extends \Magento\Backend\Block\Widget\Container
// activate
if ($profile->canActivate()) {
- $url = $this->getUrl('*/*/updateState', array('profile' => $profile->getId(), 'action' => 'activate'));
+ $url = $this->getUrl('adminhtml/*/updateState', array('profile' => $profile->getId(), 'action' => 'activate'));
$this->_addButton('activate', array(
'label' => __('Activate'),
'onclick' => "confirmSetLocation('{$comfirmationMessage}', '{$url}')",
@@ -102,7 +102,7 @@ class View extends \Magento\Backend\Block\Widget\Container
// get update
if ($profile->canFetchUpdate()) {
- $url = $this->getUrl('*/*/updateProfile', array('profile' => $profile->getId(),));
+ $url = $this->getUrl('adminhtml/*/updateProfile', array('profile' => $profile->getId(),));
$this->_addButton('update', array(
'label' => __('Get Update'),
'onclick' => "confirmSetLocation('{$comfirmationMessage}', '{$url}')",
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View/Getawayinfo.php b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View/Getawayinfo.php
index 8c4b3f75bc2..c7ab5e8ca06 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View/Getawayinfo.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View/Getawayinfo.php
@@ -28,7 +28,7 @@
* Recurring profile getaway info block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Sales\Block\Adminhtml\Recurring\Profile\View;
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View/Info.php b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View/Info.php
index d2fb4b89e67..ba86127cf36 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View/Info.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View/Info.php
@@ -28,7 +28,7 @@
* Recurring profile info block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Sales\Block\Adminhtml\Recurring\Profile\View;
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View/Items.php b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View/Items.php
index 842d9a60f7a..334964897e0 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View/Items.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View/Items.php
@@ -28,12 +28,12 @@
* Adminhtml recurring profile items grid
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Sales\Block\Adminhtml\Recurring\Profile\View;
-class Items extends \Magento\Adminhtml\Block\Sales\Items\AbstractItems
+class Items extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
{
/**
* @var \Magento\Core\Model\StoreManagerInterface
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Orders.php b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Orders.php
index c927521e49d..cc245cb5964 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Orders.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View/Tab/Orders.php
@@ -175,7 +175,7 @@ class Orders
'actions' => array(
array(
'caption' => __('View'),
- 'url' => array('base'=>'*/sales_order/view'),
+ 'url' => array('base'=>'sales/order/view'),
'field' => 'order_id'
)
),
@@ -197,7 +197,7 @@ class Orders
*/
public function getRowUrl($row)
{
- return $this->getUrl('*/sales_order/view', array('order_id' => $row->getId()));
+ return $this->getUrl('sales/order/view', array('order_id' => $row->getId()));
}
/**
@@ -218,7 +218,7 @@ class Orders
public function getTabUrl()
{
$recurringProfile = $this->_coreRegistry->registry('current_recurring_profile');
- return $this->getUrl('*/*/orders', array('profile' => $recurringProfile->getId()));
+ return $this->getUrl('adminhtml/*/orders', array('profile' => $recurringProfile->getId()));
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Reorder/Renderer/Action.php b/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Sales/Reorder/Renderer/Action.php
rename to app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php
index 1b2b01ae704..483198292ee 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Reorder/Renderer/Action.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Reorder/Renderer/Action.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,11 +28,11 @@
* Adminhtml alert queue grid block action item renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Reorder\Renderer;
+namespace Magento\Sales\Block\Adminhtml\Reorder\Renderer;
class Action
extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
@@ -70,7 +70,7 @@ class Action
$this->_actions = array();
if ($this->_salesReorder->canReorder($row)) {
$reorderAction = array(
- '@' => array('href' => $this->getUrl('*/sales_order_create/reorder', array('order_id'=>$row->getId()))),
+ '@' => array('href' => $this->getUrl('sales/order_create/reorder', array('order_id'=>$row->getId()))),
'#' => __('Reorder')
);
$this->addToActions($reorderAction);
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Shipment.php b/app/code/Magento/Sales/Block/Adminhtml/Shipment.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Sales/Shipment.php
rename to app/code/Magento/Sales/Block/Adminhtml/Shipment.php
index ac5528d1850..28c1071b41f 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Shipment.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Shipment.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,18 +28,19 @@
* Adminhtml sales shipments block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales;
+namespace Magento\Sales\Block\Adminhtml;
class Shipment extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
protected function _construct()
{
- $this->_controller = 'sales_shipment';
+ $this->_controller = 'adminhtml_shipment';
+ $this->_blockGroup = 'Magento_Sales';
$this->_headerText = __('Shipments');
parent::_construct();
$this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Shipment/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Shipment/Grid.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Sales/Shipment/Grid.php
rename to app/code/Magento/Sales/Block/Adminhtml/Shipment/Grid.php
index a6091aa1adf..064767b07e0 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Shipment/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Shipment/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,7 +29,7 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Shipment;
+namespace Magento\Sales\Block\Adminhtml\Shipment;
class Grid extends \Magento\Adminhtml\Block\Widget\Grid
{
@@ -154,7 +154,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
'actions' => array(
array(
'caption' => __('View'),
- 'url' => array('base' => '*/sales_shipment/view'),
+ 'url' => array('base' => 'sales/shipment/view'),
'field' => 'shipment_id'
)
),
@@ -183,7 +183,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
return false;
}
- return $this->getUrl('*/sales_shipment/view',
+ return $this->getUrl('sales/shipment/view',
array(
'shipment_id' => $row->getId(),
)
@@ -193,7 +193,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
/**
* Prepare and set options for massaction
*
- * @return \Magento\Adminhtml\Block\Sales\Shipment\Grid
+ * @return \Magento\Sales\Block\Adminhtml\Shipment\Grid
*/
protected function _prepareMassaction()
{
@@ -203,12 +203,12 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
$this->getMassactionBlock()->addItem('pdfshipments_order', array(
'label' => __('PDF Packing Slips'),
- 'url' => $this->getUrl('*/sales_shipment/pdfshipments'),
+ 'url' => $this->getUrl('sales/shipment/pdfshipments'),
));
$this->getMassactionBlock()->addItem('print_shipping_label', array(
'label' => __('Print Shipping Labels'),
- 'url' => $this->getUrl('*/sales_order_shipment/massPrintShippingLabel'),
+ 'url' => $this->getUrl('sales/order_shipment/massPrintShippingLabel'),
));
return $this;
@@ -221,7 +221,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
*/
public function getGridUrl()
{
- return $this->getUrl('*/*/*', array('_current' => true));
+ return $this->getUrl('adminhtml/*/*', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Totals.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Sales/Totals.php
rename to app/code/Magento/Sales/Block/Adminhtml/Totals.php
index 079d8dd5113..243843b899b 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Totals.php
@@ -19,12 +19,12 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Sales;
+namespace Magento\Sales\Block\Adminhtml;
class Totals extends \Magento\Sales\Block\Order\Totals
{
@@ -37,7 +37,7 @@ class Totals extends \Magento\Sales\Block\Order\Totals
public function formatValue($total)
{
if (!$total->getIsFormated()) {
- return $this->helper('Magento\Adminhtml\Helper\Sales')->displayPrices(
+ return $this->helper('Magento\Sales\Helper\Admin')->displayPrices(
$this->getOrder(),
$total->getBaseValue(),
$total->getValue()
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Transactions.php b/app/code/Magento/Sales/Block/Adminhtml/Transactions.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Sales/Transactions.php
rename to app/code/Magento/Sales/Block/Adminhtml/Transactions.php
index c32a93f3061..a5c92e49b09 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Transactions.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Transactions.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,16 +28,17 @@
* Adminhtml sales transactions block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales;
+namespace Magento\Sales\Block\Adminhtml;
class Transactions extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
protected function _construct()
{
- $this->_controller = 'sales_transactions';
+ $this->_controller = 'adminhtml_transactions';
+ $this->_blockGroup = 'Magento_Sales';
$this->_headerText = __('Transactions');
parent::_construct();
$this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Transactions/Child/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Child/Grid.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Sales/Transactions/Child/Grid.php
rename to app/code/Magento/Sales/Block/Adminhtml/Transactions/Child/Grid.php
index 9d6c4cfb64c..9b08ac239c8 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Transactions/Child/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Child/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Adminhtml transaction details grid
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Transactions\Child;
+namespace Magento\Sales\Block\Adminhtml\Transactions\Child;
-class Grid extends \Magento\Adminhtml\Block\Sales\Transactions\Grid
+class Grid extends \Magento\Sales\Block\Adminhtml\Transactions\Grid
{
/**
* Columns, that should be removed from grid
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Transactions/Detail.php b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Sales/Transactions/Detail.php
rename to app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php
index 023c5cfd7b6..dc8a1978453 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Transactions/Detail.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Adminhtml transaction detail
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Transactions;
+namespace Magento\Sales\Block\Adminhtml\Transactions;
class Detail extends \Magento\Adminhtml\Block\Widget\Container
{
@@ -78,7 +78,7 @@ class Detail extends \Magento\Adminhtml\Block\Widget\Container
return;
}
- $backUrl = ($this->_txn->getOrderUrl()) ? $this->_txn->getOrderUrl() : $this->getUrl('*/*/');
+ $backUrl = ($this->_txn->getOrderUrl()) ? $this->_txn->getOrderUrl() : $this->getUrl('sales/*/');
$this->_addButton('back', array(
'label' => __('Back'),
'onclick' => "setLocation('{$backUrl}')",
@@ -87,7 +87,7 @@ class Detail extends \Magento\Adminhtml\Block\Widget\Container
if ($this->_authorization->isAllowed('Magento_Sales::transactions_fetch')
&& $this->_txn->getOrderPaymentObject()->getMethodInstance()->canFetchTransactionInfo()) {
- $fetchUrl = $this->getUrl('*/*/fetch' , array('_current' => true));
+ $fetchUrl = $this->getUrl('sales/*/fetch' , array('_current' => true));
$this->_addButton('fetch', array(
'label' => __('Fetch'),
'onclick' => "setLocation('{$fetchUrl}')",
@@ -111,7 +111,7 @@ class Detail extends \Magento\Adminhtml\Block\Widget\Container
$this->setTxnIdHtml($this->escapeHtml($this->_txn->getTxnId()));
$this->setParentTxnIdUrlHtml(
- $this->escapeHtml($this->getUrl('*/sales_transactions/view', array('txn_id' => $this->_txn->getParentId())))
+ $this->escapeHtml($this->getUrl('sales/transactions/view', array('txn_id' => $this->_txn->getParentId())))
);
$this->setParentTxnIdHtml(
@@ -123,7 +123,7 @@ class Detail extends \Magento\Adminhtml\Block\Widget\Container
$this->setTxnTypeHtml($this->escapeHtml($this->_txn->getTxnType()));
$this->setOrderIdUrlHtml(
- $this->escapeHtml($this->getUrl('*/sales_order/view', array('order_id' => $this->_txn->getOrderId())))
+ $this->escapeHtml($this->getUrl('sales/order/view', array('order_id' => $this->_txn->getOrderId())))
);
$this->setIsClosedHtml(
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Transactions/Detail/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Sales/Transactions/Detail/Grid.php
rename to app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php
index 3bb4613d803..272cfe78ec3 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Transactions/Detail/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Adminhtml transaction details grid
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Transactions\Detail;
+namespace Magento\Sales\Block\Adminhtml\Transactions\Detail;
class Grid extends \Magento\Adminhtml\Block\Widget\Grid
{
diff --git a/app/code/Magento/Adminhtml/Block/Sales/Transactions/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Grid.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Sales/Transactions/Grid.php
rename to app/code/Magento/Sales/Block/Adminhtml/Transactions/Grid.php
index a60b991c79e..26b7428a01f 100644
--- a/app/code/Magento/Adminhtml/Block/Sales/Transactions/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Adminhtml transactions grid
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sales\Transactions;
+namespace Magento\Sales\Block\Adminhtml\Transactions;
class Grid extends \Magento\Adminhtml\Block\Widget\Grid
{
@@ -217,7 +217,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
*/
public function getGridUrl()
{
- return $this->getUrl('*/*/grid', array('_current' => true));
+ return $this->getUrl('sales/*/grid', array('_current' => true));
}
/**
@@ -228,6 +228,6 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
*/
public function getRowUrl($item)
{
- return $this->getUrl('*/*/view', array('txn_id' => $item->getId()));
+ return $this->getUrl('sales/*/view', array('txn_id' => $item->getId()));
}
}
diff --git a/app/code/Magento/Sales/Block/Billing/Agreement/View.php b/app/code/Magento/Sales/Block/Billing/Agreement/View.php
index bbb6f15c430..4fd2608d92f 100644
--- a/app/code/Magento/Sales/Block/Billing/Agreement/View.php
+++ b/app/code/Magento/Sales/Block/Billing/Agreement/View.php
@@ -151,7 +151,7 @@ class View extends \Magento\Core\Block\Template
$value = $order->getStatusLabel();
break;
case 'view_url':
- $value = $this->getUrl('*/order/view', array('order_id' => $order->getId()));
+ $value = $this->getUrl('sales/order/view', array('order_id' => $order->getId()));
break;
default:
$value = ($order->getData($key)) ? $order->getData($key) : __('N/A');
diff --git a/app/code/Magento/Adminhtml/Controller/Sales/Billing/Agreement.php b/app/code/Magento/Sales/Controller/Adminhtml/Billing/Agreement.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Controller/Sales/Billing/Agreement.php
rename to app/code/Magento/Sales/Controller/Adminhtml/Billing/Agreement.php
index 0cc4790f1e1..b2d82c9ec4d 100644
--- a/app/code/Magento/Adminhtml/Controller/Sales/Billing/Agreement.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Billing/Agreement.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -27,9 +27,9 @@
/**
* Adminhtml billing agreement controller
*/
-namespace Magento\Adminhtml\Controller\Sales\Billing;
+namespace Magento\Sales\Controller\Adminhtml\Billing;
-class Agreement extends \Magento\Adminhtml\Controller\Action
+class Agreement extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -91,7 +91,7 @@ class Agreement extends \Magento\Adminhtml\Controller\Action
return;
}
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
return;
}
@@ -129,7 +129,7 @@ class Agreement extends \Magento\Adminhtml\Controller\Action
try {
$agreementModel->cancel();
$this->_getSession()->addSuccess(__('You canceled the billing agreement.'));
- $this->_redirect('*/*/view', array('_current' => true));
+ $this->_redirect('sales/*/view', array('_current' => true));
return;
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
@@ -137,9 +137,9 @@ class Agreement extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addError(__('We could not cancel the billing agreement.'));
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
}
- $this->_redirect('*/*/view', array('_current' => true));
+ $this->_redirect('sales/*/view', array('_current' => true));
}
- return $this->_redirect('*/*/');
+ return $this->_redirect('sales/*/');
}
/**
@@ -153,7 +153,7 @@ class Agreement extends \Magento\Adminhtml\Controller\Action
try {
$agreementModel->delete();
$this->_getSession()->addSuccess(__('You deleted the billing agreement.'));
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
return;
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
@@ -161,9 +161,9 @@ class Agreement extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addError(__('We could not delete the billing agreement.'));
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
}
- $this->_redirect('*/*/view', array('_current' => true));
+ $this->_redirect('sales/*/view', array('_current' => true));
}
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
/**
@@ -188,7 +188,7 @@ class Agreement extends \Magento\Adminhtml\Controller\Action
/**
* Initialize customer by ID specified in request
*
- * @return \Magento\Adminhtml\Controller\Sales\Billing\Agreement
+ * @return \Magento\Sales\Controller\Adminhtml\Billing\Agreement
*/
protected function _initCustomer()
{
diff --git a/app/code/Magento/Adminhtml/Controller/Sales/Creditmemo.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo.php
similarity index 82%
rename from app/code/Magento/Adminhtml/Controller/Sales/Creditmemo.php
rename to app/code/Magento/Sales/Controller/Adminhtml/Creditmemo.php
index 703c89bf630..c96b3bfd68b 100644
--- a/app/code/Magento/Adminhtml/Controller/Sales/Creditmemo.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,9 +29,9 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Sales;
+namespace Magento\Sales\Controller\Adminhtml;
-class Creditmemo extends \Magento\Adminhtml\Controller\Sales\Creditmemo\AbstractCreditmemo
+class Creditmemo extends \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo
{
/**
* Export credit memo grid to CSV format
@@ -39,7 +39,7 @@ class Creditmemo extends \Magento\Adminhtml\Controller\Sales\Creditmemo\Abstract
public function exportCsvAction()
{
$fileName = 'creditmemos.csv';
- $grid = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Sales\Creditmemo\Grid');
+ $grid = $this->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Creditmemo\Grid');
$this->_prepareDownloadResponse($fileName, $grid->getCsvFile());
}
@@ -49,7 +49,7 @@ class Creditmemo extends \Magento\Adminhtml\Controller\Sales\Creditmemo\Abstract
public function exportExcelAction()
{
$fileName = 'creditmemos.xml';
- $grid = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Sales\Creditmemo\Grid');
+ $grid = $this->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Creditmemo\Grid');
$this->_prepareDownloadResponse($fileName, $grid->getExcelFile($fileName));
}
diff --git a/app/code/Magento/Adminhtml/Controller/Sales/Creditmemo/AbstractCreditmemo.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Controller/Sales/Creditmemo/AbstractCreditmemo.php
rename to app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo.php
index c2821d5e7ec..4d035e0ff29 100644
--- a/app/code/Magento/Adminhtml/Controller/Sales/Creditmemo/AbstractCreditmemo.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,14 +29,14 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Sales\Creditmemo;
+namespace Magento\Sales\Controller\Adminhtml\Creditmemo;
-class AbstractCreditmemo extends \Magento\Adminhtml\Controller\Action
+class AbstractCreditmemo extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Init layout, menu and breadcrumb
*
- * @return \Magento\Adminhtml\Controller\Sales\Creditmemo
+ * @return \Magento\Sales\Controller\Adminhtml\Creditmemo
*/
protected function _initAction()
{
@@ -53,7 +53,7 @@ class AbstractCreditmemo extends \Magento\Adminhtml\Controller\Action
public function indexAction()
{
$this->_initAction()
- ->_addContent($this->getLayout()->createBlock('Magento\Adminhtml\Block\Sales\Creditmemo'))
+ ->_addContent($this->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Creditmemo'))
->renderLayout();
}
@@ -63,7 +63,7 @@ class AbstractCreditmemo extends \Magento\Adminhtml\Controller\Action
public function viewAction()
{
if ($creditmemoId = $this->getRequest()->getParam('creditmemo_id')) {
- $this->_forward('view', 'sales_order_creditmemo', null, array('come_from' => 'sales_creditmemo'));
+ $this->_forward('view', 'order_creditmemo', null, array('come_from' => 'sales_creditmemo'));
} else {
$this->_forward('noRoute');
}
@@ -88,7 +88,7 @@ class AbstractCreditmemo extends \Magento\Adminhtml\Controller\Action
}
$this->_getSession()->addSuccess(__('We sent the message.'));
- $this->_redirect('*/sales_order_creditmemo/view', array(
+ $this->_redirect('sales/order_creditmemo/view', array(
'creditmemo_id' => $creditmemoId
));
}
@@ -113,12 +113,12 @@ class AbstractCreditmemo extends \Magento\Adminhtml\Controller\Action
return $this->_prepareDownloadResponse('creditmemo' . $date . '.pdf', $pdf->render(), 'application/pdf');
}
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
public function printAction()
{
- /** @see \Magento\Adminhtml\Controller\Sales\Order\Invoice */
+ /** @see \Magento\Sales\Controller\Adminhtml\Order\Invoice */
$creditmemoId = $this->getRequest()->getParam('creditmemo_id');
if ($creditmemoId) {
$creditmemo = $this->_objectManager->create('Magento\Sales\Model\Order\Creditmemo')->load($creditmemoId);
diff --git a/app/code/Magento/Adminhtml/Controller/Sales/Invoice.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice.php
similarity index 81%
rename from app/code/Magento/Adminhtml/Controller/Sales/Invoice.php
rename to app/code/Magento/Sales/Controller/Adminhtml/Invoice.php
index d7dfc78019e..8cf5779656e 100644
--- a/app/code/Magento/Adminhtml/Controller/Sales/Invoice.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,9 +29,9 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Sales;
+namespace Magento\Sales\Controller\Adminhtml;
-class Invoice extends \Magento\Adminhtml\Controller\Sales\Invoice\AbstractInvoice
+class Invoice extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice
{
/**
* Export invoice grid to CSV format
@@ -39,7 +39,7 @@ class Invoice extends \Magento\Adminhtml\Controller\Sales\Invoice\AbstractInvoic
public function exportCsvAction()
{
$fileName = 'invoices.csv';
- $grid = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Sales\Invoice\Grid');
+ $grid = $this->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Invoice\Grid');
$this->_prepareDownloadResponse($fileName, $grid->getCsvFile());
}
@@ -49,7 +49,7 @@ class Invoice extends \Magento\Adminhtml\Controller\Sales\Invoice\AbstractInvoic
public function exportExcelAction()
{
$fileName = 'invoices.xml';
- $grid = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Sales\Invoice\Grid');
+ $grid = $this->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Invoice\Grid');
$this->_prepareDownloadResponse($fileName, $grid->getExcelFile($fileName));
}
}
diff --git a/app/code/Magento/Adminhtml/Controller/Sales/Invoice/AbstractInvoice.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Controller/Sales/Invoice/AbstractInvoice.php
rename to app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice.php
index 81046560253..a1c56f63357 100644
--- a/app/code/Magento/Adminhtml/Controller/Sales/Invoice/AbstractInvoice.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,15 +29,15 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Sales\Invoice;
+namespace Magento\Sales\Controller\Adminhtml\Invoice;
class AbstractInvoice
- extends \Magento\Adminhtml\Controller\Action
+ extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Init layout, menu and breadcrumb
*
- * @return \Magento\Adminhtml\Controller\Sales\Invoice
+ * @return \Magento\Sales\Controller\Adminhtml\Invoice
*/
protected function _initAction()
{
@@ -55,7 +55,7 @@ class AbstractInvoice
{
$this->loadLayout();
$this->getResponse()->setBody(
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Sales\Invoice\Grid')->toHtml()
+ $this->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Invoice\Grid')->toHtml()
);
}
@@ -67,7 +67,7 @@ class AbstractInvoice
$this->_title(__('Invoices'));
$this->_initAction()
- ->_addContent($this->getLayout()->createBlock('Magento\Adminhtml\Block\Sales\Invoice'))
+ ->_addContent($this->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Invoice'))
->renderLayout();
}
@@ -77,7 +77,7 @@ class AbstractInvoice
public function viewAction()
{
if ($invoiceId = $this->getRequest()->getParam('invoice_id')) {
- $this->_forward('view', 'sales_order_invoice', null, array('come_from'=>'invoice'));
+ $this->_forward('view', 'order_invoice', null, array('come_from'=>'invoice'));
} else {
$this->_forward('noRoute');
}
@@ -98,7 +98,7 @@ class AbstractInvoice
$historyItem->save();
}
$this->_getSession()->addSuccess(__('We sent the message.'));
- $this->_redirect('*/sales_invoice/view', array(
+ $this->_redirect('sales/invoice/view', array(
'order_id' => $invoice->getOrder()->getId(),
'invoice_id'=> $invoiceId,
));
@@ -139,7 +139,7 @@ class AbstractInvoice
return $this->_prepareDownloadResponse('invoice' . $date . '.pdf', $pdf->render(), 'application/pdf');
}
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
protected function _isAllowed()
diff --git a/app/code/Magento/Adminhtml/Controller/Sales/Order.php b/app/code/Magento/Sales/Controller/Adminhtml/Order.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Controller/Sales/Order.php
rename to app/code/Magento/Sales/Controller/Adminhtml/Order.php
index 0626951c4dc..b74815b3d96 100644
--- a/app/code/Magento/Adminhtml/Controller/Sales/Order.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Adminhtml sales orders controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Sales;
+namespace Magento\Sales\Controller\Adminhtml;
-class Order extends \Magento\Adminhtml\Controller\Action
+class Order extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Array of actions which can be processed without secret key validation
@@ -64,7 +64,7 @@ class Order extends \Magento\Adminhtml\Controller\Action
/**
* Init layout, menu and breadcrumb
*
- * @return \Magento\Adminhtml\Controller\Sales\Order
+ * @return \Magento\Sales\Controller\Adminhtml\Order
*/
protected function _initAction()
{
@@ -87,7 +87,7 @@ class Order extends \Magento\Adminhtml\Controller\Action
if (!$order->getId()) {
$this->_getSession()->addError(__('This order no longer exists.'));
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
$this->setFlag('', self::FLAG_NO_DISPATCH, true);
return false;
}
@@ -152,7 +152,7 @@ class Order extends \Magento\Adminhtml\Controller\Action
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
}
}
- $this->_redirect('*/sales_order/view', array('order_id' => $order->getId()));
+ $this->_redirect('sales/order/view', array('order_id' => $order->getId()));
}
/**
@@ -174,7 +174,7 @@ class Order extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addError(__('You have not canceled the item.'));
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
}
- $this->_redirect('*/sales_order/view', array('order_id' => $order->getId()));
+ $this->_redirect('sales/order/view', array('order_id' => $order->getId()));
}
}
@@ -196,7 +196,7 @@ class Order extends \Magento\Adminhtml\Controller\Action
} catch (\Exception $e) {
$this->_getSession()->addError(__('You have not put the order on hold.'));
}
- $this->_redirect('*/sales_order/view', array('order_id' => $order->getId()));
+ $this->_redirect('sales/order/view', array('order_id' => $order->getId()));
}
}
@@ -218,7 +218,7 @@ class Order extends \Magento\Adminhtml\Controller\Action
} catch (\Exception $e) {
$this->_getSession()->addError(__('The order was not on hold.'));
}
- $this->_redirect('*/sales_order/view', array('order_id' => $order->getId()));
+ $this->_redirect('sales/order/view', array('order_id' => $order->getId()));
}
}
@@ -260,7 +260,7 @@ class Order extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addError(__('We couldn\'t update the payment.'));
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
}
- $this->_redirect('*/sales_order/view', array('order_id' => $order->getId()));
+ $this->_redirect('sales/order/view', array('order_id' => $order->getId()));
}
/**
@@ -317,7 +317,7 @@ class Order extends \Magento\Adminhtml\Controller\Action
{
$this->_initOrder();
$this->getResponse()->setBody(
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Sales\Order\View\Tab\Invoices')->toHtml()
+ $this->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Order\View\Tab\Invoices')->toHtml()
);
}
@@ -328,7 +328,7 @@ class Order extends \Magento\Adminhtml\Controller\Action
{
$this->_initOrder();
$this->getResponse()->setBody(
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Sales\Order\View\Tab\Shipments')->toHtml()
+ $this->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Order\View\Tab\Shipments')->toHtml()
);
}
@@ -339,7 +339,7 @@ class Order extends \Magento\Adminhtml\Controller\Action
{
$this->_initOrder();
$this->getResponse()->setBody(
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Sales\Order\View\Tab\Creditmemos')->toHtml()
+ $this->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Order\View\Tab\Creditmemos')->toHtml()
);
}
@@ -349,7 +349,7 @@ class Order extends \Magento\Adminhtml\Controller\Action
public function commentsHistoryAction()
{
$this->_initOrder();
- $html = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Sales\Order\View\Tab\History')->toHtml();
+ $html = $this->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Order\View\Tab\History')->toHtml();
if ($this->_translator->isAllowed()) {
$this->_translator->processResponseBody($html);
}
@@ -384,7 +384,7 @@ class Order extends \Magento\Adminhtml\Controller\Action
if ($countCancelOrder) {
$this->_getSession()->addSuccess(__('We canceled %1 order(s).', $countCancelOrder));
}
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
/**
@@ -417,7 +417,7 @@ class Order extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addSuccess(__('You have put %1 order(s) on hold.', $countHoldOrder));
}
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
/**
@@ -453,7 +453,7 @@ class Order extends \Magento\Adminhtml\Controller\Action
__('%1 order(s) have been released from on hold status.', $countUnHoldOrder)
);
}
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
/**
@@ -505,10 +505,10 @@ class Order extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addError(
__('There are no printable documents related to selected orders.')
);
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
}
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
/**
@@ -543,10 +543,10 @@ class Order extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addError(
__('There are no printable documents related to selected orders.')
);
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
}
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
/**
@@ -581,10 +581,10 @@ class Order extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addError(
__('There are no printable documents related to selected orders.')
);
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
}
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
/**
@@ -645,10 +645,10 @@ class Order extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addError(
__('There are no printable documents related to selected orders.')
);
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
}
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
/**
@@ -671,7 +671,7 @@ class Order extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addError(__('We couldn\'t void the payment.'));
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
}
- $this->_redirect('*/*/view', array('order_id' => $order->getId()));
+ $this->_redirect('sales/*/view', array('order_id' => $order->getId()));
}
/**
@@ -771,7 +771,7 @@ class Order extends \Magento\Adminhtml\Controller\Action
$this->renderLayout();
} else {
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
}
@@ -788,7 +788,7 @@ class Order extends \Magento\Adminhtml\Controller\Action
try {
$address->save();
$this->_getSession()->addSuccess(__('You updated the order address.'));
- $this->_redirect('*/*/view', array('order_id' => $address->getParentId()));
+ $this->_redirect('sales/*/view', array('order_id' => $address->getParentId()));
return;
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
@@ -798,9 +798,9 @@ class Order extends \Magento\Adminhtml\Controller\Action
__('Something went wrong updating the order address.')
);
}
- $this->_redirect('*/*/address', array('address_id' => $address->getId()));
+ $this->_redirect('sales/*/address', array('address_id' => $address->getId()));
} else {
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
}
}
diff --git a/app/code/Magento/Adminhtml/Controller/Sales/Order/Create.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Controller/Sales/Order/Create.php
rename to app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
index bf4a1be3bbc..9ce5f8e247b 100644
--- a/app/code/Magento/Adminhtml/Controller/Sales/Order/Create.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Adminhtml sales orders creation process controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Sales\Order;
+namespace Magento\Sales\Controller\Adminhtml\Order;
-class Create extends \Magento\Adminhtml\Controller\Action
+class Create extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Additional initialization
@@ -68,11 +68,11 @@ class Create extends \Magento\Adminhtml\Controller\Action
/**
* Retrieve order create model
*
- * @return \Magento\Adminhtml\Model\Sales\Order\Create
+ * @return \Magento\Sales\Model\AdminOrder\Create
*/
protected function _getOrderCreateModel()
{
- return $this->_objectManager->get('Magento\Adminhtml\Model\Sales\Order\Create');
+ return $this->_objectManager->get('Magento\Sales\Model\AdminOrder\Create');
}
/**
@@ -88,7 +88,7 @@ class Create extends \Magento\Adminhtml\Controller\Action
/**
* Initialize order creation session data
*
- * @return \Magento\Adminhtml\Controller\Sales\Order\Create
+ * @return \Magento\Sales\Controller\Adminhtml\Order\Create
*/
protected function _initSession()
{
@@ -119,7 +119,7 @@ class Create extends \Magento\Adminhtml\Controller\Action
/**
* Processing request data
*
- * @return \Magento\Adminhtml\Controller\Sales\Order\Create
+ * @return \Magento\Sales\Controller\Adminhtml\Order\Create
*/
protected function _processData()
{
@@ -130,7 +130,7 @@ class Create extends \Magento\Adminhtml\Controller\Action
* Process request data with additional logic for saving quote and creating order
*
* @param string $action
- * @return \Magento\Adminhtml\Controller\Sales\Order\Create
+ * @return \Magento\Sales\Controller\Adminhtml\Order\Create
*/
protected function _processActionData($action = null)
{
@@ -356,10 +356,10 @@ class Create extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->setUseOldShippingMethod(true);
$this->_getOrderCreateModel()->initFromOrder($order);
- $this->_redirect('*/*');
+ $this->_redirect('sales/*');
}
else {
- $this->_redirect('*/sales_order/');
+ $this->_redirect('sales/order/');
}
}
@@ -395,9 +395,9 @@ class Create extends \Magento\Adminhtml\Controller\Action
$update = $this->getLayout()->getUpdate();
if ($asJson) {
- $update->addHandle('adminhtml_sales_order_create_load_block_json');
+ $update->addHandle('sales_order_create_load_block_json');
} else {
- $update->addHandle('adminhtml_sales_order_create_load_block_plain');
+ $update->addHandle('sales_order_create_load_block_plain');
}
if ($block) {
@@ -407,14 +407,14 @@ class Create extends \Magento\Adminhtml\Controller\Action
}
foreach ($blocks as $block) {
- $update->addHandle('adminhtml_sales_order_create_load_block_' . $block);
+ $update->addHandle('sales_order_create_load_block_' . $block);
}
}
$this->loadLayoutUpdates()->generateLayoutXml()->generateLayoutBlocks();
$result = $this->getLayout()->renderElement('content');
if ($request->getParam('as_js_varname')) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->setUpdateResult($result);
- $this->_redirect('*/*/showUpdateResult');
+ $this->_redirect('sales/*/showUpdateResult');
} else {
$this->getResponse()->setBody($result);
}
@@ -446,7 +446,7 @@ class Create extends \Magento\Adminhtml\Controller\Action
$updateResult->setJsVarName($this->getRequest()->getParam('as_js_varname'));
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->setCompositeProductResult($updateResult);
- $this->_redirect('*/catalog_product/showUpdateResult');
+ $this->_redirect('sales/product/showUpdateResult');
}
/**
@@ -455,7 +455,7 @@ class Create extends \Magento\Adminhtml\Controller\Action
public function startAction()
{
$this->_getSession()->clear();
- $this->_redirect('*/*', array('customer_id' => $this->getRequest()->getParam('customer_id')));
+ $this->_redirect('sales/*', array('customer_id' => $this->getRequest()->getParam('customer_id')));
}
/**
@@ -465,12 +465,12 @@ class Create extends \Magento\Adminhtml\Controller\Action
{
if ($orderId = $this->_getSession()->getReordered()) {
$this->_getSession()->clear();
- $this->_redirect('*/sales_order/view', array(
+ $this->_redirect('sales/order/view', array(
'order_id'=>$orderId
));
} else {
$this->_getSession()->clear();
- $this->_redirect('*/*');
+ $this->_redirect('sales/*');
}
}
@@ -501,9 +501,9 @@ class Create extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->clear();
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addSuccess(__('You created the order.'));
if ($this->_authorization->isAllowed('Magento_Sales::actions_view')) {
- $this->_redirect('*/sales_order/view', array('order_id' => $order->getId()));
+ $this->_redirect('sales/order/view', array('order_id' => $order->getId()));
} else {
- $this->_redirect('*/sales_order/index');
+ $this->_redirect('sales/order/index');
}
} catch (\Magento\Payment\Model\Info\Exception $e) {
$this->_getOrderCreateModel()->saveQuote();
@@ -511,17 +511,17 @@ class Create extends \Magento\Adminhtml\Controller\Action
if( !empty($message) ) {
$this->_getSession()->addError($message);
}
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
} catch (\Magento\Core\Exception $e){
$message = $e->getMessage();
if( !empty($message) ) {
$this->_getSession()->addError($message);
}
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
catch (\Exception $e){
$this->_getSession()->addException($e, __('Order saving error: %1', $e->getMessage()));
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
}
@@ -554,7 +554,7 @@ class Create extends \Magento\Adminhtml\Controller\Action
/*
* Ajax handler to response configuration fieldset of composite product in order
*
- * @return \Magento\Adminhtml\Controller\Sales\Order\Create
+ * @return \Magento\Sales\Controller\Adminhtml\Order\Create
*/
public function configureProductToAddAction()
{
@@ -569,7 +569,7 @@ class Create extends \Magento\Adminhtml\Controller\Action
$configureResult->setCurrentCustomerId($sessionQuote->getCustomerId());
// Render page
- $this->_objectManager->get('Magento\Adminhtml\Helper\Catalog\Product\Composite')
+ $this->_objectManager->get('Magento\Catalog\Helper\Product\Composite')
->renderConfigureResult($this, $configureResult);
return $this;
@@ -578,7 +578,7 @@ class Create extends \Magento\Adminhtml\Controller\Action
/*
* Ajax handler to response configuration fieldset of composite product in quote items
*
- * @return \Magento\Adminhtml\Controller\Sales\Order\Create
+ * @return \Magento\Sales\Controller\Adminhtml\Order\Create
*/
public function configureQuoteItemsAction()
{
@@ -612,7 +612,7 @@ class Create extends \Magento\Adminhtml\Controller\Action
}
// Render page
- $this->_objectManager->get('Magento\Adminhtml\Helper\Catalog\Product\Composite')
+ $this->_objectManager->get('Magento\Catalog\Helper\Product\Composite')
->renderConfigureResult($this, $configureResult);
return $this;
diff --git a/app/code/Magento/Adminhtml/Controller/Sales/Order/Creditmemo.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Controller/Sales/Order/Creditmemo.php
rename to app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo.php
index 767b63bd8c6..00af8725cc5 100644
--- a/app/code/Magento/Adminhtml/Controller/Sales/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Adminhtml sales order creditmemo controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Sales\Order;
+namespace Magento\Sales\Controller\Adminhtml\Order;
class Creditmemo
- extends \Magento\Adminhtml\Controller\Sales\Creditmemo\AbstractCreditmemo
+ extends \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo
{
/**
* Get requested items qtys and return to stock flags
@@ -224,7 +224,7 @@ class Creditmemo
/**
* Clear old values for creditmemo qty's
*/
- $this->_redirect('*/*/new', array('_current'=>true));
+ $this->_redirect('sales/*/new', array('_current'=>true));
}
/**
@@ -330,7 +330,7 @@ class Creditmemo
$creditmemo->sendEmail(!empty($data['send_email']), $comment);
$this->_getSession()->addSuccess(__('You created the credit memo.'));
$this->_getSession()->getCommentText(true);
- $this->_redirect('*/sales_order/view', array('order_id' => $creditmemo->getOrderId()));
+ $this->_redirect('sales/order/view', array('order_id' => $creditmemo->getOrderId()));
return;
} else {
$this->_forward('noRoute');
@@ -343,7 +343,7 @@ class Creditmemo
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
$this->_getSession()->addError(__('Cannot save the credit memo.'));
}
- $this->_redirect('*/*/new', array('_current' => true));
+ $this->_redirect('sales/*/new', array('_current' => true));
}
/**
@@ -362,7 +362,7 @@ class Creditmemo
} catch (\Exception $e) {
$this->_getSession()->addError(__('You canceled the credit memo.'));
}
- $this->_redirect('*/*/view', array('creditmemo_id'=>$creditmemo->getId()));
+ $this->_redirect('sales/*/view', array('creditmemo_id'=>$creditmemo->getId()));
} else {
$this->_forward('noRoute');
}
@@ -384,7 +384,7 @@ class Creditmemo
} catch (\Exception $e) {
$this->_getSession()->addError(__('We can\'t void the credit memo.'));
}
- $this->_redirect('*/*/view', array('creditmemo_id'=>$creditmemo->getId()));
+ $this->_redirect('sales/*/view', array('creditmemo_id'=>$creditmemo->getId()));
} else {
$this->_forward('noRoute');
}
diff --git a/app/code/Magento/Adminhtml/Controller/Sales/Order/Edit.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit.php
similarity index 84%
rename from app/code/Magento/Adminhtml/Controller/Sales/Order/Edit.php
rename to app/code/Magento/Sales/Controller/Adminhtml/Order/Edit.php
index 733fc9a5e59..a821af1b504 100644
--- a/app/code/Magento/Adminhtml/Controller/Sales/Order/Edit.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Edit.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Adminhtml sales order edit controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Sales\Order;
+namespace Magento\Sales\Controller\Adminhtml\Order;
-class Edit extends \Magento\Adminhtml\Controller\Sales\Order\Create
+class Edit extends \Magento\Sales\Controller\Adminhtml\Order\Create
{
/**
* Start edit order initialization
@@ -48,17 +48,17 @@ class Edit extends \Magento\Adminhtml\Controller\Sales\Order\Create
if ($order->getId()) {
$this->_getSession()->setUseOldShippingMethod(true);
$this->_getOrderCreateModel()->initFromOrder($order);
- $this->_redirect('*/*');
+ $this->_redirect('sales/*');
}
else {
- $this->_redirect('*/sales_order/');
+ $this->_redirect('sales/order/');
}
} catch (\Magento\Core\Exception $e) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError($e->getMessage());
- $this->_redirect('*/sales_order/view', array('order_id' => $orderId));
+ $this->_redirect('sales/order/view', array('order_id' => $orderId));
} catch (\Exception $e) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addException($e, $e->getMessage());
- $this->_redirect('*/sales_order/view', array('order_id' => $orderId));
+ $this->_redirect('sales/order/view', array('order_id' => $orderId));
}
}
diff --git a/app/code/Magento/Adminhtml/Controller/Sales/Order/Invoice.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Controller/Sales/Order/Invoice.php
rename to app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice.php
index 774b877424d..8400e96948c 100644
--- a/app/code/Magento/Adminhtml/Controller/Sales/Order/Invoice.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Adminhtml sales order edit controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Sales\Order;
+namespace Magento\Sales\Controller\Adminhtml\Order;
-class Invoice extends \Magento\Adminhtml\Controller\Sales\Invoice\AbstractInvoice
+class Invoice extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice
{
/**
* Core registry
@@ -119,7 +119,7 @@ class Invoice extends \Magento\Adminhtml\Controller\Sales\Invoice\AbstractInvoic
* Save data for invoice and related order
*
* @param \Magento\Sales\Model\Order\Invoice $invoice
- * @return \Magento\Adminhtml\Controller\Sales\Order\Invoice
+ * @return \Magento\Sales\Controller\Adminhtml\Order\Invoice
*/
protected function _saveInvoice($invoice)
{
@@ -188,7 +188,7 @@ class Invoice extends \Magento\Adminhtml\Controller\Sales\Invoice\AbstractInvoic
* Clear old values for invoice qty's
*/
$this->_getSession()->getInvoiceItemQtys(true);
- $this->_redirect('*/*/new', array('order_id' => $this->getRequest()->getParam('order_id')));
+ $this->_redirect('sales/*/new', array('order_id' => $this->getRequest()->getParam('order_id')));
}
/**
@@ -209,7 +209,7 @@ class Invoice extends \Magento\Adminhtml\Controller\Sales\Invoice\AbstractInvoic
->_setActiveMenu('Magento_Sales::sales_order')
->renderLayout();
} else {
- $this->_redirect('*/sales_order/view', array('order_id'=>$this->getRequest()->getParam('order_id')));
+ $this->_redirect('sales/order/view', array('order_id'=>$this->getRequest()->getParam('order_id')));
}
}
@@ -323,9 +323,9 @@ class Invoice extends \Magento\Adminhtml\Controller\Sales\Invoice\AbstractInvoic
}
}
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->getCommentText(true);
- $this->_redirect('*/sales_order/view', array('order_id' => $orderId));
+ $this->_redirect('sales/order/view', array('order_id' => $orderId));
} else {
- $this->_redirect('*/*/new', array('order_id' => $orderId));
+ $this->_redirect('sales/*/new', array('order_id' => $orderId));
}
return;
} catch (\Magento\Core\Exception $e) {
@@ -334,7 +334,7 @@ class Invoice extends \Magento\Adminhtml\Controller\Sales\Invoice\AbstractInvoic
$this->_getSession()->addError(__('We can\'t save the invoice.'));
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
}
- $this->_redirect('*/*/new', array('order_id' => $orderId));
+ $this->_redirect('sales/*/new', array('order_id' => $orderId));
}
@@ -354,7 +354,7 @@ class Invoice extends \Magento\Adminhtml\Controller\Sales\Invoice\AbstractInvoic
} catch (\Exception $e) {
$this->_getSession()->addError(__('Invoice capturing error'));
}
- $this->_redirect('*/*/view', array('invoice_id'=>$invoice->getId()));
+ $this->_redirect('sales/*/view', array('invoice_id'=>$invoice->getId()));
} else {
$this->_forward('noRoute');
}
@@ -376,7 +376,7 @@ class Invoice extends \Magento\Adminhtml\Controller\Sales\Invoice\AbstractInvoic
} catch (\Exception $e) {
$this->_getSession()->addError(__('Invoice canceling error'));
}
- $this->_redirect('*/*/view', array('invoice_id' => $invoice->getId()));
+ $this->_redirect('sales/*/view', array('invoice_id' => $invoice->getId()));
} else {
$this->_forward('noRoute');
}
@@ -398,7 +398,7 @@ class Invoice extends \Magento\Adminhtml\Controller\Sales\Invoice\AbstractInvoic
} catch (\Exception $e) {
$this->_getSession()->addError(__('Invoice voiding error'));
}
- $this->_redirect('*/*/view', array('invoice_id' => $invoice->getId()));
+ $this->_redirect('sales/*/view', array('invoice_id' => $invoice->getId()));
} else {
$this->_forward('noRoute');
}
diff --git a/app/code/Magento/Adminhtml/Controller/Sales/Order/Shipment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Shipment.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Controller/Sales/Order/Shipment.php
rename to app/code/Magento/Sales/Controller/Adminhtml/Order/Shipment.php
index c0c6817f60c..32e23dd8ed2 100644
--- a/app/code/Magento/Adminhtml/Controller/Sales/Order/Shipment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Shipment.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Adminhtml sales order shipment controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Sales\Order;
+namespace Magento\Sales\Controller\Adminhtml\Order;
-class Shipment extends \Magento\Adminhtml\Controller\Sales\Shipment\AbstractShipment
+class Shipment extends \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment
{
/**
* Core registry
@@ -131,7 +131,7 @@ class Shipment extends \Magento\Adminhtml\Controller\Sales\Shipment\AbstractShip
* Save shipment and order in one transaction
*
* @param \Magento\Sales\Model\Order\Shipment $shipment
- * @return \Magento\Adminhtml\Controller\Sales\Order\Shipment
+ * @return \Magento\Sales\Controller\Adminhtml\Order\Shipment
*/
protected function _saveShipment($shipment)
{
@@ -170,7 +170,7 @@ class Shipment extends \Magento\Adminhtml\Controller\Sales\Shipment\AbstractShip
/**
* Clear old values for shipment qty's
*/
- $this->_redirect('*/*/new', array('order_id'=>$this->getRequest()->getParam('order_id')));
+ $this->_redirect('sales/*/new', array('order_id'=>$this->getRequest()->getParam('order_id')));
}
/**
@@ -191,7 +191,7 @@ class Shipment extends \Magento\Adminhtml\Controller\Sales\Shipment\AbstractShip
->_setActiveMenu('Magento_Sales::sales_order')
->renderLayout();
} else {
- $this->_redirect('*/sales_order/view', array('order_id' => $this->getRequest()->getParam('order_id')));
+ $this->_redirect('sales/order/view', array('order_id' => $this->getRequest()->getParam('order_id')));
}
}
@@ -256,7 +256,7 @@ class Shipment extends \Magento\Adminhtml\Controller\Sales\Shipment\AbstractShip
$responseAjax->setMessage($e->getMessage());
} else {
$this->_getSession()->addError($e->getMessage());
- $this->_redirect('*/*/new', array('order_id' => $this->getRequest()->getParam('order_id')));
+ $this->_redirect('sales/*/new', array('order_id' => $this->getRequest()->getParam('order_id')));
}
} catch (\Exception $e) {
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
@@ -266,14 +266,14 @@ class Shipment extends \Magento\Adminhtml\Controller\Sales\Shipment\AbstractShip
__('An error occurred while creating shipping label.'));
} else {
$this->_getSession()->addError(__('Cannot save shipment.'));
- $this->_redirect('*/*/new', array('order_id' => $this->getRequest()->getParam('order_id')));
+ $this->_redirect('sales/*/new', array('order_id' => $this->getRequest()->getParam('order_id')));
}
}
if ($isNeedCreateLabel) {
$this->getResponse()->setBody($responseAjax->toJson());
} else {
- $this->_redirect('*/sales_order/view', array('order_id' => $shipment->getOrderId()));
+ $this->_redirect('sales/order/view', array('order_id' => $shipment->getOrderId()));
}
}
@@ -301,7 +301,7 @@ class Shipment extends \Magento\Adminhtml\Controller\Sales\Shipment\AbstractShip
} catch (\Exception $e) {
$this->_getSession()->addError(__('Cannot send shipment information.'));
}
- $this->_redirect('*/*/view', array(
+ $this->_redirect('sales/*/view', array(
'shipment_id' => $this->getRequest()->getParam('shipment_id')
));
}
@@ -585,7 +585,7 @@ class Shipment extends \Magento\Adminhtml\Controller\Sales\Shipment\AbstractShip
$this->_getSession()
->addError(__('An error occurred while creating shipping label.'));
}
- $this->_redirect('*/sales_order_shipment/view', array(
+ $this->_redirect('sales/order_shipment/view', array(
'shipment_id' => $this->getRequest()->getParam('shipment_id')
));
}
@@ -661,11 +661,11 @@ class Shipment extends \Magento\Adminhtml\Controller\Sales\Shipment\AbstractShip
if ($createdFromOrders) {
$this->_getSession()
->addError(__('There are no shipping labels related to selected orders.'));
- $this->_redirect('*/sales_order/index');
+ $this->_redirect('sales/order/index');
} else {
$this->_getSession()
->addError(__('There are no shipping labels related to selected shipments.'));
- $this->_redirect('*/sales_order_shipment/index');
+ $this->_redirect('sales/order_shipment/index');
}
}
@@ -735,7 +735,7 @@ class Shipment extends \Magento\Adminhtml\Controller\Sales\Shipment\AbstractShip
$this->_initShipment();
return $this->getResponse()->setBody(
$this->getLayout()
- ->createBlock('Magento\Adminhtml\Block\Sales\Order\Shipment\Packaging\Grid')
+ ->createBlock('Magento\Sales\Block\Adminhtml\Order\Shipment\Packaging\Grid')
->setIndex($this->getRequest()->getParam('index'))
->toHtml()
);
diff --git a/app/code/Magento/Adminhtml/Controller/Sales/Order/Status.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Controller/Sales/Order/Status.php
rename to app/code/Magento/Sales/Controller/Adminhtml/Order/Status.php
index d91939546fa..ab0420d0c7c 100644
--- a/app/code/Magento/Adminhtml/Controller/Sales/Order/Status.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Order status management controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Sales\Order;
+namespace Magento\Sales\Controller\Adminhtml\Order;
-class Status extends \Magento\Adminhtml\Controller\Action
+class Status extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -112,7 +112,7 @@ class Status extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addError(
__('We can\'t find this order status.')
);
- $this->_redirect('*/');
+ $this->_redirect('sales/');
}
}
@@ -146,7 +146,7 @@ class Status extends \Magento\Adminhtml\Controller\Action
__('We found another order status with the same order status code.')
);
$this->_getSession()->setFormData($data);
- $this->_redirect('*/*/new');
+ $this->_redirect('sales/*/new');
return;
}
@@ -155,7 +155,7 @@ class Status extends \Magento\Adminhtml\Controller\Action
try {
$status->save();
$this->_getSession()->addSuccess(__('You have saved the order status.'));
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
return;
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
@@ -167,13 +167,13 @@ class Status extends \Magento\Adminhtml\Controller\Action
}
$this->_getSession()->setFormData($data);
if ($isNew) {
- $this->_redirect('*/*/new');
+ $this->_redirect('sales/*/new');
} else {
- $this->_redirect('*/*/edit', array('status' => $this->getRequest()->getParam('status')));
+ $this->_redirect('sales/*/edit', array('status' => $this->getRequest()->getParam('status')));
}
return;
}
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
/**
@@ -201,7 +201,7 @@ class Status extends \Magento\Adminhtml\Controller\Action
try {
$status->assignState($state, $isDefault);
$this->_getSession()->addSuccess(__('You have assigned the order status.'));
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
return;
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
@@ -214,10 +214,10 @@ class Status extends \Magento\Adminhtml\Controller\Action
} else {
$this->_getSession()->addError(__('We can\'t find this order status.'));
}
- $this->_redirect('*/*/assign');
+ $this->_redirect('sales/*/assign');
return;
}
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
public function unassignAction()
@@ -239,7 +239,7 @@ class Status extends \Magento\Adminhtml\Controller\Action
} else {
$this->_getSession()->addError(__('We can\'t find this order status.'));
}
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
/**
diff --git a/app/code/Magento/Adminhtml/Controller/Sales/Order/View/Giftmessage.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Controller/Sales/Order/View/Giftmessage.php
rename to app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage.php
index f55acdf4ab8..111f0a7fa96 100644
--- a/app/code/Magento/Adminhtml/Controller/Sales/Order/View/Giftmessage.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,12 +29,12 @@
* Adminhtml sales order view gift messages controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Sales\Order\View;
+namespace Magento\Sales\Controller\Adminhtml\Order\View;
-class Giftmessage extends \Magento\Adminhtml\Controller\Action
+class Giftmessage extends \Magento\Backend\Controller\Adminhtml\Action
{
public function saveAction()
{
diff --git a/app/code/Magento/Adminhtml/Controller/Sales/Recurring/Profile.php b/app/code/Magento/Sales/Controller/Adminhtml/Recurring/Profile.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Controller/Sales/Recurring/Profile.php
rename to app/code/Magento/Sales/Controller/Adminhtml/Recurring/Profile.php
index e66d689a571..fa37b0ad3c4 100644
--- a/app/code/Magento/Adminhtml/Controller/Sales/Recurring/Profile.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Recurring/Profile.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,9 +29,9 @@
*
* TODO: implement ACL restrictions
*/
-namespace Magento\Adminhtml\Controller\Sales\Recurring;
+namespace Magento\Sales\Controller\Adminhtml\Recurring;
-class Profile extends \Magento\Adminhtml\Controller\Action
+class Profile extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -82,7 +82,7 @@ class Profile extends \Magento\Adminhtml\Controller\Action
} catch (\Exception $e) {
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
}
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
/**
@@ -98,7 +98,7 @@ class Profile extends \Magento\Adminhtml\Controller\Action
} catch (\Exception $e) {
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
}
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
/**
@@ -143,9 +143,9 @@ class Profile extends \Magento\Adminhtml\Controller\Action
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
}
if ($profile) {
- $this->_redirect('*/*/view', array('profile' => $profile->getId()));
+ $this->_redirect('sales/*/view', array('profile' => $profile->getId()));
} else {
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
}
@@ -171,9 +171,9 @@ class Profile extends \Magento\Adminhtml\Controller\Action
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
}
if ($profile) {
- $this->_redirect('*/*/view', array('profile' => $profile->getId()));
+ $this->_redirect('sales/*/view', array('profile' => $profile->getId()));
} else {
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
}
@@ -191,7 +191,7 @@ class Profile extends \Magento\Adminhtml\Controller\Action
/**
* Initialize customer by ID specified in request
*
- * @return \Magento\Adminhtml\Controller\Sales\Billing\Agreement
+ * @return \Magento\Sales\Controller\Adminhtml\Billing\Agreement
*/
protected function _initCustomer()
{
diff --git a/app/code/Magento/Adminhtml/Controller/Sales/Shipment.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment.php
similarity index 81%
rename from app/code/Magento/Adminhtml/Controller/Sales/Shipment.php
rename to app/code/Magento/Sales/Controller/Adminhtml/Shipment.php
index e62f7faac21..5231462ee59 100644
--- a/app/code/Magento/Adminhtml/Controller/Sales/Shipment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,9 +29,9 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Sales;
+namespace Magento\Sales\Controller\Adminhtml;
-class Shipment extends \Magento\Adminhtml\Controller\Sales\Shipment\AbstractShipment
+class Shipment extends \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment
{
/**
* Export shipment grid to CSV format
@@ -39,7 +39,7 @@ class Shipment extends \Magento\Adminhtml\Controller\Sales\Shipment\AbstractShip
public function exportCsvAction()
{
$fileName = 'shipments.csv';
- $grid = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Sales\Shipment\Grid');
+ $grid = $this->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Shipment\Grid');
$this->_prepareDownloadResponse($fileName, $grid->getCsvFile());
}
@@ -49,7 +49,7 @@ class Shipment extends \Magento\Adminhtml\Controller\Sales\Shipment\AbstractShip
public function exportExcelAction()
{
$fileName = 'shipments.xml';
- $grid = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Sales\Shipment\Grid');
+ $grid = $this->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Shipment\Grid');
$this->_prepareDownloadResponse($fileName, $grid->getExcelFile($fileName));
}
}
diff --git a/app/code/Magento/Adminhtml/Controller/Sales/Shipment/AbstractShipment.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Controller/Sales/Shipment/AbstractShipment.php
rename to app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment.php
index 0c47a134974..bd066fd5df6 100644
--- a/app/code/Magento/Adminhtml/Controller/Sales/Shipment/AbstractShipment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,14 +29,14 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Sales\Shipment;
+namespace Magento\Sales\Controller\Adminhtml\Shipment;
-class AbstractShipment extends \Magento\Adminhtml\Controller\Action
+class AbstractShipment extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Init layout, menu and breadcrumb
*
- * @return \Magento\Adminhtml\Controller\Sales\Shipment
+ * @return \Magento\Sales\Controller\Adminhtml\Shipment
*/
protected function _initAction()
{
@@ -55,7 +55,7 @@ class AbstractShipment extends \Magento\Adminhtml\Controller\Action
$this->_title(__('Shipments'));
$this->_initAction()
- ->_addContent($this->getLayout()->createBlock('Magento\Adminhtml\Block\Sales\Shipment'))
+ ->_addContent($this->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Shipment'))
->renderLayout();
}
@@ -65,7 +65,7 @@ class AbstractShipment extends \Magento\Adminhtml\Controller\Action
public function viewAction()
{
if ($shipmentId = $this->getRequest()->getParam('shipment_id')) {
- $this->_forward('view', 'sales_order_shipment', null, array('come_from'=>'shipment'));
+ $this->_forward('view', 'order_shipment', null, array('come_from'=>'shipment'));
} else {
$this->_forward('noRoute');
}
@@ -88,12 +88,12 @@ class AbstractShipment extends \Magento\Adminhtml\Controller\Action
$date = $this->_objectManager->get('Magento\Core\Model\Date')->date('Y-m-d_H-i-s');
return $this->_prepareDownloadResponse('packingslip' . $date . '.pdf', $pdf->render(), 'application/pdf');
}
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
}
public function printAction()
{
- /** @see \Magento\Adminhtml\Controller\Sales\Order\Invoice */
+ /** @see \Magento\Sales\Controller\Adminhtml\Order\Invoice */
$shipmentId = $this->getRequest()->getParam('invoice_id');
if ($shipmentId) { // invoice_id o_0
$shipment = $this->_objectManager->create('Magento\Sales\Model\Order\Shipment')->load($shipmentId);
diff --git a/app/code/Magento/Adminhtml/Controller/Sales/Transactions.php b/app/code/Magento/Sales/Controller/Adminhtml/Transactions.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Controller/Sales/Transactions.php
rename to app/code/Magento/Sales/Controller/Adminhtml/Transactions.php
index 2f27f89d801..7f8d80ac1fe 100644
--- a/app/code/Magento/Adminhtml/Controller/Sales/Transactions.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Transactions.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,9 +29,9 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Sales;
+namespace Magento\Sales\Controller\Adminhtml;
-class Transactions extends \Magento\Adminhtml\Controller\Action
+class Transactions extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -65,14 +65,14 @@ class Transactions extends \Magento\Adminhtml\Controller\Action
if (!$txn->getId()) {
$this->_getSession()->addError(__('Please correct the transaction ID and try again.'));
- $this->_redirect('*/*/');
+ $this->_redirect('sales/*/');
$this->setFlag('', self::FLAG_NO_DISPATCH, true);
return false;
}
$orderId = $this->getRequest()->getParam('order_id');
if ($orderId) {
$txn->setOrderUrl(
- $this->getUrl('*/sales_order/view', array('order_id' => $orderId))
+ $this->getUrl('sales/order/view', array('order_id' => $orderId))
);
}
@@ -140,7 +140,7 @@ class Transactions extends \Magento\Adminhtml\Controller\Action
);
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
}
- $this->_redirect('*/sales_transactions/view', array('_current' => true));
+ $this->_redirect('sales/transactions/view', array('_current' => true));
}
/**
diff --git a/app/code/Magento/Adminhtml/Helper/Sales.php b/app/code/Magento/Sales/Helper/Admin.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Helper/Sales.php
rename to app/code/Magento/Sales/Helper/Admin.php
index a9625310196..aa04a32ed6f 100644
--- a/app/code/Magento/Adminhtml/Helper/Sales.php
+++ b/app/code/Magento/Sales/Helper/Admin.php
@@ -19,14 +19,14 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Helper;
+namespace Magento\Sales\Helper;
-class Sales extends \Magento\Core\Helper\AbstractHelper
+class Admin extends \Magento\Core\Helper\AbstractHelper
{
/**
* @var \Magento\Sales\Model\Config
diff --git a/app/code/Magento/Adminhtml/Model/Sales/Order.php b/app/code/Magento/Sales/Model/AdminOrder.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Model/Sales/Order.php
rename to app/code/Magento/Sales/Model/AdminOrder.php
index 03e4c031cec..bec56ca9812 100644
--- a/app/code/Magento/Adminhtml/Model/Sales/Order.php
+++ b/app/code/Magento/Sales/Model/AdminOrder.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Order control model
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Model\Sales;
+namespace Magento\Sales\Model;
-class Order
+class AdminOrder
{
/**
* @var \Magento\Backend\Model\Session
diff --git a/app/code/Magento/Adminhtml/Model/Sales/Order/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Model/Sales/Order/Create.php
rename to app/code/Magento/Sales/Model/AdminOrder/Create.php
index a93ca31f502..c27aac7a249 100644
--- a/app/code/Magento/Adminhtml/Model/Sales/Order/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,10 +29,10 @@
* Order create model
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Model\Sales\Order;
+namespace Magento\Sales\Model\AdminOrder;
class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\CartInterface
{
@@ -190,7 +190,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
* Set validate data in import data flag
*
* @param boolean $flag
- * @return \Magento\Adminhtml\Model\Sales\Order\Create
+ * @return \Magento\Sales\Model\AdminOrder\Create
*/
public function setIsValidate($flag)
{
@@ -227,7 +227,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
/**
* Initialize data for price rules
*
- * @return \Magento\Adminhtml\Model\Sales\Order\Create
+ * @return \Magento\Sales\Model\AdminOrder\Create
*/
public function initRuleData()
{
@@ -243,7 +243,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
* Set collect totals flag for quote
*
* @param bool $flag
- * @return \Magento\Adminhtml\Model\Sales\Order\Create
+ * @return \Magento\Sales\Model\AdminOrder\Create
*/
public function setRecollect($flag)
{
@@ -255,7 +255,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
* Recollect totals for customer cart.
* Set recollect totals flag for quote
*
- * @return \Magento\Adminhtml\Model\Sales\Order\Create
+ * @return \Magento\Sales\Model\AdminOrder\Create
*/
public function recollectCart()
{
@@ -271,7 +271,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
/**
* Quote saving
*
- * @return \Magento\Adminhtml\Model\Sales\Order\Create
+ * @return \Magento\Sales\Model\AdminOrder\Create
*/
public function saveQuote()
{
@@ -314,7 +314,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
* Set quote object
*
* @param \Magento\Sales\Model\Quote $quote
- * @return \Magento\Adminhtml\Model\Sales\Order\Create
+ * @return \Magento\Sales\Model\AdminOrder\Create
*/
public function setQuote(\Magento\Sales\Model\Quote $quote)
{
@@ -326,7 +326,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
* Initialize creation data from existing order
*
* @param \Magento\Sales\Model\Order $order
- * @return \Magento\Adminhtml\Model\Sales\Order\Create
+ * @return \Magento\Sales\Model\AdminOrder\Create
*/
public function initFromOrder(\Magento\Sales\Model\Order $order)
{
@@ -576,7 +576,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
* @param int|\Magento\Sales\Model\Quote\Item $item
* @param string $moveTo
* @param int $qty
- * @return \Magento\Adminhtml\Model\Sales\Order\Create
+ * @return \Magento\Sales\Model\AdminOrder\Create
*/
public function moveQuoteItem($item, $moveTo, $qty)
{
@@ -684,7 +684,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
* Handle data sent from sidebar
*
* @param array $data
- * @return \Magento\Adminhtml\Model\Sales\Order\Create
+ * @return \Magento\Sales\Model\AdminOrder\Create
*/
public function applySidebarData($data)
{
@@ -737,7 +737,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
*
* @param int $itemId
* @param string $from
- * @return \Magento\Adminhtml\Model\Sales\Order\Create
+ * @return \Magento\Sales\Model\AdminOrder\Create
*/
public function removeItem($itemId, $from)
{
@@ -773,7 +773,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
* Remove quote item
*
* @param int $item
- * @return \Magento\Adminhtml\Model\Sales\Order\Create
+ * @return \Magento\Sales\Model\AdminOrder\Create
*/
public function removeQuoteItem($item)
{
@@ -789,7 +789,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
*
* @param int|\Magento\Catalog\Model\Product $product
* @param array|float|int|\Magento\Object $config
- * @return \Magento\Adminhtml\Model\Sales\Order\Create
+ * @return \Magento\Sales\Model\AdminOrder\Create
*/
public function addProduct($product, $config = 1)
{
@@ -846,7 +846,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
* Add multiple products to current order quote
*
* @param array $products
- * @return \Magento\Adminhtml\Model\Sales\Order\Create|Exception
+ * @return \Magento\Sales\Model\AdminOrder\Create|Exception
*/
public function addProducts(array $products)
{
@@ -868,7 +868,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
*
* @param array $data
* @throws \Exception|\Magento\Core\Exception
- * @return \Magento\Adminhtml\Model\Sales\Order\Create
+ * @return \Magento\Sales\Model\AdminOrder\Create
*/
public function updateQuoteItems($data)
{
@@ -1123,7 +1123,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
*
* @param \Magento\Sales\Model\Quote\Address $address
* @param array $data
- * @return \Magento\Adminhtml\Model\Sales\Order\Create
+ * @return \Magento\Sales\Model\AdminOrder\Create
*/
protected function _setQuoteAddress(\Magento\Sales\Model\Quote\Address $address, array $data)
{
@@ -1316,7 +1316,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
* Parse data retrieved from request
*
* @param array $data
- * @return \Magento\Adminhtml\Model\Sales\Order\Create
+ * @return \Magento\Sales\Model\AdminOrder\Create
*/
public function importPostData($data)
{
@@ -1380,7 +1380,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
* Set and validate Customer data
*
* @param \Magento\Customer\Model\Customer $customer
- * @return \Magento\Adminhtml\Model\Sales\Order\Create
+ * @return \Magento\Sales\Model\AdminOrder\Create
*/
protected function _setCustomerData(\Magento\Customer\Model\Customer $customer)
{
@@ -1410,7 +1410,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
/**
* Prepare quote customer
*
- * @return \Magento\Adminhtml\Model\Sales\Order\Create
+ * @return \Magento\Sales\Model\AdminOrder\Create
*/
public function _prepareCustomer()
{
@@ -1615,7 +1615,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
/**
* Validate quote data before order creation
*
- * @return \Magento\Adminhtml\Model\Sales\Order\Create
+ * @return \Magento\Sales\Model\AdminOrder\Create
*/
protected function _validate()
{
diff --git a/app/code/Magento/Adminhtml/Model/Sales/Order/Random.php b/app/code/Magento/Sales/Model/AdminOrder/Random.php
similarity index 98%
rename from app/code/Magento/Adminhtml/Model/Sales/Order/Random.php
rename to app/code/Magento/Sales/Model/AdminOrder/Random.php
index a85e83c86f7..d6b31d9000c 100644
--- a/app/code/Magento/Adminhtml/Model/Sales/Order/Random.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Random.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -30,7 +30,7 @@
* @author Magento Core Team <core@magentocommerce.com>
*
*/
-namespace Magento\Adminhtml\Model\Sales\Order;
+namespace Magento\Sales\Model\AdminOrder;
/**
* @SuppressWarnings(PHPMD.LongVariable)
diff --git a/app/code/Magento/Sales/Model/Order/Grid/Massaction/ItemsUpdater.php b/app/code/Magento/Sales/Model/Order/Grid/Massaction/ItemsUpdater.php
index 0840304ac6e..9946f38dcde 100644
--- a/app/code/Magento/Sales/Model/Order/Grid/Massaction/ItemsUpdater.php
+++ b/app/code/Magento/Sales/Model/Order/Grid/Massaction/ItemsUpdater.php
@@ -28,7 +28,7 @@
* Sales orders grid massaction items updater
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Sales\Model\Order\Grid\Massaction;
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Shipment/Packaging.php b/app/code/Magento/Sales/Model/Order/Pdf/Shipment/Packaging.php
index 089804e800f..ea890cc2635 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Shipment/Packaging.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Shipment/Packaging.php
@@ -160,7 +160,7 @@ class Packaging extends \Magento\Sales\Model\Order\Pdf\AbstractPdf
if ($this->getPackageShippingBlock()) {
$packaging = $this->getPackageShippingBlock();
} else {
- $packaging = $this->_layout->getBlockSingleton('Magento\Adminhtml\Block\Sales\Order\Shipment\Packaging');
+ $packaging = $this->_layout->getBlockSingleton('Magento\Sales\Block\Adminhtml\Order\Shipment\Packaging');
}
$packages = $packaging->getPackages();
diff --git a/app/code/Magento/Sales/etc/adminhtml/menu.xml b/app/code/Magento/Sales/etc/adminhtml/menu.xml
index 5ac145c8256..9339c419c83 100644
--- a/app/code/Magento/Sales/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Sales/etc/adminhtml/menu.xml
@@ -29,13 +29,13 @@
<menu>
<add id="Magento_Sales::sales" title="Sales" module="Magento_Sales" sortOrder="10" dependsOnModule="Magento_Sales" resource="Magento_Sales::sales"/>
<add id="Magento_Sales::sales_operation" title="Operations" module="Magento_Sales" sortOrder="10" parent="Magento_Sales::sales" resource="Magento_Sales::sales_operation" />
- <add id="Magento_Sales::sales_order" title="Orders" module="Magento_Sales" sortOrder="10" parent="Magento_Sales::sales_operation" action="adminhtml/sales_order" resource="Magento_Sales::sales_order"/>
- <add id="Magento_Sales::sales_invoice" title="Invoices" module="Magento_Sales" sortOrder="20" parent="Magento_Sales::sales_operation" action="adminhtml/sales_invoice" resource="Magento_Sales::sales_invoice"/>
- <add id="Magento_Sales::sales_shipment" title="Shipments" module="Magento_Sales" sortOrder="30" parent="Magento_Sales::sales_operation" action="adminhtml/sales_shipment" resource="Magento_Sales::shipment"/>
- <add id="Magento_Sales::sales_creditmemo" title="Credit Memos" module="Magento_Sales" sortOrder="40" parent="Magento_Sales::sales_operation" action="adminhtml/sales_creditmemo" resource="Magento_Sales::sales_creditmemo"/>
- <add id="Magento_Sales::sales_transactions" title="Transactions" module="Magento_Sales" sortOrder="70" parent="Magento_Sales::sales_operation" action="adminhtml/sales_transactions" resource="Magento_Sales::transactions"/>
- <add id="Magento_Sales::sales_recurring_profile" title="Recurring Billing" module="Magento_Sales" sortOrder="80" parent="Magento_Sales::sales_operation" action="adminhtml/sales_recurring_profile" resource="Magento_Sales::recurring_profile"/>
- <add id="Magento_Sales::sales_billing_agreement" title="Billing Agreements" module="Magento_Sales" sortOrder="60" parent="Magento_Sales::sales_operation" action="adminhtml/sales_billing_agreement" resource="Magento_Sales::billing_agreement"/>
- <add id="Magento_Sales::system_order_statuses" title="Order Status" module="Magento_Sales" sortOrder="40" parent="Magento_Adminhtml::stores_settings" action="adminhtml/sales_order_status" resource="Magento_Sales::order_statuses"/>
+ <add id="Magento_Sales::sales_order" title="Orders" module="Magento_Sales" sortOrder="10" parent="Magento_Sales::sales_operation" action="sales/order" resource="Magento_Sales::sales_order"/>
+ <add id="Magento_Sales::sales_invoice" title="Invoices" module="Magento_Sales" sortOrder="20" parent="Magento_Sales::sales_operation" action="sales/invoice" resource="Magento_Sales::sales_invoice"/>
+ <add id="Magento_Sales::sales_shipment" title="Shipments" module="Magento_Sales" sortOrder="30" parent="Magento_Sales::sales_operation" action="sales/shipment" resource="Magento_Sales::shipment"/>
+ <add id="Magento_Sales::sales_creditmemo" title="Credit Memos" module="Magento_Sales" sortOrder="40" parent="Magento_Sales::sales_operation" action="sales/creditmemo" resource="Magento_Sales::sales_creditmemo"/>
+ <add id="Magento_Sales::sales_transactions" title="Transactions" module="Magento_Sales" sortOrder="70" parent="Magento_Sales::sales_operation" action="sales/transactions" resource="Magento_Sales::transactions"/>
+ <add id="Magento_Sales::sales_recurring_profile" title="Recurring Billing" module="Magento_Sales" sortOrder="80" parent="Magento_Sales::sales_operation" action="sales/recurring_profile" resource="Magento_Sales::recurring_profile"/>
+ <add id="Magento_Sales::sales_billing_agreement" title="Billing Agreements" module="Magento_Sales" sortOrder="60" parent="Magento_Sales::sales_operation" action="sales/billing_agreement" resource="Magento_Sales::billing_agreement"/>
+ <add id="Magento_Sales::system_order_statuses" title="Order Status" module="Magento_Sales" sortOrder="40" parent="Magento_Adminhtml::stores_settings" action="sales/order_status" resource="Magento_Sales::order_statuses"/>
</menu>
</config>
diff --git a/app/code/Magento/Sales/etc/adminhtml/routes.xml b/app/code/Magento/Sales/etc/adminhtml/routes.xml
new file mode 100644
index 00000000000..a5055bf8c1c
--- /dev/null
+++ b/app/code/Magento/Sales/etc/adminhtml/routes.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<config>
+ <router id="admin">
+ <route id="sales" frontName="sales">
+ <module name="Magento_Sales_Adminhtml" before="Magento_Adminhtml" />
+ </route>
+ </router>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/items/column/name.phtml b/app/code/Magento/Sales/view/adminhtml/items/column/name.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/items/column/name.phtml
rename to app/code/Magento/Sales/view/adminhtml/items/column/name.phtml
index baa92579ff5..b799af32317 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/items/column/name.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/items/column/name.phtml
@@ -26,7 +26,7 @@
?>
<?php
/**
- * @see \Magento\Adminhtml\Block\Sales\Items\Column\Name
+ * @see \Magento\Sales\Block\Adminhtml\Items\Column\Name
*/
?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/items/column/qty.phtml b/app/code/Magento/Sales/view/adminhtml/items/column/qty.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/items/column/qty.phtml
rename to app/code/Magento/Sales/view/adminhtml/items/column/qty.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/items/renderer/default.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/items/renderer/default.phtml
rename to app/code/Magento/Sales/view/adminhtml/items/renderer/default.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_billing_agreement_customergrid.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_billing_agreement_customergrid.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_billing_agreement_customergrid.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_billing_agreement_customergrid.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_billing_agreement_grid.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_billing_agreement_grid.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_billing_agreement_grid.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_billing_agreement_grid.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_billing_agreement_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_billing_agreement_index.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_billing_agreement_index.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_billing_agreement_index.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_billing_agreement_ordersgrid.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_billing_agreement_ordersgrid.xml
similarity index 96%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_billing_agreement_ordersgrid.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_billing_agreement_ordersgrid.xml
index 379bd1c6b6a..17687db5dbb 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_billing_agreement_ordersgrid.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_billing_agreement_ordersgrid.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_sales_order_grid_block"/>
+ <update handle="sales_order_grid_block"/>
<referenceBlock name="sales.order.grid">
<arguments>
<argument name="dataSource" xsi:type="object">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_billing_agreement_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_billing_agreement_view.xml
similarity index 97%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_billing_agreement_view.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_billing_agreement_view.xml
index dba7f3e78a8..08188273a38 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_billing_agreement_view.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_billing_agreement_view.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_sales_order_grid_block"/>
+ <update handle="sales_order_grid_block"/>
<referenceBlock name="sales.order.grid">
<arguments>
<argument name="dataSource" xsi:type="object">
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_addcomment.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_addcomment.xml
new file mode 100644
index 00000000000..987e3cc2de5
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_addcomment.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <block class="Magento\Sales\Block\Adminhtml\Order\View\History" name="order_history" template="order/view/history.phtml" output="1"/>
+</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_address.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_address.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_address.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_address.xml
index 65e5f805426..9ed62d1b890 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_address.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_address.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Address" name="sales_order_address.form.container"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Address" name="sales_order_address.form.container"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_customer_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_customer_block.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_customer_block.xml
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
new file mode 100644
index 00000000000..ea64a7c7d22
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <update handle="sales_order_create_customer_block"/>
+ <referenceBlock name="page-title">
+ <action method="setTitleId">
+ <argument translate="true" name="id" xsi:type="string">order-header</argument>
+ </action>
+ </referenceBlock>
+ <referenceBlock name="head">
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-sales-order-create-scripts-js">
+ <arguments>
+ <argument name="file" xsi:type="string">Magento_Sales::order/create/scripts.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-sales-order-create-giftmessage-js">
+ <arguments>
+ <argument name="file" xsi:type="string">Magento_Sales::order/create/giftmessage.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-catalog-product-composite-configure-js">
+ <arguments>
+ <argument name="file" xsi:type="string">Magento_Catalog::catalog/product/composite/configure.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="varien-configurable-js">
+ <arguments>
+ <argument name="file" xsi:type="string">varien/configurable.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-sales-order-giftoptions-tooltip-js">
+ <arguments>
+ <argument name="file" xsi:type="string">Magento_Sales::order/giftoptions_tooltip.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Adminhtml\Block\Template" name="optional_zip_countries" as="optional_zip_countries" template="Magento_Directory::js/optional_zip_countries.phtml"/>
+ <block class="Magento\Page\Block\Html\Head\Css" name="magento-core-prototype-magento-css">
+ <arguments>
+ <argument name="file" xsi:type="string">Magento_Core::prototype/magento.css</argument>
+ </arguments>
+ </block>
+ </referenceBlock>
+ <referenceContainer name="js">
+ <block class="Magento\Adminhtml\Block\Template" template="Magento_Sales::order/create/js.phtml" name="create"/>
+ </referenceContainer>
+ <referenceBlock name="root">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create" name="content">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Form" template="order/create/form.phtml" name="order_create_form" as="form">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Messages" name="message"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Customer" template="order/create/abstract.phtml" name="customer.grid.container"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Store" template="order/create/abstract.phtml" name="store">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Store\Select" template="order/create/store/select.phtml" name="select"/>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Data" template="order/create/data.phtml" name="data">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar" template="order/create/sidebar.phtml" name="sidebar">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Cart" template="order/create/sidebar/items.phtml" name="cart"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Wishlist" template="order/create/sidebar/items.phtml" name="wishlist"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Reorder" template="order/create/sidebar/items.phtml" name="reorder"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Viewed" template="order/create/sidebar/items.phtml" name="viewed"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Compared" template="order/create/sidebar/items.phtml" name="compared"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Pcompared" template="order/create/sidebar/items.phtml" name="pcompared"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Pviewed" template="order/create/sidebar/items.phtml" name="pviewed"/>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Form\Account" template="order/create/form/account.phtml" name="form_account"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="order/create/form/address.phtml" name="shipping_address"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="order/create/form/address.phtml" name="billing_address"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method" template="order/create/abstract.phtml" name="shipping_method">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method\Form" template="order/create/shipping/method/form.phtml" name="order_create_shipping_form" as="form"/>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Method" template="order/create/abstract.phtml" name="billing_method">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Method\Form" template="order/create/billing/method/form.phtml" name="order_create_billing_form" as="form"/>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Newsletter" template="order/create/abstract.phtml" name="newsletter">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Newsletter\Form" template="order/create/newsletter/form.phtml" name="order_create_newsletter_form" as="form"/>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Search" template="order/create/abstract.phtml" name="search">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid" name="search_grid" as="grid"/>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Items" template="order/create/items.phtml" name="items">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid" template="order/create/items/grid.phtml" name="items_grid">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Coupons" template="order/create/coupons/form.phtml" name="coupons">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Coupons\Form" template="order/create/coupons/form.phtml" name="order_create_coupons_form" as="form"/>
+ </block>
+ </block>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Comment" template="order/create/comment.phtml" name="comment"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Totals" template="order/create/totals.phtml" name="totals"/>
+ <block class="Magento\Adminhtml\Block\Template" name="gift_options" template="Magento_Sales::order/giftoptions.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Giftmessage" template="order/create/giftmessage.phtml" name="giftmessage"/>
+ </block>
+ <block class="Magento\Core\Block\Text\ListText" name="order_item_extra_info"/>
+ </block>
+ </block>
+ </block>
+ </referenceBlock>
+ <referenceContainer name="before_body_end">
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Composite\Configure" template="Magento_Catalog::catalog/product/composite/configure.phtml"/>
+ </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_form_account.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml
similarity index 87%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_form_account.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml
index cdd627b677e..4febc19149b 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_form_account.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Form\Account" template="sales/order/create/form/account.phtml" name="form_account"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="order/create/form/address.phtml" name="billing_address"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_billing_method.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_method.xml
similarity index 76%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_billing_method.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_method.xml
index 3c3258982d5..3a312d0a6d6 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_billing_method.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_method.xml
@@ -25,8 +25,8 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Billing\Method" template="sales/order/create/abstract.phtml" name="billing_method">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Billing\Method\Form" template="sales/order/create/billing/method/form.phtml" name="order.create.billing.method.form" as="form"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Method" template="order/create/abstract.phtml" name="billing_method">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Method\Form" template="order/create/billing/method/form.phtml" name="order.create.billing.method.form" as="form"/>
</block>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_comment.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_comment.xml
new file mode 100644
index 00000000000..8f53697b463
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_comment.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Comment" template="order/create/comment.phtml" name="comment"/>
+ </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_customer_grid.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_customer_grid.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_customer_grid.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_customer_grid.xml
index 4bbf262deb4..d7deaeeb682 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_customer_grid.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_customer_grid.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_sales_order_create_customer_block"/>
+ <update handle="sales_order_create_customer_block"/>
<referenceContainer name="content">
<block class="Magento\Backend\Block\Widget\Grid\Container" name="customer.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml" output="1"/>
</referenceContainer>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml
new file mode 100644
index 00000000000..0e97b9c64d7
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_data.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Data" template="order/create/data.phtml" name="data">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar" template="order/create/sidebar.phtml" name="sidebar">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Cart" template="order/create/sidebar/items.phtml" name="cart"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Wishlist" template="order/create/sidebar/items.phtml" name="wishlist"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Reorder" template="order/create/sidebar/items.phtml" name="reorder"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Viewed" template="order/create/sidebar/items.phtml" name="viewed"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Compared" template="order/create/sidebar/items.phtml" name="compared"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Pcompared" template="order/create/sidebar/items.phtml" name="pcompared"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Pviewed" template="order/create/sidebar/items.phtml" name="pviewed"/>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Form\Account" template="order/create/form/account.phtml" name="form_account"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="order/create/form/address.phtml" name="shipping_address"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address" template="order/create/form/address.phtml" name="billing_address"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method" template="order/create/abstract.phtml" name="shipping_method">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method\Form" template="order/create/shipping/method/form.phtml" name="order.create.shipping.method.form" as="form"/>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Method" template="order/create/abstract.phtml" name="billing_method">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Billing\Method\Form" template="order/create/billing/method/form.phtml" name="order.create.billing.method.form" as="form"/>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Newsletter" template="order/create/abstract.phtml" name="newsletter">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Newsletter\Form" template="order/create/newsletter/form.phtml" name="order.create.newsletter.form" as="form"/>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Search" template="order/create/abstract.phtml" name="search">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid" name="search.grid" as="grid"/>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Items" template="order/create/items.phtml" name="items">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid" template="order/create/items/grid.phtml" name="items_grid">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Coupons" template="order/create/coupons/form.phtml" name="coupons">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Coupons\Form" template="order/create/coupons/form.phtml" name="order.create.coupons.form" as="form"/>
+ </block>
+ </block>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Comment" template="order/create/comment.phtml" name="comment"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Totals" template="order/create/totals.phtml" name="totals"/>
+ <block class="Magento\Adminhtml\Block\Template" name="gift_options" template="Magento_Sales::order/giftoptions.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Giftmessage" template="order/create/giftmessage.phtml" name="giftmessage"/>
+ </block>
+ <block class="Magento\Core\Block\Text\ListText" name="order_item_extra_info"/>
+ </block>
+ </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_form_account.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_form_account.xml
new file mode 100644
index 00000000000..428088a7816
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_form_account.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Form\Account" template="order/create/form/account.phtml" name="form_account"/>
+ </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_comment.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_giftmessage.xml
similarity index 88%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_comment.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_giftmessage.xml
index cea7fb52321..f97dc5ea4eb 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_comment.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_giftmessage.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Comment" template="sales/order/create/comment.phtml" name="comment"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Giftmessage" template="order/create/giftmessage.phtml" name="giftmessage"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_header.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_header.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_header.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_header.xml
index e09ddefae07..1496fe60957 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_header.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_header.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Header" name="header"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Header" name="header"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_items.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_items.xml
similarity index 67%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_items.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_items.xml
index 891e6d5ada0..342847b839d 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_items.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_items.xml
@@ -25,10 +25,10 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Items" template="sales/order/create/items.phtml" name="items">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Items\Grid" template="sales/order/create/items/grid.phtml" name="items_grid">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Coupons" template="sales/order/create/coupons/form.phtml" name="coupons">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Coupons\Form" template="sales/order/create/coupons/form.phtml" name="order.create.coupons.form" as="form"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Items" template="order/create/items.phtml" name="items">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid" template="order/create/items/grid.phtml" name="items_grid">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Coupons" template="order/create/coupons/form.phtml" name="coupons">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Coupons\Form" template="order/create/coupons/form.phtml" name="order.create.coupons.form" as="form"/>
</block>
</block>
</block>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_json.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_json.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_json.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_json.xml
index 6679b074f34..54b1a01f4a0 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_json.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_json.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="root">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Load" name="content"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Load" name="content"/>
</referenceBlock>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_message.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_message.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_message.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_message.xml
index 549fe625cae..6125f07ff3a 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_message.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_message.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Messages" name="message"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Messages" name="message"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_newsletter.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_newsletter.xml
similarity index 77%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_newsletter.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_newsletter.xml
index 61a2d0e3dac..4edca3732a6 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_newsletter.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_newsletter.xml
@@ -25,8 +25,8 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Newsletter" template="sales/order/create/abstract.phtml" name="newsletter">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Newsletter\Form" template="sales/order/create/newsletter/form.phtml" name="order.create.newsletter.form" as="form"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Newsletter" template="order/create/abstract.phtml" name="newsletter">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Newsletter\Form" template="order/create/newsletter/form.phtml" name="order.create.newsletter.form" as="form"/>
</block>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_plain.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_plain.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_plain.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_plain.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_search.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_search.xml
similarity index 85%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_search.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_search.xml
index 5c03daaac58..928bad088d3 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_search.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_search.xml
@@ -25,8 +25,8 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Search" template="sales/order/create/abstract.phtml" name="search">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Search\Grid" name="search.grid" as="grid"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Search" template="order/create/abstract.phtml" name="search">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid" name="search.grid" as="grid"/>
</block>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_search_grid.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_search_grid.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_search_grid.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_search_grid.xml
index 827c8f4d81e..c4ee6c4f995 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_search_grid.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_search_grid.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Search\Grid" name="serach.grid" as="grid"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid" name="serach.grid" as="grid"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml
new file mode 100644
index 00000000000..f7eb71264f0
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_address.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address" template="order/create/form/address.phtml" name="shipping_address"/>
+ </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_method.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_method.xml
new file mode 100644
index 00000000000..053d04951e7
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_shipping_method.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method" template="order/create/abstract.phtml" name="shipping_method">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method\Form" template="order/create/shipping/method/form.phtml" name="order.create.shipping.method.form" as="form"/>
+ </block>
+ </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar.xml
new file mode 100644
index 00000000000..2f01901f381
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar" template="order/create/sidebar.phtml" name="sidebar">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Cart" template="order/create/sidebar/items.phtml" name="cart"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Wishlist" template="order/create/sidebar/items.phtml" name="wishlist"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Reorder" template="order/create/sidebar/items.phtml" name="reorder"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Viewed" template="order/create/sidebar/items.phtml" name="viewed"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Compared" template="order/create/sidebar/items.phtml" name="compared"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Pcompared" template="order/create/sidebar/items.phtml" name="pcompared"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Pviewed" template="order/create/sidebar/items.phtml" name="pviewed"/>
+ </block>
+ </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_cart.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_cart.xml
new file mode 100644
index 00000000000..e1f080736c1
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_cart.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Cart" template="order/create/sidebar/items.phtml" name="sidebar_cart"/>
+ </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_compared.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_compared.xml
new file mode 100644
index 00000000000..5cf522f0798
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_compared.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Compared" template="order/create/sidebar/items.phtml" name="sidebar_compared"/>
+ </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_pcompared.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_pcompared.xml
new file mode 100644
index 00000000000..f8728553d5b
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_pcompared.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Pcompared" template="order/create/sidebar/items.phtml" name="sidebar_pcompared"/>
+ </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_pviewed.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_pviewed.xml
new file mode 100644
index 00000000000..9e6c8ac541f
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_pviewed.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Pviewed" template="order/create/sidebar/items.phtml" name="sidebar_pviewed"/>
+ </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_reorder.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_reorder.xml
new file mode 100644
index 00000000000..a2a8c0ae0bd
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_reorder.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Reorder" template="order/create/sidebar/items.phtml" name="sidebar_reorder"/>
+ </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_giftmessage.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_viewed.xml
similarity index 87%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_giftmessage.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_viewed.xml
index c6f5f8786d7..22f85ba6a74 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_giftmessage.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_viewed.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Giftmessage" template="sales/order/create/giftmessage.phtml" name="giftmessage"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Viewed" template="order/create/sidebar/items.phtml" name="sidebar_viewed"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_wishlist.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_wishlist.xml
new file mode 100644
index 00000000000..9a0b4ff12fa
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_sidebar_wishlist.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Wishlist" template="order/create/sidebar/items.phtml" name="sidebar_wishlist"/>
+ </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_totals.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_totals.xml
new file mode 100644
index 00000000000..0bfef181e61
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_totals.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Create\Totals" template="order/create/totals.phtml" name="totals"/>
+ </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_creditmemo_addcomment.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_addcomment.xml
similarity index 84%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_creditmemo_addcomment.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_addcomment.xml
index 37bcc6b4406..6f3722aebf7 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_creditmemo_addcomment.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_addcomment.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <block class="Magento\Adminhtml\Block\Sales\Order\Creditmemo\View\Comments" name="creditmemo_comments">
- <block class="Magento\Adminhtml\Block\Sales\Order\Comments\View" name="order_comments" template="sales/order/comments/view.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\View\Comments" name="creditmemo_comments">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Comments\View" name="order_comments" template="order/comments/view.phtml"/>
</block>
</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml
new file mode 100644
index 00000000000..88e5265a8b0
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_new.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create" name="sales_creditmemo_create">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Form" name="form" template="order/creditmemo/create/form.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\View\Info" name="order_info" template="order/view/info.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Payment" name="order_payment"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Items" name="order_items" template="order/creditmemo/create/items.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" as="default" template="order/creditmemo/create/items/renderer/default.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="items/column/qty.phtml" group="column"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="items/column/name.phtml" group="column"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name\Grouped" name="column_name_grouped" template="items/column/name.phtml" group="column"/>
+ <block class="Magento\Core\Block\Text\ListText" name="order_item_extra_info"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totalbar" name="order_totalbar" template="order/totalbar.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Adjustments" name="adjustments" template="order/creditmemo/create/totals/adjustments.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="order/totals/tax.phtml"/>
+ <!--
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="footer" template="order/totals/footer.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="grand" template="order/totals/grand.phtml">
+ <action method="setGrandTotalTitle">
+ <argument name="title" xsi:type="string">Total Refund</argument>
+ </action>
+ </block>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="sales.order.view.totals.main" as="main" template="order/totals/main.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="tax" template="order/totals/item.phtml">
+ <action method="setSourceField">
+ <argument name="value" xsi:type="string">tax_amount</argument>
+ </action>
+ <action method="setLabel">
+ <argument name="value" xsi:type="string">Tax</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="discount" template="order/totals/item.phtml">
+ <action method="setSourceField">
+ <argument name="value" xsi:type="string">discount_amount</argument>
+ </action>
+ <action method="setLabel">
+ <argument name="value" xsi:type="string">Discount</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="adjustments" template="order/creditmemo/create/totals/adjustments.phtml"/>
+ </block>
+ -->
+ </block>
+ <container name="submit_before" label="Submit Before"/>
+ <container name="submit_after" label="Submit After"/>
+ </block>
+ </block>
+ </block>
+ </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
new file mode 100644
index 00000000000..15553f15632
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_updateqty.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Items" name="order_items" template="order/creditmemo/create/items.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" as="default" template="order/creditmemo/create/items/renderer/default.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="items/column/qty.phtml" group="column"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="items/column/name.phtml" group="column"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name\Grouped" name="column_name_grouped" template="items/column/name.phtml" group="column"/>
+ <block class="Magento\Core\Block\Text\ListText" name="order_item_extra_info"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totalbar" name="order_totalbar" template="order/totalbar.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Adjustments" name="adjustments" template="order/creditmemo/create/totals/adjustments.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="order/totals/tax.phtml"/>
+ <!--<block class="Magento\Sales\Block\Adminhtml\Order\Totals" name="order_totals" template="order/totals.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="footer" template="order/totals/footer.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="grand" template="order/totals/grand.phtml">
+ <action method="setGrandTotalTitle">
+ <argument name="title" xsi:type="string">Total Refund</argument>
+ </action>
+ </block>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="sales.order.view.totals.main" as="main" template="order/totals/main.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="tax" template="order/totals/item.phtml">
+ <action method="setSourceField">
+ <argument name="value" xsi:type="string">tax_amount</argument>
+ </action>
+ <action method="setLabel">
+ <argument name="value" xsi:type="string">Tax</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="discount" template="order/totals/item.phtml">
+ <action method="setSourceField">
+ <argument name="value" xsi:type="string">discount_amount</argument>
+ </action>
+ <action method="setLabel">
+ <argument name="value" xsi:type="string">Discount</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="adjustments" template="order/creditmemo/create/totals/adjustments.phtml"/>
+ </block>-->
+ </block>
+ <container name="submit_before" label="Submit Before"/>
+ <container name="submit_after" label="Submit After"/>
+ </block>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_view.xml
new file mode 100644
index 00000000000..590a3663a4d
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_creditmemo_view.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\View" name="sales_creditmemo_view">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\View\Form" name="form" template="order/creditmemo/view/form.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\View\Info" name="order_info" template="order/view/info.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Payment" name="order_payment"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\View\Items" name="creditmemo_items" template="order/creditmemo/view/items.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" as="default" template="order/creditmemo/view/items/renderer/default.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="items/column/qty.phtml" group="column"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="items/column/name.phtml" group="column"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name\Grouped" name="column_name_grouped" template="items/column/name.phtml" group="column"/>
+ <block class="Magento\Core\Block\Text\ListText" name="order_item_extra_info"/>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Comments\View" name="order_comments" template="order/comments/view.phtml">
+ <action method="setParentType">
+ <argument name="type" xsi:type="string">creditmemo</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="order/totals/tax.phtml"/>
+ <!--<block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="footer" template="order/totals/footer.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="grand" template="order/totals/grand.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="paid" template="order/totals/paid.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="refunded" template="order/totals/refunded.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="due" template="order/totals/due.phtml"/>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="sales.order.view.totals.main" as="main" template="order/totals/main.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="order/totals/tax.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="shipping" template="order/totals/shipping.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="discount" template="order/totals/discount.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="giftcert" template="order/totals/item.phtml">
+ <action method="setSourceField">
+ <argument name="value" xsi:type="string">giftcert_amount</argument>
+ </action>
+ <action method="setLabel">
+ <argument name="value" xsi:type="string">Gift Certificate</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="adjustment_positive" template="order/totals/item.phtml">
+ <action method="setSourceField">
+ <argument name="value" xsi:type="string">adjustment_positive</argument>
+ </action>
+ <action method="setLabel">
+ <argument name="value" xsi:type="string">Adjustment Refund</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="adjustment_negative" template="order/totals/item.phtml">
+ <action method="setSourceField">
+ <argument name="value" xsi:type="string">adjustment_negative</argument>
+ </action>
+ <action method="setLabel">
+ <argument name="value" xsi:type="string">Adjustment Fee</argument>
+ </action>
+ </block>
+ </block>-->
+ </block>
+ </block>
+ </block>
+ </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_review_edit.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_edit_index.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_review_edit.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_edit_index.xml
index bf4e05a2988..f46279b1652 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_catalog_product_review_edit.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_edit_index.xml
@@ -24,5 +24,5 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_catalog_product_review_new"/>
+ <update handle="sales_order_create_index"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_exportcsv.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_exportcsv.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_exportcsv.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_exportcsv.xml
index 53d181d5d7e..7f3382064fb 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_exportcsv.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_exportcsv.xml
@@ -24,6 +24,6 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_sales_order_grid_block"/>
+ <update handle="sales_order_grid_block"/>
<block class="Magento\Backend\Block\Widget\Grid\Container" name="sales_order.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_exportexcel.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_exportexcel.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_exportexcel.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_exportexcel.xml
index 53d181d5d7e..7f3382064fb 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_exportexcel.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_exportexcel.xml
@@ -24,6 +24,6 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_sales_order_grid_block"/>
+ <update handle="sales_order_grid_block"/>
<block class="Magento\Backend\Block\Widget\Grid\Container" name="sales_order.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_grid.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_grid.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_grid.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_grid.xml
index 8718330e064..306a2a1c01a 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_grid.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_grid.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<update handle="formkey"/>
- <update handle="adminhtml_sales_order_grid_block"/>
+ <update handle="sales_order_grid_block"/>
<block class="Magento\Backend\Block\Widget\Grid\Container" name="sales_order.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml" output="1"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_grid_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_grid_block.xml
similarity index 92%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_grid_block.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_grid_block.xml
index 2a7cb007067..37a2af6e41c 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_grid_block.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_grid_block.xml
@@ -25,7 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="sales_order.grid.container">
- <block class="Magento\Adminhtml\Block\Sales\Order\Grid" name="sales.order.grid" as="grid">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Grid" name="sales.order.grid" as="grid">
<arguments>
<argument name="id" xsi:type="string">sales_order_grid</argument>
<argument name="dataSource" xsi:type="object">Magento\Sales\Model\Resource\Order\Grid\Collection</argument>
@@ -52,35 +52,35 @@
<updater>Magento\Sales\Model\Order\Grid\Massaction\ItemsUpdater</updater>
<item name="cancel_order" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Cancel</item>
- <item name="url" xsi:type="string">*/sales_order/massCancel</item>
+ <item name="url" xsi:type="string">adminhtml/sales_order/massCancel</item>
</item>
<item name="hold_order" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Hold</item>
- <item name="url" xsi:type="string">*/sales_order/massHold</item>
+ <item name="url" xsi:type="string">adminhtml/sales_order/massHold</item>
</item>
<item name="unhold_order" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Unhold</item>
- <item name="url" xsi:type="string">*/sales_order/massUnhold</item>
+ <item name="url" xsi:type="string">adminhtml/sales_order/massUnhold</item>
</item>
<item name="pdfinvoices_order" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Print Invoices</item>
- <item name="url" xsi:type="string">*/sales_order/pdfinvoices</item>
+ <item name="url" xsi:type="string">adminhtml/sales_order/pdfinvoices</item>
</item>
<item name="pdfshipments_order" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Print Packing Slips</item>
- <item name="url" xsi:type="string">*/sales_order/pdfshipments</item>
+ <item name="url" xsi:type="string">adminhtml/sales_order/pdfshipments</item>
</item>
<item name="pdfcreditmemos_order" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Print Credit Memos</item>
- <item name="url" xsi:type="string">*/sales_order/pdfcreditmemos</item>
+ <item name="url" xsi:type="string">adminhtml/sales_order/pdfcreditmemos</item>
</item>
<item name="pdfdocs_order" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Print All</item>
- <item name="url" xsi:type="string">*/sales_order/pdfdocs</item>
+ <item name="url" xsi:type="string">adminhtml/sales_order/pdfdocs</item>
</item>
<item name="print_shipping_label" xsi:type="array">
<item name="label" xsi:type="string" translate="true">Print Shipping Labels</item>
- <item name="url" xsi:type="string">*/sales_order_shipment/massPrintShippingLabel</item>
+ <item name="url" xsi:type="string">adminhtml/sales_order_shipment/massPrintShippingLabel</item>
</item>
</argument>
</arguments>
@@ -89,11 +89,11 @@
<arguments>
<argument name="exportTypes" xsi:type="array">
<item name="csv" xsi:type="array">
- <item name="urlPath" xsi:type="string">*/*/exportCsv</item>
+ <item name="urlPath" xsi:type="string">adminhtml/*/exportCsv</item>
<item name="label" xsi:type="string" translate="true">CSV</item>
</item>
<item name="excel" xsi:type="array">
- <item name="urlPath" xsi:type="string">*/*/exportExcel</item>
+ <item name="urlPath" xsi:type="string">adminhtml/*/exportExcel</item>
<item name="label" xsi:type="string" translate="true">Excel XML</item>
</item>
</argument>
@@ -104,7 +104,7 @@
<argument name="id" xsi:type="string">sales_order_grid</argument>
<argument name="rowUrl" xsi:type="array">
<item name="generatorClass" xsi:type="string">Magento\Sales\Model\Order\Grid\Row\UrlGenerator</item>
- <item name="path" xsi:type="string">*/sales_order/view</item>
+ <item name="path" xsi:type="string">sales/order/view</item>
<item name="extraParamsTemplate" xsi:type="array">
<item name="order_id" xsi:type="string">getId</item>
</item>
@@ -209,7 +209,7 @@
<item name="view_action" xsi:type="array">
<item name="caption" xsi:type="string" translate="true">View</item>
<item name="url" xsi:type="array">
- <item name="base" xsi:type="string">*/sales_order/view</item>
+ <item name="base" xsi:type="string">sales/order/view</item>
</item>
<item name="field" xsi:type="string">order_id</item>
</item>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_index.xml
similarity index 90%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_index.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_index.xml
index 03c46bf6f98..2e952e74080 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_index.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_index.xml
@@ -24,8 +24,8 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_sales_order_grid_block"/>
+ <update handle="sales_order_grid_block"/>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order" name="sales_order.grid.container"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order" name="sales_order.grid.container"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_invoice_addcomment.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_addcomment.xml
similarity index 83%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_invoice_addcomment.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_addcomment.xml
index 8a3aba5ce2d..d41411de35a 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_invoice_addcomment.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_addcomment.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <block class="Magento\Adminhtml\Block\Sales\Order\Invoice\View\Comments" name="invoice_comments">
- <block class="Magento\Adminhtml\Block\Sales\Order\Comments\View" name="order_comments" template="sales/order/comments/view.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\View\Comments" name="invoice_comments">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Comments\View" name="order_comments" template="order/comments/view.phtml"/>
</block>
</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml
new file mode 100644
index 00000000000..d61ec84080c
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_new.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\Create" name="sales_invoice_create">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\Create\Form" name="form" template="order/invoice/create/form.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\View\Info" name="order_info" template="order/view/info.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Payment" name="order_payment"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\Create\Items" name="order_items" template="order/invoice/create/items.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" as="default" template="order/invoice/create/items/renderer/default.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="items/column/qty.phtml" group="column"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="items/column/name.phtml" group="column"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name\Grouped" name="column_name_grouped" template="items/column/name.phtml" group="column"/>
+ <block class="Magento\Core\Block\Text\ListText" name="order_item_extra_info"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totalbar" name="order_totalbar" template="order/totalbar.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="order/totals/tax.phtml"/>
+ <!--<block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="footer" template="order/totals/footer.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="grand" template="order/totals/grand.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="paid" template="order/totals/paid.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="refunded" template="order/totals/refunded.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="due" template="order/totals/due.phtml"/>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="sales.order.view.totals.main" as="main" template="order/totals/main.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="tax" template="order/totals/item.phtml">
+ <action method="setSourceField">
+ <argument name="value" xsi:type="string">tax_amount</argument>
+ </action>
+ <action method="setLabel">
+ <argument name="value" xsi:type="string">Tax</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="shipping" template="order/totals/shipping.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="discount" template="order/totals/discount.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="giftcert" template="order/totals/item.phtml">
+ <action method="setSourceField">
+ <argument name="value" xsi:type="string">giftcert_amount</argument>
+ </action>
+ <action method="setLabel">
+ <argument name="value" xsi:type="string">Gift Certificate</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="adjustment_positive" template="order/totals/item.phtml">
+ <action method="setSourceField">
+ <argument name="value" xsi:type="string">adjustment_positive</argument>
+ </action>
+ <action method="setLabel">
+ <argument name="value" xsi:type="string">Adjustment Refund</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="adjustment_negative" template="order/totals/item.phtml">
+ <action method="setSourceField">
+ <argument name="value" xsi:type="string">adjustment_negative</argument>
+ </action>
+ <action method="setLabel">
+ <argument name="value" xsi:type="string">Adjustment Fee</argument>
+ </action>
+ </block>
+ </block>-->
+ </block>
+ </block>
+ </block>
+ </block>
+ </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_updateqty.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_updateqty.xml
new file mode 100644
index 00000000000..4ea586a7b16
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_updateqty.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\Create\Items" name="order_items" template="order/invoice/create/items.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" as="default" template="order/invoice/create/items/renderer/default.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="items/column/qty.phtml" group="column"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="items/column/name.phtml" group="column"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name\Grouped" name="column_name_grouped" template="items/column/name.phtml" group="column"/>
+ <block class="Magento\Core\Block\Text\ListText" name="order_item_extra_info"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totalbar" name="order_totalbar" template="order/totalbar.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="order/totals/tax.phtml"/>
+ <!--<block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="footer" template="order/totals/footer.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="grand" template="order/totals/grand.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="paid" template="order/totals/paid.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="refunded" template="order/totals/refunded.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="due" template="order/totals/due.phtml"/>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="sales.order.view.totals.main" as="main" template="order/totals/main.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="tax" template="order/totals/item.phtml">
+ <action method="setSourceField">
+ <argument name="value" xsi:type="string">tax_amount</argument>
+ </action>
+ <action method="setLabel">
+ <argument name="value" xsi:type="string">Tax</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="shipping" template="order/totals/shipping.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="discount" template="order/totals/discount.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="giftcert" template="order/totals/item.phtml">
+ <action method="setSourceField">
+ <argument name="value" xsi:type="string">giftcert_amount</argument>
+ </action>
+ <action method="setLabel">
+ <argument name="value" xsi:type="string">Gift Certificate</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="adjustment_positive" template="order/totals/item.phtml">
+ <action method="setSourceField">
+ <argument name="value" xsi:type="string">adjustment_positive</argument>
+ </action>
+ <action method="setLabel">
+ <argument name="value" xsi:type="string">Adjustment Refund</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="adjustment_negative" template="order/totals/item.phtml">
+ <action method="setSourceField">
+ <argument name="value" xsi:type="string">adjustment_negative</argument>
+ </action>
+ <action method="setLabel">
+ <argument name="value" xsi:type="string">Adjustment Fee</argument>
+ </action>
+ </block>
+ </block>-->
+ </block>
+ </block>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_view.xml
new file mode 100644
index 00000000000..91256831620
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_invoice_view.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\View" name="sales_invoice_view">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\View\Form" name="form" template="order/invoice/view/form.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\View\Info" name="order_info" template="order/view/info.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Payment" name="order_payment"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\View\Items" name="invoice_items" template="order/invoice/view/items.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" as="default" template="order/invoice/view/items/renderer/default.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="items/column/qty.phtml" group="column"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="items/column/name.phtml" group="column"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name\Grouped" name="column_name_grouped" template="items/column/name.phtml" group="column"/>
+ <block class="Magento\Core\Block\Text\ListText" name="order_item_extra_info"/>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Comments\View" name="order_comments" template="order/comments/view.phtml">
+ <action method="setParentType">
+ <argument name="type" xsi:type="string">invoice</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="order/totals/tax.phtml"/>
+ <!--<block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="footer" template="order/totals/footer.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="grand" template="order/totals/grand.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="paid" template="order/totals/paid.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="refunded" template="order/totals/refunded.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="due" template="order/totals/due.phtml"/>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="sales.order.view.totals.main" as="main" template="order/totals/main.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="tax" template="order/totals/item.phtml">
+ <action method="setSourceField">
+ <argument name="value" xsi:type="string">tax_amount</argument>
+ </action>
+ <action method="setLabel">
+ <argument name="value" xsi:type="string">Tax</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="shipping" template="order/totals/shipping.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="discount" template="order/totals/discount.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="giftcert" template="order/totals/item.phtml">
+ <action method="setSourceField">
+ <argument name="value" xsi:type="string">giftcert_amount</argument>
+ </action>
+ <action method="setLabel">
+ <argument name="value" xsi:type="string">Gift Certificate</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="adjustment_positive" template="order/totals/item.phtml">
+ <action method="setSourceField">
+ <argument name="value" xsi:type="string">adjustment_positive</argument>
+ </action>
+ <action method="setLabel">
+ <argument name="value" xsi:type="string">Adjustment Refund</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Item" name="adjustment_negative" template="order/totals/item.phtml">
+ <action method="setSourceField">
+ <argument name="value" xsi:type="string">adjustment_negative</argument>
+ </action>
+ <action method="setLabel">
+ <argument name="value" xsi:type="string">Adjustment Fee</argument>
+ </action>
+ </block>
+ </block>-->
+ </block>
+ </block>
+ </block>
+ </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_shipment_addcomment.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_addcomment.xml
similarity index 84%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_shipment_addcomment.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_addcomment.xml
index 89d32a89b8a..6c10838b0e0 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_shipment_addcomment.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_addcomment.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <block class="Magento\Adminhtml\Block\Sales\Order\Shipment\View\Comments" name="shipment_comments">
- <block class="Magento\Adminhtml\Block\Sales\Order\Comments\View" name="order_comments" template="sales/order/comments/view.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Shipment\View\Comments" name="shipment_comments">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Comments\View" name="order_comments" template="order/comments/view.phtml"/>
</block>
</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_addtrack.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_addtrack.xml
new file mode 100644
index 00000000000..c5b259b630f
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_addtrack.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Shipment\View\Tracking" name="shipment_tracking" template="order/shipment/view/tracking.phtml"/>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_new.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_new.xml
new file mode 100644
index 00000000000..b315840b7fe
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_new.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceBlock name="head">
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-sales-order-shipment-packaging-js">
+ <arguments>
+ <argument name="file" xsi:type="string">Magento_Sales::order/shipment/packaging.js</argument>
+ </arguments>
+ </block>
+ </referenceBlock>
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Shipment\Create" name="sales_shipment_create">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Shipment\Create\Form" name="form" template="order/shipment/create/form.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\View\Info" name="order_info" template="order/view/info.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Payment" name="order_payment"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Shipment\Create\Tracking" name="shipment_tracking" template="order/shipment/create/tracking.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Shipment\Create\Items" name="order_items" template="order/shipment/create/items.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" as="default" template="order/shipment/create/items/renderer/default.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="items/column/qty.phtml" group="column"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="items/column/name.phtml" group="column"/>
+ <block class="Magento\Core\Block\Text\ListText" name="order_item_extra_info"/>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Shipment\Packaging" name="shipment_packaging" template="order/shipment/packaging/popup.phtml"/>
+ </block>
+ </block>
+ </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_removetrack.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_removetrack.xml
new file mode 100644
index 00000000000..c5b259b630f
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_removetrack.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Shipment\View\Tracking" name="shipment_tracking" template="order/shipment/view/tracking.phtml"/>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_view.xml
new file mode 100644
index 00000000000..68771ba3130
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_shipment_view.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceBlock name="head">
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-sales-order-shipment-packaging-js">
+ <arguments>
+ <argument name="file" xsi:type="string">Magento_Sales::order/shipment/packaging.js</argument>
+ </arguments>
+ </block>
+ </referenceBlock>
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Shipment\View" name="sales_shipment_view">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Shipment\View\Form" name="form" template="order/shipment/view/form.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\View\Info" name="order_info" template="order/view/info.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Payment" name="order_payment"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Shipment\View\Tracking" name="shipment_tracking" template="order/shipment/view/tracking.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Shipment\View\Items" name="shipment_items" template="order/shipment/view/items.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" as="default" template="order/shipment/view/items/renderer/default.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="items/column/qty.phtml" group="column"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="items/column/name.phtml" group="column"/>
+ <block class="Magento\Core\Block\Text\ListText" name="order_item_extra_info"/>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Invoice\Create\Tracking" name="invoice_tracking" template="order/shipment/create/tracking.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Comments\View" name="order_comments" template="order/comments/view.phtml">
+ <action method="setParentType">
+ <argument name="type" xsi:type="string">shipment</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Shipment\Packaging" name="shipment_packaging" template="order/shipment/packaging/popup.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Shipment\Packaging" name="shipment_packed" template="order/shipment/packaging/packed.phtml"/>
+ </block>
+ </block>
+ </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_status_assign.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_assign.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_status_assign.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_assign.xml
index 50465792120..cb20cb42b76 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_status_assign.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_assign.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Status\Assign" name="sales_order_status.assign.container"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Status\Assign" name="sales_order_status.assign.container"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_status_edit.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_edit.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_status_edit.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_edit.xml
index 162d111d97a..d49544e81c3 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_status_edit.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_edit.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Status\Edit" name="sales_order_status.edit.container"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Status\Edit" name="sales_order_status.edit.container"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_status_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_status_index.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml
index 0d686454812..39abf257ae9 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_status_index.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml
@@ -25,7 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Status" name="sales_order_status.grid.container">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Status" name="sales_order_status.grid.container">
<block class="Magento\Backend\Block\Widget\Grid" name="sales_order_status.grid" as="grid">
<arguments>
<argument name="id" xsi:type="string">sales_order_status_grid</argument>
@@ -37,7 +37,7 @@
<block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="sales_order_status.grid.columnSet">
<arguments>
<argument name="rowUrl" xsi:type="array">
- <item name="path" xsi:type="string">*/sales_order_status/edit</item>
+ <item name="path" xsi:type="string">adminhtml/sales_order_status/edit</item>
<item name="extraParamsTemplate" xsi:type="array">
<item name="status" xsi:type="string">getStatus</item>
</item>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_status_newstatus.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_newstatus.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_status_newstatus.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_newstatus.xml
index a994147ddd3..5d3f44fc9fe 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_status_newstatus.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_newstatus.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Status\NewStatus" name="sales_order_status.new.container"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Status\NewStatus" name="sales_order_status.new.container"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_transactions_grid.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_transactions.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_transactions_grid.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_transactions.xml
index 43b6da96635..d570c4f312b 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_transactions_grid.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_transactions.xml
@@ -24,5 +24,5 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <block class="Magento\Adminhtml\Block\Sales\Transactions\Grid" name="sales_transactions.grid" output="1"/>
+ <block class="Magento\Sales\Block\Adminhtml\Transactions\Grid" name="sales_transactions.grid" output="1"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
similarity index 52%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_view.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
index 1d9fdfdc5b4..a796f65243e 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_view.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
@@ -27,50 +27,37 @@
<referenceBlock name="head">
<block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-sales-order-create-giftmessage-js">
<arguments>
- <argument name="file" xsi:type="string">Magento_Adminhtml::sales/order/create/giftmessage.js</argument>
+ <argument name="file" xsi:type="string">Magento_Sales::order/create/giftmessage.js</argument>
</arguments>
</block>
<block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-sales-order-giftoptions-tooltip-js">
<arguments>
- <argument name="file" xsi:type="string">Magento_Adminhtml::sales/order/giftoptions_tooltip.js</argument>
+ <argument name="file" xsi:type="string">Magento_Sales::order/giftoptions_tooltip.js</argument>
</arguments>
</block>
</referenceBlock>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\View" name="sales_order_edit"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\View" name="sales_order_edit"/>
</referenceContainer>
<referenceContainer name="left">
- <block class="Magento\Adminhtml\Block\Sales\Order\View\Tabs" name="sales_order_tabs">
- <block class="Magento\Adminhtml\Block\Sales\Order\View\Tab\Info" name="order_tab_info" template="sales/order/view/tab/info.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\View\Messages" name="order_messages"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\View\Info" name="order_info" template="sales/order/view/info.phtml"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\View\Items" name="order_items" template="sales/order/view/items.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\View\Items\Renderer\DefaultRenderer" as="default" template="sales/order/view/items/renderer/default.phtml"/>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">qty</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Qty</argument>
- <argument name="template" xsi:type="string">sales/items/column/qty.phtml</argument>
- </action>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">name</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Name</argument>
- <argument name="template" xsi:type="string">sales/items/column/name.phtml</argument>
- </action>
- <action method="addColumnRender">
- <argument name="column" xsi:type="string">name</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Items\Column\Name\Grouped</argument>
- <argument name="template" xsi:type="string">sales/items/column/name.phtml</argument>
- <argument name="type" xsi:type="string">grouped</argument>
- </action>
+ <block class="Magento\Sales\Block\Adminhtml\Order\View\Tabs" name="sales_order_tabs">
+ <block class="Magento\Sales\Block\Adminhtml\Order\View\Tab\Info" name="order_tab_info" template="order/view/tab/info.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\View\Messages" name="order_messages"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\View\Info" name="order_info" template="order/view/info.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\View\Items" name="order_items" template="order/view/items.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer\DefaultRenderer" as="default" template="order/view/items/renderer/default.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="items/column/qty.phtml" group="column"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="items/column/name.phtml" group="column"/>
+ <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name\Grouped" name="column_name_grouped" template="items/column/name.phtml" group="column"/>
<block class="Magento\Core\Block\Text\ListText" name="order_item_extra_info"/>
</block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Payment" name="order_payment"/>
- <block class="Magento\Adminhtml\Block\Sales\Order\View\History" name="order_history" template="sales/order/view/history.phtml"/>
- <block class="Magento\Adminhtml\Block\Template" name="gift_options" template="sales/order/giftoptions.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\View\Giftmessage" name="order_giftmessage" template="sales/order/view/giftmessage.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Payment" name="order_payment"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\View\History" name="order_history" template="order/view/history.phtml"/>
+ <block class="Magento\Adminhtml\Block\Template" name="gift_options" template="Magento_Sales::order/giftoptions.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\View\Giftmessage" name="order_giftmessage" template="order/view/giftmessage.phtml"/>
</block>
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals" name="order_totals" template="sales/order/totals.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Order\Totals\Tax" name="tax" template="sales/order/totals/tax.phtml"/>
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals" name="order_totals" template="order/totals.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Order\Totals\Tax" name="tax" template="order/totals/tax.phtml"/>
</block>
</block>
<action method="addTab">
@@ -79,23 +66,23 @@
</action>
<action method="addTab">
<argument name="name" xsi:type="string">order_invoices</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Order\View\Tab\Invoices</argument>
+ <argument name="block" xsi:type="string">Magento\Sales\Block\Adminhtml\Order\View\Tab\Invoices</argument>
</action>
<action method="addTab">
<argument name="name" xsi:type="string">order_creditmemos</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Order\View\Tab\Creditmemos</argument>
+ <argument name="block" xsi:type="string">Magento\Sales\Block\Adminhtml\Order\View\Tab\Creditmemos</argument>
</action>
<action method="addTab">
<argument name="name" xsi:type="string">order_shipments</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Order\View\Tab\Shipments</argument>
+ <argument name="block" xsi:type="string">Magento\Sales\Block\Adminhtml\Order\View\Tab\Shipments</argument>
</action>
<action method="addTab">
<argument name="name" xsi:type="string">order_history</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Order\View\Tab\History</argument>
+ <argument name="block" xsi:type="string">Magento\Sales\Block\Adminhtml\Order\View\Tab\History</argument>
</action>
<action method="addTab">
<argument name="name" xsi:type="string">order_transactions</argument>
- <argument name="block" xsi:type="string">Magento\Adminhtml\Block\Sales\Order\View\Tab\Transactions</argument>
+ <argument name="block" xsi:type="string">Magento\Sales\Block\Adminhtml\Order\View\Tab\Transactions</argument>
</action>
</block>
</referenceContainer>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_recurring_profile_customergrid.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_recurring_profile_customergrid.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_recurring_profile_customergrid.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_recurring_profile_customergrid.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_recurring_profile_grid.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_recurring_profile_grid.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_recurring_profile_grid.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_recurring_profile_grid.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_recurring_profile_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_recurring_profile_index.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_recurring_profile_index.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_recurring_profile_index.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_recurring_profile_orders.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_recurring_profile_orders.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_recurring_profile_orders.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_recurring_profile_orders.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_recurring_profile_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_recurring_profile_view.xml
similarity index 79%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_recurring_profile_view.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_recurring_profile_view.xml
index 2e0d122c007..ca3b850eaab 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_recurring_profile_view.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_recurring_profile_view.xml
@@ -43,21 +43,13 @@
<argument name="value" xsi:type="string">sales_recurring_profile_view_tabs</argument>
</action>
<block class="Magento\Sales\Block\Adminhtml\Recurring\Profile\View\Tab\Info" as="info_tab" name="sales.recurring.profile.tab.info" template="recurring/profile/view.phtml">
- <block class="Magento\Sales\Block\Recurring\Profile\View\Reference" name="sales.recurring.profile.view.general" as="general">
- <action method="addToParentGroup">
- <argument name="value" xsi:type="string">info_blocks_row_1</argument>
- </action>
- <action method="setViewColumn">
- <argument name="value" xsi:type="string">1</argument>
- </action>
- <action method="setViewLabel">
- <argument translate="true" name="value" xsi:type="string">Reference</argument>
- </action>
+ <block class="Magento\Sales\Block\Recurring\Profile\View\Reference" name="sales.recurring.profile.view.general" as="general" group="info_blocks_row_1">
+ <arguments>
+ <argument name="view_column" xsi:type="string">1</argument>
+ <argument translate="true" name="view_label" xsi:type="string">Reference</argument>
+ </arguments>
</block>
- <block class="Magento\Sales\Block\Recurring\Profile\View\Item" name="sales.recurring.profile.view.item" as="item">
- <action method="addToParentGroup">
- <argument name="value" xsi:type="string">info_blocks_row_1</argument>
- </action>
+ <block class="Magento\Sales\Block\Recurring\Profile\View\Item" name="sales.recurring.profile.view.item" as="item" group="info_blocks_row_1">
<action method="setViewColumn">
<argument name="value" xsi:type="string">2</argument>
</action>
@@ -65,10 +57,7 @@
<argument translate="true" name="value" xsi:type="string">Purchased Item</argument>
</action>
</block>
- <block class="Magento\Sales\Block\Recurring\Profile\View\Schedule" name="sales.recurring.profile.view.schedule" as="profile">
- <action method="addToParentGroup">
- <argument name="value" xsi:type="string">info_blocks_row_2</argument>
- </action>
+ <block class="Magento\Sales\Block\Recurring\Profile\View\Schedule" name="sales.recurring.profile.view.schedule" as="profile" group="info_blocks_row_2">
<action method="setViewColumn">
<argument name="value" xsi:type="string">1</argument>
</action>
@@ -76,10 +65,7 @@
<argument translate="true" name="value" xsi:type="string">Profile Schedule</argument>
</action>
</block>
- <block class="Magento\Sales\Block\Recurring\Profile\View\Fees" name="sales.recurring.profile.view.fees" as="fees">
- <action method="addToParentGroup">
- <argument name="value" xsi:type="string">info_blocks_row_2</argument>
- </action>
+ <block class="Magento\Sales\Block\Recurring\Profile\View\Fees" name="sales.recurring.profile.view.fees" as="fees" group="info_blocks_row_2">
<action method="setViewColumn">
<argument name="value" xsi:type="string">2</argument>
</action>
@@ -87,10 +73,7 @@
<argument translate="true" name="value" xsi:type="string">Profile Payments</argument>
</action>
</block>
- <block class="Magento\Sales\Block\Recurring\Profile\View\Address" name="sales.recurring.profile.view.billing" as="billing_address">
- <action method="addToParentGroup">
- <argument name="value" xsi:type="string">info_blocks_row_3</argument>
- </action>
+ <block class="Magento\Sales\Block\Recurring\Profile\View\Address" name="sales.recurring.profile.view.billing" as="billing_address" group="info_blocks_row_3">
<action method="setViewColumn">
<argument name="value" xsi:type="string">1</argument>
</action>
@@ -98,13 +81,10 @@
<argument translate="true" name="value" xsi:type="string">Billing Address</argument>
</action>
</block>
- <block class="Magento\Sales\Block\Recurring\Profile\View\Address" name="sales.recurring.profile.view.shipping" as="shipping_address">
+ <block class="Magento\Sales\Block\Recurring\Profile\View\Address" name="sales.recurring.profile.view.shipping" as="shipping_address" group="info_blocks_row_3">
<action method="setAddressType">
<argument name="value" xsi:type="string">shipping</argument>
</action>
- <action method="addToParentGroup">
- <argument name="value" xsi:type="string">info_blocks_row_3</argument>
- </action>
<action method="setViewColumn">
<argument name="value" xsi:type="string">2</argument>
</action>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_transactions.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_grid.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_transactions.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_grid.xml
index 43b6da96635..d570c4f312b 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_transactions.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_grid.xml
@@ -24,5 +24,5 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <block class="Magento\Adminhtml\Block\Sales\Transactions\Grid" name="sales_transactions.grid" output="1"/>
+ <block class="Magento\Sales\Block\Adminhtml\Transactions\Grid" name="sales_transactions.grid" output="1"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_transactions_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_index.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_transactions_index.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_index.xml
index ac549fdd4ca..d19d250ecd5 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_transactions_index.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_index.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Transactions" name="sales_transactions.grid.container"/>
+ <block class="Magento\Sales\Block\Adminhtml\Transactions" name="sales_transactions.grid.container"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_transactions_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_view.xml
similarity index 81%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_transactions_view.xml
rename to app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_view.xml
index 02352b5e81b..5f010f2f13e 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_transactions_view.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_transactions_view.xml
@@ -25,9 +25,9 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Transactions\Detail" name="sales_transactions.detail" template="sales/transactions/detail.phtml">
- <block class="Magento\Adminhtml\Block\Sales\Transactions\Detail\Grid" name="sales_transactions.detail.grid" as="detail_grid"/>
- <block class="Magento\Adminhtml\Block\Sales\Transactions\Child\Grid" name="sales_transactions.child.grid" as="child_grid"/>
+ <block class="Magento\Sales\Block\Adminhtml\Transactions\Detail" name="sales_transactions.detail" template="transactions/detail.phtml">
+ <block class="Magento\Sales\Block\Adminhtml\Transactions\Detail\Grid" name="sales_transactions.detail.grid" as="detail_grid"/>
+ <block class="Magento\Sales\Block\Adminhtml\Transactions\Child\Grid" name="sales_transactions.child.grid" as="child_grid"/>
</block>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/address/form.phtml b/app/code/Magento/Sales/view/adminhtml/order/address/form.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/address/form.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/address/form.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/comments/view.phtml b/app/code/Magento/Sales/view/adminhtml/order/comments/view.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/comments/view.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/comments/view.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/abstract.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/abstract.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/abstract.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/abstract.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/billing/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/billing/method/form.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/billing/method/form.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/billing/method/form.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/comment.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/comment.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/comment.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/comment.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/coupons/form.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/coupons/form.phtml
similarity index 97%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/coupons/form.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/coupons/form.phtml
index f4a11c6f1bd..b6c1e67b1ce 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/coupons/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/order/create/coupons/form.phtml
@@ -26,7 +26,7 @@
?>
<?php
/**
- * \Magento\Adminhtml\Block\Sales\Order\Create\Coupons
+ * \Magento\Sales\Block\Adminhtml\Order\Create\Coupons
*
*/
?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/data.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/data.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/data.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/data.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/form.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/form.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/form.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/form/account.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/form/account.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/form/account.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/form/account.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/form/address.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/form/address.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/form/address.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/form/address.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/giftmessage.js b/app/code/Magento/Sales/view/adminhtml/order/create/giftmessage.js
similarity index 99%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/giftmessage.js
rename to app/code/Magento/Sales/view/adminhtml/order/create/giftmessage.js
index c6495714b57..03799a9fb7f 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/giftmessage.js
+++ b/app/code/Magento/Sales/view/adminhtml/order/create/giftmessage.js
@@ -18,7 +18,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/giftmessage.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/giftmessage.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/giftmessage.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/giftmessage.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/items.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/items.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/items.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/items/grid.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/items/grid.phtml
similarity index 99%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/items/grid.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/items/grid.phtml
index b05ec069602..14e119ba8f6 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/items/grid.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/order/create/items/grid.phtml
@@ -26,7 +26,7 @@
?>
<?php
/**
- * @see \Magento\Adminhtml\Block\Sales\Order\Create\Items\Grid
+ * @see \Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid
*/
?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/js.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/js.phtml
similarity index 86%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/js.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/js.phtml
index 9f488e5b0dd..2b1fdb88f18 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/js.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/order/create/js.phtml
@@ -29,10 +29,10 @@
Event.observe(window, 'load', function() {
if (window.productConfigure) {
productConfigure.addListType('product_to_add', {
- urlFetch: '<?php echo $this->getUrl('*/sales_order_create/configureProductToAdd') ?>'
+ urlFetch: '<?php echo $this->getUrl('sales/order_create/configureProductToAdd') ?>'
});
productConfigure.addListType('quote_items', {
- urlFetch: '<?php echo $this->getUrl('*/sales_order_create/configureQuoteItems') ?>'
+ urlFetch: '<?php echo $this->getUrl('sales/order_create/configureQuoteItems') ?>'
});
}
});
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/newsletter/form.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/newsletter/form.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/newsletter/form.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/newsletter/form.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/order/create/scripts.js
similarity index 99%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/scripts.js
rename to app/code/Magento/Sales/view/adminhtml/order/create/scripts.js
index eec891fa353..44b18011b63 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/scripts.js
+++ b/app/code/Magento/Sales/view/adminhtml/order/create/scripts.js
@@ -18,7 +18,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/shipping/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/shipping/method/form.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/shipping/method/form.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/shipping/method/form.phtml
index 6127a2a2d83..38f0dcf67fe 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/shipping/method/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/order/create/shipping/method/form.phtml
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php /** @var $this \Magento\Adminhtml\Block\Sales\Order\Create\Shipping\Method\Form */ ?>
+<?php /** @var $this \Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method\Form */ ?>
<?php $_shippingRateGroups = $this->getShippingRates(); ?>
<?php if ($_shippingRateGroups): ?>
<div id="order-shipping-method-choose" style="display:none">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/sidebar.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/sidebar.phtml
similarity index 87%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/sidebar.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/sidebar.phtml
index 60b3a79f7a7..1a37deec88a 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/sidebar.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/order/create/sidebar.phtml
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-/** @var $this \Magento\Adminhtml\Block\Sales\Order\Create\Sidebar */
+/** @var $this \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar */
?>
<div class="customer-current-activity-inner">
<h4><?php echo __('Customer\'s Current Activities') ?></h4>
@@ -45,12 +45,12 @@
<script>
function addSidebarCompositeListType() {
productConfigure.addListType('sidebar', {
- urlFetch: '<?php echo $this->getUrl('*/sales_order_create/configureProductToAdd') ?>',
- urlConfirm: '<?php echo $this->getUrl('*/sales_order_create/addConfigured') ?>'
+ urlFetch: '<?php echo $this->getUrl('sales/order_create/configureProductToAdd') ?>',
+ urlConfirm: '<?php echo $this->getUrl('sales/order_create/addConfigured') ?>'
});
productConfigure.addListType('sidebar_wishlist', {
urlFetch: '<?php echo $this->getUrl('*/customer_wishlist_product_composite_wishlist/configure') ?>',
- urlConfirm: '<?php echo $this->getUrl('*/sales_order_create/addConfigured') ?>'
+ urlConfirm: '<?php echo $this->getUrl('sales/order_create/addConfigured') ?>'
});
}
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/sidebar/items.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/sidebar/items.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/sidebar/items.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/sidebar/items.phtml
index 9ae3a08f533..46cc20bc111 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/sidebar/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/order/create/sidebar/items.phtml
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php /* @var $this \Magento\Adminhtml\Block\Sales\Order\Create\Sidebar\AbstractSidebar */ ?>
+<?php /* @var $this \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar */ ?>
<div class="create-order-sidebar-block" id="sidebar_data_<?php echo $this->getDataId() ?>">
<div class="head">
<a href="#" class="action-refresh" title="<?php echo __('Refresh') ?>" onclick="order.loadArea('sidebar_<?php echo $this->getDataId() ?>', 'sidebar_data_<?php echo $this->getDataId() ?>');return false;">Refresh</a>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/store/select.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/store/select.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/store/select.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/store/select.phtml
index 5a9c2fd3fe7..563e1493e78 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/store/select.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/order/create/store/select.phtml
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php /* @var $this \Magento\Adminhtml\Block\Sales\Order\Create\Store\Select */ ?>
+<?php /* @var $this \Magento\Sales\Block\Adminhtml\Order\Create\Store\Select */ ?>
<div class="store-scope form-inline">
<div class="tree-store-scope">
<?php $showHelpHint = 0; ?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/totals.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/totals.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/totals.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/totals.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/totals/default.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/totals/default.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/totals/default.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/totals/default.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/totals/grandtotal.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/totals/grandtotal.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/totals/grandtotal.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/totals/grandtotal.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/totals/shipping.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/totals/shipping.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/totals/shipping.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/totals/shipping.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/totals/subtotal.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/totals/subtotal.phtml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/totals/subtotal.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/totals/subtotal.phtml
index 744259af93f..f3c14a65b90 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/totals/subtotal.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/order/create/totals/subtotal.phtml
@@ -24,8 +24,8 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
/**
- * @var $this \Magento\Adminhtml\Block\Sales\Order\Create\Totals\Subtotal
- * @see \Magento\Adminhtml\Block\Sales\Order\Create\Totals\Subtotal
+ * @var $this \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Subtotal
+ * @see \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Subtotal
*/
?>
<?php if ($this->displayBoth()):?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/totals/tax.phtml b/app/code/Magento/Sales/view/adminhtml/order/create/totals/tax.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/totals/tax.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/create/totals/tax.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/creditmemo/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/order/creditmemo/create/form.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/creditmemo/create/form.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/creditmemo/create/form.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/creditmemo/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/order/creditmemo/create/items.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/creditmemo/create/items.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/creditmemo/create/items.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/creditmemo/create/items/renderer/configurable.phtml b/app/code/Magento/Sales/view/adminhtml/order/creditmemo/create/items/renderer/configurable.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/creditmemo/create/items/renderer/configurable.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/creditmemo/create/items/renderer/configurable.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/creditmemo/create/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/order/creditmemo/create/items/renderer/default.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/creditmemo/create/items/renderer/default.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/creditmemo/create/items/renderer/default.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/creditmemo/create/totals/adjustments.phtml b/app/code/Magento/Sales/view/adminhtml/order/creditmemo/create/totals/adjustments.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/creditmemo/create/totals/adjustments.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/creditmemo/create/totals/adjustments.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/creditmemo/view/form.phtml b/app/code/Magento/Sales/view/adminhtml/order/creditmemo/view/form.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/creditmemo/view/form.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/creditmemo/view/form.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/creditmemo/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/order/creditmemo/view/items.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/creditmemo/view/items.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/creditmemo/view/items.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/creditmemo/view/items/renderer/configurable.phtml b/app/code/Magento/Sales/view/adminhtml/order/creditmemo/view/items/renderer/configurable.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/creditmemo/view/items/renderer/configurable.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/creditmemo/view/items/renderer/configurable.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/creditmemo/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/order/creditmemo/view/items/renderer/default.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/creditmemo/view/items/renderer/default.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/creditmemo/view/items/renderer/default.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/giftoptions.phtml b/app/code/Magento/Sales/view/adminhtml/order/giftoptions.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/giftoptions.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/giftoptions.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/giftoptions_tooltip.js b/app/code/Magento/Sales/view/adminhtml/order/giftoptions_tooltip.js
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/giftoptions_tooltip.js
rename to app/code/Magento/Sales/view/adminhtml/order/giftoptions_tooltip.js
index 9f9dd95f86b..2f7ea4e717c 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/giftoptions_tooltip.js
+++ b/app/code/Magento/Sales/view/adminhtml/order/giftoptions_tooltip.js
@@ -18,7 +18,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -27,7 +27,7 @@
* Gift Options Tooltip Model
*
* @category Mage
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @author Magento Core Team <core@magentocommerce.com>
*/
GiftOptionsTooltip = Class.create();
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/invoice/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/order/invoice/create/form.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/invoice/create/form.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/invoice/create/form.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/invoice/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/order/invoice/create/items.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/invoice/create/items.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/invoice/create/items.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/invoice/create/items/renderer/configurable.phtml b/app/code/Magento/Sales/view/adminhtml/order/invoice/create/items/renderer/configurable.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/invoice/create/items/renderer/configurable.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/invoice/create/items/renderer/configurable.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/invoice/create/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/order/invoice/create/items/renderer/default.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/invoice/create/items/renderer/default.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/invoice/create/items/renderer/default.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/invoice/create/tracking.phtml b/app/code/Magento/Sales/view/adminhtml/order/invoice/create/tracking.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/invoice/create/tracking.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/invoice/create/tracking.phtml
index c91c4a4edcc..bd9e8046c31 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/invoice/create/tracking.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/order/invoice/create/tracking.phtml
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php /** @var $this \Magento\Adminhtml\Block\Sales\Order\Invoice\Create\Tracking */ ?>
+<?php /** @var $this \Magento\Sales\Block\Adminhtml\Order\Invoice\Create\Tracking */ ?>
<script type="text/javascript">
//<![CDATA[
var trackingControl;
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/invoice/view/form.phtml b/app/code/Magento/Sales/view/adminhtml/order/invoice/view/form.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/invoice/view/form.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/invoice/view/form.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/invoice/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/order/invoice/view/items.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/invoice/view/items.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/invoice/view/items.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/invoice/view/items/renderer/configurable.phtml b/app/code/Magento/Sales/view/adminhtml/order/invoice/view/items/renderer/configurable.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/invoice/view/items/renderer/configurable.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/invoice/view/items/renderer/configurable.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/invoice/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/order/invoice/view/items/renderer/default.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/invoice/view/items/renderer/default.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/invoice/view/items/renderer/default.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/order/shipment/create/form.phtml
similarity index 99%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/create/form.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/shipment/create/form.phtml
index be60c5a531b..92d85ab8b14 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/create/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/order/shipment/create/form.phtml
@@ -81,7 +81,7 @@
});
packaging.setLabelCreatedCallback(function(response){
setLocation("<?php echo $this->getUrl(
- '*/sales_order/view',
+ 'sales/order/view',
array('order_id' => $this->getShipment()->getOrderId())
); ?>");
});
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/order/shipment/create/items.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/create/items.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/shipment/create/items.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/create/items/renderer/configurable.phtml b/app/code/Magento/Sales/view/adminhtml/order/shipment/create/items/renderer/configurable.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/create/items/renderer/configurable.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/shipment/create/items/renderer/configurable.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/create/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/order/shipment/create/items/renderer/default.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/create/items/renderer/default.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/shipment/create/items/renderer/default.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/create/tracking.phtml b/app/code/Magento/Sales/view/adminhtml/order/shipment/create/tracking.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/create/tracking.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/shipment/create/tracking.phtml
index fea86634507..9a1e4eb0d8a 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/create/tracking.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/order/shipment/create/tracking.phtml
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php /** @var $this \Magento\Adminhtml\Block\Sales\Order\Shipment\Create\Tracking */ ?>
+<?php /** @var $this \Magento\Sales\Block\Adminhtml\Order\Shipment\Create\Tracking */ ?>
<script type="text/javascript">
//<![CDATA[
var trackingControl;
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/packaging.js b/app/code/Magento/Sales/view/adminhtml/order/shipment/packaging.js
similarity index 99%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/packaging.js
rename to app/code/Magento/Sales/view/adminhtml/order/shipment/packaging.js
index a2eb1f55974..9c499151444 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/packaging.js
+++ b/app/code/Magento/Sales/view/adminhtml/order/shipment/packaging.js
@@ -18,7 +18,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Mage
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/packaging/grid.phtml b/app/code/Magento/Sales/view/adminhtml/order/shipment/packaging/grid.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/packaging/grid.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/shipment/packaging/grid.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/packaging/packed.phtml b/app/code/Magento/Sales/view/adminhtml/order/shipment/packaging/packed.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/packaging/packed.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/shipment/packaging/packed.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/packaging/popup.phtml b/app/code/Magento/Sales/view/adminhtml/order/shipment/packaging/popup.phtml
similarity index 99%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/packaging/popup.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/shipment/packaging/popup.phtml
index 5db89436c5a..96974884af7 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/packaging/popup.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/order/shipment/packaging/popup.phtml
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php /** @var $this \Magento\Adminhtml\Block\Sales\Order\Shipment\Packaging */ ?>
+<?php /** @var $this \Magento\Sales\Block\Adminhtml\Order\Shipment\Packaging */ ?>
<?php
$shippingMethod = $this->getShipment()->getOrder()->getShippingMethod();
$sizeSource = $this->getSourceSizeModel()->toOptionArray();
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/tracking/info.phtml b/app/code/Magento/Sales/view/adminhtml/order/shipment/tracking/info.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/tracking/info.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/shipment/tracking/info.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/view/form.phtml b/app/code/Magento/Sales/view/adminhtml/order/shipment/view/form.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/view/form.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/shipment/view/form.phtml
index 11b7e77fe14..666fe4fd059 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/view/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/order/shipment/view/form.phtml
@@ -86,7 +86,7 @@
});
packaging.setLabelCreatedCallback(function(response){
setLocation("<?php echo $this->getUrl(
- '*/sales_order_shipment/view',
+ 'sales/order_shipment/view',
array('shipment_id' => $this->getShipment()->getId())
); ?>");
});
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/order/shipment/view/items.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/view/items.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/shipment/view/items.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/view/items/renderer/configurable.phtml b/app/code/Magento/Sales/view/adminhtml/order/shipment/view/items/renderer/configurable.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/view/items/renderer/configurable.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/shipment/view/items/renderer/configurable.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/order/shipment/view/items/renderer/default.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/view/items/renderer/default.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/shipment/view/items/renderer/default.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/view/tracking.phtml b/app/code/Magento/Sales/view/adminhtml/order/shipment/view/tracking.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/view/tracking.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/shipment/view/tracking.phtml
index da7b13f8a45..463ad94f857 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/view/tracking.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/order/shipment/view/tracking.phtml
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php /** @var $this \Magento\Adminhtml\Block\Sales\Order\Shipment\View\Tracking */ ?>
+<?php /** @var $this \Magento\Sales\Block\Adminhtml\Order\Shipment\View\Tracking */ ?>
<table cellspacing="0" class="data-table" id="shipment_tracking_info">
<thead>
<tr class="headings">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/totalbar.phtml b/app/code/Magento/Sales/view/adminhtml/order/totalbar.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/totalbar.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/totalbar.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals.phtml b/app/code/Magento/Sales/view/adminhtml/order/totals.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/totals.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals/discount.phtml b/app/code/Magento/Sales/view/adminhtml/order/totals/discount.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals/discount.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/totals/discount.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals/due.phtml b/app/code/Magento/Sales/view/adminhtml/order/totals/due.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals/due.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/totals/due.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals/footer.phtml b/app/code/Magento/Sales/view/adminhtml/order/totals/footer.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals/footer.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/totals/footer.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals/grand.phtml b/app/code/Magento/Sales/view/adminhtml/order/totals/grand.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals/grand.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/totals/grand.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals/item.phtml b/app/code/Magento/Sales/view/adminhtml/order/totals/item.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals/item.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/totals/item.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals/main.phtml b/app/code/Magento/Sales/view/adminhtml/order/totals/main.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals/main.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/totals/main.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals/paid.phtml b/app/code/Magento/Sales/view/adminhtml/order/totals/paid.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals/paid.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/totals/paid.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals/refunded.phtml b/app/code/Magento/Sales/view/adminhtml/order/totals/refunded.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals/refunded.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/totals/refunded.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals/shipping.phtml b/app/code/Magento/Sales/view/adminhtml/order/totals/shipping.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals/shipping.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/totals/shipping.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals/tax.phtml b/app/code/Magento/Sales/view/adminhtml/order/totals/tax.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals/tax.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/totals/tax.phtml
index 7cd2a5755cb..f0c12b04bd4 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/totals/tax.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/order/totals/tax.phtml
@@ -23,7 +23,7 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-/** @var $this \Magento\Adminhtml\Block\Sales\Order\Totals\Tax */
+/** @var $this \Magento\Sales\Block\Adminhtml\Order\Totals\Tax */
?>
<?php
/** @var $_source \Magento\Sales\Model\Order\Invoice */
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/view/form.phtml b/app/code/Magento/Sales/view/adminhtml/order/view/form.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/view/form.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/view/form.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/view/giftmessage.phtml b/app/code/Magento/Sales/view/adminhtml/order/view/giftmessage.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/view/giftmessage.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/view/giftmessage.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/view/history.phtml b/app/code/Magento/Sales/view/adminhtml/order/view/history.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/view/history.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/view/history.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/view/info.phtml b/app/code/Magento/Sales/view/adminhtml/order/view/info.phtml
similarity index 99%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/view/info.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/view/info.phtml
index 66ab8985cbe..ab5b01810f3 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/view/info.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/order/view/info.phtml
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php /** @var $this \Magento\Adminhtml\Block\Sales\Order\View\Info */ ?>
+<?php /** @var $this \Magento\Sales\Block\Adminhtml\Order\View\Info */ ?>
<?php $_order = $this->getOrder() ?>
<?php
$orderAdminDate = $this->formatDate($_order->getCreatedAtDate(), 'medium', true);
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/order/view/items.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/view/items.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/view/items.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/order/view/items/renderer/default.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/view/items/renderer/default.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/view/items/renderer/default.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/view/tab/history.phtml b/app/code/Magento/Sales/view/adminhtml/order/view/tab/history.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/view/tab/history.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/view/tab/history.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/view/tab/info.phtml b/app/code/Magento/Sales/view/adminhtml/order/view/tab/info.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/view/tab/info.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/view/tab/info.phtml
index 57c1e815270..26584d528f9 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/view/tab/info.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/order/view/tab/info.phtml
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php /** @var $this \Magento\Adminhtml\Block\Sales\Order\View\Tab\Info */ ?>
+<?php /** @var $this \Magento\Sales\Block\Adminhtml\Order\View\Tab\Info */ ?>
<?php $_order = $this->getOrder() ?>
<div id="order-messages">
<?php echo $this->getChildHtml('order_messages') ?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/order/view/tracking.phtml b/app/code/Magento/Sales/view/adminhtml/order/view/tracking.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/order/view/tracking.phtml
rename to app/code/Magento/Sales/view/adminhtml/order/view/tracking.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/sales/transactions/detail.phtml b/app/code/Magento/Sales/view/adminhtml/transactions/detail.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/sales/transactions/detail.phtml
rename to app/code/Magento/Sales/view/adminhtml/transactions/detail.phtml
diff --git a/app/code/Magento/Sales/view/frontend/billing/agreement/view.phtml b/app/code/Magento/Sales/view/frontend/billing/agreement/view.phtml
index 65ac7e0519d..f352e60e34c 100644
--- a/app/code/Magento/Sales/view/frontend/billing/agreement/view.phtml
+++ b/app/code/Magento/Sales/view/frontend/billing/agreement/view.phtml
@@ -19,92 +19,83 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php /* @var $this \Magento\Sales\Block\Billing\Agreement\View */ ?>
-<div class="page-title title-buttons">
- <h1><?php echo __('Billing Agreement # %1', $this->escapeHtml($this->getReferenceId())) ?></h1>
- <?php if ($this->getCanCancel()): ?>
- <button type="button" title="<?php echo __('Cancel') ?>" class="button" onclick="if( confirm('<?php echo __('Are you sure you want to do this?') ?>') ) { window.location.href = '<?php echo $this->getCancelUrl() ?>'; } return false;"><span><span><?php echo __('Cancel') ?></span></span></button>
- <?php endif; ?>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<div class="billing-agreements">
- <div class="info-box">
- <h2 class="box-title"><?php echo __('Agreement Information') ?></h2>
- <div class="box-content">
- <table class="info-table">
- <tbody>
- <tr>
- <th><?php echo __('Reference ID:') ?></th>
- <td><?php echo $this->escapeHtml($this->getReferenceId()); ?></td>
- </tr>
- <tr>
- <th><?php echo __('Status:') ?></th>
- <td><?php echo $this->getAgreementStatus() ?></td>
- </tr>
- <tr>
- <th><?php echo __('Created:') ?></th>
- <td><?php echo $this->escapeHtml($this->getAgreementCreatedAt()) ?></td>
- </tr>
+<div class="block billing agreements">
+ <div class="title">
+ <strong><?php echo __('Billing Agreement # %1', $this->escapeHtml($this->getReferenceId())) ?></strong>
+ <?php if ($this->getCanCancel()): ?>
+ <button type="button" title="<?php echo __('Cancel') ?>" class="secondary action cancel" onclick="if( confirm('<?php echo __('Are you sure you want to do this?') ?>') ) { window.location.href = '<?php echo $this->getCancelUrl() ?>'; } return false;">
+ <span><?php echo __('Cancel') ?></span>
+ </button>
+ <?php endif; ?>
+ </div>
+ <div class="content">
+ <h2 class="subtitle caption"><?php echo __('Agreement Information') ?></h2>
+ <table class="data table">
+ <thead>
+ <tr>
+ <th class="col id"><?php echo __('Reference ID:'); ?></th>
+ <th class="col status"><?php echo __('Status:'); ?></th>
+ <th class="col created"><?php echo __('Created:'); ?></th>
<?php if($this->getAgreementUpdatedAt()): ?>
- <tr>
- <th><?php echo __('Updated:') ?></th>
- <td><?php echo $this->escapeHtml($this->getAgreementUpdatedAt()); ?></td>
- </tr>
+ <th class="col updated"><?php echo __('Updated:'); ?></th>
<?php endif; ?>
- <tr>
- <th><?php echo __('Payment Method:') ?></th>
- <td><?php echo $this->getPaymentMethodTitle() ?></td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- <?php $relatedOrders = $this->getRelatedOrders() ?>
- <?php if(count($relatedOrders) > 0): ?>
- <?php echo $this->getChildHtml('pager'); ?>
- <h2 class="table-caption"><?php echo __('Related Orders') ?></h2>
- <table class="data-table" id="related-orders-table">
- <col width="1" />
- <col width="1" />
- <col />
- <col width="1" />
- <col width="1" />
- <col width="1" />
- <thead>
- <tr>
- <th><span class="nobr"><?php echo __('Order #') ?></span></th>
- <th><?php echo __('Date') ?></th>
- <th><?php echo __('Ship To') ?></th>
- <th><span class="nobr"><?php echo __('Order Total') ?></span></th>
- <th><span class="nobr"><?php echo __('Order Status') ?></span></th>
- <th> </th>
- </tr>
- </thead>
- <tbody>
+ <th class="col payment"><?php echo __('Payment Method:'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td class="col id"><?php echo $this->escapeHtml($this->getReferenceId()); ?></td>
+ <td class="col status"><?php echo $this->getAgreementStatus() ?></td>
+ <td class="col created"><?php echo $this->escapeHtml($this->getAgreementCreatedAt()) ?></td>
+ <?php if($this->getAgreementUpdatedAt()): ?>
+ <td class="col updated"><?php echo $this->escapeHtml($this->getAgreementUpdatedAt()); ?></td>
+ <?php endif; ?>
+ <td class="col payment"><?php echo $this->getPaymentMethodTitle() ?></td>
+ </tr>
+ </tbody>
+ </table>
+
+ <?php $relatedOrders = $this->getRelatedOrders() ?>
+ <?php if(count($relatedOrders) > 0): ?>
+ <?php echo $this->getChildHtml('pager'); ?>
+ <h2 class="subtitle caption"><?php echo __('Related Orders') ?></h2>
+ <table class="data table" id="related-orders-table">
+ <thead>
+ <tr>
+ <th class="col id"><?php echo __('Order #') ?></th>
+ <th class="col date"><?php echo __('Date') ?></th>
+ <th class="col shipto"><?php echo __('Ship To') ?></th>
+ <th class="col total"><?php echo __('Order Total') ?></th>
+ <th class="col status"><?php echo __('Order Status') ?></th>
+ <th class="col actions"> </th>
+ </tr>
+ </thead>
+ <tbody>
<?php foreach ($relatedOrders as $order): ?>
<tr>
- <td><?php echo $this->getOrderItemValue($order, 'order_increment_id') ?></td>
- <td><span class="nobr"><?php echo $this->getOrderItemValue($order, 'created_at') ?></span></td>
- <td><?php echo $this->getOrderItemValue($order, 'shipping_address') ?></td>
- <td><?php echo $this->getOrderItemValue($order, 'order_total') ?></td>
- <td><em><?php echo $this->getOrderItemValue($order, 'status_label') ?></em></td>
- <td class="a-center">
- <span class="nobr">
- <a href="<?php echo $this->getOrderItemValue($order, 'view_url') ?>"><?php echo __('View Order') ?></a>
- </span>
- </td>
+ <th class="col id"><?php echo $this->getOrderItemValue($order, 'order_increment_id') ?></th>
+ <th class="col date"><?php echo $this->getOrderItemValue($order, 'created_at') ?></th>
+ <th class="col shipto"><?php echo $this->getOrderItemValue($order, 'shipping_address') ?></th>
+ <th class="col total"><?php echo $this->getOrderItemValue($order, 'order_total') ?></th>
+ <th class="col status"><?php echo $this->getOrderItemValue($order, 'status_label') ?></th>
+ <th class="col actions">
+ <a href="<?php echo $this->getOrderItemValue($order, 'view_url') ?>"><?php echo __('View Order') ?></a>
+ </th>
</tr>
<?php endforeach; ?>
- </tbody>
- </table>
- <script type="text/javascript">(function($) {$('#related-orders-table').decorate('table')})(jQuery)</script>
- <?php endif; ?>
- <div class="buttons-set">
- <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo __('Back to Billing Agreements') ?></a></p>
+ </tbody>
+ </table>
+ <?php endif; ?>
+
+ <div class="actions">
+ <div class="secondary">
+ <a href="<?php echo $this->getBackUrl() ?>" class="action back"><?php echo __('Back to Billing Agreements') ?></a>
+ </div>
+ </div>
</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/view/frontend/billing/agreements.phtml b/app/code/Magento/Sales/view/frontend/billing/agreements.phtml
index 96eae811fce..e5415ba17fc 100644
--- a/app/code/Magento/Sales/view/frontend/billing/agreements.phtml
+++ b/app/code/Magento/Sales/view/frontend/billing/agreements.phtml
@@ -19,81 +19,74 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php /* @var $this \Magento\Sales\Block\Billing\Agreements */ ?>
-<div class="page-title">
- <h1><?php echo __('Billing Agreements') ?></h1>
-</div>
-
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-
-<div class="billing-agreements">
+<div class="block billing agreements">
<?php $billingAgreements = $this->getBillingAgreements(); ?>
<?php if (count($billingAgreements) > 0): ?>
<?php echo $this->getChildHtml('pager'); ?>
- <table id="billing-agreements" class="data-table">
- <col />
- <col width="1" />
- <col />
- <col />
- <col />
- <col width="1" />
+ <table id="billing-agreements" class="data table billing agreements">
<thead>
- <tr>
- <th><span class="nobr"><?php echo __('Reference ID'); ?></span></th>
- <th><?php echo __('Status'); ?></th>
- <th><span class="nobr"><?php echo __('Created At'); ?></span></th>
- <th><span class="nobr"><?php echo __('Updated At'); ?></span></th>
- <th><span class="nobr"><?php echo __('Payment Method'); ?></span></th>
- <th> </th>
- </tr>
+ <tr>
+ <th class="col id"><?php echo __('Reference ID'); ?></th>
+ <th class="col status"><?php echo __('Status'); ?></th>
+ <th class="col created"><?php echo __('Created At'); ?></th>
+ <th class="col updated"><?php echo __('Updated At'); ?></th>
+ <th class="col payment"><?php echo __('Payment Method'); ?></th>
+ <th class="col actions"> </th>
+ </tr>
</thead>
<tbody>
- <?php foreach($billingAgreements as $item): ?>
+ <?php foreach ($billingAgreements as $item): ?>
<tr>
- <td><span class="nobr"><?php echo $this->getItemValue($item, 'reference_id') ?></span></td>
- <td><?php echo $this->getItemValue($item, 'status') ?></td>
- <td><span class="nobr"><?php echo $this->getItemValue($item, 'created_at') ?></span></td>
- <td><span class="nobr"><?php echo $this->getItemValue($item, 'updated_at') ?></span></td>
- <td><?php echo $this->getItemValue($item, 'payment_method_label') ?></td>
- <td><a href="<?php echo $this->getItemValue($item, 'edit_url') ?>"><?php echo __('View') ?></a></td>
+ <td class="col id"><?php echo $this->getItemValue($item, 'reference_id') ?></td>
+ <td class="col status"><?php echo $this->getItemValue($item, 'status') ?></td>
+ <td class="col created"><?php echo $this->getItemValue($item, 'created_at') ?></td>
+ <td class="col updated"><?php echo $this->getItemValue($item, 'updated_at') ?></td>
+ <td class="col payment"><?php echo $this->getItemValue($item, 'payment_method_label') ?></td>
+ <td class="col actions">
+ <a href="<?php echo $this->getItemValue($item, 'edit_url') ?>"><?php echo __('View') ?></a>
+ </td>
</tr>
- <?php endforeach; ?>
+ <?php endforeach; ?>
</tbody>
</table>
- <script type="text/javascript">(function($) {$('#billing-agreements').decorate('table')})(jQuery)</script>
<?php else: ?>
- <p><?php echo __('There are no billing agreements yet.')?></p>
+ <p class="no agreements"><?php echo __('There are no billing agreements yet.') ?></p>
<?php endif; ?>
<?php $paymentMethods = $this->getWizardPaymentMethodOptions() ?>
<?php if ($paymentMethods): ?>
- <div class="info-box">
- <h2 class="box-title"><?php echo __('New Billing Agreement') ?></h2>
- <form action="<?php echo $this->getCreateUrl() ?>" method="post">
- <div class="box-content">
- <p><?php echo __('You will be redirected to the payment system website.') ?></p>
- <ul class="form-list">
- <li>
- <select id="payment_method" name="payment_method">
- <option value=""><?php echo __('-- Please Select --') ?></option>
- <?php foreach ($paymentMethods as $code => $title): ?>
- <option value="<?php echo $code ?>"><?php echo $title ?></option>
- <?php endforeach; ?>
- </select>
- <button type="submit" class="button"><span><span><?php echo __('Create...') ?></span></span></button>
- </li>
- </ul>
+ <h2 class="subtitle caption"><?php echo __('New Billing Agreement') ?></h2>
+
+ <form action="<?php echo $this->getCreateUrl() ?>" method="post" class="form new agreement">
+ <fieldset class="fieldset">
+ <p class="note"><?php echo __('You will be redirected to the payment system website.') ?></p>
+
+ <div class="field payment method">
+ <div class="control">
+ <select id="payment_method" name="payment_method">
+ <option value=""><?php echo __('-- Please Select --') ?></option>
+ <?php foreach ($paymentMethods as $code => $title): ?>
+ <option value="<?php echo $code ?>"><?php echo $title ?></option>
+ <?php endforeach; ?>
+ </select>
+ </div>
</div>
- </form>
- </div>
+ <button type="submit" class="primary action create">
+ <span><?php echo __('Create...') ?></span>
+ </button>
+ </fieldset>
+ </form>
<?php endif; ?>
- <div class="buttons-set">
- <p class="back-link"><a href="<?php echo $this->escapeHtml($this->getBackUrl()) ?>"><small>« </small><?php echo __('Back') ?></a></p>
+ <div class="actions">
+ <div class="secondary">
+ <a href="<?php echo $this->escapeHtml($this->getBackUrl()) ?>"
+ class="action back"><span><?php echo __('Back') ?></span></a>
+ </div>
</div>
</div>
diff --git a/app/code/Magento/Sales/view/frontend/guest/form.phtml b/app/code/Magento/Sales/view/frontend/guest/form.phtml
index 95208cfceba..2e405f45fbe 100644
--- a/app/code/Magento/Sales/view/frontend/guest/form.phtml
+++ b/app/code/Magento/Sales/view/frontend/guest/form.phtml
@@ -19,59 +19,61 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package default_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<div class="page-title">
- <h1><?php echo __('Orders and Returns') ?></h1>
-</div>
-<form id="oar-widget-orders-and-returns-form" action="<?php echo $this->getActionUrl() ?>" method="post" class="search-form" name="guest_post">
- <div class="fieldset">
- <h2 class="legend"><?php echo __('Order Information') ?></h2>
- <ul class="form-list">
- <li class="fields">
- <div class="field">
- <label for="oar-order-id" class="required"><em>*</em><?php echo __('Order ID') ?></label>
- <div class="input-box">
- <input type="text" class="input-text" id="oar-order-id" name="oar_order_id" data-validate="{required:true}"/>
- </div>
- </div>
- <div class="field">
- <label for="oar-billing-lastname" class="required"><em>*</em><?php echo __('Billing Last Name') ?></label>
- <div class="input-box">
- <input type="text" class="input-text" id="oar-billing-lastname" name="oar_billing_lastname" data-validate="{required:true}"/>
- </div>
- </div>
- </li>
- <li class="fields">
- <div class="field">
- <label for="quick-search-type-id" class="required"><em>*</em><?php echo __('Find Order By:') ?></label>
- <div class="input-box">
- <select name="oar_type" id="quick-search-type-id" class="select">
- <option value="email"><?php echo __('Email Address'); ?></option>
- <option value="zip"><?php echo __('ZIP Code'); ?></option>
- </select>
- </div>
- </div>
- <div id="oar-email" class="field">
- <label for="oar_email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
- <div class="input-box">
- <input type="text" class="input-text" id="oar_email" name="oar_email" data-validate="{required:true, 'validate-email':true}"/>
- </div>
- </div>
- <div id="oar-zip" class="field">
- <label for="oar_zip" class="required"><em>*</em><?php echo __('Billing ZIP Code') ?></label>
- <div class="input-box">
- <input type="text" class="input-text" id="oar_zip" name="oar_zip" data-validate="{required:true}"/>
- </div>
- </div>
- </li>
- </ul>
- </div>
- <div class="buttons-set form-buttons">
- <button type="submit" title="<?php echo __('Continue') ?>" class="button"><span><span><?php echo __('Continue') ?></span></span></button>
+<form class="form orders search" id="oar-widget-orders-and-returns-form" action="<?php echo $this->getActionUrl() ?>"
+ method="post" name="guest_post">
+ <fieldset class="fieldset">
+ <legend class="legend"><span><?php echo __('Order Information') ?></span></legend>
+ <br/>
+
+ <div class="field id required">
+ <label class="label" for="oar-order-id"><span><?php echo __('Order ID') ?></span></label>
+
+ <div class="control">
+ <input type="text" class="input-text" id="oar-order-id" name="oar_order_id"
+ data-validate="{required:true}"/>
+ </div>
+ </div>
+ <div class="field lastname required">
+ <label class="label" for="oar-billing-lastname"><span><?php echo __('Billing Last Name') ?></span></label>
+
+ <div class="control">
+ <input type="text" class="input-text" id="oar-billing-lastname" name="oar_billing_lastname"
+ data-validate="{required:true}"/>
+ </div>
+ </div>
+ <div class="field find required">
+ <label class="label" for="quick-search-type-id"><span><?php echo __('Find Order By:') ?></span></label>
+
+ <div class="control">
+ <select name="oar_type" id="quick-search-type-id" class="select">
+ <option value="email"><?php echo __('Email Address'); ?></option>
+ <option value="zip"><?php echo __('ZIP Code'); ?></option>
+ </select>
+ </div>
+ </div>
+ <div id="oar-email" class="field email required">
+ <label class="label" for="oar_email"><span><?php echo __('Email Address') ?></span></label>
+
+ <div class="control">
+ <input type="text" class="input-text" id="oar_email" name="oar_email"
+ data-validate="{required:true, 'validate-email':true}"/>
+ </div>
+ </div>
+ <div id="oar-zip" class="field zip required">
+ <label class="label" for="oar_zip"><span><?php echo __('Billing ZIP Code') ?></span></label>
+
+ <div class="control">
+ <input type="text" class="input-text" id="oar_zip" name="oar_zip" data-validate="{required:true}"/>
+ </div>
+ </div>
+ </fieldset>
+ <div class="actions">
+ <button type="submit" title="<?php echo __('Continue') ?>" class="action submit">
+ <span><?php echo __('Continue') ?></span></button>
</div>
</form>
<script type="text/javascript">
@@ -79,7 +81,7 @@
"<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
"<?php echo $this->getViewFileUrl('mage/validation.js')?>",
"<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
- "<?php echo $this->getViewFileUrl('Magento_Sales::orders-returns.js');?>", function() {
+ "<?php echo $this->getViewFileUrl('Magento_Sales::orders-returns.js');?>", function () {
jQuery('#oar-widget-orders-and-returns-form').ordersReturns().validation();
- });
+ });
</script>
diff --git a/app/code/Magento/Sales/view/frontend/layout/customer_account_index.xml b/app/code/Magento/Sales/view/frontend/layout/customer_account_index.xml
index b6109fd568a..20442ea3140 100644
--- a/app/code/Magento/Sales/view/frontend/layout/customer_account_index.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/customer_account_index.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="customer_account_dashboard">
- <block class="Magento\Sales\Block\Order\Recent" name="customer_account_dashboard_top" as="top" template="order/recent.phtml"/>
+ <referenceBlock name="my.account.wrapper">
+ <block class="Magento\Sales\Block\Order\Recent" name="customer_account_dashboard_top" after="customer_account_dashboard_hello" template="order/recent.phtml"/>
</referenceBlock>
</layout>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_billing_agreement_index.xml b/app/code/Magento/Sales/view/frontend/layout/sales_billing_agreement_index.xml
index 70ae62068e2..0eb79578e40 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_billing_agreement_index.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_billing_agreement_index.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Billing Agreement" type="page" parent="customer_account_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Billing Agreement" type="page">
<update handle="customer_account"/>
<referenceBlock name="root">
<action method="setTemplate">
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_billing_agreement_view.xml b/app/code/Magento/Sales/view/frontend/layout/sales_billing_agreement_view.xml
index 038fd3576a1..9093b370404 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_billing_agreement_view.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_billing_agreement_view.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Billing Agreement View" type="page" parent="sales_billing_agreement_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Billing Agreement View" type="page">
<update handle="customer_account"/>
<referenceBlock name="root">
<action method="setTemplate">
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml
index f266ce63dbf..3d735d4fecf 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml
@@ -23,17 +23,15 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Email Creditmemo Items List" type="page" parent="sales_order_creditmemo">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Email Creditmemo Items List" type="page">
<block class="Magento\Sales\Block\Order\Email\Creditmemo\Items" name="items" template="email/creditmemo/items.phtml">
<block class="Magento\Sales\Block\Order\Email\Items\DefaultItems" as="default" template="email/items/creditmemo/default.phtml"/>
<block class="Magento\Sales\Block\Order\Email\Items\Order\Grouped" as="grouped" template="email/items/creditmemo/default.phtml"/>
<block class="Magento\Sales\Block\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
- <action method="setLabelProperties">
- <argument name="value" xsi:type="string">colspan="3" align="right" style="padding:3px 9px"</argument>
- </action>
- <action method="setValueProperties">
- <argument name="value" xsi:type="string">align="right" style="padding:3px 9px"</argument>
- </action>
+ <arguments>
+ <argument name="label_properties" xsi:type="string">colspan="3" align="right" style="padding:3px 9px"</argument>
+ <argument name="value_properties" xsi:type="string">align="right" style="padding:3px 9px"</argument>
+ </arguments>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
</block>
</block>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_items.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_items.xml
index 21520008479..11ff51bae7f 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_items.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_items.xml
@@ -23,17 +23,15 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Email Invoice Items List" type="page" parent="sales_order_invoice">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Email Invoice Items List" type="page">
<block class="Magento\Sales\Block\Order\Email\Invoice\Items" name="items" template="email/invoice/items.phtml">
<block class="Magento\Sales\Block\Order\Email\Items\DefaultItems" as="default" template="email/items/invoice/default.phtml"/>
<block class="Magento\Sales\Block\Order\Email\Items\Order\Grouped" as="grouped" template="email/items/invoice/default.phtml"/>
<block class="Magento\Sales\Block\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
- <action method="setLabelProperties">
- <argument name="value" xsi:type="string">colspan="3" align="right" style="padding:3px 9px"</argument>
- </action>
- <action method="setValueProperties">
- <argument name="value" xsi:type="string">align="right" style="padding:3px 9px"</argument>
- </action>
+ <arguments>
+ <argument name="label_properties" xsi:type="string">colspan="3" align="right" style="padding:3px 9px"</argument>
+ <argument name="value_properties" xsi:type="string">align="right" style="padding:3px 9px"</argument>
+ </arguments>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
</block>
</block>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_items.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_items.xml
index b7a275337b8..125e058b82f 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_items.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_items.xml
@@ -23,17 +23,15 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Email Order Items List" type="page" parent="sales_order_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Email Order Items List" type="page">
<block class="Magento\Sales\Block\Order\Email\Items" name="items" template="email/items.phtml">
<block class="Magento\Sales\Block\Order\Email\Items\Order\DefaultOrder" as="default" template="email/items/order/default.phtml"/>
<block class="Magento\Sales\Block\Order\Email\Items\Order\Grouped" as="grouped" template="email/items/order/default.phtml"/>
<block class="Magento\Sales\Block\Order\Totals" name="order_totals" template="order/totals.phtml">
- <action method="setLabelProperties">
- <argument name="value" xsi:type="string">colspan="3" align="right" style="padding:3px 9px"</argument>
- </action>
- <action method="setValueProperties">
- <argument name="value" xsi:type="string">align="right" style="padding:3px 9px"</argument>
- </action>
+ <arguments>
+ <argument name="label_properties" xsi:type="string">colspan="3" align="right" style="padding:3px 9px"</argument>
+ <argument name="value_properties" xsi:type="string">align="right" style="padding:3px 9px"</argument>
+ </arguments>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml">
<action method="setIsPlaneMode">
<argument name="value" xsi:type="string">1</argument>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_items.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_items.xml
index 8c27b09b513..948e627b452 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_items.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_items.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Email Shipment Items List" type="page" parent="sales_order_shipment">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Email Shipment Items List" type="page">
<block class="Magento\Sales\Block\Order\Email\Shipment\Items" name="items" template="email/shipment/items.phtml">
<block class="Magento\Sales\Block\Order\Email\Items\DefaultItems" as="default" template="email/items/shipment/default.phtml"/>
</block>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_creditmemo.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_creditmemo.xml
index 8af6d88f831..8b875fec3c2 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_creditmemo.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_creditmemo.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Guest Order Creditmemo View" type="page" parent="sales_guest_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Guest Order Creditmemo View" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
@@ -38,12 +38,10 @@
<block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/creditmemo/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/creditmemo/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
- <action method="setLabelProperties">
- <argument name="value" xsi:type="string">colspan="6" class="a-right"</argument>
- </action>
- <action method="setValueProperties">
- <argument name="value" xsi:type="string">class="a-right"</argument>
- </action>
+ <arguments>
+ <argument name="label_properties" xsi:type="string">colspan="6" class="mark"</argument>
+ <argument name="value_properties" xsi:type="string">class="amount"</argument>
+ </arguments>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
</block>
<block class="Magento\Sales\Block\Order\Comments" name="creditmemo_comments" template="order/comments.phtml"/>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_form.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_form.xml
index 0747d89f8b6..fd9731b7a37 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_form.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_form.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Returns" type="page" parent="sales_guest_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Returns" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_invoice.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_invoice.xml
index 5f558a28a5e..ff12ccdb39d 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_invoice.xml
+++ b/app/code/Magento/Sales/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Guest Order Invoice View" type="page" parent="sales_guest_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Guest Order Invoice View" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
@@ -38,12 +38,10 @@
<block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/invoice/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/invoice/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
- <action method="setLabelProperties">
- <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
- </action>
- <action method="setValueProperties">
- <argument name="value" xsi:type="string">class="last a-right"</argument>
- </action>
+ <arguments>
+ <argument name="label_properties" xsi:type="string">colspan="4" class="mark"</argument>
+ <argument name="value_properties" xsi:type="string">class="amount"</argument>
+ </arguments>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
</block>
<block class="Magento\Sales\Block\Order\Comments" name="invoice_comments" template="order/comments.phtml"/>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_printorder.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_printorder.xml
index 5a1ff2d5430..028083d2091 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_printorder.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_printorder.xml
@@ -23,18 +23,16 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Order Print View" type="page" parent="print">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Order Print View" type="page">
<referenceContainer name="content">
<block class="Magento\Sales\Block\Order\PrintShipment" name="sales.order.print" template="order/print.phtml">
<block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Totals" name="order_totals" template="order/totals.phtml">
- <action method="setLabelProperties">
- <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
- </action>
- <action method="setValueProperties">
- <argument name="value" xsi:type="string">class="last a-right"</argument>
- </action>
+ <arguments>
+ <argument name="label_properties" xsi:type="string">colspan="4" class="mark"</argument>
+ <argument name="value_properties" xsi:type="string">class="amount"</argument>
+ </arguments>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml">
<action method="setIsPlaneMode">
<argument name="value" xsi:type="string">1</argument>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_printordercreditmemo.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_printordercreditmemo.xml
index 4cdd7a9c2ab..a8af83e3966 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_printordercreditmemo.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_printordercreditmemo.xml
@@ -23,18 +23,16 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Creditmemo Print View" type="page" parent="sales_guest_print">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Creditmemo Print View" type="page">
<referenceContainer name="content">
<block class="Magento\Sales\Block\Order\PrintOrder\Creditmemo" name="sales.order.print.creditmemo" template="order/print/creditmemo.phtml">
<block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/creditmemo/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/creditmemo/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
- <action method="setLabelProperties">
- <argument name="value" xsi:type="string">colspan="6" class="a-right"</argument>
- </action>
- <action method="setValueProperties">
- <argument name="value" xsi:type="string">class="a-right"</argument>
- </action>
+ <arguments>
+ <argument name="label_properties" xsi:type="string">colspan="6" class="mark"</argument>
+ <argument name="value_properties" xsi:type="string">class="amount"</argument>
+ </arguments>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
</block>
</block>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_printorderinvoice.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_printorderinvoice.xml
index cf9ca0129a0..74c99bc2b02 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_printorderinvoice.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_printorderinvoice.xml
@@ -23,18 +23,16 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Invoice Print View" type="page" parent="sales_guest_print">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Invoice Print View" type="page">
<referenceContainer name="content">
<block class="Magento\Sales\Block\Order\PrintOrder\Invoice" name="sales.order.print.invoice" template="order/print/invoice.phtml">
<block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/invoice/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/invoice/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
- <action method="setLabelProperties">
- <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
- </action>
- <action method="setValueProperties">
- <argument name="value" xsi:type="string">class="last a-right"</argument>
- </action>
+ <arguments>
+ <argument name="label_properties" xsi:type="string">colspan="4" class="mark"</argument>
+ <argument name="value_properties" xsi:type="string">class="amount"</argument>
+ </arguments>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
</block>
</block>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_printshipment.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_printshipment.xml
index c458b461cbe..c9b3c3dd228 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_printshipment.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_printshipment.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Shipment Print View" type="page" parent="sales_guest_print">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Shipment Print View" type="page">
<referenceContainer name="content">
<block class="Magento\Sales\Block\Order\PrintOrder\Shipment" name="sales.order.print.shipment" template="order/print/shipment.phtml">
<block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/shipment/items/renderer/default.phtml"/>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_reorder.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_reorder.xml
index 3eda812229e..a5a1d6d97da 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_reorder.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_reorder.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Guest Reorder" type="page" parent="sales_guest_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Guest Reorder" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_shipment.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_shipment.xml
index ddcd6265b83..1ca20c876af 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_shipment.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_shipment.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Guest Order Shipment View" type="page" parent="sales_guest_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Guest Order Shipment View" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_guest_view.xml b/app/code/Magento/Sales/view/frontend/layout/sales_guest_view.xml
index 7fd919c7957..bef1f64cc68 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_guest_view.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_guest_view.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Guest Order View" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Guest Order View" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
@@ -38,12 +38,10 @@
<block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Totals" name="order_totals" template="order/totals.phtml">
- <action method="setLabelProperties">
- <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
- </action>
- <action method="setValueProperties">
- <argument name="value" xsi:type="string">class="last a-right"</argument>
- </action>
+ <arguments>
+ <argument name="label_properties" xsi:type="string">colspan="4" class="mark"</argument>
+ <argument name="value_properties" xsi:type="string">class="amount"</argument>
+ </arguments>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
</block>
</block>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo.xml
index af95daea8be..206d1e853b3 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Order Creditmemo View" type="page" parent="sales_order_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Order Creditmemo View" type="page">
<update handle="customer_account"/>
<referenceContainer name="my.account.wrapper">
<block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
@@ -34,12 +34,10 @@
<block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/creditmemo/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/creditmemo/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
- <action method="setLabelProperties">
- <argument name="value" xsi:type="string">colspan="6" class="a-right"</argument>
- </action>
- <action method="setValueProperties">
- <argument name="value" xsi:type="string">class="a-right"</argument>
- </action>
+ <arguments>
+ <argument name="label_properties" xsi:type="string">colspan="6" class="mark"</argument>
+ <argument name="value_properties" xsi:type="string">class="amount"</argument>
+ </arguments>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
</block>
<block class="Magento\Sales\Block\Order\Comments" name="creditmemo_comments" template="order/comments.phtml"/>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_guest_info_links.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_guest_info_links.xml
index d01be782ea8..670254ed398 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_guest_info_links.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_guest_info_links.xml
@@ -26,6 +26,9 @@
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="sales.order.info">
<block class="Magento\Page\Block\Links" as="links" name="sales.order.info.links">
+ <arguments>
+ <argument name="css_class" xsi:type="string">items</argument>
+ </arguments>
<block class="Magento\Sales\Block\Order\Link" name="sales.order.info.links.billing-agreements">
<arguments>
<argument name="path" xsi:type="string">sales/guest/view</argument>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_history.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_history.xml
index 8482ad11e2f..244db3b4843 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_history.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_history.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Order History" type="page" parent="sales_order_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Order History" type="page">
<update handle="customer_account"/>
<referenceContainer name="my.account.wrapper">
<block class="Magento\Sales\Block\Order\History" name="sales.order.history">
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_info_links.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_info_links.xml
index 49f4b45c66e..20aa47ee1d7 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_info_links.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_info_links.xml
@@ -26,6 +26,9 @@
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="sales.order.info">
<block class="Magento\Page\Block\Links" as="links" name="sales.order.info.links">
+ <arguments>
+ <argument name="css_class" xsi:type="string">items</argument>
+ </arguments>
<block class="Magento\Sales\Block\Order\Link" name="sales.order.info.links.billing-agreements">
<arguments>
<argument name="path" xsi:type="string">sales/order/view</argument>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice.xml
index c5052f952b3..bc422dd897f 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Order Invoice View" type="page" parent="sales_order_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Order Invoice View" type="page">
<update handle="customer_account"/>
<referenceContainer name="my.account.wrapper">
<block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
@@ -34,12 +34,10 @@
<block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/invoice/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/invoice/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
- <action method="setLabelProperties">
- <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
- </action>
- <action method="setValueProperties">
- <argument name="value" xsi:type="string">class="last a-right"</argument>
- </action>
+ <arguments>
+ <argument name="label_properties" xsi:type="string">colspan="4" class="mark"</argument>
+ <argument name="value_properties" xsi:type="string">class="amount"</argument>
+ </arguments>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
</block>
<block class="Magento\Sales\Block\Order\Comments" name="invoice_comments" template="order/comments.phtml"/>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_printorder.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_printorder.xml
index 825fb36e865..0ca941a869e 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_printorder.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_printorder.xml
@@ -23,22 +23,20 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Order Print View" type="page" parent="print">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Order Print View" type="page">
<referenceContainer name="content">
<block class="Magento\Sales\Block\Order\PrintShipment" name="sales.order.print" template="order/print.phtml">
<block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Totals" name="order_totals" template="order/totals.phtml">
- <action method="setLabelProperties">
- <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
- </action>
- <action method="setValueProperties">
- <argument name="value" xsi:type="string">class="last a-right"</argument>
- </action>
+ <arguments>
+ <argument name="label_properties" xsi:type="string">colspan="4" class="mark"</argument>
+ <argument name="value_properties" xsi:type="string">class="amount"</argument>
+ </arguments>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml">
- <action method="setIsPlaneMode">
- <argument name="value" xsi:type="string">1</argument>
- </action>
+ <arguments>
+ <argument name="is_plane_mode" xsi:type="string">1</argument>
+ </arguments>
</block>
</block>
</block>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_printordercreditmemo.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_printordercreditmemo.xml
index 356e32d0dfb..2c3df77fc7e 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_printordercreditmemo.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_printordercreditmemo.xml
@@ -23,18 +23,16 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Creditmemo Print View" type="page" parent="sales_order_print">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Creditmemo Print View" type="page">
<referenceContainer name="content">
<block class="Magento\Sales\Block\Order\PrintOrder\Creditmemo" name="sales.order.print.creditmemo" template="order/print/creditmemo.phtml">
<block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/creditmemo/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/creditmemo/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
- <action method="setLabelProperties">
- <argument name="value" xsi:type="string">colspan="6" class="a-right"</argument>
- </action>
- <action method="setValueProperties">
- <argument name="value" xsi:type="string">class="a-right"</argument>
- </action>
+ <arguments>
+ <argument name="label_properties" xsi:type="string">colspan="6" class="mark"</argument>
+ <argument name="value_properties" xsi:type="string">class="amount"</argument>
+ </arguments>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
</block>
</block>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_printorderinvoice.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_printorderinvoice.xml
index 1a809dcf126..7df3af50607 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_printorderinvoice.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_printorderinvoice.xml
@@ -23,18 +23,16 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Invoice Print View" type="page" parent="sales_order_print">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Invoice Print View" type="page">
<referenceContainer name="content">
<block class="Magento\Sales\Block\Order\PrintOrder\Invoice" name="sales.order.print.invoice" template="order/print/invoice.phtml">
<block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/invoice/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/invoice/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
- <action method="setLabelProperties">
- <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
- </action>
- <action method="setValueProperties">
- <argument name="value" xsi:type="string">class="last a-right"</argument>
- </action>
+ <arguments>
+ <argument name="label_properties" xsi:type="string">colspan="4" class="mark"</argument>
+ <argument name="value_properties" xsi:type="string">class="amount"</argument>
+ </arguments>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
</block>
</block>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_printshipment.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_printshipment.xml
index f5428f30b26..e9f1682cde3 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_printshipment.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_printshipment.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Shipment Print View" type="page" parent="sales_order_print">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Shipment Print View" type="page">
<referenceContainer name="content">
<block class="Magento\Sales\Block\Order\PrintOrder\Shipment" name="sales.order.print.shipment" template="order/print/shipment.phtml">
<block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/shipment/items/renderer/default.phtml"/>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_reorder.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_reorder.xml
index 32234a72268..c246af7a129 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_reorder.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_reorder.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Reorder" type="page" parent="sales_order_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Reorder" type="page">
<update handle="customer_account"/>
<referenceContainer name="content">
<block class="Magento\Sales\Block\Order\View" name="sales.order.view"/>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_shipment.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_shipment.xml
index 4bb15a310ae..b48bbb83697 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_shipment.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_shipment.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Order Shipment View" type="page" parent="sales_order_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Order Shipment View" type="page">
<update handle="customer_account"/>
<referenceContainer name="my.account.wrapper">
<block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_view.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_view.xml
index 24a1964ff6f..ddde2494e29 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_view.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_view.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Order View" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Order View" type="page">
<update handle="customer_account"/>
<referenceContainer name="my.account.wrapper">
<block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
@@ -34,12 +34,10 @@
<block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Totals" name="order_totals" template="order/totals.phtml">
- <action method="setLabelProperties">
- <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
- </action>
- <action method="setValueProperties">
- <argument name="value" xsi:type="string">class="last a-right"</argument>
- </action>
+ <arguments>
+ <argument name="label_properties" xsi:type="string">colspan="4" class="mark"</argument>
+ <argument name="value_properties" xsi:type="string">class="amount"</argument>
+ </arguments>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
</block>
</block>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_recurring_profile_index.xml b/app/code/Magento/Sales/view/frontend/layout/sales_recurring_profile_index.xml
index 36d4758c9a0..57be56d1936 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_recurring_profile_index.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_recurring_profile_index.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Recurring Profile" type="page" parent="customer_account_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Recurring Profile" type="page">
<update handle="customer_account"/>
<referenceBlock name="root">
<action method="setTemplate">
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_recurring_profile_orders.xml b/app/code/Magento/Sales/view/frontend/layout/sales_recurring_profile_orders.xml
index 7172f01d739..f4266eab8ed 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_recurring_profile_orders.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_recurring_profile_orders.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Recurring Profile Orders List" type="page" parent="sales_recurring_profile_view__tabs">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Recurring Profile Orders List" type="page">
<update handle="customer_account"/>
<update handle="sales_recurring_profile_view__tabs"/>
<referenceBlock name="sales.recurring.profile.view.tab.orders">
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_recurring_profile_view.xml b/app/code/Magento/Sales/view/frontend/layout/sales_recurring_profile_view.xml
index a8c347d4f78..816ad80e9be 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_recurring_profile_view.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_recurring_profile_view.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Recurring Profile View" type="page" parent="sales_recurring_profile_view__tabs">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Recurring Profile View" type="page">
<update handle="customer_account"/>
<update handle="sales_recurring_profile_view__tabs"/>
<referenceBlock name="sales.recurring.profile.view.tab.profile">
@@ -32,10 +32,7 @@
</action>
</referenceBlock>
<referenceBlock name="sales.recurring.profile.view">
- <block class="Magento\Sales\Block\Recurring\Profile\View\Schedule" name="sales.recurring.profile.view.general" as="general" template="recurring/profile/view/info.phtml">
- <action method="addToParentGroup">
- <argument name="value" xsi:type="string">info_blocks_row_1</argument>
- </action>
+ <block class="Magento\Sales\Block\Recurring\Profile\View\Schedule" name="sales.recurring.profile.view.general" as="general" template="recurring/profile/view/info.phtml" group="info_blocks_row_1">
<action method="setViewColumn">
<argument name="value" xsi:type="string">1</argument>
</action>
@@ -43,10 +40,7 @@
<argument translate="true" name="value" xsi:type="string">Reference</argument>
</action>
</block>
- <block class="Magento\Sales\Block\Recurring\Profile\View\Item" name="sales.recurring.profile.view.item" as="item" template="recurring/profile/view/info.phtml">
- <action method="addToParentGroup">
- <argument name="value" xsi:type="string">info_blocks_row_1</argument>
- </action>
+ <block class="Magento\Sales\Block\Recurring\Profile\View\Item" name="sales.recurring.profile.view.item" as="item" template="recurring/profile/view/info.phtml" group="info_blocks_row_1">
<action method="setViewColumn">
<argument name="value" xsi:type="string">2</argument>
</action>
@@ -54,10 +48,7 @@
<argument translate="true" name="value" xsi:type="string">Purchased Item</argument>
</action>
</block>
- <block class="Magento\Sales\Block\Recurring\Profile\View\Schedule" name="sales.recurring.profile.view.schedule" as="profile" template="recurring/profile/view/info.phtml">
- <action method="addToParentGroup">
- <argument name="value" xsi:type="string">info_blocks_row_2</argument>
- </action>
+ <block class="Magento\Sales\Block\Recurring\Profile\View\Schedule" name="sales.recurring.profile.view.schedule" as="profile" template="recurring/profile/view/info.phtml" group="info_blocks_row_2">
<action method="setViewColumn">
<argument name="value" xsi:type="string">1</argument>
</action>
@@ -65,10 +56,7 @@
<argument translate="true" name="value" xsi:type="string">Profile Schedule</argument>
</action>
</block>
- <block class="Magento\Sales\Block\Recurring\Profile\View\Fees" name="sales.recurring.profile.view.fees" as="fees" template="recurring/profile/view/info.phtml">
- <action method="addToParentGroup">
- <argument name="value" xsi:type="string">info_blocks_row_2</argument>
- </action>
+ <block class="Magento\Sales\Block\Recurring\Profile\View\Fees" name="sales.recurring.profile.view.fees" as="fees" template="recurring/profile/view/info.phtml" group="info_blocks_row_2">
<action method="setViewColumn">
<argument name="value" xsi:type="string">2</argument>
</action>
@@ -76,10 +64,7 @@
<argument translate="true" name="value" xsi:type="string">Profile Payments</argument>
</action>
</block>
- <block class="Magento\Sales\Block\Recurring\Profile\View\Address" name="sales.recurring.profile.view.billing" as="billing_address" template="recurring/profile/view/info.phtml">
- <action method="addToParentGroup">
- <argument name="value" xsi:type="string">info_blocks_row_3</argument>
- </action>
+ <block class="Magento\Sales\Block\Recurring\Profile\View\Address" name="sales.recurring.profile.view.billing" as="billing_address" template="recurring/profile/view/info.phtml" group="info_blocks_row_3">
<action method="setViewColumn">
<argument name="value" xsi:type="string">1</argument>
</action>
@@ -87,13 +72,10 @@
<argument translate="true" name="value" xsi:type="string">Billing Address</argument>
</action>
</block>
- <block class="Magento\Sales\Block\Recurring\Profile\View\Address" name="sales.recurring.profile.view.shipping" as="shipping_address" template="recurring/profile/view/info.phtml">
+ <block class="Magento\Sales\Block\Recurring\Profile\View\Address" name="sales.recurring.profile.view.shipping" as="shipping_address" template="recurring/profile/view/info.phtml" group="info_blocks_row_3">
<action method="setAddressType">
<argument name="value" xsi:type="string">shipping</argument>
</action>
- <action method="addToParentGroup">
- <argument name="value" xsi:type="string">info_blocks_row_3</argument>
- </action>
<action method="setViewColumn">
<argument name="value" xsi:type="string">2</argument>
</action>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_recurring_profile_view__tabs.xml b/app/code/Magento/Sales/view/frontend/layout/sales_recurring_profile_view__tabs.xml
index 6a8ab90ea74..6900e63f006 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_recurring_profile_view__tabs.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_recurring_profile_view__tabs.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Recurring Profile View Tabs" type="page" parent="sales_recurring_profile_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Recurring Profile View Tabs" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">2columns-left.phtml</argument>
@@ -34,10 +34,7 @@
<action method="setShouldPrepareInfoTabs">
<argument name="value" xsi:type="string">1</argument>
</action>
- <block class="Magento\Core\Block\Text" as="profile_info" name="sales.recurring.profile.view.tab.profile">
- <action method="addToParentGroup">
- <argument name="value" xsi:type="string">info_tabs</argument>
- </action>
+ <block class="Magento\Core\Block\Text" as="profile_info" name="sales.recurring.profile.view.tab.profile" group="info_tabs">
<action method="setViewLabel">
<argument translate="true" name="value" xsi:type="string">Profile Information</argument>
</action>
@@ -58,10 +55,7 @@
</action>
</block>
-->
- <block class="Magento\Core\Block\Text" as="related_orders" name="sales.recurring.profile.view.tab.orders">
- <action method="addToParentGroup">
- <argument name="value" xsi:type="string">info_tabs</argument>
- </action>
+ <block class="Magento\Core\Block\Text" as="related_orders" name="sales.recurring.profile.view.tab.orders" group="info_tabs">
<action method="setViewLabel">
<argument translate="true" name="value" xsi:type="string">Related Orders</argument>
</action>
diff --git a/app/code/Magento/Sales/view/frontend/order/comments.phtml b/app/code/Magento/Sales/view/frontend/order/comments.phtml
index fcf34f53ce6..bd9d1a61b54 100644
--- a/app/code/Magento/Sales/view/frontend/order/comments.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/comments.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -31,12 +30,12 @@
*/
?>
<?php if ($this->hasComments()):?>
- <div class="order-additional order-comments">
- <h2 class="sub-title"><?php echo $this->getTitle() ?></h2>
- <dl class="order-about">
+ <div class="order additional details comments">
+ <h3 class="subtitle"><?php echo $this->getTitle() ?></h3>
+ <dl class="order comments">
<?php foreach ($this->getComments() as $_commentItem): ?>
- <dt><?php echo $this->formatDate($_commentItem->getCreatedAtStoreDate(), 'medium', true) ?></dt>
- <dd><?php echo $this->escapeHtml($_commentItem->getComment()) ?></dd>
+ <dt class="comment date"><?php echo $this->formatDate($_commentItem->getCreatedAtStoreDate(), 'medium', true) ?></dt>
+ <dd class="comment text"><?php echo $this->escapeHtml($_commentItem->getComment()) ?></dd>
<?php endforeach; ?>
</dl>
</div>
diff --git a/app/code/Magento/Sales/view/frontend/order/creditmemo.phtml b/app/code/Magento/Sales/view/frontend/order/creditmemo.phtml
index 3b8c8c263ad..247b9c52366 100644
--- a/app/code/Magento/Sales/view/frontend/order/creditmemo.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/creditmemo.phtml
@@ -19,14 +19,17 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<div class="order-items order-details">
+<div class="order details items creditmemo">
<?php echo $this->getChildHtml('creditmemo_items') ?>
- <div class="buttons-set">
- <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo $this->getBackTitle() ?></a></p>
+ <div class="actions">
+ <div class="secondary">
+ <a href="<?php echo $this->getBackUrl() ?>" class="action back">
+ <span><?php echo $this->getBackTitle() ?></span>
+ </a>
+ </div>
</div>
</div>
diff --git a/app/code/Magento/Sales/view/frontend/order/creditmemo/items.phtml b/app/code/Magento/Sales/view/frontend/order/creditmemo/items.phtml
index 004e32fa503..5c3d8d85590 100644
--- a/app/code/Magento/Sales/view/frontend/order/creditmemo/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/creditmemo/items.phtml
@@ -19,33 +19,41 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php $_order = $this->getOrder() ?>
-<p class="order-links"><a href="<?php echo $this->getPrintAllCreditmemosUrl($_order) ?>" onclick="this.target='_blank'" class="link-print"><?php echo __('Print All Refunds') ?></a></p>
+<div class="order toolbar">
+ <div class="actions">
+ <a href="<?php echo $this->getPrintAllCreditmemosUrl($_order) ?>"
+ onclick="this.target='_blank'"
+ class="action print">
+ <span><?php echo __('Print All Refunds') ?></span>
+ </a>
+ </div>
+</div>
<?php foreach ($_order->getCreditmemosCollection() as $_creditmemo): ?>
-<h2 class="sub-title"><?php echo __('Refund #') ?><?php echo $_creditmemo->getIncrementId(); ?> <span class="separator">|</span> <a href="<?php echo $this->getPrintCreditmemoUrl($_creditmemo) ?>" onclick="this.target='_blank'" class="link-print"><?php echo __('Print Refund') ?></a></h2>
-<h3 class="table-caption"><?php echo __('Items Refunded') ?></h3>
-<table class="data-table" id="my-refund-table-<?php echo $_creditmemo->getId(); ?>">
- <col />
- <col width="1" />
- <col width="1" />
- <col width="1" />
- <col width="1" />
- <col width="1" />
- <col width="1" />
+<div class="order title">
+ <strong><?php echo __('Refund #') ?><?php echo $_creditmemo->getIncrementId(); ?> </strong>
+ <a href="<?php echo $this->getPrintCreditmemoUrl($_creditmemo) ?>"
+ onclick="this.target='_blank'"
+ class="action print">
+ <span><?php echo __('Print Refund') ?></span>
+ </a>
+</div>
+
+<div class="order subtitle caption"><strong><?php echo __('Items Refunded') ?></strong></div>
+<table class="data table order items creditmemo" id="my-refund-table-<?php echo $_creditmemo->getId(); ?>">
<thead>
<tr>
- <th><?php echo __('Product Name') ?></th>
- <th><?php echo __('SKU') ?></th>
- <th class="a-right"><?php echo __('Price') ?></th>
- <th class="a-center"><?php echo __('Qty') ?></th>
- <th class="a-right"><?php echo __('Subtotal') ?></th>
- <th class="a-center wrap"><?php echo __('Discount Amount') ?></th>
- <th class="a-right wrap"><?php echo __('Row Total') ?></th>
+ <th class="col name"><?php echo __('Product Name') ?></th>
+ <th class="col sku"><?php echo __('SKU') ?></th>
+ <th class="col price"><?php echo __('Price') ?></th>
+ <th class="col qty"><?php echo __('Qty') ?></th>
+ <th class="col subtotal"><?php echo __('Subtotal') ?></th>
+ <th class="col discount"><?php echo __('Discount Amount') ?></th>
+ <th class="col total"><?php echo __('Row Total') ?></th>
</tr>
</thead>
<tfoot>
@@ -60,6 +68,5 @@
</tbody>
<?php endforeach; ?>
</table>
-<script type="text/javascript">(function($) {$('#my-refund-table-<?php echo $_creditmemo->getId(); ?>').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})})(jQuery)</script>
<?php echo $this->getCommentsHtml($_creditmemo)?>
<?php endforeach; ?>
diff --git a/app/code/Magento/Sales/view/frontend/order/creditmemo/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/order/creditmemo/items/renderer/default.phtml
index 5f717e6a19a..176a8772f7c 100644
--- a/app/code/Magento/Sales/view/frontend/order/creditmemo/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/creditmemo/items/renderer/default.phtml
@@ -26,10 +26,11 @@
?>
<?php $_item = $this->getItem() ?>
<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
-<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
- <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
+<tr id="order-item-row-<?php echo $_item->getId() ?>">
+ <td class="col name">
+ <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
<?php if($_options = $this->getItemOptions()): ?>
- <dl class="item-options">
+ <dl class="item options">
<?php foreach ($_options as $_option) : ?>
<dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
<?php if (!$this->getPrintStatus()): ?>
@@ -37,7 +38,7 @@
<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
<?php if (isset($_formatedOptionValue['full_view'])): ?>
<div class="truncated_full_value">
- <dl class="item-options">
+ <dl class="item options">
<dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
</dl>
@@ -50,17 +51,31 @@
<?php endforeach; ?>
</dl>
<?php endif; ?>
+
+ <?php /* downloadable */ ?>
+ <?php if ($links = $this->getLinks()): ?>
+ <dl class="item options">
+ <dt><?php echo $this->getLinksTitle() ?></dt>
+ <?php foreach ($links->getPurchasedItems() as $link): ?>
+ <dd><?php echo $this->escapeHtml($link->getLinkTitle()); ?></dd>
+ <?php endforeach; ?>
+ </dl>
+ <?php endif; ?>
+ <?php /* EOF downloadable */ ?>
+
<?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
<?php if ($addInfoBlock) :?>
<?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
<?php endif; ?>
<?php echo $this->escapeHtml($_item->getDescription()) ?>
<?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
- <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $_item->getId()?>" data-item-id="<?php echo $_item->getId()?>"><?php echo __('Gift Message') ?></a>
+ <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="action show"
+ aria-controls="order-item-gift-message-<?php echo $_item->getId() ?>"
+ data-item-id="<?php echo $_item->getId() ?>"><?php echo __('Gift Message') ?></a>
<?php endif; ?>
</td>
- <td><?php echo $this->escapeHtml($this->helper('Magento\Core\Helper\String')->splitInjection($this->getSku())) ?></td>
- <td class="a-right">
+ <td class="col sku"><?php echo $this->escapeHtml($this->helper('Magento\Core\Helper\String')->splitInjection($this->getSku())) ?></td>
+ <td class="col price">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
<span class="price-excl-tax">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
@@ -83,10 +98,8 @@
<?php else: ?>
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
<?php endif; ?>
-
</span>
-
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
<span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
@@ -141,10 +154,8 @@
<?php else: ?>
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
<?php endif; ?>
-
</span>
-
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
<span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
@@ -176,8 +187,8 @@
</span>
<?php endif; ?>
</td>
- <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
- <td class="a-right">
+ <td class="col qty"><?php echo $_item->getQty()*1 ?></td>
+ <td class="col subtotal">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
<span class="price-excl-tax">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
@@ -200,10 +211,8 @@
<?php else: ?>
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
<?php endif; ?>
-
</span>
-
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
<span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
@@ -257,10 +266,8 @@
<?php else: ?>
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
<?php endif; ?>
-
</span>
-
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
<span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
@@ -289,14 +296,11 @@
</span>
<?php endif; ?>
<?php endif; ?>
-
-
-
</span>
<?php endif; ?>
</td>
- <td class="a-right"><?php echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
- <td class="last a-right">
+ <td class="col discount"><?php echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
+ <td class="cot total">
<?php echo $_order->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()) ?>
</td>
</tr>
diff --git a/app/code/Magento/Sales/view/frontend/order/history.phtml b/app/code/Magento/Sales/view/frontend/order/history.phtml
index 125c387f26f..e5bc8f2590c 100644
--- a/app/code/Magento/Sales/view/frontend/order/history.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/history.phtml
@@ -19,58 +19,48 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
<?php $_orders = $this->getOrders(); ?>
-<div class="page-title">
- <h1><?php echo __('My Orders') ?></h1>
-</div>
-<?php echo $this->getPagerHtml(); ?>
+<?php echo $this->getChildHtml('info');?>
+<div class="order toolbar"><?php echo $this->getPagerHtml(); ?></div>
<?php if($_orders->getSize()): ?>
-<table class="data-table" id="my-orders-table">
- <col width="1" />
- <col width="1" />
- <col />
- <col width="1" />
- <col width="1" />
- <col width="1" />
+<table class="data table orders history" id="my-orders-table">
<thead>
<tr>
- <th><?php echo __('Order #') ?></th>
- <th><?php echo __('Date') ?></th>
- <th><?php echo __('Ship To') ?></th>
- <th><span class="nobr"><?php echo __('Order Total') ?></span></th>
- <th><span class="nobr"><?php echo __('Order Status') ?></span></th>
- <th> </th>
+ <th class="col id"><?php echo __('Order #') ?></th>
+ <th class="col date"><?php echo __('Date') ?></th>
+ <th class="col shipping"><?php echo __('Ship To') ?></th>
+ <th class="col total"><?php echo __('Order Total') ?></th>
+ <th class="col status"><?php echo __('Status') ?></th>
+ <th class="col actions"> </th>
</tr>
</thead>
<tbody>
- <?php $_odd = ''; ?>
<?php foreach ($_orders as $_order): ?>
- <tr>
- <td><?php echo $_order->getRealOrderId() ?></td>
- <td><span class="nobr"><?php echo $this->formatDate($_order->getCreatedAtStoreDate()) ?></span></td>
- <td><?php echo $_order->getShippingAddress() ? $this->escapeHtml($_order->getShippingAddress()->getName()) : ' ' ?></td>
- <td><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
- <td><em><?php echo $_order->getStatusLabel() ?></em></td>
- <td class="a-center">
- <span class="nobr"><a href="<?php echo $this->getViewUrl($_order) ?>"><?php echo __('View Order') ?></a>
- <?php /*<span class="separator">|</span><a href="<?php echo $this->getTrackUrl($_order) ?>"><?php echo __('Track Order') ?></a> */ ?>
+ <tr>
+ <td class="col id"><?php echo $_order->getRealOrderId() ?></td>
+ <td class="col date"><?php echo $this->formatDate($_order->getCreatedAtStoreDate()) ?></td>
+ <td class="col shipping"><?php echo $_order->getShippingAddress() ? $this->escapeHtml($_order->getShippingAddress()->getName()) : ' ' ?></td>
+ <td class="col total"><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
+ <td class="col status"><em><?php echo $_order->getStatusLabel() ?></em></td>
+ <td class="col actions">
+ <a href="<?php echo $this->getViewUrl($_order) ?>" class="action view">
+ <span><?php echo __('View Order') ?></span>
+ </a>
<?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order)) : ?>
- <span class="separator">|</span> <a href="<?php echo $this->getReorderUrl($_order) ?>" class="link-reorder"><?php echo __('Reorder') ?></a>
- <?php endif ?>
- </span>
- </td>
- </tr>
+ <a href="<?php echo $this->getReorderUrl($_order) ?>" class="action order">
+ <span><?php echo __('Reorder') ?></span>
+ </a>
+ <?php endif ?>
+ </td>
+ </tr>
<?php endforeach; ?>
</tbody>
</table>
-<script type="text/javascript">(function($) {$('#my-orders-table').decorate('table')})(jQuery)</script>
-<?php echo $this->getPagerHtml(); ?>
+<div class="order toolbar bottom"><?php echo $this->getPagerHtml(); ?></div>
<?php else: ?>
<p><?php echo __('You have placed no orders.'); ?></p>
<?php endif ?>
diff --git a/app/code/Magento/Sales/view/frontend/order/info.phtml b/app/code/Magento/Sales/view/frontend/order/info.phtml
index 46a06098ebd..d5491807095 100644
--- a/app/code/Magento/Sales/view/frontend/order/info.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/info.phtml
@@ -19,74 +19,59 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php /** @var $this \Magento\Sales\Block\Order\Info */ ?>
<?php $_order = $this->getOrder() ?>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<div class="page-title title-buttons">
- <h1><?php echo __('Order #%1 - %2', $_order->getRealOrderId(), $_order->getStatusLabel()) ?></h1>
- <?php echo $this->getChildHtml('buttons') ?>
-</div>
-<?php echo $this->getStatusHistoryRssUrl($_order) ?>
-<dl class="order-info">
- <dt><?php echo __('About This Order:') ?></dt>
- <dd>
- <?php echo $this->getChildHtml('links') ?>
- <script type="text/javascript">(function($) {$('#order-info-tabs').find('li').decorate('generic', ['first','last'])})(jQuery)</script>
- </dd>
-</dl>
-<p class="order-date"><?php echo __('Order Date: %1', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
+<div class="order details view">
+ <strong class="order status"><?php echo $_order->getStatusLabel() ?></strong>
+ <div class="order toolbar">
+ <?php echo $this->getChildHtml('buttons') ?>
+ <?php echo $this->getStatusHistoryRssUrl($_order) ?>
+ </div>
+ <dl class="order info">
+ <dt><?php echo __('About This Order:') ?></dt>
+ <dd>
+ <?php echo $this->getChildHtml('links') ?>
+ </dd>
+ </dl>
+ <p class="order date"><?php echo __('<span class="label">Order Date:</span> %1', '<date>' . $this->formatDate($_order->getCreatedAtStoreDate(), 'long') . '</date>' ) ?></p>
<?php if (!$_order->getIsVirtual()): ?>
-<div class="col2-set order-info-box">
- <div class="col-1">
- <div class="box">
- <div class="box-title">
- <h2><?php echo __('Shipping Address') ?></h2>
- </div>
- <div class="box-content">
- <address><?php echo $_order->getShippingAddress()->format('html') ?></address>
- </div>
+ <div class="block order shipping address">
+ <div class="title"><strong><?php echo __('Shipping Address') ?></strong></div>
+ <div class="content">
+ <address><?php echo $_order->getShippingAddress()->format('html') ?></address>
</div>
</div>
- <div class="col-2">
- <div class="box">
- <div class="box-title">
- <h2><?php echo __('Shipping Method') ?></h2>
- </div>
- <div class="box-content">
- <?php if ($_order->getShippingDescription()): ?>
- <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
- <?php else: ?>
- <p><?php echo __('No shipping information available'); ?></p>
- <?php endif; ?>
- </div>
+
+ <div class="block order shipping method">
+ <div class="title"><strong><?php echo __('Shipping Method') ?></strong></div>
+ <div class="content">
+ <?php if ($_order->getShippingDescription()): ?>
+ <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
+ <?php else: ?>
+ <?php echo __('No shipping information available'); ?>
+ <?php endif; ?>
</div>
</div>
-</div>
+
<?php endif; ?>
-<div class="col2-set order-info-box">
- <div class="col-1">
- <div class="box">
- <div class="box-title">
- <h2><?php echo __('Billing Address') ?></h2>
- </div>
- <div class="box-content">
- <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
- </div>
+ <div class="block order billing address">
+ <div class="title">
+ <strong><?php echo __('Billing Address') ?></strong>
+ </div>
+ <div class="content">
+ <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
</div>
</div>
- <div class="col-2">
- <div class="box box-payment">
- <div class="box-title">
- <h2><?php echo __('Payment Method') ?></h2>
- </div>
- <div class="box-content">
- <?php echo $this->getPaymentInfoHtml() ?>
- </div>
+ <div class="block order billing method">
+ <div class="title">
+ <strong><?php echo __('Payment Method') ?></strong>
+ </div>
+ <div class="content">
+ <?php echo $this->getPaymentInfoHtml() ?>
</div>
</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/view/frontend/order/info/buttons.phtml b/app/code/Magento/Sales/view/frontend/order/info/buttons.phtml
index da314fcbd1b..345c5e73577 100644
--- a/app/code/Magento/Sales/view/frontend/order/info/buttons.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/info/buttons.phtml
@@ -19,20 +19,27 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-
-<?php $_order = $this->getOrder() ?>
-<?php if($this->helper('Magento\Rss\Helper\Order')->isStatusNotificationAllow()): ?>
- <a href="<?php echo $this->helper('Magento\Rss\Helper\Order')->getStatusHistoryRssUrl($_order) ?>" class="link-rss f-none"><?php echo __('Subscribe to Order Status') ?></a>
- <span class="separator">|</span>
-<?php endif; ?>
-<?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order)) : ?>
- <a href="<?php echo $this->getReorderUrl($_order) ?>" class="link-reorder"><?php echo __('Reorder') ?></a>
- <span class="separator">|</span>
-<?php endif ?>
-<a href="<?php echo $this->getPrintUrl($_order) ?>" class="link-print" onclick="this.target='_blank';"><?php echo __('Print Order') ?></a>
-<?php echo $this->getChildHtml(); ?>
+<div class="actions">
+ <?php $_order = $this->getOrder() ?>
+ <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order)) : ?>
+ <a class="action reorder" href="<?php echo $this->getReorderUrl($_order) ?>">
+ <span><?php echo __('Reorder') ?></span>
+ </a>
+ <?php endif ?>
+ <a class="action print"
+ href="<?php echo $this->getPrintUrl($_order) ?>"
+ onclick="this.target='_blank';">
+ <span><?php echo __('Print Order') ?></span>
+ </a>
+ <?php if($this->helper('Magento\Rss\Helper\Order')->isStatusNotificationAllow()): ?>
+ <a href="<?php echo $this->helper('Magento\Rss\Helper\Order')->getStatusHistoryRssUrl($_order) ?>"
+ class="action rss">
+ <span><?php echo __('Subscribe to Order Status') ?></span>
+ </a>
+ <?php endif; ?>
+ <?php echo $this->getChildHtml(); ?>
+</div>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/view/frontend/order/invoice.phtml b/app/code/Magento/Sales/view/frontend/order/invoice.phtml
index bef92be0054..fff36854de1 100644
--- a/app/code/Magento/Sales/view/frontend/order/invoice.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/invoice.phtml
@@ -19,14 +19,17 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<div class="order-items order-details">
+<div class="order details items invoice">
<?php echo $this->getChildHtml('invoice_items') ?>
- <div class="buttons-set">
- <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo $this->getBackTitle() ?></a></p>
+ <div class="actions">
+ <div class="secondary">
+ <a href="<?php echo $this->getBackUrl() ?>" class="action back">
+ <span><?php echo $this->getBackTitle() ?></span>
+ </a>
+ </div>
</div>
</div>
diff --git a/app/code/Magento/Sales/view/frontend/order/invoice/items.phtml b/app/code/Magento/Sales/view/frontend/order/invoice/items.phtml
index dc4c5000e89..b9be6d9379d 100644
--- a/app/code/Magento/Sales/view/frontend/order/invoice/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/invoice/items.phtml
@@ -19,29 +19,38 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php $_order = $this->getOrder() ?>
-<p class="order-links"><a href="<?php echo $this->getPrintAllInvoicesUrl($_order) ?>" onclick="this.target='_blank'" class="link-print"><?php echo __('Print All Invoices') ?></a></p>
+<?php $_order = $this->getOrder() ?>
+<div class="order toolbar">
+ <div class="actions">
+ <a href="<?php echo $this->getPrintAllInvoicesUrl($_order) ?>"
+ target="_blank"
+ class="action print">
+ <span><?php echo __('Print All Invoices') ?></span>
+ </a>
+ </div>
+</div>
<?php foreach ($_order->getInvoiceCollection() as $_invoice): ?>
-<h2 class="sub-title"><?php echo __('Invoice #') ?><?php echo $_invoice->getIncrementId(); ?> <span class="separator">|</span> <a href="<?php echo $this->getPrintInvoiceUrl($_invoice) ?>" onclick="this.target='_blank'" class="link-print"><?php echo __('Print Invoice') ?></a></h2>
-<h3 class="table-caption"><?php echo __('Items Invoiced') ?></h3>
-<table class="data-table" id="my-invoice-table-<?php echo $_invoice->getId(); ?>">
- <col />
- <col width="1" />
- <col width="1" />
- <col width="1" />
- <col width="1" />
+<div class="order title">
+ <strong><?php echo __('Invoice #') ?><?php echo $_invoice->getIncrementId(); ?></strong>
+ <a href="<?php echo $this->getPrintInvoiceUrl($_invoice) ?>"
+ onclick="this.target='_blank'"
+ class="action print">
+ <span><?php echo __('Print Invoice') ?></span>
+ </a>
+</div>
+<div class="order subtitle caption"><strong><?php echo __('Items Invoiced') ?></strong></div>
+<table class="data table order items invoice" id="my-invoice-table-<?php echo $_invoice->getId(); ?>">
<thead>
<tr>
- <th><?php echo __('Product Name') ?></th>
- <th><?php echo __('SKU') ?></th>
- <th class="a-right"><?php echo __('Price') ?></th>
- <th class="a-center"><span class="nobr"><?php echo __('Qty Invoiced') ?></span></th>
- <th class="a-right"><?php echo __('Subtotal') ?></th>
+ <th class="col name"><?php echo __('Product Name') ?></th>
+ <th class="col sku"><?php echo __('SKU') ?></th>
+ <th class="col price"><?php echo __('Price') ?></th>
+ <th class="col qty"><?php echo __('Qty Invoiced') ?></th>
+ <th class="col subtotal"><?php echo __('Subtotal') ?></th>
</tr>
</thead>
<tfoot>
@@ -56,6 +65,5 @@
</tbody>
<?php endforeach; ?>
</table>
-<script type="text/javascript">(function($) {$('#my-invoice-table-<?php echo $_invoice->getId(); ?>').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})})(jQuery)</script>
<?php echo $this->getInvoiceCommentsHtml($_invoice)?>
<?php endforeach; ?>
diff --git a/app/code/Magento/Sales/view/frontend/order/invoice/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/order/invoice/items/renderer/default.phtml
index c07b48bc77c..435ebe03f6b 100644
--- a/app/code/Magento/Sales/view/frontend/order/invoice/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/invoice/items/renderer/default.phtml
@@ -19,17 +19,17 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php $_item = $this->getItem() ?>
<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
-<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
- <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
+<tr id="order-item-row-<?php echo $_item->getId() ?>">
+ <td class="col name">
+ <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
<?php if($_options = $this->getItemOptions()): ?>
- <dl class="item-options">
+ <dl class="item options">
<?php foreach ($_options as $_option) : ?>
<dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
<?php if (!$this->getPrintStatus()): ?>
@@ -38,7 +38,7 @@
<?php echo $_formatedOptionValue['value'] ?>
<?php if (isset($_formatedOptionValue['full_view'])): ?>
<div class="truncated_full_value">
- <dl class="item-options">
+ <dl class="item options">
<dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
</dl>
@@ -57,11 +57,16 @@
<?php endif; ?>
<?php echo $this->escapeHtml($_item->getDescription()) ?>
<?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
- <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $_item->getId()?>" data-item-id="<?php echo $_item->getId()?>"><?php echo __('Gift Message') ?></a>
+ <a href="#"
+ id="order-item-gift-message-link-<?php echo $_item->getId() ?>"
+ class="action show"
+ aria-controls="order-item-gift-message-<?php echo $_item->getId()?>" data-item-id="<?php echo $_item->getId()?>">
+ <?php echo __('Gift Message') ?>
+ </a>
<?php endif; ?>
</td>
- <td><?php echo $this->escapeHtml($this->helper('Magento\Core\Helper\String')->splitInjection($this->getSku())) ?></td>
- <td class="a-right">
+ <td class="col sku"><?php echo $this->escapeHtml($this->helper('Magento\Core\Helper\String')->splitInjection($this->getSku())) ?></td>
+ <td class="col price">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
<span class="price-excl-tax">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
@@ -87,7 +92,6 @@
</span>
-
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
<span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
@@ -145,7 +149,6 @@
</span>
-
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
<span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
@@ -177,8 +180,10 @@
</span>
<?php endif; ?>
</td>
- <td class="a-center"><?php echo $_item->getQty()*1 ?> </td>
- <td class="a-right">
+ <td class="col qty">
+ <span class="qty summary"><?php echo $_item->getQty()*1 ?></span>
+ </td>
+ <td class="col subtotal">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
<span class="price-excl-tax">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
@@ -204,7 +209,6 @@
</span>
-
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
<span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
@@ -261,7 +265,6 @@
</span>
-
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
<span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
@@ -291,8 +294,6 @@
<?php endif; ?>
<?php endif; ?>
-
-
</span>
<?php endif; ?>
</td>
diff --git a/app/code/Magento/Sales/view/frontend/order/items.phtml b/app/code/Magento/Sales/view/frontend/order/items.phtml
index d7511c2d2a3..0ab62e2dc07 100644
--- a/app/code/Magento/Sales/view/frontend/order/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/items.phtml
@@ -19,26 +19,20 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php $_order = $this->getOrder() ?>
-<?php $_giftMessage = ''; ?>
-<table class="data-table" id="my-orders-table" summary="<?php echo __('Items Ordered') ?>">
- <col />
- <col width="1" />
- <col width="1" />
- <col width="1" />
- <col width="1" />
+<?php $_giftMessage; ?>
+<table class="data table order items" id="my-orders-table" summary="<?php echo __('Items Ordered') ?>">
<thead>
<tr>
- <th><?php echo __('Product Name') ?></th>
- <th><?php echo __('SKU') ?></th>
- <th class="a-right"><?php echo __('Price') ?></th>
- <th class="a-center"><?php echo __('Qty') ?></th>
- <th class="a-right"><?php echo __('Subtotal') ?></th>
+ <th class="col name"><?php echo __('Product Name') ?></th>
+ <th class="col sku"><?php echo __('SKU') ?></th>
+ <th class="col price"><?php echo __('Price') ?></th>
+ <th class="col qty"><?php echo __('Qty') ?></th>
+ <th class="col subtotal"><?php echo __('Subtotal') ?></th>
</tr>
</thead>
<tfoot>
@@ -47,31 +41,39 @@
<?php $_items = $_order->getItemsCollection(); ?>
<?php $_index = 0; ?>
<?php $_count = $_items->count(); ?>
+ <?php $_giftMessage = ''?>
<?php foreach ($_items as $_item): ?>
<?php if ($_item->getParentItem()) continue; ?>
<tbody>
<?php echo $this->getItemHtml($_item) ?>
<?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
- <tr class="border<?php echo ($_index++ > $_count ?' last':'') ?>" id="order-item-gift-message-<?php echo $_item->getId() ?>" role="region" aria-expanded="false" tabindex="-1" style="display:none;">
+ <tr id="order-item-gift-message-<?php echo $_item->getId() ?>" role="region" aria-expanded="false" tabindex="-1" style="display:none;">
<?php $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessageForEntity($_item); ?>
- <td class="gift-message-row" colspan="7">
- <a href="#" title="<?php echo __('Close') ?>" aria-controls="order-item-gift-message-<?php echo $_item->getId()?>" data-item-id="<?php echo $_item->getId()?>" class="btn-close"><?php echo __('Close') ?></a>
- <dl class="gift-message">
- <dt><strong><?php echo __('From:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?></dt>
- <dt><strong><?php echo __('To:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?></dt>
- <dd><?php echo $this->helper('Magento\GiftMessage\Helper\Message')->getEscapedGiftMessage($_item) ?></dd>
- </dl>
+ <td class="col message" colspan="7">
+ <div class="gift message details">
+ <a href="#"
+ title="<?php echo __('Close') ?>"
+ aria-controls="order-item-gift-message-<?php echo $_item->getId()?>"
+ data-item-id="<?php echo $_item->getId()?>"
+ class="action close">
+ <?php echo __('Close') ?>
+ </a>
+ <dl class="gift message">
+ <dt class="gift sender"><strong class="label"><?php echo __('From:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?></dt>
+ <dt class="gift recipient"><strong class="label"><?php echo __('To:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?></dt>
+ <dd class="message text"><?php echo $this->helper('Magento\GiftMessage\Helper\Message')->getEscapedGiftMessage($_item) ?></dd>
+ </dl>
+ </div>
</td>
</tr>
<?php endif ?>
</tbody>
<?php endforeach; ?>
</table>
-<script type="text/javascript">jQuery('#my-orders-table').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})</script>
<?php if ($_giftMessage): ?>
<script type="text/javascript">
head.js("<?php echo $this->getViewFileUrl('Magento_Sales::gift-message.js')?>", function() {
- jQuery('a.gift-message-link').add('a.btn-close').giftMessage();
+ jQuery('a.action.show').add('a.action.close').giftMessage();
});
</script>
-<?php endif ?>
+<?php endif; ?>
diff --git a/app/code/Magento/Sales/view/frontend/order/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/order/items/renderer/default.phtml
index f527029e49e..70a7964512e 100644
--- a/app/code/Magento/Sales/view/frontend/order/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/items/renderer/default.phtml
@@ -19,16 +19,16 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php $_item = $this->getItem() ?>
-<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
- <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3>
+<tr id="order-item-row-<?php echo $_item->getId() ?>">
+ <td class="col name">
+ <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
<?php if($_options = $this->getItemOptions()): ?>
- <dl class="item-options">
+ <dl class="item options">
<?php foreach ($_options as $_option) : ?>
<dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
<?php if (!$this->getPrintStatus()): ?>
@@ -37,7 +37,7 @@
<?php echo $_formatedOptionValue['value'] ?>
<?php if (isset($_formatedOptionValue['full_view'])): ?>
<div class="truncated_full_value">
- <dl class="item-options">
+ <dl class="item options">
<dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
</dl>
@@ -58,11 +58,17 @@
<?php endif; ?>
<?php echo $this->escapeHtml($_item->getDescription()) ?>
<?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
- <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $_item->getId()?>" data-item-id="<?php echo $_item->getId()?>"><?php echo __('Gift Message') ?></a>
+ <a href="#"
+ id="order-item-gift-message-link-<?php echo $_item->getId() ?>"
+ class="action show"
+ aria-controls="order-item-gift-message-<?php echo $_item->getId()?>"
+ data-item-id="<?php echo $_item->getId()?>">
+ <?php echo __('Gift Message') ?>
+ </a>
<?php endif; ?>
</td>
- <td><?php echo $this->escapeHtml($this->helper('Magento\Core\Helper\String')->splitInjection($this->getSku())) ?></td>
- <td class="a-right">
+ <td class="col sku"><?php echo $this->escapeHtml($this->helper('Magento\Core\Helper\String')->splitInjection($this->getSku())) ?></td>
+ <td class="col price">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
<span class="price-excl-tax">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
@@ -85,10 +91,8 @@
<?php else: ?>
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
<?php endif; ?>
-
</span>
-
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
<span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
@@ -118,7 +122,6 @@
<?php endif; ?>
<?php endif; ?>
</span>
- <br />
<?php endif; ?>
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
<span class="price-incl-tax">
@@ -137,16 +140,13 @@
<?php else: ?>
<span class="cart-price">
<?php endif; ?>
-
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
<?php else: ?>
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
<?php endif; ?>
-
</span>
-
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
<span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
@@ -178,23 +178,23 @@
</span>
<?php endif; ?>
</td>
- <td class="a-right">
- <span class="nobr">
- <?php if ($this->getItem()->getQtyOrdered() > 0): ?>
- <?php echo __('Ordered'); ?>: <strong><?php echo $this->getItem()->getQtyOrdered()*1 ?></strong><br />
+ <td class="col qty">
+ <ul class="qty summary items">
+ <?php if ($this->getItem()->getQtyOrdered() > 0): ?>
+ <li class="item"><span class="label"><?php echo __('Ordered'); ?></span><strong><?php echo $this->getItem()->getQtyOrdered()*1 ?></strong></li>
<?php endif; ?>
<?php if ($this->getItem()->getQtyShipped() > 0): ?>
- <?php echo __('Shipped'); ?>: <strong><?php echo $this->getItem()->getQtyShipped()*1 ?></strong><br />
+ <li class="item"><span class="label"><?php echo __('Shipped'); ?></span><strong><?php echo $this->getItem()->getQtyShipped()*1 ?></strong></li>
<?php endif; ?>
<?php if ($this->getItem()->getQtyCanceled() > 0): ?>
- <?php echo __('Canceled'); ?>: <strong><?php echo $this->getItem()->getQtyCanceled()*1 ?></strong><br />
+ <li class="item"><span class="label"><?php echo __('Canceled'); ?></span><strong><?php echo $this->getItem()->getQtyCanceled()*1 ?></strong></li>
<?php endif; ?>
<?php if ($this->getItem()->getQtyRefunded() > 0): ?>
- <?php echo __('Refunded'); ?>: <strong><?php echo $this->getItem()->getQtyRefunded()*1 ?></strong><br />
+ <li class="item"><span class="label"><?php echo __('Refunded'); ?></span><strong><?php echo $this->getItem()->getQtyRefunded()*1 ?></strong></li>
<?php endif; ?>
- </span>
+ </ul>
</td>
- <td class="a-right">
+ <td class="col subtotal">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
<span class="price-excl-tax">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
@@ -211,16 +211,13 @@
<?php else: ?>
<span class="cart-price">
<?php endif; ?>
-
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
<?php else: ?>
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
<?php endif; ?>
-
</span>
-
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
<span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
@@ -274,10 +271,8 @@
<?php else: ?>
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
<?php endif; ?>
-
</span>
-
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
<span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
@@ -306,18 +301,15 @@
</span>
<?php endif; ?>
<?php endif; ?>
-
-
-
</span>
<?php endif; ?>
</td>
- <!--
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
+
+ <?php /* if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
<th class="a-right"><?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?></th>
<?php endif; ?>
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
<th class="a-right"><?php echo $this->getOrder()->formatPrice($this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem())); ?></th>
- <?php endif; ?>
- -->
+ <?php endif; */ ?>
+
</tr>
diff --git a/app/code/Magento/Sales/view/frontend/order/print.phtml b/app/code/Magento/Sales/view/frontend/order/print.phtml
index 41323417d0f..9cc814cfd83 100644
--- a/app/code/Magento/Sales/view/frontend/order/print.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/print.phtml
@@ -19,67 +19,76 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php $_order = $this->getOrder() ?>
-<h1><?php echo __('Order #%1', $_order->getRealOrderId()) ?></h1>
+<div class="page title">
+ <h1 class="title"><?php echo __('Order #%1', $_order->getRealOrderId()) ?></h1>
+</div>
<p class="order-date"><?php echo __('Order Date: %1', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
-<div class="col2-set">
+
+<div class="order details view">
+ <div class="block order shipping address">
+ <div class="title">
+ <strong><?php echo __('Shipping Address') ?></strong>
+ </div>
+ <div class="content">
+ <address><?php echo $_order->getShippingAddress()->format('html') ?></address>
+ </div>
+ </div>
+ <div class="block order billing address">
+ <div class="title">
+ <strong><?php echo __('Billing Address') ?></strong>
+ </div>
+ <div class="content">
+ <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
+ </div>
+ </div>
<?php if (!$_order->getIsVirtual()): ?>
- <div class="col-1">
- <h2><?php echo __('Shipping Address') ?></h2>
- <address><?php echo $_order->getShippingAddress()->format('html') ?></address>
+ <div class="block order shipping method">
+ <div class="title">
+ <strong><?php echo __('Shipping Method') ?></strong>
+ </div>
+ <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
</div>
- <div class="col-2">
- <?php else: ?>
- <div class="col-1">
<?php endif; ?>
- <h2><?php echo __('Billing Address') ?></h2>
- <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
+ <div class="block order shipping">
+ <div class="title">
+ <strong><?php echo __('Payment Method') ?></strong>
+ </div>
+ <div class="content">
+ <?php echo $this->getPaymentInfoHtml() ?>
+ </div>
</div>
-<?php if (!$_order->getIsVirtual()): ?>
</div>
-<div class="col2-set">
- <div class="col-1">
- <h2><?php echo __('Shipping Method') ?></h2>
- <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
+
+<div class="order details items">
+ <div class="order subtitle caption">
+ <strong><?php echo __('Items Ordered') ?></strong>
</div>
-<?php endif; ?>
- <div class="col-2">
- <h2><?php echo __('Payment Method') ?></h2>
- <?php echo $this->getPaymentInfoHtml() ?>
- </div>
-</div>
-<h2><?php echo __('Items Ordered') ?></h2>
-<table class="data-table" id="my-orders-table">
- <col />
- <col width="1" />
- <col width="1" />
- <col width="1" />
- <col width="1" />
- <thead>
+ <table class="data table order items" id="my-orders-table">
+ <thead>
<tr>
- <th><?php echo __('Product Name') ?></th>
- <th><?php echo __('SKU') ?></th>
- <th class="a-right"><?php echo __('Price') ?></th>
- <th class="a-center"><?php echo __('Qty') ?></th>
- <th class="a-right"><?php echo __('Subtotal') ?></th>
+ <th class="col name"><?php echo __('Product Name') ?></th>
+ <th class="col sku"><?php echo __('SKU') ?></th>
+ <th class="col price"><?php echo __('Price') ?></th>
+ <th class="col qty"><?php echo __('Qty') ?></th>
+ <th class="col subtotal"><?php echo __('Subtotal') ?></th>
</tr>
- </thead>
- <tfoot>
+ </thead>
+ <tfoot>
<?php echo $this->getChildHtml('order_totals') ?>
- </tfoot>
- <?php $_items = $_order->getItemsCollection(); ?>
- <?php $_count = $_items->count(); ?>
- <?php foreach ($_items as $_item): ?>
- <?php if ($_item->getParentItem()) continue; ?>
- <tbody>
- <?php echo $this->getItemHtml($_item) ?>
- </tbody>
+ </tfoot>
+ <?php $_items = $_order->getItemsCollection(); ?>
+ <?php $_count = $_items->count(); ?>
+ <?php foreach ($_items as $_item): ?>
+ <?php if ($_item->getParentItem()) continue; ?>
+ <tbody>
+ <?php echo $this->getItemHtml($_item) ?>
+ </tbody>
<?php endforeach; ?>
-</table>
-<script type="text/javascript">(function($) {$('#my-orders-table').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})})(jQuery)</script>
+ </table>
+</div>
<script type="text/javascript">window.print();</script>
diff --git a/app/code/Magento/Sales/view/frontend/order/print/creditmemo.phtml b/app/code/Magento/Sales/view/frontend/order/print/creditmemo.phtml
index ceba0157c74..9a8ad487db3 100644
--- a/app/code/Magento/Sales/view/frontend/order/print/creditmemo.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/print/creditmemo.phtml
@@ -25,8 +25,10 @@
*/
?>
<?php $_order = $this->getOrder() ?>
-<h1><?php echo __('Order #%1', $_order->getRealOrderId()) ?></h1>
-<p class="order-date"><?php echo __('Order Date: %1', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
+<div class="page title">
+ <h1 class="title"><?php echo __('Order #%1', $_order->getRealOrderId()) ?></h1>
+</div>
+<p class="order date"><?php echo __('Order Date: %1', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
<?php $_creditmemo = $this->getCreditmemo() ?>
<?php if($_creditmemo): ?>
<?php $_creditmemos = array($_creditmemo); ?>
@@ -34,65 +36,81 @@
<?php $_creditmemos = $_order->getCreditmemosCollection() ?>
<?php endif; ?>
<?php foreach ($_creditmemos as $_creditmemo): ?>
- <h2 class="h2"><?php echo __('Refund #%1', $_creditmemo->getIncrementId()) ?></h2>
- <div class="col2-set">
- <div class="col-1">
+ <div class="order details view">
+ <div class="title">
+ <strong><?php echo __('Refund #%1', $_creditmemo->getIncrementId()) ?></strong>
+ </div>
+
+ <div class="block order shipping address">
<?php if (!$_order->getIsVirtual()): ?>
- <h3><?php echo __('Shipping Address') ?></h3>
- <?php $_shipping = $_creditmemo->getShippingAddress() ?>
- <address><?php echo $_shipping->format('html') ?></address>
+ <div class="title">
+ <strong><?php echo __('Shipping Address') ?></strong>
+ </div>
+ <div class="content">
+ <?php $_shipping = $_creditmemo->getShippingAddress() ?>
+ <address><?php echo $_shipping->format('html') ?></address>
+ </div>
</div>
- <div class="col-2">
+
+ <div class="block order billing address">
<?php endif; ?>
- <h3><?php echo __('Billing Address') ?></h3>
- <?php $_billing = $_creditmemo->getbillingAddress() ?>
- <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
+ <div class="title">
+ <strong><?php echo __('Billing Address') ?></strong>
+ </div>
+ <div class="content">
+ <?php $_billing = $_creditmemo->getbillingAddress() ?>
+ <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
+ </div>
</div>
- <?php if (!$_order->getIsVirtual()): ?>
- </div>
- <div class="col2-set">
- <div class="col-1">
- <h3><?php echo __('Shipping Method') ?></h3>
- <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
+
+ <?php if (!$_order->getIsVirtual()): ?>
+ <div class="block order shipping method">
+ <div class="title">
+ <strong><?php echo __('Shipping Method') ?></strong>
+ </div>
+ <div class="content">
+ <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
+ </div>
</div>
<?php endif; ?>
- <div class="col-2">
- <h3><?php echo __('Payment Method') ?></h3>
- <?php echo $this->getPaymentInfoHtml() ?>
+ <div class="block order payment method">
+ <div class="title">
+ <strong><?php echo __('Payment Method') ?></strong>
+ </div>
+ <div class="content">
+ <?php echo $this->getPaymentInfoHtml() ?>
+ </div>
+ </div>
+
+ </div>
+ <div class="order details items">
+ <div class="order subtitle caption">
+ <strong><?php echo __('Items Refunded') ?></strong>
</div>
+ <table class="data table order items" id="my-refund-table-<?php echo $_creditmemo->getId(); ?>">
+ <thead>
+ <tr>
+ <th class="col name"><?php echo __('Product Name') ?></th>
+ <th class="col sku"><?php echo __('SKU') ?></th>
+ <th class="col price"><?php echo __('Price') ?></th>
+ <th class="col qty"><?php echo __('Qty') ?></th>
+ <th class="col subtotal"><?php echo __('Subtotal') ?></th>
+ <th class="col discount"><?php echo __('Discount Amount') ?></th>
+ <th class="col rowtotal"><?php echo __('Row Total') ?></th>
+ </tr>
+ </thead>
+ <tfoot>
+ <?php echo $this->getTotalsHtml($_creditmemo);?>
+ </tfoot>
+ <?php $_items = $_creditmemo->getAllItems(); ?>
+ <?php $_count = count($_items); ?>
+ <?php foreach ($_items as $_item): ?>
+ <?php if ($_item->getOrderItem()->getParentItem()) continue; ?>
+ <tbody>
+ <?php echo $this->getItemHtml($_item) ?>
+ </tbody>
+ <?php endforeach; ?>
+ </table>
</div>
- <h3><?php echo __('Items Refunded') ?></h3>
- <table class="data-table" id="my-refund-table-<?php echo $_creditmemo->getId(); ?>">
- <col />
- <col width="1" />
- <col width="1" />
- <col width="1" />
- <col width="1" />
- <col width="1" />
- <col width="1" />
- <thead>
- <tr>
- <th><?php echo __('Product Name') ?></th>
- <th><?php echo __('SKU') ?></th>
- <th class="a-right"><?php echo __('Price') ?></th>
- <th class="a-center"><?php echo __('Qty') ?></th>
- <th class="a-right"><?php echo __('Subtotal') ?></th>
- <th class="a-center wrap"><?php echo __('Discount Amount') ?></th>
- <th class="a-center wrap"><?php echo __('Row Total') ?></th>
- </tr>
- </thead>
- <tfoot>
- <?php echo $this->getTotalsHtml($_creditmemo);?>
- </tfoot>
- <?php $_items = $_creditmemo->getAllItems(); ?>
- <?php $_count = count($_items); ?>
- <?php foreach ($_items as $_item): ?>
- <?php if ($_item->getOrderItem()->getParentItem()) continue; ?>
- <tbody>
- <?php echo $this->getItemHtml($_item) ?>
- </tbody>
- <?php endforeach; ?>
-</table>
-<script type="text/javascript">(function($) {$('#my-refund-table-<?php echo $_creditmemo->getId(); ?>').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})})(jQuery)</script>
<?php endforeach; ?>
<script type="text/javascript">window.print();</script>
diff --git a/app/code/Magento/Sales/view/frontend/order/print/invoice.phtml b/app/code/Magento/Sales/view/frontend/order/print/invoice.phtml
index 58817c4e8b4..c839020ce63 100644
--- a/app/code/Magento/Sales/view/frontend/order/print/invoice.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/print/invoice.phtml
@@ -25,57 +25,75 @@
*/
?>
<?php $_order = $this->getOrder() ?>
-<h1><?php echo __('Order #%1', $_order->getRealOrderId()) ?></h1>
-<p class="order-date"><?php echo __('Order Date: %1', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
+<div class="page title">
+ <h1 class="title"><?php echo __('Order #%1', $_order->getRealOrderId()) ?></h1>
+</div>
+<p class="order date"><?php echo __('Order Date: %1', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
<?php $_invoice = $this->getInvoice() ?>
-<?php if($_invoice): ?>
- <?php $_invoices = array($_invoice); ?>
+<?php if ($_invoice): ?>
+<?php $_invoices = array($_invoice); ?>
<?php else: ?>
- <?php $_invoices = $_order->getInvoiceCollection() ?>
+<?php $_invoices = $_order->getInvoiceCollection() ?>
<?php endif; ?>
<?php foreach ($_invoices as $_invoice): ?>
- <h2 class="h2"><?php echo __('Invoice #%1', $_invoice->getIncrementId()) ?></h2>
- <div class="col2-set">
- <div class="col-1">
- <?php if (!$_order->getIsVirtual()): ?>
- <h3><?php echo __('Shipping Address') ?></h3>
+<div class="order details view">
+ <div class="title">
+ <strong><?php echo __('Invoice #%1', $_invoice->getIncrementId()) ?></strong>
+ </div>
+
+ <div class="block order shipping address">
+ <?php if (!$_order->getIsVirtual()): ?>
+ <div class="title">
+ <strong><?php echo __('Shipping Address') ?></strong>
+ </div>
+ <div class="content">
<?php $_shipping = $_invoice->getShippingAddress() ?>
<address><?php echo $_shipping->format('html') ?></address>
</div>
- <div class="col-2">
+ </div>
+ <div class="block order billing address">
<?php endif; ?>
- <h3><?php echo __('Billing Address') ?></h3>
+ <div class="title">
+ <strong><?php echo __('Billing Address') ?></strong>
+ </div>
+ <div class="content">
<?php $_billing = $_invoice->getbillingAddress() ?>
<address><?php echo $_order->getBillingAddress()->format('html') ?></address>
</div>
- <?php if (!$_order->getIsVirtual()): ?>
</div>
- <div class="col2-set">
- <div class="col-1">
- <h3><?php echo __('Shipping Method') ?></h3>
- <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
+ <?php if (!$_order->getIsVirtual()): ?>
+
+ <div class="block order shipping method">
+ <div class="title">
+ <strong><?php echo __('Shipping Method') ?></strong>
</div>
- <?php endif; ?>
- <div class="col-2">
- <h3><?php echo __('Payment Method') ?></h3>
+ <div class="content">
+ <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
+ </div>
+ </div>
+ <?php endif; ?>
+ <div class="block order payment method">
+ <div class="title">
+ <strong><?php echo __('Payment Method') ?></strong>
+ </div>
+ <div class="content">
<?php echo $this->getPaymentInfoHtml() ?>
</div>
</div>
- <h3><?php echo __('Items Invoiced') ?></h3>
- <table class="data-table" id="my-invoice-table-<?php echo $_invoice->getId(); ?>">
- <col />
- <col width="1" />
- <col width="1" />
- <col width="1" />
- <col width="1" />
+</div>
+<div class="order details items">
+ <div class="order subtitle caption">
+ <strong><?php echo __('Items Invoiced') ?></strong>
+ </div>
+ <table class="data table order items" id="my-invoice-table-<?php echo $_invoice->getId(); ?>">
<thead>
- <tr>
- <th><?php echo __('Product Name') ?></th>
- <th><?php echo __('SKU') ?></th>
- <th class="a-right"><?php echo __('Price') ?></th>
- <th class="a-center"><span class="nobr"><?php echo __('Qty Invoiced') ?></span></th>
- <th class="a-right"><?php echo __('Subtotal') ?></th>
- </tr>
+ <tr>
+ <th class="col name"><?php echo __('Product Name') ?></th>
+ <th class="col sku"><?php echo __('SKU') ?></th>
+ <th class="col price"><?php echo __('Price') ?></th>
+ <th class="col qty"><span class="nobr"><?php echo __('Qty Invoiced') ?></span></th>
+ <th class="col subtotal"><?php echo __('Subtotal') ?></th>
+ </tr>
</thead>
<tfoot>
<?php echo $this->getInvoiceTotalsHtml($_invoice)?>
@@ -89,6 +107,6 @@
</tbody>
<?php endforeach; ?>
</table>
- <script type="text/javascript">(function($) {$('#my-invoice-table-<?php echo $_invoice->getId(); ?>').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})})(jQuery)</script>
+</div>
<?php endforeach; ?>
<script type="text/javascript">window.print();</script>
diff --git a/app/code/Magento/Sales/view/frontend/order/print/shipment.phtml b/app/code/Magento/Sales/view/frontend/order/print/shipment.phtml
index b42a54d939e..6053d40cf7d 100644
--- a/app/code/Magento/Sales/view/frontend/order/print/shipment.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/print/shipment.phtml
@@ -19,79 +19,101 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php /* @var $this \Magento\Sales\Block\Order\Print\Shipment */?>
+<?php /* @var $this \Magento\Sales\Block\Order\PrintOrder\Shipment */ ?>
<?php $order = $this->getOrder(); ?>
-<h1><?php echo __('Order #%1', $this->getObjectData($order, 'real_order_id')); ?></h1>
+<div class="page title">
+ <h1 class="title">
+ <?php echo __('Order #%1', $this->getObjectData($order, 'real_order_id')); ?>
+ </h1>
+</div>
<p class="order-date"><?php echo __('Order Date: %1', $this->formatDate($this->getObjectData($order, 'created_at_store_date'), 'long')) ?></p>
<?php if (!$this->getObjectData($order, 'is_virtual')): ?>
<?php foreach ($this->getShipmentsCollection() as $shipment): ?>
- <h2 class="h2"><?php echo __('Shipment #%1', $this->getObjectData($shipment, 'increment_id')); ?></h2>
- <div class="col2-set">
- <div class="col-1">
- <h3><?php echo __('Shipping Address') ?></h3>
- <address><?php echo $this->getShipmentAddressFormattedHtml($shipment); ?></address>
+ <div class="order details view">
+ <div class="title">
+ <strong><?php echo __('Shipment #%1', $this->getObjectData($shipment, 'increment_id')); ?></strong>
</div>
- <div class="col-2">
- <h3><?php echo __('Billing Address') ?></h3>
- <address><?php echo $this->getBillingAddressFormattedHtml($order); ?></address>
+
+ <div class="block order shipping address">
+ <div class="title">
+ <strong><?php echo __('Shipping Address') ?></strong>
+ </div>
+ <div class="content">
+ <address><?php echo $this->getShipmentAddressFormattedHtml($shipment); ?></address>
+ </div>
</div>
- </div>
- <div class="col2-set">
- <div class="col-1">
- <h3><?php echo __('Shipping Method') ?></h3>
- <?php echo $this->escapeHtml($this->getObjectData($order, 'shipping_description')); ?>
- <?php $tracks = $this->getShipmentTracks($shipment);
- if ($tracks): ?>
- <table class="data-table" id="my-shipment-tracking">
- <col />
- <col />
+
+ <div class="block order billing address">
+ <div class="title">
+ <strong><?php echo __('Billing Address') ?></strong>
+ </div>
+ <div class="content">
+ <address><?php echo $this->getBillingAddressFormattedHtml($order); ?></address>
+ </div>
+ </div>
+
+ <div class="block order shipping method">
+ <div class="title">
+ <strong><?php echo __('Shipping Method') ?></strong>
+ </div>
+ <?php echo $this->escapeHtml($this->getObjectData($order, 'shipping_description')); ?>
+ <?php $tracks = $this->getShipmentTracks($shipment);
+ if ($tracks): ?>
+ <table class="data table order tracking" id="my-shipment-tracking">
<thead>
- <tr>
- <th><?php echo __('Title')?></th>
- <th><?php echo __('Number')?></th>
- </tr>
+ <tr>
+ <th class="col label"><?php echo __('Title')?></th>
+ <th class="col number"><?php echo __('Number')?></th>
+ </tr>
</thead>
<tbody>
<?php foreach ($tracks as $track): ?>
- <tr>
- <td><?php echo $this->escapeHtml($this->getObjectData($track, 'title')); ?></td>
- <td><?php echo $this->escapeHtml($this->getObjectData($track, 'number')); ?></td>
- </tr>
+ <tr>
+ <td class="col label"><?php echo $this->escapeHtml($this->getObjectData($track, 'title')); ?></td>
+ <td class="col number"><?php echo $this->escapeHtml($this->getObjectData($track, 'number')); ?></td>
+ </tr>
<?php endforeach; ?>
</tbody>
</table>
- <script type="text/javascript">(function($) {$('#my-shipment-tracking').decorate('table')})(jQuery)</script>
<?php endif; ?>
</div>
- <div class="col-2">
- <h3><?php echo __('Payment Method') ?></h3>
- <?php echo $this->getPaymentInfoHtml() ?>
+
+ <div class="block order payment method">
+ <div class="title">
+ <strong><?php echo __('Payment Method') ?></strong>
+ </div>
+ <div class="content">
+ <?php echo $this->getPaymentInfoHtml() ?>
+ </div>
</div>
+
</div>
- <h3><?php echo __('Items Shipped') ?></h3>
- <table class="data-table" id="my-shipment-table-<?php echo $this->getObjectData($shipment, 'id') ?>">
- <col />
- <col width="1" />
- <col width="1" />
- <thead>
+ <div class="order details items">
+ <div class="order subtitle caption">
+ <strong><?php echo __('Items Shipped') ?></strong>
+ </div>
+ <table class="data table order items" id="my-shipment-table-<?php echo $this->getObjectData($shipment, 'id') ?>">
+ <thead>
<tr>
- <th><?php echo __('Product Name') ?></th>
- <th><?php echo __('SKU') ?></th>
- <th class="a-center"><span class="nobr"><?php echo __('Qty Shipped') ?></span></th>
+ <th class="col name"><?php echo __('Product Name') ?></th>
+ <th class="col sku"><?php echo __('SKU') ?></th>
+ <th class="col price"><span class="nobr"><?php echo __('Qty Shipped') ?></span></th>
</tr>
- </thead>
- <?php foreach ($this->getShipmentItems($shipment) as $item): ?>
- <tbody>
- <?php echo $this->getItemHtml($item) ?>
- </tbody>
- <?php endforeach; ?>
- </table>
- <script type="text/javascript">(function($) {$('#my-shipment-table-<?php echo $this->getObjectData($shipment, 'id')?>').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})})(jQuery)</script>
-<?php endforeach; ?>
+ </thead>
+ <?php foreach ($this->getShipmentItems($shipment) as $item): ?>
+ <tbody>
+ <?php echo $this->getItemHtml($item) ?>
+ </tbody>
+ <?php endforeach; ?>
+ </table>
+ </div>
+ <script type="text/javascript">(function ($) {
+ $('#my-shipment-table-<?php echo $this->getObjectData($shipment, 'id')?>').decorate('table', {'tbody':['odd', 'even'], 'tbody tr':['first', 'last']})
+ })(jQuery)</script>
+ <?php endforeach; ?>
<?php endif; ?>
<script type="text/javascript">window.print();</script>
diff --git a/app/code/Magento/Sales/view/frontend/order/recent.phtml b/app/code/Magento/Sales/view/frontend/order/recent.phtml
index 4fb37abf552..35af465a6a1 100644
--- a/app/code/Magento/Sales/view/frontend/order/recent.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/recent.phtml
@@ -19,57 +19,58 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<div class="box-account box-recent">
+<div class="block dashboard orders">
<?php $_orders = $this->getOrders(); ?>
- <div class="box-head">
- <h2><?php echo __('Recent Orders') ?></h2>
- <?php if( sizeof($_orders->getItems()) > 0 ): ?><a href="<?php echo $this->getUrl('sales/order/history') ?>"><?php echo __('View All') ?></a><?php endif; ?>
+ <div class="order title">
+ <strong><?php echo __('Recent Orders') ?></strong>
+ <?php if( sizeof($_orders->getItems()) > 0 ): ?>
+ <a class="action view" href="<?php echo $this->getUrl('sales/order/history') ?>">
+ <span><?php echo __('View All') ?></span>
+ </a>
+ <?php endif; ?>
</div>
-<?php if( sizeof($_orders->getItems()) > 0 ): ?>
- <table class="data-table" id="my-orders-table">
- <col width="1" />
- <col width="1" />
- <col />
- <col width="1" />
- <col width="1" />
- <col width="1" />
- <thead>
- <tr>
- <th><?php echo __('Order #') ?></th>
- <th><?php echo __('Date') ?></th>
- <th><?php echo __('Ship To') ?></th>
- <th><span class="nobr"><?php echo __('Order Total') ?></span></th>
- <th><?php echo __('Status') ?></th>
- <th> </th>
- </tr>
- </thead>
- <tbody>
- <?php foreach ($_orders as $_order): ?>
+ <div class="content">
+ <?php echo $this->getChildHtml()?>
+ <?php if( sizeof($_orders->getItems()) > 0 ): ?>
+ <table class="data table orders recent" id="my-orders-table">
+ <thead>
<tr>
- <td><?php echo $_order->getRealOrderId() ?></td>
- <td><span class="nobr"><?php echo $this->formatDate($_order->getCreatedAtStoreDate()) ?></span></td>
- <td><?php echo $_order->getShippingAddress() ? $this->escapeHtml($_order->getShippingAddress()->getName()) : ' ' ?></td>
- <td><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
- <td><em><?php echo $_order->getStatusLabel() ?></em></td>
- <td class="a-center">
- <span class="nobr">
- <a href="<?php echo $this->getViewUrl($_order) ?>"><?php echo __('View Order') ?></a>
- <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order)) : ?>
- <span class="separator">|</span> <a href="<?php echo $this->getReorderUrl($_order) ?>" class="link-reorder"><?php echo __('Reorder') ?></a>
- <?php endif ?>
- </span>
- </td>
+ <th class="col id"><?php echo __('Order #') ?></th>
+ <th class="col date"><?php echo __('Date') ?></th>
+ <th class="col shipping"><?php echo __('Ship To') ?></th>
+ <th class="col total"><?php echo __('Order Total') ?></th>
+ <th class="col status"><?php echo __('Status') ?></th>
+ <th class="col actions"> </th>
</tr>
- <?php endforeach; ?>
- </tbody>
- </table>
- <script type="text/javascript">(function($) {$('#my-orders-table').decorate('table')})(jQuery)</script>
-<?php else: ?>
- <p><?php echo __('You have placed no orders.'); ?></p>
-<?php endif; ?>
+ </thead>
+ <tbody>
+ <?php foreach ($_orders as $_order): ?>
+ <tr>
+ <td class="col id"><?php echo $_order->getRealOrderId() ?></td>
+ <td class="col date"><?php echo $this->formatDate($_order->getCreatedAtStoreDate()) ?></td>
+ <td class="col shipping"><?php echo $_order->getShippingAddress() ? $this->escapeHtml($_order->getShippingAddress()->getName()) : ' ' ?></td>
+ <td class="col total"><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
+ <td class="col status"><em><?php echo $_order->getStatusLabel() ?></em></td>
+ <td class="col actions">
+ <a href="<?php echo $this->getViewUrl($_order) ?>" class="action view">
+ <span><?php echo __('View Order') ?></span>
+ </a>
+ <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order)) : ?>
+ <a href="<?php echo $this->getReorderUrl($_order) ?>" class="action order">
+ <span><?php echo __('Reorder') ?></span>
+ </a>
+ <?php endif ?>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ <?php else: ?>
+ <p class="empty"><?php echo __('You have placed no orders.'); ?></p>
+ <?php endif; ?>
+ </div>
</div>
diff --git a/app/code/Magento/Sales/view/frontend/order/shipment.phtml b/app/code/Magento/Sales/view/frontend/order/shipment.phtml
index b6237c8c2f4..191012ded18 100644
--- a/app/code/Magento/Sales/view/frontend/order/shipment.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/shipment.phtml
@@ -19,14 +19,17 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<div class="order-items order-details">
+<div class="order items details shipments">
<?php echo $this->getChildHtml('shipment_items') ?>
- <div class="buttons-set">
- <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo $this->getBackTitle() ?></a></p>
+ <div class="actions">
+ <div class="secondary">
+ <a href="<?php echo $this->getBackUrl() ?>" class="action back">
+ <span><?php echo $this->getBackTitle() ?></span>
+ </a>
+ </div>
</div>
</div>
diff --git a/app/code/Magento/Sales/view/frontend/order/shipment/items.phtml b/app/code/Magento/Sales/view/frontend/order/shipment/items.phtml
index 2f9c3b96527..c3a54e80093 100644
--- a/app/code/Magento/Sales/view/frontend/order/shipment/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/shipment/items.phtml
@@ -19,32 +19,49 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php $_order = $this->getOrder() ?>
-<p class="order-links">
- <?php if ($_order->getTracksCollection()->count()) : ?>
- <a href="#" data-mage-init="{popupWindow: {windowURL:'<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_order) ?>',windowName:'trackorder',width:800,height:600,top:0,left:0,resizable:1,scrollbars:1}}" title="<?php echo __('Track all shipment(s)') ?>"><?php echo __('Track all shipments') ?></a> <span class="separator">|</span>
- <?php endif; ?>
- <a href="<?php echo $this->getPrintAllShipmentsUrl($_order) ?>" onclick="this.target='_blank'" class="link-print"><?php echo __('Print All Shipments') ?></a>
-</p>
+<div class="order toolbar">
+ <div class="actions">
+ <?php if ($_order->getTracksCollection()->count()) : ?>
+ <a href="#"
+ data-mage-init="{popupWindow: {windowURL:'<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_order) ?>',windowName:'trackorder',width:800,height:600,top:0,left:0,resizable:1,scrollbars:1}}" title="<?php echo __('Track all shipment(s)') ?>"
+ class="action track">
+ <span><?php echo __('Track all shipments') ?></span>
+ </a>
+ <?php endif; ?>
+ <a href="<?php echo $this->getPrintAllShipmentsUrl($_order) ?>"
+ onclick="this.target='_blank'"
+ class="action print">
+ <span><?php echo __('Print All Shipments') ?></span>
+ </a>
+ </div>
+</div>
<?php foreach ($_order->getShipmentsCollection() as $_shipment): ?>
-<h2 class="sub-title"><?php echo __('Shipment #') ?><?php echo $_shipment->getIncrementId(); ?> <span class="separator">|</span> <a href="<?php echo $this->getPrintShipmentUrl($_shipment) ?>" onclick="this.target='_blank'" class="link-print"><?php echo __('Print Shipment') ?></a></h2>
+<div class="order title">
+ <strong><?php echo __('Shipment #') ?><?php echo $_shipment->getIncrementId(); ?></strong>
+ <a href="<?php echo $this->getPrintShipmentUrl($_shipment) ?>"
+ onclick="this.target='_blank'"
+ class="action print">
+ <span><?php echo __('Print Shipment') ?></span
+ </a>
+ <a href="#"
+ data-mage-init="{popupWindow: {windowURL:'<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_shipment) ?>',windowName:'trackshipment',width:800,height:600,top:0,left:0,resizable:1,scrollbars:1}}"
+ title="<?php echo __('Track this shipment') ?>"
+ class="action track">
+ <span><?php echo __('Track this shipment') ?></span>
+ </a>
+</div>
<?php $tracks = $_shipment->getTracksCollection(); ?>
<?php if ($tracks->count()): ?>
- <table class="data-table tracking-table" id="my-tracking-table-<?php echo $_shipment->getId(); ?>">
+ <table class="data table order tracking" id="my-tracking-table-<?php echo $_shipment->getId(); ?>">
<tbody>
<tr>
- <td colspan="2">
- <a href="#" data-mage-init="{popupWindow: {windowURL:'<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_shipment) ?>',windowName:'trackshipment',width:800,height:600,top:0,left:0,resizable:1,scrollbars:1}}" title="<?php echo __('Track this shipment') ?>"><?php echo __('Track this shipment') ?></a>
- </td>
- </tr>
- <tr>
- <th class="label"><?php echo __('Tracking Number(s):') ?></th>
- <td>
+ <th class="col label"><?php echo __('Tracking Number(s):') ?></th>
+ <td class="col number">
<?php
$i = 1;
$_size = $tracks->count();
@@ -52,7 +69,11 @@
<?php if($track->isCustom()): ?>
<?php echo $this->escapeHtml($track->getNumber()) ?>
<?php else: ?>
- <a href="#" data-mage-init="{popupWindow: {windowURL:'<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($track) ?>',windowName:'trackorder',width:800,height:600,left:0,top:0,resizable:1,scrollbars:1}}"><?php echo $this->escapeHtml($track->getNumber()) ?></a>
+ <a href="#"
+ data-mage-init="{popupWindow: {windowURL:'<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($track) ?>',windowName:'trackorder',width:800,height:600,left:0,top:0,resizable:1,scrollbars:1}}"
+ class="action track">
+ <span><?php echo $this->escapeHtml($track->getNumber()) ?></span>
+ </a>
<?php endif; ?>
<?php if($i!=$_size): ?>, <?php endif; ?>
<?php $i++;
@@ -61,18 +82,14 @@
</tr>
</tbody>
</table>
- <script type="text/javascript">jQuery('#my-tracking-table-<?php echo $_shipment->getId(); ?>').decorate('table')</script>
<?php endif; ?>
-<h3 class="table-caption"><?php echo __('Items Shipped') ?></h3>
-<table class="data-table" id="my-shipment-table-<?php echo $_shipment->getId(); ?>">
- <col />
- <col width="1" />
- <col width="1" />
+<div class="order subtitle caption"><strong><?php echo __('Items Shipped') ?></strong></div>
+<table class="data table order items shipment" id="my-shipment-table-<?php echo $_shipment->getId(); ?>">
<thead>
<tr>
- <th><?php echo __('Product Name') ?></th>
- <th><?php echo __('SKU') ?></th>
- <th class="a-center"><span class="nobr"><?php echo __('Qty Shipped') ?></span></th>
+ <th class="col name"><?php echo __('Product Name') ?></th>
+ <th class="col sku"><?php echo __('SKU') ?></th>
+ <th class="col qty"><?php echo __('Qty Shipped') ?></th>
</tr>
</thead>
<?php $_items = $_shipment->getAllItems(); ?>
@@ -84,6 +101,5 @@
</tbody>
<?php endforeach; ?>
</table>
-<script type="text/javascript">jQuery('#my-shipment-table-<?php echo $_shipment->getId(); ?>').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})</script>
<?php echo $this->getCommentsHtml($_shipment)?>
<?php endforeach; ?>
diff --git a/app/code/Magento/Sales/view/frontend/order/shipment/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/order/shipment/items/renderer/default.phtml
index 3ac8fc628ed..1cca16162d4 100644
--- a/app/code/Magento/Sales/view/frontend/order/shipment/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/shipment/items/renderer/default.phtml
@@ -19,17 +19,17 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php $_item = $this->getItem() ?>
<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
-<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
- <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
+<tr id="order-item-row-<?php echo $_item->getId() ?>">
+ <td class="col name">
+ <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
<?php if($_options = $this->getItemOptions()): ?>
- <dl class="item-options">
+ <dl class="item options">
<?php foreach ($_options as $_option) : ?>
<dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
<?php if (!$this->getPrintStatus()): ?>
@@ -38,7 +38,7 @@
<?php echo $_formatedOptionValue['value'] ?>
<?php if (isset($_formatedOptionValue['full_view'])): ?>
<div class="truncated_full_value">
- <dl class="item-options">
+ <dl class="item options">
<dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
</dl>
@@ -57,9 +57,15 @@
<?php endif; ?>
<?php echo $this->escapeHtml($_item->getDescription()) ?>
<?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
- <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $_item->getId()?>" data-item-id="<?php echo $_item->getId()?>"><?php echo __('Gift Message') ?></a>
+ <a href="#"
+ id="order-item-gift-message-link-<?php echo $_item->getId() ?>"
+ class="action show"
+ aria-controls="order-item-gift-message-<?php echo $_item->getId() ?>"
+ data-item-id="<?php echo $_item->getId() ?>">
+ <?php echo __('Gift Message') ?>
+ </a>
<?php endif; ?>
</td>
- <td><?php echo $this->escapeHtml($this->helper('Magento\Core\Helper\String')->splitInjection($this->getSku())) ?></td>
- <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
+ <td class="col sku"><?php echo $this->escapeHtml($this->helper('Magento\Core\Helper\String')->splitInjection($this->getSku())) ?></td>
+ <td class="col qty"><?php echo $_item->getQty()*1 ?></td>
</tr>
diff --git a/app/code/Magento/Sales/view/frontend/order/totals.phtml b/app/code/Magento/Sales/view/frontend/order/totals.phtml
index ff3477323e1..2145cbbc3ab 100644
--- a/app/code/Magento/Sales/view/frontend/order/totals.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/totals.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
diff --git a/app/code/Magento/Sales/view/frontend/order/trackinginfo.phtml b/app/code/Magento/Sales/view/frontend/order/trackinginfo.phtml
index bc3cf4e0dae..ab52ce0bf97 100644
--- a/app/code/Magento/Sales/view/frontend/order/trackinginfo.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/trackinginfo.phtml
@@ -19,49 +19,45 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<span class="field-row grid" id="shipment_tracking_info">
-
+<div class="field row grid" id="shipment_tracking_info">
<?php if($this->getTrackingInfo()): ?>
- <strong><?php echo $this->escapeHtml($this->getTrackingInfo()->getCarrierTitle()) ?></strong> - <?php echo $this->getTrackingInfo()->getTracking() ?>
+ <div class="title"><strong><?php echo $this->escapeHtml($this->getTrackingInfo()->getCarrierTitle()) ?></strong> - <?php echo $this->getTrackingInfo()->getTracking() ?></div>
<div class="info">
<?php if ($this->getTrackingInfo()->getErrorMessage()): ?>
<?php echo $this->escapeHtml($this->getTrackingInfo()->getErrorMessage()) ?>
<?php else: ?>
<?php if ($this->getTrackingInfo()->getUrl()): ?>
- Please, visit for more info: <a href="<?php echo $this->getTrackingInfo()->getUrl() ?>" target="_blank"><?php echo $this->escapeHtml($this->getTrackingInfo()->getCarrierTitle()) ?></a><br />
+ <?php echo __('Please, visit for more info') ?>: <a href="<?php echo $this->getTrackingInfo()->getUrl() ?>" target="_blank"><?php echo $this->escapeHtml($this->getTrackingInfo()->getCarrierTitle()) ?></a><br />
<?php endif; ?>
<?php if ($this->getTrackingInfo()->getStatus()): ?>
- Status: <?php echo $this->getTrackingInfo()->getStatus() ?><br />
+ <?php echo __('Status') ?>: <?php echo $this->getTrackingInfo()->getStatus() ?><br />
<?php endif; ?>
<?php if ($this->getTrackingInfo()->getDeliverydate()): ?>
- Delivery Date: <?php echo $this->getTrackingInfo()->getDeliverydate() ?><br />
+ <?php echo __('Delivery Date') ?>: <?php echo $this->getTrackingInfo()->getDeliverydate() ?><br />
<?php endif; ?>
<?php if ($this->getTrackingInfo()->getDeliverytime()): ?>
- Delivery Time: <?php echo $this->getTrackingInfo()->getDeliverytime() ?><br />
+ <?php echo __('Delivery Time') ?>: <?php echo $this->getTrackingInfo()->getDeliverytime() ?><br />
<?php endif; ?>
<?php if ($this->getTrackingInfo()->getDeliverylocation()): ?>
- Delivery Location: <?php echo $this->getTrackingInfo()->getDeliverylocation() ?><br />
+ <?php echo __('Delivery Location') ?>: <?php echo $this->getTrackingInfo()->getDeliverylocation() ?><br />
<?php endif; ?>
<?php if ($this->getTrackingInfo()->getSignedby()): ?>
- Signed by: <?php echo $this->getTrackingInfo()->getSignedby() ?><br />
+ <?php echo __('Signed by') ?>: <?php echo $this->getTrackingInfo()->getSignedby() ?><br />
<?php endif; ?>
<?php if ($this->getTrackingInfo()->getTrackSummary()): ?>
- Tracking summary: <?php echo $this->getTrackingInfo()->getTrackSummary() ?><br />
+ <?php echo __('Tracking summary') ?>: <?php echo $this->getTrackingInfo()->getTrackSummary() ?><br />
<?php endif; ?>
-
<?php endif; ?>
</div>
<?php endif; ?>
-
-</span>
+</div>
diff --git a/app/code/Magento/Sales/view/frontend/order/view.phtml b/app/code/Magento/Sales/view/frontend/order/view.phtml
index 6022448f69e..5c6065afbe0 100644
--- a/app/code/Magento/Sales/view/frontend/order/view.phtml
+++ b/app/code/Magento/Sales/view/frontend/order/view.phtml
@@ -19,45 +19,55 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<div class="order-items order-details">
+<div class="order details items">
<?php $_order = $this->getOrder() ?>
- <h2 class="table-caption"><?php echo __('Items Ordered') ?>
+
+ <div class="order subtitle caption">
+ <strong><?php echo __('Items Ordered') ?></strong>
<?php if ($_order->getTracksCollection()->count()) : ?>
- <span class="separator">|</span> <a href="#" data-mage-init="{popupWindow: {windowURL:'<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_order) ?>',windowName:'trackorder',top:0,left:0,width:800,height:600,resizable:1,scrollbars:1}}" title="<?php echo __('Track your order') ?>"><?php echo __('Track your order') ?></a>
+ <a href="#"
+ data-mage-init="{popupWindow: {windowURL:'<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_order) ?>',windowName:'trackorder',top:0,left:0,width:800,height:600,resizable:1,scrollbars:1}}"
+ title="<?php echo __('Track your order') ?>"
+ class="action track">
+ <span><?php echo __('Track your order') ?></span>
+ </a>
<?php endif; ?>
- </h2>
+ </div>
<?php echo $this->getChildHtml('order_items') ?>
<?php if($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order', $_order) && $_order->getGiftMessageId()): ?>
- <div class="order-additional order-gift-message">
- <h2 class="sub-title"><?php echo __('Gift Message for This Order') ?></h2>
+ <div class="order additional details gift">
+ <div class="order subtitle caption"><strong><?php echo __('Gift Message for This Order') ?></strong></div>
<?php $_giftMessage=$this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessageForEntity($_order); ?>
- <dl class="gift-message">
- <dt><strong><?php echo __('From:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?></dt>
- <dt><strong><?php echo __('To:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?></dt>
- <dd><?php echo $this->helper('Magento\GiftMessage\Helper\Message')->getEscapedGiftMessage($_order) ?></dd>
+ <dl class="gift message">
+ <dt class="gift sender"><strong class="label"><?php echo __('From:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?></dt>
+ <dt class="gift recipient"><strong class="label"><?php echo __('To:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?></dt>
+ <dd class="message text"><?php echo $this->helper('Magento\GiftMessage\Helper\Message')->getEscapedGiftMessage($_order) ?></dd>
</dl>
</div>
<?php endif; ?>
<?php $_history = $this->getOrder()->getVisibleStatusHistory() ?>
<?php if (count($_history)): ?>
- <div class="order-additional order-comments">
- <h2 class="sub-title"><?php echo __('About Your Order') ?></h2>
- <dl class="order-about">
+ <div class="order additional details comments">
+ <div class="order subtitle caption"><strong><?php echo __('About Your Order') ?></strong></div>
+ <dl class="order comments">
<?php foreach ($_history as $_historyItem): ?>
- <dt><?php echo $this->formatDate($_historyItem->getCreatedAtStoreDate(), 'medium', true) ?></dt>
- <dd><?php echo $this->escapeHtml($_historyItem->getComment()) ?></dd>
+ <dt class="comment date"><?php echo $this->formatDate($_historyItem->getCreatedAtStoreDate(), 'medium', true) ?></dt>
+ <dd class="comment text"><?php echo $this->escapeHtml($_historyItem->getComment()) ?></dd>
<?php endforeach; ?>
</dl>
</div>
<?php endif; ?>
- <div class="buttons-set">
- <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo $this->getBackTitle() ?></a></p>
+ <div class="actions">
+ <div class="secondary">
+ <a class="action back" href="<?php echo $this->getBackUrl() ?>">
+ <span><?php echo $this->getBackTitle() ?></span>
+ </a>
+ </div>
</div>
</div>
diff --git a/app/code/Magento/Sales/view/frontend/payment/form/billing/agreement.phtml b/app/code/Magento/Sales/view/frontend/payment/form/billing/agreement.phtml
index 5d2129cde3a..5e725666785 100644
--- a/app/code/Magento/Sales/view/frontend/payment/form/billing/agreement.phtml
+++ b/app/code/Magento/Sales/view/frontend/payment/form/billing/agreement.phtml
@@ -19,23 +19,20 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php /* @var $this \Magento\Sales\Block\Payment\Form\Billing\Agreement */?>
<?php $_code=$this->getMethodCode() ?>
-<ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none;">
- <li>
- <label for="<?php echo $_code ?>_ba_agreement_id" class="required"><em>*</em><?php echo __('Billing Agreement') ?></label>
- <div class="input-box">
- <select id="<?php echo $_code ?>_ba_agreement_id" name="payment[<?php echo $this->getTransportName(); ?>]" class="required-entry">
- <option value=""><?php echo __('-- Please Select Billing Agreement--') ?></option>
- <?php foreach ($this->getBillingAgreements() as $id => $referenceId): ?>
- <option value="<?php echo $id ?>"><?php echo $this->escapeHtml($referenceId) ?></option>
- <?php endforeach ?>
- </select>
- </div>
- </li>
-</ul>
+<div class="field items required" id="payment_form_<?php echo $_code ?>" style="display:none;">
+ <label for="<?php echo $_code ?>_ba_agreement_id" class="label"><span><?php echo __('Billing Agreement') ?></span></label>
+ <div class="control">
+ <select id="<?php echo $_code ?>_ba_agreement_id" name="payment[<?php echo $this->getTransportName(); ?>]" class="select">
+ <option value=""><?php echo __('-- Please Select Billing Agreement--') ?></option>
+ <?php foreach ($this->getBillingAgreements() as $id => $referenceId): ?>
+ <option value="<?php echo $id ?>"><?php echo $this->escapeHtml($referenceId) ?></option>
+ <?php endforeach ?>
+ </select>
+ </div>
+</div>
diff --git a/app/code/Magento/Sales/view/frontend/recurring/grid.phtml b/app/code/Magento/Sales/view/frontend/recurring/grid.phtml
index 9202a7a8faa..dadad046132 100644
--- a/app/code/Magento/Sales/view/frontend/recurring/grid.phtml
+++ b/app/code/Magento/Sales/view/frontend/recurring/grid.phtml
@@ -19,62 +19,60 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php /* @var $this \Magento\Core\Block\Template */?>
-<div <?php echo $this->getGridHtmlClass() ? ' class="' . $this->getGridHtmlClass() . '"' : ''?><?php echo $this->getGridHtmlCss() ? ' style="' . $this->getGridHtmlCss() . '"' : ''?>>
-<?php if ($caption = $this->getGridCaption()): ?>
-<h2 class="table-caption"><?php echo $this->escapeHtml($caption) ?></h2>
-<?php endif; ?>
+<?php /* @var $this \Magento\Core\Block\Template */ ?>
+<div <?php echo $this->getGridHtmlClass() ? ' class="' . $this->getGridHtmlClass() . '"' : '' ?><?php echo $this->getGridHtmlCss() ? ' style="' . $this->getGridHtmlCss() . '"' : '' ?>>
-<?php $gridElements = $this->getGridElements(); ?>
-<?php if ($gridElements): ?>
- <?php echo $this->getChildHtml('pager'); ?>
- <table id="<?php echo $this->getGridHtmlId() ?>" class="data-table">
-<?php foreach ($this->getGridColumns() as $column):?>
- <col <?php $width = $this->getObjectData($column, 'width'); echo $width ? ' width="' . $width . '"' : '' ?>/>
-<?php endforeach; ?>
- <thead>
- <tr>
-<?php foreach ($this->getGridColumns() as $column):
-$nobr = $this->getObjectData($column, 'is_nobr') ? '<span class="nobr">%s</span>' : '%s';
-$title = $this->getObjectData($column, 'title');
-?>
- <th><?php echo $title ? sprintf($nobr, $this->escapeHtml($title)) : ' ' ?></th>
-<?php endforeach; ?>
- </tr>
- </thead>
- <tbody>
-<?php foreach($gridElements as $row): ?>
+ <?php if ($caption = $this->getGridCaption()): ?>
+ <div class="title"><strong><?php echo $this->escapeHtml($caption) ?></strong></div>
+ <?php endif; ?>
+
+ <?php $gridElements = $this->getGridElements(); ?>
+ <?php if ($gridElements): ?>
+ <div class="toolbar"><?php echo $this->getChildHtml('pager'); ?></div>
+ <table id="<?php echo $this->getGridHtmlId() ?>" class="data table">
+ <thead>
<tr>
-<?php foreach ($this->getGridColumns() as $column):
-$nobr = $this->getObjectData($column, 'is_nobr') ? '<span class="nobr">%s</span>' : '%s';
-$index = $this->getObjectData($column, 'index');
-$value = $this->getObjectData($row, $index);
-$linkUrl = $this->getObjectData($row, "{$index}_link_url");
-$linkAnchorText = $this->getObjectData($row, "{$index}_link_text");
-$linkText = $linkUrl ? ($linkAnchorText ? $linkAnchorText : $value) : '';
-$linkFormat = $linkUrl ? '<a href="%s">%s</a>' : '';
-?>
- <td<?php $this->getObjectData($row, 'is_amount') ? ' class="a-right"' : '' ?>><?php
-if ($linkFormat) {
- echo sprintf($nobr, sprintf($linkFormat, $this->escapeHtml($linkUrl), $this->escapeHtml($linkText)));
-} else {
- echo sprintf($nobr, $this->escapeHtml($value));
-}
- ?></td>
-<?php endforeach; ?>
+ <?php foreach ($this->getGridColumns() as $column):
+ $nobr = $this->getObjectData($column, 'is_nobr') ? '<span class="nobr">%s</span>' : '%s';
+ $title = $this->getObjectData($column, 'title');
+ ?>
+ <th class="col title"><?php echo $title ? sprintf($nobr, $this->escapeHtml($title)) : ' ' ?></th>
+ <?php endforeach; ?>
</tr>
-<?php endforeach; ?>
- </tbody>
- </table>
- <?php echo $this->getChildHtml('pager'); ?>
- <script type="text/javascript">(function($) {$('#<?php echo $this->getGridHtmlId() ?>').decorate('table')})(jQuery)</script>
-<?php else: ?>
- <p><?php echo $this->escapeHtml($this->getEmptyGridMessage()); ?></p>
-<?php endif; ?>
+ </thead>
+ <tbody>
+ <?php foreach ($gridElements as $row): ?>
+ <tr>
+ <?php foreach ($this->getGridColumns() as $column):
+ $nobr = $this->getObjectData($column, 'is_nobr') ? '<span class="nobr">%s</span>' : '%s';
+ $index = $this->getObjectData($column, 'index');
+ $value = $this->getObjectData($row, $index);
+ $linkUrl = $this->getObjectData($row, "{$index}_link_url");
+ $linkAnchorText = $this->getObjectData($row, "{$index}_link_text");
+ $linkText = $linkUrl ? ($linkAnchorText ? $linkAnchorText : $value) : '';
+ $linkFormat = $linkUrl ? '<a href="%s">%s</a>' : '';
+ ?>
+ <td<?php $this->getObjectData($row, 'is_amount') ? ' class="col qty"' : '' ?>>
+ <?php
+ if ($linkFormat) {
+ echo sprintf($nobr, sprintf($linkFormat, $this->escapeHtml($linkUrl), $this->escapeHtml($linkText)));
+ } else {
+ echo sprintf($nobr, $this->escapeHtml($value));
+ }
+ ?>
+ </td>
+ <?php endforeach; ?>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ <div class="toolbar"><?php echo $this->getChildHtml('pager'); ?></div>
+ <?php else: ?>
+ <p><?php echo $this->escapeHtml($this->getEmptyGridMessage()); ?></p>
+ <?php endif; ?>
</div>
diff --git a/app/code/Magento/Sales/view/frontend/recurring/profile/view.phtml b/app/code/Magento/Sales/view/frontend/recurring/profile/view.phtml
index ebd21c420e7..2ccd67afb2f 100644
--- a/app/code/Magento/Sales/view/frontend/recurring/profile/view.phtml
+++ b/app/code/Magento/Sales/view/frontend/recurring/profile/view.phtml
@@ -26,85 +26,97 @@
?>
<?php /* @var $this \Magento\Sales\Block\Recurring\Profile\View */ ?>
-<div class="order-page">
-
-<!-- title 'n' actions -->
-<div class="page-title title-buttons">
- <h1><?php echo __('Recurring Profile # %1', $this->escapeHtml($this->getReferenceId())) ?></h1>
- <?php if ($this->getCanCancel()): ?>
- <button type="button" title="<?php echo __('Cancel') ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getCancelUrl() ?>'; } return false;"><span><span><?php echo __('Cancel') ?></span></span></button>
- <?php endif; ?>
- <?php if ($this->getCanSuspend()): ?>
- <button type="button" title="<?php echo __('Suspend') ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getSuspendUrl() ?>'; } return false;"><span><span><?php echo __('Suspend') ?></span></span></button>
- <?php endif; ?>
- <?php if ($this->getCanActivate()): ?>
- <button type="button" title="<?php echo __('Activate') ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getActivateUrl() ?>'; } return false;"><span><span><?php echo __('Activate') ?></span></span></button>
- <?php endif; ?>
- <?php if ($this->getCanUpdate()):?>
- <button type="button" title="<?php echo __('Get Update') ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getUpdateUrl() ?>'; } return false;"><span><span><?php echo __('Get Update') ?></span></span></button>
- <?php endif;?>
-</div>
+<div class="order recurring details">
+ <div class="actions">
+ <div class="primary">
+ <?php if ($this->getCanCancel()): ?>
+ <button type="button" title="<?php echo __('Cancel') ?>" class="action cancel"
+ onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getCancelUrl() ?>'; } return false;">
+ <span><?php echo __('Cancel') ?></span></button>
+ <?php endif; ?>
+ <?php if ($this->getCanSuspend()): ?>
+ <button type="button" title="<?php echo __('Suspend') ?>" class="action suspend"
+ onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getSuspendUrl() ?>'; } return false;">
+ <span><?php echo __('Suspend') ?></span></button>
+ <?php endif; ?>
+ <?php if ($this->getCanActivate()): ?>
+ <button type="button" title="<?php echo __('Activate') ?>" class="action activate"
+ onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getActivateUrl() ?>'; } return false;">
+ <span><?php echo __('Activate') ?></span></button>
+ <?php endif; ?>
+ <?php if ($this->getCanUpdate()): ?>
+ <button type="button" title="<?php echo __('Get Update') ?>" class="action update"
+ onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getUpdateUrl() ?>'; } return false;">
+ <span><?php echo __('Get Update') ?></span></button>
+ <?php endif; ?>
+ </div>
+ </div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
+ <?php /* info tabs */ ?>
+ <?php $layout = $this->getLayout(); ?>
+ <?php $infoTabs = $this->getGroupChildNames('info_tabs'); ?>
+ <dl class="order info">
+ <dt><?php echo __('About This Profile:') ?></dt>
+ <dd>
+ <ul id="order-info-tabs" class="items">
+ <?php foreach ($infoTabs as $elementName): ?>
+ <?php $block = $layout->getBlock($elementName); ?>
+ <?php if (!$block) continue; ?>
+ <?php if ($this->getObjectData($block, 'is_view_current')): ?>
+ <li class="nav item current">
+ <strong><?php echo $this->escapeHtml($this->getObjectData($block, 'view_label')) ?></strong>
+ </li>
+ <?php else: ?>
+ <li class="nav item">
+ <a href="<?php echo $this->escapeHtml($this->getObjectData($block, 'view_url')) ?>"><?php echo $this->escapeHtml($this->getObjectData($block, 'view_label')) ?></a>
+ </li>
+ <?php endif; ?>
+ <?php endforeach; ?>
+ </ul>
+ </dd>
+ </dl>
-<!-- info tabs -->
-<?php $layout = $this->getLayout(); ?>
-<?php $infoTabs = $this->getGroupChildNames('info_tabs'); ?>
-<dl class="order-info">
- <dt><?php echo __('About This Profile:') ?></dt>
- <dd>
- <ul id="order-info-tabs">
- <?php foreach ($infoTabs as $elementName): ?>
- <?php $block = $layout->getBlock($elementName); ?>
- <?php if (!$block) continue; ?>
- <?php if ($this->getObjectData($block, 'is_view_current')): ?>
- <li class="current"><strong><?php echo $this->escapeHtml($this->getObjectData($block, 'view_label')) ?></strong></li>
- <?php else: ?>
- <li><a href="<?php echo $this->escapeHtml($this->getObjectData($block, 'view_url')) ?>"><?php echo $this->escapeHtml($this->getObjectData($block, 'view_label')) ?></a></li>
- <?php endif; ?>
- <?php endforeach; ?>
- </ul>
- </dd>
-</dl>
+ <?php /* info blocks */ ?>
+ <!-- info blocks in 2 columns -->
+ <?php for ($i = 1; $i <= 5; $i++): ?>
+ <?php $infoBlocks = $this->getGroupChildNames("info_blocks_row_{$i}"); ?>
+ <?php if ($infoBlocks): ?>
+ <div class="block view info">
+ <?php for ($j = 1; $j <= 2; $j++): ?>
+ <?php foreach ($infoBlocks as $elementName): ?>
+ <?php $block = $layout->getBlock($elementName); ?>
+ <?php if (!$block) continue; ?>
+ <?php if ($j == $this->getObjectData($block, 'view_column')): ?>
+ <div class="box box<?php echo $j ?>">
+ <strong class="subtitle">
+ <span><?php echo $this->escapeHtml($this->getObjectData($block, 'view_label')) ?></span>
+ </strong>
-<!-- info blocks in 2 columns -->
-<?php for ($i = 1; $i <= 5; $i++):?>
- <?php $infoBlocks = $this->getGroupChildNames("info_blocks_row_{$i}"); ?>
- <?php if ($infoBlocks):?>
-<div class="col2-set order-info-box">
- <?php for ($j = 1; $j <= 2; $j++):?>
- <?php foreach ($infoBlocks as $elementName):?>
- <?php $block = $layout->getBlock($elementName); ?>
- <?php if (!$block) continue; ?>
-<?php if ($j == $this->getObjectData($block, 'view_column')):?>
- <div class="col-<?php echo $j?>">
- <div class="info-box">
- <div class="box-title">
- <h2><?php echo $this->escapeHtml($this->getObjectData($block, 'view_label')) ?></h2>
- </div>
- <div class="box-content">
- <?php $html = $layout->renderElement($elementName); ?>
- <?php echo ($html ? $html : __('No information available.')) ; ?>
+ <div class="content">
+ <?php $html = $layout->renderElement($elementName); ?>
+ <?php echo($html ? $html : __('No information available.')); ?>
+ </div>
+ </div>
+ <?php endif; ?>
+ <?php endforeach; ?>
+ <?php endfor; ?>
</div>
+ <?php endif; ?>
+ <?php endfor; ?>
+
+ <!-- table data block -->
+ <?php $table = $this->getChildBlock('table') ?>
+ <?php if ($table): ?>
+ <div class="recurring order details items">
+ <div class="order subtitle caption">
+ <strong><?php echo $this->escapeHtml($this->getObjectData($table, 'view_label')) ?></strong></div>
+ <?php echo $this->getChildHtml('table') ?>
</div>
- </div>
-<?php endif; ?>
- <?php endforeach;?>
- <?php endfor;?>
-</div>
<?php endif; ?>
-<?php endfor;?>
-
-<!-- table data block -->
-<?php $table = $this->getChildBlock('table') ?>
-<?php if ($table):?>
-<div>
- <h2 class="table-caption"><?php echo $this->escapeHtml($this->getObjectData($table, 'view_label')) ?></h2>
- <?php echo $this->getChildHtml('table') ?>
-</div>
-<?php endif;?>
- <div class="buttons-set">
- <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo __('Back to Recurring Billing Profiles') ?></a></p>
+ <div class="actions">
+ <div class="secondary"><a href="<?php echo $this->getBackUrl() ?>"
+ class="action back"><span><?php echo __('Back to Recurring Billing Profiles') ?></span></a>
+ </div>
</div>
</div>
diff --git a/app/code/Magento/Sales/view/frontend/recurring/profile/view/info.phtml b/app/code/Magento/Sales/view/frontend/recurring/profile/view/info.phtml
index bbdb4e6455c..2ff67a6f7e6 100644
--- a/app/code/Magento/Sales/view/frontend/recurring/profile/view/info.phtml
+++ b/app/code/Magento/Sales/view/frontend/recurring/profile/view/info.phtml
@@ -19,29 +19,28 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php /* @var $this \Magento\Sales\Block\Recurring\Profile\View */?>
-<?php if ($this->getIsAddress()):?>
+<?php /* @var $this \Magento\Sales\Block\Recurring\Profile\View */ ?>
+<?php if ($this->getIsAddress()): ?>
-<?php foreach ($this->getRenderedInfo() as $row):?>
-<address><?php echo nl2br($this->escapeHtml($this->getObjectData($row, 'value')))?></address>
-<?php endforeach;?>
+ <?php foreach ($this->getRenderedInfo() as $row): ?>
+ <address><?php echo nl2br($this->escapeHtml($this->getObjectData($row, 'value'))) ?></address>
+ <?php endforeach; ?>
-<?php else:?>
+<?php else: ?>
-<table class="info-table">
- <tbody>
- <?php foreach ($this->getRenderedInfo() as $row):?>
- <?php $isAmount = $this->getObjectData($row, 'is_amount');?>
- <tr>
- <th><?php echo $this->escapeHtml($this->getObjectData($row, 'label'))?>:</th>
- <td><?php echo $this->renderRowValue($row) ?></td>
- </tr>
- <?php endforeach;?>
- </tbody>
-</table>
-<?php endif;?>
+ <table class="data table">
+ <tbody>
+ <?php foreach ($this->getRenderedInfo() as $row): ?>
+ <?php $isAmount = $this->getObjectData($row, 'is_amount'); ?>
+ <tr>
+ <th class="col label"><?php echo $this->escapeHtml($this->getObjectData($row, 'label')) ?>:</th>
+ <td class="col value"><?php echo $this->renderRowValue($row) ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+<?php endif; ?>
diff --git a/app/code/Magento/Sales/view/frontend/recurring/profiles.phtml b/app/code/Magento/Sales/view/frontend/recurring/profiles.phtml
index 3d5101fcfbb..dd1e70ef5e6 100644
--- a/app/code/Magento/Sales/view/frontend/recurring/profiles.phtml
+++ b/app/code/Magento/Sales/view/frontend/recurring/profiles.phtml
@@ -19,23 +19,16 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php /* @var $this \Magento\Sales\Block\Recurring\Profiles */ ?>
-<div class="page-title">
- <h1><?php echo __('Recurring Billing Profiles') ?></h1>
-</div>
-
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-
-<div class="recurring-profiles">
-
+<div class="block recurring profiles">
<?php echo $this->getChildHtml('grid')?>
-
- <div class="buttons-set">
- <p class="back-link"><a href="<?php echo $this->escapeHtml($this->getBackUrl()) ?>"><small>« </small><?php echo __('Back') ?></a></p>
+ <div class="actions">
+ <div class="secondary">
+ <a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="action back"><span><?php echo __('Back') ?></span></a>
+ </div>
</div>
</div>
diff --git a/app/code/Magento/Sales/view/frontend/reorder/sidebar.phtml b/app/code/Magento/Sales/view/frontend/reorder/sidebar.phtml
index 14f0a84ac2a..92f812bc6d2 100644
--- a/app/code/Magento/Sales/view/frontend/reorder/sidebar.phtml
+++ b/app/code/Magento/Sales/view/frontend/reorder/sidebar.phtml
@@ -19,7 +19,6 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -33,14 +32,14 @@
?>
<?php $_items = $this->getItems()?>
<?php if($_items): ?>
-<div class="block block-reorder">
- <div class="block-title">
- <strong><span><?php echo __('My Orders') ?></span></strong>
+<div class="block reorder">
+ <div class="title">
+ <strong><?php echo __('My Orders') ?></strong>
</div>
- <form method="post" action="<?php echo $this->getFormActionUrl() ?>" id="reorder-validate-detail">
- <div class="block-content">
- <p class="block-subtitle"><?php echo __('Last Ordered Items') ?></p>
- <ol id="cart-sidebar-reorder">
+ <div class="content">
+ <form method="post" class="form reorder" action="<?php echo $this->getFormActionUrl() ?>" id="reorder-validate-detail">
+ <strong class="subtitle"><?php echo __('Last Ordered Items') ?></strong>
+ <ol class="items" id="cart-sidebar-reorder">
<?php $_showAddButtonFlag = false ?>
<?php foreach ($_items as $_item): ?>
<li class="item">
@@ -49,35 +48,38 @@
<input type="checkbox" name="order_items[]" id="reorder-item-<?php echo $_item->getId() ?>" value="<?php echo $_item->getId() ?>" title="<?php echo __('Add to Cart') ?>"
class="checkbox" data-validate='{"validate-one-checkbox-required-by-name": true}'/>
<?php endif; ?>
- <p class="product-name"><a href="<?php echo $_item->getProduct()->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></p>
+ <strong class="product name"><a href="<?php echo $_item->getProduct()->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></strong>
</li>
<?php endforeach; ?>
</ol>
- <script type="text/javascript">(function($) {$('#cart-sidebar-reorder').decorate('list', false)})(jQuery)</script>
<div id="cart-sidebar-reorder-advice-container"></div>
<div class="actions">
<?php if ($_showAddButtonFlag): ?>
- <button type="submit" title="<?php echo __('Add to Cart') ?>" class="button btn-cart"><span><span><?php echo __('Add to Cart') ?></span></span></button>
+ <div class="primary">
+ <button type="submit" title="<?php echo __('Add to Cart') ?>" class="action tocart">
+ <span><?php echo __('Add to Cart') ?></span>
+ </button>
+ </div>
<?php endif; ?>
- <a href="<?php echo $this->getUrl('customer/account') ?>"><?php echo __('View All'); ?></a>
+ <div class="secondary"><a class="action view" href="<?php echo $this->getUrl('customer/account') ?>"><span><?php echo __('View All'); ?></span></a></div>
</div>
- </div>
- </form>
+ </form>
+ </div>
+ <?php echo $this->getPagerHtml(); ?>
+ <script type="text/javascript">
+ head.js(
+ "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
+ "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
+ "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
+ "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
+ function() {
+ jQuery('#reorder-validate-detail').validation({
+ errorPlacement: function(error, element) {
+ error.appendTo('#cart-sidebar-reorder-advice-container');
+ }
+ });
+ }
+ );
+ </script>
</div>
-<?php echo $this->getPagerHtml(); ?>
-<script type="text/javascript">
- head.js(
- "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
- "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
- "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
- "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
- function() {
- jQuery('#reorder-validate-detail').validation({
- errorPlacement: function(error, element) {
- error.appendTo('#cart-sidebar-reorder-advice-container');
- }
- });
- }
- );
-</script>
<?php endif ?>
diff --git a/app/code/Magento/Sales/view/frontend/widget/guest/form.phtml b/app/code/Magento/Sales/view/frontend/widget/guest/form.phtml
index 50d6134f034..e9c1c29b50c 100644
--- a/app/code/Magento/Sales/view/frontend/widget/guest/form.phtml
+++ b/app/code/Magento/Sales/view/frontend/widget/guest/form.phtml
@@ -26,62 +26,70 @@
/** @var $this \Magento\Sales\Block\Widget\Guest\Form */
?>
<?php if ($this->isEnable()): ?>
- <div class="widget">
- <div class="block block-gr-search">
- <div class="block-title">
- <h2><?php echo __('Orders and Returns') ?></h2>
- </div>
- <div class="block-content">
- <form id="oar-widget-orders-and-returns-form" action="<?php echo $this->getActionUrl() ?>" method="post" class="search-form" name="guest_post">
- <ul class="form-alt">
- <li>
- <label class="required"><?php echo __('Find Order By:') ?></label>
- <div class="input-box">
- <select name="oar_type" id="quick-search-type-id" class="select" title="">
- <option value="email"><?php echo __('Email Address') ?></option>
- <option value="zip"><?php echo __('ZIP Code') ?></option>
- </select>
- </div>
- </li>
- <li>
- <label for="oar-order-id" class="required"><?php echo __('Order ID') ?> <em>*</em></label>
- <div class="input-box">
- <input type="text" class="input-text" id="oar-order-id" name="oar_order_id" autocomplete="off" data-validate="{required:true}"/>
- </div>
- </li>
- <li>
- <label for="oar-billing-lastname" class="required"><?php echo __('Billing Last Name') ?> <em>*</em></label>
- <div class="input-box">
- <input type="text" class="input-text" id="oar-billing-lastname" name="oar_billing_lastname" autocomplete="off" data-validate="{required:true}"/>
- </div>
- </li>
- <li id="oar-email">
- <label for="oar_email" class="required"><?php echo __('Email Address') ?> <em>*</em></label>
- <div class="input-box">
- <input type="text" class="input-text" id="oar_email" name="oar_email" autocomplete="off" data-validate="{required:true, 'validate-email':true}"/>
- </div>
- </li>
- <li id="oar-zip" style="display:none;">
- <label for="oar_zip" class="required"><?php echo __('Billing ZIP Code') ?> <em>*</em></label>
- <div class="input-box">
- <input type="text" class="input-text" id="oar_zip" name="oar_zip" data-validate="{required:true}"/>
- </div>
- </li>
- </ul>
- <div class="actions">
- <button type="submit" title="Continue" class="button"><span><span><?php echo __('Continue') ?></span></span></button>
- </div>
- </form>
- </div>
+ <div class="widget block orders returns">
+ <div class="title">
+ <strong><?php echo __('Orders and Returns') ?></strong>
+ </div>
+ <div class="content">
+ <form id="oar-widget-orders-and-returns-form" action="<?php echo $this->getActionUrl() ?>" method="post"
+ class="form orders search" name="guest_post">
+ <div class="field find required">
+ <label class="label"><span><?php echo __('Find Order By:') ?></span></label>
+
+ <div class="control">
+ <select name="oar_type" id="quick-search-type-id" class="select" title="">
+ <option value="email"><?php echo __('Email Address') ?></option>
+ <option value="zip"><?php echo __('ZIP Code') ?></option>
+ </select>
+ </div>
+ </div>
+ <div class="field id required">
+ <label for="oar-order-id" class="label"><span><?php echo __('Order ID') ?></span></label>
+
+ <div class="control">
+ <input type="text" class="input-text" id="oar-order-id" name="oar_order_id" autocomplete="off"
+ data-validate="{required:true}">
+ </div>
+ </div>
+ <div class="field lastname required">
+ <label for="oar-billing-lastname"
+ class="label"><span><?php echo __('Billing Last Name') ?></span></label>
+
+ <div class="control">
+ <input type="text" class="input-text" id="oar-billing-lastname" name="oar_billing_lastname"
+ autocomplete="off" data-validate="{required:true}">
+ </div>
+ </div>
+ <div id="oar-email" class="field email required">
+ <label for="oar_email" class="label"><span><?php echo __('Email Address') ?></span></label>
+
+ <div class="control">
+ <input type="text" class="input-text" id="oar_email" name="oar_email" autocomplete="off"
+ data-validate="{required:true, 'validate-email':true}">
+ </div>
+ </div>
+ <div id="oar-zip" style="display:none;" class="field required">
+ <label for="oar_zip" class="label"><span><?php echo __('Billing ZIP Code') ?></span></label>
+
+ <div class="control">
+ <input type="text" class="input-text" id="oar_zip" name="oar_zip"
+ data-validate="{required:true}"/>
+ </div>
+ </div>
+ <div class="actions">
+ <button type="submit" title="Continue" class="action search">
+ <span><?php echo __('Continue') ?></span></button>
+ </div>
+ </form>
</div>
</div>
-<script type="text/javascript">
- head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
- "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
- "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
- "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
- "<?php echo $this->getViewFileUrl('Magento_Sales::orders-returns.js');?>", function() {
- jQuery('#oar-widget-orders-and-returns-form').ordersReturns().validation();
- });
-</script>
+ <script type="text/javascript">
+ head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
+ "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
+ "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
+ "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
+ "<?php echo $this->getViewFileUrl('Magento_Sales::orders-returns.js');?>", function () {
+ jQuery('#oar-widget-orders-and-returns-form').ordersReturns().validation();
+ });
+ </script>
<?php endif; ?>
diff --git a/app/code/Magento/Sendfriend/view/frontend/layout/sendfriend_product_send.xml b/app/code/Magento/Sendfriend/view/frontend/layout/sendfriend_product_send.xml
index 6ffedf785f0..27dce03336e 100644
--- a/app/code/Magento/Sendfriend/view/frontend/layout/sendfriend_product_send.xml
+++ b/app/code/Magento/Sendfriend/view/frontend/layout/sendfriend_product_send.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product Email to a Friend" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product Email to a Friend" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
diff --git a/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml b/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml
index 4dc99d20fa8..75df863046a 100644
--- a/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml
+++ b/app/code/Magento/Shipping/view/frontend/layout/shipping_tracking_popup.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Shipment Tracking Popup" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Shipment Tracking Popup" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">popup.phtml</argument>
diff --git a/app/code/Magento/Adminhtml/Controller/Sitemap.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Controller/Sitemap.php
rename to app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap.php
index 5e5fdaae34d..13931fb8b44 100644
--- a/app/code/Magento/Adminhtml/Controller/Sitemap.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap.php
@@ -28,9 +28,9 @@
/**
* XML sitemap controller
*/
-namespace Magento\Adminhtml\Controller;
+namespace Magento\Sitemap\Controller\Adminhtml;
-class Sitemap extends \Magento\Adminhtml\Controller\Action
+class Sitemap extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -54,7 +54,7 @@ class Sitemap extends \Magento\Adminhtml\Controller\Action
/**
* Init actions
*
- * @return \Magento\Adminhtml\Controller\Sitemap
+ * @return \Magento\Sitemap\Controller\Adminhtml\Sitemap
*/
protected function _initAction()
{
@@ -107,7 +107,7 @@ class Sitemap extends \Magento\Adminhtml\Controller\Action
if (! $model->getId()) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(
__('This sitemap no longer exists.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
}
@@ -151,8 +151,8 @@ class Sitemap extends \Magento\Adminhtml\Controller\Action
. DS . $data['sitemap_filename'];
/** @var $validator \Magento\Core\Model\File\Validator\AvailablePath */
$validator = $this->_objectManager->create('Magento\Core\Model\File\Validator\AvailablePath');
- /** @var $helper \Magento\Adminhtml\Helper\Catalog */
- $helper = $this->_objectManager->get('Magento\Adminhtml\Helper\Catalog');
+ /** @var $helper \Magento\Catalog\Helper\Catalog */
+ $helper = $this->_objectManager->get('Magento\Catalog\Helper\Catalog');
$validator->setPaths($helper->getSitemapValidPaths());
if (!$validator->isValid($path)) {
foreach ($validator->getMessages() as $message) {
@@ -161,7 +161,7 @@ class Sitemap extends \Magento\Adminhtml\Controller\Action
// save data in session
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->setFormData($data);
// redirect to edit form
- $this->_redirect('*/*/edit', array(
+ $this->_redirect('adminhtml/*/edit', array(
'sitemap_id' => $this->getRequest()->getParam('sitemap_id')));
return;
}
@@ -199,7 +199,7 @@ class Sitemap extends \Magento\Adminhtml\Controller\Action
// check if 'Save and Continue'
if ($this->getRequest()->getParam('back')) {
- $this->_redirect('*/*/edit', array('sitemap_id' => $model->getId()));
+ $this->_redirect('adminhtml/*/edit', array('sitemap_id' => $model->getId()));
return;
}
// go to grid or forward to generate action
@@ -208,7 +208,7 @@ class Sitemap extends \Magento\Adminhtml\Controller\Action
$this->_forward('generate');
return;
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
} catch (\Exception $e) {
@@ -217,12 +217,12 @@ class Sitemap extends \Magento\Adminhtml\Controller\Action
// save data in session
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->setFormData($data);
// redirect to edit form
- $this->_redirect('*/*/edit', array(
+ $this->_redirect('adminhtml/*/edit', array(
'sitemap_id' => $this->getRequest()->getParam('sitemap_id')));
return;
}
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
@@ -253,14 +253,14 @@ class Sitemap extends \Magento\Adminhtml\Controller\Action
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addSuccess(
__('The sitemap has been deleted.'));
// go to grid
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
} catch (\Exception $e) {
// display error message
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError($e->getMessage());
// go back to edit form
- $this->_redirect('*/*/edit', array('sitemap_id' => $id));
+ $this->_redirect('adminhtml/*/edit', array('sitemap_id' => $id));
return;
}
}
@@ -268,7 +268,7 @@ class Sitemap extends \Magento\Adminhtml\Controller\Action
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(
__('We can\'t find a sitemap to delete.'));
// go to grid
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
/**
@@ -300,7 +300,7 @@ class Sitemap extends \Magento\Adminhtml\Controller\Action
}
// go to grid
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
/**
diff --git a/app/code/Magento/Sitemap/etc/adminhtml/routes.xml b/app/code/Magento/Sitemap/etc/adminhtml/routes.xml
new file mode 100644
index 00000000000..1eb890617b2
--- /dev/null
+++ b/app/code/Magento/Sitemap/etc/adminhtml/routes.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<config>
+ <router id="admin">
+ <route id="adminhtml">
+ <module name="Magento_Sitemap_Adminhtml" before="Magento_Adminhtml" />
+ </route>
+ </router>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/Adminhtml/Block/Tax/Rate/Form.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Tax/Rate/Form.php
rename to app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
index 2d9563e795a..c1a878029c9 100644
--- a/app/code/Magento/Adminhtml/Block/Tax/Rate/Form.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,11 +28,11 @@
* Admin product tax class add form
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Tax\Rate;
+namespace Magento\Tax\Block\Adminhtml\Rate;
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
@@ -40,7 +40,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
protected $_titles = null;
- protected $_template = 'tax/rate/form.phtml';
+ protected $_template = 'rate/form.phtml';
/**
* Tax data
@@ -50,7 +50,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
protected $_taxData = null;
/**
- * @var \Magento\Adminhtml\Block\Tax\Rate\Title\Fieldset
+ * @var \Magento\Tax\Block\Adminhtml\Rate\Title\Fieldset
*/
protected $_fieldset;
@@ -77,7 +77,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
/**
* @param \Magento\Directory\Model\RegionFactory $regionFactory
* @param \Magento\Directory\Model\Config\Source\Country $country
- * @param \Magento\Adminhtml\Block\Tax\Rate\Title\Fieldset $fieldset
+ * @param \Magento\Tax\Block\Adminhtml\Rate\Title\Fieldset $fieldset
* @param \Magento\Tax\Model\Calculation\RateFactory $rateFactory
* @param \Magento\Tax\Model\Calculation\Rate $rate
* @param \Magento\Tax\Helper\Data $taxData
@@ -90,7 +90,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
public function __construct(
\Magento\Directory\Model\RegionFactory $regionFactory,
\Magento\Directory\Model\Config\Source\Country $country,
- \Magento\Adminhtml\Block\Tax\Rate\Title\Fieldset $fieldset,
+ \Magento\Tax\Block\Adminhtml\Rate\Title\Fieldset $fieldset,
\Magento\Tax\Model\Calculation\RateFactory $rateFactory,
\Magento\Tax\Model\Calculation\Rate $rate,
\Magento\Tax\Helper\Data $taxData,
@@ -223,7 +223,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
'class' => 'validate-not-negative-number'
));
- $form->setAction($this->getUrl('adminhtml/tax_rate/save'));
+ $form->setAction($this->getUrl('tax/rate/save'));
$form->setUseContainer(true);
$form->setId(self::FORM_ELEMENT_ID);
$form->setMethod('post');
@@ -244,7 +244,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
$this->setChild(
'form_after',
$this->getLayout()->createBlock('Magento\Core\Block\Template')
- ->setTemplate('Magento_Adminhtml::tax/rate/js.phtml')
+ ->setTemplate('Magento_Tax::rate/js.phtml')
);
return parent::_prepareForm();
diff --git a/app/code/Magento/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Grid/Renderer/Country.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php
rename to app/code/Magento/Tax/Block/Adminhtml/Rate/Grid/Renderer/Country.php
index 385a4c78809..78682b4e865 100644
--- a/app/code/Magento/Adminhtml/Block/Tax/Rate/Grid/Renderer/Country.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Grid/Renderer/Country.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Adminhtml tax rates grid item renderer country
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Tax\Rate\Grid\Renderer;
+namespace Magento\Tax\Block\Adminhtml\Rate\Grid\Renderer;
class Country extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Country
{
diff --git a/app/code/Magento/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Grid/Renderer/Data.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php
rename to app/code/Magento/Tax/Block/Adminhtml/Rate/Grid/Renderer/Data.php
index ad250a4f70f..a0e4284311d 100644
--- a/app/code/Magento/Adminhtml/Block/Tax/Rate/Grid/Renderer/Data.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Grid/Renderer/Data.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,11 +28,11 @@
* Adminhtml grid item renderer number
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Tax\Rate\Grid\Renderer;
+namespace Magento\Tax\Block\Adminhtml\Rate\Grid\Renderer;
class Data extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer
{
diff --git a/app/code/Magento/Adminhtml/Block/Tax/Rate/ImportExport.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/ImportExport.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Tax/Rate/ImportExport.php
rename to app/code/Magento/Tax/Block/Adminhtml/Rate/ImportExport.php
index 58d27e489e6..972d6fed65d 100644
--- a/app/code/Magento/Adminhtml/Block/Tax/Rate/ImportExport.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/ImportExport.php
@@ -19,17 +19,17 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Tax\Rate;
+namespace Magento\Tax\Block\Adminhtml\Rate;
class ImportExport extends \Magento\Adminhtml\Block\Widget
{
- protected $_template = 'tax/importExport.phtml';
+ protected $_template = 'importExport.phtml';
/**
* @param \Magento\Core\Helper\Data $coreData
diff --git a/app/code/Magento/Adminhtml/Block/Tax/Rate/ImportExportHeader.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/ImportExportHeader.php
similarity index 87%
rename from app/code/Magento/Adminhtml/Block/Tax/Rate/ImportExportHeader.php
rename to app/code/Magento/Tax/Block/Adminhtml/Rate/ImportExportHeader.php
index 047fb56855f..e854b7b5ade 100644
--- a/app/code/Magento/Adminhtml/Block/Tax/Rate/ImportExportHeader.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/ImportExportHeader.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,10 +28,10 @@
* Adminhtml import/export header block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Tax\Rate;
+namespace Magento\Tax\Block\Adminhtml\Rate;
class ImportExportHeader extends \Magento\Adminhtml\Block\Widget
{
@@ -40,5 +40,5 @@ class ImportExportHeader extends \Magento\Adminhtml\Block\Widget
*
* @var string
*/
- protected $_template = 'tax/importExportHeader.phtml';
+ protected $_template = 'importExportHeader.phtml';
}
diff --git a/app/code/Magento/Adminhtml/Block/Tax/Rate/Title.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Tax/Rate/Title.php
rename to app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php
index 0d08f68e79b..7961349ee2d 100644
--- a/app/code/Magento/Adminhtml/Block/Tax/Rate/Title.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Title.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -30,13 +30,13 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Tax\Rate;
+namespace Magento\Tax\Block\Adminhtml\Rate;
class Title extends \Magento\Core\Block\Template
{
protected $_titles;
- protected $_template = 'tax/rate/title.phtml';
+ protected $_template = 'rate/title.phtml';
/**
* @var \Magento\Tax\Model\Calculation\Rate
diff --git a/app/code/Magento/Adminhtml/Block/Tax/Rate/Title/Fieldset.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Title/Fieldset.php
similarity index 88%
rename from app/code/Magento/Adminhtml/Block/Tax/Rate/Title/Fieldset.php
rename to app/code/Magento/Tax/Block/Adminhtml/Rate/Title/Fieldset.php
index 12e55fe7a84..aadfa9144b3 100644
--- a/app/code/Magento/Adminhtml/Block/Tax/Rate/Title/Fieldset.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Title/Fieldset.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -30,24 +30,24 @@
*
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Tax\Rate\Title;
+namespace Magento\Tax\Block\Adminhtml\Rate\Title;
class Fieldset extends \Magento\Data\Form\Element\Fieldset
{
/**
- * @var \Magento\Adminhtml\Block\Tax\Rate\Title
+ * @var \Magento\Tax\Block\Adminhtml\Rate\Title
*/
protected $_title;
/**
- * @param \Magento\Adminhtml\Block\Tax\Rate\Title $title
+ * @param \Magento\Tax\Block\Adminhtml\Rate\Title $title
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Data\Form\Element\Factory $factoryElement
* @param \Magento\Data\Form\Element\CollectionFactory $factoryCollection
* @param array $attributes
*/
public function __construct(
- \Magento\Adminhtml\Block\Tax\Rate\Title $title,
+ \Magento\Tax\Block\Adminhtml\Rate\Title $title,
\Magento\Core\Helper\Data $coreData,
\Magento\Data\Form\Element\Factory $factoryElement,
\Magento\Data\Form\Element\CollectionFactory $factoryCollection,
diff --git a/app/code/Magento/Adminhtml/Block/Tax/Rate/Toolbar/Add.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
similarity index 87%
rename from app/code/Magento/Adminhtml/Block/Tax/Rate/Toolbar/Add.php
rename to app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
index b601f85d3c7..8452d1ca86a 100644
--- a/app/code/Magento/Adminhtml/Block/Tax/Rate/Toolbar/Add.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,22 +28,22 @@
* Admin tax class product toolbar
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Tax\Rate\Toolbar;
+namespace Magento\Tax\Block\Adminhtml\Rate\Toolbar;
class Add extends \Magento\Adminhtml\Block\Template
{
- protected $_template = 'tax/toolbar/rate/add.phtml';
+ protected $_template = 'toolbar/rate/add.phtml';
protected function _prepareLayout()
{
$this->addChild('addButton', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Add New Tax Rate'),
- 'onclick' => 'window.location.href=\''.$this->getUrl('*/tax_rate/add').'\'',
+ 'onclick' => 'window.location.href=\''.$this->getUrl('tax/rate/add').'\'',
'class' => 'add'
));
return parent::_prepareLayout();
diff --git a/app/code/Magento/Adminhtml/Block/Tax/Rate/Toolbar/Save.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
similarity index 88%
rename from app/code/Magento/Adminhtml/Block/Tax/Rate/Toolbar/Save.php
rename to app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
index 95cbd680535..6183d11988b 100644
--- a/app/code/Magento/Adminhtml/Block/Tax/Rate/Toolbar/Save.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,21 +28,21 @@
* Admin tax rate save toolbar
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Tax\Rate\Toolbar;
+namespace Magento\Tax\Block\Adminhtml\Rate\Toolbar;
class Save extends \Magento\Adminhtml\Block\Template
{
- protected $_template = 'tax/toolbar/rate/save.phtml';
+ protected $_template = 'toolbar/rate/save.phtml';
protected function _construct()
{
parent::_construct();
- $this->assign('createUrl', $this->getUrl('*/tax_rate/save'));
+ $this->assign('createUrl', $this->getUrl('tax/rate/save'));
}
@@ -50,7 +50,7 @@ class Save extends \Magento\Adminhtml\Block\Template
{
$this->addChild('backButton', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Back'),
- 'onclick' => 'window.location.href=\''.$this->getUrl('*/*/').'\'',
+ 'onclick' => 'window.location.href=\''.$this->getUrl('tax/*/').'\'',
'class' => 'back'
));
@@ -66,7 +66,7 @@ class Save extends \Magento\Adminhtml\Block\Template
$this->addChild('deleteButton', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Delete Rate'),
- 'onclick' => 'deleteConfirm(\'' . __('Are you sure you want to do this?') . '\', \'' . $this->getUrl('*/*/delete', array('rate' => $this->getRequest()->getParam('rate'))) . '\')',
+ 'onclick' => 'deleteConfirm(\'' . __('Are you sure you want to do this?') . '\', \'' . $this->getUrl('tax/*/delete', array('rate' => $this->getRequest()->getParam('rate'))) . '\')',
'class' => 'delete'
));
return parent::_prepareLayout();
diff --git a/app/code/Magento/Adminhtml/Block/Tax/Rule.php b/app/code/Magento/Tax/Block/Adminhtml/Rule.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Tax/Rule.php
rename to app/code/Magento/Tax/Block/Adminhtml/Rule.php
index 422cc4eb155..9a671ae6e53 100644
--- a/app/code/Magento/Adminhtml/Block/Tax/Rule.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rule.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,11 +28,11 @@
* Admin tax rule content block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Tax;
+namespace Magento\Tax\Block\Adminhtml;
class Rule extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
diff --git a/app/code/Magento/Adminhtml/Block/Tax/Rule/Edit.php b/app/code/Magento/Tax/Block/Adminhtml/Rule/Edit.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Tax/Rule/Edit.php
rename to app/code/Magento/Tax/Block/Adminhtml/Rule/Edit.php
index cafb8557a17..2d0bb43b12e 100644
--- a/app/code/Magento/Adminhtml/Block/Tax/Rule/Edit.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rule/Edit.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Adminhtml tax rule Edit Container
*/
-namespace Magento\Adminhtml\Block\Tax\Rule;
+namespace Magento\Tax\Block\Adminhtml\Rule;
class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
{
@@ -62,7 +62,8 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
protected function _construct()
{
$this->_objectId = 'rule';
- $this->_controller = 'tax_rule';
+ $this->_controller = 'adminhtml_rule';
+ $this->_blockGroup = 'Magento_Tax';
parent::_construct();
diff --git a/app/code/Magento/Adminhtml/Block/Tax/Rule/Edit/Form.php b/app/code/Magento/Tax/Block/Adminhtml/Rule/Edit/Form.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Tax/Rule/Edit/Form.php
rename to app/code/Magento/Tax/Block/Adminhtml/Rule/Edit/Form.php
index 5e23ffab589..7a1e8e439a6 100644
--- a/app/code/Magento/Adminhtml/Block/Tax/Rule/Edit/Form.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rule/Edit/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -27,7 +27,7 @@
/**
* Adminhtml Tax Rule Edit Form
*/
-namespace Magento\Adminhtml\Block\Tax\Rule\Edit;
+namespace Magento\Tax\Block\Adminhtml\Rule\Edit;
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
@@ -189,7 +189,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
}
$form->addValues($model->getData());
- $form->setAction($this->getUrl('*/tax_rule/save'));
+ $form->setAction($this->getUrl('tax/rule/save'));
$form->setUseContainer($this->getUseContainer());
$this->setForm($form);
@@ -217,9 +217,9 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
public function getTaxClassSelectConfig($classType)
{
$config = array(
- 'new_url' => $this->getUrl('adminhtml/tax_tax/ajaxSave/'),
- 'save_url' => $this->getUrl('adminhtml/tax_tax/ajaxSave/'),
- 'delete_url' => $this->getUrl('adminhtml/tax_tax/ajaxDelete/'),
+ 'new_url' => $this->getUrl('tax/tax/ajaxSave/'),
+ 'save_url' => $this->getUrl('tax/tax/ajaxSave/'),
+ 'delete_url' => $this->getUrl('tax/tax/ajaxDelete/'),
'delete_confirm_message' => __('Do you really want to delete this tax class?'),
'target_select_id' => $this->getTaxClassSelectHtmlId($classType),
'add_button_caption' => __('Add New Tax Class'),
@@ -241,7 +241,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
*/
public function getTaxRateDeleteUrl()
{
- return $this->getUrl('adminhtml/tax_rate/ajaxDelete/');
+ return $this->getUrl('tax/rate/ajaxDelete/');
}
/**
@@ -251,6 +251,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
*/
public function getTaxRateSaveUrl()
{
- return $this->getUrl('adminhtml/tax_rate/ajaxSave/');
+ return $this->getUrl('tax/rate/ajaxSave/');
}
}
diff --git a/app/code/Magento/Tax/Block/Sales/Order/Tax.php b/app/code/Magento/Tax/Block/Sales/Order/Tax.php
index 0f1e2a36752..aaeae5387c1 100644
--- a/app/code/Magento/Tax/Block/Sales/Order/Tax.php
+++ b/app/code/Magento/Tax/Block/Sales/Order/Tax.php
@@ -83,7 +83,7 @@ class Tax extends \Magento\Core\Block\Template
*/
public function initTotals()
{
- /** @var $parent \Magento\Adminhtml\Block\Sales\Order\Invoice\Totals */
+ /** @var $parent \Magento\Sales\Block\Adminhtml\Order\Invoice\Totals */
$parent = $this->getParentBlock();
$this->_order = $parent->getOrder();
$this->_source = $parent->getSource();
diff --git a/app/code/Magento/Adminhtml/Controller/Tax/Rate.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Controller/Tax/Rate.php
rename to app/code/Magento/Tax/Controller/Adminhtml/Rate.php
index 474438fab8a..a71debda121 100644
--- a/app/code/Magento/Adminhtml/Controller/Tax/Rate.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,13 @@
* Adminhtml tax rate controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Tax;
+namespace Magento\Tax\Controller\Adminhtml;
-class Rate extends \Magento\Adminhtml\Controller\Action
+class Rate extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Show Main Grid
@@ -69,13 +69,13 @@ class Rate extends \Magento\Adminhtml\Controller\Action
}
$this->_initAction()
- ->_addBreadcrumb(__('Manage Tax Rates'), __('Manage Tax Rates'), $this->getUrl('*/tax_rate'))
+ ->_addBreadcrumb(__('Manage Tax Rates'), __('Manage Tax Rates'), $this->getUrl('tax/rate'))
->_addBreadcrumb(__('New Tax Rate'), __('New Tax Rate'))
->_addContent(
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Tax\Rate\Toolbar\Save')
+ $this->getLayout()->createBlock('Magento\Tax\Block\Adminhtml\Rate\Toolbar\Save')
->assign('header', __('Add New Tax Rate'))
->assign('form',
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Tax\Rate\Form', 'tax_rate_form')
+ $this->getLayout()->createBlock('Magento\Tax\Block\Adminhtml\Rate\Form', 'tax_rate_form')
)
)
->renderLayout();
@@ -116,7 +116,7 @@ class Rate extends \Magento\Adminhtml\Controller\Action
$this->_redirectReferer();
return;
}
- $this->getResponse()->setRedirect($this->getUrl('*/tax_rate'));
+ $this->getResponse()->setRedirect($this->getUrl('tax/rate'));
}
/**
@@ -195,13 +195,13 @@ class Rate extends \Magento\Adminhtml\Controller\Action
$this->_title(sprintf("%s", $rateModel->getCode()));
$this->_initAction()
- ->_addBreadcrumb(__('Manage Tax Rates'), __('Manage Tax Rates'), $this->getUrl('*/tax_rate'))
+ ->_addBreadcrumb(__('Manage Tax Rates'), __('Manage Tax Rates'), $this->getUrl('tax/rate'))
->_addBreadcrumb(__('Edit Tax Rate'), __('Edit Tax Rate'))
->_addContent(
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Tax\Rate\Toolbar\Save')
+ $this->getLayout()->createBlock('Magento\Tax\Block\Adminhtml\Rate\Toolbar\Save')
->assign('header', __('Edit Tax Rate'))
->assign('form',
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Tax\Rate\Form', 'tax_rate_form')
+ $this->getLayout()->createBlock('Magento\Tax\Block\Adminhtml\Rate\Form', 'tax_rate_form')
->setShowLegend(true)
)
)
@@ -243,7 +243,7 @@ class Rate extends \Magento\Adminhtml\Controller\Action
} else {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')
->addError(__('Something went wrong deleting this rate because of an incorrect rate ID.'));
- $this->getResponse()->setRedirect($this->getUrl('*/*/'));
+ $this->getResponse()->setRedirect($this->getUrl('tax/*/'));
}
}
}
@@ -301,7 +301,7 @@ class Rate extends \Magento\Adminhtml\Controller\Action
/**
* Initialize action
*
- * @return \Magento\Adminhtml\Controller\Action
+ * @return \Magento\Backend\Controller\Adminhtml\Action
*/
protected function _initAction()
{
@@ -324,8 +324,8 @@ class Rate extends \Magento\Adminhtml\Controller\Action
$this->loadLayout()
->_setActiveMenu('Magento_Tax::system_convert_tax')
- ->_addContent($this->getLayout()->createBlock('Magento\Adminhtml\Block\Tax\Rate\ImportExportHeader'))
- ->_addContent($this->getLayout()->createBlock('Magento\Adminhtml\Block\Tax\Rate\ImportExport'))
+ ->_addContent($this->getLayout()->createBlock('Magento\Tax\Block\Adminhtml\Rate\ImportExportHeader'))
+ ->_addContent($this->getLayout()->createBlock('Magento\Tax\Block\Adminhtml\Rate\ImportExport'))
->renderLayout();
}
diff --git a/app/code/Magento/Adminhtml/Controller/Tax/Rule.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Controller/Tax/Rule.php
rename to app/code/Magento/Tax/Controller/Adminhtml/Rule.php
index b6a0bf98a82..4084f0bb445 100644
--- a/app/code/Magento/Adminhtml/Controller/Tax/Rule.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Tax rule controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Tax;
+namespace Magento\Tax\Controller\Adminhtml;
-class Rule extends \Magento\Adminhtml\Controller\Action
+class Rule extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -79,7 +79,7 @@ class Rule extends \Magento\Adminhtml\Controller\Action
if (!$ruleModel->getId()) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->unsRuleData();
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(__('This rule no longer exists.'));
- $this->_redirect('*/*/');
+ $this->_redirect('tax/*/');
return;
}
}
@@ -112,11 +112,11 @@ class Rule extends \Magento\Adminhtml\Controller\Action
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addSuccess(__('The tax rule has been saved.'));
if ($this->getRequest()->getParam('back')) {
- $this->_redirect('*/*/edit', array('rule' => $ruleModel->getId()));
+ $this->_redirect('tax/*/edit', array('rule' => $ruleModel->getId()));
return;
}
- $this->_redirect('*/*/');
+ $this->_redirect('tax/*/');
return;
} catch (\Magento\Core\Exception $e) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError($e->getMessage());
@@ -128,7 +128,7 @@ class Rule extends \Magento\Adminhtml\Controller\Action
$this->_redirectReferer();
return;
}
- $this->getResponse()->setRedirect($this->getUrl('*/tax_rule'));
+ $this->getResponse()->setRedirect($this->getUrl('tax/rule'));
}
public function deleteAction()
@@ -138,7 +138,7 @@ class Rule extends \Magento\Adminhtml\Controller\Action
->load($ruleId);
if (!$ruleModel->getId()) {
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addError(__('This rule no longer exists'));
- $this->_redirect('*/*/');
+ $this->_redirect('tax/*/');
return;
}
@@ -146,7 +146,7 @@ class Rule extends \Magento\Adminhtml\Controller\Action
$ruleModel->delete();
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addSuccess(__('The tax rule has been deleted.'));
- $this->_redirect('*/*/');
+ $this->_redirect('tax/*/');
return;
} catch (\Magento\Core\Exception $e) {
@@ -161,7 +161,7 @@ class Rule extends \Magento\Adminhtml\Controller\Action
/**
* Initialize action
*
- * @return \Magento\Adminhtml\Controller\Action
+ * @return \Magento\Backend\Controller\Adminhtml\Action
*/
protected function _initAction()
{
diff --git a/app/code/Magento/Adminhtml/Controller/Tax/Tax.php b/app/code/Magento/Tax/Controller/Adminhtml/Tax.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Controller/Tax/Tax.php
rename to app/code/Magento/Tax/Controller/Adminhtml/Tax.php
index 509db35075f..acf972ee6b5 100644
--- a/app/code/Magento/Adminhtml/Controller/Tax/Tax.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Tax.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,12 +28,12 @@
* Adminhtml common tax class controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Tax;
+namespace Magento\Tax\Controller\Adminhtml;
-class Tax extends \Magento\Adminhtml\Controller\Action
+class Tax extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Save Tax Class via AJAX
diff --git a/app/code/Magento/Tax/etc/adminhtml/menu.xml b/app/code/Magento/Tax/etc/adminhtml/menu.xml
index 9d52cbab99f..75eb983de20 100644
--- a/app/code/Magento/Tax/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Tax/etc/adminhtml/menu.xml
@@ -28,8 +28,8 @@
<config>
<menu>
<add id="Magento_Tax::sales_tax" title="Taxes" module="Magento_Tax" sortOrder="20" parent="Magento_Adminhtml::stores" resource="Magento_Tax::manage_tax"/>
- <add id="Magento_Tax::sales_tax_rules" title="Tax Rules" module="Magento_Tax" sortOrder="10" parent="Magento_Tax::sales_tax" action="adminhtml/tax_rule" resource="Magento_Tax::manage_tax"/>
- <add id="Magento_Tax::sales_tax_rates" title="Tax Zones and Rates" module="Magento_Tax" sortOrder="20" parent="Magento_Tax::sales_tax" action="adminhtml/tax_rate" resource="Magento_Tax::manage_tax"/>
- <add id="Magento_Tax::system_convert_tax" title="Import/Export Tax Rates" sortOrder="30" module="Magento_Tax" parent="Magento_Adminhtml::system_convert" action="adminhtml/tax_rate/importExport" resource="Magento_Tax::import_export"/>
+ <add id="Magento_Tax::sales_tax_rules" title="Tax Rules" module="Magento_Tax" sortOrder="10" parent="Magento_Tax::sales_tax" action="tax/rule" resource="Magento_Tax::manage_tax"/>
+ <add id="Magento_Tax::sales_tax_rates" title="Tax Zones and Rates" module="Magento_Tax" sortOrder="20" parent="Magento_Tax::sales_tax" action="tax/rate" resource="Magento_Tax::manage_tax"/>
+ <add id="Magento_Tax::system_convert_tax" title="Import/Export Tax Rates" sortOrder="30" module="Magento_Tax" parent="Magento_Adminhtml::system_convert" action="tax/rate/importExport" resource="Magento_Tax::import_export"/>
</menu>
</config>
diff --git a/app/code/Magento/Media/etc/frontend/routes.xml b/app/code/Magento/Tax/etc/adminhtml/routes.xml
similarity index 89%
rename from app/code/Magento/Media/etc/frontend/routes.xml
rename to app/code/Magento/Tax/etc/adminhtml/routes.xml
index b79187943fd..f3a79589c73 100644
--- a/app/code/Magento/Media/etc/frontend/routes.xml
+++ b/app/code/Magento/Tax/etc/adminhtml/routes.xml
@@ -24,9 +24,9 @@
*/
-->
<config>
- <router id="standard">
- <route id="media" frontName="media">
- <module name="Magento_Media" />
+ <router id="admin">
+ <route id="tax" frontName="tax">
+ <module name="Magento_Tax" />
</route>
</router>
</config>
\ No newline at end of file
diff --git a/app/code/Magento/Tax/etc/sales.xml b/app/code/Magento/Tax/etc/sales.xml
index 4aadb62f31e..136e916ec08 100644
--- a/app/code/Magento/Tax/etc/sales.xml
+++ b/app/code/Magento/Tax/etc/sales.xml
@@ -30,23 +30,23 @@
<item name="tax_shipping" instance="Magento\Tax\Model\Sales\Total\Quote\Shipping" sort_order="300"/>
<item name="tax" instance="Magento\Tax\Model\Sales\Total\Quote\Tax" sort_order="450">
<renderer name="frontend" instance="Magento\Tax\Block\Checkout\Tax"/>
- <renderer name="adminhtml" instance="Magento\Adminhtml\Block\Sales\Order\Create\Totals\Tax"/>
+ <renderer name="adminhtml" instance="Magento\Sales\Block\Adminhtml\Order\Create\Totals\Tax"/>
</item>
<item name="subtotal">
<renderer name="frontend" instance="Magento\Tax\Block\Checkout\Subtotal"/>
- <renderer name="adminhtml" instance="Magento\Adminhtml\Block\Sales\Order\Create\Totals\Subtotal"/>
+ <renderer name="adminhtml" instance="Magento\Sales\Block\Adminhtml\Order\Create\Totals\Subtotal"/>
</item>
<item name="shipping">
<renderer name="frontend" instance="Magento\Tax\Block\Checkout\Shipping"/>
- <renderer name="adminhtml" instance="Magento\Adminhtml\Block\Sales\Order\Create\Totals\Shipping"/>
+ <renderer name="adminhtml" instance="Magento\Sales\Block\Adminhtml\Order\Create\Totals\Shipping"/>
</item>
<item name="discount">
<renderer name="frontend" instance="Magento\Tax\Block\Checkout\Discount"/>
- <renderer name="adminhtml" instance="Magento\Adminhtml\Block\Sales\Order\Create\Totals\Discount"/>
+ <renderer name="adminhtml" instance="Magento\Sales\Block\Adminhtml\Order\Create\Totals\Discount"/>
</item>
<item name="grand_total">
<renderer name="frontend" instance="Magento\Tax\Block\Checkout\Grandtotal"/>
- <renderer name="adminhtml" instance="Magento\Adminhtml\Block\Sales\Order\Create\Totals\Grandtotal"/>
+ <renderer name="adminhtml" instance="Magento\Sales\Block\Adminhtml\Order\Create\Totals\Grandtotal"/>
</item>
</group>
<group name="nominal_totals">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/tax/class/page/edit.phtml b/app/code/Magento/Tax/view/adminhtml/class/page/edit.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/tax/class/page/edit.phtml
rename to app/code/Magento/Tax/view/adminhtml/class/page/edit.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/tax/importExport.phtml b/app/code/Magento/Tax/view/adminhtml/importExport.phtml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/tax/importExport.phtml
rename to app/code/Magento/Tax/view/adminhtml/importExport.phtml
index c93ab8ffdbd..ea43099e8ed 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/tax/importExport.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/importExport.phtml
@@ -28,7 +28,7 @@
<?php if (!$this->getIsReadonly()): ?>
<div class="import-tax-rates">
<?php if ($this->getUseContainer()): ?>
- <form id="import-form" action="<?php echo $this->getUrl('adminhtml/tax_rate/importPost') ?>" method="post" enctype="multipart/form-data">
+ <form id="import-form" action="<?php echo $this->getUrl('tax/rate/importPost') ?>" method="post" enctype="multipart/form-data">
<?php endif; ?>
<?php echo $this->getBlockHtml('formkey')?>
<fieldset class="fieldset">
@@ -57,7 +57,7 @@
<?php endif; ?>
<div class="export-tax-rates <?php if ($this->getIsReadonly()): ?>box-left<?php else: ?>box-right<?php endif; ?>">
<?php if ($this->getUseContainer()): ?>
- <form id="export_form" action="<?php echo $this->getUrl('adminhtml/tax_rate/exportPost') ?>" method="post" enctype="multipart/form-data">
+ <form id="export_form" action="<?php echo $this->getUrl('tax/rate/exportPost') ?>" method="post" enctype="multipart/form-data">
<?php endif; ?>
<?php echo $this->getBlockHtml('formkey')?>
<fieldset class="fieldset">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/tax/importExportHeader.phtml b/app/code/Magento/Tax/view/adminhtml/importExportHeader.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/tax/importExportHeader.phtml
rename to app/code/Magento/Tax/view/adminhtml/importExportHeader.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_tax_rate_block.xml b/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_block.xml
similarity index 96%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_tax_rate_block.xml
rename to app/code/Magento/Tax/view/adminhtml/layout/tax_rate_block.xml
index 8e7d2bb9bd0..5678794eb43 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_tax_rate_block.xml
+++ b/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_block.xml
@@ -37,11 +37,11 @@
<arguments>
<argument name="exportTypes" xsi:type="array">
<item name="csv" xsi:type="array">
- <item name="urlPath" xsi:type="string">*/*/exportCsv</item>
+ <item name="urlPath" xsi:type="string">tax/*/exportCsv</item>
<item name="label" xsi:type="string" translate="true">CSV</item>
</item>
<item name="excel" xsi:type="array">
- <item name="urlPath" xsi:type="string">*/*/exportXml</item>
+ <item name="urlPath" xsi:type="string">tax/*/exportXml</item>
<item name="label" xsi:type="string" translate="true">Excel XML</item>
</item>
</argument>
@@ -51,7 +51,7 @@
<arguments>
<argument name="id" xsi:type="string">tax_rate_grid</argument>
<argument name="rowUrl" xsi:type="array">
- <item name="path" xsi:type="string">*/*/edit</item>
+ <item name="path" xsi:type="string">tax/*/edit</item>
<item name="extraParamsTemplate" xsi:type="array">
<item name="rate" xsi:type="string">getTaxCalculationRateId</item>
</item>
@@ -73,7 +73,7 @@
<argument name="align" xsi:type="string">left</argument>
<argument name="filter_index" xsi:type="string">main_table.tax_country_id</argument>
<argument name="index" xsi:type="string">tax_country_id</argument>
- <argument name="renderer" xsi:type="string">Magento\Adminhtml\Block\Tax\Rate\Grid\Renderer\Country</argument>
+ <argument name="renderer" xsi:type="string">Magento\Tax\Block\Adminhtml\Rate\Grid\Renderer\Country</argument>
<argument name="sortable" xsi:type="string">0</argument>
</arguments>
</block>
@@ -102,7 +102,7 @@
<argument name="index" xsi:type="string">rate</argument>
<argument name="type" xsi:type="string">number</argument>
<argument name="default" xsi:type="string">0.00</argument>
- <argument name="renderer" xsi:type="string">Magento\Adminhtml\Block\Tax\Rate\Grid\Renderer\Data</argument>
+ <argument name="renderer" xsi:type="string">Magento\Tax\Block\Adminhtml\Rate\Grid\Renderer\Data</argument>
</arguments>
</block>
</block>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_tax_rate_exportcsv.xml b/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_exportcsv.xml
similarity index 96%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_tax_rate_exportcsv.xml
rename to app/code/Magento/Tax/view/adminhtml/layout/tax_rate_exportcsv.xml
index 9ad6df6f8ab..aed286cddff 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_tax_rate_exportcsv.xml
+++ b/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_exportcsv.xml
@@ -24,6 +24,6 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_tax_rate_block"/>
+ <update handle="tax_rate_block"/>
<block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.tax.rate.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_tax_rate_exportxml.xml b/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_exportxml.xml
similarity index 96%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_tax_rate_exportxml.xml
rename to app/code/Magento/Tax/view/adminhtml/layout/tax_rate_exportxml.xml
index 9ad6df6f8ab..aed286cddff 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_tax_rate_exportxml.xml
+++ b/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_exportxml.xml
@@ -24,6 +24,6 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_tax_rate_block"/>
+ <update handle="tax_rate_block"/>
<block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.tax.rate.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_tax_rate_index.xml b/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_index.xml
similarity index 91%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_tax_rate_index.xml
rename to app/code/Magento/Tax/view/adminhtml/layout/tax_rate_index.xml
index 02dc624f375..0aaf016eff6 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_tax_rate_index.xml
+++ b/app/code/Magento/Tax/view/adminhtml/layout/tax_rate_index.xml
@@ -25,8 +25,8 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<update handle="formkey"/>
- <update handle="adminhtml_tax_rate_block"/>
+ <update handle="tax_rate_block"/>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Tax\Rate\Toolbar\Add" name="adminhtml.tax.rate.container"/>
+ <block class="Magento\Tax\Block\Adminhtml\Rate\Toolbar\Add" name="adminhtml.tax.rate.container"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_tax_rule_block.xml b/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_block.xml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_tax_rule_block.xml
rename to app/code/Magento/Tax/view/adminhtml/layout/tax_rule_block.xml
index 0ade1a03a82..13ec942784a 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_tax_rule_block.xml
+++ b/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_block.xml
@@ -36,7 +36,7 @@
<block class="Magento\Backend\Block\Widget\Grid\ColumnSet" name="adminhtml.block.tax.rule.columnSet" as="grid.columnSet">
<arguments>
<argument name="rowUrl" xsi:type="array">
- <item name="path" xsi:type="string">*/*/edit</item>
+ <item name="path" xsi:type="string">tax/*/edit</item>
<item name="extraParamsTemplate" xsi:type="array">
<item name="rule" xsi:type="string">getId</item>
</item>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_tax_rule_edit.xml b/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_edit.xml
similarity index 85%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_tax_rule_edit.xml
rename to app/code/Magento/Tax/view/adminhtml/layout/tax_rule_edit.xml
index 12a3897379c..0916b3dd6f6 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_tax_rule_edit.xml
+++ b/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_edit.xml
@@ -52,9 +52,9 @@
</block>
</referenceBlock>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Tax\Rule\Edit"/>
- <block class="Magento\Adminhtml\Block\Tax\Rule\Edit\Form" name="tax-rule-edit" template="Magento_Adminhtml::tax/rule/edit.phtml"/>
- <block class="Magento\Adminhtml\Block\Tax\Rate\Form" name="tax-rate-form" template="tax/rule/rate/form.phtml"/>
- <block class="Magento\Adminhtml\Block\Tax\Rate\ImportExport" name="tax-rate-importExport" template="tax/importExport.phtml"/>
+ <block class="Magento\Tax\Block\Adminhtml\Rule\Edit"/>
+ <block class="Magento\Tax\Block\Adminhtml\Rule\Edit\Form" name="tax-rule-edit" template="rule/edit.phtml"/>
+ <block class="Magento\Tax\Block\Adminhtml\Rate\Form" name="tax-rate-form" template="rule/rate/form.phtml"/>
+ <block class="Magento\Tax\Block\Adminhtml\Rate\ImportExport" name="tax-rate-importExport" template="importExport.phtml"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_tax_rule_index.xml b/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_index.xml
similarity index 90%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_tax_rule_index.xml
rename to app/code/Magento/Tax/view/adminhtml/layout/tax_rule_index.xml
index 7d70bb2592f..6d2ef770e2b 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_tax_rule_index.xml
+++ b/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_index.xml
@@ -24,8 +24,8 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_tax_rule_block"/>
+ <update handle="tax_rule_block"/>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Tax\Rule" name="adminhtml.block.tax.rule.container"/>
+ <block class="Magento\Tax\Block\Adminhtml\Rule" name="adminhtml.block.tax.rule.container"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/tax/rate/form.phtml b/app/code/Magento/Tax/view/adminhtml/rate/form.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/tax/rate/form.phtml
rename to app/code/Magento/Tax/view/adminhtml/rate/form.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/tax/rate/js.phtml b/app/code/Magento/Tax/view/adminhtml/rate/js.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/tax/rate/js.phtml
rename to app/code/Magento/Tax/view/adminhtml/rate/js.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/tax/rate/title.phtml b/app/code/Magento/Tax/view/adminhtml/rate/title.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/tax/rate/title.phtml
rename to app/code/Magento/Tax/view/adminhtml/rate/title.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/tax/rule/edit.phtml b/app/code/Magento/Tax/view/adminhtml/rule/edit.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/tax/rule/edit.phtml
rename to app/code/Magento/Tax/view/adminhtml/rule/edit.phtml
index f1225508d70..59d2bb155cc 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/tax/rule/edit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/rule/edit.phtml
@@ -24,7 +24,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-/** @var $this \Magento\Adminhtml\Block\Tax\Rule\Edit\Form */
+/** @var $this \Magento\Tax\Block\Adminhtml\Rule\Edit\Form */
?>
<script type="text/javascript">
(function ($) {
@@ -124,7 +124,7 @@
var taxRate = $('#tax_rate'),
taxRateField = taxRate.parent(),
taxRateForm = $('#tax-rate-form'),
- taxRateFormElement = $('#<?php echo \Magento\Adminhtml\Block\Tax\Rate\Form::FORM_ELEMENT_ID ?>');
+ taxRateFormElement = $('#<?php echo \Magento\Tax\Block\Adminhtml\Rate\Form::FORM_ELEMENT_ID ?>');
if (!this.isEntityEditable) {
// Override default layout of editable multiselect
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/tax/rule/rate/form.phtml b/app/code/Magento/Tax/view/adminhtml/rule/rate/form.phtml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/tax/rule/rate/form.phtml
rename to app/code/Magento/Tax/view/adminhtml/rule/rate/form.phtml
index 70dc674b1a9..1871fcc75e4 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/tax/rule/rate/form.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/rule/rate/form.phtml
@@ -23,7 +23,7 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-/* @var $this \Magento\Adminhtml\Block\Tax\Rate\Form */
+/* @var $this \Magento\Tax\Block\Adminhtml\Rate\Form */
?>
<div id="<?php echo $this->getNameInLayout() ?>" style="display:none">
<?php echo $this->getFormHtml();?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/tax/toolbar/class/add.phtml b/app/code/Magento/Tax/view/adminhtml/toolbar/class/add.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/tax/toolbar/class/add.phtml
rename to app/code/Magento/Tax/view/adminhtml/toolbar/class/add.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/tax/toolbar/class/save.phtml b/app/code/Magento/Tax/view/adminhtml/toolbar/class/save.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/tax/toolbar/class/save.phtml
rename to app/code/Magento/Tax/view/adminhtml/toolbar/class/save.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/tax/toolbar/rate/add.phtml b/app/code/Magento/Tax/view/adminhtml/toolbar/rate/add.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/tax/toolbar/rate/add.phtml
rename to app/code/Magento/Tax/view/adminhtml/toolbar/rate/add.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/tax/toolbar/rate/save.phtml b/app/code/Magento/Tax/view/adminhtml/toolbar/rate/save.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/tax/toolbar/rate/save.phtml
rename to app/code/Magento/Tax/view/adminhtml/toolbar/rate/save.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/tax/toolbar/rule/add.phtml b/app/code/Magento/Tax/view/adminhtml/toolbar/rule/add.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/tax/toolbar/rule/add.phtml
rename to app/code/Magento/Tax/view/adminhtml/toolbar/rule/add.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/tax/toolbar/rule/save.phtml b/app/code/Magento/Tax/view/adminhtml/toolbar/rule/save.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/tax/toolbar/rule/save.phtml
rename to app/code/Magento/Tax/view/adminhtml/toolbar/rule/save.phtml
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit.php
index 05b45b24077..480af10a823 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit.php
@@ -95,7 +95,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
$message = __('Are you sure you want to delete this theme?');
$onClick = sprintf("deleteConfirm('%s', '%s')",
$message,
- $this->getUrl('*/*/delete', array('id' => $theme->getId()))
+ $this->getUrl('adminhtml/*/delete', array('id' => $theme->getId()))
);
$this->_updateButton('delete', 'onclick', $onClick);
}
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form.php
index 547b2bd19c7..707ac75b239 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Form.php
@@ -44,7 +44,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
$form = $this->_formFactory->create(array(
'attributes' => array(
'id' => 'edit_form',
- 'action' => $this->getUrl('*/*/save'),
+ 'action' => $this->getUrl('adminhtml/*/save'),
'enctype' => 'multipart/form-data',
'method' => 'post',
))
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
index e83fbdf4e28..7451577aa51 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
@@ -181,7 +181,7 @@ class Css
$downloadButtonConfig = array(
'name' => 'css_download_button',
'value' => __('Download CSS File'),
- 'onclick' => "setLocation('" . $this->getUrl('*/*/downloadCustomCss', array(
+ 'onclick' => "setLocation('" . $this->getUrl('adminhtml/*/downloadCustomCss', array(
'theme_id' => $this->_getCurrentTheme()->getId())) . "');"
);
if (!$this->_customCssFile) {
@@ -196,7 +196,7 @@ class Css
'label' => __('Manage'),
'class' => 'button',
'onclick' => "MediabrowserUtility.openDialog('"
- . $this->getUrl('*/system_design_wysiwyg_files/index', array(
+ . $this->getUrl('adminhtml/system_design_wysiwyg_files/index', array(
'target_element_id' => 'custom_css_content',
\Magento\Theme\Helper\Storage::PARAM_THEME_ID =>
$this->_getCurrentTheme()->getId(),
@@ -222,7 +222,7 @@ class Css
'label' => __('Manage'),
'class' => 'button',
'onclick' => "MediabrowserUtility.openDialog('"
- . $this->getUrl('*/system_design_wysiwyg_files/index', array(
+ . $this->getUrl('adminhtml/system_design_wysiwyg_files/index', array(
'target_element_id' => 'custom_css_content',
\Magento\Theme\Helper\Storage::PARAM_THEME_ID => $this->_getCurrentTheme()->getId(),
\Magento\Theme\Helper\Storage::PARAM_CONTENT_TYPE => \Magento\Theme\Model\Wysiwyg\Storage::TYPE_FONT
@@ -300,7 +300,7 @@ class Css
*/
public function getDownloadUrl($fileId, $themeId)
{
- return $this->getUrl('*/*/downloadCss', array(
+ return $this->getUrl('adminhtml/*/downloadCss', array(
'theme_id' => $themeId,
'file' => $this->_helperFactory->get('Magento\Core\Helper\Data')->urlEncode($fileId)
));
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Js.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Js.php
index 107d2b927b0..0652e5fc5b1 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Js.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Js.php
@@ -118,7 +118,9 @@ class Js
*/
public function getJsUploadUrl()
{
- return $this->getUrl('*/system_design_theme/uploadjs', array('id' => $this->_getCurrentTheme()->getId()));
+ return $this->getUrl(
+ 'adminhtml/system_design_theme/uploadjs', array('id' => $this->_getCurrentTheme()->getId())
+ );
}
/**
diff --git a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content.php b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content.php
index e140724f5b7..e34accd130b 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content.php
@@ -80,7 +80,7 @@ class Content extends \Magento\Backend\Block\Widget\Container
*/
public function getContentsUrl()
{
- return $this->getUrl('*/*/contents', array('type' => $this->getRequest()->getParam('type'))
+ return $this->getUrl('adminhtml/*/contents', array('type' => $this->getRequest()->getParam('type'))
+ $this->helper('Magento\Theme\Helper\Storage')->getRequestParams());
}
@@ -117,7 +117,9 @@ class Content extends \Magento\Backend\Block\Widget\Container
*/
public function getNewfolderUrl()
{
- return $this->getUrl('*/*/newFolder', $this->helper('Magento\Theme\Helper\Storage')->getRequestParams());
+ return $this->getUrl(
+ 'adminhtml/*/newFolder', $this->helper('Magento\Theme\Helper\Storage')->getRequestParams()
+ );
}
/**
@@ -127,7 +129,9 @@ class Content extends \Magento\Backend\Block\Widget\Container
*/
protected function getDeletefolderUrl()
{
- return $this->getUrl('*/*/deleteFolder', $this->helper('Magento\Theme\Helper\Storage')->getRequestParams());
+ return $this->getUrl(
+ 'adminhtml/*/deleteFolder', $this->helper('Magento\Theme\Helper\Storage')->getRequestParams()
+ );
}
/**
@@ -137,7 +141,9 @@ class Content extends \Magento\Backend\Block\Widget\Container
*/
public function getDeleteFilesUrl()
{
- return $this->getUrl('*/*/deleteFiles', $this->helper('Magento\Theme\Helper\Storage')->getRequestParams());
+ return $this->getUrl(
+ 'adminhtml/*/deleteFiles', $this->helper('Magento\Theme\Helper\Storage')->getRequestParams()
+ );
}
/**
@@ -147,7 +153,7 @@ class Content extends \Magento\Backend\Block\Widget\Container
*/
public function getOnInsertUrl()
{
- return $this->getUrl('*/*/onInsert', $this->helper('Magento\Theme\Helper\Storage')->getRequestParams());
+ return $this->getUrl('adminhtml/*/onInsert', $this->helper('Magento\Theme\Helper\Storage')->getRequestParams());
}
/**
diff --git a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php
index 8d5860f00e9..30a0c7ec7ca 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Content/Uploader.php
@@ -48,7 +48,7 @@ class Uploader extends \Magento\Adminhtml\Block\Media\Uploader
protected function _prepareLayout()
{
$this->getConfig()->setUrl(
- $this->getUrl('*/*/upload', $this->helper('Magento\Theme\Helper\Storage')->getRequestParams())
+ $this->getUrl('adminhtml/*/upload', $this->helper('Magento\Theme\Helper\Storage')->getRequestParams())
);
return parent::_prepareLayout();
}
diff --git a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Tree.php b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Tree.php
index ea87d13f0c6..2b56eda8dfa 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Tree.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Tree.php
@@ -40,7 +40,7 @@ class Tree extends \Magento\Backend\Block\Template
*/
public function getTreeLoaderUrl()
{
- return $this->getUrl('*/*/treeJson', $this->helper('Magento\Theme\Helper\Storage')->getRequestParams());
+ return $this->getUrl('adminhtml/*/treeJson', $this->helper('Magento\Theme\Helper\Storage')->getRequestParams());
}
/**
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme.php
index bee1b30b336..22aeb30ec45 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme.php
@@ -29,7 +29,7 @@
*/
namespace Magento\Theme\Controller\Adminhtml\System\Design;
-class Theme extends \Magento\Adminhtml\Controller\Action
+class Theme extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -106,11 +106,11 @@ class Theme extends \Magento\Adminhtml\Controller\Action
$this->renderLayout();
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
} catch (\Exception $e) {
$this->_getSession()->addError(__('We cannot find the theme.'));
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
}
@@ -166,7 +166,9 @@ class Theme extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addError('The theme was not saved');
$this->_objectManager->get('Magento\Core\Model\Logger')->logException($e);
}
- $redirectBack ? $this->_redirect('*/*/edit', array('id' => $theme->getId())) : $this->_redirect('*/*/');
+ $redirectBack
+ ? $this->_redirect('adminhtml/*/edit', array('id' => $theme->getId()))
+ : $this->_redirect('adminhtml/*/');
}
/**
@@ -200,7 +202,7 @@ class Theme extends \Magento\Adminhtml\Controller\Action
/**
* @todo Temporary solution. Theme module should not know about the existence of editor module.
*/
- $redirectBack ? $this->_redirect('*/system_design_editor/index/') : $this->_redirect('*/*/');
+ $redirectBack ? $this->_redirect('adminhtml/system_design_editor/index/') : $this->_redirect('adminhtml/*/');
}
/**
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files.php
index 39fa4fda0cb..9a96b37897c 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files.php
@@ -29,7 +29,7 @@
*/
namespace Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg;
-class Files extends \Magento\Adminhtml\Controller\Action
+class Files extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Index action
diff --git a/app/code/Magento/User/Controller/Adminhtml/Auth.php b/app/code/Magento/User/Controller/Adminhtml/Auth.php
index f9ccda27d14..d01a33e2fdf 100644
--- a/app/code/Magento/User/Controller/Adminhtml/Auth.php
+++ b/app/code/Magento/User/Controller/Adminhtml/Auth.php
@@ -123,7 +123,7 @@ class Auth extends \Magento\Backend\Controller\AbstractAction
$this->_getSession()->addError(
__('Your password reset link has expired.')
);
- $this->_redirect('*/auth/forgotpassword', array('_nosecret' => true));
+ $this->_redirect('adminhtml/auth/forgotpassword', array('_nosecret' => true));
return;
}
}
@@ -173,7 +173,7 @@ class Auth extends \Magento\Backend\Controller\AbstractAction
);
} catch (\Magento\Core\Exception $exception) {
$this->_getSession()->addMessages($exception->getMessages());
- $this->_redirect('*/auth/resetpassword', array(
+ $this->_redirect('adminhtml/auth/resetpassword', array(
'_nosecret' => true,
'_query' => array(
'id' => $userId,
diff --git a/app/code/Magento/User/Controller/Adminhtml/User.php b/app/code/Magento/User/Controller/Adminhtml/User.php
index ed476fad622..3f115c06bba 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User.php
@@ -91,7 +91,7 @@ class User extends \Magento\Backend\Controller\AbstractAction
$model->load($userId);
if (! $model->getId()) {
$this->_session->addError(__('This user no longer exists.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
} else {
@@ -122,14 +122,14 @@ class User extends \Magento\Backend\Controller\AbstractAction
$userId = (int)$this->getRequest()->getParam('user_id');
$data = $this->getRequest()->getPost();
if (!$data) {
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
/** @var $model \Magento\User\Model\User */
$model = $this->_objectManager->create('Magento\User\Model\User')->load($userId);
if ($userId && $model->isObjectNew()) {
$this->_getSession()->addError(__('This user no longer exists.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
$model->setData($this->_getAdminUserData($data));
@@ -150,11 +150,11 @@ class User extends \Magento\Backend\Controller\AbstractAction
$model->save();
$this->_getSession()->addSuccess(__('You saved the user.'));
$this->_getSession()->setUserData(false);
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addMessages($e->getMessages());
$this->_getSession()->setUserData($data);
- $this->_redirect('*/*/edit', array('_current' => true));
+ $this->_redirect('adminhtml/*/edit', array('_current' => true));
}
}
@@ -184,7 +184,7 @@ class User extends \Magento\Backend\Controller\AbstractAction
$this->_session->addError(
__('You cannot delete your own account.')
);
- $this->_redirect('*/*/edit', array('user_id' => $userId));
+ $this->_redirect('adminhtml/*/edit', array('user_id' => $userId));
return;
}
try {
@@ -193,17 +193,17 @@ class User extends \Magento\Backend\Controller\AbstractAction
$model->setId($userId);
$model->delete();
$this->_session->addSuccess(__('You deleted the user.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
catch (\Exception $e) {
$this->_session->addError($e->getMessage());
- $this->_redirect('*/*/edit', array('user_id' => $this->getRequest()->getParam('user_id')));
+ $this->_redirect('adminhtml/*/edit', array('user_id' => $this->getRequest()->getParam('user_id')));
return;
}
}
$this->_session->addError(__('We can\'t find a user to delete.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
public function rolesGridAction()
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role.php b/app/code/Magento/User/Controller/Adminhtml/User/Role.php
index 4b70880e8a5..c564ef2868f 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Role.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Role.php
@@ -192,7 +192,7 @@ class Role extends \Magento\Backend\Controller\AbstractAction
$this->_session->addError(
__('You cannot delete self-assigned roles.')
);
- $this->_redirect('*/*/editrole', array('rid' => $rid));
+ $this->_redirect('adminhtml/*/editrole', array('rid' => $rid));
return;
}
@@ -235,7 +235,7 @@ class Role extends \Magento\Backend\Controller\AbstractAction
$role = $this->_initRole('role_id');
if (!$role->getId() && $rid) {
$this->_session->addError(__('This role no longer exists.'));
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
@@ -274,7 +274,7 @@ class Role extends \Magento\Backend\Controller\AbstractAction
__('An error occurred while saving this role.')
);
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
diff --git a/app/code/Magento/User/view/adminhtml/admin/forgotpassword.phtml b/app/code/Magento/User/view/adminhtml/admin/forgotpassword.phtml
index af86059e2a8..f934635221c 100644
--- a/app/code/Magento/User/view/adminhtml/admin/forgotpassword.phtml
+++ b/app/code/Magento/User/view/adminhtml/admin/forgotpassword.phtml
@@ -99,7 +99,7 @@
</div>
<footer class="footer">
<div class="footer-content">
- <div class="footer-copyright"><?php echo __('Magento® is a trademark of X.commerce, Inc. Copyright © %1 X.commerce, Inc.', date('Y')) ?></div>
+ <div class="footer-copyright"><?php echo $this->getChildHtml('copyright');?></div>
</div>
</footer>
</body>
diff --git a/app/code/Magento/User/view/adminhtml/admin/resetforgottenpassword.phtml b/app/code/Magento/User/view/adminhtml/admin/resetforgottenpassword.phtml
index af0ce9347c6..2c3e3f0b64f 100644
--- a/app/code/Magento/User/view/adminhtml/admin/resetforgottenpassword.phtml
+++ b/app/code/Magento/User/view/adminhtml/admin/resetforgottenpassword.phtml
@@ -100,7 +100,7 @@
</div>
<footer class="footer">
<div class="footer-content">
- <div class="footer-copyright"><?php echo __('Magento® is a trademark of X.commerce, Inc. Copyright © %1 X.commerce, Inc.', date('Y')) ?></div>
+ <div class="footer-copyright"><?php echo $this->getChildHtml('copyright');?></div>
</div>
</footer>
</body>
diff --git a/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_forgotpassword.xml b/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_forgotpassword.xml
index 5a8a0dd3931..2f1f0dd016e 100644
--- a/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_forgotpassword.xml
+++ b/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_forgotpassword.xml
@@ -26,6 +26,7 @@
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<container name="root" label="Root" output="1">
<block class="Magento\Backend\Block\Template" name="content" template="Magento_User::admin/forgotpassword.phtml">
+ <block class="Magento\Backend\Block\Page\Copyright" name="copyright" as="copyright"/>
<container name="form.additional.info" label="Form Additional Info"/>
</block>
</container>
diff --git a/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_resetpassword.xml b/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_resetpassword.xml
index ce3494e21dc..a6eb3d2b99d 100644
--- a/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_resetpassword.xml
+++ b/app/code/Magento/User/view/adminhtml/layout/adminhtml_auth_resetpassword.xml
@@ -25,6 +25,8 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<container name="root" label="Root" output="1">
- <block class="Magento\Backend\Block\Template" name="content" template="Magento_User::admin/resetforgottenpassword.phtml"/>
+ <block class="Magento\Backend\Block\Template" name="content" template="Magento_User::admin/resetforgottenpassword.phtml">
+ <block class="Magento\Backend\Block\Page\Copyright" name="copyright" as="copyright"/>
+ </block>
</container>
</layout>
diff --git a/app/code/Magento/Webapi/Block/Adminhtml/Role.php b/app/code/Magento/Webapi/Block/Adminhtml/Role.php
index 062619b1e6b..9621b888e43 100644
--- a/app/code/Magento/Webapi/Block/Adminhtml/Role.php
+++ b/app/code/Magento/Webapi/Block/Adminhtml/Role.php
@@ -55,6 +55,6 @@ class Role extends \Magento\Backend\Block\Widget\Grid\Container
*/
public function getCreateUrl()
{
- return $this->getUrl('*/*/edit');
+ return $this->getUrl('adminhtml/*/edit');
}
}
diff --git a/app/code/Magento/Webapi/Block/Adminhtml/Role/Edit.php b/app/code/Magento/Webapi/Block/Adminhtml/Role/Edit.php
index ef81675508c..fd2d4756cdb 100644
--- a/app/code/Magento/Webapi/Block/Adminhtml/Role/Edit.php
+++ b/app/code/Magento/Webapi/Block/Adminhtml/Role/Edit.php
@@ -73,7 +73,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
*/
public function getSaveAndContinueUrl()
{
- return $this->getUrl('*/*/save', array('_current' => true, 'continue' => true));
+ return $this->getUrl('adminhtml/*/save', array('_current' => true, 'continue' => true));
}
/**
diff --git a/app/code/Magento/Webapi/Block/Adminhtml/Role/Edit/Form.php b/app/code/Magento/Webapi/Block/Adminhtml/Role/Edit/Form.php
index 95eae3b21ba..64d5dc215b2 100644
--- a/app/code/Magento/Webapi/Block/Adminhtml/Role/Edit/Form.php
+++ b/app/code/Magento/Webapi/Block/Adminhtml/Role/Edit/Form.php
@@ -37,7 +37,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
/** @var \Magento\Data\Form $form */
$form = $this->_formFactory->create(array(
'attributes' => array(
- 'action' => $this->getUrl('*/*/save'),
+ 'action' => $this->getUrl('adminhtml/*/save'),
'id' => 'edit_form',
'method' => 'post',
))
diff --git a/app/code/Magento/Webapi/Block/Adminhtml/User/Edit/Form.php b/app/code/Magento/Webapi/Block/Adminhtml/User/Edit/Form.php
index 8b816dc9cf0..35ee61a5e8a 100644
--- a/app/code/Magento/Webapi/Block/Adminhtml/User/Edit/Form.php
+++ b/app/code/Magento/Webapi/Block/Adminhtml/User/Edit/Form.php
@@ -44,7 +44,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
/** @var \Magento\Data\Form $form */
$form = $this->_formFactory->create();
$form->setId('edit_form');
- $form->setAction($this->getUrl('*/*/save'));
+ $form->setAction($this->getUrl('adminhtml/*/save'));
$form->setMethod('post');
$form->setUseContainer(true);
$this->setForm($form);
diff --git a/app/code/Magento/Webapi/Controller/Adminhtml/Webapi/Role.php b/app/code/Magento/Webapi/Controller/Adminhtml/Webapi/Role.php
index 8476aca3084..3069b905741 100644
--- a/app/code/Magento/Webapi/Controller/Adminhtml/Webapi/Role.php
+++ b/app/code/Magento/Webapi/Controller/Adminhtml/Webapi/Role.php
@@ -25,7 +25,7 @@
*/
namespace Magento\Webapi\Controller\Adminhtml\Webapi;
-class Role extends \Magento\Adminhtml\Controller\Action
+class Role extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* @var \Magento\Core\Model\Validator\Factory
@@ -112,7 +112,7 @@ class Role extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addError(
__('This API role no longer exists.')
);
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
$this->_addBreadcrumb(
@@ -184,7 +184,7 @@ class Role extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addError(
__('This role no longer exists.')
);
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
$role->setData($data);
@@ -203,14 +203,14 @@ class Role extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->setWebapiRoleData(false);
if ($roleId && !$this->getRequest()->has('continue')) {
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
} else {
- $this->_redirect('*/*/edit', array('role_id' => $role->getId()));
+ $this->_redirect('adminhtml/*/edit', array('role_id' => $role->getId()));
}
} catch (\Exception $e) {
$this->_getSession()->addError($e->getMessage());
$this->_getSession()->setWebapiRoleData($data);
- $this->_redirect('*/*/edit', array('role_id' => $role->getId()));
+ $this->_redirect('adminhtml/*/edit', array('role_id' => $role->getId()));
}
}
}
diff --git a/app/code/Magento/Webapi/Controller/Adminhtml/Webapi/User.php b/app/code/Magento/Webapi/Controller/Adminhtml/Webapi/User.php
index 19d7a378489..360a542d7ec 100644
--- a/app/code/Magento/Webapi/Controller/Adminhtml/Webapi/User.php
+++ b/app/code/Magento/Webapi/Controller/Adminhtml/Webapi/User.php
@@ -166,9 +166,9 @@ class User extends \Magento\Backend\Controller\AbstractAction
}
}
if ($redirectBack) {
- $this->_redirect('*/*/edit', array('user_id' => $userId));
+ $this->_redirect('adminhtml/*/edit', array('user_id' => $userId));
} else {
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
}
@@ -189,18 +189,18 @@ class User extends \Magento\Backend\Controller\AbstractAction
$this->_getSession()->addSuccess(
__('The API user has been deleted.')
);
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
} catch (\Exception $e) {
$this->_getSession()->addError($e->getMessage());
- $this->_redirect('*/*/edit', array('user_id' => $userId));
+ $this->_redirect('adminhtml/*/edit', array('user_id' => $userId));
return;
}
}
$this->_getSession()->addError(
__('Unable to find a user to be deleted.')
);
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
/**
@@ -260,7 +260,7 @@ class User extends \Magento\Backend\Controller\AbstractAction
$this->_getSession()->addError(
__('This user no longer exists.')
);
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return false;
}
return $user;
diff --git a/app/code/Magento/Webapi/etc/module.xml b/app/code/Magento/Webapi/etc/module.xml
index 7fa3563b2aa..a24b37e1a85 100755
--- a/app/code/Magento/Webapi/etc/module.xml
+++ b/app/code/Magento/Webapi/etc/module.xml
@@ -36,7 +36,6 @@
<module name="Magento_Oauth"/>
<module name="Magento_Service"/>
<module name="Magento_Backend"/>
- <module name="Magento_Adminhtml"/>
</depends>
</module>
</config>
diff --git a/app/code/Magento/Webhook/Block/Adminhtml/Registration/Activate.php b/app/code/Magento/Webhook/Block/Adminhtml/Registration/Activate.php
index 9b195ca6743..c25e37daab9 100644
--- a/app/code/Magento/Webhook/Block/Adminhtml/Registration/Activate.php
+++ b/app/code/Magento/Webhook/Block/Adminhtml/Registration/Activate.php
@@ -63,7 +63,7 @@ class Activate extends \Magento\Backend\Block\Template
*/
public function getAcceptUrl()
{
- return $this->getUrl('*/*/accept', array('id' => $this->_subscriptionData[self::DATA_SUBSCRIPTION_ID]));
+ return $this->getUrl('adminhtml/*/accept', array('id' => $this->_subscriptionData[self::DATA_SUBSCRIPTION_ID]));
}
/**
diff --git a/app/code/Magento/Webhook/Block/Adminhtml/Registration/Create/Form.php b/app/code/Magento/Webhook/Block/Adminhtml/Registration/Create/Form.php
index 7183b1e0fc8..1c93e77a79f 100644
--- a/app/code/Magento/Webhook/Block/Adminhtml/Registration/Create/Form.php
+++ b/app/code/Magento/Webhook/Block/Adminhtml/Registration/Create/Form.php
@@ -59,7 +59,9 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
$form = $this->_formFactory->create(array(
'attributes' => array(
'id' => 'api_user',
- 'action' => $this->getUrl('*/*/register', array('id' => $subscription[self::DATA_SUBSCRIPTION_ID])),
+ 'action' => $this->getUrl(
+ 'adminhtml/*/register', array('id' => $subscription[self::DATA_SUBSCRIPTION_ID])
+ ),
'method' => 'post',
))
);
diff --git a/app/code/Magento/Webhook/Block/Adminhtml/Registration/Create/Form/Container.php b/app/code/Magento/Webhook/Block/Adminhtml/Registration/Create/Form/Container.php
index 784ce624821..f0689022d32 100644
--- a/app/code/Magento/Webhook/Block/Adminhtml/Registration/Create/Form/Container.php
+++ b/app/code/Magento/Webhook/Block/Adminhtml/Registration/Create/Form/Container.php
@@ -62,7 +62,9 @@ class Container extends \Magento\Backend\Block\Template
*/
public function getSubmitUrl()
{
- return $this->getUrl('*/*/register', array('id' => $this->_subscriptionData[self::DATA_SUBSCRIPTION_ID]));
+ return $this->getUrl(
+ 'adminhtml/*/register', array('id' => $this->_subscriptionData[self::DATA_SUBSCRIPTION_ID])
+ );
}
/**
diff --git a/app/code/Magento/Webhook/Block/Adminhtml/Subscription/Edit/Form.php b/app/code/Magento/Webhook/Block/Adminhtml/Subscription/Edit/Form.php
index 6cd2fdc7189..5586d5df93b 100644
--- a/app/code/Magento/Webhook/Block/Adminhtml/Subscription/Edit/Form.php
+++ b/app/code/Magento/Webhook/Block/Adminhtml/Subscription/Edit/Form.php
@@ -92,7 +92,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
$form = $this->_formFactory->create(array(
'attributes' => array(
'id' => 'edit_form',
- 'action' => $this->getUrl('*/*/save', array('id' => $subscriptionId)),
+ 'action' => $this->getUrl('adminhtml/*/save', array('id' => $subscriptionId)),
'method' => 'post',
))
);
diff --git a/app/code/Magento/Webhook/Block/Adminhtml/Subscription/Grid/Renderer/Action.php b/app/code/Magento/Webhook/Block/Adminhtml/Subscription/Grid/Renderer/Action.php
index 6c583506e88..b7e0b767db9 100644
--- a/app/code/Magento/Webhook/Block/Adminhtml/Subscription/Grid/Renderer/Action.php
+++ b/app/code/Magento/Webhook/Block/Adminhtml/Subscription/Grid/Renderer/Action.php
@@ -44,13 +44,15 @@ class Action
switch ($row->getStatus()) {
case \Magento\Webhook\Model\Subscription::STATUS_ACTIVE :
- return '<a href="' . $this->getUrl('*/webhook_subscription/revoke', array('id' => $row->getId()))
+ return '<a href="'
+ . $this->getUrl('adminhtml/webhook_subscription/revoke', array('id' => $row->getId()))
. '">' . __('Revoke') . '</a>';
case \Magento\Webhook\Model\Subscription::STATUS_REVOKED :
- return '<a href="' . $this->getUrl('*/webhook_subscription/activate', array('id' => $row->getId()))
+ return '<a href="'
+ . $this->getUrl('adminhtml/webhook_subscription/activate', array('id' => $row->getId()))
. '">' . __('Activate') . '</a>';
case \Magento\Webhook\Model\Subscription::STATUS_INACTIVE :
- $url = $this->getUrl('*/webhook_registration/activate', array('id' => $row->getId()));
+ $url = $this->getUrl('adminhtml/webhook_registration/activate', array('id' => $row->getId()));
return '<a href="#" onclick="activateSubscription(\''. $url .'\'); return false;">'
. __('Activate') . '</a>';
default :
diff --git a/app/code/Magento/Webhook/Controller/Adminhtml/Webhook/Registration.php b/app/code/Magento/Webhook/Controller/Adminhtml/Webhook/Registration.php
index 3a74665a12d..a47de9d7570 100644
--- a/app/code/Magento/Webhook/Controller/Adminhtml/Webhook/Registration.php
+++ b/app/code/Magento/Webhook/Controller/Adminhtml/Webhook/Registration.php
@@ -225,7 +225,7 @@ class Registration extends \Magento\Backend\Controller\AbstractAction
$this->_getSession()->addSuccess(
__('The subscription \'%1\' has been activated.', $subscriptionData[self::DATA_NAME])
);
- $this->_redirect('*/webhook_registration/succeeded',
+ $this->_redirect('adminhtml/webhook_registration/succeeded',
array(self::PARAM_SUBSCRIPTION_ID => $subscriptionData[self::DATA_SUBSCRIPTION_ID]));
}
@@ -237,6 +237,6 @@ class Registration extends \Magento\Backend\Controller\AbstractAction
protected function _redirectFailed($errorMessage)
{
$this->_getSession()->addError($errorMessage);
- $this->_redirect('*/webhook_registration/failed');
+ $this->_redirect('adminhtml/webhook_registration/failed');
}
}
diff --git a/app/code/Magento/Webhook/Controller/Adminhtml/Webhook/Subscription.php b/app/code/Magento/Webhook/Controller/Adminhtml/Webhook/Subscription.php
index 72f506ddf5c..d14864055ca 100644
--- a/app/code/Magento/Webhook/Controller/Adminhtml/Webhook/Subscription.php
+++ b/app/code/Magento/Webhook/Controller/Adminhtml/Webhook/Subscription.php
@@ -126,7 +126,7 @@ class Subscription extends \Magento\Backend\Controller\AbstractAction
$this->renderLayout();
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
}
@@ -155,7 +155,7 @@ class Subscription extends \Magento\Backend\Controller\AbstractAction
__('The subscription \'%1\' has been saved.',
$subscriptionData[self::DATA_NAME])
);
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
} else {
$this->_getSession()->addError(
__('The subscription \'%1\' has not been saved, as no data was provided.',
@@ -168,7 +168,7 @@ class Subscription extends \Magento\Backend\Controller\AbstractAction
}
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
}
@@ -202,7 +202,7 @@ class Subscription extends \Magento\Backend\Controller\AbstractAction
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
/**
@@ -225,7 +225,7 @@ class Subscription extends \Magento\Backend\Controller\AbstractAction
$this->_getSession()->addError($e->getMessage());
}
- $this->_redirect('*/webhook_subscription/index');
+ $this->_redirect('adminhtml/webhook_subscription/index');
}
/**
@@ -248,7 +248,7 @@ class Subscription extends \Magento\Backend\Controller\AbstractAction
$this->_getSession()->addError($e->getMessage());
}
- $this->_redirect('*/webhook_subscription/index');
+ $this->_redirect('adminhtml/webhook_subscription/index');
}
/**
diff --git a/app/code/Magento/Weee/view/adminhtml/layout/adminhtml_catalog_product_new.xml b/app/code/Magento/Weee/view/adminhtml/layout/catalog_product_new.xml
similarity index 100%
rename from app/code/Magento/Weee/view/adminhtml/layout/adminhtml_catalog_product_new.xml
rename to app/code/Magento/Weee/view/adminhtml/layout/catalog_product_new.xml
diff --git a/app/code/Magento/Weee/view/frontend/tax-toggle.js b/app/code/Magento/Weee/view/frontend/tax-toggle.js
index 211b1975841..332883f0d9d 100644
--- a/app/code/Magento/Weee/view/frontend/tax-toggle.js
+++ b/app/code/Magento/Weee/view/frontend/tax-toggle.js
@@ -17,8 +17,7 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Varien
- * @package js
+ * @category design
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget.php b/app/code/Magento/Widget/Block/Adminhtml/Widget.php
index 3b43c10b798..9a5d59998fc 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget.php
@@ -53,6 +53,6 @@ class Widget extends \Magento\Adminhtml\Block\Widget\Form\Container
$this->_formScripts[] = 'wWidget = new WysiwygWidget.Widget('
. '"widget_options_form", "select_widget_type", "widget_options", "'
- . $this->getUrl('*/*/loadOptions') .'", "' . $this->getRequest()->getParam('widget_target_id') . '");';
+ . $this->getUrl('adminhtml/*/loadOptions') .'", "' . $this->getRequest()->getParam('widget_target_id') . '");';
}
}
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Form.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Form.php
index 481da000ddd..76a1cae238f 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Form.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Form.php
@@ -85,7 +85,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
$form->setUseContainer(true);
$form->setId('widget_options_form');
$form->setMethod('post');
- $form->setAction($this->getUrl('*/*/buildWidget'));
+ $form->setAction($this->getUrl('adminhtml/*/buildWidget'));
$this->setForm($form);
}
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit.php
index fc227e6a92e..bdf8f176ba4 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit.php
@@ -129,7 +129,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
*/
public function getValidationUrl()
{
- return $this->getUrl('*/*/validate', array('_current'=>true));
+ return $this->getUrl('adminhtml/*/validate', array('_current'=>true));
}
/**
@@ -139,6 +139,6 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
*/
public function getSaveUrl()
{
- return $this->getUrl('*/*/save', array('_current'=>true, 'back'=>null));
+ return $this->getUrl('adminhtml/*/save', array('_current'=>true, 'back'=>null));
}
}
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php
index c0e1f9d9ae6..320dca50de8 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/Layout.php
@@ -73,18 +73,8 @@ class Layout extends \Magento\Core\Block\Html\Select
$layoutUpdateParams = array(
'theme' => $this->_getThemeInstance($this->getTheme()),
);
- $pageTypes = array();
- $pageTypesAll = $this->_getLayoutProcessor($layoutUpdateParams)->getPageHandlesHierarchy();
- foreach ($pageTypesAll as $pageTypeName => $pageTypeInfo) {
- $layoutMerge = $this->_getLayoutProcessor($layoutUpdateParams);
- $layoutMerge->addPageHandles(array($pageTypeName));
- $layoutMerge->load();
- if (!$layoutMerge->getContainers()) {
- continue;
- }
- $pageTypes[$pageTypeName] = $pageTypeInfo;
- }
- $this->_addPageTypeOptions($pageTypes);
+ $pageTypesAll = $this->_getLayoutProcessor($layoutUpdateParams)->getAllPageHandles();
+ $this->_addPageTypeOptions($pageTypesAll);
}
return parent::_beforeToHtml();
}
@@ -93,6 +83,10 @@ class Layout extends \Magento\Core\Block\Html\Select
* Retrieve theme instance by its identifier
*
* @param int $themeId
+ *
+ *
+ *
+ *
* @return \Magento\Core\Model\Theme|null
*/
protected function _getThemeInstance($themeId)
@@ -117,17 +111,19 @@ class Layout extends \Magento\Core\Block\Html\Select
* Add page types information to the options
*
* @param array $pageTypes
- * @param int $level
*/
- protected function _addPageTypeOptions(array $pageTypes, $level = 0)
+ protected function _addPageTypeOptions(array $pageTypes)
{
+ // Sort list of page types by label
+ foreach ($pageTypes as $key => $row) {
+ $label[$key] = $row['label'];
+ }
+ array_multisort($label, SORT_STRING, $pageTypes);
+
foreach ($pageTypes as $pageTypeName => $pageTypeInfo) {
$params = array();
- if ($pageTypeInfo['type'] == \Magento\Core\Model\Layout\Merge::TYPE_FRAGMENT) {
- $params['class'] = 'fragment';
- }
- $this->addOption($pageTypeName, str_repeat('. ', $level) . $pageTypeInfo['label'], $params);
- $this->_addPageTypeOptions($pageTypeInfo['children'], $level + 1);
+
+ $this->addOption($pageTypeName, $pageTypeInfo['label'], $params);
}
}
}
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
index 558c8247310..3a5ceffa425 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
@@ -102,7 +102,7 @@ class Layout
*/
public function getCategoriesChooserUrl()
{
- return $this->getUrl('*/*/categories', array('_current' => true));
+ return $this->getUrl('adminhtml/*/categories', array('_current' => true));
}
/**
@@ -112,7 +112,7 @@ class Layout
*/
public function getProductsChooserUrl()
{
- return $this->getUrl('*/*/products', array('_current' => true));
+ return $this->getUrl('adminhtml/*/products', array('_current' => true));
}
/**
@@ -122,7 +122,7 @@ class Layout
*/
public function getBlockChooserUrl()
{
- return $this->getUrl('*/*/blocks', array('_current' => true));
+ return $this->getUrl('adminhtml/*/blocks', array('_current' => true));
}
/**
@@ -132,7 +132,7 @@ class Layout
*/
public function getTemplateChooserUrl()
{
- return $this->getUrl('*/*/template', array('_current' => true));
+ return $this->getUrl('adminhtml/*/template', array('_current' => true));
}
/**
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php
index 32eb1e94cf8..c6c932d95b4 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php
@@ -188,7 +188,7 @@ class Settings
*/
public function getContinueUrl()
{
- return $this->getUrl('*/*/*', array(
+ return $this->getUrl('adminhtml/*/*', array(
'_current' => true,
'code' => '{{code}}',
'theme_id' => '{{theme_id}}'
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget.php
index 931743042b6..32e4f6d16fd 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Widget\Controller\Adminhtml;
-class Widget extends \Magento\Adminhtml\Controller\Action
+class Widget extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php
index 95d97203a25..4b7631cb8c8 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php
@@ -29,7 +29,7 @@
*/
namespace Magento\Widget\Controller\Adminhtml\Widget;
-class Instance extends \Magento\Adminhtml\Controller\Action
+class Instance extends \Magento\Backend\Controller\Adminhtml\Action
{
/**
* Core registry
@@ -149,7 +149,7 @@ class Instance extends \Magento\Adminhtml\Controller\Action
{
$widgetInstance = $this->_initWidgetInstance();
if (!$widgetInstance) {
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
@@ -198,7 +198,7 @@ class Instance extends \Magento\Adminhtml\Controller\Action
{
$widgetInstance = $this->_initWidgetInstance();
if (!$widgetInstance) {
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
$widgetInstance->setTitle($this->getRequest()->getPost('title'))
@@ -212,21 +212,21 @@ class Instance extends \Magento\Adminhtml\Controller\Action
__('The widget instance has been saved.')
);
if ($this->getRequest()->getParam('back', false)) {
- $this->_redirect('*/*/edit', array(
+ $this->_redirect('adminhtml/*/edit', array(
'instance_id' => $widgetInstance->getId(),
'_current' => true
));
} else {
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
}
return;
} catch (\Exception $exception) {
$this->_getSession()->addError($exception->getMessage());
$this->_logger->logException($exception);
- $this->_redirect('*/*/edit', array('_current' => true));
+ $this->_redirect('adminhtml/*/edit', array('_current' => true));
return;
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
@@ -247,7 +247,7 @@ class Instance extends \Magento\Adminhtml\Controller\Action
$this->_getSession()->addError($e->getMessage());
}
}
- $this->_redirect('*/*/');
+ $this->_redirect('adminhtml/*/');
return;
}
@@ -260,7 +260,7 @@ class Instance extends \Magento\Adminhtml\Controller\Action
$selected = $this->getRequest()->getParam('selected', '');
$isAnchorOnly = $this->getRequest()->getParam('is_anchor_only', 0);
$chooser = $this->getLayout()
- ->createBlock('Magento\Adminhtml\Block\Catalog\Category\Widget\Chooser')
+ ->createBlock('Magento\Catalog\Block\Adminhtml\Category\Widget\Chooser')
->setUseMassaction(true)
->setId($this->_objectManager->get('Magento\Core\Helper\Data')->uniqHash('categories'))
->setIsAnchorOnly($isAnchorOnly)
@@ -277,7 +277,7 @@ class Instance extends \Magento\Adminhtml\Controller\Action
$selected = $this->getRequest()->getParam('selected', '');
$productTypeId = $this->getRequest()->getParam('product_type_id', '');
$chooser = $this->getLayout()
- ->createBlock('Magento\Adminhtml\Block\Catalog\Product\Widget\Chooser')
+ ->createBlock('Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser')
->setName($this->_objectManager->get('Magento\Core\Helper\Data')->uniqHash('products_grid_'))
->setUseMassaction(true)
->setProductTypeId($productTypeId)
diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php
index 657b599ecac..aa5bf71f0ae 100644
--- a/app/code/Magento/Widget/Model/Template/Filter.php
+++ b/app/code/Magento/Widget/Model/Template/Filter.php
@@ -72,14 +72,8 @@ class Filter extends \Magento\Cms\Model\Template\Filter
$this->_widgetResource = $widgetResource;
$this->_widget = $widget;
parent::__construct(
- $logger,
- $coreData,
- $viewUrl,
- $coreStoreConfig,
- $coreVariableFactory,
- $storeManager,
- $layout,
- $layoutFactory
+ $logger, $coreData, $viewUrl, $coreStoreConfig, $coreVariableFactory, $storeManager,
+ $layout, $layoutFactory
);
}
diff --git a/app/code/Magento/Widget/Model/Widget/Config.php b/app/code/Magento/Widget/Model/Widget/Config.php
index 0686ffa7a2f..d4d85e5208d 100644
--- a/app/code/Magento/Widget/Model/Widget/Config.php
+++ b/app/code/Magento/Widget/Model/Widget/Config.php
@@ -116,7 +116,7 @@ class Config
if (count($skipped) > 0) {
$params['skip_widgets'] = $this->encodeWidgetsToQuery($skipped);
}
- return $this->_backendUrl->getUrl('*/widget/index', $params);
+ return $this->_backendUrl->getUrl('adminhtml/widget/index', $params);
}
/**
diff --git a/app/code/Magento/Widget/view/frontend/layout/default.xml b/app/code/Magento/Widget/view/frontend/layout/default.xml
index d58625467f0..6c60196129d 100644
--- a/app/code/Magento/Widget/view/frontend/layout/default.xml
+++ b/app/code/Magento/Widget/view/frontend/layout/default.xml
@@ -23,12 +23,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="head">
- <block class="Magento\Page\Block\Html\Head\Css" name="magento-widget-widgets-css">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Widget::widgets.css</argument>
- </arguments>
- </block>
- </referenceBlock>
-</layout>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
diff --git a/app/code/Magento/Widget/view/frontend/layout/print.xml b/app/code/Magento/Widget/view/frontend/layout/print.xml
index ba0a322322b..6c60196129d 100644
--- a/app/code/Magento/Widget/view/frontend/layout/print.xml
+++ b/app/code/Magento/Widget/view/frontend/layout/print.xml
@@ -23,12 +23,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="head">
- <block class="Magento\Page\Block\Html\Head\Css" name="magento-cms-widgets-css">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Cms::widgets.css</argument>
- </arguments>
- </block>
- </referenceBlock>
-</layout>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
diff --git a/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php b/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
index 36c0970e0c0..622ca6aa595 100644
--- a/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
+++ b/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
@@ -95,7 +95,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
/**
* Adminhtml sales
*
- * @var \Magento\Adminhtml\Helper\Sales
+ * @var \Magento\Sales\Helper\Admin
*/
protected $_adminhtmlSales = null;
@@ -153,7 +153,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
/**
* @param \Magento\CatalogInventory\Helper\Data $catalogInventoryData
- * @param \Magento\Adminhtml\Helper\Sales $adminhtmlSales
+ * @param \Magento\Sales\Helper\Admin $adminhtmlSales
* @param \Magento\Event\ManagerInterface $eventManager
* @param \Magento\Core\Model\Logger $logger
* @param \Magento\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
@@ -171,7 +171,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
*/
public function __construct(
\Magento\CatalogInventory\Helper\Data $catalogInventoryData,
- \Magento\Adminhtml\Helper\Sales $adminhtmlSales,
+ \Magento\Sales\Helper\Admin $adminhtmlSales,
\Magento\Event\ManagerInterface $eventManager,
\Magento\Core\Model\Logger $logger,
\Magento\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
diff --git a/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php b/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
index 810277748c7..3fedafad975 100644
--- a/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
+++ b/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
@@ -38,7 +38,7 @@ class Grid extends \Magento\Wishlist\Model\Resource\Item\Collection
/**
* @param \Magento\CatalogInventory\Helper\Data $catalogInventoryData
- * @param \Magento\Adminhtml\Helper\Sales $adminhtmlSales
+ * @param \Magento\Sales\Helper\Admin $adminhtmlSales
* @param \Magento\Event\ManagerInterface $eventManager
* @param \Magento\Core\Model\Logger $logger
* @param \Magento\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
@@ -57,7 +57,7 @@ class Grid extends \Magento\Wishlist\Model\Resource\Item\Collection
*/
public function __construct(
\Magento\CatalogInventory\Helper\Data $catalogInventoryData,
- \Magento\Adminhtml\Helper\Sales $adminhtmlSales,
+ \Magento\Sales\Helper\Admin $adminhtmlSales,
\Magento\Event\ManagerInterface $eventManager,
\Magento\Core\Model\Logger $logger,
\Magento\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
diff --git a/app/code/Magento/Wishlist/etc/module.xml b/app/code/Magento/Wishlist/etc/module.xml
index f4ad413aaea..9cc2b1f2db5 100755
--- a/app/code/Magento/Wishlist/etc/module.xml
+++ b/app/code/Magento/Wishlist/etc/module.xml
@@ -35,7 +35,6 @@
<module name="Magento_Core"/>
<module name="Magento_Checkout"/>
<module name="Magento_Page"/>
- <module name="Magento_Adminhtml"/>
<module name="Magento_CatalogInventory"/>
<module name="Magento_Tax"/>
<module name="Magento_Backend"/>
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure.xml
index 58774d757f4..e3f3630fa50 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Wish list Item" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Wish list Item" type="page">
<referenceBlock name="product.info">
<block class="Magento\Wishlist\Block\Item\Configure" name="product.info.addto" as="addto" template="item/configure/addto.phtml"/>
</referenceBlock>
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_bundle.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_bundle.xml
index 0cdbb41d2fc..a0016fef01a 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_bundle.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_bundle.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Wishlist Item (Bundle)" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Wishlist Item (Bundle)" type="page">
<referenceBlock name="head">
<block class="Magento\Page\Block\Html\Head\Script" name="magento-bundle-bundle-js">
<arguments>
@@ -52,22 +52,10 @@
</referenceBlock>
<referenceBlock name="product.info.options.wrapper">
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle.options" as="type_bundle_options" template="catalog/product/view/type/bundle/options.phtml" before="-">
- <action method="addRenderer">
- <argument name="type" xsi:type="string">select</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select</argument>
- </action>
- <action method="addRenderer">
- <argument name="type" xsi:type="string">multi</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi</argument>
- </action>
- <action method="addRenderer">
- <argument name="type" xsi:type="string">radio</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio</argument>
- </action>
- <action method="addRenderer">
- <argument name="type" xsi:type="string">checkbox</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox</argument>
- </action>
+ <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select" name="product.info.bundle.options.select" as="select"/>
+ <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi" name="product.info.bundle.options.multi" as="multi"/>
+ <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio" name="product.info.bundle.options.radio" as="radio"/>
+ <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox" name="product.info.bundle.options.checkbox" as="checkbox"/>
</block>
</referenceBlock>
<referenceBlock name="product.info.options.wrapper.bottom">
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_configurable.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_configurable.xml
index 8f18ec49f42..e6afc097fcb 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_configurable.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_configurable.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Wishlist Item (Configurable)" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Wishlist Item (Configurable)" type="page">
<referenceBlock name="product.info">
<block class="Magento\Catalog\Block\Product\View\Type\Configurable" name="product.info.configurable" as="product_type_data" template="product/view/type/default.phtml">
<container name="product.info.configurable.extra" as="product_type_data_extra" label="Product Extra Info"/>
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_grouped.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_grouped.xml
index 7a4c0055a7c..91c6bd25a01 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_grouped.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_grouped.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Wishlist Item (Grouped)" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Wishlist Item (Grouped)" type="page">
<referenceBlock name="product.info">
<block class="Magento\Catalog\Block\Product\View\Type\Grouped" name="product.info.grouped" as="product_type_data" template="product/view/type/grouped.phtml">
<container name="product.info.grouped.extra" as="product_type_data_extra" label="Product Extra Info"/>
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml b/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
index 8b8fe21bac0..c1262ad6aed 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_index.xml
+++ b/app/code/Magento/Wishlist/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account My Wish List" type="page" parent="customer_account_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account My Wish List" type="page">
<update handle="customer_account"/>
<referenceContainer name="my.account.wrapper">
<block class="Magento\Wishlist\Block\Customer\Wishlist" name="customer.wishlist" template="view.phtml">
diff --git a/app/design/adminhtml/magento_backend/css/admin.css b/app/design/adminhtml/magento_backend/css/admin.css
index 3b3f5e97475..fde65899eff 100644
--- a/app/design/adminhtml/magento_backend/css/admin.css
+++ b/app/design/adminhtml/magento_backend/css/admin.css
@@ -527,11 +527,11 @@ button.primary.disabled:hover,
.image .action-delete[disabled],
.fieldset-wrapper-title .actions .action-delete[disabled],
.address-list-item-actions .action-delete[disabled],
-[class^=" adminhtml-catalog-product-"] .page-actions .action-back,
-[class^=" adminhtml-catalog-product-"] .page-actions .action-back:hover,
-[class^=" adminhtml-catalog-product-"] .page-actions .action-back:active,
-[class^=" adminhtml-catalog-product-"] .page-actions .action-back.active,
-[class^=" adminhtml-catalog-product-"] .page-actions .action-back[disabled],
+[class^=" catalog-product-"] .page-actions .action-back,
+[class^=" catalog-product-"] .page-actions .action-back:hover,
+[class^=" catalog-product-"] .page-actions .action-back:active,
+[class^=" catalog-product-"] .page-actions .action-back.active,
+[class^=" catalog-product-"] .page-actions .action-back[disabled],
[class^=" adminhtml-newsletter-"] .page-actions .action-back,
[class^=" adminhtml-newsletter-"] .page-actions .action-back:hover,
[class^=" adminhtml-newsletter-"] .page-actions .action-back:active,
@@ -547,11 +547,11 @@ button.primary.disabled:hover,
.notification .action-close:active,
.notification .action-close.active,
.notification .action-close[disabled],
-.adminhtml-sales-order-create-index .page-actions-inner .cancel,
-.adminhtml-sales-order-create-index .page-actions-inner .cancel:hover,
-.adminhtml-sales-order-create-index .page-actions-inner .cancel:active,
-.adminhtml-sales-order-create-index .page-actions-inner .cancel.active,
-.adminhtml-sales-order-create-index .page-actions-inner .cancel[disabled] {
+.sales-order-create-index .page-actions-inner .cancel,
+.sales-order-create-index .page-actions-inner .cancel:hover,
+.sales-order-create-index .page-actions-inner .cancel:active,
+.sales-order-create-index .page-actions-inner .cancel.active,
+.sales-order-create-index .page-actions-inner .cancel[disabled] {
border: 0;
border-radius: 0;
background: none;
@@ -4122,7 +4122,7 @@ table tbody tr:nth-child(odd):hover th {
float: left;
}
-.adminhtml-catalog-product-index .page-actions {
+.catalog-product-index .page-actions {
padding-top: 0;
}
@@ -5063,9 +5063,9 @@ table .col-draggable .draggable-handle {
.order-information .data-table tbody tr th,
.order-account-information .data-table tbody tr th,
.adminhtml-rma-new .data-table tbody tr th,
-[class^=" adminhtml-sales-transactions-"] .data-table tbody tr th,
-[class^=" adminhtml-sales-"] .order-payment-method .data-table tbody tr th,
-[class^=" adminhtml-sales-billing-agreement-"] .log-details .data-table tbody tr th {
+[class^=" sales-transactions-"] .data-table tbody tr th,
+[class^=" sales-"] .order-payment-method .data-table tbody tr th,
+[class^=" sales-billing-agreement-"] .log-details .data-table tbody tr th {
font-weight: bold;
}
@@ -5083,12 +5083,12 @@ table .col-draggable .draggable-handle {
.order-account-information .data-table tbody tr th,
[class^=" adminhtml-rma-"] .data-table tbody tr td,
[class^=" adminhtml-rma-"] .data-table tbody tr th,
-[class^=" adminhtml-sales-transactions-"] .data-table tbody tr th,
-[class^=" adminhtml-sales-transactions-"] .data-table tbody tr td,
-[class^=" adminhtml-sales-"] .order-payment-method .data-table tbody tr th,
-[class^=" adminhtml-sales-"] .order-payment-method .data-table tbody tr td,
-[class^=" adminhtml-sales-billing-agreement-"] .log-details .data-table tbody tr th,
-[class^=" adminhtml-sales-billing-agreement-"] .log-details .data-table tbody tr td {
+[class^=" sales-transactions-"] .data-table tbody tr th,
+[class^=" sales-transactions-"] .data-table tbody tr td,
+[class^=" sales-"] .order-payment-method .data-table tbody tr th,
+[class^=" sales-"] .order-payment-method .data-table tbody tr td,
+[class^=" sales-billing-agreement-"] .log-details .data-table tbody tr th,
+[class^=" sales-billing-agreement-"] .log-details .data-table tbody tr td {
background-color: #fff;
border: 0;
padding: 9px 10px 10px;
@@ -5110,12 +5110,12 @@ table .col-draggable .draggable-handle {
.order-account-information .data-table tbody tr:nth-child(2n+1) th,
[class^=" adminhtml-rma-"] .data-table tbody tr:nth-child(2n+1) td,
[class^=" adminhtml-rma-"] .data-table tbody tr:nth-child(2n+1) th,
-[class^=" adminhtml-sales-transactions-"] .data-table tbody tr:nth-child(2n+1) th,
-[class^=" adminhtml-sales-transactions-"] .data-table tbody tr:nth-child(2n+1) td,
-[class^=" adminhtml-sales-"] .order-payment-method .data-table tbody tr:nth-child(2n+1) th,
-[class^=" adminhtml-sales-"] .order-payment-method .data-table tbody tr:nth-child(2n+1) td,
-[class^=" adminhtml-sales-billing-agreement-"] .log-details .data-table tbody tr:nth-child(2n+1) th,
-[class^=" adminhtml-sales-billing-agreement-"] .log-details .data-table tbody tr:nth-child(2n+1) td {
+[class^=" sales-transactions-"] .data-table tbody tr:nth-child(2n+1) th,
+[class^=" sales-transactions-"] .data-table tbody tr:nth-child(2n+1) td,
+[class^=" sales-"] .order-payment-method .data-table tbody tr:nth-child(2n+1) th,
+[class^=" sales-"] .order-payment-method .data-table tbody tr:nth-child(2n+1) td,
+[class^=" sales-billing-agreement-"] .log-details .data-table tbody tr:nth-child(2n+1) th,
+[class^=" sales-billing-agreement-"] .log-details .data-table tbody tr:nth-child(2n+1) td {
background-color: #fbfaf6;
}
@@ -5133,12 +5133,12 @@ table .col-draggable .draggable-handle {
.eq-ie8 .order-account-information .data-table tbody tr th,
.eq-ie8 [class^=" adminhtml-rma-"] .data-table tbody tr td,
.eq-ie8 [class^=" adminhtml-rma-"] .data-table tbody tr th,
-.eq-ie8 [class^=" adminhtml-sales-transactions-"] .data-table tbody tr th,
-.eq-ie8 [class^=" adminhtml-sales-transactions-"] .data-table tbody tr td,
-.eq-ie8 [class^=" adminhtml-sales-"] .order-payment-method .data-table tbody tr th,
-.eq-ie8 [class^=" adminhtml-sales-"] .order-payment-method .data-table tbody tr td,
-.eq-ie8 [class^=" adminhtml-sales-billing-agreement-"] .log-details .data-table tbody tr th,
-.eq-ie8 [class^=" adminhtml-sales-billing-agreement-"] .log-details .data-table tbody tr td {
+.eq-ie8 [class^=" sales-transactions-"] .data-table tbody tr th,
+.eq-ie8 [class^=" sales-transactions-"] .data-table tbody tr td,
+.eq-ie8 [class^=" sales-"] .order-payment-method .data-table tbody tr th,
+.eq-ie8 [class^=" sales-"] .order-payment-method .data-table tbody tr td,
+.eq-ie8 [class^=" sales-billing-agreement-"] .log-details .data-table tbody tr th,
+.eq-ie8 [class^=" sales-billing-agreement-"] .log-details .data-table tbody tr td {
border-bottom: 1px solid #ededed;
}
diff --git a/app/design/adminhtml/magento_backend/css/debug.css b/app/design/adminhtml/magento_backend/css/debug.css
index 02f37c864b6..3dfb74027be 100644
--- a/app/design/adminhtml/magento_backend/css/debug.css
+++ b/app/design/adminhtml/magento_backend/css/debug.css
@@ -684,29 +684,29 @@ th.required:after {
1 column grid pages with actions
-------------------------------------- */
/* slaes */
-.adminhtml-sales-order-index .col-1-layout,
-.adminhtml-sales-shipment-index .col-1-layout,
+.sales-order-index .col-1-layout,
+.sales-shipment-index .col-1-layout,
.adminhtml-rma-index .col-1-layout,
-.adminhtml-sales-invoice-index .col-1-layout,
+.sales-invoice-index .col-1-layout,
.adminhtml-rma-item-attribute-index .col-1-layout,
-.adminhtml-sales-transactions-index .col-1-layout,
-.adminhtml-sales-creditmemo-index .col-1-layout,
-.adminhtml-sales-recurring-profile-index .col-1-layout,
+.sales-transactions-index .col-1-layout,
+.sales-creditmemo-index .col-1-layout,
+.sales-recurring-profile-index .col-1-layout,
.adminhtml-giftwrapping-index .col-1-layout,
-.adminhtml-sales-billing-agreement-index .col-1-layout,
+.sales-billing-agreement-index .col-1-layout,
.adminhtml-checkout-agreement-index .col-1-layout,
/* catalog */
-.adminhtml-catalog-product-index .col-1-layout,
+.catalog-product-index .col-1-layout,
.adminhtml-catalog-event-index .col-1-layout,
.adminhtml-googleshopping-items-index .col-1-layout,
-.adminhtml-catalog-product-attribute-index .col-1-layout,
-.adminhtml-catalog-product-set-index .col-1-layout,
+.catalog-product-attribute-index .col-1-layout,
+.catalog-product-set-index .col-1-layout,
.adminhtml-urlrewrite-index .col-1-layout,
.adminhtml-targetrule-index .col-1-layout,
-.adminhtml-catalog-search-index .col-1-layout,
-.adminhtml-catalog-product-review-pending .col-1-layout,
-.adminhtml-catalog-product-review-index .col-1-layout,
-.adminhtml-rating-index .col-1-layout,
+.catalog-search-index .col-1-layout,
+.catalog-product-review-pending .col-1-layout,
+.catalog-product-review-index .col-1-layout,
+.rating-index-index .col-1-layout,
.adminhtml-tag-index .col-1-layout,
.adminhtml-tag-pending .col-1-layout,
.adminhtml-googleshopping-types-index .col-1-layout,
@@ -775,11 +775,11 @@ th.required:after {
.adminhtml-system-variable-index .col-1-layout,
.adminhtml-user-index .col-1-layout,
.adminhtml-user-role-index .col-1-layout,
-.adminhtml-tax-rule-index .col-1-layout,
-.adminhtml-tax-rate-index .col-1-layout,
+.tax-rule-index .col-1-layout,
+.tax-rate-index .col-1-layout,
.adminhtml-system-currency-index .col-1-layout,
.adminhtml-cache-index .col-1-layout,
-.adminhtml-sales-order-status-index .col-1-layout {
+.sales-order-status-index .col-1-layout {
padding: 0;
background: transparent;
border: 0;
@@ -791,21 +791,21 @@ th.required:after {
/*
Round "+" button for grid tables
-------------------------------------- */
-.adminhtml-sales-order-index .page-actions,
+.sales-order-index .page-actions,
.adminhtml-rma-index .page-actions,
.adminhtml-giftwrapping-index .page-actions,
.adminhtml-rma-item-attribute-index .page-actions,
.adminhtml-checkout-agreement-index .page-actions,
/* catalog */
-.adminhtml-catalog-product-index .page-actions,
+.catalog-product-index .page-actions,
.adminhtml-catalog-event-index .page-actions,
-.adminhtml-catalog-product-attribute-index .page-actions,
-.adminhtml-catalog-product-set-index .page-actions,
+.catalog-product-attribute-index .page-actions,
+.catalog-product-set-index .page-actions,
.adminhtml-urlrewrite-index .page-actions,
.adminhtml-targetrule-index .page-actions,
-.adminhtml-catalog-search-index .page-actions,
-.adminhtml-catalog-product-review-index .page-actions,
-.adminhtml-rating-index .page-actions,
+.catalog-search-index .page-actions,
+.catalog-product-review-index .page-actions,
+.rating-index-index .page-actions,
.adminhtml-tag-index .page-actions,
.adminhtml-googleshopping-types-index .page-actions,
.adminhtml-sitemap-index .page-actions,
@@ -840,8 +840,8 @@ th.required:after {
.adminhtml-system-variable-index .page-actions,
.adminhtml-user-index .page-actions,
.adminhtml-user-role-index .page-actions,
-.adminhtml-tax-rule-index .page-actions,
-.adminhtml-tax-rate-index .page-actions {
+.tax-rule-index .page-actions,
+.tax-rate-index .page-actions {
position: absolute;
z-index: 2;
margin-top: 8px;
@@ -849,21 +849,21 @@ th.required:after {
padding: 0;
}
-.adminhtml-sales-order-index .page-actions.fixed,
+.sales-order-index .page-actions.fixed,
.adminhtml-rma-index .page-actions.fixed,
.adminhtml-giftwrapping-index .page-actions.fixed,
.adminhtml-rma-item-attribute-index .page-actions.fixed,
.adminhtml-checkout-agreement-index .page-actions.fixed,
/* catalog */
-.adminhtml-catalog-product-index .page-actions.fixed,
+.catalog-product-index .page-actions.fixed,
.adminhtml-catalog-event-index .page-actions.fixed,
-.adminhtml-catalog-product-attribute-index .page-actions.fixed,
-.adminhtml-catalog-product-set-index .page-actions.fixed,
+.catalog-product-attribute-index .page-actions.fixed,
+.catalog-product-set-index .page-actions.fixed,
.adminhtml-urlrewrite-index .page-actions.fixed,
.adminhtml-targetrule-index .page-actions.fixed,
-.adminhtml-catalog-search-index .page-actions.fixed,
-.adminhtml-catalog-product-review-index .page-actions.fixed,
-.adminhtml-rating-index .page-actions.fixed,
+.catalog-search-index .page-actions.fixed,
+.catalog-product-review-index .page-actions.fixed,
+.rating-index-index .page-actions.fixed,
.adminhtml-tag-index .page-actions.fixed,
.adminhtml-googleshopping-types-index .page-actions.fixed,
.adminhtml-sitemap-index .page-actions.fixed,
@@ -898,29 +898,29 @@ th.required:after {
.adminhtml-system-variable-index .page-actions.fixed,
.adminhtml-user-index .page-actions.fixed,
.adminhtml-user-role-index .page-actions.fixed,
-.adminhtml-tax-rule-index .page-actions.fixed,
-.adminhtml-tax-rate-index .page-actions.fixed {
+.tax-rule-index .page-actions.fixed,
+.tax-rate-index .page-actions.fixed {
left: 0;
margin: 0;
padding: 0 21px;
position: fixed;
}
-.adminhtml-sales-order-index .page-actions .add,
+.sales-order-index .page-actions .add,
.adminhtml-rma-index .page-actions .add,
.adminhtml-giftwrapping-index .page-actions .add,
.adminhtml-rma-item-attribute-index .page-actions .add,
.adminhtml-checkout-agreement-index .page-actions .add,
/* catalog */
-.adminhtml-catalog-product-index .page-actions .btn-round > .action-default,
+.catalog-product-index .page-actions .btn-round > .action-default,
.adminhtml-catalog-event-index .page-actions .add,
-.adminhtml-catalog-product-attribute-index .page-actions .add,
-.adminhtml-catalog-product-set-index .page-actions .add,
+.catalog-product-attribute-index .page-actions .add,
+.catalog-product-set-index .page-actions .add,
.adminhtml-urlrewrite-index .page-actions .add,
.adminhtml-targetrule-index .page-actions .add,
-.adminhtml-catalog-search-index .page-actions .add,
-.adminhtml-catalog-product-review-index .page-actions .add,
-.adminhtml-rating-index .page-actions .add,
+.catalog-search-index .page-actions .add,
+.catalog-product-review-index .page-actions .add,
+.rating-index-index .page-actions .add,
.adminhtml-tag-index .page-actions .add,
.adminhtml-googleshopping-types-index .page-actions .add,
.adminhtml-sitemap-index .page-actions .add,
@@ -955,8 +955,8 @@ th.required:after {
.adminhtml-system-variable-index .page-actions .add,
.adminhtml-user-index .page-actions .add,
.adminhtml-user-role-index .page-actions .add,
-.adminhtml-tax-rule-index .page-actions .add,
-.adminhtml-tax-rate-index .page-actions .add {
+.tax-rule-index .page-actions .add,
+.tax-rate-index .page-actions .add {
width: 32px;
height: 32px;
overflow: hidden;
@@ -976,21 +976,21 @@ th.required:after {
background: linear-gradient(to bottom, #f58228 0%,#f3731c 100%);
}
-.eq-ie8 .adminhtml-sales-order-index .page-actions .add,
+.eq-ie8 .sales-order-index .page-actions .add,
.eq-ie8 .adminhtml-rma-index .page-actions .add,
.eq-ie8 .adminhtml-giftwrapping-index .page-actions .add,
.eq-ie8 .adminhtml-rma-item-attribute-index .page-actions .add,
.eq-ie8 .adminhtml-checkout-agreement-index .page-actions .add,
/* catalog */
-.eq-ie8 .adminhtml-catalog-product-index .page-actions .btn-round > .action-default,
+.eq-ie8 .catalog-product-index .page-actions .btn-round > .action-default,
.eq-ie8 .adminhtml-catalog-event-index .page-actions .add,
-.eq-ie8 .adminhtml-catalog-product-attribute-index .page-actions .add,
-.eq-ie8 .adminhtml-catalog-product-set-index .page-actions .add,
+.eq-ie8 .catalog-product-attribute-index .page-actions .add,
+.eq-ie8 .catalog-product-set-index .page-actions .add,
.eq-ie8 .adminhtml-urlrewrite-index .page-actions .add,
.eq-ie8 .adminhtml-targetrule-index .page-actions .add,
-.eq-ie8 .adminhtml-catalog-search-index .page-actions .add,
-.eq-ie8 .adminhtml-catalog-product-review-index .page-actions .add,
-.eq-ie8 .adminhtml-rating-index .page-actions .add,
+.eq-ie8 .catalog-search-index .page-actions .add,
+.eq-ie8 .catalog-product-review-index .page-actions .add,
+.eq-ie8 .rating-index-index .page-actions .add,
.eq-ie8 .adminhtml-tag-index .page-actions .add,
.eq-ie8 .adminhtml-googleshopping-types-index .page-actions .add,
.eq-ie8 .adminhtml-sitemap-index .page-actions .add,
@@ -1025,26 +1025,26 @@ th.required:after {
.eq-ie8 .adminhtml-system-variable-index .page-actions .add,
.eq-ie8 .adminhtml-user-index .page-actions .add,
.eq-ie8 .adminhtml-user-role-index .page-actions .add,
-.eq-ie8 .adminhtml-tax-rule-index .page-actions .add,
-.eq-ie8 .adminhtml-tax-rate-index .page-actions .add {
+.eq-ie8 .tax-rule-index .page-actions .add,
+.eq-ie8 .tax-rate-index .page-actions .add {
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f58228', endColorstr='#f3731c',GradientType=0 );
}
-.adminhtml-sales-order-index .page-actions .add:hover,
+.sales-order-index .page-actions .add:hover,
.adminhtml-rma-index .page-actions .add:hover,
.adminhtml-giftwrapping-index .page-actions .add:hover,
.adminhtml-rma-item-attribute-index .page-actions .add:hover,
.adminhtml-checkout-agreement-index .page-actions .add:hover,
/* catalog */
-.adminhtml-catalog-product-index .page-actions .btn-round > .action-default:hover,
+.catalog-product-index .page-actions .btn-round > .action-default:hover,
.adminhtml-catalog-event-index .page-actions .add:hover,
-.adminhtml-catalog-product-attribute-index .page-actions .add:hover,
-.adminhtml-catalog-product-set-index .page-actions .add:hover,
+.catalog-product-attribute-index .page-actions .add:hover,
+.catalog-product-set-index .page-actions .add:hover,
.adminhtml-urlrewrite-index .page-actions .add:hover,
.adminhtml-targetrule-index .page-actions .add:hover,
-.adminhtml-catalog-search-index .page-actions .add:hover,
-.adminhtml-catalog-product-review-index .page-actions .add:hover,
-.adminhtml-rating-index .page-actions .add:hover,
+.catalog-search-index .page-actions .add:hover,
+.catalog-product-review-index .page-actions .add:hover,
+.rating-index-index .page-actions .add:hover,
.adminhtml-tag-index .page-actions .add:hover,
.adminhtml-googleshopping-types-index .page-actions .add:hover,
.adminhtml-sitemap-index .page-actions .add:hover,
@@ -1079,8 +1079,8 @@ th.required:after {
.adminhtml-system-variable-index .page-actions .add:hover,
.adminhtml-user-index .page-actions .add:hover,
.adminhtml-user-role-index .page-actions .add:hover,
-.adminhtml-tax-rule-index .page-actions .add:hover,
-.adminhtml-tax-rate-index .page-actions .add:hover {
+.tax-rule-index .page-actions .add:hover,
+.tax-rate-index .page-actions .add:hover {
border: 1px solid #e4731c;
background: #e47821;
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2U0NzgyMSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNkZjY4MTciIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
@@ -1092,21 +1092,21 @@ th.required:after {
background: linear-gradient(to bottom, #e47821 0%,#df6817 100%);
}
-.eq-ie8 .adminhtml-sales-order-index .page-actions .add:hover,
+.eq-ie8 .sales-order-index .page-actions .add:hover,
.eq-ie8 .adminhtml-rma-index .page-actions .add:hover,
.eq-ie8 .adminhtml-giftwrapping-index .page-actions .add:hover,
.eq-ie8 .adminhtml-rma-item-attribute-index .page-actions .add:hover,
.eq-ie8 .adminhtml-checkout-agreement-index .page-actions .add:hover,
/* catalog */
-.eq-ie8 .adminhtml-catalog-product-index .page-actions .btn-round > .action-default:hover,
+.eq-ie8 .catalog-product-index .page-actions .btn-round > .action-default:hover,
.eq-ie8 .adminhtml-catalog-event-index .page-actions .add:hover,
-.eq-ie8 .adminhtml-catalog-product-attribute-index .page-actions .add:hover,
-.eq-ie8 .adminhtml-catalog-product-set-index .page-actions .add:hover,
+.eq-ie8 .catalog-product-attribute-index .page-actions .add:hover,
+.eq-ie8 .catalog-product-set-index .page-actions .add:hover,
.eq-ie8 .adminhtml-urlrewrite-index .page-actions .add:hover,
.eq-ie8 .adminhtml-targetrule-index .page-actions .add:hover,
-.eq-ie8 .adminhtml-catalog-search-index .page-actions .add:hover,
-.eq-ie8 .adminhtml-catalog-product-review-index .page-actions .add:hover,
-.eq-ie8 .adminhtml-rating-index .page-actions .add:hover,
+.eq-ie8 .catalog-search-index .page-actions .add:hover,
+.eq-ie8 .catalog-product-review-index .page-actions .add:hover,
+.eq-ie8 .rating-index-index .page-actions .add:hover,
.eq-ie8 .adminhtml-tag-index .page-actions .add:hover,
.eq-ie8 .adminhtml-googleshopping-types-index .page-actions .add:hover,
.eq-ie8 .adminhtml-sitemap-index .page-actions .add:hover,
@@ -1141,26 +1141,26 @@ th.required:after {
.eq-ie8 .adminhtml-system-variable-index .page-actions .add:hover,
.eq-ie8 .adminhtml-user-index .page-actions .add:hover,
.eq-ie8 .adminhtml-user-role-index .page-actions .add:hover,
-.eq-ie8 .adminhtml-tax-rule-index .page-actions .add:hover,
-.eq-ie8 .adminhtml-tax-rate-index .page-actions .add:hover {
+.eq-ie8 .tax-rule-index .page-actions .add:hover,
+.eq-ie8 .tax-rate-index .page-actions .add:hover {
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e47821', endColorstr='#df6817',GradientType=0 );
}
-.adminhtml-sales-order-index .page-actions .add:active,
+.sales-order-index .page-actions .add:active,
.adminhtml-rma-index .page-actions .add:active,
.adminhtml-giftwrapping-index .page-actions .add:active,
.adminhtml-rma-item-attribute-index .page-actions .add:active,
.adminhtml-checkout-agreement-index .page-actions .add:active,
/* catalog */
-.adminhtml-catalog-product-index .page-actions .btn-round > .action-default:active,
+.catalog-product-index .page-actions .btn-round > .action-default:active,
.adminhtml-catalog-event-index .page-actions .add:active,
-.adminhtml-catalog-product-attribute-index .page-actions .add:active,
-.adminhtml-catalog-product-set-index .page-actions .add:active,
+.catalog-product-attribute-index .page-actions .add:active,
+.catalog-product-set-index .page-actions .add:active,
.adminhtml-urlrewrite-index .page-actions .add:active,
.adminhtml-targetrule-index .page-actions .add:active,
-.adminhtml-catalog-search-index .page-actions .add:active,
-.adminhtml-catalog-product-review-index .page-actions .add:active,
-.adminhtml-rating-index .page-actions .add:active,
+.catalog-search-index .page-actions .add:active,
+.catalog-product-review-index .page-actions .add:active,
+.rating-index-index .page-actions .add:active,
.adminhtml-tag-index .page-actions .add:active,
.adminhtml-googleshopping-types-index .page-actions .add:active,
.adminhtml-sitemap-index .page-actions .add:active,
@@ -1195,8 +1195,8 @@ th.required:after {
.adminhtml-system-variable-index .page-actions .add:active,
.adminhtml-user-index .page-actions .add:active,
.adminhtml-user-role-index .page-actions .add:active,
-.adminhtml-tax-rule-index .page-actions .add:active,
-.adminhtml-tax-rate-index .page-actions .add:active {
+.tax-rule-index .page-actions .add:active,
+.tax-rate-index .page-actions .add:active {
background: #e2701av;
-webkit-box-shadow: inset 0px 1px 1px 1px rgba(185, 90, 19, 1);
box-shadow: inset 0px 1px 1px 1px rgba(185, 90, 19, 1);
@@ -1204,21 +1204,21 @@ th.required:after {
filter: none;
}
-.adminhtml-sales-order-index .page-actions .add > span,
+.sales-order-index .page-actions .add > span,
.adminhtml-rma-index .page-actions .add > span,
.adminhtml-rma-item-attribute-index .page-actions .add > span,
.adminhtml-giftwrapping-index .page-actions .add > span,
.adminhtml-checkout-agreement-index .page-actions .add > span,
/* catalog */
-.adminhtml-catalog-product-index .page-actions .btn-round > .action-default > span,
+.catalog-product-index .page-actions .btn-round > .action-default > span,
.adminhtml-catalog-event-index .page-actions .add > span,
-.adminhtml-catalog-product-attribute-index .page-actions .add > span,
-.adminhtml-catalog-product-set-index .page-actions .add > span,
+.catalog-product-attribute-index .page-actions .add > span,
+.catalog-product-set-index .page-actions .add > span,
.adminhtml-urlrewrite-index .page-actions .add > span,
.adminhtml-targetrule-index .page-actions .add > span,
-.adminhtml-catalog-search-index .page-actions .add > span,
-.adminhtml-catalog-product-review-index .page-actions .add > span,
-.adminhtml-rating-index .page-actions .add > span,
+.catalog-search-index .page-actions .add > span,
+.catalog-product-review-index .page-actions .add > span,
+.rating-index-index .page-actions .add > span,
.adminhtml-tag-index .page-actions .add > span,
.adminhtml-googleshopping-types-index .page-actions .add > span,
.adminhtml-sitemap-index .page-actions .add > span,
@@ -1253,29 +1253,29 @@ th.required:after {
.adminhtml-system-variable-index .page-actions .add > span,
.adminhtml-user-index .page-actions .add > span,
.adminhtml-user-role-index .page-actions .add > span,
-.adminhtml-tax-rule-index .page-actions .add > span,
-.adminhtml-tax-rate-index .page-actions .add > span {
+.tax-rule-index .page-actions .add > span,
+.tax-rate-index .page-actions .add > span {
text-indent: -999em;
display: block;
width: 32px;
height: 32px;
}
-.adminhtml-sales-order-index .page-actions .add > span:before,
+.sales-order-index .page-actions .add > span:before,
.adminhtml-rma-index .page-actions .add > span:before,
.adminhtml-giftwrapping-index .page-actions .add > span:before,
.adminhtml-rma-item-attribute-index .page-actions .add > span:before,
.adminhtml-checkout-agreement-index .page-actions .add > span:before,
/* catalog */
-.adminhtml-catalog-product-index .page-actions .btn-round > .action-default > span:before,
+.catalog-product-index .page-actions .btn-round > .action-default > span:before,
.adminhtml-catalog-event-index .page-actions .add > span:before,
-.adminhtml-catalog-product-attribute-index .page-actions .add > span:before,
-.adminhtml-catalog-product-set-index .page-actions .add > span:before,
+.catalog-product-attribute-index .page-actions .add > span:before,
+.catalog-product-set-index .page-actions .add > span:before,
.adminhtml-urlrewrite-index .page-actions .add > span:before,
.adminhtml-targetrule-index .page-actions .add > span:before,
-.adminhtml-catalog-search-index .page-actions .add > span:before,
-.adminhtml-catalog-product-review-index .page-actions .add > span:before,
-.adminhtml-rating-index .page-actions .add > span:before,
+.catalog-search-index .page-actions .add > span:before,
+.catalog-product-review-index .page-actions .add > span:before,
+.rating-index-index .page-actions .add > span:before,
.adminhtml-tag-index .page-actions .add > span:before,
.adminhtml-googleshopping-types-index .page-actions .add > span:before,
.adminhtml-sitemap-index .page-actions .add > span:before,
@@ -1310,8 +1310,8 @@ th.required:after {
.adminhtml-system-variable-index .page-actions .add > span:before,
.adminhtml-user-index .page-actions .add > span:before,
.adminhtml-user-role-index .page-actions .add > span:before,
-.adminhtml-tax-rule-index .page-actions .add > span:before,
-.adminhtml-tax-rate-index .page-actions .add > span:before {
+.tax-rule-index .page-actions .add > span:before,
+.tax-rate-index .page-actions .add > span:before {
text-indent: 0;
font-family: 'MUI-Icons';
font-weight: normal;
@@ -1329,8 +1329,8 @@ th.required:after {
overflow: hidden;
}
-.adminhtml-catalog-product-index .btn-round > .action-toggle,
-.adminhtml-catalog-product-index .btn-round > .action-toggle:focus {
+.catalog-product-index .btn-round > .action-toggle,
+.catalog-product-index .btn-round > .action-toggle:focus {
border: 1px solid #c5c0b9;
border-radius: 0 20px 20px 0;
box-shadow: 0 1px 0 0 #f3f2f1, inset 0 1px 0 0 #f4f1ec;
@@ -1349,12 +1349,12 @@ th.required:after {
background: linear-gradient(to bottom, #f1eee7 0%,#ebe7dc 100%);
}
-.eq-ie8 .adminhtml-catalog-product-index .btn-round > .action-toggle,
-.eq-ie8 .adminhtml-catalog-product-index .btn-round > .action-toggle:focus {
+.eq-ie8 .catalog-product-index .btn-round > .action-toggle,
+.eq-ie8 .catalog-product-index .btn-round > .action-toggle:focus {
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f1eee7', endColorstr='#ebe7dc',GradientType=0 );
}
-.adminhtml-catalog-product-index .btn-round > .action-toggle:hover {
+.catalog-product-index .btn-round > .action-toggle:hover {
margin-left: -6px;
text-shadow: none;
background: #dfdbd4;
@@ -1367,11 +1367,11 @@ th.required:after {
background: linear-gradient(to bottom, #dfdbd4 0%,#d3cdc3 100%);
}
-.eq-ie8 .adminhtml-catalog-product-index .btn-round > .action-toggle:hover {
+.eq-ie8 .catalog-product-index .btn-round > .action-toggle:hover {
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#dfdbd4', endColorstr='#d3cdc3',GradientType=0 );
}
-.adminhtml-catalog-product-index .btn-round.active {
+.catalog-product-index .btn-round.active {
background: #fff;
padding: 5px 4px 6px 7px;
margin: -6px -4px -6px -8px;
@@ -1382,8 +1382,8 @@ th.required:after {
filter: none
}
-.adminhtml-catalog-product-index .btn-round.active > .action-toggle,
-.adminhtml-catalog-product-index .btn-round.active > .action-toggle:hover {
+.catalog-product-index .btn-round.active > .action-toggle,
+.catalog-product-index .btn-round.active > .action-toggle:hover {
background: transparent;
border: 0;
border-radius: 0;
@@ -1392,12 +1392,12 @@ th.required:after {
padding: 1px 5px 1px 11px;
}
-.eq-ie8 .adminhtml-catalog-product-index .btn-round.active > .action-toggle,
-.eq-ie8 .adminhtml-catalog-product-index .btn-round.active > .action-toggle:hover {
+.eq-ie8 .catalog-product-index .btn-round.active > .action-toggle,
+.eq-ie8 .catalog-product-index .btn-round.active > .action-toggle:hover {
filter: none;
}
-.adminhtml-catalog-product-index .btn-round.active:before {
+.catalog-product-index .btn-round.active:before {
position: absolute;
display: block;
bottom: -2px;
@@ -1409,7 +1409,7 @@ th.required:after {
z-index: 5;
}
-.adminhtml-catalog-product-index .btn-round .dropdown-menu {
+.catalog-product-index .btn-round .dropdown-menu {
margin-top: -4px;
left: -1px;
right: auto;
@@ -1419,29 +1419,29 @@ th.required:after {
z-index: 1;
}
-.adminhtml-catalog-product-index .dropdown-menu {
+.catalog-product-index .dropdown-menu {
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
}
-.adminhtml-catalog-product-index .btn-round.active .dropdown-menu > li > .item {
+.catalog-product-index .btn-round.active .dropdown-menu > li > .item {
padding: 9px 10px 10px;
}
-.adminhtml-sales-order-index .grid-actions,
+.sales-order-index .grid-actions,
.adminhtml-rma-index .grid-actions,
.adminhtml-giftwrapping-index .grid-actions,
.adminhtml-rma-item-attribute-index .grid-actions,
.adminhtml-checkout-agreement-index .grid-actions,
/* catalog */
-.adminhtml-catalog-product-index .grid-actions,
+.catalog-product-index .grid-actions,
.adminhtml-catalog-event-index .grid-actions,
-.adminhtml-catalog-product-attribute-index .grid-actions,
-.adminhtml-catalog-product-set-index .grid-actions,
+.catalog-product-attribute-index .grid-actions,
+.catalog-product-set-index .grid-actions,
.adminhtml-urlrewrite-index .grid-actions,
.adminhtml-targetrule-index .grid-actions,
-.adminhtml-catalog-search-index .grid-actions,
-.adminhtml-catalog-product-review-index .grid-actions,
-.adminhtml-rating-index .grid-actions,
+.catalog-search-index .grid-actions,
+.catalog-product-review-index .grid-actions,
+.rating-index-index .grid-actions,
.adminhtml-tag-index .grid-actions,
.adminhtml-googleshopping-types-index .grid-actions,
.adminhtml-sitemap-index .grid-actions,
@@ -1476,8 +1476,8 @@ th.required:after {
.adminhtml-system-variable-index .grid-actions,
.adminhtml-user-index .grid-actions,
.adminhtml-user-role-index .grid-actions,
-.adminhtml-tax-rule-index .grid-actions,
-.adminhtml-tax-rate-index .grid-actions {
+.tax-rule-index .grid-actions,
+.tax-rate-index .grid-actions {
border-radius: 5px 5px 0 0;
margin-top: 20px;
padding-left: 100px;
@@ -1491,7 +1491,7 @@ th.required:after {
.adminhtml-system-currencysymbol-index .page-actions,
.adminhtml-cache-index .page-actions,
.adminhtml-system-store-index .page-actions,
-.adminhtml-sales-order-status-index .page-actions {
+.sales-order-status-index .page-actions {
border: 1px solid #c0bbaf;
border-bottom: 0;
background: rgb(246, 243, 236);
@@ -1527,13 +1527,13 @@ th.required:after {
.adminhtml-system-currencysymbol-index .page-actions.fixed,
.adminhtml-cache-index .page-actions.fixed,
.adminhtml-system-store-index .page-actions.fixed,
-.adminhtml-sales-order-status-index .page-actions.fixed {
+.sales-order-status-index .page-actions.fixed {
background-image: none;
padding: 0 21px;
position: fixed;
}
-.adminhtml-catalog-product-index .grid-actions {
+.catalog-product-index .grid-actions {
padding-left: 80px;
}
@@ -1546,7 +1546,7 @@ th.required:after {
margin: 3px 0 0 10px;
}
-.adminhtml-catalog-product-index .field-store-switcher {
+.catalog-product-index .field-store-switcher {
padding: 0;
}
@@ -1558,7 +1558,7 @@ th.required:after {
margin: 0 0 5px;
}
-.adminhtml-sales-order-create-index .grid table .action-configure {
+.sales-order-create-index .grid table .action-configure {
float: right;
}
@@ -1616,7 +1616,7 @@ th.required:after {
/*
Manage Categories
-------------------------------------- */
-.adminhtml-catalog-category-edit .category-edit-title {
+.catalog-category-edit .category-edit-title {
float: left;
}
diff --git a/app/design/adminhtml/magento_backend/css/pages.css b/app/design/adminhtml/magento_backend/css/pages.css
index 2d3f4fc45bb..9a7c6b0d09a 100644
--- a/app/design/adminhtml/magento_backend/css/pages.css
+++ b/app/design/adminhtml/magento_backend/css/pages.css
@@ -26,9 +26,9 @@
-------------------------------------- */
/* Action "Back" as cross */
-[class^=" adminhtml-catalog-product-"] .page-actions .action-back,
-[class^=" adminhtml-catalog-product-"] .page-actions .action-back:hover,
-[class^=" adminhtml-catalog-product-"] .page-actions .action-back:active,
+[class^=" catalog-product-"] .page-actions .action-back,
+[class^=" catalog-product-"] .page-actions .action-back:hover,
+[class^=" catalog-product-"] .page-actions .action-back:active,
[class^=" adminhtml-newsletter-"] .page-actions .action-back,
[class^=" adminhtml-newsletter-"] .page-actions .action-back:hover,
[class^=" adminhtml-newsletter-"] .page-actions .action-back:active {
@@ -38,33 +38,33 @@
color: #7a7976;
}
-.eq-ie8 [class^=" adminhtml-catalog-product-"] .page-actions .action-back,
-.eq-ie8 [class^=" adminhtml-catalog-product-"] .page-actions .action-back:hover,
-.eq-ie8 [class^=" adminhtml-catalog-product-"] .page-actions .action-back:active,
+.eq-ie8 [class^=" catalog-product-"] .page-actions .action-back,
+.eq-ie8 [class^=" catalog-product-"] .page-actions .action-back:hover,
+.eq-ie8 [class^=" catalog-product-"] .page-actions .action-back:active,
.eq-ie8 [class^=" adminhtml-newsletter-"] .page-actions .action-back,
.eq-ie8 [class^=" adminhtml-newsletter-"] .page-actions .action-back:hover,
.eq-ie8 [class^=" adminhtml-newsletter-"] .page-actions .action-back:active,
-.adminhtml-sales-order-create-index .page-actions-inner .cancel,
-.adminhtml-sales-order-create-index .page-actions-inner .cancel:hover,
-.adminhtml-sales-order-create-index .page-actions-inner .cancel:active {
+.sales-order-create-index .page-actions-inner .cancel,
+.sales-order-create-index .page-actions-inner .cancel:hover,
+.sales-order-create-index .page-actions-inner .cancel:active {
filter: none;
border: 0;
}
-[class^=" adminhtml-catalog-product-"] .page-actions .action-back:hover,
+[class^=" catalog-product-"] .page-actions .action-back:hover,
[class^=" adminhtml-newsletter-"] .page-actions .action-back:hover,
-.adminhtml-sales-order-create-index .page-actions-inner .cancel:hover {
+.sales-order-create-index .page-actions-inner .cancel:hover {
color: #000;
}
-[class^=" adminhtml-catalog-product-"] .page-actions .action-back.mage-error,
+[class^=" catalog-product-"] .page-actions .action-back.mage-error,
[class^=" adminhtml-newsletter-"] .page-actions .action-back.mage-error {
color: #b57c72;
}
-[class^=" adminhtml-catalog-product-"] .page-actions .action-back:before,
+[class^=" catalog-product-"] .page-actions .action-back:before,
[class^=" adminhtml-newsletter-"] .page-actions .action-back:before,
-.adminhtml-sales-order-create-index .page-actions-inner .cancel:before {
+.sales-order-create-index .page-actions-inner .cancel:before {
display: inline-block;
font-family: 'MUI-Icons';
font-style: normal;
@@ -75,9 +75,9 @@
font-size: 16px;
}
-[class^=" adminhtml-catalog-product-"] .page-actions .action-back span,
+[class^=" catalog-product-"] .page-actions .action-back span,
[class^=" adminhtml-newsletter-"] .page-actions .action-back span,
-.adminhtml-sales-order-create-index .page-actions-inner .cancel span {
+.sales-order-create-index .page-actions-inner .cancel span {
display: inline-block;
overflow: hidden;
text-indent: -999em;
@@ -1376,11 +1376,11 @@
.order-billing-address,
.order-billing-method,
-[class^=" adminhtml-sales-order-"] .order-history,
-[class^=" adminhtml-sales-order-"] .order-comments-history,
-[class^=" adminhtml-sales-order-"] .order-information,
-[class^=" adminhtml-sales-order-"] .order-billing-address,
-[class^=" adminhtml-sales-order-"] .order-payment-method,
+[class^=" sales-order-"] .order-history,
+[class^=" sales-order-"] .order-comments-history,
+[class^=" sales-order-"] .order-information,
+[class^=" sales-order-"] .order-billing-address,
+[class^=" sales-order-"] .order-payment-method,
[class^=" adminhtml-rma-"] .order-comments-history,
[class^=" adminhtml-rma-"] .order-shipping-address,
[class^=" adminhtml-rma-"] .rma-request-details {
@@ -1390,11 +1390,11 @@
.order-shipping-address,
.order-shipping-method,
-[class^=" adminhtml-sales-order-"] .order-totals,
-[class^=" adminhtml-sales-order-"] .order-account-information,
-[class^=" adminhtml-sales-order-"] .order-shipping-address,
-[class^=" adminhtml-sales-order-"] .order-payment-method-virtual,
-[class^=" adminhtml-sales-order-"] .order-shipping-method,
+[class^=" sales-order-"] .order-totals,
+[class^=" sales-order-"] .order-account-information,
+[class^=" sales-order-"] .order-shipping-address,
+[class^=" sales-order-"] .order-payment-method-virtual,
+[class^=" sales-order-"] .order-shipping-method,
[class^=" adminhtml-rma-"] .rma-confirmation,
[class^=" adminhtml-rma-"] .order-shipping-method,
[class^=" adminhtml-rma-"] .order-return-address {
@@ -1407,7 +1407,7 @@
width: auto;
}
-[class^=" adminhtml-sales-"] .order-information .fieldset-wrapper > .fieldset-wrapper-title .title {
+[class^=" sales-"] .order-information .fieldset-wrapper > .fieldset-wrapper-title .title {
width: 100%;
}
@@ -1506,78 +1506,78 @@
width: 100%;
}
-[class^=" adminhtml-sales-order-"] .order-billing-address .actions,
-[class^=" adminhtml-sales-order-"] .order-shipping-address .actions {
+[class^=" sales-order-"] .order-billing-address .actions,
+[class^=" sales-order-"] .order-shipping-address .actions {
margin: 17px 0;
}
-[class^=" adminhtml-sales-order-"] .order-billing-address .control + label,
-[class^=" adminhtml-sales-order-"] .order-shipping-address .control + label {
+[class^=" sales-order-"] .order-billing-address .control + label,
+[class^=" sales-order-"] .order-shipping-address .control + label {
margin: 17px 0 0;
}
-.adminhtml-sales-order-create-index .page-actions-inner .cancel,
-.adminhtml-sales-order-create-index .page-actions-inner .cancel:hover,
-.adminhtml-sales-order-create-index .page-actions-inner .cancel:active {
+.sales-order-create-index .page-actions-inner .cancel,
+.sales-order-create-index .page-actions-inner .cancel:hover,
+.sales-order-create-index .page-actions-inner .cancel:active {
float: right;
margin: 0 0 0 12px;
padding: 3px 0 3px 6px;
}
-.adminhtml-sales-order-create-index #order-message ul.messages > li,
-.adminhtml-sales-order-edit-index #order-message ul.messages > li {
+.sales-order-create-index #order-message ul.messages > li,
+.sales-order-edit-index #order-message ul.messages > li {
margin: 0 0 60px;
}
-.adminhtml-sales-order-create-index thead .col-entity_id,
-.adminhtml-sales-order-create-index .col-entity_id,
-.adminhtml-sales-order-create-index .col-qty {
+.sales-order-create-index thead .col-entity_id,
+.sales-order-create-index .col-entity_id,
+.sales-order-create-index .col-qty {
width: 50px;
}
-.adminhtml-sales-order-create-index .col-in_products {
+.sales-order-create-index .col-in_products {
text-align: center;
}
-.adminhtml-sales-order-create-index .col-sku,
-.adminhtml-sales-order-create-index .col-remove {
+.sales-order-create-index .col-sku,
+.sales-order-create-index .col-remove {
width: 120px;
}
-.adminhtml-sales-order-create-index .col-price {
+.sales-order-create-index .col-price {
width: 70px;
}
-.adminhtml-sales-order-create-index .order-search-items .col-name {
+.sales-order-create-index .order-search-items .col-name {
width: 50%;
}
-.adminhtml-sales-order-create-index .order-items.fieldset-wrapper .fieldset-wrapper-title,
-.adminhtml-sales-order-create-index .order-search-items.fieldset-wrapper .fieldset-wrapper-title,
-.adminhtml-sales-order-create-index .order-additional-area.fieldset-wrapper .fieldset-wrapper-title,
-.adminhtml-sales-order-create-index .order-errors .fieldset-wrapper-title {
+.sales-order-create-index .order-items.fieldset-wrapper .fieldset-wrapper-title,
+.sales-order-create-index .order-search-items.fieldset-wrapper .fieldset-wrapper-title,
+.sales-order-create-index .order-additional-area.fieldset-wrapper .fieldset-wrapper-title,
+.sales-order-create-index .order-errors .fieldset-wrapper-title {
border-bottom: 0;
margin: 0;
}
-.adminhtml-sales-order-create-index #order-data .fieldset-wrapper-title .actions .action-add {
+.sales-order-create-index #order-data .fieldset-wrapper-title .actions .action-add {
margin-left: 0;
margin-right: 20px;
}
-.adminhtml-sales-order-create-index .order-items.fieldset-wrapper .title,
-.adminhtml-sales-order-create-index .order-additional-area.fieldset-wrapper .title,
-.adminhtml-sales-order-create-index .order-search-items.fieldset-wrapper .title,
-.adminhtml-sales-order-create-index .order-errors .title {
+.sales-order-create-index .order-items.fieldset-wrapper .title,
+.sales-order-create-index .order-additional-area.fieldset-wrapper .title,
+.sales-order-create-index .order-search-items.fieldset-wrapper .title,
+.sales-order-create-index .order-errors .title {
border-bottom: 1px solid #ededed;
float: none;
margin: 0 0 18px;
width: 100%;
}
-.adminhtml-sales-order-create-index .order-items.fieldset-wrapper .actions,
-.adminhtml-sales-order-create-index .order-search-items.fieldset-wrapper .actions,
-.adminhtml-sales-order-create-index #order-errors .actions {
+.sales-order-create-index .order-items.fieldset-wrapper .actions,
+.sales-order-create-index .order-search-items.fieldset-wrapper .actions,
+.sales-order-create-index #order-errors .actions {
float: none;
border: 1px solid #c0bbaf;
border-bottom: 0;
@@ -1595,7 +1595,7 @@
position: relative;
}
-.adminhtml-sales-order-create-index #order-data .fieldset-wrapper .actions .action-add {
+.sales-order-create-index #order-data .fieldset-wrapper .actions .action-add {
background: #f58227;
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2Y1ODIyNyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmMDcyMWMiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
background: -moz-linear-gradient(top, #f58227 0%, #f0721c 100%);
@@ -1616,13 +1616,13 @@
text-decoration: none;
}
-.adminhtml-sales-order-create-index .order-additional-area.fieldset-wrapper .actions {
+.sales-order-create-index .order-additional-area.fieldset-wrapper .actions {
float: none;
margin: 0 0 8px;
padding: 0;
}
-.adminhtml-sales-order-create-index #order-data .fieldset-wrapper .actions .action-add:hover {
+.sales-order-create-index #order-data .fieldset-wrapper .actions .action-add:hover {
color: #fff;
background: #e47821;
background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2U0NzgyMSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNkZTY4MTciIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
@@ -1634,15 +1634,15 @@
background: linear-gradient(to bottom, #e47821 0%, #de6817 100%);
}
-.eq-ie8 .adminhtml-sales-order-create-index #order-data .fieldset-wrapper .actions .action-add {
+.eq-ie8 .sales-order-create-index #order-data .fieldset-wrapper .actions .action-add {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f58227', endColorstr='#f0721c', GradientType=0);
}
-.eq-ie8 .adminhtml-sales-order-create-index #order-data .fieldset-wrapper .action-add:hover {
+.eq-ie8 .sales-order-create-index #order-data .fieldset-wrapper .action-add:hover {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e47821', endColorstr='#de6817', GradientType=0);
}
-.adminhtml-sales-order-create-index #order-data .fieldset-wrapper .actions .action-delete {
+.sales-order-create-index #order-data .fieldset-wrapper .actions .action-delete {
margin: 11px 0 0;
}
@@ -1751,16 +1751,16 @@
/*
Order view
-------------------------------------- */
-[class^=" adminhtml-sales-order-"] .fieldset-wrapper-title .actions {
+[class^=" sales-order-"] .fieldset-wrapper-title .actions {
float: right;
font-size: 12px;
margin: 8px 20px 0 0;
}
-[class^=" adminhtml-sales-order-"] .fieldset-wrapper-title .actions a:link,
-[class^=" adminhtml-sales-order-"] .fieldset-wrapper-title .actions a:visited,
-[class^=" adminhtml-sales-order-"] .fieldset-wrapper-title .actions a:hover,
-[class^=" adminhtml-sales-order-"] .fieldset-wrapper-title .actions a:active {
+[class^=" sales-order-"] .fieldset-wrapper-title .actions a:link,
+[class^=" sales-order-"] .fieldset-wrapper-title .actions a:visited,
+[class^=" sales-order-"] .fieldset-wrapper-title .actions a:hover,
+[class^=" sales-order-"] .fieldset-wrapper-title .actions a:active {
color: #a29c94;
}
@@ -1790,7 +1790,7 @@
float: right;
}
-[class^=" adminhtml-sales-order-"] .fieldset-wrapper address {
+[class^=" sales-order-"] .fieldset-wrapper address {
overflow: auto;
}
@@ -1855,26 +1855,26 @@
.adminhtml-giftwrapping-index .col-id,
.adminhtml-checkout-agreement-index .col-id,
-[class^=" adminhtml-sales-billing-"] .col-id,
-[class^=" adminhtml-sales-transactions-"] .col-id {
+[class^=" sales-billing-"] .col-id,
+[class^=" sales-transactions-"] .col-id {
width: 35px;
}
-[class^=" adminhtml-sales-order-shipment-"] .col-ship,
-[class^=" adminhtml-sales-"] .col-return-to-stock,
+[class^=" sales-order-shipment-"] .col-ship,
+[class^=" sales-"] .col-return-to-stock,
.adminhtml-rma-new .col-select {
text-align: center;
width: 35px;
}
-[class^=" adminhtml-sales-order-"] .col-price-original,
-[class^=" adminhtml-sales-order-"] .col-tax-amount,
-[class^=" adminhtml-sales-order-"] .col-tax-percent,
-[class^=" adminhtml-sales-order-"] .col-discont,
-[class^=" adminhtml-sales-order-"] .col-total,
-[class^=" adminhtml-sales-order-"] .col-discount,
-[class^=" adminhtml-sales-order-"] .col-tax,
-[class^=" adminhtml-sales-"] .col-refunded,
+[class^=" sales-order-"] .col-price-original,
+[class^=" sales-order-"] .col-tax-amount,
+[class^=" sales-order-"] .col-tax-percent,
+[class^=" sales-order-"] .col-discont,
+[class^=" sales-order-"] .col-total,
+[class^=" sales-order-"] .col-discount,
+[class^=" sales-order-"] .col-tax,
+[class^=" sales-"] .col-refunded,
[class^=" adminhtml-rma-"] .col-order,
[class^=" adminhtml-rma-"] .col-required,
[class^=" adminhtml-rma-"] .col-system,
@@ -1886,71 +1886,71 @@
width: 50px;
}
-[class^=" adminhtml-sales-order-"] .col-subtotal,
-[class^=" adminhtml-sales-order-"] .col-price,
+[class^=" sales-order-"] .col-subtotal,
+[class^=" sales-order-"] .col-price,
[class^=" adminhtml-rma-"] .col-price,
.adminhtml-giftwrapping-index .col-price {
text-align: right;
width: 50px;
}
-.adminhtml-sales-order-invoice-view .col-subtotal,
-.adminhtml-sales-order-invoice-view .col-price {
+.sales-order-invoice-view .col-subtotal,
+.sales-order-invoice-view .col-price {
width: 10%;
}
-[class^=" adminhtml-sales-"] .col-actions,
+[class^=" sales-"] .col-actions,
[class^=" adminhtml-rma-"] .col-actions,
[class^=" adminhtml-rma-"] .col-default,
.adminhtml-giftwrapping-index .col-actions {
width: 50px;
}
-[class^=" adminhtml-sales-"] .col-select,
+[class^=" sales-"] .col-select,
[class^=" adminhtml-rma-"] .col-select,
.adminhtml-giftwrapping-index .col-select {
width: 60px;
}
-[class^=" adminhtml-sales-"] .col-qty,
-[class^=" adminhtml-sales-order-"] .col-qty-invoice,
-[class^=" adminhtml-sales-order-"] .col-ordered-qty,
+[class^=" sales-"] .col-qty,
+[class^=" sales-order-"] .col-qty-invoice,
+[class^=" sales-order-"] .col-ordered-qty,
[class^=" adminhtml-rma-"] .col-qty,
[class^=" adminhtml-rma-"] .col-condition {
width: 70px;
}
-[class^=" adminhtml-sales-"] .col-refund,
-[class^=" adminhtml-sales-transactions-"] .col-closed,
-.adminhtml-sales-order-view .col-closed {
+[class^=" sales-"] .col-refund,
+[class^=" sales-transactions-"] .col-closed,
+.sales-order-view .col-closed {
text-align: center;
width: 70px;
}
-[class^=" adminhtml-sales-"] .col-order-number,
-[class^=" adminhtml-sales-"] .col-invoice-number,
-[class^=" adminhtml-sales-"] .col-memo-number,
-[class^=" adminhtml-sales-"] .col-shipment-number,
-[class^=" adminhtml-sales-"] .col-rma-number,
-[class^=" adminhtml-sales-"] .col-status,
+[class^=" sales-"] .col-order-number,
+[class^=" sales-"] .col-invoice-number,
+[class^=" sales-"] .col-memo-number,
+[class^=" sales-"] .col-shipment-number,
+[class^=" sales-"] .col-rma-number,
+[class^=" sales-"] .col-status,
[class^=" adminhtml-rma-"] .col-order-number,
[class^=" adminhtml-rma-"] .col-rma-number,
-[class^=" adminhtml-sales-transactions-"] .col-order-id,
+[class^=" sales-transactions-"] .col-order-id,
.adminhtml-giftwrapping-index .col-status,
-.adminhtml-sales-order-view .col-refunded {
+.sales-order-view .col-refunded {
white-space: normal;
width: 75px;
}
-[class^=" adminhtml-sales-"] .col-gtbase,
-[class^=" adminhtml-sales-"] .col-gtpurchased {
+[class^=" sales-"] .col-gtbase,
+[class^=" sales-"] .col-gtpurchased {
text-align: right;
white-space: normal;
width: 75px;
}
-[class^=" adminhtml-sales-"] .col-order-number,
-[class^=" adminhtml-sales-"] .col-rma-number,
+[class^=" sales-"] .col-order-number,
+[class^=" sales-"] .col-rma-number,
[class^=" adminhtml-rma-"] .col-order-number,
[class^=" adminhtml-rma-"] .col-rma-number {
text-align: left;
@@ -1959,27 +1959,27 @@
[class^=" adminhtml-rma-"] .col-status,
[class^=" adminhtml-rma-"] .col-reason,
[class^=" adminhtml-rma-"] .col-resolution,
-[class^=" adminhtml-sales-transactions-"] .col-transaction-type,
-.adminhtml-sales-order-view .col-memo {
+[class^=" sales-transactions-"] .col-transaction-type,
+.sales-order-view .col-memo {
width: 100px;
}
-[class^=" adminhtml-sales-"] tr.headings .col-parent-transaction-id > span,
-[class^=" adminhtml-sales-"] tr.headings .col-method > span,
-[class^=" adminhtml-sales-"] tr.headings .col-transaction-id > span,
-[class^=" adminhtml-sales-"] tr.headings .col-transaction-type > span,
-[class^=" adminhtml-sales-"] tr.headings .col-gtbase > span,
-[class^=" adminhtml-sales-"] tr.headings .col-gtpurchased > span,
-[class^=" adminhtml-sales-order-"] tr.headings .col-discont > span {
+[class^=" sales-"] tr.headings .col-parent-transaction-id > span,
+[class^=" sales-"] tr.headings .col-method > span,
+[class^=" sales-"] tr.headings .col-transaction-id > span,
+[class^=" sales-"] tr.headings .col-transaction-type > span,
+[class^=" sales-"] tr.headings .col-gtbase > span,
+[class^=" sales-"] tr.headings .col-gtpurchased > span,
+[class^=" sales-order-"] tr.headings .col-discont > span {
white-space: normal;
}
-[class^=" adminhtml-sales-"] .col-period,
+[class^=" sales-"] .col-period,
[class^=" adminhtml-rma-"] .col-period {
width: 150px;
}
-[class^=" adminhtml-sales-order-shipment-"] .col-carrier {
+[class^=" sales-order-shipment-"] .col-carrier {
width: 190px;
}
@@ -1989,42 +1989,42 @@
width: 200px;
}
-[class^=" adminhtml-sales-transactions-"] .log-details .data-table tbody tr th,
-[class^=" adminhtml-sales-transactions-"] .col-key {
+[class^=" sales-transactions-"] .log-details .data-table tbody tr th,
+[class^=" sales-transactions-"] .col-key {
width: 22%;
}
-.adminhtml-sales-order-index .col-1-layout table.data {
+.sales-order-index .col-1-layout table.data {
table-layout: fixed;
word-wrap: break-word;
}
-.eq-ie8 .adminhtml-sales-order-index .col-1-layout table.data {
+.eq-ie8 .sales-order-index .col-1-layout table.data {
table-layout: auto;
word-wrap: normal;
}
-[class^=" adminhtml-sales-"] .col-from-store {
+[class^=" sales-"] .col-from-store {
width: 15%;
}
-[class^=" adminhtml-sales-"] .col-2-left-layout .hor-scroll {
+[class^=" sales-"] .col-2-left-layout .hor-scroll {
margin-bottom: -4px;
overflow: auto;
padding-bottom: 4px;
width: 100%;
}
-[class^=" adminhtml-sales-order-"] .order-totals .actions,
+[class^=" sales-order-"] .order-totals .actions,
[class^=" adminhtml-rma-"] .col-qty,
[class^=" adminhtml-rma-"] .col-qty_ordered,
-.adminhtml-sales-order-view .col-refunded {
+.sales-order-view .col-refunded {
text-align: right;
}
.adminhtml-giftwrapping-index .col-price .label,
-[class^=" adminhtml-sales-order-"] .col-price .label,
-[class^=" adminhtml-sales-order-"] .col-subtotal .label {
+[class^=" sales-order-"] .col-price .label,
+[class^=" sales-order-"] .col-subtotal .label {
display: inline-block;
min-width: 60px;
white-space: nowrap;
@@ -2032,42 +2032,42 @@
.adminhtml-giftwrapping-index .col-price .price-excl-tax .price,
.adminhtml-giftwrapping-index .col-price .price-incl-tax .price,
-[class^=" adminhtml-sales-order-"] .col-price .price-excl-tax .price,
-[class^=" adminhtml-sales-order-"] .col-price .price-incl-tax .price,
-[class^=" adminhtml-sales-order-"] .col-subtotal .price-excl-tax .price,
-[class^=" adminhtml-sales-order-"] .col-subtotal .price-incl-tax .price {
+[class^=" sales-order-"] .col-price .price-excl-tax .price,
+[class^=" sales-order-"] .col-price .price-incl-tax .price,
+[class^=" sales-order-"] .col-subtotal .price-excl-tax .price,
+[class^=" sales-order-"] .col-subtotal .price-incl-tax .price {
font-weight: bold;
}
-[class^=" adminhtml-sales-order-"] .grid .col-qty table,
-[class^=" adminhtml-sales-order-"] .grid .col-qty tbody,
-[class^=" adminhtml-sales-order-"] .grid .col-qty tr,
-[class^=" adminhtml-sales-order-"] .grid .col-qty td,
-[class^=" adminhtml-sales-order-"] .grid .col-ordered-qty table,
-[class^=" adminhtml-sales-order-"] .grid .col-ordered-qty tbody,
-[class^=" adminhtml-sales-order-"] .grid .col-ordered-qty tr,
-[class^=" adminhtml-sales-order-"] .grid .col-ordered-qty td {
+[class^=" sales-order-"] .grid .col-qty table,
+[class^=" sales-order-"] .grid .col-qty tbody,
+[class^=" sales-order-"] .grid .col-qty tr,
+[class^=" sales-order-"] .grid .col-qty td,
+[class^=" sales-order-"] .grid .col-ordered-qty table,
+[class^=" sales-order-"] .grid .col-ordered-qty tbody,
+[class^=" sales-order-"] .grid .col-ordered-qty tr,
+[class^=" sales-order-"] .grid .col-ordered-qty td {
background: none;
border: 0;
}
-[class^=" adminhtml-sales-order-"] .col-ordered-qty td {
+[class^=" sales-order-"] .col-ordered-qty td {
padding: 0 5px 3px;
}
-[class^=" adminhtml-sales-order-"] .grid .product-title {
+[class^=" sales-order-"] .grid .product-title {
font-weight: bold;
}
-[class^=" adminhtml-sales-order-"] .item-options {
+[class^=" sales-order-"] .item-options {
margin: 5px 0 5px 10px;
}
-[class^=" adminhtml-sales-order-"] .item-options dt {
+[class^=" sales-order-"] .item-options dt {
font-weight: bold;
}
-[class^=" adminhtml-sales-order-"] .item-options dd {
+[class^=" sales-order-"] .item-options dd {
margin: 0 0 0 10px;
}
@@ -2092,7 +2092,7 @@ table.items-to-invoice tbody tr:hover td {
text-align: center;
}
-[class^=" adminhtml-sales-order-creditmemo-"] .no-items {
+[class^=" sales-order-creditmemo-"] .no-items {
padding-top: 13px;
text-align: center;
}
@@ -2102,11 +2102,11 @@ table.items-to-invoice tbody tr:hover td {
font-weight: bold;
}
-.adminhtml-sales-order-shipment-new .order-totals .fieldset-wrapper {
+.sales-order-shipment-new .order-totals .fieldset-wrapper {
padding-top: 18px;
}
-.adminhtml-sales-order-shipment-new .actions {
+.sales-order-shipment-new .actions {
float: right;
}
@@ -2115,7 +2115,7 @@ table.items-to-invoice tbody tr:hover td {
width: 60px;
}
-[class^=" adminhtml-sales-order-"] .order-subtotal .label {
+[class^=" sales-order-"] .order-subtotal .label {
width: 80%;
}
@@ -2131,7 +2131,7 @@ table.items-to-invoice tbody tr:hover td {
}
.adminhtml-rma-edit .data-table .col-carrier,
-[class^=" adminhtml-sales-billing-agreement-"] .log-details .data-table th {
+[class^=" sales-billing-agreement-"] .log-details .data-table th {
width: 20%;
}
@@ -2143,7 +2143,7 @@ table.items-to-invoice tbody tr:hover td {
width: 25%;
}
-[class^=" adminhtml-sales-order-"] .order-shipping-address .price,
+[class^=" sales-order-"] .order-shipping-address .price,
.order-shipping-address .shipping-description-title {
font-weight: bold;
}
@@ -2162,36 +2162,36 @@ table.items-to-invoice tbody tr:hover td {
margin: 0 3px;
}
-[class^=" adminhtml-sales-"] .order-payment-method .data-table {
+[class^=" sales-"] .order-payment-method .data-table {
margin-top: 15px;
}
-[class^=" adminhtml-sales-"] .order-payment-currency {
+[class^=" sales-"] .order-payment-currency {
margin-top: 15px;
}
-[class^=" adminhtml-sales-"] .grid tbody td {
+[class^=" sales-"] .grid tbody td {
vertical-align: top;
}
-[class^=" adminhtml-sales-"] .grid tbody.even tr td {
+[class^=" sales-"] .grid tbody.even tr td {
background: #e6e3de;
}
-[class^=" adminhtml-sales-"] .grid tbody.odd tr td {
+[class^=" sales-"] .grid tbody.odd tr td {
border-bottom: 0;
background: #f5f2ed;
}
-[class^=" adminhtml-sales-"] .grid .data {
+[class^=" sales-"] .grid .data {
border-bottom: 1px solid #c0bbaf;
}
-[class^=" adminhtml-sales-"] .grid td .option-label {
+[class^=" sales-"] .grid td .option-label {
font-weight: bold;
}
-[class^=" adminhtml-sales-"] .grid td .option-value {
+[class^=" sales-"] .grid td .option-value {
margin: 0 0 0 10px;
}
@@ -2542,8 +2542,8 @@ table.items-to-invoice tbody tr:hover td {
padding: 0;
}
-[class^=" adminhtml-sales-order-"] .order-billing-address .packaging-window .actions,
-[class^=" adminhtml-sales-order-"] .order-shipping-address .packaging-window .actions {
+[class^=" sales-order-"] .order-billing-address .packaging-window .actions,
+[class^=" sales-order-"] .order-shipping-address .packaging-window .actions {
margin: 0;
}
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/payment.js b/app/design/frontend/magento_backup/Magento_Checkout/js/payment.js
new file mode 100644
index 00000000000..e0028755b9b
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Checkout/js/payment.js
@@ -0,0 +1,133 @@
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category multshipping payment
+ * @package mage
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+/*jshint browser:true jquery:true*/
+/*global alert*/
+(function($) {
+ 'use strict';
+ $.widget('mage.payment', {
+ options: {
+ continueSelector: '#payment-continue',
+ methodsContainer: '#payment-methods',
+ minBalance: 0.0001,
+ tmpl: '<input id="hidden-free" type="hidden" name="payment[method]" value="free">'
+ },
+
+ _create: function() {
+ this.element.find('dd [name^="payment["]').prop('disabled', true).end()
+ .on('click', this.options.continueSelector, $.proxy(this._submitHandler, this))
+ .on('updateCheckoutPrice', $.proxy(function(event, data) {
+ //updating the checkoutPrice
+ if (data.price) {
+ this.options.checkoutPrice += data.price;
+ }
+ //updating total price
+ if (data.totalPrice) {
+ data.totalPrice = this.options.checkoutPrice;
+ }
+ if (this.options.checkoutPrice < this.options.minBalance) {
+ // Add free input field, hide and disable unchecked checkbox payment method and all radio button payment methods
+ this._disablePaymentMethods();
+ } else {
+ // Remove free input field, show all payment method
+ this._enablePaymentMethods();
+ }
+ }, this))
+ .on('click', 'dt input:radio', $.proxy(this._paymentMethodHandler, this));
+
+ if (this.options.checkoutPrice < this.options.minBalance) {
+ this._disablePaymentMethods();
+ } else {
+ this._enablePaymentMethods();
+ }
+ },
+
+ /**
+ * Display payment details when payment method radio button is checked
+ * @private
+ * @param e
+ */
+ _paymentMethodHandler: function(e) {
+ var element = $(e.target),
+ parentsDl = element.closest('dl');
+ parentsDl.find('dt input:radio').prop('checked', false);
+ parentsDl.find('dd ul').hide().find('[name^="payment["]').prop('disabled', true);
+ element.prop('checked', true).parent().nextUntil('dt').find('ul').show().find('[name^="payment["]').prop('disabled', false);
+ },
+
+ /**
+ * make sure one payment method is selected
+ * @private
+ * @return {Boolean}
+ */
+ _validatePaymentMethod: function() {
+ var methods = this.element.find('[name^="payment["]'),
+ isValid = false;
+ if (methods.length === 0) {
+ alert($.mage.__("We can't complete your order because you don't have a payment method available."));
+ }
+ else if (methods.filter(':checked').length) {
+ isValid = true;
+ } else {
+ alert($.mage.__('Please specify payment method.'));
+ }
+ return isValid;
+ },
+
+ /**
+ * Disable and enable payment methods
+ * @private
+ */
+ _disablePaymentMethods: function() {
+ this.element.find('input[name="payment[method]"]').prop('disabled', true).end()
+ .find('input[id^="use"][name^="payment[use"]:not(:checked)').prop('disabled', true).parent().hide();
+ this.element.find('[name="payment[method]"][value="free"]').parent('dt').remove();
+ this.element.find(this.options.methodsContainer).hide().find('[name^="payment["]').prop('disabled', true);
+ $.tmpl(this.options.tmpl).appendTo(this.element);
+ },
+
+ /**
+ * Enable and enable payment methods
+ * @private
+ */
+ _enablePaymentMethods: function() {
+ this.element.find('input[name="payment[method]"]').prop('disabled', false).end()
+ .find('input[name="payment[method]"][value="free"]').remove().end()
+ .find('dt input:radio:checked').trigger('click').end()
+ .find('input[id^="use"][name^="payment[use"]:not(:checked)').prop('disabled', false).parent().show();
+ this.element.find(this.options.methodsContainer).show();
+ },
+
+ /**
+ * Validate before form submit
+ * @private
+ */
+ _submitHandler: function(e) {
+ e.preventDefault();
+ if (this._validatePaymentMethod()) {
+ this.element.submit();
+ }
+ }
+ });
+})(jQuery);
\ No newline at end of file
diff --git a/app/design/frontend/magento_backup/Magento_Cms/content_heading.phtml b/app/design/frontend/magento_backup/Magento_Cms/content_heading.phtml
new file mode 100644
index 00000000000..4bb4b239282
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Cms/content_heading.phtml
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php if($_heading = $this->getContentHeading()): ?>
+ <div class="page-title">
+ <h1><?php echo $_heading; ?></h1>
+ </div>
+<?php endif; ?>
diff --git a/app/code/Magento/Cms/view/frontend/images/i_widget-link.gif b/app/design/frontend/magento_backup/Magento_Cms/images/i_widget-link.gif
similarity index 100%
rename from app/code/Magento/Cms/view/frontend/images/i_widget-link.gif
rename to app/design/frontend/magento_backup/Magento_Cms/images/i_widget-link.gif
diff --git a/app/design/frontend/magento_backup/Magento_Cms/layout/override/default.xml b/app/design/frontend/magento_backup/Magento_Cms/layout/override/default.xml
new file mode 100644
index 00000000000..d5b7d2f834c
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Cms/layout/override/default.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceBlock name="head">
+ <block class="Magento\Page\Block\Html\Head\Css" name="magento-cms-widgets-css">
+ <arguments>
+ <argument name="file" xsi:type="string">Magento_Cms::widgets.css</argument>
+ </arguments>
+ </block>
+ </referenceBlock>
+ <referenceBlock name="footer">
+ <block class="Magento\Cms\Block\Block" name="cms_footer_links" before="footer_links">
+ <!--
+ The content of this block is taken from the database by its block_id.
+ You can manage it in admin CMS -> Static Blocks
+ -->
+ <action method="setBlockId">
+ <argument name="block_id" xsi:type="string">footer_links</argument>
+ </action>
+ </block>
+ </referenceBlock>
+</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Review/layout/override/customer_account_index.xml b/app/design/frontend/magento_backup/Magento_Cms/layout/override/print.xml
similarity index 78%
rename from app/design/frontend/magento_plushe/Magento_Review/layout/override/customer_account_index.xml
rename to app/design/frontend/magento_backup/Magento_Cms/layout/override/print.xml
index 8df4eb25e23..ba0a322322b 100644
--- a/app/design/frontend/magento_plushe/Magento_Review/layout/override/customer_account_index.xml
+++ b/app/design/frontend/magento_backup/Magento_Cms/layout/override/print.xml
@@ -24,7 +24,11 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="my.account.wrapper">
- <block class="Magento\Review\Block\Customer\Recent" name="customer_account_dashboard_info1" template="customer/recent.phtml" after="customer_account_dashboard_address"/>
+ <referenceBlock name="head">
+ <block class="Magento\Page\Block\Html\Head\Css" name="magento-cms-widgets-css">
+ <arguments>
+ <argument name="file" xsi:type="string">Magento_Cms::widgets.css</argument>
+ </arguments>
+ </block>
</referenceBlock>
</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Directory/layout/override/catalog_category_view.xml b/app/design/frontend/magento_backup/Magento_Cms/widget/static_block/default.phtml
similarity index 86%
rename from app/design/frontend/magento_plushe/Magento_Directory/layout/override/catalog_category_view.xml
rename to app/design/frontend/magento_backup/Magento_Cms/widget/static_block/default.phtml
index 6c60196129d..77b50f85a70 100644
--- a/app/design/frontend/magento_plushe/Magento_Directory/layout/override/catalog_category_view.xml
+++ b/app/design/frontend/magento_backup/Magento_Cms/widget/static_block/default.phtml
@@ -1,5 +1,4 @@
-<?xml version="1.0"?>
-<!--
+<?php
/**
* Magento
*
@@ -19,8 +18,10 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
+ * @category design
+ * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
+?>
+<div class="widget widget-static-block"><?php echo $this->getText(); ?></div>
diff --git a/app/code/Magento/Cms/view/frontend/widgets.css b/app/design/frontend/magento_backup/Magento_Cms/widgets.css
similarity index 100%
rename from app/code/Magento/Cms/view/frontend/widgets.css
rename to app/design/frontend/magento_backup/Magento_Cms/widgets.css
diff --git a/app/design/frontend/magento_backup/Magento_Contacts/form.phtml b/app/design/frontend/magento_backup/Magento_Contacts/form.phtml
new file mode 100644
index 00000000000..91f06ee1dd6
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Contacts/form.phtml
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<div id="messages_product_view"><?php echo $this->getMessagesBlock()->getGroupedHtml() ?></div>
+<div class="page-title">
+ <h1><?php echo __('Contact Us') ?></h1>
+</div>
+<form action="<?php echo $this->getFormAction(); ?>" id="contact-form" method="post">
+ <div class="fieldset">
+ <h2 class="legend"><?php echo __('Contact Information') ?></h2>
+ <ul class="form-list">
+ <li class="fields">
+ <div class="field">
+ <label for="name" class="required"><em>*</em><?php echo __('Name') ?></label>
+ <div class="input-box">
+ <input name="name" id="name" title="<?php echo __('Name') ?>" value="<?php echo $this->escapeHtml($this->helper('Magento\Contacts\Helper\Data')->getUserName()) ?>" class="input-text" type="text" data-validate="{required:true}"/>
+ </div>
+ </div>
+ <div class="field">
+ <label for="email" class="required"><em>*</em><?php echo __('Email') ?></label>
+ <div class="input-box">
+ <input name="email" id="email" title="<?php echo __('Email') ?>" value="<?php echo $this->escapeHtml($this->helper('Magento\Contacts\Helper\Data')->getUserEmail()) ?>" class="input-text" type="text" data-validate="{required:true, 'validate-email':true}"/>
+ </div>
+ </div>
+ </li>
+ <li>
+ <label for="telephone"><?php echo __('Telephone') ?></label>
+ <div class="input-box">
+ <input name="telephone" id="telephone" title="<?php echo __('Telephone') ?>" value="" class="input-text" type="text" />
+ </div>
+ </li>
+ <li class="wide">
+ <label for="comment" class="required"><em>*</em><?php echo __('Comment') ?></label>
+ <div class="input-box">
+ <textarea name="comment" id="comment" title="<?php echo __('Comment') ?>" class="input-text" cols="5" rows="3" data-validate="{required:true}"></textarea>
+ </div>
+ </li>
+ <?php echo $this->getChildHtml('form.additional.info'); ?>
+ </ul>
+ </div>
+ <div class="buttons-set">
+ <p class="required"><?php echo __('* Required Fields') ?></p>
+ <input type="text" name="hideit" id="hideit" value="" style="display:none !important;" />
+ <button type="submit" title="<?php echo __('Submit') ?>" class="button"><span><span><?php echo __('Submit') ?></span></span></button>
+ </div>
+</form>
+<script type="text/javascript">
+ (function($) {
+ head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
+ "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
+ "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
+ "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>", function() {
+ $('#contact-form').validation();
+ });
+ })(jQuery);
+</script>
diff --git a/app/design/frontend/magento_backup/Magento_Core/fam_book_open.png b/app/design/frontend/magento_backup/Magento_Core/fam_book_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d863f949741ff83fd8373a77c0d95a3d95e441f
GIT binary patch
literal 622
zcmV-!0+IcRP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!07*naR5;6}
zQ_pJ?Q4pS$w@qAVekfW^Q_+&87>YeaZ-G+53gSTz{SPWVdFiPaPX+$~@n)fi9>qgJ
zh4fN-QcEhq^wI<|vImjml9)pF*W2zl+qWbTPaSyKyqWKt`DS)j3xa?yVgf%ewhl|m
zA$_0x^Rx4E@d&=>uRoSN*Cm&aL#`7&zr0;L(pKMn1G#$ZszFkMC^?B8f`0w&-UD$u
zd-(?iK6#!;xZ`>J^A9DGiTfguewDOKwDEK<mL;X6%J<*Yu-X+69xa&k<iYHS^wR1Z
zn$Yzsw*a}YdcDs7QDJF*p6*-`Hzy}kG&7Z@TCK*he!oxUa+w^*4qKUsW&i@rG))Gf
zSIe@<YPG0XERt;-9D~2t>oL}`ZE_M}0=xvsgf$usmJeV$oo28d0#yu!pdgpag$giC
zhlKP!CMX3wsPMGgZ5n>Xg+hV--ENofAcH61#0B7Hvl-7Il}g2A6;lfG`FxbX8A>p$
z0P;GW4il9Mr9jO9)xB^Rgy%*CSTdQ6D;kDDnM{U{5Q21FA4#ZM71$_Dba8z<-Y_Na
zS@|v#c0PZNDux9AoXD-ZoWP~q)7QrC`G<o;20dP08XMo;{X}9g7*MPCZ)C@nf*VuU
zxl(0sf2;zmy!OAZ(OlWwK0WO}#Ezsh*^}n`SIgsY+C@L-GloW+?l6nAU;qFB07*qo
IM6N<$f=tvEoB#j-
literal 0
HcmV?d00001
diff --git a/app/design/frontend/magento_backup/Magento_Core/prototype/magento.css b/app/design/frontend/magento_backup/Magento_Core/prototype/magento.css
new file mode 100644
index 00000000000..11a5aa8ba79
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Core/prototype/magento.css
@@ -0,0 +1,94 @@
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category Magento
+ * @package Magento_Core
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+
+.dialog { border:1px solid #555; }
+.dialog .bot { display:none !important; }
+.overlay_magento { background-color:#000; filter:alpha(opacity=60); -moz-opacity:.6; opacity:.6; -webkit-opacity:.6; }
+.top.table_window { border-bottom:1px solid #e6e6e6; background:#6a838b url(magento/top_bg.gif) 0 100% repeat-x; }
+
+.magento_nw { width:6px; height:28px; }
+.magento_n { height:28px; }
+.magento_ne { width:6px; height:28px; }
+
+.magento_w { width:6px; }
+.magento_e { width:6px; }
+.magento_w,
+.magento_e,
+.magento_content { background: #fafafa url(magento/content_bg.gif) 0 0 repeat-x; }
+
+.magento_sw { background:#deebf0; width:5px; height:3px; }
+.magento_s { background:#deebf0; height:3px; }
+.magento_se,
+
+.magento_sizer { background:#deebf0; width:5px; height:3px; }
+.magento_sizer { cursor:se-resize; }
+
+.magento_close { width:16px; height:16px; background:url(magento/window_close.png) no-repeat 0 0; position:absolute; top:5px; right:7px; cursor:pointer; z-index:1000; }
+
+.magento_title { float:left; width:100%; font:bold 12px/28px Arial, Helvetica, sans-serif; color:#fff; text-align:left; }
+
+.magento_content { overflow:auto; font-size:12px; }
+.magento_content,
+.magento_content label { color:#333; font-family:Arial, sans-serif; }
+
+.magento_buttons { padding:10px; text-align:right; }
+.magento_buttons input.button { border-width:1px; border-style:solid; border-color:#ed6502 #a04300 #a04300 #ed6502; background:#ffac47 url(magento/btn_bg.gif) 0 100% repeat-x; padding:0 7px 1px 7px; font:bold 12px/18px Arial, Helvetica, sans-serif; color:#fff; cursor:pointer; text-align:center; white-space:nowrap; }
+.magento_buttons button.button span span span { display:inline; background:none; padding:0; height:auto; }
+
+/* FOR IE */
+* html .magento_close { background-image:none; filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/magento/window_close.png", sizingMethod="crop"); }
+
+
+.dialog.ui-dialog, .ui-dialog .ui-dialog-titlebar, .ui-dialog .ui-dialog-buttonset button.button { -webkit-border-radius: 0px; border-radius: 0px; }
+.dialog.ui-dialog { border:1px solid #555; display: none; padding: 0; }
+.ui-widget-overlay { background:#000; filter:alpha(opacity=60); -moz-opacity:.6; opacity:.6; -webkit-opacity:.6; position: absolute; left:0px; top:0px; }
+.ui-dialog .ui-dialog-titlebar { border-bottom:1px solid #e6e6e6; background:#6a838b url(magento/top_bg.gif) 0 100% repeat-x; height:28px; border: none; }
+.ui-dialog .ui-dialog-titlebar span { margin: 0px; }
+.ui-dialog .ui-dialog-title { float:left; width:100%; font:bold 12px/28px Arial, Helvetica, sans-serif; color:#fff; text-align:left; cursor: move; }
+.ui-dialog .ui-dialog-content, .ui-dialog .ui-dialog-titlebar, .ui-dialog .ui-dialog-buttonset { padding: 0 6px; }
+.ui-dialog .ui-icon { text-indent: -99999px; }
+.ui-dialog .ui-dialog-titlebar-close { width:16px; height:16px; background:url(magento/window_close.png) no-repeat 0 0; position:absolute; top:5px; right:7px; cursor:pointer; z-index:1000; margin: 0px; padding: 0; }
+.ui-dialog .ui-dialog-titlebar-close .ui-icon { display: none; }
+.ui-dialog .ui-dialog-titlebar-close.ui-state-hover { border: none; }
+.ui-dialog .ui-dialog-content form { display: block; overflow: hidden; }
+.ui-dialog .ui-dialog-content { background: #fafafa url(magento/content_bg.gif) 0 0 repeat-x; overflow: auto; }
+.ui-dialog .ui-dialog-buttonpane { background: #fafafa; margin: 0; padding: 0; border: none;}
+.ui-dialog .ui-dialog-buttonset { padding:10px; text-align:right; }
+.ui-dialog .ui-dialog-buttonset input.button { border-width:1px; border-style:solid; border-color:#ed6502 #a04300 #a04300 #ed6502; background:#ffac47 url(magento/btn_bg.gif) 0 100% repeat-x; padding:0 7px 1px 7px; font:bold 12px/18px Arial, Helvetica, sans-serif; color:#fff; cursor:pointer; text-align:center; white-space:nowrap; margin-left: 5px; }
+.ui-dialog .ui-dialog-buttonset button.button { margin-left: 5px; background: #FFAC47; border-color: #ED6502 #A04300 #A04300 #ED6502; border-style: solid; border-width: 1px; color: #FFFFFF; cursor: pointer; font: bold 12px arial,helvetica,sans-serif; padding: 0; }
+.ui-dialog .ui-dialog-buttonset button.button span { padding: 0 7px 1px; text-align: center !important; white-space: nowrap; display: block; background: transparent; height: auto; color:#ffffff; }
+.ui-dialog .ui-dialog-buttonset button.button span span span { display:inline; background:none; padding:0; height:auto; }
+
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; }
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: 0px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: 0px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -7px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: 0px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: 0px; top: -5px;}
diff --git a/app/code/Magento/Core/view/frontend/prototype/magento/btn_bg.gif b/app/design/frontend/magento_backup/Magento_Core/prototype/magento/btn_bg.gif
similarity index 100%
rename from app/code/Magento/Core/view/frontend/prototype/magento/btn_bg.gif
rename to app/design/frontend/magento_backup/Magento_Core/prototype/magento/btn_bg.gif
diff --git a/app/code/Magento/Core/view/frontend/prototype/magento/content_bg.gif b/app/design/frontend/magento_backup/Magento_Core/prototype/magento/content_bg.gif
similarity index 100%
rename from app/code/Magento/Core/view/frontend/prototype/magento/content_bg.gif
rename to app/design/frontend/magento_backup/Magento_Core/prototype/magento/content_bg.gif
diff --git a/app/code/Magento/Core/view/frontend/prototype/magento/top_bg.gif b/app/design/frontend/magento_backup/Magento_Core/prototype/magento/top_bg.gif
similarity index 100%
rename from app/code/Magento/Core/view/frontend/prototype/magento/top_bg.gif
rename to app/design/frontend/magento_backup/Magento_Core/prototype/magento/top_bg.gif
diff --git a/app/code/Magento/Core/view/frontend/prototype/magento/window_close.png b/app/design/frontend/magento_backup/Magento_Core/prototype/magento/window_close.png
similarity index 100%
rename from app/code/Magento/Core/view/frontend/prototype/magento/window_close.png
rename to app/design/frontend/magento_backup/Magento_Core/prototype/magento/window_close.png
diff --git a/app/design/frontend/magento_backup/Magento_Core/translate_inline.phtml b/app/design/frontend/magento_backup/Magento_Core/translate_inline.phtml
new file mode 100644
index 00000000000..3675b14f271
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Core/translate_inline.phtml
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @package Magento_Core
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+
+<script type="text/javascript" src="<?php echo $this->getViewFileUrl('prototype/window.js') ?>"></script>
+<link rel="stylesheet" type="text/css" href="<?php echo $this->getViewFileUrl('prototype/windows/themes/default.css') ?>"/>
+<link rel="stylesheet" type="text/css" href="<?php echo $this->getViewFileUrl('Magento_Core::prototype/magento.css') ?>"/>
+<script type="text/javascript" src="<?php echo $this->getViewFileUrl('mage/edit-trigger.js') ?>"></script>
+<script type="text/javascript" src="<?php echo $this->getViewFileUrl('mage/translate-inline.js') ?>"></script>
+<link rel="stylesheet" type="text/css" href="<?php echo $this->getViewFileUrl('mage/translate-inline.css') ?>"/>
+
+<script id="translate-inline-icon" type="text/x-jQuery-tmpl">
+ <img src="${img}" height="16" width="16" class="translate-edit-icon">
+</script>
+<script id="translate-form-template" type="text/x-jquery-tmpl">
+ <form id="${id}">
+ {{each(i, item) items}}
+ <div class="magento_table_container"><table cellspacing="0">
+ {{each item}}
+ <tr>
+ <th class="label" style="text-transform: capitalize;">${$index}:</th>
+ <td class="value">${$value}</td>
+ </tr>
+ {{/each}}
+ <tr>
+ <th class="label"><label for="perstore_${i}">Store View Specific:</label></th>
+ <td class="value">
+ <input id="perstore_${i}" name="translate[${i}][perstore]" type="checkbox" value="1"/>
+ </td>
+ </tr>
+ <tr>
+ <th class="label"><label for="custom_${i}">Custom:</label></th>
+ <td class="value">
+ <input name="translate[${i}][original]" type="hidden" value="${item.scope}::${escape(item.original)}"/>
+ <input id="custom_${i}" name="translate[${i}][custom]" class="input-text" value="${escape(item.translated)}" />
+ </td>
+ </tr>
+ </table></div>
+ {{/each}}
+ </form>
+ {{if message}}<p class="a-center accent">${message}</p>{{/if}}
+</script>
+
+<div data-role="translate-dialog" data-mage-init="{translateInline: {ajaxUrl:"<?php echo $this->getAjaxUrl() ?>"}, loader: {}}"></div>
+<script type="text/javascript">
+ (function($){
+ $('body').editTrigger({img: '<?php echo $this->getViewFileUrl('Magento_Core::fam_book_open.png') ?>', alwaysShown:true, singleElement:false});
+ $('body').addClass('trnslate-inline-area');
+ })(jQuery);
+</script>
diff --git a/app/design/frontend/magento_backup/Magento_Directory/currency.phtml b/app/design/frontend/magento_backup/Magento_Directory/currency.phtml
new file mode 100644
index 00000000000..93bda8e1fe4
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Directory/currency.phtml
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * Currency switcher
+ *
+ * @see \Magento\Directory\Block\Currency
+ */
+?>
+<?php if($this->getCurrencyCount()>1): ?>
+<div class="block block-currency">
+ <div class="block-title">
+ <strong><span><?php echo __('Select Your Currency') ?></span></strong>
+ </div>
+ <div class="block-content">
+ <select name="currency" title="<?php echo __('Select Your Currency') ?>" onchange="setLocation(this.value)">
+ <?php foreach ($this->getCurrencies() as $_code => $_name): ?>
+ <option value="<?php echo $this->getSwitchCurrencyUrl($_code) ?>"<?php if($_code==$this->getCurrentCurrencyCode()): ?> selected="selected"<?php endif; ?>>
+ <?php echo $_name ?> - <?php echo $_code ?>
+ </option>
+ <?php endforeach; ?>
+ </select>
+ </div>
+</div>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Directory/currency/switch.phtml b/app/design/frontend/magento_backup/Magento_Directory/currency/switch.phtml
new file mode 100644
index 00000000000..8fa890d6df2
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Directory/currency/switch.phtml
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<div class="page-title">
+ <h1><?php echo __('Currency') ?></h1>
+</div>
+<p><?php echo __('Your current currency is: %1.', $currency->getCode()) ?></p>
+<p><a href="<?php echo $this->getBaseUrl(); ?>"><?php echo __('Continue »') ?></a></p>
diff --git a/app/code/Magento/Directory/view/frontend/js/optional_zip_countries.phtml b/app/design/frontend/magento_backup/Magento_Directory/js/optional_zip_countries.phtml
similarity index 100%
rename from app/code/Magento/Directory/view/frontend/js/optional_zip_countries.phtml
rename to app/design/frontend/magento_backup/Magento_Directory/js/optional_zip_countries.phtml
diff --git a/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalog_category_view.xml b/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalog_category_view.xml
new file mode 100644
index 00000000000..9d64de3d1e7
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalog_category_view.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="left">
+ <block class="Magento\Directory\Block\Currency" name="currency" before="catalog.leftnav" template="currency.phtml"/>
+ </referenceContainer>
+</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Directory/layout/override/catalogsearch_advanced_index.xml b/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_advanced_index.xml
similarity index 78%
rename from app/design/frontend/magento_plushe/Magento_Directory/layout/override/catalogsearch_advanced_index.xml
rename to app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_advanced_index.xml
index 6c60196129d..b0d82dc10a0 100644
--- a/app/design/frontend/magento_plushe/Magento_Directory/layout/override/catalogsearch_advanced_index.xml
+++ b/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_advanced_index.xml
@@ -23,4 +23,8 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="left">
+ <block class="Magento\Directory\Block\Currency" name="right_currency" before="-" template="currency.phtml"/>
+ </referenceContainer>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_advanced_result.xml b/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_advanced_result.xml
new file mode 100644
index 00000000000..7ea5d0eb50c
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_advanced_result.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="right">
+ <block class="Magento\Directory\Block\Currency" name="right_currency" before="-" template="currency.phtml"/>
+ </referenceContainer>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_result_index.xml b/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_result_index.xml
new file mode 100644
index 00000000000..4c71dc1b48a
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_result_index.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="left">
+ <block class="Magento\Directory\Block\Currency" name="currency" before="-" template="currency.phtml"/>
+ </referenceContainer>
+</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Directory/layout/override/default.xml b/app/design/frontend/magento_backup/Magento_GoogleCheckout/layout/override/checkout_cart_index.xml
similarity index 74%
rename from app/design/frontend/magento_plushe/Magento_Directory/layout/override/default.xml
rename to app/design/frontend/magento_backup/Magento_GoogleCheckout/layout/override/checkout_cart_index.xml
index 7eae7a3f7e9..12efb313611 100644
--- a/app/design/frontend/magento_plushe/Magento_Directory/layout/override/default.xml
+++ b/app/design/frontend/magento_backup/Magento_GoogleCheckout/layout/override/checkout_cart_index.xml
@@ -24,10 +24,10 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="header.panel">
- <block class="Magento\Directory\Block\Currency" name="currency" before="store_language" template="currency.phtml"/>
+ <referenceContainer name="checkout.cart.top_methods">
+ <block class="Magento\GoogleCheckout\Block\Link" name="checkout.cart.methods.googlecheckout.top" template="link.phtml" before="-"/>
+ </referenceContainer>
+ <referenceContainer name="checkout.cart.methods">
+ <block class="Magento\GoogleCheckout\Block\Link" name="checkout.cart.methods.googlecheckout.bottom" template="link.phtml"/>
</referenceContainer>
- <referenceBlock name="head">
- <block class="Magento\Core\Block\Template" name="optional_zip_countries" as="optional_zip_countries" template="Magento_Directory::js/optional_zip_countries.phtml"/>
- </referenceBlock>
</layout>
diff --git a/app/design/frontend/magento_backup/Magento_GoogleCheckout/link.phtml b/app/design/frontend/magento_backup/Magento_GoogleCheckout/link.phtml
new file mode 100644
index 00000000000..694917f1788
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_GoogleCheckout/link.phtml
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php echo $this->getBeforeHtml(); ?>
+<?php if ($this->getIsDisabled()): ?>
+<img src="<?php echo $this->escapeHtml($this->getImageUrl())?>" alt="<?php echo __('Fast checkout through Google');?>" title="<?php echo __('Fast Checkout through Google');?>" />
+<?php else: ?>
+<form method="post" action="<?php echo $this->getCheckoutUrl();?>"<?php if ($this->getOnsubmitJs()):?> onsubmit="<?php echo $this->getOnsubmitJs() ?>"<?php endif;?>>
+ <fieldset>
+ <input type="hidden" name="analyticsdata" value="" />
+ <input type="image" src="<?php echo $this->escapeHtml($this->getImageUrl())?>" title="<?php echo __('Fast checkout through Google');?>" alt="<?php echo __('Fast Checkout through Google');?>" />
+ </fieldset>
+</form>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Page/1column.phtml b/app/design/frontend/magento_backup/Magento_Page/1column.phtml
similarity index 52%
rename from app/design/frontend/magento_plushe/Magento_Page/1column.phtml
rename to app/design/frontend/magento_backup/Magento_Page/1column.phtml
index 11954afe5a7..19f3a76a483 100644
--- a/app/design/frontend/magento_plushe/Magento_Page/1column.phtml
+++ b/app/design/frontend/magento_backup/Magento_Page/1column.phtml
@@ -19,6 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
+ * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -27,34 +28,31 @@
/**
* Template for \Magento\Page\Block\Html
*/
-$bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
?>
-<!doctype html>
-<html lang="<?php echo $this->getLang() ?>" class="no-js">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width">
- <?php echo $this->getChildHtml('head') ?>
+<?php echo $this->getChildHtml('head') ?>
</head>
-<body class="col1-layout<?php echo $bodyCss ?>">
- <?php echo $this->getChildHtml('after_body_start') ?>
- <div class="page wrapper">
- <?php echo $this->getChildHtml('global_notices') ?>
- <?php echo $this->getChildHtml('header-container') ?>
- <?php echo $this->getChildHtml('page_top') ?>
- <section class="page main">
- <?php echo $this->getChildHtml('columns_top') ?>
- <div class="columns">
- <?php echo $this->getChildHtml('main') ?>
+<body<?php echo $this->getBodyClass()?' class="'.$this->getBodyClass().'"':'' ?> data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+<?php echo $this->getChildHtml('after_body_start') ?>
+<div class="wrapper">
+ <?php echo $this->getChildHtml('global_notices') ?>
+ <div class="page">
+ <?php echo $this->getChildHtml('header') ?>
+ <div class="main-container col1-layout">
+ <div class="main">
+ <?php echo $this->getChildHtml('breadcrumbs') ?>
+ <div class="col-main">
+ <?php echo $this->getChildHtml('global_messages') ?>
+ <?php echo $this->getChildHtml('main') ?>
+ </div>
</div>
- </section>
- <?php echo $this->getChildHtml('page_bottom') ?>
-
+ </div>
<?php echo $this->getChildHtml('footer') ?>
-
<?php echo $this->getChildHtml('before_body_end') ?>
</div>
- <?php echo $this->getAbsoluteFooter() ?>
+</div>
+<?php echo $this->getAbsoluteFooter() ?>
</body>
</html>
diff --git a/app/design/frontend/magento_backup/Magento_Page/2columns-left.phtml b/app/design/frontend/magento_backup/Magento_Page/2columns-left.phtml
new file mode 100644
index 00000000000..9047209145d
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Page/2columns-left.phtml
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * Template for \Magento\Page\Block\Html
+ */
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
+<head>
+<?php echo $this->getChildHtml('head') ?>
+</head>
+<body<?php echo $this->getBodyClass()?' class="'.$this->getBodyClass().'"':'' ?> data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+<?php echo $this->getChildHtml('after_body_start') ?>
+<div class="wrapper">
+ <?php echo $this->getChildHtml('global_notices') ?>
+ <div class="page">
+ <?php echo $this->getChildHtml('header') ?>
+ <div class="main-container col2-left-layout">
+ <div class="main">
+ <?php echo $this->getChildHtml('breadcrumbs') ?>
+ <div class="col-main">
+ <?php echo $this->getChildHtml('global_messages') ?>
+ <?php echo $this->getChildHtml('content') ?>
+ </div>
+ <div class="col-left sidebar"><?php echo $this->getChildHtml('left') ?></div>
+ </div>
+ </div>
+ <?php echo $this->getChildHtml('footer') ?>
+ <?php echo $this->getChildHtml('before_body_end') ?>
+ </div>
+</div>
+<?php echo $this->getAbsoluteFooter() ?>
+</body>
+</html>
diff --git a/app/design/frontend/magento_backup/Magento_Page/2columns-right.phtml b/app/design/frontend/magento_backup/Magento_Page/2columns-right.phtml
new file mode 100644
index 00000000000..ea929a0ebbc
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Page/2columns-right.phtml
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * Template for \Magento\Page\Block\Html
+ */
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
+<head>
+<?php echo $this->getChildHtml('head') ?>
+</head>
+<body<?php echo $this->getBodyClass()?' class="'.$this->getBodyClass().'"':'' ?> data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+<?php echo $this->getChildHtml('after_body_start') ?>
+<div class="wrapper">
+ <?php echo $this->getChildHtml('global_notices') ?>
+ <div class="page">
+ <?php echo $this->getChildHtml('header') ?>
+ <div class="main-container col2-right-layout">
+ <div class="main">
+ <?php echo $this->getChildHtml('breadcrumbs') ?>
+ <div class="col-main">
+ <?php echo $this->getChildHtml('global_messages') ?>
+ <?php echo $this->getChildHtml('content') ?>
+ </div>
+ <div class="col-right sidebar"><?php echo $this->getChildHtml('right') ?></div>
+ </div>
+ </div>
+ <?php echo $this->getChildHtml('footer') ?>
+ <?php echo $this->getChildHtml('before_body_end') ?>
+ </div>
+</div>
+<?php echo $this->getAbsoluteFooter() ?>
+</body>
+</html>
diff --git a/app/design/frontend/magento_backup/Magento_Page/3columns.phtml b/app/design/frontend/magento_backup/Magento_Page/3columns.phtml
new file mode 100644
index 00000000000..ad11e60846e
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Page/3columns.phtml
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * Template for \Magento\Page\Block\Html
+ */
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
+<head>
+<?php echo $this->getChildHtml('head') ?>
+</head>
+<body<?php echo $this->getBodyClass()?' class="'.$this->getBodyClass().'"':'' ?> data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+<?php echo $this->getChildHtml('after_body_start') ?>
+<div class="wrapper">
+ <?php echo $this->getChildHtml('global_notices') ?>
+ <div class="page">
+ <?php echo $this->getChildHtml('header') ?>
+ <div class="main-container col3-layout">
+ <div class="main">
+ <?php echo $this->getChildHtml('breadcrumbs') ?>
+ <div class="col-wrapper">
+ <div class="col-main">
+ <?php echo $this->getChildHtml('global_messages') ?>
+ <?php echo $this->getChildHtml('main') ?>
+ </div>
+ <div class="col-left sidebar"><?php echo $this->getChildHtml('left') ?></div>
+ </div>
+ <div class="col-right sidebar"><?php echo $this->getChildHtml('right') ?></div>
+ </div>
+ </div>
+ <?php echo $this->getChildHtml('footer') ?>
+ <?php echo $this->getChildHtml('before_body_end') ?>
+ </div>
+</div>
+<?php echo $this->getAbsoluteFooter() ?>
+</body>
+</html>
diff --git a/app/design/frontend/magento_plushe/Magento_Page/empty.phtml b/app/design/frontend/magento_backup/Magento_Page/empty.phtml
similarity index 58%
rename from app/design/frontend/magento_plushe/Magento_Page/empty.phtml
rename to app/design/frontend/magento_backup/Magento_Page/empty.phtml
index b61be5ca1b9..112112b6795 100644
--- a/app/design/frontend/magento_plushe/Magento_Page/empty.phtml
+++ b/app/design/frontend/magento_backup/Magento_Page/empty.phtml
@@ -19,6 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
+ * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -27,29 +28,19 @@
/**
* Template for \Magento\Page\Block\Html
*/
-$bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
?>
-<!doctype html>
-<html lang="<?php echo $this->getLang() ?>" class="no-js">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width">
<?php echo $this->getChildHtml('head') ?>
</head>
-<body class="page-empty<?php echo $bodyCss ?>">
- <?php echo $this->getChildHtml('after_body_start') ?>
- <div class="page wrapper">
- <?php echo $this->getChildHtml('global_notices') ?>
- <section class="page main">
- <?php echo $this->getChildHtml('columns_top') ?>
- <div class="columns">
- <?php echo $this->getChildHtml('main') ?>
- </div>
- </section>
- <?php echo $this->getChildHtml('page_bottom') ?>
+<body class="page-empty <?php echo $this->getBodyClass()?$this->getBodyClass():'' ?>">
+ <div>
+ <?php echo $this->getChildHtml('after_body_start') ?>
+ <?php echo $this->getChildHtml('global_messages') ?>
+ <?php echo $this->getChildHtml('content') ?>
<?php echo $this->getChildHtml('before_body_end') ?>
+ <?php echo $this->getAbsoluteFooter() ?>
</div>
- <?php echo $this->getAbsoluteFooter() ?>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/app/design/frontend/magento_plushe/Magento_Page/html/breadcrumbs.phtml b/app/design/frontend/magento_backup/Magento_Page/html/breadcrumbs.phtml
similarity index 89%
rename from app/design/frontend/magento_plushe/Magento_Page/html/breadcrumbs.phtml
rename to app/design/frontend/magento_backup/Magento_Page/html/breadcrumbs.phtml
index 5bfd6768190..b1e9df03aa7 100644
--- a/app/design/frontend/magento_plushe/Magento_Page/html/breadcrumbs.phtml
+++ b/app/design/frontend/magento_backup/Magento_Page/html/breadcrumbs.phtml
@@ -19,15 +19,16 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
+ * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php if($crumbs && is_array($crumbs)): ?>
<div class="breadcrumbs">
- <ul class="items">
+ <ul>
<?php foreach($crumbs as $_crumbName=>$_crumbInfo): ?>
- <li class="item <?php echo $_crumbName ?>">
+ <li class="<?php echo $_crumbName ?>">
<?php if($_crumbInfo['link']): ?>
<a href="<?php echo $_crumbInfo['link'] ?>" title="<?php echo $this->escapeHtml($_crumbInfo['title']) ?>"><?php echo $this->escapeHtml($_crumbInfo['label']) ?></a>
<?php elseif($_crumbInfo['last']): ?>
@@ -35,6 +36,9 @@
<?php else: ?>
<?php echo $this->escapeHtml($_crumbInfo['label']) ?>
<?php endif; ?>
+ <?php if(!$_crumbInfo['last']): ?>
+ <span>/ </span>
+ <?php endif; ?>
</li>
<?php endforeach; ?>
</ul>
diff --git a/app/design/frontend/magento_plushe/Magento_Page/html/head.phtml b/app/design/frontend/magento_backup/Magento_Page/html/head.phtml
similarity index 89%
rename from app/design/frontend/magento_plushe/Magento_Page/html/head.phtml
rename to app/design/frontend/magento_backup/Magento_Page/html/head.phtml
index 9254ba1971d..d14d1bbde6e 100644
--- a/app/design/frontend/magento_plushe/Magento_Page/html/head.phtml
+++ b/app/design/frontend/magento_backup/Magento_Page/html/head.phtml
@@ -19,9 +19,12 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
+ * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
+
+/** @var $this \Magento\Page\Block\Html\Head */
?>
<meta http-equiv="Content-Type" content="<?php echo $this->getContentType() ?>"/>
<title><?php echo $this->getTitle() ?></title>
@@ -30,6 +33,7 @@
<meta name="robots" content="<?php echo $this->escapeHtml($this->getRobots())?>"/>
<link rel="icon" href="<?php echo $this->getFaviconFile(); ?>" type="image/x-icon"/>
<link rel="shortcut icon" href="<?php echo $this->getFaviconFile(); ?>" type="image/x-icon"/>
+<link rel="stylesheet" href="<?php echo $this->getViewFileUrl('Magento_Page::css/validate.css') ?>" type="text/css" media="all"/>
<?php echo $this->getCssJsHtml() ?>
<?php echo $this->getChildHtml() ?>
<?php echo $this->getIncludes() ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Page/html/header.phtml b/app/design/frontend/magento_backup/Magento_Page/html/header.phtml
similarity index 50%
rename from app/design/frontend/magento_plushe/Magento_Page/html/header.phtml
rename to app/design/frontend/magento_backup/Magento_Page/html/header.phtml
index d7747717eee..ec10346c9f4 100644
--- a/app/design/frontend/magento_plushe/Magento_Page/html/header.phtml
+++ b/app/design/frontend/magento_backup/Magento_Page/html/header.phtml
@@ -19,6 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
+ * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -26,27 +27,20 @@
* @var \Magento\Page\Block\Html\Header $this
*/
?>
-
-<?php switch($this->getShowPart()):
- case 'logo': ?>
- <?php $storeName = $this->getThemeName() ? $this->getThemeName() : $this->getLogoAlt();?>
+<div class="header-container">
+ <div class="header">
<?php if ($this->getIsHomePage()):?>
- <strong class="logo">
- <img src="<?php echo $this->getLogoSrc() ?>" alt="<?php echo $this->getLogoAlt() ?>" />
- </strong>
+ <h1 class="logo"><strong><?php echo $this->getLogoAlt() ?></strong><a href="<?php echo $this->getUrl('') ?>" title="<?php echo $this->getLogoAlt() ?>" class="logo"><img src="<?php echo $this->getLogoSrc() ?>" alt="<?php echo $this->getLogoAlt() ?>" /></a></h1>
<?php else:?>
- <a class="logo" href="<?php echo $this->getUrl(''); ?>" title="<?php echo $storeName ?>">
- <img src="<?php echo $this->getLogoSrc() ?>" alt="<?php echo $storeName ?>" />
- </a>
+ <a href="<?php echo $this->getUrl('') ?>" title="<?php echo $this->getLogoAlt() ?>" class="logo"><strong><?php echo $this->getLogoAlt() ?></strong><img src="<?php echo $this->getLogoSrc() ?>" alt="<?php echo $this->getLogoAlt() ?>" /></a>
<?php endif?>
- <?php break; ?>
-
- <?php case 'welcome': ?>
- <p class="welcome"><?php echo $this->getWelcome() ?></p>
- <?php break; ?>
-
- <?php case 'other': ?>
- <?php echo $this->getChildHtml(); ?>
- <?php break; ?>
-
-<?php endswitch; ?>
+ <div class="quick-access">
+ <?php echo $this->getChildHtml('topSearch') ?>
+ <p class="welcome-msg"><?php echo $this->getWelcome() ?> <?php echo $this->getAdditionalHtml() ?></p>
+ <?php echo $this->getChildHtml('topLinks') ?>
+ <?php echo $this->getChildHtml('store_language') ?>
+ </div>
+ <?php echo $this->getChildHtml('topContainer'); ?>
+ </div>
+</div>
+<?php echo $this->getChildHtml('topMenu') ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Page/html/notices.phtml b/app/design/frontend/magento_backup/Magento_Page/html/notices.phtml
similarity index 68%
rename from app/design/frontend/magento_plushe/Magento_Page/html/notices.phtml
rename to app/design/frontend/magento_backup/Magento_Page/html/notices.phtml
index 7814e18e1c7..0df537f82bd 100644
--- a/app/design/frontend/magento_plushe/Magento_Page/html/notices.phtml
+++ b/app/design/frontend/magento_backup/Magento_Page/html/notices.phtml
@@ -19,6 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
+ * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -30,27 +31,26 @@
?>
<?php if ($this->displayNoscriptNotice()): ?>
<noscript>
- <div class="notice global site noscript">
- <div class="content">
+ <div class="global-site-notice noscript">
+ <div class="notice-inner">
<p>
<strong><?php echo __('JavaScript seems to be disabled in your browser.'); ?></strong><br />
- <?php echo __('Enable JavaScript in your browser to get the best experience on our website!'); ?>
+ <?php echo __('To use this website you must first enable JavaScript in your browser.'); ?>
</p>
</div>
</div>
</noscript>
<?php endif; ?>
<?php if ($this->displayDemoNotice()): ?>
- <div class="notice global site demo">
- <div class="content"><p><?php echo __('This is just a demo store. You can browse and place orders, but nothing will be processed.') ?></p></div>
+ <div class="global-site-notice demo-notice">
+ <div class="notice-inner"><p><?php echo __('This is only a demo store. You can browse and place orders, but nothing will be processed.') ?></p></div>
</div>
- <?php $noticePosion = true; ?>
<?php endif; ?>
<?php if ($this->helper('Magento\Core\Helper\Cookie')->isUserNotAllowSaveCookie()): ?>
- <div class="notice global site cookie" id="notice-cookie-block" style="display: none">
- <div class="content">
+ <div class="global-site-notice notice-cookie" id="notice-cookie-block" style="display: none">
+ <div class="notice-inner">
<p><?php echo __('This store uses cookies to make shopping more enjoyable. Learn how cookies work in our <a href="%1">privacy policy</a>.', $this->getPrivacyPolicyLink()) ?></p>
- <div class="actions"><button id="btn-cookie-allow" class="action allow"><span><?php echo __('Allow Cookies');?></span></button></div>
+ <div class="actions"><button id="btn-cookie-allow" class="button"><span><span><?php echo __('Allow');?></span></span></button></div>
</div>
</div>
<script type="text/javascript">
@@ -69,22 +69,4 @@
})(jQuery);
// ]]>
</script>
- <?php $noticePosion = true; ?>
-<?php endif; ?>
-<?php if (isset($noticePosion)): ?>
- <script type="text/javascript">
- // <![CDATA[
- (function($) {
- $(document).ready(function() {
- var notices = $('.notice.global.site'),
- top = 0;
- for (var i=0; i < notices.length; i++) {
- $(notices[i]).css('top',top);
- top += $(notices[i]).outerHeight();
- $('body').css('paddingTop', top );
- };
- });
- })(jQuery);
- // ]]>
- </script>
<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Page/html/pager.phtml b/app/design/frontend/magento_backup/Magento_Page/html/pager.phtml
new file mode 100644
index 00000000000..41e7c480ac8
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Page/html/pager.phtml
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * Pager template
+ *
+ * @see \Magento\Page\Block\Html\Pager
+ */
+?>
+<?php if($this->getCollection()->getSize()): ?>
+
+ <?php if($this->getUseContainer()): ?>
+ <div class="pager">
+ <?php endif ?>
+
+ <?php if($this->getShowAmounts()): ?>
+ <p class="amount">
+ <?php if($this->getLastPageNum()>1): ?>
+ <?php echo __('Items %1 to %2 of %3 total', $this->getFirstNum(), $this->getLastNum(), $this->getTotalNum()) ?>
+ <?php else: ?>
+ <strong><?php echo __('%1 Item(s)', $this->getTotalNum()) ?></strong>
+ <?php endif; ?>
+ </p>
+ <?php endif ?>
+
+ <?php if($this->getShowPerPage()): ?>
+ <div class="limiter">
+ <label><?php echo __('Show') ?></label>
+ <select onchange="setLocation(this.value)">
+ <?php foreach ($this->getAvailableLimit() as $_key=>$_limit): ?>
+ <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if($this->isLimitCurrent($_key)): ?> selected="selected"<?php endif ?>>
+ <?php echo $_limit ?>
+ </option>
+ <?php endforeach; ?>
+ </select> <?php echo __('per page') ?>
+ </div>
+ <?php endif ?>
+
+ <?php if($this->getLastPageNum()>1): ?>
+ <div class="pages">
+ <strong><?php echo __('Page:') ?></strong>
+ <ol>
+ <?php if (!$this->isFirstPage()): ?>
+ <li>
+ <a class="previous<?php if(!$this->getAnchorTextForPrevious()): ?> i-previous<?php endif;?>" href="<?php echo $this->getPreviousPageUrl() ?>" title="<?php echo __('Previous') ?>">
+ <?php if(!$this->getAnchorTextForPrevious()): ?>
+ <img src="<?php echo $this->getViewFileUrl('images/pager_arrow_left.gif') ?>" alt="<?php echo __('Previous') ?>" class="v-middle" />
+ <?php else: ?>
+ <?php echo $this->getAnchorTextForPrevious() ?>
+ <?php endif;?>
+ </a>
+ </li>
+ <?php endif;?>
+
+ <?php if ($this->canShowFirst()): ?>
+ <li><a class="first" href="<?php echo $this->getFirstPageUrl() ?>">1</a></li>
+ <?php endif;?>
+
+ <?php if ($this->canShowPreviousJump()): ?>
+ <li><a class="previous_jump" title="" href="<?php echo $this->getPreviousJumpUrl() ?>">...</a></li>
+ <?php endif;?>
+
+ <?php foreach ($this->getFramePages() as $_page): ?>
+ <?php if ($this->isPageCurrent($_page)): ?>
+ <li class="current"><?php echo $_page ?></li>
+ <?php else: ?>
+ <li><a href="<?php echo $this->getPageUrl($_page) ?>"><?php echo $_page ?></a></li>
+ <?php endif;?>
+ <?php endforeach;?>
+
+
+ <?php if ($this->canShowNextJump()): ?>
+ <li><a class="next_jump" title="" href="<?php echo $this->getNextJumpUrl() ?>">...</a></li>
+ <?php endif;?>
+
+ <?php if ($this->canShowLast()): ?>
+ <li><a class="last" href="<?php echo $this->getLastPageUrl() ?>"><?php echo $this->getLastPageNum() ?></a></li>
+ <?php endif;?>
+
+ <?php if (!$this->isLastPage()): ?>
+ <li>
+ <a class="next<?php if(!$this->getAnchorTextForNext()): ?> i-next<?php endif; ?>" href="<?php echo $this->getNextPageUrl() ?>" title="<?php echo __('Next') ?>">
+ <?php if(!$this->getAnchorTextForNext()): ?>
+ <img src="<?php echo $this->getViewFileUrl('images/pager_arrow_right.gif') ?>" alt="<?php echo __('Next') ?>" class="v-middle" />
+ <?php else: ?>
+ <?php echo $this->getAnchorTextForNext() ?>
+ <?php endif;?>
+ </a>
+ </li>
+ <?php endif;?>
+ </ol>
+
+ </div>
+ <?php endif; ?>
+
+ <?php if($this->getUseContainer()): ?>
+ </div>
+ <?php endif ?>
+
+<?php endif ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Page/html/topmenu.phtml b/app/design/frontend/magento_backup/Magento_Page/html/topmenu.phtml
similarity index 73%
rename from app/design/frontend/magento_plushe/Magento_Page/html/topmenu.phtml
rename to app/design/frontend/magento_backup/Magento_Page/html/topmenu.phtml
index 9c10e155293..c14eeceb25d 100644
--- a/app/design/frontend/magento_plushe/Magento_Page/html/topmenu.phtml
+++ b/app/design/frontend/magento_backup/Magento_Page/html/topmenu.phtml
@@ -18,7 +18,7 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Mage
+ * @category Magento
* @package Magento_Page
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
@@ -31,12 +31,18 @@
* @see \Magento\Page\Block\Html\Topmenu
*/
?>
-<?php $columnsLimit = $this->getColumnsLimit() ? : 0; ?>
-<?php $_menu = $this->getHtml('level-top','submenu', $columnsLimit) ?>
+<?php $_menu = $this->getHtml('level-top') ?>
<?php if ($_menu): ?>
-<nav class="navigation" role="navigation">
- <ul>
- <?php echo $_menu; ?>
+<div class="nav-container">
+ <ul id="nav">
+ <?php echo $_menu ?>
</ul>
-</nav>
-<?php endif; ?>
+</div>
+<script type="text/javascript">
+ (function($) {
+ head.js("<?php echo $this->getViewFileUrl('Magento_Page::js/menu.js') ?>", function() {
+ $('#nav .parent').menu();
+ });
+ })(jQuery);
+</script>
+<?php endif ?>
diff --git a/app/code/Magento/Page/view/frontend/js/menu.js b/app/design/frontend/magento_backup/Magento_Page/js/menu.js
similarity index 100%
rename from app/code/Magento/Page/view/frontend/js/menu.js
rename to app/design/frontend/magento_backup/Magento_Page/js/menu.js
diff --git a/app/code/Magento/Page/view/frontend/js/popup-menu.js b/app/design/frontend/magento_backup/Magento_Page/js/popup-menu.js
similarity index 100%
rename from app/code/Magento/Page/view/frontend/js/popup-menu.js
rename to app/design/frontend/magento_backup/Magento_Page/js/popup-menu.js
diff --git a/app/design/frontend/magento_backup/Magento_Page/js/row-builder.js b/app/design/frontend/magento_backup/Magento_Page/js/row-builder.js
new file mode 100644
index 00000000000..201d183f164
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Page/js/row-builder.js
@@ -0,0 +1,222 @@
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category Page
+ * @package mage
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+/*jshint browser:true jquery:true*/
+(function($) {
+ "use strict";
+ $.widget('mage.rowBuilder', {
+
+ /**
+ * options with default values for setting up the template
+ */
+ options: {
+ //Default template options
+ rowTemplate: '#template-registrant',
+ rowContainer: '#registrant-container',
+ //Row index used by the template rows.
+ rowIndex: 0,
+ //Row count: Should not be set externally
+ rowCount: 0,
+ rowParentElem: '<li></li>',
+ rowContainerClass: 'fields',
+ addRowBtn: '#add-registrant-button',
+ btnRemoveIdPrefix: 'btn-remove',
+ btnRemoveSelector: '.btn-remove',
+ rowIdPrefix: 'row',
+ //This class is added to rows added after the first one. Adds the dotted separator
+ additionalRowClass: 'add-row',
+ /*
+ This is provided during widget instantiation. eg :
+ formDataPost : {"formData":formData,"templateFields":['field1-name','field2-name'] }
+ -"formData" is the multi-dimensional array of form field values : [['a','b'],['c','b']]
+ received from the server and encoded
+ -"templateFields" are the input fields in the template with index suffixed after the field name
+ eg field1-name{index}
+ */
+ formDataPost: null,
+ //Default selectors for add element of a template
+ addEventSelector: 'button',
+ //Default selectors for remove markup elements of a template
+ remEventSelector: 'a',
+ //This option allows adding first row delete option and a row separator
+ hideFirstRowAddSeparator: true,
+ //Max rows - This option should be set when instantiating the widget
+ maxRows: 1000,
+ maxRowsMsg: '#max-registrant-message'
+ },
+
+ /**
+ * Initialize create
+ * @private
+ */
+ _create: function() {
+ this.options.rowCount = this.options.rowIndex = 0;
+ //On document ready related tasks
+ $($.proxy(this.ready, this));
+
+ //Binding template-wide events handlers for adding and removing rows
+ this.element.on('click', this.options.addEventSelector + this.options.addRowBtn, $.proxy(this.handleAdd, this));
+ this.element.on('click', this.options.remEventSelector + this.options.btnRemoveSelector, $.proxy(this.handleRemove, this));
+ },
+
+ /**
+ * Initialize template
+ * @public
+ */
+ ready: function() {
+ if (this.options.formDataPost && this.options.formDataPost.formData && this.options.formDataPost.formData.length) {
+ this.processFormDataArr(this.options.formDataPost);
+ } else if (this.options.rowIndex === 0 && this.options.maxRows !== 0) {
+ //If no form data , then add default row
+ this.addRow(0);
+ }
+ },
+
+ /**
+ * Process and loop through all row data to create preselected values. This is used for any error on submit.
+ * For complex implementations the inheriting widget can override this behavior
+ * @public
+ * @param {Object} formDataArr
+ */
+ processFormDataArr: function(formDataArr) {
+ var formData = formDataArr.formData,
+ templateFields = formDataArr.templateFields;
+ for (var i = this.options.rowIndex = 0; i < formData.length; this.options.rowIndex = i++) {
+ this.addRow(i);
+ var formRow = formData[i];
+ for (var j = 0; j < formRow.length; j++) {
+ this.setFieldById(templateFields[j] + i, formRow[j]);
+ }
+ }
+
+ },
+
+ /**
+ * Initialize and create markup for template row. Add it to the parent container.
+ * The template processing will substitute row index at all places marked with _index_ in the template
+ * using the template
+ * @public
+ * @param {Number} index - current index/count of the created template. This will be used as the id
+ * @return {*}
+ */
+ addRow: function(index) {
+ var row = $(this.options.rowParentElem);
+ row.addClass(this.options.rowContainerClass).attr('id', this.options.rowIdPrefix + index);
+ $(this.options.rowTemplate).tmpl([
+ {_index_: index}
+ ]).appendTo(row);
+ $(this.options.rowContainer).append(row);
+ row.addClass(this.options.additionalRowClass);
+ //Remove 'delete' link and additionalRowClass for first row
+ if (this.options.rowIndex === 0 && this.options.hideFirstRowAddSeparator) {
+ $('#' + this._esc(this.options.btnRemoveIdPrefix) + '0').remove();
+ $('#' + this._esc(this.options.rowIdPrefix) + '0').removeClass(this.options.additionalRowClass);
+ }
+ this.maxRowCheck(++this.options.rowCount);
+ return row;
+ },
+
+ /**
+ * Remove return item information row
+ * @public
+ * @param {*} rowIndex - return item information row index
+ * @return {boolean}
+ */
+ removeRow: function(rowIndex) {
+ $('#' + this._esc(this.options.rowIdPrefix) + rowIndex).remove();
+ this.maxRowCheck(--this.options.rowCount);
+ return false;
+ },
+
+ /**
+ * Function to check if maximum rows are exceeded and render/hide maxMsg and Add btn
+ * @public
+ * @param rowIndex
+ */
+ maxRowCheck: function(rowIndex) {
+ var addRowBtn = $(this.options.addRowBtn),
+ maxRowMsg = $(this.options.maxRowsMsg);
+ //liIndex starts from 0
+ if (rowIndex >= this.options.maxRows) {
+ addRowBtn.hide();
+ maxRowMsg.show();
+ } else if (addRowBtn.is(":hidden")) {
+ addRowBtn.show();
+ maxRowMsg.hide();
+ }
+ },
+
+ /**
+ * Set the value on given element
+ * @public
+ * @param {string} domId
+ * @param {string} value
+ */
+ setFieldById: function(domId, value) {
+ var x = $('#' + this._esc(domId));
+ if (x.length) {
+ if (x.is(':checkbox')) {
+ x.attr('checked', true);
+ } else if (x.is('option')) {
+ x.attr('selected', 'selected');
+ } else {
+ x.val(value);
+ }
+ }
+ },
+
+ /**
+ * Delegated handler for adding a row
+ * @public
+ * @return {boolean}
+ */
+ handleAdd: function() {
+ this.addRow(++this.options.rowIndex);
+ return false;
+ },
+
+ /**
+ * Delegated handler for removing a selected row
+ * @public
+ * @param {Object} e - Native event object
+ * @return {boolean}
+ */
+ handleRemove: function(e) {
+ this.removeRow($(e.currentTarget).closest("[id^='" + this.options.btnRemoveIdPrefix + "']")
+ .attr('id').replace(this.options.btnRemoveIdPrefix, ''));
+ return false;
+ },
+
+ /*
+ * Utility function to add escape chars for jquery selector strings
+ * @private
+ * @param str - string to be processed
+ * @return {string}
+ */
+ _esc: function(str) {
+ return str ? str.replace(/([ ;&,.+*~\':"!\^$\[\]()=>|\/@])/g, '\\$1') : str;
+ }
+ });
+
+})(jQuery);
\ No newline at end of file
diff --git a/app/design/frontend/magento_plushe/Magento_Page/link/current.phtml b/app/design/frontend/magento_backup/Magento_Page/link/current.phtml
similarity index 96%
rename from app/design/frontend/magento_plushe/Magento_Page/link/current.phtml
rename to app/design/frontend/magento_backup/Magento_Page/link/current.phtml
index d8e6268840b..7ad6578648c 100644
--- a/app/design/frontend/magento_plushe/Magento_Page/link/current.phtml
+++ b/app/design/frontend/magento_backup/Magento_Page/link/current.phtml
@@ -26,11 +26,11 @@
*/
?>
<?php if ($this->isCurrent()):?>
-<li class="nav item current">
+<li class="current">
<strong><?php echo $this->escapeHtml(__($this->getLabel()))?></strong>
</li>
<?php else:?>
-<li class="nav item">
+<li>
<a href="<?php echo $this->escapeHtml($this->getHref())?>"
<?php if ($title = $this->getTitle()):?> title="<?php echo $this->escapeHtml(__($title))?>"<?php endif;?>
>
diff --git a/app/design/frontend/magento_plushe/Magento_Page/popup.phtml b/app/design/frontend/magento_backup/Magento_Page/popup.phtml
similarity index 68%
rename from app/design/frontend/magento_plushe/Magento_Page/popup.phtml
rename to app/design/frontend/magento_backup/Magento_Page/popup.phtml
index 816610ffdd6..5d23527f833 100644
--- a/app/design/frontend/magento_plushe/Magento_Page/popup.phtml
+++ b/app/design/frontend/magento_backup/Magento_Page/popup.phtml
@@ -19,6 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
+ * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -27,22 +28,18 @@
/**
* Template for \Magento\Page\Block\Html
*/
-$bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
?>
-<!doctype html>
-<html lang="<?php echo $this->getLang() ?>" class="no-js">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width">
- <?php echo $this->getChildHtml('head') ?>
+<?php echo $this->getChildHtml('head') ?>
</head>
-<body class="page popup<?php echo $bodyCss ?>">
+<body class="page-popup<?php echo $this->getBodyClass()?$this->getBodyClass() : ''?>">
+<div>
<?php echo $this->getChildHtml('after_body_start') ?>
- <div class="page wrapper">
- <?php echo $this->getChildHtml('main') ?>
- </div>
+ <?php echo $this->getChildHtml('content') ?>
<?php echo $this->getChildHtml('before_body_end') ?>
- <?php echo $this->getAbsoluteFooter() ?>
+</div>
+<?php echo $this->getAbsoluteFooter() ?>
</body>
</html>
diff --git a/app/design/frontend/magento_plushe/Magento_Page/print.phtml b/app/design/frontend/magento_backup/Magento_Page/print.phtml
similarity index 74%
rename from app/design/frontend/magento_plushe/Magento_Page/print.phtml
rename to app/design/frontend/magento_backup/Magento_Page/print.phtml
index 19e15f9c166..bc05952d3d1 100644
--- a/app/design/frontend/magento_plushe/Magento_Page/print.phtml
+++ b/app/design/frontend/magento_backup/Magento_Page/print.phtml
@@ -34,23 +34,19 @@
<head>
<?php echo $this->getChildHtml('head') ?>
</head>
-<body class="page print<?php echo $this->getBodyClass()?$this->getBodyClass():'' ?>">
+<body class="page-print<?php echo $this->getBodyClass()?$this->getBodyClass():'' ?>">
<?php echo $this->getChildHtml('after_body_start') ?>
-<div class="page print wrapper">
- <header class="header print">
- <img src="<?php echo $this->getPrintLogoUrl() ? $this->getPrintLogoUrl() : $this->getViewFileUrl('images/logo.gif') ?>" class="logo" alt="" />
+<div>
+ <div class="print-head">
+ <img src="<?php echo $this->getPrintLogoUrl() ? $this->getPrintLogoUrl() : $this->getViewFileUrl('images/logo_print.gif') ?>" class="logo" alt="" />
<?php if ($this->getPrintLogoText()):?>
<address><?php echo nl2br($this->escapeHtml($this->getPrintLogoText())) ?></address>
<?php endif;?>
- </header>
- <div class="page print main">
- <?php echo $this->getChildHtml('content') ?>
</div>
- <footer class="page print footer">
- <div class="actions">
- <button type="button" title="<?php echo __('Close Window') ?>" class="action close" onclick="window.close();"><span><?php echo __('Close Window') ?></span></button>
- </div>
- </footer>
+ <?php echo $this->getChildHtml('content') ?>
+ <div class="buttons-set">
+ <button type="button" title="<?php echo __('Close Window') ?>" class="button" onclick="window.close();"><span><span><?php echo __('Close Window') ?></span></span></button>
+ </div>
<?php echo $this->getAbsoluteFooter() ?>
</div>
</body>
diff --git a/app/design/frontend/magento_backup/Magento_Page/switch/languages.phtml b/app/design/frontend/magento_backup/Magento_Page/switch/languages.phtml
new file mode 100644
index 00000000000..95e60198fd5
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Page/switch/languages.phtml
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * Language switcher template
+ *
+ * @see \Magento\Page\Block\Switcher
+ */
+?>
+<?php if(count($this->getStores())>1): ?>
+<div class="form-language">
+ <label for="select-language"><?php echo __('Your Language:') ?></label>
+ <select id="select-language" title="<?php echo __('Your Language') ?>" onchange="window.location.href=this.value">
+ <?php foreach ($this->getStores() as $_lang): ?>
+ <?php $_selected = ($_lang->getId() == $this->getCurrentStoreId()) ? ' selected="selected"' : '' ?>
+ <option value="<?php echo $_lang->getCurrentUrl() ?>"<?php echo $_selected ?>><?php echo $this->escapeHtml($_lang->getName()) ?></option>
+ <?php endforeach; ?>
+ </select>
+</div>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Page/switch/stores.phtml b/app/design/frontend/magento_backup/Magento_Page/switch/stores.phtml
similarity index 62%
rename from app/design/frontend/magento_plushe/Magento_Page/switch/stores.phtml
rename to app/design/frontend/magento_backup/Magento_Page/switch/stores.phtml
index cb4d6d80c79..f6c35103437 100644
--- a/app/design/frontend/magento_plushe/Magento_Page/switch/stores.phtml
+++ b/app/design/frontend/magento_backup/Magento_Page/switch/stores.phtml
@@ -19,6 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
+ * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -31,29 +32,16 @@
*/
?>
<?php if(count($this->getGroups())>1): ?>
-<div class="switcher-store">
- <label><?php echo __('Select Store') ?>:</label>
- <ul id="select-store">
- <?php foreach ($this->getGroups() as $_group): ?>
- <?php /* $_selected = ($_group->getId()==$this->getCurrentGroupId()) ? ' class="current"' : '' */ ?>
- <?php if ($_group->getId()==$this->getCurrentGroupId()): ?>
- <li class="current"><strong><?php echo $this->escapeHtml($_group->getName()) ?></strong></li>
- <?php else: ?>
- <li><a href="<?php echo $_group->getHomeUrl() ?>"><?php echo $this->escapeHtml($_group->getName()) ?></a></li>
- <?php endif; ?>
- <?php endforeach; ?>
- </ul>
-</div>
-<?php endif; ?>
-
-<?php /* if(count($this->getGroups())>1): ?>
-<div class="switcher-store">
- <label for="select-store"><?php echo __('Select Store') ?>:</label>
- <select id="select-store" onchange="location.href=this.value">
+<div class="store-switcher">
+ <label for="select-store"><?php echo __('Select Store:') ?></label>
+ <select id="select-store" title="<?php echo __('Select Store') ?>" onchange="location.href=this.value">
+ <?php /*foreach ($this->getStores() as $_store): ?>
+ <option value="<?php echo $_store->getUrl('') ?>"<?php if($_store->getId()==$this->getCurrentStoreId()): ?> selected="selected"<?php endif; ?>><?php echo $_store->getName() ?></option>
+ <?php endforeach;*/ ?>
<?php foreach ($this->getGroups() as $_group): ?>
<?php $_selected = ($_group->getId()==$this->getCurrentGroupId()) ? ' selected="selected"' : '' ?>
<option value="<?php echo $_group->getHomeUrl() ?>"<?php echo $_selected ?>><?php echo $this->escapeHtml($_group->getName()) ?></option>
<?php endforeach; ?>
</select>
</div>
-<?php endif; */ ?>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/catalog/product/view/profile/options.phtml b/app/design/frontend/magento_backup/Magento_Payment/catalog/product/view/profile/options.phtml
new file mode 100644
index 00000000000..8093dce4eb2
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Payment/catalog/product/view/profile/options.phtml
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * @see \Magento\Payment\Block\Catalog\Product\View\Profile
+ */
+?>
+<?php if ($dateHtml = $this->getDateHtml()): ?>
+<dl>
+ <dt>
+ <label for="<?php echo $this->getDateHtmlId() ?>"><?php echo __('Recurring Profile Start Date') ?></label>
+ </dt>
+ <dd>
+ <?php echo $dateHtml ?>
+ </dd>
+</dl>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/catalog/product/view/profile/schedule.phtml b/app/design/frontend/magento_backup/Magento_Payment/catalog/product/view/profile/schedule.phtml
new file mode 100644
index 00000000000..1c41afb6785
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Payment/catalog/product/view/profile/schedule.phtml
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * @see \Magento\Payment\Block\Catalog\Product\View\Profile
+ */
+?>
+<dl>
+<?php foreach($this->getScheduleInfo() as $term => $definitions): ?>
+ <dt><?php echo $this->escapeHtml($term); ?></dt>
+<?php foreach ($definitions as $definition):?>
+ <dd><?php echo $this->escapeHtml($definition)?></dd>
+<?php endforeach;?>
+<?php endforeach;?>
+</dl>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/cc-type.js b/app/design/frontend/magento_backup/Magento_Payment/cc-type.js
new file mode 100644
index 00000000000..4fc0b878e43
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Payment/cc-type.js
@@ -0,0 +1,52 @@
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category credit card type
+ * @package mage
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+/*jshint jquery:true*/
+(function($) {
+ "use strict";
+ $.widget('mage.creditCardType', {
+ options: {
+ typeCodes: ['SS', 'SM', 'SO'] // Type codes for Switch/Maestro/Solo credit cards.
+ },
+
+ /**
+ * Bind change handler to select element and trigger the event to show/hide
+ * the Switch/Maestro or Solo credit card type container for those credit card types.
+ * @private
+ */
+ _create: function() {
+ this.element.on('change', $.proxy(this._toggleCardType, this)).trigger('change');
+ },
+
+ /**
+ * Toggle the Switch/Maestro and Solo credit card type container depending on which
+ * credit card type is selected.
+ * @private
+ */
+ _toggleCardType: function() {
+ $(this.options.creditCardTypeContainer)
+ .toggle($.inArray(this.element.val(), this.options.typeCodes) !== -1);
+ }
+ });
+})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Payment/form/banktransfer.phtml b/app/design/frontend/magento_backup/Magento_Payment/form/banktransfer.phtml
new file mode 100644
index 00000000000..11e895dc221
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Payment/form/banktransfer.phtml
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category Magento
+ * @package Magento_Payment
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php if ($instructions = $this->getInstructions()): ?>
+ <ul class="form-list checkout-agreements" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
+ <li>
+ <div class="<?php echo $this->getMethodCode() ?>-instructions-content agreement-content">
+ <?php echo nl2br($instructions) ?>
+ </div>
+ </li>
+ </ul>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/form/cashondelivery.phtml b/app/design/frontend/magento_backup/Magento_Payment/form/cashondelivery.phtml
new file mode 100644
index 00000000000..f6581f70ae5
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Payment/form/cashondelivery.phtml
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category Magento
+ * @package Magento_Payment
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+
+/**
+ * @see \Magento\Payment\Block\Form\Cashondelivery
+ */
+?>
+<?php if ($this->getInstructions()): ?>
+ <ul class="form-list checkout-agreements" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
+ <li>
+ <div class="<?php echo $this->getMethodCode() ?>-instructions-content agreement-content">
+ <?php echo nl2br($this->getInstructions()) ?>
+ </div>
+ </li>
+ </ul>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/form/cc.phtml b/app/design/frontend/magento_backup/Magento_Payment/form/cc.phtml
new file mode 100644
index 00000000000..39f14f5862f
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Payment/form/cc.phtml
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php $_code=$this->getMethodCode() ?>
+<ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none;">
+<?php /*
+ <li>
+ <div class="input-box">
+ <label for="<?php echo $_code ?>_cc_owner" class="required"><em>*</em><?php echo __('Name on Card') ?></label>
+ <input type="text" title="<?php echo __('Name on Card') ?>" class="input-text required-entry" id="<?php echo $_code ?>_cc_owner" name="payment[cc_owner]" value="<?php echo $this->escapeHtml($this->getInfoData('cc_owner')) ?>" />
+ </div>
+ </li>
+*/ ?>
+ <li>
+ <label for="<?php echo $_code ?>_cc_type" class="required"><em>*</em><?php echo __('Credit Card Type') ?></label>
+ <div class="input-box">
+ <select id="<?php echo $_code ?>_cc_type" name="payment[cc_type]" data-validate='{required:true, "validate-cc-type-select":"#<?php echo $_code ?>_cc_number"}'>
+ <option value=""><?php echo __('--Please Select--')?></option>
+ <?php $_ccType = $this->getInfoData('cc_type') ?>
+ <?php foreach ($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
+ <option value="<?php echo $_typeCode ?>"<?php if($_typeCode==$_ccType): ?> selected="selected"<?php endif ?>><?php echo $_typeName ?></option>
+ <?php endforeach ?>
+ </select>
+ </div>
+ </li>
+ <li>
+ <label for="<?php echo $_code ?>_cc_number" class="required"><em>*</em><?php echo __('Credit Card Number') ?></label>
+ <div class="input-box">
+ <input type="text" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo __('Credit Card Number') ?>" class="input-text" value="" data-validate='{required:true, "validate-cc-number":"#<?php echo $_code ?>_cc_type", "validate-cc-type":"#<?php echo $_code ?>_cc_type"}'/>
+ </div>
+ </li>
+ <li id="<?php echo $_code ?>_cc_type_exp_div">
+ <label for="<?php echo $_code ?>_expiration" class="required"><em>*</em><?php echo __('Expiration Date') ?></label>
+ <div class="input-box">
+ <div class="v-fix">
+ <select id="<?php echo $_code ?>_expiration" name="payment[cc_exp_month]" class="month" data-validate='{required:true, "validate-cc-exp":"#<?php echo $_code ?>_expiration_yr"}'>
+ <?php $_ccExpMonth = $this->getInfoData('cc_exp_month') ?>
+ <?php foreach ($this->getCcMonths() as $k=>$v): ?>
+ <option value="<?php echo $k?$k:'' ?>"<?php if($k==$_ccExpMonth): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+ <?php endforeach ?>
+ </select>
+ </div>
+ <div class="v-fix">
+ <?php $_ccExpYear = $this->getInfoData('cc_exp_year') ?>
+ <select id="<?php echo $_code ?>_expiration_yr" name="payment[cc_exp_year]" class="year" data-validate='{required:true}'>
+ <?php foreach ($this->getCcYears() as $k=>$v): ?>
+ <option value="<?php echo $k?$k:'' ?>"<?php if($k==$_ccExpYear): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+ <?php endforeach ?>
+ </select>
+ </div>
+ </div>
+ </li>
+ <?php echo $this->getChildHtml() ?>
+ <?php if($this->hasVerification()): ?>
+ <li id="<?php echo $_code ?>_cc_type_cvv_div">
+ <label for="<?php echo $_code ?>_cc_cid" class="required"><em>*</em><?php echo __('Card Verification Number') ?></label>
+ <div class="input-box">
+ <div class="v-fix">
+ <input type="text" title="<?php echo __('Card Verification Number') ?>" class="input-text cvv" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" data-validate='{required:true, "validate-cc-cvn":"#<?php echo $_code ?>_cc_type"}' />
+ </div>
+ <a href="#" class="cvv-what-is-this" data-mage-init='{toggleAdvanced: {toggleContainers: "#<?php echo $_code ?>_cc_type_cvv_div .tool-tip"}}'><?php echo __('What is this?') ?></a>
+ <div class="tool-tip hidden">
+ <div class="btn-close"><a data-mage-init='{toggleAdvanced: {toggleContainers: "#<?php echo $_code ?>_cc_type_cvv_div .tool-tip"}}' href="#" title="<?php echo __('Close') ?>"><img src="<?php echo $this->getViewFileUrl('images/btn_window_close.gif') ?>" alt="<?php echo __('Close') ?>" title="<?php echo __('Close') ?>" /></a></div>
+ <div class="tool-tip-content"><img src="<?php echo $this->getViewFileUrl('Magento_Checkout::cvv.gif') ?>" alt="<?php echo __('Card Verification Number Visual Reference') ?>" title="<?php echo __('Card Verification Number Visual Reference') ?>" /></div>
+ </div>
+ </div>
+ </li>
+ <?php endif; ?>
+
+ <?php if ($this->hasSsCardType()): ?>
+ <li id="<?php echo $_code ?>_cc_type_ss_div">
+ <ul class="inner-form">
+ <li class="form-alt"><label for="<?php echo $_code ?>_cc_issue" class="required"><em>*</em><?php echo __('Switch/Solo/Maestro Only') ?></label></li>
+ <li>
+ <label for="<?php echo $_code ?>_cc_issue"><?php echo __('Issue Number') ?>:</label>
+ <span class="input-box">
+ <input type="text" title="<?php echo __('Issue Number') ?>" class="input-text cvv" id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" data-validate='{"validate-cc-ukss":true}'/>
+ </span>
+ </li>
+
+ <li>
+ <label for="<?php echo $_code ?>_start_month"><?php echo __('Start Date') ?>:</label>
+ <div class="input-box">
+ <div class="v-fix">
+ <select id="<?php echo $_code ?>_start_month" name="payment[cc_ss_start_month]" class="month" data-validate='{"validate-cc-ukss":true}'>
+ <?php foreach ($this->getCcMonths() as $k=>$v): ?>
+ <option value="<?php echo $k?$k:'' ?>"<?php if($k==$this->getInfoData('cc_ss_start_month')): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+ <?php endforeach ?>
+ </select>
+ </div>
+ <div class="v-fix">
+ <select id="<?php echo $_code ?>_start_year" name="payment[cc_ss_start_year]" class="year" data-validate='{"validate-cc-ukss":true}'>
+ <?php foreach ($this->getSsStartYears() as $k=>$v): ?>
+ <option value="<?php echo $k?$k:'' ?>"<?php if($k==$this->getInfoData('cc_ss_start_year')): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+ <?php endforeach ?>
+ </select>
+ </div>
+ </div>
+ </li>
+ <li class="adv-container" data-validation-msg="validate-cc-ukss"> </li>
+ </ul>
+ <script type="text/javascript">
+ head.js("<?php echo $this->getViewFileUrl('Magento_Payment::cc-type.js')?>", function() {
+ jQuery('#<?php echo $_code ?>_cc_type').creditCardType({
+ creditCardTypeContainer: '#<?php echo $_code ?>_cc_type_ss_div'
+ });
+ });
+ </script>
+ </li>
+ <?php endif; ?>
+</ul>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/form/ccsave.phtml b/app/design/frontend/magento_backup/Magento_Payment/form/ccsave.phtml
new file mode 100644
index 00000000000..c93732d4564
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Payment/form/ccsave.phtml
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php $_code=$this->getMethodCode() ?>
+<ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none;">
+ <li>
+ <label for="<?php echo $_code ?>_cc_owner" class="required"><em>*</em><?php echo __('Name on Card') ?></label>
+ <div class="input-box">
+ <input type="text" title="<?php echo __('Name on Card') ?>" class="input-text" id="<?php echo $_code ?>_cc_owner" name="payment[cc_owner]" value="<?php echo $this->escapeHtml($this->getInfoData('cc_owner')) ?>" data-validate='{required:true}'/>
+ </div>
+ </li>
+ <li>
+ <label for="<?php echo $_code ?>_cc_type" class="required"><em>*</em><?php echo __('Credit Card Type') ?></label>
+ <div class="input-box">
+ <select id="<?php echo $_code ?>_cc_type" name="payment[cc_type]" title="<?php echo __('Credit Card Type') ?>" data-validate='{required:true, "validate-cc-type-select":"#<?php echo $_code ?>_cc_number"}'>
+ <option value=""><?php echo __('--Please Select--') ?></option>
+ <?php $_ccType = $this->getInfoData('cc_type') ?>
+ <?php foreach ($this->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
+ <option value="<?php echo $_typeCode ?>"<?php if($_typeCode==$_ccType): ?> selected="selected"<?php endif ?>><?php echo $_typeName ?></option>
+ <?php endforeach ?>
+ </select>
+ </div>
+ </li>
+ <li>
+ <label for="<?php echo $_code ?>_cc_number" class="required"><em>*</em><?php echo __('Credit Card Number') ?></label>
+ <div class="input-box">
+ <input type="text" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo __('Credit Card Number') ?>" class="input-text" value="" data-validate='{required:true, "validate-cc-number":"#<?php echo $_code ?>_cc_type", "validate-cc-type":"#<?php echo $_code ?>_cc_type"}'/>
+ </div>
+ </li>
+ <li>
+ <label for="<?php echo $_code ?>_expiration" class="required"><em>*</em><?php echo __('Expiration Date') ?></label>
+ <div class="input-box">
+ <div class="v-fix">
+ <select id="<?php echo $_code ?>_expiration" name="payment[cc_exp_month]" class="month" data-validate='{required:true, "validate-cc-exp":"#<?php echo $_code ?>_expiration_yr"}'>
+ <?php $_ccExpMonth = $this->getInfoData('cc_exp_month') ?>
+ <?php foreach ($this->getCcMonths() as $k=>$v): ?>
+ <option value="<?php echo $k?$k:'' ?>"<?php if($k==$_ccExpMonth): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+ <?php endforeach ?>
+ </select>
+ </div>
+ <div class="v-fix">
+ <?php $_ccExpYear = $this->getInfoData('cc_exp_year') ?>
+ <select id="<?php echo $_code ?>_expiration_yr" name="payment[cc_exp_year]" class="year" data-validate='{required:true}'>
+ <?php foreach ($this->getCcYears() as $k=>$v): ?>
+ <option value="<?php echo $k?$k:'' ?>"<?php if($k==$_ccExpYear): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+ <?php endforeach ?>
+ </select>
+ </div>
+ </div>
+ </li>
+ <?php echo $this->getChildHtml() ?>
+ <?php if($this->hasVerification()): ?>
+ <li>
+ <label for="<?php echo $_code ?>_cc_cid" class="required"><em>*</em><?php echo __('Card Verification Number') ?></label>
+ <div class="input-box">
+ <div class="v-fix">
+ <input type="text" title="<?php echo __('Card Verification Number') ?>" class="input-text cvv" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" data-validate='{required:true, "validate-cc-cvn":"#<?php echo $_code ?>_cc_type"}'/>
+ </div>
+ <a href="#" class="cvv-what-is-this" data-mage-init='{toggleAdvanced: {toggleContainers:"#ccv-save-tooltip"}}'><?php echo __('What is this?') ?></a>
+ <div class="tool-tip hidden" id="ccv-save-tooltip">
+ <div class="btn-close"><a data-mage-init='{toggleAdvanced: {toggleContainers:"#ccv-save-tooltip"}}' href="#" title="<?php echo __('Close') ?>"><img src="<?php echo $this->getViewFileUrl('images/btn_window_close.gif') ?>" alt="<?php echo __('Close') ?>" title="<?php echo __('Close') ?>" /></a></div>
+ <div class="tool-tip-content"><img src="<?php echo $this->getViewFileUrl('Magento_Checkout::cvv.gif') ?>" alt="<?php echo __('Card Verification Number Visual Reference') ?>" title="<?php echo __('Card Verification Number Visual Reference') ?>" /></div>
+ </div>
+ </div>
+ </li>
+ <?php endif; ?>
+ <?php if ($this->hasSsCardType()): ?>
+ <li id="<?php echo $_code ?>_cc_type_ss_div">
+ <ul class="inner-form">
+ <li class="form-alt"><label for="<?php echo $_code ?>_cc_issue" class="required"><em>*</em><?php echo __('Switch/Solo/Maestro Only') ?></label></li>
+ <li>
+ <label for="<?php echo $_code ?>_cc_issue"><?php echo __('Issue Number') ?>:</label>
+ <span class="input-box">
+ <input type="text" title="<?php echo __('Issue Number') ?>" class="input-text cvv" id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" data-validate='{"validate-cc-ukss":true}'/>
+ </span>
+ </li>
+
+ <li>
+ <label for="<?php echo $_code ?>_start_month"><?php echo __('Start Date') ?>:</label>
+ <div class="input-box">
+ <div class="v-fix">
+ <select id="<?php echo $_code ?>_start_month" name="payment[cc_ss_start_month]" class="month" data-validate='{"validate-cc-ukss":true}'>
+ <?php foreach ($this->getCcMonths() as $k=>$v): ?>
+ <option value="<?php echo $k?$k:'' ?>"<?php if($k==$this->getInfoData('cc_ss_start_month')): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+ <?php endforeach ?>
+ </select>
+ </div>
+ <div class="v-fix">
+ <select id="<?php echo $_code ?>_start_year" name="payment[cc_ss_start_year]" class="year" data-validate='{"validate-cc-ukss":true}'>
+ <?php foreach ($this->getSsStartYears() as $k=>$v): ?>
+ <option value="<?php echo $k?$k:'' ?>"<?php if($k==$this->getInfoData('cc_ss_start_year')): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+ <?php endforeach ?>
+ </select>
+ </div>
+ </div>
+ </li>
+ <li class="adv-container" data-validation-msg="validate-cc-ukss"> </li>
+ </ul>
+ <script type="text/javascript">
+ head.js("<?php echo $this->getViewFileUrl('Magento_Payment::cc-type.js')?>", function() {
+ jQuery('#<?php echo $_code ?>_cc_type').creditCardType({
+ creditCardTypeContainer: '#<?php echo $_code ?>_cc_type_ss_div'
+ });
+ });
+ </script>
+ </li>
+ <?php endif; ?>
+</ul>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/form/checkmo.phtml b/app/design/frontend/magento_backup/Magento_Payment/form/checkmo.phtml
new file mode 100644
index 00000000000..1e98b9826fc
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Payment/form/checkmo.phtml
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php if ($this->getMethod()->getMailingAddress() || $this->getMethod()->getPayableTo()): ?>
+ <ul class="form-list checkmo-list" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
+ <?php if ($this->getMethod()->getPayableTo()): ?>
+ <li>
+ <label><?php echo __('Make Check payable to:') ?></label>
+ <?php echo $this->escapeHtml($this->getMethod()->getPayableTo()) ?>
+ </li>
+ <?php endif; ?>
+ <?php if ($this->getMethod()->getMailingAddress()): ?>
+ <li>
+ <label><?php echo __('Send Check to:') ?></label>
+ <address class="checkmo-mailing-address">
+ <?php echo nl2br($this->escapeHtml($this->getMethod()->getMailingAddress())) ?>
+ </address>
+ </li>
+ <?php endif; ?>
+ </ul>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/form/purchaseorder.phtml b/app/design/frontend/magento_backup/Magento_Payment/form/purchaseorder.phtml
new file mode 100644
index 00000000000..f5fc7ae1b00
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Payment/form/purchaseorder.phtml
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<ul class="form-list" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
+ <li>
+ <label for="po_number" class="required"><em>*</em><?php echo __('Purchase Order Number') ?></label>
+ <div class="input-box">
+ <input type="text" id="po_number" name="payment[po_number]" title="<?php echo __('Purchase Order Number') ?>" class="input-text required-entry" value="<?php echo $this->escapeHtml($this->getInfoData('po_number')) ?>" />
+ </div>
+ </li>
+</ul>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/info/checkmo.phtml b/app/design/frontend/magento_backup/Magento_Payment/info/checkmo.phtml
new file mode 100644
index 00000000000..3021359b08a
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Payment/info/checkmo.phtml
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<p><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></p>
+<?php if($this->getInfo()->getAdditionalData()): ?>
+ <?php if($this->getPayableTo()): ?>
+ <p><strong><?php echo __('Make Check payable to:') ?></strong> <?php echo $this->escapeHtml($this->getPayableTo()) ?></p>
+ <?php endif; ?>
+ <?php if($this->getMailingAddress()): ?>
+ <p><strong><?php echo __('Send Check to:') ?></strong></p>
+ <address class="checkmo-mailing-address">
+ <?php echo nl2br($this->escapeHtml($this->getMailingAddress())) ?>
+ </address>
+ <?php endif; ?>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/info/default.phtml b/app/design/frontend/magento_backup/Magento_Payment/info/default.phtml
new file mode 100644
index 00000000000..aa4e7d58fa4
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Payment/info/default.phtml
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * @see \Magento\Payment\Block\Info
+ */
+?>
+<p><strong><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></strong></p>
+
+<?php if ($_specificInfo = $this->getSpecificInformation()):?>
+<table>
+ <tbody>
+ <?php foreach ($_specificInfo as $_label => $_value):?>
+ <tr>
+ <th><strong><?php echo $this->escapeHtml($_label)?>:</strong></th>
+ </tr>
+ <tr>
+ <td><?php echo nl2br(implode($this->getValueAsArray($_value, true), "\n"))?></td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+</table>
+<?php endif;?>
+
+<?php echo $this->getChildHtml()?>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/info/instructions.phtml b/app/design/frontend/magento_backup/Magento_Payment/info/instructions.phtml
new file mode 100644
index 00000000000..5e66f337d24
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Payment/info/instructions.phtml
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category Magento
+ * @package Magento_Payment
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * @see \Magento\Payment\Block\Info
+ */
+?>
+<p><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></p>
+<?php if ($this->getInstructions()): ?>
+<table>
+ <tbody>
+ <tr>
+ <td><?php echo nl2br($this->getInstructions()) ?></td>
+ </tr>
+ </tbody>
+</table>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/info/purchaseorder.phtml b/app/design/frontend/magento_backup/Magento_Payment/info/purchaseorder.phtml
new file mode 100644
index 00000000000..22502d154a3
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Payment/info/purchaseorder.phtml
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<p><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></p>
+<p><strong><?php echo __('Purchase Order Number:') ?></strong> <span class="nobr"><?php echo $this->escapeHtml($this->getInfo()->getPoNumber()) ?></span></p>
diff --git a/app/design/frontend/magento_backup/Magento_Payment/layout/override/catalog_product_view.xml b/app/design/frontend/magento_backup/Magento_Payment/layout/override/catalog_product_view.xml
new file mode 100644
index 00000000000..7155d46d979
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Payment/layout/override/catalog_product_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceBlock name="product.info">
+ <block class="Magento\Payment\Block\Catalog\Product\View\Profile" name="product.info.additional.recurring.schedule" as="recurring_info" template="catalog/product/view/profile/schedule.phtml" group="detailed_info">
+ <action method="setTitle">
+ <argument translate="true" name="value" xsi:type="string">Recurring Profile</argument>
+ </action>
+ </block>
+ </referenceBlock>
+ <referenceBlock name="product.info.options.wrapper">
+ <block class="Magento\Payment\Block\Catalog\Product\View\Profile" name="product.info.options.recurring" as="recurring_options" template="catalog/product/view/profile/options.phtml"/>
+ </referenceBlock>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/express/review.phtml b/app/design/frontend/magento_backup/Magento_Paypal/express/review.phtml
new file mode 100644
index 00000000000..d02d0dc97ea
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/express/review.phtml
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+/** @var $this \Magento\Paypal\Block\Express\Review */
+
+$billingBlock = $this->getChildBlock('billing')->setFieldNamePrefix('billing')->setHideEmailAddress(true);
+$shippingAddress = $this->getShippingAddress();
+?>
+<div class="page-title">
+ <h1><?php echo __('Review Order') ?></h1>
+</div>
+<?php echo $this->getLayout()->renderElement('messages') ?>
+<h2 class="sub-title">
+ Please confirm your addresses
+</h2>
+<div class="paypal-review-order">
+ <form method="post" id="order-review-form" action="<?php echo $this->getPlaceOrderUrl() ?>">
+ <?php if(!$billingBlock->isCustomerLoggedIn()): ?>
+ <div class="info-set col2-set">
+ <h2 class="legend"><?php echo __('Customer Information') ?></h2>
+ <ul class="form-list form-list-narrow">
+ <li id="customer-info-form" class="address-form">
+ <div class="field">
+ <label for="customer:email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
+ <div class="input-box">
+ <input type="text" name="customer-email" id="customer:email" value="<?php echo $this->escapeHtml($billingBlock->getAddress()->getEmail()) ?>" title="<?php echo __('Email Address') ?>" class="input-text validate-email required-entry" />
+ </div>
+ </div>
+ </li>
+ </ul>
+ </div>
+ <?php endif ?>
+ <div class="info-set col2-set">
+ <div class="col-1" id="billing-address">
+ <h2 class="legend"><?php echo __('Billing Address') ?></h2>
+ <?php if ($shippingAddress): ?>
+ <?php echo $billingBlock->setShowAsShippingCheckbox(true)->toHtml(); ?>
+ <?php else: ?>
+ <?php echo $billingBlock->toHtml(); ?>
+ <?php endif; ?>
+ </div>
+ <?php if ($shippingAddress): ?>
+ <div class="col-2" id="shipping-address">
+ <h2 class="legend"><?php echo __('Shipping Address') ?></h2>
+ <?php echo $this->getChildBlock('shipping')->setFieldNamePrefix('shipping')->setHideEmailAddress(true)->toHtml(); ?>
+ </div>
+ </div>
+
+ <div class="info-set col2-set">
+ <div class="col-2">
+ <div class="box paypal-shipping-method">
+ <div class="box-title">
+ <h3><?php echo __('Shipping Method') ?></h3>
+ </div>
+ <div class="box-content">
+ <?php echo $this->getChildBlock('shipping_method')->toHtml(); ?>
+ </div>
+ </div>
+ </div>
+ <?php endif; ?>
+ </div>
+
+ <div class="info-set">
+ <h2 class="legend"><?php echo __('Items in Your Shopping Cart') ?><span class="separator"> | </span><a href="<?php echo $this->getUrl('checkout/cart') ?>"><?php echo __('Edit Shopping Cart') ?></a></h2>
+ <div id="details-reload">
+ <?php echo $this->getChildHtml('details') ?>
+ </div>
+ </div>
+ <?php echo $this->getChildHtml('agreements'); ?>
+ <div class="buttons-set buttons-set-order" id="review-buttons-container">
+ <button type="button" id="review-button" value="<?php echo __('Place Order') ?>" class="button btn-checkout"><span><span><?php echo __('Place Order') ?></span></span></button>
+ <button type="button" id="review-submit" value="<?php echo __('Place Order') ?>" class="button btn-checkout"><span><span><?php echo __('Place Order') ?></span></span></button>
+ <button type="button" id="update-order" class="button btn-checkout"><span><span><?php echo __('Update Order Data') ?></span></span></button>
+ <span class="please-wait" id="review-please-wait" style="display:none;">
+ <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo __('Submitting order information') ?>" title="<?php echo __('Submitting order information') ?>" class="v-middle" /> <?php echo __('Submitting order information') ?>
+ </span>
+ </div>
+ </form>
+</div>
+<script type="text/javascript">
+ head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
+ "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
+ "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
+ "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
+ "<?php echo $this->getViewFileUrl('Magento_Paypal::order-review.js') ?>",
+ function() {
+ jQuery('#order-review-form').validation().orderReview({
+ shippingMethodUpdateUrl: '<?php echo $this->escapeHtml($this->getUpdateShippingMethodsUrl()) ?>',
+ updateOrderSubmitUrl: '<?php echo $this->escapeHtml($this->getUpdateOrderSubmitUrl()) ?>',
+ isAjax: <?php echo $this->getUseAjax() ? 'true' : 'false' ?>
+ });
+ });
+</script>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/express/review/address.phtml b/app/design/frontend/magento_backup/Magento_Paypal/express/review/address.phtml
new file mode 100644
index 00000000000..6f282dd71c3
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/express/review/address.phtml
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category Magento
+ * @package Magento_Paypal
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php $prefix = $this->getFieldNamePrefix();?>
+<fieldset>
+ <ul class="form-list form-list-narrow">
+ <li id="<?php echo $prefix ?>-address-form" class="address-form">
+ <fieldset>
+ <input type="hidden" name="<?php echo $prefix ?>[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="<?php echo $prefix ?>:address_id" />
+ <ul>
+ <li class="fields"><?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getQuote()->getCustomer())->setForceUseCustomerRequiredAttributes(!$this->isCustomerLoggedIn())->setFieldIdFormat($prefix . ':%s')->setFieldNameFormat($prefix . '[%s]')->toHtml() ?></li>
+ <li class="fields">
+ <div class="field">
+ <label for="<?php echo $prefix ?>:company"><?php echo __('Company') ?></label>
+ <div class="input-box">
+ <input type="text" id="<?php echo $prefix ?>:company" name="<?php echo $prefix ?>[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo __('Company') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>" />
+ </div>
+ </div>
+ <?php if(!$this->isCustomerLoggedIn() && !$this->getHideEmailAddress()): ?>
+ <div class="field">
+ <label for="<?php echo $prefix ?>:email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
+ <div class="input-box">
+ <input type="text" name="<?php echo $prefix ?>[email]" id="<?php echo $prefix ?>:email" value="<?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?>" title="<?php echo __('Email Address') ?>" class="input-text validate-email required-entry" />
+ </div>
+ </div>
+ <?php endif; ?>
+ </li>
+ <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
+ <li class="wide">
+ <label for="<?php echo $prefix ?>:street1" class="required"><em>*</em><?php echo __('Address') ?></label>
+ <div class="input-box">
+ <input type="text" title="<?php echo __('Street Address') ?>" name="<?php echo $prefix ?>[street][]" id="<?php echo $prefix ?>:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
+ </div>
+ </li>
+ <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
+ <?php for ($_i = 2, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i <= $_n; $_i++): ?>
+ <li class="add-field">
+ <div class="input-box">
+ <input type="text" title="<?php echo __('Street Address %1', $_i) ?>" name="<?php echo $prefix ?>[street][]" id="<?php echo $prefix ?>:street<?php echo $_i?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
+ </div>
+ </li>
+ <?php endfor; ?>
+ <?php if ($this->helper('Magento\Customer\Helper\Address')->isVatAttributeVisible()) : ?>
+ <li class="wide">
+ <label for="<?php echo $prefix ?>:vat_id"><?php echo __('VAT Number') ?></label>
+ <div class="input-box">
+ <input type="text" id="<?php echo $prefix ?>:vat_id" name="<?php echo $prefix ?>[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo __('VAT Number') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id') ?>" />
+ </div>
+ </li>
+ <?php endif; ?>
+ <li class="fields">
+ <div class="field">
+ <label for="<?php echo $prefix ?>:city" class="required"><em>*</em><?php echo __('City') ?></label>
+ <div class="input-box">
+ <input type="text" title="<?php echo __('City') ?>" name="<?php echo $prefix ?>[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="<?php echo $prefix ?>:city" />
+ </div>
+ </div>
+ <div class="field">
+ <label for="<?php echo $prefix ?>:region_id" class="required"><em>*</em><?php echo __('State/Province') ?></label>
+ <div class="input-box">
+ <select id="<?php echo $prefix ?>:region_id" name="<?php echo $prefix ?>[region_id]" title="<?php echo __('State/Province') ?>" class="validate-select" style="display:none;">
+ <option value=""><?php echo __('Please select a region, state or province.') ?></option>
+ </select>
+ <input type="text" id="<?php echo $prefix ?>:region" name="<?php echo $prefix ?>[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo __('State/Province') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>" style="display:none;" />
+ </div>
+ </div>
+ </li>
+ <li class="fields">
+ <div class="field">
+ <label for="<?php echo $prefix ?>:postcode" class="required"><em>*</em><?php echo __('Zip/Postal Code') ?></label>
+ <div class="input-box">
+ <input type="text" title="<?php echo __('Zip/Postal Code') ?>" name="<?php echo $prefix ?>[postcode]" id="<?php echo $prefix ?>:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" />
+ </div>
+ </div>
+ <div class="field">
+ <label for="<?php echo $prefix ?>:country_id" class="required"><em>*</em><?php echo __('Country') ?></label>
+ <div class="input-box">
+ <?php echo $this->getCountryHtmlSelect($prefix) ?>
+ </div>
+ </div>
+ </li>
+ <li class="fields">
+ <div class="field">
+ <label for="<?php echo $prefix ?>:telephone" class="required"><em>*</em><?php echo __('Telephone') ?></label>
+ <div class="input-box">
+ <input type="text" name="<?php echo $prefix ?>[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo __('Telephone') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>" id="<?php echo $prefix ?>:telephone" />
+ </div>
+ </div>
+ <div class="field">
+ <label for="<?php echo $prefix ?>:fax"><?php echo __('Fax') ?></label>
+ <div class="input-box">
+ <input type="text" name="<?php echo $prefix ?>[fax]" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo __('Fax') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>" id="<?php echo $prefix ?>:fax" />
+ </div>
+ </div>
+ </li>
+ <?php echo $this->getChildHtml('form.additional.info'); ?>
+ <?php if ($this->getShowAsShippingCheckbox()): ?>
+ <li class="control">
+ <div class="field">
+ <div class="input-box">
+ <input type="checkbox" name="<?php echo $prefix ?>[as_shipping]" class="checkbox" value="1" title="<?php echo __('Same as shipping') ?>" id="<?php echo $prefix ?>:as_shipping" <?php if ($this->getAddress()->getSameAsBilling()):?>checked="checked"<?php endif;?>/>
+ </div>
+ <label for="<?php echo $prefix ?>:as_shipping"><?php echo __('Same as shipping') ?></label>
+ </div>
+ </li>
+ <?php endif; ?>
+ </ul>
+ </fieldset>
+ </li>
+ </ul>
+</fieldset>
+<script type="text/javascript">
+ (function($) {
+ head.js(
+ "<?php echo $this->getViewFileUrl('Magento_Checkout::js/region-updater.js') ?>",
+ "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
+ "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js') ?>",
+ "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
+ "<?php echo $this->getViewFileUrl('mage/validation/validation.js') ?>",
+ function() {
+ $('#<?php echo $prefix ?>\\:country_id').regionUpdater({
+ optionalRegionAllowed: <?php echo ($this->getConfig('general/region/display_all') ? 'true' : 'false'); ?>,
+ regionListId: '#<?php echo $prefix ?>\\:region_id',
+ regionInputId: '#<?php echo $prefix ?>\\:region',
+ postcodeId: '#<?php echo $prefix ?>\\:postcode',
+ regionJson: <?php echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
+ defaultRegion: "<?php echo $this->getAddress()->getRegionId() ?>",
+ countriesWithOptionalZip: <?php echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
+ });
+ });
+ })(jQuery);
+</script>
diff --git a/app/design/frontend/magento_plushe/Magento_Paypal/express/review/details.phtml b/app/design/frontend/magento_backup/Magento_Paypal/express/review/details.phtml
similarity index 56%
rename from app/design/frontend/magento_plushe/Magento_Paypal/express/review/details.phtml
rename to app/design/frontend/magento_backup/Magento_Paypal/express/review/details.phtml
index 51706067751..f6da6571d36 100644
--- a/app/design/frontend/magento_plushe/Magento_Paypal/express/review/details.phtml
+++ b/app/design/frontend/magento_backup/Magento_Paypal/express/review/details.phtml
@@ -28,21 +28,29 @@
* @see \Magento\Paypal\Block\Express\Review\Details
*/
?>
-<table id="details-table" class="data table paypal review items">
+<table id="details-table" class="data-table">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): $colspan = $rowspan = 2; else: $colspan = $rowspan = 1; endif; ?>
+ <col />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
+ <col width="1" />
+ <col width="1" />
+ <?php endif; ?>
<thead>
<tr>
- <th rowspan="<?php echo $rowspan ?>" class="col name"><?php echo __('Product Name') ?></th>
- <th colspan="<?php echo $colspan ?>" class="col price"><?php echo __('Price') ?></th>
- <th rowspan="<?php echo $rowspan ?>" class="col qty"><?php echo __('Qty') ?></th>
- <th colspan="<?php echo $colspan ?>" class="col subtotal"><?php echo __('Subtotal') ?></th>
+ <th rowspan="<?php echo $rowspan ?>"><?php echo __('Product Name') ?></th>
+ <th colspan="<?php echo $colspan ?>" class="a-center"><?php echo __('Price') ?></th>
+ <th rowspan="<?php echo $rowspan ?>" class="a-center"><?php echo __('Qty') ?></th>
+ <th colspan="<?php echo $colspan ?>" class="a-center"><?php echo __('Subtotal') ?></th>
</tr>
<?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
<tr>
- <th class="col price excl tax"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(false) ?></th>
- <th class="col price incl tax"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(true) ?></th>
- <th class="col subtotal excl tax"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(false) ?></th>
- <th class="col subtotal incl tax"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(true) ?></th>
+ <th class="a-right"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(false) ?></th>
+ <th><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(true) ?></th>
+ <th class="a-right"><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(false) ?></th>
+ <th><?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcTaxLabel(true) ?></th>
</tr>
<?php endif; ?>
</thead>
@@ -53,3 +61,4 @@
<?php endforeach ?>
</tbody>
</table>
+<script type="text/javascript">(function($) {$('#details-table').decorate('table')})(jQuery)</script>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/express/review/shipping/method.phtml b/app/design/frontend/magento_backup/Magento_Paypal/express/review/shipping/method.phtml
new file mode 100644
index 00000000000..f98d878c6ff
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/express/review/shipping/method.phtml
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+/** @var $this \Magento\Paypal\Block\Express\Review */
+?>
+<fieldset id="shipping-method-container">
+<?php if ($this->getCanEditShippingMethod() || !$this->getCurrentShippingRate()):?>
+ <?php if ($groups = $this->getShippingRateGroups()):?>
+ <?php $currentRate = $this->getCurrentShippingRate(); ?>
+ <select name="shipping_method" id="shipping_method" style="width:250px;" class="required-entry">
+ <?php if (!$currentRate):?>
+ <option value=""><?php echo __('Please select a shipping method.') ?></option>
+ <?php endif;?>
+ <?php foreach ($groups as $code => $rates):?>
+ <optgroup label="<?php echo $this->escapeHtml($this->getCarrierName($code)) ?>" style="font-style:normal;">
+ <?php foreach ($rates as $rate):?>
+ <option value="<?php echo $this->renderShippingRateValue($rate)?>"<?php echo ($currentRate === $rate) ? ' selected="selected"' : '' ;?>>
+ <?php echo $this->renderShippingRateOption($rate)?>
+ </option>
+ <?php endforeach;?>
+ </optgroup>
+ <?php endforeach;?>
+ </select>
+ <?php else: ?>
+ <p><strong><?php echo __('Sorry, no quotes are available for this order.') ?></strong></p>
+ <?php endif;?>
+<?php else: ?>
+ <p><strong><?php echo $this->renderShippingRateOption($this->getCurrentShippingRate())?></strong></p>
+<?php endif; ?>
+</fieldset>
+<div style="display:none" id="shipping_method_update"><p><?php echo __('Please update order data to get shipping methods and rates') ?></p></div>
diff --git a/app/design/frontend/magento_plushe/Magento_Paypal/express/shortcut.phtml b/app/design/frontend/magento_backup/Magento_Paypal/express/shortcut.phtml
similarity index 79%
rename from app/design/frontend/magento_plushe/Magento_Paypal/express/shortcut.phtml
rename to app/design/frontend/magento_backup/Magento_Paypal/express/shortcut.phtml
index 4f4a98cca34..e79714b90dc 100644
--- a/app/design/frontend/magento_plushe/Magento_Paypal/express/shortcut.phtml
+++ b/app/design/frontend/magento_backup/Magento_Paypal/express/shortcut.phtml
@@ -19,6 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
+ * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -28,30 +29,27 @@
* @var $this \Magento\Paypal\Block\Express\Shortcut
*/
?>
-<?php
-$labelPosition = '';
-if ($this->isOrPositionBefore()) {
-$labelPosition = ' before';
-} elseif ($this->isOrPositionAfter()) {
-$labelPosition = ' after';
-}
-?>
-
-<div data-label="or" class="paypal checkout <?php echo $labelPosition ?> paypal-logo">
+<p class="paypal-logo">
<?php $shortcutHtmlId = $this->getShortcutHtmlId() ?>
+ <?php if ($this->isOrPositionBefore()): ?>
+ <span class="paypal-or"><?php echo __('-OR-');?></span>
+ <?php endif; ?>
<input type="image" data-action="checkout-form-submit" data-checkout-url="<?php echo $this->getCheckoutUrl()?>"
src="<?php echo $this->getImageUrl()?>"
alt="<?php echo __('Checkout with PayPal');?>"
title="<?php echo __('Checkout with PayPal');?>"/>
+ <?php if ($this->isOrPositionAfter()): ?>
+ <span class="paypal-or"><?php echo __('-OR-');?></span>
+ <?php endif; ?>
<?php if ($this->getConfirmationUrl() || $this->getIsInCatalogProduct()): ?>
- <?php if ($this->getIsInCatalogProduct()): ?>
- <input type="hidden" id="pp-checkout-url" name="return_url" value=""/>
+ <?php if ($this->getIsInCatalogProduct()): ?>
+ <input type="hidden" id="pp-checkout-url" name="return_url" value=""/>
<?php endif; ?>
- <?php
- $confirmationUrl = $this->getConfirmationUrl();
- $isInCatalogProduct = $this->getIsInCatalogProduct();
-endif; ?>
+ <?php
+ $confirmationUrl = $this->getConfirmationUrl();
+ $isInCatalogProduct = $this->getIsInCatalogProduct();
+ endif; ?>
<script type="text/javascript">
(function($) {
head.js(
@@ -67,4 +65,4 @@ endif; ?>
});
})(jQuery);
</script>
-</div>
\ No newline at end of file
+</p>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/hss/form.phtml b/app/design/frontend/magento_backup/Magento_Paypal/hss/form.phtml
new file mode 100644
index 00000000000..e67b386db86
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/hss/form.phtml
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+
+/**
+ * @see \Magento\Paypal\Block\Payflow\Link\Iframe
+ */
+?>
+<html>
+<head>
+ <script type="text/javascript" src="<?php echo $this->getViewFileUrl('jquery/jquery.js')?>"></script>
+</head>
+<body>
+ <form id="token_form" method="POST" action="<?php echo $this->getTransactionUrl() ?>">
+ <input type="hidden" name="SECURETOKEN" value="<?php echo $this->getSecureToken(); ?>" />
+ <input type="hidden" name="SECURETOKENID" value="<?php echo $this->getSecureTokenId(); ?>" />
+ <input type="hidden" name="MODE" value="<?php echo $this->isTestMode() ? 'TEST' : 'LIVE'; ?>" />
+ </form>
+ <script type="text/javascript">
+ // this is NOT tested.
+ jQuery('#token_form').submit();
+ </script>
+</body>
+</html>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/hss/iframe.phtml b/app/design/frontend/magento_backup/Magento_Paypal/hss/iframe.phtml
new file mode 100644
index 00000000000..7c3aa2dfe57
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/hss/iframe.phtml
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+
+?>
+<div id="iframe-warning" class="warning-message">
+ <?php echo __('Please do not refresh the page until you complete payment.') ?>
+</div>
+<iframe id="hss-iframe" data-container="paypal-iframe" class="no-display" scrolling="no" frameborder="0" border="0" src="<?php echo $this->getFrameActionUrl() ?>" height="610" width="570"></iframe>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/hss/info.phtml b/app/design/frontend/magento_backup/Magento_Paypal/hss/info.phtml
new file mode 100644
index 00000000000..7fffe8e2647
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/hss/info.phtml
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+
+/**
+ * @see \Magento\Paypal\Block\Payflow\Link\Info
+ */
+?>
+<ul id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none" class="form-list">
+ <li>
+ <?php echo __('You will be required to enter your payment details after you place an order.') ?>
+ </li>
+</ul>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/hss/js.phtml b/app/design/frontend/magento_backup/Magento_Paypal/hss/js.phtml
new file mode 100644
index 00000000000..9a0408fe524
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/hss/js.phtml
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+
+/**
+ * @see \Magento\Paypal\Block\Iframe
+ */
+?>
+<div id="checkout-paypaliframe-load" class="authentication"></div>
+
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/hss/redirect.phtml b/app/design/frontend/magento_backup/Magento_Paypal/hss/redirect.phtml
new file mode 100644
index 00000000000..1816db2ed47
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/hss/redirect.phtml
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+
+/**
+ * @see \Magento\Paypal\Block\Iframe
+ */
+?>
+<html>
+<head>
+ <script type="text/javascript" src="<?php echo $this->getViewFileUrl('jquery/jquery.js')?>"></script>
+</head>
+<body>
+ <script type="text/javascript">
+ // this code is NOT tested!
+ if (window.top == window.self) {
+ window.location = "<?php echo $this->getUrl('checkout/cart') ?>";
+ }
+ <?php if ($this->getGotoSection()): ?>
+ parent.jQuery.each(parent.jQuery('[id^="opc-"]'), function() {
+ var step = parent.jQuery(this).attr('id').substring(4);
+ if (step === '<?php echo $this->getGotoSection() ?>') {
+ return;
+ }
+ step.addClass('allow');
+ });
+ parent.jQuery('#checkoutSteps').trigger('gotoSection', '<?php echo $this->getGotoSection() ?>');
+ parent.jQuery('#checkout-review-submit').show();
+ parent.jQuery('#iframe-warning').hide();
+ <?php if ($this->getErrorMsg()): ?>
+ alert('<?php echo $this->getErrorMsg() ?>');
+ <?php endif; ?>
+ <?php elseif ($this->getGotoSuccessPage()) : ?>
+ window.top.location = "<?php echo $this->getUrl('checkout/onepage/success') ?>";
+ <?php else : ?>
+ window.top.location = "<?php echo $this->getUrl('checkout/cart') ?>";
+ <?php endif; ?>
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/hss/review/button.phtml b/app/design/frontend/magento_backup/Magento_Paypal/hss/review/button.phtml
new file mode 100644
index 00000000000..19163379e1a
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/hss/review/button.phtml
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<button type="submit" data-role="review-save" title="<?php echo __('Continue') ?>" class="button btn-checkout"><span><span><?php echo __('Continue') ?></span></span></button>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/js/paypal-checkout.js b/app/design/frontend/magento_backup/Magento_Paypal/js/paypal-checkout.js
new file mode 100644
index 00000000000..c04d8b80e48
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/js/paypal-checkout.js
@@ -0,0 +1,50 @@
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category CE
+ * @package CE_Paypal
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+/*jshint browser:true jquery:true*/
+(function($, window) {
+ "use strict";
+ $.widget('mage.paypalCheckout', {
+ /**
+ * Initialize store credit events
+ * @private
+ */
+ _create: function() {
+ this.element.on('click', '[data-action="checkout-form-submit"]', $.proxy(function(e) {
+ var returnUrl = $(e.target).data('checkout-url');
+ if (this.options.confirmUrl && this.options.confirmMessage) {
+ if (window.confirm(this.options.confirmMessage)) {
+ returnUrl = this.options.confirmUrl;
+ }
+ }
+ if (this.options.isCatalogProduct) {
+ $(this.options.paypalCheckoutSelector).val(returnUrl);
+ $(this.options.productAddToCartForm).submit();
+ } else {
+ $.mage.redirect(returnUrl);
+ }
+ }, this));
+ }
+ });
+})(jQuery, window);
\ No newline at end of file
diff --git a/app/design/frontend/magento_plushe/Magento_Paypal/layout/override/catalog_product_view.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/SHORTCUT_popup.xml
similarity index 77%
rename from app/design/frontend/magento_plushe/Magento_Paypal/layout/override/catalog_product_view.xml
rename to app/design/frontend/magento_backup/Magento_Paypal/layout/override/SHORTCUT_popup.xml
index 5f06f13a7ce..9b50d93483b 100644
--- a/app/design/frontend/magento_plushe/Magento_Paypal/layout/override/catalog_product_view.xml
+++ b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/SHORTCUT_popup.xml
@@ -24,19 +24,16 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="product.info.addtocart">
- <container name="product.info.addtocart.paypal.wrapper" label="PayPal Express Checkout Shortcut Wrapper">
+ <referenceBlock name="product.tooltip">
+ <container name="product.info.addtocart.paypal.wrapper" label="PayPal Express Checkout Shortcut Wrapper" htmlTag="div">
<block class="Magento\Paypal\Block\Express\Shortcut" name="product.info.addtocart.paypal" template="express/shortcut.phtml">
<action method="setIsInCatalogProduct">
<argument name="value" xsi:type="string">1</argument>
</action>
+ <action method="setShowOrPosition">
+ <argument name="value" xsi:type="string">after</argument>
+ </action>
</block>
</container>
</referenceBlock>
- <update handle="SHORTCUT_popup"/>
- <referenceContainer name="right">
- <block class="Magento\Paypal\Block\Logo" name="paypal.partner.right.logo" template="partner/logo.phtml">
- <!--action method="setLogoType"><value>wePrefer_150x60</value></action-->
- </block>
- </referenceContainer>
</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/catalog_category_view.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/catalog_category_view.xml
new file mode 100644
index 00000000000..d44e594ae0f
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/catalog_category_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <update handle="SHORTCUT_popup"/>
+ <referenceContainer name="right">
+ <block class="Magento\Paypal\Block\Logo" name="paypal.partner.right.logo" template="partner/logo.phtml"/>
+ </referenceContainer>
+</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Paypal/layout/override/default.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_cart_index.xml
similarity index 64%
rename from app/design/frontend/magento_plushe/Magento_Paypal/layout/override/default.xml
rename to app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_cart_index.xml
index 78c6f1d1ccc..4b92177880b 100644
--- a/app/design/frontend/magento_plushe/Magento_Paypal/layout/override/default.xml
+++ b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_cart_index.xml
@@ -24,10 +24,19 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="topCart.extra_actions">
- <block class="Magento\Paypal\Block\Express\Shortcut" name="paypal.partner.top_cart.shortcut" template="express/shortcut.phtml"/>
+ <referenceContainer name="checkout.cart.top_methods">
+ <block class="Magento\Paypal\Block\Express\Shortcut" name="checkout.cart.methods.paypal_express.top" before="-" template="express/shortcut.phtml">
+ <action method="setIsQuoteAllowed">
+ <argument name="value" xsi:type="string">1</argument>
+ </action>
+ </block>
</referenceContainer>
- <referenceContainer name="cart_sidebar.extra_actions">
- <block class="Magento\Paypal\Block\Express\Shortcut" name="paypal.partner.cart_sidebar.shortcut" template="express/shortcut.phtml"/>
+ <referenceContainer name="checkout.cart.methods">
+ <block class="Magento\Paypal\Block\Express\Shortcut" name="checkout.cart.methods.paypal_express.bottom" before="-" template="express/shortcut.phtml">
+ <action method="setIsQuoteAllowed">
+ <argument name="value" xsi:type="string">1</argument>
+ </action>
+ </block>
</referenceContainer>
+ <update handle="SHORTCUT_popup"/>
</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/layout/override/default.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_onepage_review.xml
similarity index 65%
rename from app/design/frontend/magento_plushe/Magento_Sales/layout/override/default.xml
rename to app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_onepage_review.xml
index f62b5835f3f..3ba25aeacbd 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/layout/override/default.xml
+++ b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_onepage_review.xml
@@ -24,15 +24,15 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="right">
- <block class="Magento\Sales\Block\Reorder\Sidebar" name="sale.reorder.sidebar" as="reorder" template="reorder/sidebar.phtml"/>
+ <referenceContainer name="checkout.onepage.review.info.items.after">
+ <block class="Magento\Paypal\Block\Iframe" name="paypal.iframe"/>
</referenceContainer>
- <referenceBlock name="footer_links">
- <block class="Magento\Sales\Block\Guest\Link" name="sales-guest-form-link">
- <arguments>
- <argument name="label" xsi:type="string">Orders and Returns</argument>
- <argument name="href" xsi:type="string">sales/guest/form</argument>
- </arguments>
- </block>
+ <referenceBlock name="checkout.onepage.review.button">
+ <action method="setTemplate">
+ <argument name="template" xsi:type="helper" helper="Magento\Paypal\Helper\Hss::getReviewButtonTemplate">
+ <param name="name">Magento_Paypal::hss/review/button.phtml</param>
+ <param name="block">checkout.onepage.review.button</param>
+ </argument>
+ </action>
</referenceBlock>
</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_onepage_success.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_onepage_success.xml
new file mode 100644
index 00000000000..aa84f501748
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_onepage_success.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <update handle="SHORTCUT_popup"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/cms_index_index.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/cms_index_index.xml
new file mode 100644
index 00000000000..7e227409019
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/cms_index_index.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="right">
+ <block class="Magento\Paypal\Block\Logo" name="paypal.partner.right.logo" template="partner/logo.phtml"/>
+ </referenceContainer>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_express_review.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_express_review.xml
new file mode 100644
index 00000000000..1abdcc25f33
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_express_review.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="PayPal Express Order Review Form" type="page">
+ <referenceBlock name="root">
+ <action method="setTemplate">
+ <argument name="template" xsi:type="string">1column.phtml</argument>
+ </action>
+ </referenceBlock>
+ <referenceContainer name="content">
+ <block class="Magento\Paypal\Block\Express\Review" name="paypal.express.review" template="express/review.phtml">
+ <block class="Magento\Paypal\Block\Express\Review\Billing" name="express.review.billing" as="billing" template="express/review/address.phtml"/>
+ <block class="Magento\Paypal\Block\Express\Review\Shipping" name="express.review.shipping" as="shipping" template="express/review/address.phtml"/>
+ <block class="Magento\Paypal\Block\Express\Review" name="express.review.shipping.method" as="shipping_method" template="express/review/shipping/method.phtml"/>
+ <block class="Magento\Paypal\Block\Express\Review\Details" name="paypal.express.review.details" as="details" template="express/review/details.phtml">
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals" as="totals" template="onepage/review/totals.phtml"/>
+ </block>
+ <block class="Magento\Checkout\Block\Agreements" name="paypal.express.review.details.agreements" as="agreements" template="onepage/agreements.phtml"/>
+ </block>
+ </referenceContainer>
+ <container name="additional.product.info" label="Additional Product Info"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_express_review_details.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_express_review_details.xml
new file mode 100644
index 00000000000..6de51a8c3a0
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_express_review_details.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <block class="Magento\Paypal\Block\Express\Review\Details" output="1" name="paypal.express.review.details" template="express/review/details.phtml">
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals" as="totals" template="onepage/review/totals.phtml"/>
+ </block>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_hostedpro_cancel.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_hostedpro_cancel.xml
new file mode 100644
index 00000000000..bcdd5b3d58a
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_hostedpro_cancel.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Hosted Pro Frame" type="page">
+ <block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
+ <block class="Magento\Paypal\Block\Hosted\Pro\Iframe" name="hosted.pro.iframe" template="hss/redirect.phtml"/>
+ </block>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_cancelpayment.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_cancelpayment.xml
new file mode 100644
index 00000000000..9b96ede33cb
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_cancelpayment.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Payflow Cancel Payment" type="page">
+ <block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
+ <block class="Magento\Paypal\Block\Payflow\Link\Iframe" name="payflow.link.iframe" template="payflowlink/redirect.phtml"/>
+ </block>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_form.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_form.xml
new file mode 100644
index 00000000000..47df5abbee0
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_form.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Payflow Form" type="page">
+ <block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
+ <block class="Magento\Paypal\Block\Payflow\Link\Iframe" name="payflow.link.iframe" template="payflowlink/form.phtml"/>
+ </block>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_returnurl.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_returnurl.xml
new file mode 100644
index 00000000000..817f34824aa
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_returnurl.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Payflow Return URL" type="page">
+ <block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
+ <block class="Magento\Paypal\Block\Payflow\Link\Iframe" name="payflow.link.iframe" template="payflowlink/redirect.phtml"/>
+ </block>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_cancelpayment.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_cancelpayment.xml
new file mode 100644
index 00000000000..ec688ce2f1c
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_cancelpayment.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Payflow Advanced Cancel Payment" type="page">
+ <block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
+ <block class="Magento\Paypal\Block\Payflow\Advanced\Iframe" name="payflow.advanced.iframe" template="payflowadvanced/redirect.phtml"/>
+ </block>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_form.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_form.xml
new file mode 100644
index 00000000000..20dc05ce077
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_form.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Payflow Advanced Form" type="page">
+ <block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
+ <block class="Magento\Paypal\Block\Payflow\Advanced\Iframe" name="payflow.advanced.iframe" template="payflowadvanced/form.phtml"/>
+ </block>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_returnurl.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_returnurl.xml
new file mode 100644
index 00000000000..fcf21c97f04
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_returnurl.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Paypal Payflow Advanced Return URL" type="page">
+ <block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
+ <block class="Magento\Paypal\Block\Payflow\Advanced\Iframe" name="payflow.advanced.iframe" template="payflowadvanced/redirect.phtml"/>
+ </block>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_standard_redirect.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_standard_redirect.xml
new file mode 100644
index 00000000000..e0e8e47f62a
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_standard_redirect.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <block class="Magento\Paypal\Block\Standard\Redirect" output="1" name="standard.redirect"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/review_product_list.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/review_product_list.xml
new file mode 100644
index 00000000000..aa84f501748
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/review_product_list.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <update handle="SHORTCUT_popup"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/tag_customer_view.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/tag_customer_view.xml
new file mode 100644
index 00000000000..aa84f501748
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/tag_customer_view.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <update handle="SHORTCUT_popup"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/tag_product_list.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/tag_product_list.xml
new file mode 100644
index 00000000000..aa84f501748
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/tag_product_list.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <update handle="SHORTCUT_popup"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/wishlist_index_index.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/wishlist_index_index.xml
new file mode 100644
index 00000000000..aa84f501748
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/wishlist_index_index.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <update handle="SHORTCUT_popup"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/order-review.js b/app/design/frontend/magento_backup/Magento_Paypal/order-review.js
new file mode 100644
index 00000000000..9b1446f7baf
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/order-review.js
@@ -0,0 +1,305 @@
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category PayPal Express
+ * @package Mage
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+/*jshint browser:true jquery:true*/
+/*global alert*/
+(function($) {
+ "use strict";
+
+ $.widget('mage.orderReview', {
+ options: {
+ orderReviewSubmitSelector: '#review-button',
+ shippingSelector: '#shipping_method',
+ shippingSubmitFormSelector: null,
+ updateOrderSelector: '#update-order',
+ billingAsShippingSelector: '#billing\\:as_shipping',
+ updateContainerSelector: '#details-reload',
+ waitLoadingContainer: '#review-please-wait',
+ shippingMethodContainer: '#shipping-method-container',
+ isAjax: false,
+ updateShippingMethodSubmitSelector: "#update-shipping-method-submit",
+ reviewSubmitSelector: "#review-submit",
+ shippingMethodUpdateUrl: null,
+ updateOrderSubmitUrl: null
+ },
+
+ /**
+ * Widget instance properties
+ */
+ triggerPropertyChange: true,
+ isShippingSubmitForm: false,
+
+ _create: function() {
+ //change handler for ajaxEnabled
+ if (this.options.isAjax) {
+ this._submitOrder = this._ajaxSubmitOrder;
+ }
+
+ this.element.on('click', this.options.orderReviewSubmitSelector, $.proxy(this._submitOrder, this))
+ .on('click', this.options.billingAsShippingSelector, $.proxy(this._shippingTobilling, this))
+ .on('change', this.options.shippingSelector, $.proxy(this._submitUpdateOrder, this, this.options.updateOrderSubmitUrl, this.options.updateContainerSelector))
+ .find(this.options.updateOrderSelector).on('click', $.proxy(this._updateOrderHandler, this)).end()
+ .find(this.options.updateShippingMethodSubmitSelector).hide().end()
+ .find(this.options.reviewSubmitSelector).hide();
+ this._shippingTobilling();
+ if ($(this.options.shippingSubmitFormSelector).length) {
+ this.isShippingSubmitForm = true;
+ $(this.options.shippingSubmitFormSelector).find(this.options.updateShippingMethodSubmitSelector).hide().end()
+ .on('change',
+ this.options.shippingSelector, $.proxy(this._submitUpdateOrder, this, $(this.options.shippingSubmitFormSelector).prop('action'), this.options.updateContainerSelector));
+ this._updateOrderSubmit(!$(this.options.shippingSubmitFormSelector).find(this.options.shippingSelector).val());
+ } else {
+ this.element.on('input propertychange', ":input[name]", $.proxy(this._updateOrderSubmit, this, true, this._onShippingChange))
+ .find('select').not(this.options.shippingSelector).on('change', this._propertyChange);
+ this._updateOrderSubmit(!this.element.find(this.options.shippingSelector).val());
+ }
+
+ },
+
+ /**
+ * show ajax loader
+ */
+ _ajaxBeforeSend: function() {
+ this.element.find(this.options.waitLoadingContainer).show();
+ },
+
+ /**
+ * hide ajax loader
+ */
+ _ajaxComplete: function() {
+ this.element.find(this.options.waitLoadingContainer).hide();
+ },
+
+ /**
+ * trigger propertychange for input type select
+ */
+ _propertyChange: function() {
+ $(this).trigger('propertychange');
+ },
+
+ /**
+ * trigger change for the update of shippping methods from server
+ */
+ _updateOrderHandler: function() {
+ $(this.options.shippingSelector).trigger('change');
+ },
+
+ /**
+ * Attempt to submit order
+ */
+ _submitOrder: function() {
+ if (this._validateForm()) {
+ this.element.find(this.options.updateOrderSelector).fadeTo(0, 0.5)
+ .end().find(this.options.waitLoadingContainer).show()
+ .end().submit();
+ }
+ this._updateOrderSubmit(true);
+ },
+
+ /**
+ * Attempt to ajax submit order
+ */
+ _ajaxSubmitOrder: function() {
+ if (this.element.find(this.options.waitLoadingContainer).is(":visible")) {
+ return false;
+ }
+ $.ajax({
+ url: this.element.prop('action'),
+ type: 'post',
+ context: this,
+ data: {isAjax: 1},
+ dataType: 'json',
+ beforeSend: this._ajaxBeforeSend,
+ complete: this._ajaxComplete,
+ success: function(response) {
+ if ($.type(response) === 'object' && !$.isEmptyObject(response)) {
+ if (response.error_messages) {
+ this._ajaxComplete();
+ var msg = response.error_messages;
+ if (msg) {
+ if ($.type(msg) === 'array') {
+ msg = msg.join("\n");
+ }
+ }
+ alert($.mage.__(msg));
+ return false;
+ }
+ if (response.redirect) {
+ $.mage.redirect(response.redirect);
+ return false;
+ }
+ else if (response.success) {
+ $.mage.redirect(this.options.successUrl);
+ return false;
+ }
+ this._ajaxComplete();
+ alert($.mage.__('Sorry, something went wrong.'));
+ }
+ },
+ error: function() {
+ alert($.mage.__('Sorry, something went wrong. Please try again later.'));
+ this._ajaxComplete();
+ }
+ });
+ },
+
+ /**
+ * Validate Order form
+ */
+ _validateForm: function() {
+ if (this.element.data('validation')) {
+ return this.element.validation().valid();
+ }
+ },
+
+ /**
+ * Check/Set whether order can be submitted
+ * Also disables form submission element, if any
+ * @param shouldDisable - whether should prevent order submission explicitly
+ * @param optional function for shipping change handler
+ * @param optional if true the property change will be set to true
+ */
+ _updateOrderSubmit: function(shouldDisable, fn) {
+ this._toggleButton(this.options.orderReviewSubmitSelector, shouldDisable);
+ if ($.type(fn) === 'function') {
+ fn.call(this);
+ }
+ },
+
+ /**
+ * Enable/Disable button
+ * @param button button selector to be toggled
+ * @param disable boolean for toggling
+ */
+ _toggleButton: function(button, disable) {
+ $(button).prop({"disabled": disable}).toggleClass('no-checkout', disable).fadeTo(0, disable ? 0.5 : 1);
+ },
+
+ /**
+ * Copy element value from shipping to billing address
+ * @param e optional
+ */
+ _shippingTobilling: function(e) {
+ if (this.options.shippingSubmitFormSelector) {
+ return false;
+ }
+ var isChecked = $(this.options.billingAsShippingSelector).is(':checked'),
+ opacity = isChecked ? 0.5 : 1;
+ if (isChecked) {
+ this.element.validation("clearError", ':input[name^="billing"]');
+ }
+ $(':input[name^="shipping"]', this.element).each($.proxy(function(key, value) {
+ var fieldObj = $(value.id.replace('shipping:', '#billing\\:'));
+ if (isChecked) {
+ fieldObj = fieldObj.val($(value).val());
+ }
+ fieldObj.prop({"readonly": isChecked, "disabled": isChecked}).fadeTo(0, opacity);
+ if (fieldObj.is("select")) {
+ this.triggerPropertyChange = false;
+ fieldObj.trigger('change');
+ }
+ }, this));
+ if (isChecked || e) {
+ this._updateOrderSubmit(true);
+ }
+ this.triggerPropertyChange = true;
+ },
+
+ /**
+ * Dispatch an ajax request of Update Order submission
+ * @param url - url where to submit shipping method
+ * @param resultId - id of element to be updated
+ */
+ _submitUpdateOrder: function(url, resultId) {
+ if (this.element.find(this.options.waitLoadingContainer).is(":visible")) {
+ return false;
+ }
+ var isChecked = $(this.options.billingAsShippingSelector).is(':checked'),
+ formData = null,
+ callBackResponseHandler = null,
+ shippingMethod = $.trim($(this.options.shippingSelector).val());
+ this._shippingTobilling();
+ if (url && resultId && this._validateForm() && shippingMethod) {
+ this._updateOrderSubmit(true);
+ this._toggleButton(this.options.updateOrderSelector, true);
+ // form data and callBack updated based on the shippping Form element
+ if (this.isShippingSubmitForm) {
+ formData = $(this.options.shippingSubmitFormSelector).serialize() + "&isAjax=true";
+ callBackResponseHandler = function(response) {
+ $(resultId).html(response);
+ this._updateOrderSubmit(false);
+ this._ajaxComplete();
+ };
+ } else {
+ formData = this.element.serialize() + "&isAjax=true";
+ callBackResponseHandler = function(response) {
+ $(resultId).html(response);
+ this._ajaxShippingUpdate(shippingMethod);
+ };
+ }
+ if (isChecked) {
+ $(this.options.shippingSelect).prop('disabled', true);
+ }
+ $.ajax({
+ url: url,
+ type: 'post',
+ context: this,
+ beforeSend: this._ajaxBeforeSend,
+ data: formData,
+ success: callBackResponseHandler
+ });
+ }
+ },
+
+ /**
+ * Update Shipping Methods Element from server
+ * @param shippingMethod
+ */
+ _ajaxShippingUpdate: function(shippingMethod) {
+ $.ajax({
+ url: this.options.shippingMethodUpdateUrl,
+ data: {isAjax: true, shipping_method: shippingMethod},
+ type: 'post',
+ context: this,
+ success: function(response) {
+ $(this.options.shippingMethodContainer).parent().html(response);
+ this._toggleButton(this.options.updateOrderSelector, false);
+ this._updateOrderSubmit(false);
+ },
+ complete: this._ajaxComplete
+ }
+ );
+ },
+
+ /**
+ * Actions on change Shipping Address data
+ */
+ _onShippingChange: function() {
+ if (this.triggerPropertyChange && $.trim($(this.options.shippingSelector).val())) {
+ this.element.find(this.options.shippingSelector).hide().end()
+ .find(this.options.shippingSelector + '_update').show();
+ }
+ }
+ });
+})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/partner/logo.phtml b/app/design/frontend/magento_backup/Magento_Paypal/partner/logo.phtml
new file mode 100644
index 00000000000..8980cad2e42
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/partner/logo.phtml
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * @see \Magento\Paypal\Block\Logo
+ */
+?>
+<div class="paypal-logo">
+ <a href="#" title="<?php echo __('Additional Options') ?>" onclick="javascript:window.open('<?php echo $this->getAboutPaypalPageUrl() ?>','paypal','width=600,height=350,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'); return false;"><img src="<?php echo $this->escapeHtml($this->getLogoImageUrl()) ?>" alt="<?php echo __('Additional Options') ?>" title="<?php echo __('Additional Options') ?>" /></a>
+</div>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/form.phtml b/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/form.phtml
new file mode 100644
index 00000000000..e458fcf9c59
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/form.phtml
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+
+/**
+ * @var $this \Magento\Paypal\Block\Payflow\Advanced\Iframe
+ */
+?>
+<html>
+<head>
+ <script type="text/javascript" src="<?php echo $this->getViewFileUrl('jquery/jquery.js')?>"></script>
+</head>
+<body>
+ <form id="token_form" method="POST" action="<?php echo $this->getTransactionUrl() ?>">
+ <input type="hidden" name="SECURETOKEN" value="<?php echo $this->getSecureToken(); ?>" />
+ <input type="hidden" name="SECURETOKENID" value="<?php echo $this->getSecureTokenId(); ?>" />
+ <input type="hidden" name="MODE" value="<?php echo $this->isTestMode() ? 'TEST' : 'LIVE'; ?>" />
+ </form>
+ <script type="text/javascript">
+ // this is NOT tested.
+ jQuery('#token_form').submit();
+ </script>
+</body>
+</html>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/iframe.phtml b/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/iframe.phtml
new file mode 100644
index 00000000000..800b4f167a0
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/iframe.phtml
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+/** @var $this \Magento\Paypal\Block\Payflow\Advanced\Form */
+?>
+<div id="iframe-warning" class="warning-message">
+ <?php echo __('Please do not refresh the page until you complete payment.') ?>
+</div>
+<iframe id="payflow-advanced-iframe" data-container="paypal-iframe" class="no-display" scrolling="no" frameborder="0" border="0" src="<?php echo $this->getFrameActionUrl() ?>" height="610" width="570"></iframe>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/info.phtml b/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/info.phtml
new file mode 100644
index 00000000000..e281cce7906
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/info.phtml
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+
+/**
+ * @var $this \Magento\Paypal\Block\Payflow\Advanced\Form
+ */
+?>
+<ul id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none" class="form-list">
+ <li>
+ <?php echo __('You will be required to enter your payment details after you place an order.') ?>
+ </li>
+</ul>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/redirect.phtml b/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/redirect.phtml
new file mode 100644
index 00000000000..caf7a3ea339
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/redirect.phtml
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+
+/**
+ * @var $this \Magento\Paypal\Block\Payflow\Advanced\Iframe
+ */
+?>
+<html>
+<head>
+ <script type="text/javascript" src="<?php echo $this->getViewFileUrl('jquery/jquery.js')?>"></script>
+</head>
+<body>
+ <script type="text/javascript">
+ if (window.top == window.self) {
+ window.location = "<?php echo $this->getUrl('checkout/cart') ?>";
+ }
+ <?php if ($this->getGotoSection()): ?>
+ var steps = [];
+ try{
+ steps = parent.jQuery('[id^="opc-"]');
+ }catch(e){
+ window.top.location="<?php echo $this->getUrl('checkout/cart') ?>";
+ }
+ parent.jQuery.each(steps, function() {
+ var step = parent.jQuery(this).attr('id').substring(4);
+ if (step === '<?php echo $this->getGotoSection() ?>') {
+ return;
+ }
+ parent.jQuery(this).addClass('allow');
+ });
+ parent.jQuery('#checkoutSteps').trigger('gotoSection', '<?php echo $this->getGotoSection() ?>');
+ parent.jQuery('#checkout-review-submit').show();
+ parent.jQuery('#iframe-warning').hide();
+ <?php if ($this->getErrorMsg()): ?>
+ alert('<?php echo $this->getErrorMsg() ?>');
+ <?php endif; ?>
+ <?php elseif ($this->getGotoSuccessPage()) : ?>
+ window.top.location = "<?php echo $this->getUrl('checkout/onepage/success') ?>";
+ <?php else : ?>
+ window.top.location = "<?php echo $this->getUrl('checkout/cart') ?>";
+ <?php endif; ?>
+ </script>
+ </body>
+</html>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/form.phtml b/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/form.phtml
new file mode 100644
index 00000000000..e67b386db86
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/form.phtml
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+
+/**
+ * @see \Magento\Paypal\Block\Payflow\Link\Iframe
+ */
+?>
+<html>
+<head>
+ <script type="text/javascript" src="<?php echo $this->getViewFileUrl('jquery/jquery.js')?>"></script>
+</head>
+<body>
+ <form id="token_form" method="POST" action="<?php echo $this->getTransactionUrl() ?>">
+ <input type="hidden" name="SECURETOKEN" value="<?php echo $this->getSecureToken(); ?>" />
+ <input type="hidden" name="SECURETOKENID" value="<?php echo $this->getSecureTokenId(); ?>" />
+ <input type="hidden" name="MODE" value="<?php echo $this->isTestMode() ? 'TEST' : 'LIVE'; ?>" />
+ </form>
+ <script type="text/javascript">
+ // this is NOT tested.
+ jQuery('#token_form').submit();
+ </script>
+</body>
+</html>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/iframe.phtml b/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/iframe.phtml
new file mode 100644
index 00000000000..81294e08878
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/iframe.phtml
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+/** @var $this \Magento\Paypal\Block\Payflow\Link\Form */
+?>
+<div id="iframe-warning" class="warning-message">
+ <?php echo __('Please do not refresh the page until you complete payment.') ?>
+</div>
+<iframe id="payflow-link-iframe" data-container="paypal-iframe" class="no-display" scrolling="no" frameborder="0" border="0" src="<?php echo $this->getFrameActionUrl() ?>" height="610" width="570"></iframe>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/info.phtml b/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/info.phtml
new file mode 100644
index 00000000000..39cd781e790
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/info.phtml
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+
+/**
+ * @var $this \Magento\Paypal\Block\Payflow\Link\Form
+ */
+?>
+<ul id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none" class="form-list">
+ <li>
+ <?php echo __('You will be required to enter your payment details after you place an order.') ?>
+ </li>
+</ul>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/redirect.phtml b/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/redirect.phtml
new file mode 100644
index 00000000000..72c0ea59bbd
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/redirect.phtml
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+
+/**
+ * @var $this \Magento\Paypal\Block\Payflow\Link\Iframe
+ */
+?>
+<html>
+<head>
+</head>
+<body>
+<script type="text/javascript">
+ if (window.top == window.self) {
+ window.location = "<?php echo $this->getUrl('checkout/cart') ?>";
+ }
+ <?php if ($this->getGotoSection()): ?>
+ var steps = [];
+ try{
+ steps = parent.jQuery('[id^="opc-"]');
+ }catch(e){
+ window.top.location = "<?php echo $this->getUrl('checkout/cart') ?>";
+ }
+ parent.jQuery.each(steps, function() {
+ var step = parent.jQuery(this).attr('id').substring(4);
+ if (step === '<?php echo $this->getGotoSection() ?>') {
+ return;
+ }
+ parent.jQuery(this).addClass('allow');
+ });
+ parent.jQuery('#checkoutSteps').trigger('gotoSection', '<?php echo $this->getGotoSection() ?>');
+ parent.jQuery('#checkout-review-submit').show();
+ parent.jQuery('#iframe-warning').hide();
+ <?php if ($this->getErrorMsg()): ?>
+ alert('<?php echo $this->getErrorMsg() ?>');
+ <?php endif; ?>
+ <?php elseif ($this->getGotoSuccessPage()) : ?>
+ window.top.location = "<?php echo $this->getUrl('checkout/onepage/success') ?>";
+ <?php else : ?>
+ window.top.location = "<?php echo $this->getUrl('checkout/cart') ?>";
+ <?php endif; ?>
+</script>
+</body>
+</html>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/payment/mark.phtml b/app/design/frontend/magento_backup/Magento_Paypal/payment/mark.phtml
new file mode 100644
index 00000000000..9206539044d
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/payment/mark.phtml
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * Note: This mark is a requirement of PayPal
+ * @see \Magento\Paypal\Block\Standard\Form
+ */
+?>
+<!-- PayPal Logo -->
+<img src="<?php echo $this->escapeHtml($this->getPaymentAcceptanceMarkSrc())?>" alt="<?php echo __('Acceptance Mark') ?>" class="v-middle" />
+<a href="<?php echo $this->getPaymentAcceptanceMarkHref()?>" onclick="javascript:window.open('<?php echo $this->getPaymentAcceptanceMarkHref()?>','olcwhatispaypal','toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,left=0, top=0, width=400, height=350'); return false;"><?php echo __('What is PayPal?') ?></a>
+<!-- PayPal Logo -->
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/payment/redirect.phtml b/app/design/frontend/magento_backup/Magento_Paypal/payment/redirect.phtml
new file mode 100644
index 00000000000..56556be6084
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Paypal/payment/redirect.phtml
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * @see \Magento\PayPal\Block\Express\Form
+ * @see \Magento\PayPal\Block\Standard\Form
+ */
+?>
+<ul class="form-list" id="payment_form_<?php echo $this->getMethodCode() ?>" style="display:none;">
+ <li class="form-alt"><?php echo $this->getRedirectMessage() ?></li>
+ <?php if ($code = $this->getCreateBACode()): ?>
+ <li class="form-alt">
+ <label for="<?php echo $code ?>"><input type="checkbox" id="<?php echo $code ?>" value="1" name="payment[<?php echo $code ?>]" class="checkbox" />
+ <?php echo __('Sign a billing agreement to streamline further purchases with PayPal.') ?></label>
+ </li>
+ <?php endif; ?>
+</ul>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/express/review.phtml b/app/design/frontend/magento_backup/Magento_PaypalUk/express/review.phtml
new file mode 100644
index 00000000000..2b97afa0f9f
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_PaypalUk/express/review.phtml
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+/** @var $this \Magento\Paypal\Block\Express\Review */
+?>
+<div class="page-title">
+ <h1><?php echo __('Review Order') ?></h1>
+</div>
+<?php echo $this->getLayout()->renderElement('messages') ?>
+
+<?php if ($this->getShippingAddress()): ?>
+<div class="info-set col2-set">
+ <h2 class="legend"><?php echo __('Shipping Information') ?></h2>
+ <div class="col-1">
+ <div class="box">
+ <div class="box-title">
+ <h3><?php echo __('Shipping Address') ?><span class="separator"><?php if ($this->getCanEditShippingAddress()):?> | </span><a href="<?php echo $this->getEditUrl() ?>"><?php echo __('Change Shipping Address') ?></a><?php endif;?></h3>
+ </div>
+ <div class="box-content">
+ <address><?php echo $this->renderAddress($this->getShippingAddress())?></address>
+ </div>
+ </div>
+ </div>
+ <div class="col-2">
+ <div class="box">
+ <div class="box-title">
+ <h3><?php echo __('Shipping Method') ?></h3>
+ </div>
+ <div class="box-content">
+ <form method="post" id="shipping-method-form" action="<?php echo $this->escapeHtml($this->getShippingMethodSubmitUrl()) ?>">
+ <?php if ($this->getCanEditShippingMethod() || !$this->getCurrentShippingRate()):?>
+ <?php if ($groups = $this->getShippingRateGroups()):?>
+ <?php $currentRate = $this->getCurrentShippingRate(); ?>
+ <fieldset>
+ <select name="shipping_method" id="shipping-method" style="width:250px;" class="required-entry">
+ <?php if (!$currentRate):?>
+ <option value=""><?php echo __('Please select a shipping method...') ?></option>
+ <?php endif;?>
+ <?php foreach ($groups as $code => $rates):?>
+ <optgroup label="<?php echo $this->escapeHtml($this->getCarrierName($code)) ?>" style="font-style:normal;">
+ <?php foreach ($rates as $rate):?>
+ <option value="<?php echo $this->renderShippingRateValue($rate)?>"<?php echo ($currentRate === $rate) ? ' selected="selected"' : '' ;?>>
+ <?php echo $this->renderShippingRateOption($rate)?>
+ </option>
+ <?php endforeach;?>
+ </optgroup>
+ <?php endforeach;?>
+ </select>
+ </fieldset>
+ <p class="actions">
+ <button id="update-shipping-method-submit" type="submit" class="button"><span><span><?php echo __('Update Shipping Method') ?></span></span></button>
+ </p>
+ <?php else: ?>
+ <p><strong><?php echo __('Sorry, no quotes are available for this order at this time.') ?></strong></p>
+ <?php endif;?>
+ <?php else: ?>
+ <p><strong><?php echo $this->renderShippingRateOption($this->getCurrentShippingRate())?></strong></p>
+ <?php endif; ?>
+ </form>
+ </div>
+ </div>
+ </div>
+</div>
+<?php endif; ?>
+
+<div class="info-set col2-set">
+ <h2 class="legend"><?php echo __('Billing Information') ?></h2>
+ <div class="col-1">
+ <div class="box">
+ <div class="box-title">
+ <h3><?php echo __('Payment Method') ?> <span class="separator">|</span>
+ <?php if($this->getEditUrl()):?><a href="<?php echo $this->getEditUrl() ?>"><?php echo __('Change Payment Method') ?></a> <?php endif ?>
+ </h3>
+ </div>
+ <div class="box-content">
+ <?php echo $this->escapeHtml($this->getPaymentMethodTitle()) ?>
+ </div>
+ </div>
+ </div>
+ <div class="col-2">
+ <div class="box">
+ <div class="box-title">
+ <h3><?php echo __('Billing Address') ?></h3>
+ </div>
+ <div class="box-content">
+ <address>
+ <?php echo $this->renderAddress($this->getBillingAddress()) ?><br />
+ <?php echo __('Payer Email: %1', $this->getBillingAddress()->getEmail()) ?>
+ </address>
+ </div>
+ </div>
+ </div>
+</div>
+
+<div class="info-set">
+ <h2 class="legend"><?php echo __('Items in Your Shopping Cart') ?><span class="separator"> | </span><a href="<?php echo $this->getUrl('checkout/cart') ?>"><?php echo __('Edit Shopping Cart') ?></a></h2>
+ <div id="details-reload">
+ <?php echo $this->getChildHtml('details') ?>
+ </div>
+</div>
+<form method="post" id="order-review-form" action="<?php echo $this->getPlaceOrderUrl() ?>">
+ <?php echo $this->getChildHtml('agreements'); ?>
+ <div class="buttons-set buttons-set-order" id="review-buttons-container">
+ <button type="button" id="review-button" value="<?php echo __('Place Order') ?>" class="button btn-checkout"><span><span><?php echo __('Place Order') ?></span></span></button>
+ <button type="button" id="review-submit" value="<?php echo __('Place Order') ?>" class="button btn-checkout"><span><span><?php echo __('Place Order') ?></span></span></button>
+ <span class="please-wait" id="review-please-wait" style="display:none;">
+ <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo __('Submitting order information...') ?>" title="<?php echo __('Submitting order information...') ?>" class="v-middle" /> <?php echo __('Submitting order information...') ?>
+ </span>
+ </div>
+</form>
+<script type="text/javascript">
+ head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
+ "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
+ "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
+ "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
+ "<?php echo $this->getViewFileUrl('Magento_Paypal::order-review.js') ?>",
+ function() {
+ jQuery('#order-review-form').validation().orderReview({
+ shippingSubmitFormSelector: '#shipping-method-form',
+ shippingSelector:'#shipping-method',
+ shippingMethodUpdateUrl: '<?php echo $this->escapeHtml($this->getUpdateShippingMethodsUrl()) ?>',
+ updateOrderSubmitUrl: '<?php echo $this->escapeHtml($this->getUpdateOrderSubmitUrl()) ?>',
+ isAjax: <?php echo $this->getUseAjax() ? 'true' : 'false' ?>
+ });
+ });
+</script>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/SHORTCUT_uk_popup.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/SHORTCUT_uk_popup.xml
new file mode 100644
index 00000000000..2dfff90ee1e
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/SHORTCUT_uk_popup.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceBlock name="product.tooltip">
+ <container name="product.info.addtocart.paypaluk.wrapper" label="PayPal Express Checkout (Payflow Edition) Shortcut Wrapper" htmlTag="div">
+ <block class="Magento\PaypalUk\Block\Express\Shortcut" name="product.info.addtocart.paypaluk" template="Magento_Paypal::express/shortcut.phtml">
+ <action method="setIsInCatalogProduct">
+ <argument name="value" xsi:type="string">1</argument>
+ </action>
+ <action method="setShowOrPosition">
+ <argument name="value" xsi:type="string">after</argument>
+ </action>
+ </block>
+ </container>
+ </referenceBlock>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_category_view.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_category_view.xml
new file mode 100644
index 00000000000..d9099840a64
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_category_view.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <update handle="SHORTCUT_uk_popup"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_product_compare_index.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_product_compare_index.xml
new file mode 100644
index 00000000000..d9099840a64
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_product_compare_index.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <update handle="SHORTCUT_uk_popup"/>
+</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Cms/layout/override/default.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_product_view.xml
similarity index 63%
rename from app/design/frontend/magento_plushe/Magento_Cms/layout/override/default.xml
rename to app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_product_view.xml
index 85d511a027c..1246781afc3 100644
--- a/app/design/frontend/magento_plushe/Magento_Cms/layout/override/default.xml
+++ b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_product_view.xml
@@ -24,13 +24,14 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="footer">
- <container name="cms_footer_links_container" label="CMS Footer Links" htmlTag="div" htmlClass="links" before="footer_links">
- <block class="Magento\Cms\Block\Block" name="cms_footer_links">
- <arguments>
- <argument name="block_id" xsi:type="string">footer_links</argument>
- </arguments>
+ <referenceBlock name="product.info.addtocart">
+ <container name="product.info.addtocart.paypaluk.wrapper" label="PayPal Express Checkout (Payflow Edition) Shortcut Wrapper" htmlTag="p" htmlClass="paypal-logo">
+ <block class="Magento\PaypalUk\Block\Express\Shortcut" name="product.info.addtocart.paypaluk" template="Magento_Paypal::express/shortcut.phtml">
+ <action method="setIsInCatalogProduct">
+ <argument name="value" xsi:type="string">1</argument>
+ </action>
</block>
</container>
- </referenceContainer>
+ </referenceBlock>
+ <update handle="SHORTCUT_uk_popup"/>
</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalogsearch_advanced_result.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalogsearch_advanced_result.xml
new file mode 100644
index 00000000000..d9099840a64
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalogsearch_advanced_result.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <update handle="SHORTCUT_uk_popup"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalogsearch_result_index.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalogsearch_result_index.xml
new file mode 100644
index 00000000000..d9099840a64
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalogsearch_result_index.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <update handle="SHORTCUT_uk_popup"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_cart_index.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_cart_index.xml
new file mode 100644
index 00000000000..c856db24932
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_cart_index.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceContainer name="checkout.cart.top_methods">
+ <block class="Magento\PaypalUk\Block\Express\Shortcut" name="checkout.cart.methods.paypaluk_express.top" before="-" template="Magento_Paypal::express/shortcut.phtml">
+ <action method="setIsQuoteAllowed">
+ <argument name="value" xsi:type="string">1</argument>
+ </action>
+ </block>
+ </referenceContainer>
+ <referenceContainer name="checkout.cart.methods">
+ <block class="Magento\PaypalUk\Block\Express\Shortcut" name="checkout.cart.methods.paypaluk_express.bottom" before="-" template="Magento_Paypal::express/shortcut.phtml">
+ <action method="setIsQuoteAllowed">
+ <argument name="value" xsi:type="string">1</argument>
+ </action>
+ </block>
+ </referenceContainer>
+ <update handle="SHORTCUT_uk_popup"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_onepage_failure.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_onepage_failure.xml
new file mode 100644
index 00000000000..d9099840a64
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_onepage_failure.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <update handle="SHORTCUT_uk_popup"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_onepage_success.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_onepage_success.xml
new file mode 100644
index 00000000000..d9099840a64
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_onepage_success.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <update handle="SHORTCUT_uk_popup"/>
+</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_billing_address.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/default.xml
similarity index 82%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_billing_address.xml
rename to app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/default.xml
index 8c761f0c26b..8ccbb0f0f28 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order_create_load_block_billing_address.xml
+++ b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/default.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sales\Order\Create\Billing\Address" template="sales/order/create/form/address.phtml" name="billing_address"/>
+ <referenceContainer name="cart_sidebar.extra_actions">
+ <block class="Magento\PaypalUk\Block\Express\Shortcut" name="paypaluk.partner.cart_sidebar.shortcut" template="Magento_Paypal::express/shortcut.phtml"/>
</referenceContainer>
</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/checkout_onepage_additional.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypal_express_review_details.xml
similarity index 58%
rename from app/design/frontend/magento_plushe/Magento_Checkout/layout/override/checkout_onepage_additional.xml
rename to app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypal_express_review_details.xml
index 658ee9f1e97..e60382310ed 100644
--- a/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/checkout_onepage_additional.xml
+++ b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypal_express_review_details.xml
@@ -23,12 +23,13 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="One Page Checkout Additional Address Form" type="fragment" owner="checkout_onepage_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml">
- <block class="Magento\Checkout\Block\Onepage\Shipping\Method\Additional" name="shipping_method_available" template="onepage/shipping_method/additional.phtml">
- <action method="setDontDisplayContainer">
- <argument name="param" xsi:type="string">1</argument>
- </action>
+ <block class="Magento\Paypal\Block\Express\Review\Details" name="paypal.express.review.details" template="express/review/details.phtml">
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals" as="totals" template="onepage/review/totals.phtml"/>
</block>
</block>
</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypaluk_express_review.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypaluk_express_review.xml
new file mode 100644
index 00000000000..b71402b7c93
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypaluk_express_review.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="PayPal Express Order Review Form" type="page">
+ <referenceBlock name="root">
+ <action method="setTemplate">
+ <argument name="template" xsi:type="string">1column.phtml</argument>
+ </action>
+ </referenceBlock>
+ <referenceContainer name="content">
+ <block class="Magento\Paypal\Block\Express\Review" name="paypal.express.review" template="Magento_PaypalUk::express/review.phtml">
+ <action method="setPaypalActionPrefix">
+ <argument name="prefix" xsi:type="string">paypaluk</argument>
+ </action>
+ <block class="Magento\Paypal\Block\Express\Review\Details" name="paypal.express.review.details" as="details" template="express/review/details.phtml">
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="onepage/review/item.phtml"/>
+ <block class="Magento\Checkout\Block\Cart\Totals" name="paypal.express.review.details.totals" as="totals" template="onepage/review/totals.phtml"/>
+ </block>
+ <block class="Magento\Checkout\Block\Agreements" name="paypal.express.review.details.agreements" as="agreements" template="onepage/agreements.phtml"/>
+ </block>
+ </referenceContainer>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypaluk_express_review_details.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypaluk_express_review_details.xml
new file mode 100644
index 00000000000..4f46c82923b
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypaluk_express_review_details.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <block class="Magento\Page\Block\Html" name="root" output="1" template="page_fragment.phtml"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/review_product_list.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/review_product_list.xml
new file mode 100644
index 00000000000..d9099840a64
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/review_product_list.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <update handle="SHORTCUT_uk_popup"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/tag_customer_view.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/tag_customer_view.xml
new file mode 100644
index 00000000000..d9099840a64
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/tag_customer_view.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <update handle="SHORTCUT_uk_popup"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/tag_product_list.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/tag_product_list.xml
new file mode 100644
index 00000000000..d9099840a64
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/tag_product_list.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <update handle="SHORTCUT_uk_popup"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/wishlist_index_index.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/wishlist_index_index.xml
new file mode 100644
index 00000000000..d9099840a64
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/wishlist_index_index.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <update handle="SHORTCUT_uk_popup"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Rating/detailed.phtml b/app/design/frontend/magento_backup/Magento_Rating/detailed.phtml
new file mode 100644
index 00000000000..dab3092a662
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Rating/detailed.phtml
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php if(!empty($collection) && $collection->getSize()): ?>
+ <table class="ratings-table">
+ <col width="1" />
+ <col />
+ <tbody>
+ <?php foreach ($collection as $_rating): ?>
+ <?php if($_rating->getSummary()): ?>
+ <tr>
+ <th><?php echo __($this->escapeHtml($_rating->getRatingCode())) ?></th>
+ <td>
+ <div class="rating-box">
+ <div class="rating" style="width:<?php echo ceil($_rating->getSummary()) ?>%;"></div>
+ </div>
+ </td>
+ </tr>
+ <?php endif; ?>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Review/customer/list.phtml b/app/design/frontend/magento_backup/Magento_Review/customer/list.phtml
new file mode 100644
index 00000000000..9550332092f
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Review/customer/list.phtml
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
+<div class="page-title">
+ <h1><?php echo __('My Product Reviews') ?></h1>
+</div>
+<?php if( $this->getCollection() && $this->count()): ?>
+ <?php echo $this->getToolbarHtml() ?>
+ <table class="data-table" id="my-reviews-table">
+ <col width="1" />
+ <col width="210" />
+ <col width="1" />
+ <col />
+ <col width="1" />
+ <tbody>
+ <?php foreach ($this->getCollection() as $_review): ?>
+ <tr>
+ <td><span class="nobr"><?php echo $this->dateFormat($_review->getReviewCreatedAt()); ?></span></td>
+ <td><h2 class="product-name"><a href="<?php echo $this->getProductLink() ?>id/<?php echo $_review->getEntityPkValue() ?>"><?php echo $this->escapeHtml($_review->getName()) ?></a></h2></td>
+ <td>
+ <?php if($_review->getSum()): ?>
+ <div class="rating-box">
+ <div class="rating" style="width:<?php echo ( $_review->getSum() / $_review->getCount() ) ?>%;"></div>
+ </div>
+ <?php endif; ?>
+ </td>
+ <td><?php echo $this->helper('Magento\Review\Helper\Data')->getDetailHtml($_review->getDetail()) ?></td>
+ <td><a href="<?php echo $this->getReviewLink() ?>id/<?php echo $_review->getReviewId() ?>" class="nobr"><?php echo __('View Details') ?></a></td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ <script type="text/javascript">(function($) {$('#my-reviews-table').decorate('table')})(jQuery)</script>
+ <?php echo $this->getToolbarHtml() ?>
+<?php else: ?>
+ <p><?php echo __('You have submitted no reviews.') ?></p>
+<?php endif; ?>
+<div class="buttons-set">
+ <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>« </small><?php echo __('Back') ?></a></p>
+</div>
diff --git a/app/design/frontend/magento_backup/Magento_Review/customer/recent.phtml b/app/design/frontend/magento_backup/Magento_Review/customer/recent.phtml
new file mode 100644
index 00000000000..89d647e1389
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Review/customer/recent.phtml
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php if( $this->getCollection() && $this->count()): ?>
+<div class="box-account box-reviews">
+ <div class="box-head">
+ <h2><?php echo __('My Recent Reviews') ?></h2>
+ <a href="<?php echo $this->getAllReviewsUrl() ?>"><?php echo __('View All Reviews') ?></a>
+ </div>
+ <ol id="my_recent_reviews">
+ <?php $iterator = 0 ?>
+ <?php foreach ($this->getCollection() as $_review): ?>
+ <li class="item">
+ <span class="number"><?php echo ++$iterator ?></span>
+ <div class="details">
+ <h3 class="product-name"><a href="<?php echo $this->getReviewUrl($_review->getReviewId()) ?>"><?php echo $this->escapeHtml($_review->getName()) ?></a></h3>
+ <?php if($_review->getSum()): ?>
+ <div class="ratings">
+ <strong><?php echo __('Rating:') ?></strong>
+ <div class="rating-box">
+ <div class="rating" style="width:<?php echo ( $_review->getSum() / $_review->getCount() ) ?>%;"></div>
+ </div>
+ </div>
+ <?php endif; ?>
+ </div>
+ </li>
+ <?php endforeach; ?>
+ </ol>
+ <script type="text/javascript">(function($) {$('#my_recent_reviews').decorate('list')})(jQuery)</script>
+</div>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Review/customer/view.phtml b/app/design/frontend/magento_backup/Magento_Review/customer/view.phtml
new file mode 100644
index 00000000000..fb5ff833437
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Review/customer/view.phtml
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php if($this->getProductData()->getId()): ?>
+<div class="product-review">
+ <div class="page-title">
+ <h1><?php echo __('Review Details') ?></h1>
+ </div>
+ <div class="product-img-box">
+ <a href="<?php echo $this->getProductData()->getProductUrl() ?>" title="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" class="product-image"><img src="<?php echo $this->getSmallImageUrl($this->getProductData()); ?>" width="125" height="125" alt="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" /></a>
+ <?php if( $this->getRating() && $this->getRating()->getSize()): ?>
+ <p class="label"><?php echo __('Average Customer Rating:') ?></p>
+ <?php echo $this->getReviewsSummaryHtml($this->getProductData()) ?>
+ <?php endif; ?>
+ </div>
+ <div class="product-details">
+ <h2 class="product-name"><?php echo $this->escapeHtml($this->getProductData()->getName()) ?></h2>
+ <?php if( $this->getRating() && $this->getRating()->getSize()): ?>
+ <h3><?php echo ($this->isReviewOwner()) ? __('Your Rating:') : __('Rating:'); ?></h3>
+ <table class="ratings-table">
+ <?php foreach ($this->getRating() as $_rating): ?>
+ <?php if($_rating->getPercent()): ?>
+ <tr>
+ <th><?php echo $this->escapeHtml($_rating->getRatingCode()) ?></th>
+ <td>
+ <div class="rating-box">
+ <div class="rating" style="width:<?php echo ceil($_rating->getPercent()) ?>%;"></div>
+ </div>
+ </td>
+ </tr>
+ <?php endif; ?>
+ <?php endforeach; ?>
+ </table>
+ <?php endif; ?>
+ <dl>
+ <dt>
+ <?php if ($this->isReviewOwner()): ?>
+ <?php echo __('Your Review (submitted on %1):', $this->dateFormat($this->getReviewData()->getCreatedAt())) ?>
+ <?php else :?>
+ <?php echo __('Review (submitted on %1):', $this->dateFormat($this->getReviewData()->getCreatedAt())) ?>
+ <?php endif;?>
+ </dt>
+ <dd>
+ <?php echo nl2br($this->escapeHtml($this->getReviewData()->getDetail())) ?>
+ </dd>
+ </dl>
+ </div>
+ <div class="buttons-set">
+ <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo __('Back to My Reviews') ?></a></p>
+ </div>
+</div>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Review/form.phtml b/app/design/frontend/magento_backup/Magento_Review/form.phtml
new file mode 100644
index 00000000000..b100e03a94c
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Review/form.phtml
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<div class="form-add">
+ <h2><?php echo __('Write Your Own Review') ?></h2>
+ <?php if ($this->getAllowWriteReviewFlag()): ?>
+ <form action="<?php echo $this->getAction() ?>" method="post" id="review-form">
+ <fieldset>
+ <?php echo $this->getChildHtml('form_fields_before')?>
+ <h3><?php echo __("You're reviewing:"); ?> <span><?php echo $this->escapeHtml($this->getProductInfo()->getName()) ?></span></h3>
+ <?php if( $this->getRatings() && $this->getRatings()->getSize()): ?>
+ <h4><?php echo __('How do you rate this product?') ?> <em class="required">*</em></h4>
+ <span id="input-message-box"></span>
+ <table class="data-table" id="product-review-table">
+ <col />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
+ <thead>
+ <tr>
+ <th> </th>
+ <th><span class="nobr"><?php echo __('1 star') ?></span></th>
+ <th><span class="nobr"><?php echo __('2 stars') ?></span></th>
+ <th><span class="nobr"><?php echo __('3 stars') ?></span></th>
+ <th><span class="nobr"><?php echo __('4 stars') ?></span></th>
+ <th><span class="nobr"><?php echo __('5 stars') ?></span></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach ($this->getRatings() as $_rating): ?>
+ <tr>
+ <th><?php echo $this->escapeHtml($_rating->getRatingCode()) ?></th>
+ <?php foreach ($_rating->getOptions() as $_option): ?>
+ <td class="value"><input type="radio" name="ratings[<?php echo $_rating->getId() ?>]" id="<?php echo $this->escapeHtml($_rating->getRatingCode()) ?>_<?php echo $_option->getValue() ?>" value="<?php echo $_option->getId() ?>" class="radio" data-validate="{required:true, messages:{required:'Please select one of each of the ratings above.'}}" /></td>
+ <?php endforeach; ?>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ <input type="hidden" name="validate_rating" class="validate-rating" value="" />
+ <script type="text/javascript">(function($) {$('#product-review-table').decorate('table')})(jQuery)</script>
+ <?php endif; ?>
+ <ul class="form-list">
+ <li>
+ <label for="nickname_field" class="required"><em>*</em><?php echo __('Nickname') ?></label>
+ <div class="input-box">
+ <input type="text" name="nickname" id="nickname_field" class="input-text" data-validate="{required:true}" value="<?php echo $this->escapeHtml($data->getNickname()) ?>" />
+ </div>
+ </li>
+ <li>
+ <label for="summary_field" class="required"><em>*</em><?php echo __('Summary of Your Review') ?></label>
+ <div class="input-box">
+ <input type="text" name="title" id="summary_field" class="input-text" data-validate="{required:true}" value="<?php echo $this->escapeHtml($data->getTitle()) ?>" />
+ </div>
+ </li>
+ <li>
+ <label for="review_field" class="required"><em>*</em><?php echo __('Review') ?></label>
+ <div class="input-box">
+ <textarea name="detail" id="review_field" cols="5" rows="3" data-validate="{required:true}"><?php echo $this->escapeHtml($data->getDetail()) ?></textarea>
+ </div>
+ </li>
+ </ul>
+ </fieldset>
+ <div class="buttons-set">
+ <button type="submit" title="<?php echo __('Submit Review') ?>" class="button"><span><span><?php echo __('Submit Review') ?></span></span></button>
+ </div>
+ </form>
+ <script>
+ (function($) {
+ head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
+ "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
+ "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
+ "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
+ function() {
+ $('#review-form').validation({
+ errorPlacement: function (error, element) {
+ if (element.parents('#product-review-table').length) {
+ $('#product-review-table').siblings(this.errorElement + '.' + this.errorClass).remove();
+ $('#product-review-table').after(error);
+ } else {
+ element.after(error);
+ }
+ }
+ });
+ });
+ })(jQuery);
+ </script>
+ <?php else: ?>
+ <p class="review-nologged" id="review-form">
+ <?php echo __('Only registered users can write reviews. Please, <a href="%1">log in</a> or <a href="%2">sign up</a>.', $this->getLoginLink(), $this->helper('Magento\Customer\Helper\Data')->getRegisterUrl()) ?>
+ </p>
+ <?php endif ?>
+</div>
diff --git a/app/design/frontend/magento_backup/Magento_Review/helper/summary.phtml b/app/design/frontend/magento_backup/Magento_Review/helper/summary.phtml
new file mode 100644
index 00000000000..8df9aa10d6e
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Review/helper/summary.phtml
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php if ($this->getReviewsCount()): ?>
+ <div class="ratings">
+ <?php if ($this->getRatingSummary()):?>
+ <div class="rating-box">
+ <div class="rating" style="width:<?php echo $this->getRatingSummary() ?>%"></div>
+ </div>
+ <?php endif;?>
+ <p class="rating-links">
+ <a href="<?php echo $this->getReviewsUrl() ?>"><?php echo __('%1 Review(s)', $this->getReviewsCount()) ?></a>
+ <span class="separator">|</span>
+ <a href="<?php echo $this->getReviewsUrl() ?>#review-form"><?php echo __('Add Your Review') ?></a>
+ </p>
+ </div>
+<?php elseif ($this->getDisplayIfEmpty()): ?>
+ <p class="no-rating"><a href="<?php echo $this->getReviewsUrl() ?>#review-form"><?php echo __('Be the first to review this product') ?></a></p>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Review/helper/summary_short.phtml b/app/design/frontend/magento_backup/Magento_Review/helper/summary_short.phtml
new file mode 100644
index 00000000000..9c36b10f00f
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Review/helper/summary_short.phtml
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php if ($this->getReviewsCount()): ?>
+ <div class="ratings">
+ <?php if ($this->getRatingSummary()):?>
+ <div class="rating-box">
+ <div class="rating" style="width:<?php echo $this->getRatingSummary() ?>%"></div>
+ </div>
+ <?php endif;?>
+ <span class="amount"><a href="#" onclick="var t = opener ? opener.window : window; t.location.href='<?php echo $this->getReviewsUrl() ?>'; return false;"><?php echo __('%1 Review(s)', $this->getReviewsCount()) ?></a></span>
+ </div>
+<?php elseif ($this->getDisplayIfEmpty()): ?>
+ <p class="no-rating"><a href="<?php echo $this->getReviewsUrl() ?>#review-form"><?php echo __('Be the first to review this product') ?></a></p>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Review/layout/override/review_product_view.xml b/app/design/frontend/magento_backup/Magento_Review/layout/override/review_product_view.xml
similarity index 88%
rename from app/design/frontend/magento_plushe/Magento_Review/layout/override/review_product_view.xml
rename to app/design/frontend/magento_backup/Magento_Review/layout/override/review_product_view.xml
index 5c720fb8ad5..ac9b3b3ed59 100644
--- a/app/design/frontend/magento_plushe/Magento_Review/layout/override/review_product_view.xml
+++ b/app/design/frontend/magento_backup/Magento_Review/layout/override/review_product_view.xml
@@ -23,10 +23,10 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product Review View" type="page" parent="review_product_list">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product Review View" type="page">
<referenceBlock name="root">
<action method="setTemplate">
- <argument name="template" xsi:type="string">1column.phtml</argument>
+ <argument name="template" xsi:type="string">2columns-right.phtml</argument>
</action>
</referenceBlock>
<referenceContainer name="content">
diff --git a/app/design/frontend/magento_backup/Magento_Review/product/view/list.phtml b/app/design/frontend/magento_backup/Magento_Review/product/view/list.phtml
new file mode 100644
index 00000000000..dda634ca062
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Review/product/view/list.phtml
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+
+<?php $_items = $this->getReviewsCollection()->getItems();?>
+<div class="box-collateral box-reviews" id="customer-reviews">
+ <?php if (count($_items)):?>
+ <h2><?php echo __('Customer Reviews') ?></h2>
+ <?php echo $this->getChildHtml('toolbar') ?>
+ <dl>
+ <?php foreach ($_items as $_review):?>
+ <dt>
+ <a href="<?php echo $this->getReviewUrl($_review->getId()) ?>"><?php echo $this->escapeHtml($_review->getTitle()) ?></a> <?php echo __('Review by <span>%1</span>', $this->escapeHtml($_review->getNickname())) ?>
+ </dt>
+ <dd>
+ <?php $_votes = $_review->getRatingVotes(); ?>
+ <?php if (count($_votes)): ?>
+ <table class="ratings-table">
+ <col width="1" />
+ <col />
+ <tbody>
+ <?php foreach ($_votes as $_vote): ?>
+ <tr>
+ <th><?php echo $this->escapeHtml($_vote->getRatingCode()) ?></th>
+ <td>
+ <div class="rating-box">
+ <div class="rating" style="width:<?php echo $_vote->getPercent() ?>%;"></div>
+ </div>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ <?php endif; ?>
+ <?php echo nl2br($this->escapeHtml($_review->getDetail())) ?>
+ <small class="date"><?php echo __('(Posted on %1)', $this->formatDate($_review->getCreatedAt())) ?></small>
+ </dd>
+ <?php endforeach; ?>
+ </dl>
+ <?php echo $this->getChildHtml('toolbar') ?>
+ <?php endif;?>
+ <?php echo $this->getChildHtml('review_form') ?>
+</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Review/view.phtml b/app/design/frontend/magento_backup/Magento_Review/view.phtml
similarity index 53%
rename from app/design/frontend/magento_plushe/Magento_Review/view.phtml
rename to app/design/frontend/magento_backup/Magento_Review/view.phtml
index e75d946912a..01fa89847fe 100644
--- a/app/design/frontend/magento_plushe/Magento_Review/view.phtml
+++ b/app/design/frontend/magento_backup/Magento_Review/view.phtml
@@ -19,6 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
+ * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -29,33 +30,40 @@
<h1><?php echo __('Review Details') ?></h1>
</div>
<div class="product-img-box">
- <a href="<?php echo $this->getProductData()->getProductUrl() ?>"><img src="<?php echo $this->getBaseImageUrl($this->getProductData()); ?>" height="<?php echo $this->getBaseImageSize()?>" width="<?php echo $this->getBaseImageSize()?>" alt="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" class="product-image" /></a>
+ <a href="<?php echo $this->getProductData()->getProductUrl() ?>" title="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" class="product-image"><img src="<?php echo $this->getSmallImageUrl($this->getProductData()); ?>" height="125" width="125" alt="<?php echo $this->escapeHtml($this->getProductData()->getName()) ?>" /></a>
<?php if( $this->getRating() && $this->getRating()->getSize()): ?>
- <p><?php echo __('Average Customer Rating') ?>:</p>
- <?php echo $this->getReviewsSummaryHtml($this->getProductData()) ?>
+ <p class="label"><?php echo __('Average Customer Rating') ?>:</p>
+ <?php echo $this->getReviewsSummaryHtml($this->getProductData()) ?>
<?php endif; ?>
</div>
- <div class="details">
- <h3 class="product-name"><?php echo $this->escapeHtml($this->getProductData()->getName()) ?></h3>
+ <div class="product-details">
+ <h2 class="product-name"><?php echo $this->escapeHtml($this->getProductData()->getName()) ?></h2>
<?php if( $this->getRating() && $this->getRating()->getSize()): ?>
- <h4><?php echo __('Product Rating:') ?></h4>
-
- <table class="data-table review-summary-table">
+ <h3><?php echo __('Product Rating:') ?></h3>
+ <table class="ratings-table">
<?php foreach ($this->getRating() as $_rating): ?>
- <?php if($_rating->getPercent()): ?>
- <tr>
- <td class="label"><?php echo __($this->escapeHtml($_rating->getRatingCode())) ?></td>
- <td class="value">
- <div class="rating-box">
- <div class="rating" style="width:<?php echo ceil($_rating->getPercent()) ?>%;"></div>
- </div></td>
- </tr>
- <?php endif; ?>
+ <?php if($_rating->getPercent()): ?>
+ <tr>
+ <th><?php echo __($this->escapeHtml($_rating->getRatingCode())) ?></th>
+ <td>
+ <div class="rating-box">
+ <div class="rating" style="width:<?php echo ceil($_rating->getPercent()) ?>%;"></div>
+ </div>
+ </td>
+ </tr>
+ <?php endif; ?>
<?php endforeach; ?>
</table>
+ </dl>
<?php endif; ?>
- <p class="date"><?php echo __('Product Review (submitted on %1):', $this->dateFormat($this->getReviewData()->getCreatedAt())) ?></p>
- <p><?php echo nl2br($this->escapeHtml($this->getReviewData()->getDetail())) ?></p>
+ <dl>
+ <dt>
+ <?php echo __('Product Review (submitted on %1):', $this->dateFormat($this->getReviewData()->getCreatedAt())) ?>
+ </dt>
+ <dd>
+ <?php echo nl2br($this->escapeHtml($this->getReviewData()->getDetail())) ?>
+ </dd>
+ </dl>
</div>
<div class="buttons-set">
<p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo __('Back to Product Reviews') ?></a></p>
diff --git a/app/design/frontend/magento_backup/Magento_Rss/list.phtml b/app/design/frontend/magento_backup/Magento_Rss/list.phtml
new file mode 100644
index 00000000000..9d5ffcb1ad8
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Rss/list.phtml
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+ $_categories = $this->getRssCatalogFeeds();
+ $_misc = $this->getRssMiscFeeds();
+?>
+<?php if ($_categories || $_misc): ?>
+<?php if($_misc): ?>
+<table class="data table rss">
+ <thead>
+ <tr>
+ <th colspan="2"><?php echo __('Miscellaneous Feeds') ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach ($_misc as $_feed): ?>
+ <tr>
+ <td><?php echo $_feed->getLabel() ?></td>
+ <td><a href="<?php echo $_feed->getUrl() ?>" class="link-rss"><?php echo __('Get Feed'); ?></a></td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+</table>
+<?php endif; ?>
+<?php if($_categories): ?>
+<table class="data table rss">
+ <thead>
+ <tr>
+ <th colspan="2"><?php echo __('Category Feeds') ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach ($_categories as $_category): ?>
+ <tr>
+ <td><?php echo $_category->getLabel() ?></td>
+ <td><a href="<?php echo $_category->getUrl() ?>" class="link-rss"><?php echo __('Get Feed'); ?></a></td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+</table>
+<?php endif; ?>
+<?php else: ?>
+ <p><?php echo __('There are no Rss Feeds.'); ?></p>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/billing/agreement/view.phtml b/app/design/frontend/magento_backup/Magento_Sales/billing/agreement/view.phtml
new file mode 100644
index 00000000000..65ac7e0519d
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/billing/agreement/view.phtml
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php /* @var $this \Magento\Sales\Block\Billing\Agreement\View */ ?>
+<div class="page-title title-buttons">
+ <h1><?php echo __('Billing Agreement # %1', $this->escapeHtml($this->getReferenceId())) ?></h1>
+ <?php if ($this->getCanCancel()): ?>
+ <button type="button" title="<?php echo __('Cancel') ?>" class="button" onclick="if( confirm('<?php echo __('Are you sure you want to do this?') ?>') ) { window.location.href = '<?php echo $this->getCancelUrl() ?>'; } return false;"><span><span><?php echo __('Cancel') ?></span></span></button>
+ <?php endif; ?>
+</div>
+<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
+<div class="billing-agreements">
+ <div class="info-box">
+ <h2 class="box-title"><?php echo __('Agreement Information') ?></h2>
+ <div class="box-content">
+ <table class="info-table">
+ <tbody>
+ <tr>
+ <th><?php echo __('Reference ID:') ?></th>
+ <td><?php echo $this->escapeHtml($this->getReferenceId()); ?></td>
+ </tr>
+ <tr>
+ <th><?php echo __('Status:') ?></th>
+ <td><?php echo $this->getAgreementStatus() ?></td>
+ </tr>
+ <tr>
+ <th><?php echo __('Created:') ?></th>
+ <td><?php echo $this->escapeHtml($this->getAgreementCreatedAt()) ?></td>
+ </tr>
+ <?php if($this->getAgreementUpdatedAt()): ?>
+ <tr>
+ <th><?php echo __('Updated:') ?></th>
+ <td><?php echo $this->escapeHtml($this->getAgreementUpdatedAt()); ?></td>
+ </tr>
+ <?php endif; ?>
+ <tr>
+ <th><?php echo __('Payment Method:') ?></th>
+ <td><?php echo $this->getPaymentMethodTitle() ?></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ <?php $relatedOrders = $this->getRelatedOrders() ?>
+ <?php if(count($relatedOrders) > 0): ?>
+ <?php echo $this->getChildHtml('pager'); ?>
+ <h2 class="table-caption"><?php echo __('Related Orders') ?></h2>
+ <table class="data-table" id="related-orders-table">
+ <col width="1" />
+ <col width="1" />
+ <col />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
+ <thead>
+ <tr>
+ <th><span class="nobr"><?php echo __('Order #') ?></span></th>
+ <th><?php echo __('Date') ?></th>
+ <th><?php echo __('Ship To') ?></th>
+ <th><span class="nobr"><?php echo __('Order Total') ?></span></th>
+ <th><span class="nobr"><?php echo __('Order Status') ?></span></th>
+ <th> </th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach ($relatedOrders as $order): ?>
+ <tr>
+ <td><?php echo $this->getOrderItemValue($order, 'order_increment_id') ?></td>
+ <td><span class="nobr"><?php echo $this->getOrderItemValue($order, 'created_at') ?></span></td>
+ <td><?php echo $this->getOrderItemValue($order, 'shipping_address') ?></td>
+ <td><?php echo $this->getOrderItemValue($order, 'order_total') ?></td>
+ <td><em><?php echo $this->getOrderItemValue($order, 'status_label') ?></em></td>
+ <td class="a-center">
+ <span class="nobr">
+ <a href="<?php echo $this->getOrderItemValue($order, 'view_url') ?>"><?php echo __('View Order') ?></a>
+ </span>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ <script type="text/javascript">(function($) {$('#related-orders-table').decorate('table')})(jQuery)</script>
+ <?php endif; ?>
+ <div class="buttons-set">
+ <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo __('Back to Billing Agreements') ?></a></p>
+ </div>
+</div>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/billing/agreements.phtml b/app/design/frontend/magento_backup/Magento_Sales/billing/agreements.phtml
new file mode 100644
index 00000000000..96eae811fce
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/billing/agreements.phtml
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php /* @var $this \Magento\Sales\Block\Billing\Agreements */ ?>
+<div class="page-title">
+ <h1><?php echo __('Billing Agreements') ?></h1>
+</div>
+
+<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
+
+<div class="billing-agreements">
+ <?php $billingAgreements = $this->getBillingAgreements(); ?>
+ <?php if (count($billingAgreements) > 0): ?>
+ <?php echo $this->getChildHtml('pager'); ?>
+ <table id="billing-agreements" class="data-table">
+ <col />
+ <col width="1" />
+ <col />
+ <col />
+ <col />
+ <col width="1" />
+ <thead>
+ <tr>
+ <th><span class="nobr"><?php echo __('Reference ID'); ?></span></th>
+ <th><?php echo __('Status'); ?></th>
+ <th><span class="nobr"><?php echo __('Created At'); ?></span></th>
+ <th><span class="nobr"><?php echo __('Updated At'); ?></span></th>
+ <th><span class="nobr"><?php echo __('Payment Method'); ?></span></th>
+ <th> </th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach($billingAgreements as $item): ?>
+ <tr>
+ <td><span class="nobr"><?php echo $this->getItemValue($item, 'reference_id') ?></span></td>
+ <td><?php echo $this->getItemValue($item, 'status') ?></td>
+ <td><span class="nobr"><?php echo $this->getItemValue($item, 'created_at') ?></span></td>
+ <td><span class="nobr"><?php echo $this->getItemValue($item, 'updated_at') ?></span></td>
+ <td><?php echo $this->getItemValue($item, 'payment_method_label') ?></td>
+ <td><a href="<?php echo $this->getItemValue($item, 'edit_url') ?>"><?php echo __('View') ?></a></td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ <script type="text/javascript">(function($) {$('#billing-agreements').decorate('table')})(jQuery)</script>
+ <?php else: ?>
+ <p><?php echo __('There are no billing agreements yet.')?></p>
+ <?php endif; ?>
+
+ <?php $paymentMethods = $this->getWizardPaymentMethodOptions() ?>
+ <?php if ($paymentMethods): ?>
+ <div class="info-box">
+ <h2 class="box-title"><?php echo __('New Billing Agreement') ?></h2>
+ <form action="<?php echo $this->getCreateUrl() ?>" method="post">
+ <div class="box-content">
+ <p><?php echo __('You will be redirected to the payment system website.') ?></p>
+ <ul class="form-list">
+ <li>
+ <select id="payment_method" name="payment_method">
+ <option value=""><?php echo __('-- Please Select --') ?></option>
+ <?php foreach ($paymentMethods as $code => $title): ?>
+ <option value="<?php echo $code ?>"><?php echo $title ?></option>
+ <?php endforeach; ?>
+ </select>
+ <button type="submit" class="button"><span><span><?php echo __('Create...') ?></span></span></button>
+ </li>
+ </ul>
+ </div>
+ </form>
+ </div>
+ <?php endif; ?>
+
+ <div class="buttons-set">
+ <p class="back-link"><a href="<?php echo $this->escapeHtml($this->getBackUrl()) ?>"><small>« </small><?php echo __('Back') ?></a></p>
+ </div>
+</div>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/email/creditmemo/items.phtml b/app/design/frontend/magento_backup/Magento_Sales/email/creditmemo/items.phtml
new file mode 100644
index 00000000000..04b959d9046
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/email/creditmemo/items.phtml
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php $_creditmemo = $this->getCreditmemo() ?>
+<?php $_order = $this->getOrder() ?>
+<?php if ($_creditmemo && $_order): ?>
+<table cellspacing="0" cellpadding="0" border="0" width="650" style="border:1px solid #EAEAEA;">
+ <thead>
+ <tr>
+ <th align="left" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Item') ?></th>
+ <th align="left" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Sku') ?></th>
+ <th align="center" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Qty') ?></th>
+ <th align="right" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Subtotal') ?></th>
+ </tr>
+ </thead>
+
+ <?php $i=0; foreach ($_creditmemo->getAllItems() as $_item): ?>
+ <?php if($_item->getOrderItem()->getParentItem()) continue; else $i++; ?>
+ <tbody<?php echo $i%2 ? ' bgcolor="#F6F6F6"' : '' ?>>
+ <?php echo $this->getItemHtml($_item) ?>
+ </tbody>
+ <?php endforeach; ?>
+
+ <tfoot>
+ <?php echo $this->getChildHtml('creditmemo_totals');?>
+ </tfoot>
+</table>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/email/invoice/items.phtml b/app/design/frontend/magento_backup/Magento_Sales/email/invoice/items.phtml
new file mode 100644
index 00000000000..7d524105278
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/email/invoice/items.phtml
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php $_invoice = $this->getInvoice() ?>
+<?php $_order = $this->getOrder() ?>
+<?php if ($_invoice && $_order): ?>
+<table cellspacing="0" cellpadding="0" border="0" width="650" style="border:1px solid #EAEAEA;">
+ <thead>
+ <tr>
+ <th align="left" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Item') ?></th>
+ <th align="left" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Sku') ?></th>
+ <th align="center" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Qty') ?></th>
+ <th align="right" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Subtotal') ?></th>
+ </tr>
+ </thead>
+
+ <?php $i=0; foreach ($_invoice->getAllItems() as $_item): ?>
+ <?php if($_item->getOrderItem()->getParentItem()) continue; else $i++; ?>
+ <tbody<?php echo $i%2 ? ' bgcolor="#F6F6F6"' : '' ?>>
+ <?php echo $this->getItemHtml($_item) ?>
+ </tbody>
+ <?php endforeach; ?>
+
+ <tfoot>
+ <?php echo $this->getChildHtml('invoice_totals')?>
+ </tfoot>
+</table>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/email/items.phtml b/app/design/frontend/magento_backup/Magento_Sales/email/items.phtml
new file mode 100644
index 00000000000..a065eb81f28
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/email/items.phtml
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php $_order = $this->getOrder() ?>
+<?php if ($_order): ?>
+<table cellspacing="0" cellpadding="0" border="0" width="650" style="border:1px solid #EAEAEA;">
+ <thead>
+ <tr>
+ <th align="left" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Item') ?></th>
+ <th align="left" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Sku') ?></th>
+ <th align="center" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Qty') ?></th>
+ <th align="right" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Subtotal') ?></th>
+ </tr>
+ </thead>
+
+ <?php $i=0; foreach ($_order->getAllItems() as $_item): ?>
+ <?php if($_item->getParentItem()) continue; else $i++; ?>
+ <tbody<?php echo $i%2 ? ' bgcolor="#F6F6F6"' : '' ?>>
+ <?php echo $this->getItemHtml($_item) ?>
+ </tbody>
+ <?php endforeach; ?>
+
+ <tbody>
+ <?php echo $this->getChildHtml('order_totals') ?>
+ </tbody>
+</table>
+<?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAvailable('order', $_order, $_order->getStore()) && $_order->getGiftMessageId()): ?>
+ <?php $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_order->getGiftMessageId()); ?>
+ <?php if ($_giftMessage): ?>
+<br />
+<table cellspacing="0" cellpadding="0" border="0" width="100%" style="border:1px solid #EAEAEA;">
+ <thead>
+ <tr>
+ <th align="left" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><strong><?php echo __('Gift Message for this Order') ?></strong></th>
+ </tr>
+ </thead>
+
+ <tbody>
+
+ <tr>
+ <td colspan="4" align="left" style="padding:3px 9px">
+ <strong><?php echo __('From:'); ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?>
+ <br /><strong><?php echo __('To:'); ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?>
+ <br /><strong><?php echo __('Message:'); ?></strong><br /> <?php echo $this->escapeHtml($_giftMessage->getMessage()) ?>
+ </td>
+ </tr>
+ </tbody>
+</table>
+ <?php endif; ?>
+<?php endif; ?>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/email/items/creditmemo/default.phtml b/app/design/frontend/magento_backup/Magento_Sales/email/items/creditmemo/default.phtml
new file mode 100644
index 00000000000..9830ad8e2b0
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/email/items/creditmemo/default.phtml
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php $_item = $this->getItem() ?>
+<?php $_order = $this->getItem()->getOrder(); ?>
+<tr>
+ <td align="left" valign="top" style="padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
+ <strong style="font-size:11px;"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
+ <?php if ($this->getItemOptions()): ?>
+ <dl style="margin:0; padding:0;">
+ <?php foreach ($this->getItemOptions() as $option): ?>
+ <dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
+ <dd style="margin:0; padding:0 0 0 9px;"><?php echo nl2br($option['value']) ?></dd>
+ <?php endforeach; ?>
+ </dl>
+ <?php endif; ?>
+ <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
+ <?php if ($addInfoBlock) :?>
+ <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
+ <?php endif; ?>
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
+ </td>
+ <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
+ <td align="center" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $_item->getQty()*1 ?></td>
+ <td align="right" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax($_order->getStore()) || $this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
+ <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+ <?php endif; ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
+ <?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
+ <?php else: ?>
+ <?php echo $_order->formatPrice($_item->getRowTotal()) ?>
+ <?php endif; ?>
+
+
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+ <br />
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
+ <?php endforeach; ?>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
+ <?php endforeach; ?>
+ </small>
+ <?php endif; ?>
+
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
+ <br />
+ <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
+ <?php endif; ?>
+ <?php endif; ?>
+ <?php endif; ?>
+
+
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax($_order->getStore()) || $this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
+ <br /><span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+ <?php endif; ?>
+ <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
+ <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
+ <?php else: ?>
+ <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
+ <?php endif; ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+ <br />
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
+ <?php endforeach; ?>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
+ <?php endforeach; ?>
+ </small>
+ <?php endif; ?>
+
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
+ <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
+ <?php endif; ?>
+ <?php endif; ?>
+ <?php endif; ?>
+ </td>
+</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/email/items/invoice/default.phtml b/app/design/frontend/magento_backup/Magento_Sales/email/items/invoice/default.phtml
new file mode 100644
index 00000000000..9830ad8e2b0
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/email/items/invoice/default.phtml
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php $_item = $this->getItem() ?>
+<?php $_order = $this->getItem()->getOrder(); ?>
+<tr>
+ <td align="left" valign="top" style="padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
+ <strong style="font-size:11px;"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
+ <?php if ($this->getItemOptions()): ?>
+ <dl style="margin:0; padding:0;">
+ <?php foreach ($this->getItemOptions() as $option): ?>
+ <dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
+ <dd style="margin:0; padding:0 0 0 9px;"><?php echo nl2br($option['value']) ?></dd>
+ <?php endforeach; ?>
+ </dl>
+ <?php endif; ?>
+ <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
+ <?php if ($addInfoBlock) :?>
+ <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
+ <?php endif; ?>
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
+ </td>
+ <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
+ <td align="center" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $_item->getQty()*1 ?></td>
+ <td align="right" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax($_order->getStore()) || $this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
+ <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+ <?php endif; ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
+ <?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
+ <?php else: ?>
+ <?php echo $_order->formatPrice($_item->getRowTotal()) ?>
+ <?php endif; ?>
+
+
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+ <br />
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
+ <?php endforeach; ?>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
+ <?php endforeach; ?>
+ </small>
+ <?php endif; ?>
+
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
+ <br />
+ <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
+ <?php endif; ?>
+ <?php endif; ?>
+ <?php endif; ?>
+
+
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax($_order->getStore()) || $this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
+ <br /><span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+ <?php endif; ?>
+ <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
+ <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
+ <?php else: ?>
+ <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
+ <?php endif; ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+ <br />
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
+ <?php endforeach; ?>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
+ <?php endforeach; ?>
+ </small>
+ <?php endif; ?>
+
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
+ <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
+ <?php endif; ?>
+ <?php endif; ?>
+ <?php endif; ?>
+ </td>
+</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/email/items/order/default.phtml b/app/design/frontend/magento_backup/Magento_Sales/email/items/order/default.phtml
new file mode 100644
index 00000000000..e756d28ce81
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/email/items/order/default.phtml
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+
+/** @var $this \Magento\Sales\Block\Order\Email\Items_Order_Default */
+
+/** @var $_item \Magento\Sales\Model\Order\Item */
+$_item = $this->getItem();
+$_order = $_item->getOrder();
+?>
+<tr>
+ <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
+ <strong style="font-size:11px;"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
+ <?php if ($this->getItemOptions()): ?>
+ <dl style="margin:0; padding:0;">
+ <?php foreach ($this->getItemOptions() as $option): ?>
+ <dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
+ <dd style="margin:0; padding:0 0 0 9px;">
+ <?php echo nl2br($option['value']) ?>
+ </dd>
+ <?php endforeach; ?>
+ </dl>
+ <?php endif; ?>
+ <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
+ <?php if ($addInfoBlock) :?>
+ <?php echo $addInfoBlock->setItem($_item)->toHtml(); ?>
+ <?php endif; ?>
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
+ </td>
+ <td align="left" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
+ <td align="center" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;"><?php echo $_item->getQtyOrdered()*1 ?></td>
+ <td align="right" valign="top" style="font-size:11px; padding:3px 9px; border-bottom:1px dotted #CCCCCC;">
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax($_order->getStore()) || $this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
+ <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+ <?php endif; ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
+ <?php echo $_order->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
+ <?php else: ?>
+ <?php echo $_order->formatPrice($_item->getRowTotal()) ?>
+ <?php endif; ?>
+
+
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+ <br />
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
+ <?php endforeach; ?>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
+ <?php endforeach; ?>
+ </small>
+ <?php endif; ?>
+
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
+ <br />
+ <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $_order->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
+ <?php endif; ?>
+ <?php endif; ?>
+ <?php endif; ?>
+
+
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax($_order->getStore()) || $this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($_order->getStore())): ?>
+ <br /><span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+ <?php endif; ?>
+ <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'email', $_order->getStore())): ?>
+ <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
+ <?php else: ?>
+ <?php echo $_order->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
+ <?php endif; ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+ <br />
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'email', $_order->getStore())): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount'],true,true); ?></span><br />
+ <?php endforeach; ?>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'email', $_order->getStore())): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $_order->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
+ <?php endforeach; ?>
+ </small>
+ <?php endif; ?>
+
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'email', $_order->getStore())): ?>
+ <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $_order->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
+ <?php endif; ?>
+ <?php endif; ?>
+ <?php endif; ?>
+ </td>
+</tr>
+<?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_item->getGiftMessageId())): ?>
+<tr>
+ <td colspan="4" style=" border-bottom:2px solid #CCCCCC; padding:3px 9px;">
+ <strong style="color:#444444; font-size:11px;"><?php echo __('Gift Message') ?></strong>
+ <?php echo __('From:'); ?> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?><br />
+ <?php echo __('To:'); ?> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?><br />
+ <strong><?php echo __('Message:'); ?></strong><br /><?php echo $this->escapeHtml($_giftMessage->getMessage()) ?>
+ </td>
+</tr>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/email/items/shipment/default.phtml b/app/design/frontend/magento_backup/Magento_Sales/email/items/shipment/default.phtml
new file mode 100644
index 00000000000..976391afcf9
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/email/items/shipment/default.phtml
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php $_item = $this->getItem() ?>
+<tr>
+ <td align="left" valign="top" style="font-size:11px; padding:3px 9px;">
+ <strong><?php echo $this->escapeHtml($_item->getName()) ?></strong>
+ <?php if ($this->getItemOptions()): ?>
+ <dl style="margin:0; padding:0;">
+ <?php foreach ($this->getItemOptions() as $option): ?>
+ <dt><strong><em><?php echo $option['label'] ?></em></strong></dt>
+ <dd style="margin:0; padding:0 0 0 9px;"><?php echo nl2br($option['value']) ?></dd>
+ <?php endforeach; ?>
+ </dl>
+ <?php endif; ?>
+ <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
+ <?php if ($addInfoBlock) :?>
+ <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
+ <?php endif; ?>
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
+ </td>
+ <td align="left" valign="top" style="font-size:11px; padding:3px 9px;"><?php echo $this->escapeHtml($this->getSku($_item)) ?></td>
+ <td align="center" valign="top" style="font-size:11px; padding:3px 9px;"><?php echo $_item->getQty()*1 ?></td>
+</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/email/shipment/items.phtml b/app/design/frontend/magento_backup/Magento_Sales/email/shipment/items.phtml
new file mode 100644
index 00000000000..cd07aee2258
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/email/shipment/items.phtml
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php $_shipment = $this->getShipment() ?>
+<?php $_order = $this->getOrder() ?>
+<?php if ($_shipment && $_order): ?>
+<table cellspacing="0" cellpadding="0" border="0" width="650" style="border:1px solid #EAEAEA;">
+ <thead>
+ <tr>
+ <th align="left" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Item') ?></th>
+ <th align="left" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Sku') ?></th>
+ <th align="center" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Qty') ?></th>
+ </tr>
+ </thead>
+
+ <?php $i=0; foreach ($_shipment->getAllItems() as $_item): ?>
+ <?php if($_item->getOrderItem()->getParentItem()) continue; else $i++; ?>
+ <tbody<?php echo $i%2 ? ' bgcolor="#F6F6F6"' : '' ?>>
+ <?php echo $this->getItemHtml($_item) ?>
+ </tbody>
+ <?php endforeach; ?>
+
+</table>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/email/shipment/track.phtml b/app/design/frontend/magento_backup/Magento_Sales/email/shipment/track.phtml
new file mode 100644
index 00000000000..f27a6fa3aff
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/email/shipment/track.phtml
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php $_shipment=$this->getShipment() ?>
+<?php $_order=$this->getOrder() ?>
+<?php if ($_shipment && $_order && $_shipment->getAllTracks()): ?>
+<table cellspacing="0" cellpadding="0" border="0" width="650" style="border:1px solid #EAEAEA;">
+ <thead>
+ <tr>
+ <th align="left" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Shipped By') ?></th>
+ <th align="center" bgcolor="#EAEAEA" style="font-size:13px; padding:3px 9px"><?php echo __('Tracking Number') ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php $i=0; foreach ($_shipment->getAllTracks() as $_item): $i++ ?>
+ <tr <?php echo $i%2?'bgcolor="#F6F6F6"':'' ?>>
+ <td align="left" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($_item->getTitle()) ?></td>
+ <td align="center" valign="top" style="padding:3px 9px"><?php echo $this->escapeHtml($_item->getNumber()) ?></td>
+ </tr>
+ <?php endforeach ?>
+ </tbody>
+</table>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/gift-message.js b/app/design/frontend/magento_backup/Magento_Sales/gift-message.js
new file mode 100644
index 00000000000..9c464b246d1
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/gift-message.js
@@ -0,0 +1,74 @@
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category gift message
+ * @package mage
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+/*jshint jquery:true*/
+(function($) {
+ "use strict";
+ $.widget('mage.giftMessage', {
+ options: {
+ rowPrefix: '#order-item-row-', // Selector prefix for item's row in the table.
+ linkPrefix: '#order-item-gift-message-link-', // Selector prefix for the 'Gift Message' link.
+ duration: 100, // Toggle duration.
+ expandedClass: 'expanded', // Class added/removed to/from the 'Gift Message' link.
+ lastClass: 'last' // Class added/removed to/from the last item's row in the products table.
+ },
+
+ /**
+ * Bind a click handler on the widget's element to toggle the gift message.
+ * @private
+ */
+ _create: function() {
+ this.element.on('click', $.proxy(this._toggleGiftMessage, this));
+ },
+
+ /**
+ * Toggle the display of the item's corresponding gift message.
+ * @private
+ * @param event - {Object} - Click event.
+ */
+ _toggleGiftMessage: function(event) {
+ var element = $(event.target), // Click target. The 'Gift Message' link or 'Close' button.
+ options = this.options, // Cached widget options.
+ itemId = element.data('item-id'), // The individual item's numeric id.
+ link = $(options.linkPrefix + itemId), // The 'Gift Message' expandable link.
+ row = $(options.rowPrefix + itemId), // The item's row in the products table.
+ region = $('#' + element.attr('aria-controls')); // The gift message container region.
+ region.toggle(options.duration, function() {
+ if (region.attr('aria-expanded') === "true") {
+ region.attr('aria-expanded', "false");
+ if (region.hasClass(options.lastClass)) {
+ row.addClass(options.lastClass);
+ }
+ } else {
+ region.attr('aria-expanded', "true");
+ if (region.hasClass(options.lastClass)) {
+ row.removeClass(options.lastClass);
+ }
+ }
+ link.toggleClass(options.expandedClass);
+ });
+ event.preventDefault(); // Prevent event propagation and avoid going to the link's href.
+ }
+ });
+})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Sales/guest/form.phtml b/app/design/frontend/magento_backup/Magento_Sales/guest/form.phtml
new file mode 100644
index 00000000000..95208cfceba
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/guest/form.phtml
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package default_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<div class="page-title">
+ <h1><?php echo __('Orders and Returns') ?></h1>
+</div>
+<form id="oar-widget-orders-and-returns-form" action="<?php echo $this->getActionUrl() ?>" method="post" class="search-form" name="guest_post">
+ <div class="fieldset">
+ <h2 class="legend"><?php echo __('Order Information') ?></h2>
+ <ul class="form-list">
+ <li class="fields">
+ <div class="field">
+ <label for="oar-order-id" class="required"><em>*</em><?php echo __('Order ID') ?></label>
+ <div class="input-box">
+ <input type="text" class="input-text" id="oar-order-id" name="oar_order_id" data-validate="{required:true}"/>
+ </div>
+ </div>
+ <div class="field">
+ <label for="oar-billing-lastname" class="required"><em>*</em><?php echo __('Billing Last Name') ?></label>
+ <div class="input-box">
+ <input type="text" class="input-text" id="oar-billing-lastname" name="oar_billing_lastname" data-validate="{required:true}"/>
+ </div>
+ </div>
+ </li>
+ <li class="fields">
+ <div class="field">
+ <label for="quick-search-type-id" class="required"><em>*</em><?php echo __('Find Order By:') ?></label>
+ <div class="input-box">
+ <select name="oar_type" id="quick-search-type-id" class="select">
+ <option value="email"><?php echo __('Email Address'); ?></option>
+ <option value="zip"><?php echo __('ZIP Code'); ?></option>
+ </select>
+ </div>
+ </div>
+ <div id="oar-email" class="field">
+ <label for="oar_email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
+ <div class="input-box">
+ <input type="text" class="input-text" id="oar_email" name="oar_email" data-validate="{required:true, 'validate-email':true}"/>
+ </div>
+ </div>
+ <div id="oar-zip" class="field">
+ <label for="oar_zip" class="required"><em>*</em><?php echo __('Billing ZIP Code') ?></label>
+ <div class="input-box">
+ <input type="text" class="input-text" id="oar_zip" name="oar_zip" data-validate="{required:true}"/>
+ </div>
+ </div>
+ </li>
+ </ul>
+ </div>
+ <div class="buttons-set form-buttons">
+ <button type="submit" title="<?php echo __('Continue') ?>" class="button"><span><span><?php echo __('Continue') ?></span></span></button>
+ </div>
+</form>
+<script type="text/javascript">
+ head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
+ "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
+ "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
+ "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
+ "<?php echo $this->getViewFileUrl('Magento_Sales::orders-returns.js');?>", function() {
+ jQuery('#oar-widget-orders-and-returns-form').ordersReturns().validation();
+ });
+</script>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/checkout_onepage_index.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/checkout_onepage_index.xml
new file mode 100644
index 00000000000..4a86287bbdf
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/checkout_onepage_index.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <remove name="sale.reorder.sidebar"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/customer_account.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/customer_account.xml
new file mode 100644
index 00000000000..75eef0fe596
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/customer_account.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceBlock name="customer_account_navigation">
+ <block class="Magento\Page\Block\Link\Current" name="customer-account-navigation-billing-agreements-link">
+ <arguments>
+ <argument name="path" xsi:type="string">sales/billing_agreement</argument>
+ <argument name="label" xsi:type="string">Billing Agreements</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Link\Current" name="customer-account-navigation-orders-link">
+ <arguments>
+ <argument name="path" xsi:type="string">sales/order/history</argument>
+ <argument name="label" xsi:type="string">My Orders</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Link\Current" name="customer-account-navigation-recurring-profiles-link">
+ <arguments>
+ <argument name="path" xsi:type="string">sales/recurring_profile</argument>
+ <argument name="label" xsi:type="string">Recurring Profiles</argument>
+ </arguments>
+ </block>
+ </referenceBlock>
+ <referenceContainer name="left">
+ <block class="Magento\Sales\Block\Reorder\Sidebar" name="sale.reorder.sidebar" as="reorder" template="reorder/sidebar.phtml"/>
+ </referenceContainer>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_billing_agreement_index.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_billing_agreement_index.xml
new file mode 100644
index 00000000000..70ae62068e2
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_billing_agreement_index.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Billing Agreement" type="page" parent="customer_account_index">
+ <update handle="customer_account"/>
+ <referenceBlock name="root">
+ <action method="setTemplate">
+ <argument name="template" xsi:type="string">2columns-left.phtml</argument>
+ </action>
+ </referenceBlock>
+ <referenceContainer name="my.account.wrapper">
+ <block class="Magento\Sales\Block\Billing\Agreements" name="customer.account.billing.agreement" template="billing/agreements.phtml"/>
+ </referenceContainer>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_billing_agreement_view.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_billing_agreement_view.xml
new file mode 100644
index 00000000000..038fd3576a1
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_billing_agreement_view.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Billing Agreement View" type="page" parent="sales_billing_agreement_index">
+ <update handle="customer_account"/>
+ <referenceBlock name="root">
+ <action method="setTemplate">
+ <argument name="template" xsi:type="string">2columns-left.phtml</argument>
+ </action>
+ </referenceBlock>
+ <referenceContainer name="my.account.wrapper">
+ <block class="Magento\Sales\Block\Billing\Agreement\View" name="customer.account.billing.agreement" template="billing/agreement/view.phtml"/>
+ </referenceContainer>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_creditmemo_items.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_creditmemo_items.xml
new file mode 100644
index 00000000000..7350fc373ea
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_creditmemo_items.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Email Creditmemo Items List" type="page">
+ <block class="Magento\Sales\Block\Order\Email\Creditmemo\Items" name="items" template="email/creditmemo/items.phtml">
+ <block class="Magento\Sales\Block\Order\Email\Items\DefaultItems" as="default" template="email/items/creditmemo/default.phtml"/>
+ <block class="Magento\Sales\Block\Order\Email\Items\Order\Grouped" as="grouped" template="email/items/creditmemo/default.phtml"/>
+ <block class="Magento\Sales\Block\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
+ <action method="setLabelProperties">
+ <argument name="value" xsi:type="string">colspan="3" align="right" style="padding:3px 9px"</argument>
+ </action>
+ <action method="setValueProperties">
+ <argument name="value" xsi:type="string">align="right" style="padding:3px 9px"</argument>
+ </action>
+ <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
+ </block>
+ </block>
+ <container name="additional.product.info" label="Additional Product Info"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_invoice_items.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_invoice_items.xml
new file mode 100644
index 00000000000..93e1dfe0713
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_invoice_items.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Email Invoice Items List" type="page">
+ <block class="Magento\Sales\Block\Order\Email\Invoice\Items" name="items" template="email/invoice/items.phtml">
+ <block class="Magento\Sales\Block\Order\Email\Items\DefaultItems" as="default" template="email/items/invoice/default.phtml"/>
+ <block class="Magento\Sales\Block\Order\Email\Items\Order\Grouped" as="grouped" template="email/items/invoice/default.phtml"/>
+ <block class="Magento\Sales\Block\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
+ <action method="setLabelProperties">
+ <argument name="value" xsi:type="string">colspan="3" align="right" style="padding:3px 9px"</argument>
+ </action>
+ <action method="setValueProperties">
+ <argument name="value" xsi:type="string">align="right" style="padding:3px 9px"</argument>
+ </action>
+ <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
+ </block>
+ </block>
+ <container name="additional.product.info" label="Additional Product Info"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_items.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_items.xml
new file mode 100644
index 00000000000..ec42d71fb15
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_items.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Email Order Items List" type="page">
+ <block class="Magento\Sales\Block\Order\Email\Items" name="items" template="email/items.phtml">
+ <block class="Magento\Sales\Block\Order\Email\Items\Order\DefaultOrder" as="default" template="email/items/order/default.phtml"/>
+ <block class="Magento\Sales\Block\Order\Email\Items\Order\Grouped" as="grouped" template="email/items/order/default.phtml"/>
+ <block class="Magento\Sales\Block\Order\Totals" name="order_totals" template="order/totals.phtml">
+ <action method="setLabelProperties">
+ <argument name="value" xsi:type="string">colspan="3" align="right" style="padding:3px 9px"</argument>
+ </action>
+ <action method="setValueProperties">
+ <argument name="value" xsi:type="string">align="right" style="padding:3px 9px"</argument>
+ </action>
+ <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml">
+ <action method="setIsPlaneMode">
+ <argument name="value" xsi:type="string">1</argument>
+ </action>
+ </block>
+ </block>
+ </block>
+ <container name="additional.product.info" label="Additional Product Info"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_shipment_items.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_shipment_items.xml
new file mode 100644
index 00000000000..948e627b452
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_shipment_items.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Email Shipment Items List" type="page">
+ <block class="Magento\Sales\Block\Order\Email\Shipment\Items" name="items" template="email/shipment/items.phtml">
+ <block class="Magento\Sales\Block\Order\Email\Items\DefaultItems" as="default" template="email/items/shipment/default.phtml"/>
+ </block>
+ <container name="additional.product.info" label="Additional Product Info"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_creditmemo.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_creditmemo.xml
new file mode 100644
index 00000000000..70dc1029c0a
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_creditmemo.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Guest Order Creditmemo View" type="page">
+ <referenceBlock name="root">
+ <action method="setTemplate">
+ <argument name="template" xsi:type="string">1column.phtml</argument>
+ </action>
+ </referenceBlock>
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
+ <block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons"/>
+ </block>
+ <block class="Magento\Sales\Block\Order\Creditmemo" name="sales.order.creditmemo" after="sales.order.info">
+ <block class="Magento\Sales\Block\Order\Creditmemo\Items" name="creditmemo_items" template="order/creditmemo/items.phtml">
+ <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/creditmemo/items/renderer/default.phtml"/>
+ <block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/creditmemo/items/renderer/default.phtml"/>
+ <block class="Magento\Sales\Block\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
+ <action method="setLabelProperties">
+ <argument name="value" xsi:type="string">colspan="6" class="a-right"</argument>
+ </action>
+ <action method="setValueProperties">
+ <argument name="value" xsi:type="string">class="a-right"</argument>
+ </action>
+ <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
+ </block>
+ <block class="Magento\Sales\Block\Order\Comments" name="creditmemo_comments" template="order/comments.phtml"/>
+ </block>
+ </block>
+ </referenceContainer>
+ <update handle="sales_order_guest_info_links"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_form.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_form.xml
new file mode 100644
index 00000000000..fd9731b7a37
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_form.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Returns" type="page">
+ <referenceBlock name="root">
+ <action method="setTemplate">
+ <argument name="template" xsi:type="string">1column.phtml</argument>
+ </action>
+ </referenceBlock>
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Widget\Guest\Form" name="guest.form" template="guest/form.phtml"/>
+ </referenceContainer>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_invoice.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_invoice.xml
new file mode 100644
index 00000000000..c2fb543c553
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_invoice.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Guest Order Invoice View" type="page">
+ <referenceBlock name="root">
+ <action method="setTemplate">
+ <argument name="template" xsi:type="string">1column.phtml</argument>
+ </action>
+ </referenceBlock>
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
+ <block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons"/>
+ </block>
+ <block class="Magento\Sales\Block\Order\Invoice" name="sales.order.invoice" after="sales.order.info">
+ <block class="Magento\Sales\Block\Order\Invoice\Items" name="invoice_items" template="order/invoice/items.phtml">
+ <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/invoice/items/renderer/default.phtml"/>
+ <block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/invoice/items/renderer/default.phtml"/>
+ <block class="Magento\Sales\Block\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
+ <action method="setLabelProperties">
+ <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
+ </action>
+ <action method="setValueProperties">
+ <argument name="value" xsi:type="string">class="last a-right"</argument>
+ </action>
+ <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
+ </block>
+ <block class="Magento\Sales\Block\Order\Comments" name="invoice_comments" template="order/comments.phtml"/>
+ </block>
+ </block>
+ </referenceContainer>
+ <update handle="sales_order_guest_info_links"/>
+</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_order_printorder.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printorder.xml
similarity index 78%
rename from app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_order_printorder.xml
rename to app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printorder.xml
index 7f7eff98c8d..5a1ff2d5430 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_order_printorder.xml
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printorder.xml
@@ -29,17 +29,18 @@
<block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Totals" name="order_totals" template="order/totals.phtml">
- <arguments>
- <argument name="label_properties" xsi:type="string">colspan="4" class="mark"</argument>
- <argument name="value_properties" xsi:type="string">class="amount"</argument>
- </arguments>
+ <action method="setLabelProperties">
+ <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
+ </action>
+ <action method="setValueProperties">
+ <argument name="value" xsi:type="string">class="last a-right"</argument>
+ </action>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml">
- <arguments>
- <argument name="is_plane_mode" xsi:type="string">1</argument>
- </arguments>
+ <action method="setIsPlaneMode">
+ <argument name="value" xsi:type="string">1</argument>
+ </action>
</block>
</block>
</block>
</referenceContainer>
- <container name="additional.product.info" label="Additional Product Info"/>
</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printordercreditmemo.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printordercreditmemo.xml
new file mode 100644
index 00000000000..489ba2241c6
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printordercreditmemo.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Creditmemo Print View" type="page">
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Order\PrintOrder\Creditmemo" name="sales.order.print.creditmemo" template="order/print/creditmemo.phtml">
+ <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/creditmemo/items/renderer/default.phtml"/>
+ <block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/creditmemo/items/renderer/default.phtml"/>
+ <block class="Magento\Sales\Block\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
+ <action method="setLabelProperties">
+ <argument name="value" xsi:type="string">colspan="6" class="a-right"</argument>
+ </action>
+ <action method="setValueProperties">
+ <argument name="value" xsi:type="string">class="a-right"</argument>
+ </action>
+ <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
+ </block>
+ </block>
+ </referenceContainer>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printorderinvoice.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printorderinvoice.xml
new file mode 100644
index 00000000000..818d84ca64a
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printorderinvoice.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Invoice Print View" type="page">
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Order\PrintOrder\Invoice" name="sales.order.print.invoice" template="order/print/invoice.phtml">
+ <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/invoice/items/renderer/default.phtml"/>
+ <block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/invoice/items/renderer/default.phtml"/>
+ <block class="Magento\Sales\Block\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
+ <action method="setLabelProperties">
+ <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
+ </action>
+ <action method="setValueProperties">
+ <argument name="value" xsi:type="string">class="last a-right"</argument>
+ </action>
+ <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
+ </block>
+ </block>
+ </referenceContainer>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printshipment.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printshipment.xml
new file mode 100644
index 00000000000..c9b3c3dd228
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printshipment.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Shipment Print View" type="page">
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Order\PrintOrder\Shipment" name="sales.order.print.shipment" template="order/print/shipment.phtml">
+ <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/shipment/items/renderer/default.phtml"/>
+ </block>
+ </referenceContainer>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_reorder.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_reorder.xml
new file mode 100644
index 00000000000..a5a1d6d97da
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_reorder.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Guest Reorder" type="page">
+ <referenceBlock name="root">
+ <action method="setTemplate">
+ <argument name="template" xsi:type="string">1column.phtml</argument>
+ </action>
+ </referenceBlock>
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Order\View" name="sales.order.view"/>
+ </referenceContainer>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_shipment.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_shipment.xml
new file mode 100644
index 00000000000..1ca20c876af
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_shipment.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Guest Order Shipment View" type="page">
+ <referenceBlock name="root">
+ <action method="setTemplate">
+ <argument name="template" xsi:type="string">1column.phtml</argument>
+ </action>
+ </referenceBlock>
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
+ <block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons"/>
+ </block>
+ <block class="Magento\Sales\Block\Order\Shipment" name="sales.order.shipment" after="sales.order.info">
+ <block class="Magento\Sales\Block\Order\Shipment\Items" name="shipment_items" template="order/shipment/items.phtml">
+ <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/shipment/items/renderer/default.phtml"/>
+ <block class="Magento\Sales\Block\Order\Comments" name="shipment_comments" template="order/comments.phtml"/>
+ </block>
+ </block>
+ </referenceContainer>
+ <update handle="sales_order_guest_info_links"/>
+</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_guest_view.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_view.xml
similarity index 83%
rename from app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_guest_view.xml
rename to app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_view.xml
index 0e6bfb02a39..42d410a682a 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_guest_view.xml
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_view.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Guest Order View" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Guest Order View" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
@@ -38,14 +38,16 @@
<block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Totals" name="order_totals" template="order/totals.phtml">
- <arguments>
- <argument name="label_properties" xsi:type="string">colspan="4" class="mark"</argument>
- <argument name="value_properties" xsi:type="string">class="amount"</argument>
- </arguments>
+ <action method="setLabelProperties">
+ <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
+ </action>
+ <action method="setValueProperties">
+ <argument name="value" xsi:type="string">class="last a-right"</argument>
+ </action>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
</block>
</block>
</block>
</referenceContainer>
- <update handle="sales_order_info_links"/>
+ <update handle="sales_order_guest_info_links"/>
</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_order_creditmemo.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_creditmemo.xml
similarity index 82%
rename from app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_order_creditmemo.xml
rename to app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_creditmemo.xml
index 194a0cd2434..a5148446939 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_order_creditmemo.xml
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_creditmemo.xml
@@ -23,9 +23,9 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Order Creditmemo View" type="page" parent="sales_order_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Order Creditmemo View" type="page">
<update handle="customer_account"/>
- <referenceBlock name="my.account.wrapper">
+ <referenceContainer name="my.account.wrapper">
<block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
<block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons"/>
</block>
@@ -34,16 +34,18 @@
<block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/creditmemo/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/creditmemo/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
- <arguments>
- <argument name="label_properties" xsi:type="string">colspan="6" class="mark"</argument>
- <argument name="value_properties" xsi:type="string">class="amount"</argument>
- </arguments>
+ <action method="setLabelProperties">
+ <argument name="value" xsi:type="string">colspan="6" class="a-right"</argument>
+ </action>
+ <action method="setValueProperties">
+ <argument name="value" xsi:type="string">class="a-right"</argument>
+ </action>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
</block>
<block class="Magento\Sales\Block\Order\Comments" name="creditmemo_comments" template="order/comments.phtml"/>
</block>
</block>
- </referenceBlock>
+ </referenceContainer>
<update handle="sales_order_info_links"/>
<container name="additional.product.info" label="Additional Product Info"/>
</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_order_info_links.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_guest_info_links.xml
similarity index 92%
rename from app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_order_info_links.xml
rename to app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_guest_info_links.xml
index 20aa47ee1d7..d01be782ea8 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_order_info_links.xml
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_guest_info_links.xml
@@ -26,33 +26,30 @@
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="sales.order.info">
<block class="Magento\Page\Block\Links" as="links" name="sales.order.info.links">
- <arguments>
- <argument name="css_class" xsi:type="string">items</argument>
- </arguments>
<block class="Magento\Sales\Block\Order\Link" name="sales.order.info.links.billing-agreements">
<arguments>
- <argument name="path" xsi:type="string">sales/order/view</argument>
+ <argument name="path" xsi:type="string">sales/guest/view</argument>
<argument name="label" xsi:type="string">Order Information</argument>
</arguments>
</block>
<block class="Magento\Sales\Block\Order\Link" name="sales.order.info.links.invoice">
<arguments>
<argument name="key" xsi:type="string">Invoices</argument>
- <argument name="path" xsi:type="string">sales/order/invoice</argument>
+ <argument name="path" xsi:type="string">sales/guest/invoice</argument>
<argument name="label" xsi:type="string">Invoices</argument>
</arguments>
</block>
<block class="Magento\Sales\Block\Order\Link" name="sales.order.info.links.shipment">
<arguments>
<argument name="key" xsi:type="string">Shipments</argument>
- <argument name="path" xsi:type="string">sales/order/shipment</argument>
+ <argument name="path" xsi:type="string">sales/guest/shipment</argument>
<argument name="label" xsi:type="string">Order Shipments</argument>
</arguments>
</block>
<block class="Magento\Sales\Block\Order\Link" name="sales.order.info.links.creditmemo">
<arguments>
<argument name="key" xsi:type="string">Creditmemos</argument>
- <argument name="path" xsi:type="string">sales/order/creditmemo</argument>
+ <argument name="path" xsi:type="string">sales/guest/creditmemo</argument>
<argument name="label" xsi:type="string">Refunds</argument>
</arguments>
</block>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_history.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_history.xml
new file mode 100644
index 00000000000..244db3b4843
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_history.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Order History" type="page">
+ <update handle="customer_account"/>
+ <referenceContainer name="my.account.wrapper">
+ <block class="Magento\Sales\Block\Order\History" name="sales.order.history">
+ <container name="sales.order.history.info" as="info" label="Order History Info"/>
+ </block>
+ <block class="Magento\Customer\Block\Account\Dashboard" name="customer.account.link.back" template="account/link/back.phtml"/>
+ </referenceContainer>
+</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_order_invoice.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_invoice.xml
similarity index 82%
rename from app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_order_invoice.xml
rename to app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_invoice.xml
index f40d14e2ee5..247e96bd3b7 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_order_invoice.xml
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_invoice.xml
@@ -23,9 +23,9 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Order Invoice View" type="page" parent="sales_order_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Order Invoice View" type="page">
<update handle="customer_account"/>
- <referenceBlock name="my.account.wrapper">
+ <referenceContainer name="my.account.wrapper">
<block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
<block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons"/>
</block>
@@ -34,16 +34,18 @@
<block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/invoice/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/invoice/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
- <arguments>
- <argument name="label_properties" xsi:type="string">colspan="4" class="mark"</argument>
- <argument name="value_properties" xsi:type="string">class="amount"</argument>
- </arguments>
+ <action method="setLabelProperties">
+ <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
+ </action>
+ <action method="setValueProperties">
+ <argument name="value" xsi:type="string">class="last a-right"</argument>
+ </action>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
</block>
<block class="Magento\Sales\Block\Order\Comments" name="invoice_comments" template="order/comments.phtml"/>
</block>
</block>
- </referenceBlock>
+ </referenceContainer>
<update handle="sales_order_info_links"/>
<container name="additional.product.info" label="Additional Product Info"/>
</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_order_printordercreditmemo.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printordercreditmemo.xml
similarity index 82%
rename from app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_order_printordercreditmemo.xml
rename to app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printordercreditmemo.xml
index 71bc0ee17df..335d8293230 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_order_printordercreditmemo.xml
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printordercreditmemo.xml
@@ -23,16 +23,18 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Creditmemo Print View" type="page" parent="sales_order_print">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Creditmemo Print View" type="page">
<referenceContainer name="content">
<block class="Magento\Sales\Block\Order\PrintOrder\Creditmemo" name="sales.order.print.creditmemo" template="order/print/creditmemo.phtml">
<block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/creditmemo/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/creditmemo/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Creditmemo\Totals" name="creditmemo_totals" template="order/totals.phtml">
- <arguments>
- <argument name="label_properties" xsi:type="string">colspan="6" class="mark"</argument>
- <argument name="value_properties" xsi:type="string">class="amount"</argument>
- </arguments>
+ <action method="setLabelProperties">
+ <argument name="value" xsi:type="string">colspan="6" class="a-right"</argument>
+ </action>
+ <action method="setValueProperties">
+ <argument name="value" xsi:type="string">class="a-right"</argument>
+ </action>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
</block>
</block>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_order_printorderinvoice.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printorderinvoice.xml
similarity index 82%
rename from app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_order_printorderinvoice.xml
rename to app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printorderinvoice.xml
index cca9e34aee1..6b30b48bda5 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_order_printorderinvoice.xml
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printorderinvoice.xml
@@ -23,16 +23,18 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Invoice Print View" type="page" parent="sales_order_print">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Invoice Print View" type="page">
<referenceContainer name="content">
<block class="Magento\Sales\Block\Order\PrintOrder\Invoice" name="sales.order.print.invoice" template="order/print/invoice.phtml">
<block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/invoice/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/invoice/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Invoice\Totals" name="invoice_totals" template="order/totals.phtml">
- <arguments>
- <argument name="label_properties" xsi:type="string">colspan="4" class="mark"</argument>
- <argument name="value_properties" xsi:type="string">class="amount"</argument>
- </arguments>
+ <action method="setLabelProperties">
+ <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
+ </action>
+ <action method="setValueProperties">
+ <argument name="value" xsi:type="string">class="last a-right"</argument>
+ </action>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
</block>
</block>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printshipment.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printshipment.xml
new file mode 100644
index 00000000000..e9f1682cde3
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printshipment.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Shipment Print View" type="page">
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Order\PrintOrder\Shipment" name="sales.order.print.shipment" template="order/print/shipment.phtml">
+ <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/shipment/items/renderer/default.phtml"/>
+ </block>
+ </referenceContainer>
+ <container name="additional.product.info" label="Additional Product Info"/>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_reorder.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_reorder.xml
new file mode 100644
index 00000000000..c246af7a129
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_reorder.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Sales Reorder" type="page">
+ <update handle="customer_account"/>
+ <referenceContainer name="content">
+ <block class="Magento\Sales\Block\Order\View" name="sales.order.view"/>
+ </referenceContainer>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_shipment.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_shipment.xml
new file mode 100644
index 00000000000..b48bbb83697
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_shipment.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Order Shipment View" type="page">
+ <update handle="customer_account"/>
+ <referenceContainer name="my.account.wrapper">
+ <block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
+ <block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons"/>
+ </block>
+ <block class="Magento\Sales\Block\Order\Shipment" name="sales.order.shipment" after="sales.order.info">
+ <block class="Magento\Sales\Block\Order\Shipment\Items" name="shipment_items" template="order/shipment/items.phtml">
+ <block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/shipment/items/renderer/default.phtml"/>
+ <block class="Magento\Sales\Block\Order\Comments" name="shipment_comments" template="order/comments.phtml"/>
+ </block>
+ </block>
+ </referenceContainer>
+ <update handle="sales_order_info_links"/>
+ <container name="additional.product.info" label="Additional Product Info"/>
+</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_order_view.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_view.xml
similarity index 81%
rename from app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_order_view.xml
rename to app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_view.xml
index 8ea32e55ea7..4d1d1ab35bf 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/layout/override/sales_order_view.xml
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_view.xml
@@ -23,9 +23,9 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Order View" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Order View" type="page">
<update handle="customer_account"/>
- <referenceBlock name="my.account.wrapper">
+ <referenceContainer name="my.account.wrapper">
<block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info">
<block class="Magento\Sales\Block\Order\Info\Buttons" as="buttons" name="sales.order.info.buttons"/>
</block>
@@ -34,15 +34,17 @@
<block class="Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer" as="default" template="order/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Item\Renderer\Grouped" as="grouped" template="order/items/renderer/default.phtml"/>
<block class="Magento\Sales\Block\Order\Totals" name="order_totals" template="order/totals.phtml">
- <arguments>
- <argument name="label_properties" xsi:type="string">colspan="4" class="mark"</argument>
- <argument name="value_properties" xsi:type="string">class="amount"</argument>
- </arguments>
+ <action method="setLabelProperties">
+ <argument name="value" xsi:type="string">colspan="4" class="a-right"</argument>
+ </action>
+ <action method="setValueProperties">
+ <argument name="value" xsi:type="string">class="last a-right"</argument>
+ </action>
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
</block>
</block>
</block>
- </referenceBlock>
+ </referenceContainer>
<update handle="sales_order_info_links"/>
<container name="additional.product.info" label="Additional Product Info"/>
</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_index.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_index.xml
new file mode 100644
index 00000000000..36d4758c9a0
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_index.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Recurring Profile" type="page" parent="customer_account_index">
+ <update handle="customer_account"/>
+ <referenceBlock name="root">
+ <action method="setTemplate">
+ <argument name="template" xsi:type="string">2columns-left.phtml</argument>
+ </action>
+ </referenceBlock>
+ <referenceContainer name="my.account.wrapper">
+ <block class="Magento\Sales\Block\Recurring\Profiles" name="sales.recurring.profiles" template="recurring/profiles.phtml">
+ <block class="Magento\Sales\Block\Recurring\Profile\Grid" name="sales.recurring.profiles.grid" as="grid" template="recurring/grid.phtml">
+ <action method="setEmptyGridMessage">
+ <argument translate="true" name="value" xsi:type="string">There are no recurring profiles yet.</argument>
+ </action>
+ <action method="setGridHtmlId">
+ <argument name="value" xsi:type="string">recurring_profile_list_view</argument>
+ </action>
+ </block>
+ </block>
+ </referenceContainer>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_orders.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_orders.xml
new file mode 100644
index 00000000000..7172f01d739
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_orders.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Recurring Profile Orders List" type="page" parent="sales_recurring_profile_view__tabs">
+ <update handle="customer_account"/>
+ <update handle="sales_recurring_profile_view__tabs"/>
+ <referenceBlock name="sales.recurring.profile.view.tab.orders">
+ <action method="setIsViewCurrent">
+ <argument name="v" xsi:type="string">1</argument>
+ </action>
+ </referenceBlock>
+ <referenceBlock name="sales.recurring.profile.view">
+ <block class="Magento\Sales\Block\Recurring\Profile\Related\Orders\Grid" name="sales.recurring.profile.view.orders" as="table" template="recurring/grid.phtml">
+ <action method="setViewLabel">
+ <argument translate="true" name="value" xsi:type="string">Orders Based on This Profile</argument>
+ </action>
+ <action method="setEmptyGridMessage">
+ <argument translate="true" name="value" xsi:type="string">There are no orders yet.</argument>
+ </action>
+ <action method="setGridHtmlClass">
+ <argument name="value" xsi:type="string">info-box</argument>
+ </action>
+ <action method="setGridHtmlCss">
+ <argument name="value" xsi:type="string">border:0</argument>
+ </action>
+ </block>
+ </referenceBlock>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_view.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_view.xml
new file mode 100644
index 00000000000..ee5837b43e6
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_view.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Recurring Profile View" type="page" parent="sales_recurring_profile_view__tabs">
+ <update handle="customer_account"/>
+ <update handle="sales_recurring_profile_view__tabs"/>
+ <referenceBlock name="sales.recurring.profile.view.tab.profile">
+ <action method="setIsViewCurrent">
+ <argument name="v" xsi:type="string">1</argument>
+ </action>
+ </referenceBlock>
+ <referenceBlock name="sales.recurring.profile.view">
+ <block class="Magento\Sales\Block\Recurring\Profile\View\Schedule" name="sales.recurring.profile.view.general" as="general" template="recurring/profile/view/info.phtml" group="info_blocks_row_1">
+ <action method="setViewColumn">
+ <argument name="value" xsi:type="string">1</argument>
+ </action>
+ <action method="setViewLabel">
+ <argument translate="true" name="value" xsi:type="string">Reference</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Recurring\Profile\View\Item" name="sales.recurring.profile.view.item" as="item" template="recurring/profile/view/info.phtml" group="info_blocks_row_1">
+ <action method="setViewColumn">
+ <argument name="value" xsi:type="string">2</argument>
+ </action>
+ <action method="setViewLabel">
+ <argument translate="true" name="value" xsi:type="string">Purchased Item</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Recurring\Profile\View\Schedule" name="sales.recurring.profile.view.schedule" as="profile" template="recurring/profile/view/info.phtml" group="info_blocks_row_2">
+ <action method="setViewColumn">
+ <argument name="value" xsi:type="string">1</argument>
+ </action>
+ <action method="setViewLabel">
+ <argument translate="true" name="value" xsi:type="string">Profile Schedule</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Recurring\Profile\View\Fees" name="sales.recurring.profile.view.fees" as="fees" template="recurring/profile/view/info.phtml" group="info_blocks_row_2">
+ <action method="setViewColumn">
+ <argument name="value" xsi:type="string">2</argument>
+ </action>
+ <action method="setViewLabel">
+ <argument translate="true" name="value" xsi:type="string">Profile Payments</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Recurring\Profile\View\Address" name="sales.recurring.profile.view.billing" as="billing_address" template="recurring/profile/view/info.phtml" group="info_blocks_row_3">
+ <action method="setViewColumn">
+ <argument name="value" xsi:type="string">1</argument>
+ </action>
+ <action method="setViewLabel">
+ <argument translate="true" name="value" xsi:type="string">Billing Address</argument>
+ </action>
+ </block>
+ <block class="Magento\Sales\Block\Recurring\Profile\View\Address" name="sales.recurring.profile.view.shipping" as="shipping_address" template="recurring/profile/view/info.phtml" group="info_blocks_row_3">
+ <action method="setAddressType">
+ <argument name="value" xsi:type="string">shipping</argument>
+ </action>
+ <action method="setViewColumn">
+ <argument name="value" xsi:type="string">2</argument>
+ </action>
+ <action method="setViewLabel">
+ <argument translate="true" name="value" xsi:type="string">Shipping Address</argument>
+ </action>
+ </block>
+ </referenceBlock>
+</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_view__tabs.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_view__tabs.xml
new file mode 100644
index 00000000000..4110ed7fbf7
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_view__tabs.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Recurring Profile View Tabs" type="page" parent="sales_recurring_profile_index">
+ <referenceBlock name="root">
+ <action method="setTemplate">
+ <argument name="template" xsi:type="string">2columns-left.phtml</argument>
+ </action>
+ </referenceBlock>
+ <referenceContainer name="my.account.wrapper">
+ <block class="Magento\Sales\Block\Recurring\Profile\View\Data" name="sales.recurring.profile.view" template="recurring/profile/view.phtml">
+ <action method="setShouldPrepareInfoTabs">
+ <argument name="value" xsi:type="string">1</argument>
+ </action>
+ <block class="Magento\Core\Block\Text" as="profile_info" name="sales.recurring.profile.view.tab.profile" group="info_tabs">
+ <action method="setViewLabel">
+ <argument translate="true" name="value" xsi:type="string">Profile Information</argument>
+ </action>
+ <action method="setViewAction">
+ <argument name="value" xsi:type="string">view</argument>
+ </action>
+ </block>
+ <!-- not implemented
+ <block class="Magento\Core\Block\Text" as="history" name="sales.recurring.profile.view.tab.history">
+ <action method="addToParentGroup">
+ <argument name="value" xsi:type="string">info_tabs</argument>
+ </action>
+ <action method="setViewLabel" translate="value">
+ <argument name="value" xsi:type="string">History</argument>
+ </action>
+ <action method="setViewAction">
+ <argument name="value" xsi:type="string">history</argument>
+ </action>
+ </block>
+ -->
+ <block class="Magento\Core\Block\Text" as="related_orders" name="sales.recurring.profile.view.tab.orders" group="info_tabs">
+ <action method="setViewLabel">
+ <argument translate="true" name="value" xsi:type="string">Related Orders</argument>
+ </action>
+ <action method="setViewAction">
+ <argument name="value" xsi:type="string">orders</argument>
+ </action>
+ </block>
+ <!-- not implemented
+ <block class="Magento\Core\Block\Text" as="vendor_info" name="sales.recurring.profile.view.tab.vendor">
+ <action method="addToParentGroup">
+ <argument name="value" xsi:type="string">info_tabs</argument>
+ </action>
+ <action method="setViewLabel" translate="value">
+ <argument name="value" xsi:type="string">Gateway Information</argument>
+ </action>
+ <action method="setViewAction">
+ <argument name="value" xsi:type="string">vendor</argument>
+ </action>
+ </block>
+ -->
+ </block>
+ </referenceContainer>
+</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/order/comments.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/comments.phtml
similarity index 75%
rename from app/design/frontend/magento_plushe/Magento_Sales/order/comments.phtml
rename to app/design/frontend/magento_backup/Magento_Sales/order/comments.phtml
index bd9d1a61b54..fcf34f53ce6 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/order/comments.phtml
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/comments.phtml
@@ -19,6 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
+ * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -30,12 +31,12 @@
*/
?>
<?php if ($this->hasComments()):?>
- <div class="order additional details comments">
- <h3 class="subtitle"><?php echo $this->getTitle() ?></h3>
- <dl class="order comments">
+ <div class="order-additional order-comments">
+ <h2 class="sub-title"><?php echo $this->getTitle() ?></h2>
+ <dl class="order-about">
<?php foreach ($this->getComments() as $_commentItem): ?>
- <dt class="comment date"><?php echo $this->formatDate($_commentItem->getCreatedAtStoreDate(), 'medium', true) ?></dt>
- <dd class="comment text"><?php echo $this->escapeHtml($_commentItem->getComment()) ?></dd>
+ <dt><?php echo $this->formatDate($_commentItem->getCreatedAtStoreDate(), 'medium', true) ?></dt>
+ <dd><?php echo $this->escapeHtml($_commentItem->getComment()) ?></dd>
<?php endforeach; ?>
</dl>
</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/order/creditmemo.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo.phtml
similarity index 78%
rename from app/design/frontend/magento_plushe/Magento_Sales/order/creditmemo.phtml
rename to app/design/frontend/magento_backup/Magento_Sales/order/creditmemo.phtml
index 247b9c52366..3b8c8c263ad 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/order/creditmemo.phtml
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo.phtml
@@ -19,17 +19,14 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
+ * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<div class="order details items creditmemo">
+<div class="order-items order-details">
<?php echo $this->getChildHtml('creditmemo_items') ?>
- <div class="actions">
- <div class="secondary">
- <a href="<?php echo $this->getBackUrl() ?>" class="action back">
- <span><?php echo $this->getBackTitle() ?></span>
- </a>
- </div>
+ <div class="buttons-set">
+ <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo $this->getBackTitle() ?></a></p>
</div>
</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/order/creditmemo/items.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items.phtml
similarity index 52%
rename from app/design/frontend/magento_plushe/Magento_Sales/order/creditmemo/items.phtml
rename to app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items.phtml
index 5c3d8d85590..004e32fa503 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/order/creditmemo/items.phtml
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items.phtml
@@ -19,41 +19,33 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
+ * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php $_order = $this->getOrder() ?>
-<div class="order toolbar">
- <div class="actions">
- <a href="<?php echo $this->getPrintAllCreditmemosUrl($_order) ?>"
- onclick="this.target='_blank'"
- class="action print">
- <span><?php echo __('Print All Refunds') ?></span>
- </a>
- </div>
-</div>
+<p class="order-links"><a href="<?php echo $this->getPrintAllCreditmemosUrl($_order) ?>" onclick="this.target='_blank'" class="link-print"><?php echo __('Print All Refunds') ?></a></p>
<?php foreach ($_order->getCreditmemosCollection() as $_creditmemo): ?>
-<div class="order title">
- <strong><?php echo __('Refund #') ?><?php echo $_creditmemo->getIncrementId(); ?> </strong>
- <a href="<?php echo $this->getPrintCreditmemoUrl($_creditmemo) ?>"
- onclick="this.target='_blank'"
- class="action print">
- <span><?php echo __('Print Refund') ?></span>
- </a>
-</div>
-
-<div class="order subtitle caption"><strong><?php echo __('Items Refunded') ?></strong></div>
-<table class="data table order items creditmemo" id="my-refund-table-<?php echo $_creditmemo->getId(); ?>">
+<h2 class="sub-title"><?php echo __('Refund #') ?><?php echo $_creditmemo->getIncrementId(); ?> <span class="separator">|</span> <a href="<?php echo $this->getPrintCreditmemoUrl($_creditmemo) ?>" onclick="this.target='_blank'" class="link-print"><?php echo __('Print Refund') ?></a></h2>
+<h3 class="table-caption"><?php echo __('Items Refunded') ?></h3>
+<table class="data-table" id="my-refund-table-<?php echo $_creditmemo->getId(); ?>">
+ <col />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
<thead>
<tr>
- <th class="col name"><?php echo __('Product Name') ?></th>
- <th class="col sku"><?php echo __('SKU') ?></th>
- <th class="col price"><?php echo __('Price') ?></th>
- <th class="col qty"><?php echo __('Qty') ?></th>
- <th class="col subtotal"><?php echo __('Subtotal') ?></th>
- <th class="col discount"><?php echo __('Discount Amount') ?></th>
- <th class="col total"><?php echo __('Row Total') ?></th>
+ <th><?php echo __('Product Name') ?></th>
+ <th><?php echo __('SKU') ?></th>
+ <th class="a-right"><?php echo __('Price') ?></th>
+ <th class="a-center"><?php echo __('Qty') ?></th>
+ <th class="a-right"><?php echo __('Subtotal') ?></th>
+ <th class="a-center wrap"><?php echo __('Discount Amount') ?></th>
+ <th class="a-right wrap"><?php echo __('Row Total') ?></th>
</tr>
</thead>
<tfoot>
@@ -68,5 +60,6 @@
</tbody>
<?php endforeach; ?>
</table>
+<script type="text/javascript">(function($) {$('#my-refund-table-<?php echo $_creditmemo->getId(); ?>').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})})(jQuery)</script>
<?php echo $this->getCommentsHtml($_creditmemo)?>
<?php endforeach; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/order/creditmemo/items/renderer/default.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items/renderer/default.phtml
similarity index 95%
rename from app/design/frontend/magento_plushe/Magento_Sales/order/creditmemo/items/renderer/default.phtml
rename to app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items/renderer/default.phtml
index 65f32a6e195..5f717e6a19a 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/order/creditmemo/items/renderer/default.phtml
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items/renderer/default.phtml
@@ -27,10 +27,9 @@
<?php $_item = $this->getItem() ?>
<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
- <td class="col name">
- <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
+ <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
<?php if($_options = $this->getItemOptions()): ?>
- <dl class="item options">
+ <dl class="item-options">
<?php foreach ($_options as $_option) : ?>
<dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
<?php if (!$this->getPrintStatus()): ?>
@@ -38,7 +37,7 @@
<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
<?php if (isset($_formatedOptionValue['full_view'])): ?>
<div class="truncated_full_value">
- <dl class="item options">
+ <dl class="item-options">
<dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
</dl>
@@ -51,18 +50,6 @@
<?php endforeach; ?>
</dl>
<?php endif; ?>
-
- <!-- downloadable -->
- <?php if ($links = $this->getLinks()): ?>
- <dl class="item options">
- <dt><?php echo $this->getLinksTitle() ?></dt>
- <?php foreach ($links->getPurchasedItems() as $link): ?>
- <dd><?php echo $this->escapeHtml($link->getLinkTitle()); ?></dd>
- <?php endforeach; ?>
- </dl>
- <?php endif; ?>
- <!-- EOF downloadable -->
-
<?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
<?php if ($addInfoBlock) :?>
<?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
@@ -72,8 +59,8 @@
<a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $_item->getId()?>" data-item-id="<?php echo $_item->getId()?>"><?php echo __('Gift Message') ?></a>
<?php endif; ?>
</td>
- <td class="col sku"><?php echo $this->escapeHtml($this->helper('Magento\Core\Helper\String')->splitInjection($this->getSku())) ?></td>
- <td class="col price">
+ <td><?php echo $this->escapeHtml($this->helper('Magento\Core\Helper\String')->splitInjection($this->getSku())) ?></td>
+ <td class="a-right">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
<span class="price-excl-tax">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
@@ -189,8 +176,8 @@
</span>
<?php endif; ?>
</td>
- <td class="col qty"><?php echo $_item->getQty()*1 ?></td>
- <td class="col subtotal">
+ <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
+ <td class="a-right">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
<span class="price-excl-tax">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
@@ -308,8 +295,8 @@
</span>
<?php endif; ?>
</td>
- <td class="col discount"><?php echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
- <td class="cot total">
+ <td class="a-right"><?php echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
+ <td class="last a-right">
<?php echo $_order->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()) ?>
</td>
</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/history.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/history.phtml
new file mode 100644
index 00000000000..125c387f26f
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/history.phtml
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
+<?php $_orders = $this->getOrders(); ?>
+<div class="page-title">
+ <h1><?php echo __('My Orders') ?></h1>
+</div>
+<?php echo $this->getPagerHtml(); ?>
+<?php if($_orders->getSize()): ?>
+<table class="data-table" id="my-orders-table">
+ <col width="1" />
+ <col width="1" />
+ <col />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
+ <thead>
+ <tr>
+ <th><?php echo __('Order #') ?></th>
+ <th><?php echo __('Date') ?></th>
+ <th><?php echo __('Ship To') ?></th>
+ <th><span class="nobr"><?php echo __('Order Total') ?></span></th>
+ <th><span class="nobr"><?php echo __('Order Status') ?></span></th>
+ <th> </th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php $_odd = ''; ?>
+ <?php foreach ($_orders as $_order): ?>
+ <tr>
+ <td><?php echo $_order->getRealOrderId() ?></td>
+ <td><span class="nobr"><?php echo $this->formatDate($_order->getCreatedAtStoreDate()) ?></span></td>
+ <td><?php echo $_order->getShippingAddress() ? $this->escapeHtml($_order->getShippingAddress()->getName()) : ' ' ?></td>
+ <td><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
+ <td><em><?php echo $_order->getStatusLabel() ?></em></td>
+ <td class="a-center">
+ <span class="nobr"><a href="<?php echo $this->getViewUrl($_order) ?>"><?php echo __('View Order') ?></a>
+ <?php /*<span class="separator">|</span><a href="<?php echo $this->getTrackUrl($_order) ?>"><?php echo __('Track Order') ?></a> */ ?>
+ <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order)) : ?>
+ <span class="separator">|</span> <a href="<?php echo $this->getReorderUrl($_order) ?>" class="link-reorder"><?php echo __('Reorder') ?></a>
+ <?php endif ?>
+ </span>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+</table>
+<script type="text/javascript">(function($) {$('#my-orders-table').decorate('table')})(jQuery)</script>
+<?php echo $this->getPagerHtml(); ?>
+<?php else: ?>
+ <p><?php echo __('You have placed no orders.'); ?></p>
+<?php endif ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/info.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/info.phtml
new file mode 100644
index 00000000000..46a06098ebd
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/info.phtml
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php /** @var $this \Magento\Sales\Block\Order\Info */ ?>
+<?php $_order = $this->getOrder() ?>
+<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
+<div class="page-title title-buttons">
+ <h1><?php echo __('Order #%1 - %2', $_order->getRealOrderId(), $_order->getStatusLabel()) ?></h1>
+ <?php echo $this->getChildHtml('buttons') ?>
+</div>
+<?php echo $this->getStatusHistoryRssUrl($_order) ?>
+<dl class="order-info">
+ <dt><?php echo __('About This Order:') ?></dt>
+ <dd>
+ <?php echo $this->getChildHtml('links') ?>
+ <script type="text/javascript">(function($) {$('#order-info-tabs').find('li').decorate('generic', ['first','last'])})(jQuery)</script>
+ </dd>
+</dl>
+<p class="order-date"><?php echo __('Order Date: %1', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
+<?php if (!$_order->getIsVirtual()): ?>
+<div class="col2-set order-info-box">
+ <div class="col-1">
+ <div class="box">
+ <div class="box-title">
+ <h2><?php echo __('Shipping Address') ?></h2>
+ </div>
+ <div class="box-content">
+ <address><?php echo $_order->getShippingAddress()->format('html') ?></address>
+ </div>
+ </div>
+ </div>
+ <div class="col-2">
+ <div class="box">
+ <div class="box-title">
+ <h2><?php echo __('Shipping Method') ?></h2>
+ </div>
+ <div class="box-content">
+ <?php if ($_order->getShippingDescription()): ?>
+ <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
+ <?php else: ?>
+ <p><?php echo __('No shipping information available'); ?></p>
+ <?php endif; ?>
+ </div>
+ </div>
+ </div>
+</div>
+<?php endif; ?>
+<div class="col2-set order-info-box">
+ <div class="col-1">
+ <div class="box">
+ <div class="box-title">
+ <h2><?php echo __('Billing Address') ?></h2>
+ </div>
+ <div class="box-content">
+ <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
+ </div>
+ </div>
+ </div>
+ <div class="col-2">
+ <div class="box box-payment">
+ <div class="box-title">
+ <h2><?php echo __('Payment Method') ?></h2>
+ </div>
+ <div class="box-content">
+ <?php echo $this->getPaymentInfoHtml() ?>
+ </div>
+ </div>
+ </div>
+</div>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/info/buttons.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/info/buttons.phtml
new file mode 100644
index 00000000000..da314fcbd1b
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/info/buttons.phtml
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+
+<?php $_order = $this->getOrder() ?>
+<?php if($this->helper('Magento\Rss\Helper\Order')->isStatusNotificationAllow()): ?>
+ <a href="<?php echo $this->helper('Magento\Rss\Helper\Order')->getStatusHistoryRssUrl($_order) ?>" class="link-rss f-none"><?php echo __('Subscribe to Order Status') ?></a>
+ <span class="separator">|</span>
+<?php endif; ?>
+<?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order)) : ?>
+ <a href="<?php echo $this->getReorderUrl($_order) ?>" class="link-reorder"><?php echo __('Reorder') ?></a>
+ <span class="separator">|</span>
+<?php endif ?>
+<a href="<?php echo $this->getPrintUrl($_order) ?>" class="link-print" onclick="this.target='_blank';"><?php echo __('Print Order') ?></a>
+<?php echo $this->getChildHtml(); ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/order/invoice.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/invoice.phtml
similarity index 78%
rename from app/design/frontend/magento_plushe/Magento_Sales/order/invoice.phtml
rename to app/design/frontend/magento_backup/Magento_Sales/order/invoice.phtml
index fff36854de1..bef92be0054 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/order/invoice.phtml
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/invoice.phtml
@@ -19,17 +19,14 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
+ * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<div class="order details items invoice">
+<div class="order-items order-details">
<?php echo $this->getChildHtml('invoice_items') ?>
- <div class="actions">
- <div class="secondary">
- <a href="<?php echo $this->getBackUrl() ?>" class="action back">
- <span><?php echo $this->getBackTitle() ?></span>
- </a>
- </div>
+ <div class="buttons-set">
+ <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo $this->getBackTitle() ?></a></p>
</div>
</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/order/invoice/items.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/invoice/items.phtml
similarity index 54%
rename from app/design/frontend/magento_plushe/Magento_Sales/order/invoice/items.phtml
rename to app/design/frontend/magento_backup/Magento_Sales/order/invoice/items.phtml
index b9be6d9379d..dc4c5000e89 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/order/invoice/items.phtml
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/invoice/items.phtml
@@ -19,38 +19,29 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
+ * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<?php $_order = $this->getOrder() ?>
-<div class="order toolbar">
- <div class="actions">
- <a href="<?php echo $this->getPrintAllInvoicesUrl($_order) ?>"
- target="_blank"
- class="action print">
- <span><?php echo __('Print All Invoices') ?></span>
- </a>
- </div>
-</div>
+<?php $_order = $this->getOrder() ?>
+<p class="order-links"><a href="<?php echo $this->getPrintAllInvoicesUrl($_order) ?>" onclick="this.target='_blank'" class="link-print"><?php echo __('Print All Invoices') ?></a></p>
<?php foreach ($_order->getInvoiceCollection() as $_invoice): ?>
-<div class="order title">
- <strong><?php echo __('Invoice #') ?><?php echo $_invoice->getIncrementId(); ?></strong>
- <a href="<?php echo $this->getPrintInvoiceUrl($_invoice) ?>"
- onclick="this.target='_blank'"
- class="action print">
- <span><?php echo __('Print Invoice') ?></span>
- </a>
-</div>
-<div class="order subtitle caption"><strong><?php echo __('Items Invoiced') ?></strong></div>
-<table class="data table order items invoice" id="my-invoice-table-<?php echo $_invoice->getId(); ?>">
+<h2 class="sub-title"><?php echo __('Invoice #') ?><?php echo $_invoice->getIncrementId(); ?> <span class="separator">|</span> <a href="<?php echo $this->getPrintInvoiceUrl($_invoice) ?>" onclick="this.target='_blank'" class="link-print"><?php echo __('Print Invoice') ?></a></h2>
+<h3 class="table-caption"><?php echo __('Items Invoiced') ?></h3>
+<table class="data-table" id="my-invoice-table-<?php echo $_invoice->getId(); ?>">
+ <col />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
<thead>
<tr>
- <th class="col name"><?php echo __('Product Name') ?></th>
- <th class="col sku"><?php echo __('SKU') ?></th>
- <th class="col price"><?php echo __('Price') ?></th>
- <th class="col qty"><?php echo __('Qty Invoiced') ?></th>
- <th class="col subtotal"><?php echo __('Subtotal') ?></th>
+ <th><?php echo __('Product Name') ?></th>
+ <th><?php echo __('SKU') ?></th>
+ <th class="a-right"><?php echo __('Price') ?></th>
+ <th class="a-center"><span class="nobr"><?php echo __('Qty Invoiced') ?></span></th>
+ <th class="a-right"><?php echo __('Subtotal') ?></th>
</tr>
</thead>
<tfoot>
@@ -65,5 +56,6 @@
</tbody>
<?php endforeach; ?>
</table>
+<script type="text/javascript">(function($) {$('#my-invoice-table-<?php echo $_invoice->getId(); ?>').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})})(jQuery)</script>
<?php echo $this->getInvoiceCommentsHtml($_invoice)?>
<?php endforeach; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/order/invoice/items/renderer/default.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/invoice/items/renderer/default.phtml
similarity index 97%
rename from app/design/frontend/magento_plushe/Magento_Sales/order/invoice/items/renderer/default.phtml
rename to app/design/frontend/magento_backup/Magento_Sales/order/invoice/items/renderer/default.phtml
index 2cfb7fdce17..c07b48bc77c 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/order/invoice/items/renderer/default.phtml
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/invoice/items/renderer/default.phtml
@@ -19,17 +19,17 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
+ * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php $_item = $this->getItem() ?>
<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
-<tr id="order-item-row-<?php echo $_item->getId() ?>">
- <td class="col name">
- <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
+<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
+ <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
<?php if($_options = $this->getItemOptions()): ?>
- <dl class="item options">
+ <dl class="item-options">
<?php foreach ($_options as $_option) : ?>
<dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
<?php if (!$this->getPrintStatus()): ?>
@@ -38,7 +38,7 @@
<?php echo $_formatedOptionValue['value'] ?>
<?php if (isset($_formatedOptionValue['full_view'])): ?>
<div class="truncated_full_value">
- <dl class="item options">
+ <dl class="item-options">
<dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
</dl>
@@ -60,8 +60,8 @@
<a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $_item->getId()?>" data-item-id="<?php echo $_item->getId()?>"><?php echo __('Gift Message') ?></a>
<?php endif; ?>
</td>
- <td class="col sku"><?php echo $this->escapeHtml($this->helper('Magento\Core\Helper\String')->splitInjection($this->getSku())) ?></td>
- <td class="col price">
+ <td><?php echo $this->escapeHtml($this->helper('Magento\Core\Helper\String')->splitInjection($this->getSku())) ?></td>
+ <td class="a-right">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
<span class="price-excl-tax">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
@@ -87,6 +87,7 @@
</span>
+
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
<span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
@@ -144,6 +145,7 @@
</span>
+
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
<span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
@@ -175,10 +177,8 @@
</span>
<?php endif; ?>
</td>
- <td class="col qty">
- <span class="qty summary"><?php echo $_item->getQty()*1 ?></span>
- </td>
- <td class="col subtotal">
+ <td class="a-center"><?php echo $_item->getQty()*1 ?> </td>
+ <td class="a-right">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
<span class="price-excl-tax">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
@@ -204,6 +204,7 @@
</span>
+
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
<span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
@@ -260,6 +261,7 @@
</span>
+
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
<span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
@@ -289,6 +291,8 @@
<?php endif; ?>
<?php endif; ?>
+
+
</span>
<?php endif; ?>
</td>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/order/items.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/items.phtml
similarity index 52%
rename from app/design/frontend/magento_plushe/Magento_Sales/order/items.phtml
rename to app/design/frontend/magento_backup/Magento_Sales/order/items.phtml
index 0ab62e2dc07..d7511c2d2a3 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/order/items.phtml
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/items.phtml
@@ -19,20 +19,26 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
+ * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php $_order = $this->getOrder() ?>
-<?php $_giftMessage; ?>
-<table class="data table order items" id="my-orders-table" summary="<?php echo __('Items Ordered') ?>">
+<?php $_giftMessage = ''; ?>
+<table class="data-table" id="my-orders-table" summary="<?php echo __('Items Ordered') ?>">
+ <col />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
<thead>
<tr>
- <th class="col name"><?php echo __('Product Name') ?></th>
- <th class="col sku"><?php echo __('SKU') ?></th>
- <th class="col price"><?php echo __('Price') ?></th>
- <th class="col qty"><?php echo __('Qty') ?></th>
- <th class="col subtotal"><?php echo __('Subtotal') ?></th>
+ <th><?php echo __('Product Name') ?></th>
+ <th><?php echo __('SKU') ?></th>
+ <th class="a-right"><?php echo __('Price') ?></th>
+ <th class="a-center"><?php echo __('Qty') ?></th>
+ <th class="a-right"><?php echo __('Subtotal') ?></th>
</tr>
</thead>
<tfoot>
@@ -41,39 +47,31 @@
<?php $_items = $_order->getItemsCollection(); ?>
<?php $_index = 0; ?>
<?php $_count = $_items->count(); ?>
- <?php $_giftMessage = ''?>
<?php foreach ($_items as $_item): ?>
<?php if ($_item->getParentItem()) continue; ?>
<tbody>
<?php echo $this->getItemHtml($_item) ?>
<?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
- <tr id="order-item-gift-message-<?php echo $_item->getId() ?>" role="region" aria-expanded="false" tabindex="-1" style="display:none;">
+ <tr class="border<?php echo ($_index++ > $_count ?' last':'') ?>" id="order-item-gift-message-<?php echo $_item->getId() ?>" role="region" aria-expanded="false" tabindex="-1" style="display:none;">
<?php $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessageForEntity($_item); ?>
- <td class="col message" colspan="7">
- <div class="gift message details">
- <a href="#"
- title="<?php echo __('Close') ?>"
- aria-controls="order-item-gift-message-<?php echo $_item->getId()?>"
- data-item-id="<?php echo $_item->getId()?>"
- class="action close">
- <?php echo __('Close') ?>
- </a>
- <dl class="gift message">
- <dt class="gift sender"><strong class="label"><?php echo __('From:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?></dt>
- <dt class="gift recipient"><strong class="label"><?php echo __('To:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?></dt>
- <dd class="message text"><?php echo $this->helper('Magento\GiftMessage\Helper\Message')->getEscapedGiftMessage($_item) ?></dd>
- </dl>
- </div>
+ <td class="gift-message-row" colspan="7">
+ <a href="#" title="<?php echo __('Close') ?>" aria-controls="order-item-gift-message-<?php echo $_item->getId()?>" data-item-id="<?php echo $_item->getId()?>" class="btn-close"><?php echo __('Close') ?></a>
+ <dl class="gift-message">
+ <dt><strong><?php echo __('From:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?></dt>
+ <dt><strong><?php echo __('To:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?></dt>
+ <dd><?php echo $this->helper('Magento\GiftMessage\Helper\Message')->getEscapedGiftMessage($_item) ?></dd>
+ </dl>
</td>
</tr>
<?php endif ?>
</tbody>
<?php endforeach; ?>
</table>
+<script type="text/javascript">jQuery('#my-orders-table').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})</script>
<?php if ($_giftMessage): ?>
<script type="text/javascript">
head.js("<?php echo $this->getViewFileUrl('Magento_Sales::gift-message.js')?>", function() {
- jQuery('a.action.show').add('a.action.close').giftMessage();
+ jQuery('a.gift-message-link').add('a.btn-close').giftMessage();
});
</script>
-<?php endif; ?>
+<?php endif ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/order/items/renderer/default.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/items/renderer/default.phtml
similarity index 96%
rename from app/design/frontend/magento_plushe/Magento_Sales/order/items/renderer/default.phtml
rename to app/design/frontend/magento_backup/Magento_Sales/order/items/renderer/default.phtml
index f0c35ef35a6..f527029e49e 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/order/items/renderer/default.phtml
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/items/renderer/default.phtml
@@ -19,16 +19,16 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
+ * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
<?php $_item = $this->getItem() ?>
-<tr id="order-item-row-<?php echo $_item->getId() ?>">
- <td class="col name">
- <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
+<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
+ <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3>
<?php if($_options = $this->getItemOptions()): ?>
- <dl class="item options">
+ <dl class="item-options">
<?php foreach ($_options as $_option) : ?>
<dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
<?php if (!$this->getPrintStatus()): ?>
@@ -37,7 +37,7 @@
<?php echo $_formatedOptionValue['value'] ?>
<?php if (isset($_formatedOptionValue['full_view'])): ?>
<div class="truncated_full_value">
- <dl class="item options">
+ <dl class="item-options">
<dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
</dl>
@@ -58,17 +58,11 @@
<?php endif; ?>
<?php echo $this->escapeHtml($_item->getDescription()) ?>
<?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
- <a href="#"
- id="order-item-gift-message-link-<?php echo $_item->getId() ?>"
- class="action show"
- aria-controls="order-item-gift-message-<?php echo $_item->getId()?>"
- data-item-id="<?php echo $_item->getId()?>">
- <?php echo __('Gift Message') ?>
- </a>
+ <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $_item->getId()?>" data-item-id="<?php echo $_item->getId()?>"><?php echo __('Gift Message') ?></a>
<?php endif; ?>
</td>
- <td class="col sku"><?php echo $this->escapeHtml($this->helper('Magento\Core\Helper\String')->splitInjection($this->getSku())) ?></td>
- <td class="col price">
+ <td><?php echo $this->escapeHtml($this->helper('Magento\Core\Helper\String')->splitInjection($this->getSku())) ?></td>
+ <td class="a-right">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
<span class="price-excl-tax">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
@@ -91,8 +85,10 @@
<?php else: ?>
<?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
<?php endif; ?>
+
</span>
+
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
<span class="cart-tax-info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
@@ -141,13 +137,16 @@
<?php else: ?>
<span class="cart-price">
<?php endif; ?>
+
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
<?php else: ?>
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
<?php endif; ?>
+
</span>
+
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
<span class="cart-tax-info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
@@ -179,8 +178,8 @@
</span>
<?php endif; ?>
</td>
- <td class="col qty">
- <span class="qty summary">
+ <td class="a-right">
+ <span class="nobr">
<?php if ($this->getItem()->getQtyOrdered() > 0): ?>
<?php echo __('Ordered'); ?>: <strong><?php echo $this->getItem()->getQtyOrdered()*1 ?></strong><br />
<?php endif; ?>
@@ -195,7 +194,7 @@
<?php endif; ?>
</span>
</td>
- <td class="col subtotal">
+ <td class="a-right">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
<span class="price-excl-tax">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
@@ -212,13 +211,16 @@
<?php else: ?>
<span class="cart-price">
<?php endif; ?>
+
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(0, 1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
<?php else: ?>
<?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
<?php endif; ?>
+
</span>
+
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
<span class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
@@ -272,8 +274,10 @@
<?php else: ?>
<?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
<?php endif; ?>
+
</span>
+
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem())): ?>
<span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
@@ -303,6 +307,8 @@
<?php endif; ?>
<?php endif; ?>
+
+
</span>
<?php endif; ?>
</td>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/print.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/print.phtml
new file mode 100644
index 00000000000..41323417d0f
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/print.phtml
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php $_order = $this->getOrder() ?>
+<h1><?php echo __('Order #%1', $_order->getRealOrderId()) ?></h1>
+<p class="order-date"><?php echo __('Order Date: %1', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
+<div class="col2-set">
+ <?php if (!$_order->getIsVirtual()): ?>
+ <div class="col-1">
+ <h2><?php echo __('Shipping Address') ?></h2>
+ <address><?php echo $_order->getShippingAddress()->format('html') ?></address>
+ </div>
+ <div class="col-2">
+ <?php else: ?>
+ <div class="col-1">
+ <?php endif; ?>
+ <h2><?php echo __('Billing Address') ?></h2>
+ <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
+ </div>
+<?php if (!$_order->getIsVirtual()): ?>
+</div>
+<div class="col2-set">
+ <div class="col-1">
+ <h2><?php echo __('Shipping Method') ?></h2>
+ <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
+ </div>
+<?php endif; ?>
+ <div class="col-2">
+ <h2><?php echo __('Payment Method') ?></h2>
+ <?php echo $this->getPaymentInfoHtml() ?>
+ </div>
+</div>
+<h2><?php echo __('Items Ordered') ?></h2>
+<table class="data-table" id="my-orders-table">
+ <col />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
+ <thead>
+ <tr>
+ <th><?php echo __('Product Name') ?></th>
+ <th><?php echo __('SKU') ?></th>
+ <th class="a-right"><?php echo __('Price') ?></th>
+ <th class="a-center"><?php echo __('Qty') ?></th>
+ <th class="a-right"><?php echo __('Subtotal') ?></th>
+ </tr>
+ </thead>
+ <tfoot>
+ <?php echo $this->getChildHtml('order_totals') ?>
+ </tfoot>
+ <?php $_items = $_order->getItemsCollection(); ?>
+ <?php $_count = $_items->count(); ?>
+ <?php foreach ($_items as $_item): ?>
+ <?php if ($_item->getParentItem()) continue; ?>
+ <tbody>
+ <?php echo $this->getItemHtml($_item) ?>
+ </tbody>
+ <?php endforeach; ?>
+</table>
+<script type="text/javascript">(function($) {$('#my-orders-table').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})})(jQuery)</script>
+<script type="text/javascript">window.print();</script>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/print/creditmemo.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/print/creditmemo.phtml
new file mode 100644
index 00000000000..ceba0157c74
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/print/creditmemo.phtml
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php $_order = $this->getOrder() ?>
+<h1><?php echo __('Order #%1', $_order->getRealOrderId()) ?></h1>
+<p class="order-date"><?php echo __('Order Date: %1', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
+<?php $_creditmemo = $this->getCreditmemo() ?>
+<?php if($_creditmemo): ?>
+ <?php $_creditmemos = array($_creditmemo); ?>
+<?php else: ?>
+ <?php $_creditmemos = $_order->getCreditmemosCollection() ?>
+<?php endif; ?>
+<?php foreach ($_creditmemos as $_creditmemo): ?>
+ <h2 class="h2"><?php echo __('Refund #%1', $_creditmemo->getIncrementId()) ?></h2>
+ <div class="col2-set">
+ <div class="col-1">
+ <?php if (!$_order->getIsVirtual()): ?>
+ <h3><?php echo __('Shipping Address') ?></h3>
+ <?php $_shipping = $_creditmemo->getShippingAddress() ?>
+ <address><?php echo $_shipping->format('html') ?></address>
+ </div>
+ <div class="col-2">
+ <?php endif; ?>
+ <h3><?php echo __('Billing Address') ?></h3>
+ <?php $_billing = $_creditmemo->getbillingAddress() ?>
+ <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
+ </div>
+ <?php if (!$_order->getIsVirtual()): ?>
+ </div>
+ <div class="col2-set">
+ <div class="col-1">
+ <h3><?php echo __('Shipping Method') ?></h3>
+ <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
+ </div>
+ <?php endif; ?>
+ <div class="col-2">
+ <h3><?php echo __('Payment Method') ?></h3>
+ <?php echo $this->getPaymentInfoHtml() ?>
+ </div>
+ </div>
+ <h3><?php echo __('Items Refunded') ?></h3>
+ <table class="data-table" id="my-refund-table-<?php echo $_creditmemo->getId(); ?>">
+ <col />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
+ <thead>
+ <tr>
+ <th><?php echo __('Product Name') ?></th>
+ <th><?php echo __('SKU') ?></th>
+ <th class="a-right"><?php echo __('Price') ?></th>
+ <th class="a-center"><?php echo __('Qty') ?></th>
+ <th class="a-right"><?php echo __('Subtotal') ?></th>
+ <th class="a-center wrap"><?php echo __('Discount Amount') ?></th>
+ <th class="a-center wrap"><?php echo __('Row Total') ?></th>
+ </tr>
+ </thead>
+ <tfoot>
+ <?php echo $this->getTotalsHtml($_creditmemo);?>
+ </tfoot>
+ <?php $_items = $_creditmemo->getAllItems(); ?>
+ <?php $_count = count($_items); ?>
+ <?php foreach ($_items as $_item): ?>
+ <?php if ($_item->getOrderItem()->getParentItem()) continue; ?>
+ <tbody>
+ <?php echo $this->getItemHtml($_item) ?>
+ </tbody>
+ <?php endforeach; ?>
+</table>
+<script type="text/javascript">(function($) {$('#my-refund-table-<?php echo $_creditmemo->getId(); ?>').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})})(jQuery)</script>
+<?php endforeach; ?>
+<script type="text/javascript">window.print();</script>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/print/invoice.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/print/invoice.phtml
new file mode 100644
index 00000000000..58817c4e8b4
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/print/invoice.phtml
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php $_order = $this->getOrder() ?>
+<h1><?php echo __('Order #%1', $_order->getRealOrderId()) ?></h1>
+<p class="order-date"><?php echo __('Order Date: %1', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
+<?php $_invoice = $this->getInvoice() ?>
+<?php if($_invoice): ?>
+ <?php $_invoices = array($_invoice); ?>
+<?php else: ?>
+ <?php $_invoices = $_order->getInvoiceCollection() ?>
+<?php endif; ?>
+<?php foreach ($_invoices as $_invoice): ?>
+ <h2 class="h2"><?php echo __('Invoice #%1', $_invoice->getIncrementId()) ?></h2>
+ <div class="col2-set">
+ <div class="col-1">
+ <?php if (!$_order->getIsVirtual()): ?>
+ <h3><?php echo __('Shipping Address') ?></h3>
+ <?php $_shipping = $_invoice->getShippingAddress() ?>
+ <address><?php echo $_shipping->format('html') ?></address>
+ </div>
+ <div class="col-2">
+ <?php endif; ?>
+ <h3><?php echo __('Billing Address') ?></h3>
+ <?php $_billing = $_invoice->getbillingAddress() ?>
+ <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
+ </div>
+ <?php if (!$_order->getIsVirtual()): ?>
+ </div>
+ <div class="col2-set">
+ <div class="col-1">
+ <h3><?php echo __('Shipping Method') ?></h3>
+ <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
+ </div>
+ <?php endif; ?>
+ <div class="col-2">
+ <h3><?php echo __('Payment Method') ?></h3>
+ <?php echo $this->getPaymentInfoHtml() ?>
+ </div>
+ </div>
+ <h3><?php echo __('Items Invoiced') ?></h3>
+ <table class="data-table" id="my-invoice-table-<?php echo $_invoice->getId(); ?>">
+ <col />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
+ <thead>
+ <tr>
+ <th><?php echo __('Product Name') ?></th>
+ <th><?php echo __('SKU') ?></th>
+ <th class="a-right"><?php echo __('Price') ?></th>
+ <th class="a-center"><span class="nobr"><?php echo __('Qty Invoiced') ?></span></th>
+ <th class="a-right"><?php echo __('Subtotal') ?></th>
+ </tr>
+ </thead>
+ <tfoot>
+ <?php echo $this->getInvoiceTotalsHtml($_invoice)?>
+ </tfoot>
+ <?php $_items = $_invoice->getItemsCollection(); ?>
+ <?php $_count = $_items->count(); ?>
+ <?php foreach ($_items as $_item): ?>
+ <?php if ($_item->getOrderItem()->getParentItem()) continue; ?>
+ <tbody>
+ <?php echo $this->getItemHtml($_item) ?>
+ </tbody>
+ <?php endforeach; ?>
+ </table>
+ <script type="text/javascript">(function($) {$('#my-invoice-table-<?php echo $_invoice->getId(); ?>').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})})(jQuery)</script>
+<?php endforeach; ?>
+<script type="text/javascript">window.print();</script>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/print/shipment.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/print/shipment.phtml
new file mode 100644
index 00000000000..b42a54d939e
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/print/shipment.phtml
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php /* @var $this \Magento\Sales\Block\Order\Print\Shipment */?>
+<?php $order = $this->getOrder(); ?>
+<h1><?php echo __('Order #%1', $this->getObjectData($order, 'real_order_id')); ?></h1>
+<p class="order-date"><?php echo __('Order Date: %1', $this->formatDate($this->getObjectData($order, 'created_at_store_date'), 'long')) ?></p>
+<?php if (!$this->getObjectData($order, 'is_virtual')): ?>
+<?php foreach ($this->getShipmentsCollection() as $shipment): ?>
+ <h2 class="h2"><?php echo __('Shipment #%1', $this->getObjectData($shipment, 'increment_id')); ?></h2>
+ <div class="col2-set">
+ <div class="col-1">
+ <h3><?php echo __('Shipping Address') ?></h3>
+ <address><?php echo $this->getShipmentAddressFormattedHtml($shipment); ?></address>
+ </div>
+ <div class="col-2">
+ <h3><?php echo __('Billing Address') ?></h3>
+ <address><?php echo $this->getBillingAddressFormattedHtml($order); ?></address>
+ </div>
+ </div>
+ <div class="col2-set">
+ <div class="col-1">
+ <h3><?php echo __('Shipping Method') ?></h3>
+ <?php echo $this->escapeHtml($this->getObjectData($order, 'shipping_description')); ?>
+ <?php $tracks = $this->getShipmentTracks($shipment);
+ if ($tracks): ?>
+ <table class="data-table" id="my-shipment-tracking">
+ <col />
+ <col />
+ <thead>
+ <tr>
+ <th><?php echo __('Title')?></th>
+ <th><?php echo __('Number')?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach ($tracks as $track): ?>
+ <tr>
+ <td><?php echo $this->escapeHtml($this->getObjectData($track, 'title')); ?></td>
+ <td><?php echo $this->escapeHtml($this->getObjectData($track, 'number')); ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ <script type="text/javascript">(function($) {$('#my-shipment-tracking').decorate('table')})(jQuery)</script>
+ <?php endif; ?>
+ </div>
+ <div class="col-2">
+ <h3><?php echo __('Payment Method') ?></h3>
+ <?php echo $this->getPaymentInfoHtml() ?>
+ </div>
+ </div>
+ <h3><?php echo __('Items Shipped') ?></h3>
+ <table class="data-table" id="my-shipment-table-<?php echo $this->getObjectData($shipment, 'id') ?>">
+ <col />
+ <col width="1" />
+ <col width="1" />
+ <thead>
+ <tr>
+ <th><?php echo __('Product Name') ?></th>
+ <th><?php echo __('SKU') ?></th>
+ <th class="a-center"><span class="nobr"><?php echo __('Qty Shipped') ?></span></th>
+ </tr>
+ </thead>
+ <?php foreach ($this->getShipmentItems($shipment) as $item): ?>
+ <tbody>
+ <?php echo $this->getItemHtml($item) ?>
+ </tbody>
+ <?php endforeach; ?>
+ </table>
+ <script type="text/javascript">(function($) {$('#my-shipment-table-<?php echo $this->getObjectData($shipment, 'id')?>').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})})(jQuery)</script>
+<?php endforeach; ?>
+<?php endif; ?>
+<script type="text/javascript">window.print();</script>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/recent.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/recent.phtml
new file mode 100644
index 00000000000..4fb37abf552
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/recent.phtml
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<div class="box-account box-recent">
+<?php $_orders = $this->getOrders(); ?>
+ <div class="box-head">
+ <h2><?php echo __('Recent Orders') ?></h2>
+ <?php if( sizeof($_orders->getItems()) > 0 ): ?><a href="<?php echo $this->getUrl('sales/order/history') ?>"><?php echo __('View All') ?></a><?php endif; ?>
+ </div>
+<?php if( sizeof($_orders->getItems()) > 0 ): ?>
+ <table class="data-table" id="my-orders-table">
+ <col width="1" />
+ <col width="1" />
+ <col />
+ <col width="1" />
+ <col width="1" />
+ <col width="1" />
+ <thead>
+ <tr>
+ <th><?php echo __('Order #') ?></th>
+ <th><?php echo __('Date') ?></th>
+ <th><?php echo __('Ship To') ?></th>
+ <th><span class="nobr"><?php echo __('Order Total') ?></span></th>
+ <th><?php echo __('Status') ?></th>
+ <th> </th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php foreach ($_orders as $_order): ?>
+ <tr>
+ <td><?php echo $_order->getRealOrderId() ?></td>
+ <td><span class="nobr"><?php echo $this->formatDate($_order->getCreatedAtStoreDate()) ?></span></td>
+ <td><?php echo $_order->getShippingAddress() ? $this->escapeHtml($_order->getShippingAddress()->getName()) : ' ' ?></td>
+ <td><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
+ <td><em><?php echo $_order->getStatusLabel() ?></em></td>
+ <td class="a-center">
+ <span class="nobr">
+ <a href="<?php echo $this->getViewUrl($_order) ?>"><?php echo __('View Order') ?></a>
+ <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order)) : ?>
+ <span class="separator">|</span> <a href="<?php echo $this->getReorderUrl($_order) ?>" class="link-reorder"><?php echo __('Reorder') ?></a>
+ <?php endif ?>
+ </span>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ <script type="text/javascript">(function($) {$('#my-orders-table').decorate('table')})(jQuery)</script>
+<?php else: ?>
+ <p><?php echo __('You have placed no orders.'); ?></p>
+<?php endif; ?>
+</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/order/shipment.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/shipment.phtml
similarity index 78%
rename from app/design/frontend/magento_plushe/Magento_Sales/order/shipment.phtml
rename to app/design/frontend/magento_backup/Magento_Sales/order/shipment.phtml
index 191012ded18..b6237c8c2f4 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/order/shipment.phtml
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/shipment.phtml
@@ -19,17 +19,14 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
+ * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<div class="order items details shipments">
+<div class="order-items order-details">
<?php echo $this->getChildHtml('shipment_items') ?>
- <div class="actions">
- <div class="secondary">
- <a href="<?php echo $this->getBackUrl() ?>" class="action back">
- <span><?php echo $this->getBackTitle() ?></span>
- </a>
- </div>
+ <div class="buttons-set">
+ <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo $this->getBackTitle() ?></a></p>
</div>
</div>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/shipment/items.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/shipment/items.phtml
new file mode 100644
index 00000000000..2f9c3b96527
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/shipment/items.phtml
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php $_order = $this->getOrder() ?>
+<p class="order-links">
+ <?php if ($_order->getTracksCollection()->count()) : ?>
+ <a href="#" data-mage-init="{popupWindow: {windowURL:'<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_order) ?>',windowName:'trackorder',width:800,height:600,top:0,left:0,resizable:1,scrollbars:1}}" title="<?php echo __('Track all shipment(s)') ?>"><?php echo __('Track all shipments') ?></a> <span class="separator">|</span>
+ <?php endif; ?>
+ <a href="<?php echo $this->getPrintAllShipmentsUrl($_order) ?>" onclick="this.target='_blank'" class="link-print"><?php echo __('Print All Shipments') ?></a>
+</p>
+<?php foreach ($_order->getShipmentsCollection() as $_shipment): ?>
+<h2 class="sub-title"><?php echo __('Shipment #') ?><?php echo $_shipment->getIncrementId(); ?> <span class="separator">|</span> <a href="<?php echo $this->getPrintShipmentUrl($_shipment) ?>" onclick="this.target='_blank'" class="link-print"><?php echo __('Print Shipment') ?></a></h2>
+<?php $tracks = $_shipment->getTracksCollection(); ?>
+<?php if ($tracks->count()): ?>
+ <table class="data-table tracking-table" id="my-tracking-table-<?php echo $_shipment->getId(); ?>">
+ <tbody>
+ <tr>
+ <td colspan="2">
+ <a href="#" data-mage-init="{popupWindow: {windowURL:'<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_shipment) ?>',windowName:'trackshipment',width:800,height:600,top:0,left:0,resizable:1,scrollbars:1}}" title="<?php echo __('Track this shipment') ?>"><?php echo __('Track this shipment') ?></a>
+ </td>
+ </tr>
+ <tr>
+ <th class="label"><?php echo __('Tracking Number(s):') ?></th>
+ <td>
+ <?php
+ $i = 1;
+ $_size = $tracks->count();
+ foreach($tracks as $track): ?>
+ <?php if($track->isCustom()): ?>
+ <?php echo $this->escapeHtml($track->getNumber()) ?>
+ <?php else: ?>
+ <a href="#" data-mage-init="{popupWindow: {windowURL:'<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($track) ?>',windowName:'trackorder',width:800,height:600,left:0,top:0,resizable:1,scrollbars:1}}"><?php echo $this->escapeHtml($track->getNumber()) ?></a>
+ <?php endif; ?>
+ <?php if($i!=$_size): ?>, <?php endif; ?>
+ <?php $i++;
+ endforeach; ?>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <script type="text/javascript">jQuery('#my-tracking-table-<?php echo $_shipment->getId(); ?>').decorate('table')</script>
+<?php endif; ?>
+<h3 class="table-caption"><?php echo __('Items Shipped') ?></h3>
+<table class="data-table" id="my-shipment-table-<?php echo $_shipment->getId(); ?>">
+ <col />
+ <col width="1" />
+ <col width="1" />
+ <thead>
+ <tr>
+ <th><?php echo __('Product Name') ?></th>
+ <th><?php echo __('SKU') ?></th>
+ <th class="a-center"><span class="nobr"><?php echo __('Qty Shipped') ?></span></th>
+ </tr>
+ </thead>
+ <?php $_items = $_shipment->getAllItems(); ?>
+ <?php $_count = count($_items) ?>
+ <?php foreach ($_items as $_item): ?>
+ <?php if ($_item->getOrderItem()->getParentItem()) continue; ?>
+ <tbody>
+ <?php echo $this->getItemHtml($_item) ?>
+ </tbody>
+ <?php endforeach; ?>
+</table>
+<script type="text/javascript">jQuery('#my-shipment-table-<?php echo $_shipment->getId(); ?>').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})</script>
+<?php echo $this->getCommentsHtml($_shipment)?>
+<?php endforeach; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/shipment/items/renderer/default.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/shipment/items/renderer/default.phtml
new file mode 100644
index 00000000000..3ac8fc628ed
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/shipment/items/renderer/default.phtml
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php $_item = $this->getItem() ?>
+<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
+<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
+ <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
+ <?php if($_options = $this->getItemOptions()): ?>
+ <dl class="item-options">
+ <?php foreach ($_options as $_option) : ?>
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+ <?php if (!$this->getPrintStatus()): ?>
+ <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
+ <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated" data-mage-init="{truncateOptions:[]}"<?php endif; ?>>
+ <?php echo $_formatedOptionValue['value'] ?>
+ <?php if (isset($_formatedOptionValue['full_view'])): ?>
+ <div class="truncated_full_value">
+ <dl class="item-options">
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+ <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
+ </dl>
+ </div>
+ <?php endif; ?>
+ </dd>
+ <?php else: ?>
+ <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
+ <?php endif; ?>
+ <?php endforeach; ?>
+ </dl>
+ <?php endif; ?>
+ <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
+ <?php if ($addInfoBlock) :?>
+ <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
+ <?php endif; ?>
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
+ <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $_item->getOrderItem()) && $_item->getGiftMessageId()): ?>
+ <a href="#" id="order-item-gift-message-link-<?php echo $_item->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $_item->getId()?>" data-item-id="<?php echo $_item->getId()?>"><?php echo __('Gift Message') ?></a>
+ <?php endif; ?>
+ </td>
+ <td><?php echo $this->escapeHtml($this->helper('Magento\Core\Helper\String')->splitInjection($this->getSku())) ?></td>
+ <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
+</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/totals.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/totals.phtml
new file mode 100644
index 00000000000..ff3477323e1
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/totals.phtml
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+/**
+ * @var $this \Magento\Sales\Block\Order\Totals
+ * @see \Magento\Sales\Block\Order\Totals
+ */
+?>
+<?php foreach ($this->getTotals() as $_code => $_total): ?>
+ <?php if ($_total->getBlockName()): ?>
+ <?php echo $this->getChildHtml($_total->getBlockName(), false); ?>
+ <?php else:?>
+ <tr class="<?php echo $_code?>">
+ <td <?php echo $this->getLabelProperties()?>>
+ <?php if ($_total->getStrong()):?>
+ <strong><?php echo $this->escapeHtml($_total->getLabel());?></strong>
+ <?php else:?>
+ <?php echo $this->escapeHtml($_total->getLabel());?>
+ <?php endif?>
+ </td>
+ <td <?php echo $this->getValueProperties()?>>
+ <?php if ($_total->getStrong()):?>
+ <strong><?php echo $this->formatValue($_total) ?></strong>
+ <?php else:?>
+ <?php echo $this->formatValue($_total) ?>
+ <?php endif?>
+ </td>
+ </tr>
+ <?php endif?>
+<?php endforeach?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/trackinginfo.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/trackinginfo.phtml
new file mode 100644
index 00000000000..bc3cf4e0dae
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/trackinginfo.phtml
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<span class="field-row grid" id="shipment_tracking_info">
+
+<?php if($this->getTrackingInfo()): ?>
+ <strong><?php echo $this->escapeHtml($this->getTrackingInfo()->getCarrierTitle()) ?></strong> - <?php echo $this->getTrackingInfo()->getTracking() ?>
+ <div class="info">
+ <?php if ($this->getTrackingInfo()->getErrorMessage()): ?>
+ <?php echo $this->escapeHtml($this->getTrackingInfo()->getErrorMessage()) ?>
+ <?php else: ?>
+ <?php if ($this->getTrackingInfo()->getUrl()): ?>
+ Please, visit for more info: <a href="<?php echo $this->getTrackingInfo()->getUrl() ?>" target="_blank"><?php echo $this->escapeHtml($this->getTrackingInfo()->getCarrierTitle()) ?></a><br />
+ <?php endif; ?>
+
+ <?php if ($this->getTrackingInfo()->getStatus()): ?>
+ Status: <?php echo $this->getTrackingInfo()->getStatus() ?><br />
+ <?php endif; ?>
+
+ <?php if ($this->getTrackingInfo()->getDeliverydate()): ?>
+ Delivery Date: <?php echo $this->getTrackingInfo()->getDeliverydate() ?><br />
+ <?php endif; ?>
+
+ <?php if ($this->getTrackingInfo()->getDeliverytime()): ?>
+ Delivery Time: <?php echo $this->getTrackingInfo()->getDeliverytime() ?><br />
+ <?php endif; ?>
+
+ <?php if ($this->getTrackingInfo()->getDeliverylocation()): ?>
+ Delivery Location: <?php echo $this->getTrackingInfo()->getDeliverylocation() ?><br />
+ <?php endif; ?>
+
+ <?php if ($this->getTrackingInfo()->getSignedby()): ?>
+ Signed by: <?php echo $this->getTrackingInfo()->getSignedby() ?><br />
+ <?php endif; ?>
+
+ <?php if ($this->getTrackingInfo()->getTrackSummary()): ?>
+ Tracking summary: <?php echo $this->getTrackingInfo()->getTrackSummary() ?><br />
+ <?php endif; ?>
+
+ <?php endif; ?>
+ </div>
+<?php endif; ?>
+
+</span>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/view.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/view.phtml
new file mode 100644
index 00000000000..6022448f69e
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/order/view.phtml
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<div class="order-items order-details">
+ <?php $_order = $this->getOrder() ?>
+ <h2 class="table-caption"><?php echo __('Items Ordered') ?>
+ <?php if ($_order->getTracksCollection()->count()) : ?>
+ <span class="separator">|</span> <a href="#" data-mage-init="{popupWindow: {windowURL:'<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_order) ?>',windowName:'trackorder',top:0,left:0,width:800,height:600,resizable:1,scrollbars:1}}" title="<?php echo __('Track your order') ?>"><?php echo __('Track your order') ?></a>
+ <?php endif; ?>
+ </h2>
+
+ <?php echo $this->getChildHtml('order_items') ?>
+
+ <?php if($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order', $_order) && $_order->getGiftMessageId()): ?>
+ <div class="order-additional order-gift-message">
+ <h2 class="sub-title"><?php echo __('Gift Message for This Order') ?></h2>
+ <?php $_giftMessage=$this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessageForEntity($_order); ?>
+ <dl class="gift-message">
+ <dt><strong><?php echo __('From:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?></dt>
+ <dt><strong><?php echo __('To:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?></dt>
+ <dd><?php echo $this->helper('Magento\GiftMessage\Helper\Message')->getEscapedGiftMessage($_order) ?></dd>
+ </dl>
+ </div>
+ <?php endif; ?>
+ <?php $_history = $this->getOrder()->getVisibleStatusHistory() ?>
+ <?php if (count($_history)): ?>
+ <div class="order-additional order-comments">
+ <h2 class="sub-title"><?php echo __('About Your Order') ?></h2>
+ <dl class="order-about">
+ <?php foreach ($_history as $_historyItem): ?>
+ <dt><?php echo $this->formatDate($_historyItem->getCreatedAtStoreDate(), 'medium', true) ?></dt>
+ <dd><?php echo $this->escapeHtml($_historyItem->getComment()) ?></dd>
+ <?php endforeach; ?>
+ </dl>
+ </div>
+ <?php endif; ?>
+ <div class="buttons-set">
+ <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo $this->getBackTitle() ?></a></p>
+ </div>
+</div>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/orders-returns.js b/app/design/frontend/magento_backup/Magento_Sales/orders-returns.js
new file mode 100644
index 00000000000..79af9c4a932
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/orders-returns.js
@@ -0,0 +1,50 @@
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category Sales Orders and Returns
+ * @package mage
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+/*jshint browser:true, jquery:true*/
+(function($) {
+ "use strict";
+ $.widget('mage.ordersReturns', {
+ options: {
+ zipCode: '#oar-zip', // Search by zip code.
+ emailAddress: '#oar-email', // Search by email address.
+ searchType: '#quick-search-type-id' // Search element used for choosing between the two.
+ },
+
+ _create: function() {
+ $(this.options.searchType).on('change', $.proxy(this._showIdentifyBlock, this)).trigger('change');
+ },
+
+ /**
+ * Show either the search by zip code option or the search by email address option.
+ * @private
+ * @param e - Change event. Event target value is either 'zip' or 'email'.
+ */
+ _showIdentifyBlock: function(e) {
+ var value = $(e.target).val();
+ $(this.options.zipCode).toggle(value === 'zip');
+ $(this.options.emailAddress).toggle(value === 'email');
+ }
+ });
+})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Sales/payment/form/billing/agreement.phtml b/app/design/frontend/magento_backup/Magento_Sales/payment/form/billing/agreement.phtml
new file mode 100644
index 00000000000..5d2129cde3a
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/payment/form/billing/agreement.phtml
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php /* @var $this \Magento\Sales\Block\Payment\Form\Billing\Agreement */?>
+<?php $_code=$this->getMethodCode() ?>
+<ul class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none;">
+ <li>
+ <label for="<?php echo $_code ?>_ba_agreement_id" class="required"><em>*</em><?php echo __('Billing Agreement') ?></label>
+ <div class="input-box">
+ <select id="<?php echo $_code ?>_ba_agreement_id" name="payment[<?php echo $this->getTransportName(); ?>]" class="required-entry">
+ <option value=""><?php echo __('-- Please Select Billing Agreement--') ?></option>
+ <?php foreach ($this->getBillingAgreements() as $id => $referenceId): ?>
+ <option value="<?php echo $id ?>"><?php echo $this->escapeHtml($referenceId) ?></option>
+ <?php endforeach ?>
+ </select>
+ </div>
+ </li>
+</ul>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/recurring/grid.phtml b/app/design/frontend/magento_backup/Magento_Sales/recurring/grid.phtml
new file mode 100644
index 00000000000..9202a7a8faa
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/recurring/grid.phtml
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php /* @var $this \Magento\Core\Block\Template */?>
+<div <?php echo $this->getGridHtmlClass() ? ' class="' . $this->getGridHtmlClass() . '"' : ''?><?php echo $this->getGridHtmlCss() ? ' style="' . $this->getGridHtmlCss() . '"' : ''?>>
+
+<?php if ($caption = $this->getGridCaption()): ?>
+<h2 class="table-caption"><?php echo $this->escapeHtml($caption) ?></h2>
+<?php endif; ?>
+
+<?php $gridElements = $this->getGridElements(); ?>
+<?php if ($gridElements): ?>
+ <?php echo $this->getChildHtml('pager'); ?>
+ <table id="<?php echo $this->getGridHtmlId() ?>" class="data-table">
+<?php foreach ($this->getGridColumns() as $column):?>
+ <col <?php $width = $this->getObjectData($column, 'width'); echo $width ? ' width="' . $width . '"' : '' ?>/>
+<?php endforeach; ?>
+ <thead>
+ <tr>
+<?php foreach ($this->getGridColumns() as $column):
+$nobr = $this->getObjectData($column, 'is_nobr') ? '<span class="nobr">%s</span>' : '%s';
+$title = $this->getObjectData($column, 'title');
+?>
+ <th><?php echo $title ? sprintf($nobr, $this->escapeHtml($title)) : ' ' ?></th>
+<?php endforeach; ?>
+ </tr>
+ </thead>
+ <tbody>
+<?php foreach($gridElements as $row): ?>
+ <tr>
+<?php foreach ($this->getGridColumns() as $column):
+$nobr = $this->getObjectData($column, 'is_nobr') ? '<span class="nobr">%s</span>' : '%s';
+$index = $this->getObjectData($column, 'index');
+$value = $this->getObjectData($row, $index);
+$linkUrl = $this->getObjectData($row, "{$index}_link_url");
+$linkAnchorText = $this->getObjectData($row, "{$index}_link_text");
+$linkText = $linkUrl ? ($linkAnchorText ? $linkAnchorText : $value) : '';
+$linkFormat = $linkUrl ? '<a href="%s">%s</a>' : '';
+?>
+ <td<?php $this->getObjectData($row, 'is_amount') ? ' class="a-right"' : '' ?>><?php
+if ($linkFormat) {
+ echo sprintf($nobr, sprintf($linkFormat, $this->escapeHtml($linkUrl), $this->escapeHtml($linkText)));
+} else {
+ echo sprintf($nobr, $this->escapeHtml($value));
+}
+ ?></td>
+<?php endforeach; ?>
+ </tr>
+<?php endforeach; ?>
+ </tbody>
+ </table>
+ <?php echo $this->getChildHtml('pager'); ?>
+ <script type="text/javascript">(function($) {$('#<?php echo $this->getGridHtmlId() ?>').decorate('table')})(jQuery)</script>
+<?php else: ?>
+ <p><?php echo $this->escapeHtml($this->getEmptyGridMessage()); ?></p>
+<?php endif; ?>
+</div>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/recurring/profile/view.phtml b/app/design/frontend/magento_backup/Magento_Sales/recurring/profile/view.phtml
new file mode 100644
index 00000000000..ebd21c420e7
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/recurring/profile/view.phtml
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php /* @var $this \Magento\Sales\Block\Recurring\Profile\View */ ?>
+
+<div class="order-page">
+
+<!-- title 'n' actions -->
+<div class="page-title title-buttons">
+ <h1><?php echo __('Recurring Profile # %1', $this->escapeHtml($this->getReferenceId())) ?></h1>
+ <?php if ($this->getCanCancel()): ?>
+ <button type="button" title="<?php echo __('Cancel') ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getCancelUrl() ?>'; } return false;"><span><span><?php echo __('Cancel') ?></span></span></button>
+ <?php endif; ?>
+ <?php if ($this->getCanSuspend()): ?>
+ <button type="button" title="<?php echo __('Suspend') ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getSuspendUrl() ?>'; } return false;"><span><span><?php echo __('Suspend') ?></span></span></button>
+ <?php endif; ?>
+ <?php if ($this->getCanActivate()): ?>
+ <button type="button" title="<?php echo __('Activate') ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getActivateUrl() ?>'; } return false;"><span><span><?php echo __('Activate') ?></span></span></button>
+ <?php endif; ?>
+ <?php if ($this->getCanUpdate()):?>
+ <button type="button" title="<?php echo __('Get Update') ?>" class="button" onclick="if( confirm('<?php echo $this->getConfirmationMessage() ?>') ) { window.location.href = '<?php echo $this->getUpdateUrl() ?>'; } return false;"><span><span><?php echo __('Get Update') ?></span></span></button>
+ <?php endif;?>
+</div>
+
+<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
+
+<!-- info tabs -->
+<?php $layout = $this->getLayout(); ?>
+<?php $infoTabs = $this->getGroupChildNames('info_tabs'); ?>
+<dl class="order-info">
+ <dt><?php echo __('About This Profile:') ?></dt>
+ <dd>
+ <ul id="order-info-tabs">
+ <?php foreach ($infoTabs as $elementName): ?>
+ <?php $block = $layout->getBlock($elementName); ?>
+ <?php if (!$block) continue; ?>
+ <?php if ($this->getObjectData($block, 'is_view_current')): ?>
+ <li class="current"><strong><?php echo $this->escapeHtml($this->getObjectData($block, 'view_label')) ?></strong></li>
+ <?php else: ?>
+ <li><a href="<?php echo $this->escapeHtml($this->getObjectData($block, 'view_url')) ?>"><?php echo $this->escapeHtml($this->getObjectData($block, 'view_label')) ?></a></li>
+ <?php endif; ?>
+ <?php endforeach; ?>
+ </ul>
+ </dd>
+</dl>
+
+<!-- info blocks in 2 columns -->
+<?php for ($i = 1; $i <= 5; $i++):?>
+ <?php $infoBlocks = $this->getGroupChildNames("info_blocks_row_{$i}"); ?>
+ <?php if ($infoBlocks):?>
+<div class="col2-set order-info-box">
+ <?php for ($j = 1; $j <= 2; $j++):?>
+ <?php foreach ($infoBlocks as $elementName):?>
+ <?php $block = $layout->getBlock($elementName); ?>
+ <?php if (!$block) continue; ?>
+<?php if ($j == $this->getObjectData($block, 'view_column')):?>
+ <div class="col-<?php echo $j?>">
+ <div class="info-box">
+ <div class="box-title">
+ <h2><?php echo $this->escapeHtml($this->getObjectData($block, 'view_label')) ?></h2>
+ </div>
+ <div class="box-content">
+ <?php $html = $layout->renderElement($elementName); ?>
+ <?php echo ($html ? $html : __('No information available.')) ; ?>
+ </div>
+ </div>
+ </div>
+<?php endif; ?>
+ <?php endforeach;?>
+ <?php endfor;?>
+</div>
+ <?php endif; ?>
+<?php endfor;?>
+
+<!-- table data block -->
+<?php $table = $this->getChildBlock('table') ?>
+<?php if ($table):?>
+<div>
+ <h2 class="table-caption"><?php echo $this->escapeHtml($this->getObjectData($table, 'view_label')) ?></h2>
+ <?php echo $this->getChildHtml('table') ?>
+</div>
+<?php endif;?>
+
+ <div class="buttons-set">
+ <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo __('Back to Recurring Billing Profiles') ?></a></p>
+ </div>
+</div>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/recurring/profile/view/info.phtml b/app/design/frontend/magento_backup/Magento_Sales/recurring/profile/view/info.phtml
new file mode 100644
index 00000000000..bbdb4e6455c
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/recurring/profile/view/info.phtml
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+?>
+<?php /* @var $this \Magento\Sales\Block\Recurring\Profile\View */?>
+<?php if ($this->getIsAddress()):?>
+
+<?php foreach ($this->getRenderedInfo() as $row):?>
+<address><?php echo nl2br($this->escapeHtml($this->getObjectData($row, 'value')))?></address>
+<?php endforeach;?>
+
+<?php else:?>
+
+<table class="info-table">
+ <tbody>
+ <?php foreach ($this->getRenderedInfo() as $row):?>
+ <?php $isAmount = $this->getObjectData($row, 'is_amount');?>
+ <tr>
+ <th><?php echo $this->escapeHtml($this->getObjectData($row, 'label'))?>:</th>
+ <td><?php echo $this->renderRowValue($row) ?></td>
+ </tr>
+ <?php endforeach;?>
+ </tbody>
+</table>
+<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/recurring/profiles.phtml b/app/design/frontend/magento_backup/Magento_Sales/recurring/profiles.phtml
similarity index 79%
rename from app/design/frontend/magento_plushe/Magento_Sales/recurring/profiles.phtml
rename to app/design/frontend/magento_backup/Magento_Sales/recurring/profiles.phtml
index ad0f270ca55..3d5101fcfbb 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/recurring/profiles.phtml
+++ b/app/design/frontend/magento_backup/Magento_Sales/recurring/profiles.phtml
@@ -25,14 +25,17 @@
*/
?>
<?php /* @var $this \Magento\Sales\Block\Recurring\Profiles */ ?>
+<div class="page-title">
+ <h1><?php echo __('Recurring Billing Profiles') ?></h1>
+</div>
+
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<div class="block recurring profiles">
+<div class="recurring-profiles">
+
<?php echo $this->getChildHtml('grid')?>
- <div class="actions">
- <div class="secondary">
- <a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="action back"><span><?php echo __('Back') ?></span></a>
- </div>
+ <div class="buttons-set">
+ <p class="back-link"><a href="<?php echo $this->escapeHtml($this->getBackUrl()) ?>"><small>« </small><?php echo __('Back') ?></a></p>
</div>
</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/reorder/sidebar.phtml b/app/design/frontend/magento_backup/Magento_Sales/reorder/sidebar.phtml
similarity index 53%
rename from app/design/frontend/magento_plushe/Magento_Sales/reorder/sidebar.phtml
rename to app/design/frontend/magento_backup/Magento_Sales/reorder/sidebar.phtml
index 92f812bc6d2..14f0a84ac2a 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/reorder/sidebar.phtml
+++ b/app/design/frontend/magento_backup/Magento_Sales/reorder/sidebar.phtml
@@ -19,6 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
+ * @package base_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -32,14 +33,14 @@
?>
<?php $_items = $this->getItems()?>
<?php if($_items): ?>
-<div class="block reorder">
- <div class="title">
- <strong><?php echo __('My Orders') ?></strong>
+<div class="block block-reorder">
+ <div class="block-title">
+ <strong><span><?php echo __('My Orders') ?></span></strong>
</div>
- <div class="content">
- <form method="post" class="form reorder" action="<?php echo $this->getFormActionUrl() ?>" id="reorder-validate-detail">
- <strong class="subtitle"><?php echo __('Last Ordered Items') ?></strong>
- <ol class="items" id="cart-sidebar-reorder">
+ <form method="post" action="<?php echo $this->getFormActionUrl() ?>" id="reorder-validate-detail">
+ <div class="block-content">
+ <p class="block-subtitle"><?php echo __('Last Ordered Items') ?></p>
+ <ol id="cart-sidebar-reorder">
<?php $_showAddButtonFlag = false ?>
<?php foreach ($_items as $_item): ?>
<li class="item">
@@ -48,38 +49,35 @@
<input type="checkbox" name="order_items[]" id="reorder-item-<?php echo $_item->getId() ?>" value="<?php echo $_item->getId() ?>" title="<?php echo __('Add to Cart') ?>"
class="checkbox" data-validate='{"validate-one-checkbox-required-by-name": true}'/>
<?php endif; ?>
- <strong class="product name"><a href="<?php echo $_item->getProduct()->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></strong>
+ <p class="product-name"><a href="<?php echo $_item->getProduct()->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></p>
</li>
<?php endforeach; ?>
</ol>
+ <script type="text/javascript">(function($) {$('#cart-sidebar-reorder').decorate('list', false)})(jQuery)</script>
<div id="cart-sidebar-reorder-advice-container"></div>
<div class="actions">
<?php if ($_showAddButtonFlag): ?>
- <div class="primary">
- <button type="submit" title="<?php echo __('Add to Cart') ?>" class="action tocart">
- <span><?php echo __('Add to Cart') ?></span>
- </button>
- </div>
+ <button type="submit" title="<?php echo __('Add to Cart') ?>" class="button btn-cart"><span><span><?php echo __('Add to Cart') ?></span></span></button>
<?php endif; ?>
- <div class="secondary"><a class="action view" href="<?php echo $this->getUrl('customer/account') ?>"><span><?php echo __('View All'); ?></span></a></div>
+ <a href="<?php echo $this->getUrl('customer/account') ?>"><?php echo __('View All'); ?></a>
</div>
- </form>
- </div>
- <?php echo $this->getPagerHtml(); ?>
- <script type="text/javascript">
- head.js(
- "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
- "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
- "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
- "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
- function() {
- jQuery('#reorder-validate-detail').validation({
- errorPlacement: function(error, element) {
- error.appendTo('#cart-sidebar-reorder-advice-container');
- }
- });
- }
- );
- </script>
+ </div>
+ </form>
</div>
+<?php echo $this->getPagerHtml(); ?>
+<script type="text/javascript">
+ head.js(
+ "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
+ "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
+ "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
+ "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
+ function() {
+ jQuery('#reorder-validate-detail').validation({
+ errorPlacement: function(error, element) {
+ error.appendTo('#cart-sidebar-reorder-advice-container');
+ }
+ });
+ }
+ );
+</script>
<?php endif ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/widget/guest/form.phtml b/app/design/frontend/magento_backup/Magento_Sales/widget/guest/form.phtml
new file mode 100644
index 00000000000..50d6134f034
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Sales/widget/guest/form.phtml
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category design
+ * @package base_default
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+/** @var $this \Magento\Sales\Block\Widget\Guest\Form */
+?>
+<?php if ($this->isEnable()): ?>
+ <div class="widget">
+ <div class="block block-gr-search">
+ <div class="block-title">
+ <h2><?php echo __('Orders and Returns') ?></h2>
+ </div>
+ <div class="block-content">
+ <form id="oar-widget-orders-and-returns-form" action="<?php echo $this->getActionUrl() ?>" method="post" class="search-form" name="guest_post">
+ <ul class="form-alt">
+ <li>
+ <label class="required"><?php echo __('Find Order By:') ?></label>
+ <div class="input-box">
+ <select name="oar_type" id="quick-search-type-id" class="select" title="">
+ <option value="email"><?php echo __('Email Address') ?></option>
+ <option value="zip"><?php echo __('ZIP Code') ?></option>
+ </select>
+ </div>
+ </li>
+ <li>
+ <label for="oar-order-id" class="required"><?php echo __('Order ID') ?> <em>*</em></label>
+ <div class="input-box">
+ <input type="text" class="input-text" id="oar-order-id" name="oar_order_id" autocomplete="off" data-validate="{required:true}"/>
+ </div>
+ </li>
+ <li>
+ <label for="oar-billing-lastname" class="required"><?php echo __('Billing Last Name') ?> <em>*</em></label>
+ <div class="input-box">
+ <input type="text" class="input-text" id="oar-billing-lastname" name="oar_billing_lastname" autocomplete="off" data-validate="{required:true}"/>
+ </div>
+ </li>
+ <li id="oar-email">
+ <label for="oar_email" class="required"><?php echo __('Email Address') ?> <em>*</em></label>
+ <div class="input-box">
+ <input type="text" class="input-text" id="oar_email" name="oar_email" autocomplete="off" data-validate="{required:true, 'validate-email':true}"/>
+ </div>
+ </li>
+ <li id="oar-zip" style="display:none;">
+ <label for="oar_zip" class="required"><?php echo __('Billing ZIP Code') ?> <em>*</em></label>
+ <div class="input-box">
+ <input type="text" class="input-text" id="oar_zip" name="oar_zip" data-validate="{required:true}"/>
+ </div>
+ </li>
+ </ul>
+ <div class="actions">
+ <button type="submit" title="Continue" class="button"><span><span><?php echo __('Continue') ?></span></span></button>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+<script type="text/javascript">
+ head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
+ "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
+ "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
+ "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
+ "<?php echo $this->getViewFileUrl('Magento_Sales::orders-returns.js');?>", function() {
+ jQuery('#oar-widget-orders-and-returns-form').ordersReturns().validation();
+ });
+</script>
+<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Contacts/layout/override/default.xml b/app/design/frontend/magento_backup/Magento_Weee/layout/override/default.xml
similarity index 77%
rename from app/design/frontend/magento_plushe/Magento_Contacts/layout/override/default.xml
rename to app/design/frontend/magento_backup/Magento_Weee/layout/override/default.xml
index d9b1bc6867e..26fdf1e9b57 100644
--- a/app/design/frontend/magento_plushe/Magento_Contacts/layout/override/default.xml
+++ b/app/design/frontend/magento_backup/Magento_Weee/layout/override/default.xml
@@ -24,12 +24,10 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="footer_links">
- <block class="Magento\Page\Block\Link" ifconfig="contacts/contacts/enabled"
- name="contact-us-link">
+ <referenceBlock name="head">
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-weee-tax-toggle-js">
<arguments>
- <argument name="label" xsi:type="string">Contact Us</argument>
- <argument name="href" xsi:type="string">contacts</argument>
+ <argument name="file" xsi:type="string">Magento_Weee::tax-toggle.js</argument>
</arguments>
</block>
</referenceBlock>
diff --git a/app/design/frontend/magento_backup/Magento_Weee/tax-toggle.js b/app/design/frontend/magento_backup/Magento_Weee/tax-toggle.js
new file mode 100644
index 00000000000..211b1975841
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Weee/tax-toggle.js
@@ -0,0 +1,37 @@
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category Varien
+ * @package js
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+/*jshint browser:true jquery:true*/
+(function($) {
+ "use strict";
+ $(function() {
+ $('body').on('click', '[data-tax-toggle]', function() {
+ var currElem = $(this),
+ args = currElem.data("tax-toggle"),
+ expandedClassName = args.expandedClassName ? args.expandedClassName : 'cart-tax-total-expanded';
+ currElem.toggleClass(expandedClassName);
+ $(args.itemTaxId).toggle();
+ });
+ });
+})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Widget/layout/override/default.xml b/app/design/frontend/magento_backup/Magento_Widget/layout/override/default.xml
new file mode 100644
index 00000000000..d58625467f0
--- /dev/null
+++ b/app/design/frontend/magento_backup/Magento_Widget/layout/override/default.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <referenceBlock name="head">
+ <block class="Magento\Page\Block\Html\Head\Css" name="magento-widget-widgets-css">
+ <arguments>
+ <argument name="file" xsi:type="string">Magento_Widget::widgets.css</argument>
+ </arguments>
+ </block>
+ </referenceBlock>
+</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/layout/override/customer_account_index.xml b/app/design/frontend/magento_backup/Magento_Widget/layout/override/print.xml
similarity index 78%
rename from app/design/frontend/magento_plushe/Magento_Sales/layout/override/customer_account_index.xml
rename to app/design/frontend/magento_backup/Magento_Widget/layout/override/print.xml
index 20442ea3140..ba0a322322b 100644
--- a/app/design/frontend/magento_plushe/Magento_Sales/layout/override/customer_account_index.xml
+++ b/app/design/frontend/magento_backup/Magento_Widget/layout/override/print.xml
@@ -24,7 +24,11 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="my.account.wrapper">
- <block class="Magento\Sales\Block\Order\Recent" name="customer_account_dashboard_top" after="customer_account_dashboard_hello" template="order/recent.phtml"/>
+ <referenceBlock name="head">
+ <block class="Magento\Page\Block\Html\Head\Css" name="magento-cms-widgets-css">
+ <arguments>
+ <argument name="file" xsi:type="string">Magento_Cms::widgets.css</argument>
+ </arguments>
+ </block>
</referenceBlock>
</layout>
diff --git a/app/code/Magento/Widget/view/frontend/widgets.css b/app/design/frontend/magento_backup/Magento_Widget/widgets.css
similarity index 100%
rename from app/code/Magento/Widget/view/frontend/widgets.css
rename to app/design/frontend/magento_backup/Magento_Widget/widgets.css
diff --git a/app/design/frontend/magento_backup/css/print.css b/app/design/frontend/magento_backup/css/print.css
new file mode 100644
index 00000000000..557b9cc0143
--- /dev/null
+++ b/app/design/frontend/magento_backup/css/print.css
@@ -0,0 +1,37 @@
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+
+* { background:none !important; text-align:left !important; }
+body { background:#fff !important; font-size:9pt !important; margin:15px !important; }
+
+.header-container,
+.footer-before-container,
+.footer-container,
+.widget,
+.pager,
+.toolbar,
+.actions,
+.buttons-set { display:none !important; }
+
+.page-print .data-table .cart-tax-total { background-position:100% -54px; }
+.page-print .data-table .cart-tax-info { display:block !important; }
diff --git a/app/design/frontend/magento_backup/media/preview_image.jpg b/app/design/frontend/magento_backup/media/preview_image.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3c9b11dae2719b47bf95d41e69136f1e56ce2904
GIT binary patch
literal 11420
zcmch71z1$?w)X}UMM9BoK>-2jZk3LqJEbLt4rvUK5D@8>7#c=m=unYCK;RF<P&0Hn
zLrFJ$<Nuy>zjMz0{`ZUfeD^ocvuCgMuG;Tf&)WOl@4lM6ng{NvE2}93czAe#D((kd
zp#X*7)PD)Tjr^Ak{8qmD43OW%Bg7*lz#|9n$?*ut@vgoB%m5yMk57Ob2mTHM!s|Ei
zuiYfVyM-H9z60P9;NxE-A|kv-h)?iahTz(D!W($_H_2HADX6IL3qR5IsioAn@p_q5
zQ1^?7MnvJu$X#0Yod=>~imw;wiaG2YaCR7R4*uB<KzQTY^_w^zZd9Hez`KTzM?ipg
zjquv-KLf$Xxxpj6ahHPfCOH)~4cq+(w5;sHBBC62_K}<q1%<?(Di|0V+d4SDj=Gu#
zNC<G|$qC2-dEoNb-!J6<!#|s@0YdwYt~-%D3JSf=6x0YF!;4!=k<gw$uSSb^TYF%j
zXuM32;#l_^ZQIa}tY1giiL;3RT_6P1ySifM(?Ll60K3qOY(KZtsmeRtTZ|7Ew8)kG
z*C&veiNvD)F+AEE4sE@pr=kIu#>QRiw*g`XN#!j`m?T7I{0fMIR!7i1{?A<9FzkkJ
z?5t6($xK*JL|pe;E_y37r<hk0H&wsi3%z}Z<k_Fv_EY^2=d$&4wZn@RP?(Fyyu4^}
z&-|NNT~^W^)^~{h$^+irSdJ_Uww%#md2N-=wikrgm*M+UXNK6r@Y##Uw9FK5#tL(-
zm@LC<hE;S}KK{*&YE~>q>CJqRQuhn%xj7V+blz#|N0|BGWq{*g9{pLk4#~FK5a-3|
z&eYqZiNDCK?QFle$6)C&*F@V=7inki?2pGhHH;G0@;3`RtIs@lb^vSy&K*g&gdf#d
zQG&C)Q%Y#qN4h+IhcCZEXwJK~WKR#=PuGFZ?Qx!SdNEi-+2*aCbtEd9P~dlz{^sqT
z!^|FJ9^uyyFh^%QKtug|_oZxPta@OTT)XFIg7)81{{(`Hg(ZK?UhMXHe$;m2NBrhp
z-R^j`(((s~3thcXV|Re|Gfp0F%6+i=M__wk2bzDPbY}ZA{vSiKZJ{P$Lv87UHYiKt
zvl}5ev7U}N_oW=|OnqoTuRnvV^hI-ov4yy2R2ZpZhxwt+(mWpWw{yBQeQxp9i8cKz
zU<z4jy?GX4^4>E$<ya9pRXMZMi<-oH_*?AX@vzW&;VaJ|=R}ireN(_T2KXYAao!kw
zzBSk;BYGGXL3^E2S4l!iN~=ArQw|Ntsm*AtLD<<3W3=_e-~(gg?s<tL?!0LB+Ow0=
zpWJ#M;{!bJ=crk2-z&T8qpf5hXh@uXSQKmdY1ptcK7MI+m(F=Dx?#X<678njlwLT2
zlz03pIzBcS{-gGm@MeVz<w}>ru|8=h3Tx@%tokFhaW0T&gP%y+Npq=&v2DNJJg{l|
zAV{e=&n{yyYVHv1TsLE+;bfXJrX{=UN{uX@Zh?W7XJp17l%$EYgwt<WObaZXRKwbh
z2@#mK!`G{gV%%k2R5Hn6nw5!Hugh35w39(W8FgDe8sF6ngdfWGWvMxE(B8)b!QrZ!
z2DcpE?@|g3Fm`fCfjP!EQBA#w?=9~a{niWy_+fO78Hsu|Sac|wpXtZSm`xf3*u5jK
z^IaHyeEl>>ZR=^!{+IZ!B+T(_;r;gR>y-@jeG?zn%*?kpZAna0JsA_K6rVm*^B$Tu
zX#V6%k<qD;`J?1hP|{XzihdlELrn*bg5klYc`<Riz<B4#6GywW(u{J}v5@IX+g*^`
zWUq>Xp7wnfc5z)NkO4zcYJI!ud@R;>R=MLVTLpJjp+c${Xfy@sXD7?70EMNNs8g=`
zpcHfsrho07!1Z!$xG{%ALC%e`5*wu699ICuje&_7rUvH~miL@}<aJ;44!2W@bi)VQ
z=vhHNgR@2s70XaPgSU)6e6@1}@uh9)^`}NgNYSa7IvSJ;Hd$pL-uMZ~z<;w1JD%M<
zHs}t|{+=BB@?EI5rnn=r;auZ-omy-3(2Sd|O_HHSt6Pb`YR8djoqAYbYj&3L&(%JM
ziTMTZr6F50TDZ_DIh&MTO8cnrTgq{-oCW3+z2v+c9*Tek7y4>Gr+Yh19Amo)P&Ehq
z(&ye{U9J_V^--`vW5u$1X_Md4OjR~JOwrNX(t}K`|IUC`fe>TjT7~?kL`EuXOz8?J
zZ!oBNw!xTksqV63DZ-PXW>OjcV710iQ`n5{wg?GW!}{rRUyl}hNoLO%fy9jWJ{lr=
zdRFozP!YkC>l3bp7P2)1wz<8ZzO9pJI*%_%l=CFyG>n^qPvY&EU=mn!hns#b2|3MJ
zxr<sa41Oos!Y8jD55e{EoOtRsvDT8j)iybj!L0iR?@-^}{h}U0kgh&sP|-3SmP|V~
zP1<S;nGDb3HNgutH{X$RmpF{tRB(JzwU-0kOsq?B#fG1up+UoWTh=9C+Vh--3JQZC
z+>#Ro97!+ri5%vaA;tC?3tz<EKPgNwTeS`#a1H~tyR?jbz$V)<ornrOkQ=DTK>IHA
z3apdbNk(na4g2s)ETUDg>Z3X3l7lvlo*+YUW{YhpD5vY$`YE{DQ2d@g0%`ix!#v${
zccI(+dcy&vBbFfT;SY`tHibB9WzQx%iCxn`-qAeFk`K0&3ZzuD`ZoR6scDv&i#wU#
zhA_08Tlm50em5j@jBIm;iEr?HC6IXp;lw+|Pg{8FyTlXa6Z4Oq7JVx{R&#Psi{(L8
zgN>E3>(!FBnMs8U8@)z4y9LUAJV9o6i_5w61K~!+Ys{0wSn-_;X%|CM10!#1@pYNt
z4y(t|PcbE3H5Rk0ur^2YFj#KhA;nH5Y>HoKU8@sa+!{S7k?y@7zeYUV^k`+Om>=?~
zaBGHeVIWJdB}(0ve;}!U>deB^)X`(<fq6*<<~}<)2Xez8_PK=j-2HLa759~|v>bIG
zDh6oB|6rR^&`V`DH}UJN@~xJKa+$lrg>!7+IqKO~f~lOu>a7M<!A>I7J0&waTc}XT
z21o=s)FJ8V_+rapa@elmHawlGhZWXx*G(lOlgeELQIT*K=vR`{pRN6#+fov1!PoP>
za8oN@9DmomjfFpr@L<Nwy|}cnPOqNV{Mq5hxZ<A}d++aPH7VyBZikfE=wv(I6);k%
z{(5#b^Ugl_0(J!?<x;oCIuvuKON%u=k{fuDfYpzbK|imtYY~N0<bMN~-q|)1epAHN
zPuW&iiC8i6oiRJ|TCwy{o;ty&cJt+x8?P9$t-05}Wm28)6G$2uSEUFGE)`e>#jw#h
ze3RHnk%)PuvPTwarmFPw;?VDB;UI)TZ-zMCr-Ha%efrE&HIQ3B)wf%t%lm=-gyGr7
zq;OQkYnvz){bY9`2`y17R9TT5#>r68m%e(*cUr48r6(-pWZR_or8Pt8Z8bkJ{j^nY
z*u{9J154nV;kyOeexH;zx*;#H&jgLea=v~${A>bdmR4Rqj!9>5p9z?;41Gk?P;K@|
zd4yh0dT*oZfrIA6L_-OZ3*7vsHFbf=`r~^<*l9zSj~n;qEv$=zD*dZ`vyyuMz6)&A
zR(Ws>3laaFNH@6DMiI-0?1(aFdfO+P&#-jo!BrN$-^zN0OA?pak^@`d6YlAT_*zxx
zuIZUSV!so^-jqCgkErG_W2pTqP0~Rxg=7cu-oh#bs^}Rt{;ELE;w|-l6m1;c>jBNt
zk592x2BPl&48AXRYLNNMvE>PyQAP`QLv2-SV{8wDa8aKVsai%1t;6w730ER%Xf8jW
zBKU?L#_C7`JBzhYKTN7NF9=)O-f$ay66DCSU3HDx<vI+K@c{&Bi+b(d<186FYTC)w
z+l|UJrA!^__bVb9k!ANmMPI_JT`b>BB|+H5Z?=FZsu}%f(n3Tgq}n+sG|TDC>vDSQ
z=wB`F<P<D_{K=xf<EPek-I`Q%u=TQ_a=pobuci0yi$#N5gJe|U%u^;yb^$(-RN8Kc
zD*6x6pUP}nBGqym6k;3LPuGf<ejY@Ps+Y6|a5U5%Y4r~OJPG8wWhK<16`NW)U-`2&
z;dRP~;aj<C1cr!eQx#cI4%{MX^kMOw6z_}#=$ciF=bKj~rDJWxhZGP)Q-cnW6TP&L
zAYC7?CivK0GVRlu5Uu*1Dt5FDF<dam#uP39b0YpK$@AejtW*bC*0jm_o+pq;xveR^
zhI@;NJ)ubmYWtQ-7-?(=a@>#6<T{o#C>t;@_kw5Z$0Z=Nl)aV9dbQAV-;FHA_RMBp
zEI}E0^LbA@PrMq!*X30GuYld#`z6xNrB}eHfL!fm)P?!Z+{~rZ#l(_)+)nt>6+n7n
zeeedl?|B8#@sDh;^Ivvh=FW-N!<Sj4FQ(4d&pZyFwiv4pD_lTQWjc63yYRBOGck^0
z=T?OTI(>9So?SR&%iEIUOC?de`QzOu96LFl7wmM(fyQaA+EO>U(plc5GrNYp-*A*E
zC;h3_{LKnWyKAL1nu1_j6HF1FwYod!_oANxyKW@>&VE`?u{s~aT}V3E^cnHvz`^?N
z^xl^w=U>P=iIEZ~^ALL_Hp9eTCG&b2+5yFw(0ry;_Fjq{<I91wo?_AOb-p}2`R-Uc
zGbX8^_N3@hy^3~0zv6@LJg_f2Ed<n6#5}*+9J^Rj<7i9&L$j~N;WamJD<~OMRb~79
zT;gzaH&j!^<VooF7q)is)_o1`=7>B{Ty!^abZ2?|;b^IuMon|Euc8*kJ9hX^d}$RE
zMI21)>EyBt1IU6m#wZJ|h6aHOH9uA(*DVnR-z^(lk561Jvsc^4h=!lMBrT^)3d7Fm
z<wXj*hpIeMNKm8DRUG@Gh@4O9c5?h7?>^WTA^c;NLZ6IuSfn)fcxyk@4H*9S$6MS9
z<=fkg5*VtP6HBWrph^ai`V8F8JsN*E%Kc_^Ja^Rl`&9G5HshX3x)@(U5oL?-OkHZU
zq4YaQ(CkNLvvMUzvTSIA|3+P-dt7Qu`ish>M!M{ZV&+BmW!cpDSB2$mDSYt;+usJ?
z1Rc>2ajv>pch`BPa7iAiOX){C9q`PRZmr3x_0pW1*8WN@y|YVw!XLjP*#Br()biAi
z2i(cH%wwq4uxY!XFM&?8^dRz9w)BH%pDPCmZP%A657Zr2v={F;B8=7y1SA9s`DW=Q
z7Cf9JhUjKR2`QNxQcAIC30O*8=8GIQ2>Kp^kz-Q%Bz))DqWA#)@{dl7)2ykaMsVGi
z!yq=(bDCF2UXXxusUzCt<L73%u8r6a`EZ5M@HO%A9H$2w;pl_5PV)VWG9%MKX|kll
z>I0>Kx3c-~PLsiJozzZR$jx4h557VqUJfVo!!es08!}bm`2?^tiLF7Kf|6L@8A}gL
zjCn!Pk4<#Atb?mM@`sYVxqbkBS6+G`abz&KbZjvOZHLmQ(BYrf^71D0GEA8b$rSMK
zmf@sVdXsBzp2$rZ;O5L+Z;lj#lsB^1O1Tb|=Zg_cZOZ<Uu`SdfI}#aOfL>x!9oDWy
z66S-3We{E}_2yp@flr%M;!V5$_(N1^^wosnxa+f8c}z!LtsFQYWwR$V#c91go&M_s
z<5KPoHLbZ3PDN)a>PsDCBKi8&*pW;KOMlL;A380KDs`>gs83L7%oqDmcdQDmxSRdG
ze$9Ju`g^&th;N*U(sGW<e9oxu03^4@)m^dWtvJ1#I;HZi^oNOB^@eZ>f1V9H@}hzR
z!7Z5N8>o<86?;{4aj<mMUNltLM-%imK}^;r4B~O(a5fyRX&J;%I`TYK)qnxprqmMX
z!BHbyn8cK!)j=l$6=|wsh(+gA;IFWHT>)HKkHZ(vn5a+i-p+MOtiz*LKom_ZtKr+X
ztwiM?o-jd^nr--@Dbk-7xA(Mv-Ny{%*K3!a%THecTX~As$5%l1xk`A?CCyHF=oO%{
zEw^xXI0&CBnVa4o%b(w7S)L4IKD*Sr5I!$my!1I)Tkc8=cfO?9yV2m`2Z3TY1w<HI
z4OZmeMBZ@n9JMBnlYCQrUxw=k-*sqAsWXW{T<C*wTXQ1ksDb+Kn-4K^{Fk>MChu~z
z)bVHOx|$1V4U|s`3|mMI=k8f<iRATWTcOCiNL@8*0+_V)k01IJp~{EeoY@!pk`9|g
z7Wj3f;vwnrweDAdgS@8kvCrIzc1a_qF+Dsxk!n(){UN{D6|hMsD3ez+rgb){|Kdck
zbgD?uncb<}!Iz?NzxB0In9T~Sp9x0S*p&Vyz4sIBkgXk0h0><xC~M#gMXLTUP6kDk
z^c^l!R6b=3yKyag?L*NkK8Y$rMKtzK{8DA(4=3%BvQgCS<&7(FeT)a6P|m)CF5*o!
z7u+Y6Uvemzj=A#Q*8BD95iI>tq#L<8QCx?V%I(qZgBmkso5m82iJGFZ4$)>KGFCmE
z!5?p#ZPtw5K*})S;tR-#+_ZcHHU7({I$tIpH>)S!5Vw6QDnmmmn6ze*w3&e)gEFa0
zMc+o`6QLtvHG9Uv7Vk}?Kqp2uR?<{jMY|-ek%?zDjaiJGti2J9A@5chP4BXQf-|R_
zVV>Hno6Y)J^4VyWtM_|u8Kre(eHBc&vkIz_+w5at9;C2sMwxs%jzZMV>5u7{PS><X
z)l_515F@qpjRdqo6!DLpOLQ(>QL)P#H9;#9Q2Hk*u+V-`8@+-)wbrEhS-h)nLhAw3
zLS)MUd)U{EVJGbR8)O!h8O(vLj?Zab;(L?ZA3ih`p!?~<jq!JT)D&snd-lDtDU+7v
zjUNjtyR&9IYtrR7cC^a+ZoDreg+tjMJ|whXg3=QxLD|t_)xEYB4PdM^xlxEOIhiFp
zxs7Ly8(Ez*J=0*TBze8c@nsaJKV&>FwBKIeQf$d^OmC&`?A<`NOZ!54p0%b5!#l*T
z%tZ3WYHO-{WYB%R)YJ~h%2sEB{!#4Hf;y^d_f?MEYD{*jX9ZFE`}`Nw@B)3>m<_vZ
zz54gJr?h`}BGZ)BkQQ7gl8gJl>qLVUPy_l<ahW|(5A&c0F=*x146~@?6`=5VY(R?G
z(%7{6)we64<gowS32ausiRw_d*f@|+bcC&o&dBsbZgQbj^k@q2<;NN}c_$=A5rdR;
zs^oHIInyH^>0v#d4~}tVm@%Cq%=6RuP03WJp_Oddd%bFx73xoMeG-XZB#VpEG^8!Y
z(J?+`?jn;Z595~u*rB$m&o4bUj3?puRTQvxGcG<vR`w7R4O1`G!vNAXax2HxjO^PC
z8$n+$)aSehj`HthwC-Cm6pnDeFB6CP$9Zqff-HhH3#A2egM^%|oIOm$smdh{uJ=DZ
zebk^i`Z9ki(P4wcPoe=lT;$Gh`f6=D>WH2>+ibzSrzW+h%$|2k<F%Hi?90RzMu#U_
znvQ-SJgzY;J7?BM3Uz4+GlmpdbZNac){GKDAJ-f0pDqtMzZ;CqCW6*bb9};1sf0FV
z_*9aeaS~ySJlh=z6%!m6RW3}nLz1{h?!tIx97WwBEs~W(4IZXb*<+%y-%&!aN>$wr
zhY*Wal&XY-j?hv?I9Wpu-0FdyXaV)xiCf>Dop}8Ao^KKqZB~`<J0+J0>kFjE1h=+}
zcKi7{XENHl&`n|1l0WEgW2OV>Qu7hDq(7B)r;6<EynsAO(-(%;lvjhwC(*UX%FdO`
zIxQ@M)AfdFW?7YlG^oI}JpCG(M%t|vH?fRpWt~~7^tN0R#<Rgz+>6+5fqk^MUm`pB
zK&JXGiW;%+zhAQE`Up!s;w4ts+S(F(3>&H16ueHp$<b0P&vO^j{FO(T^wCe3dZlXV
zte*~+&t)~I)Y%*pid|H0KVSctI|9k>pSfi?xZ+_g^!hDig++O}#355UY_T9EqjJ?Y
zYc(p$3y+C$*8w5UCwlj}*uD!w^x=UQQykL)pUAn1N_QGL@_A;NbJ-SeyNcf}vplaU
zzQ&w}(afim*!K_<5p)w~T19%jvw*j0;8?tg3S1jd!LQro&0OR;9(@R73qeJ{Qy*-g
zBT;d$dq8g@%>3<S(^M_x8@07Fv`G6=PY?Jo;^KIRjC;Ckd5ze#e^w+C86SLvj5q%#
zqXCyGoao!sV|4AIeG1;ye9+!@&Lwk<=`uU-aykqjonu-KpuZGfY0n#WZJE31o!jzn
zv&J4tU1IuKOxLZ8IH$Jz!Zqb)F6)mI$-+-X55s@uv+pwV_gn!Y=g_ySC%F4UyEV&B
zyuwFAx?;naVw0Z;-$!VB%Z|n$m8HJ0gP0ay^nlq6dhnZ%j*7y?Y@^DpJR0dVDw*yL
z_F}^)*Yw_~B}Z{dhown8bFSs*S}c6^wY+iuvto}*v&&cM^0ZPXuEXhH`iZPL<#(B^
z{eCP+bW1!<isZl6GzPf>sJ&&E^UM%OeLiCGb;`{>!;FJt)gNV{f&@m6brx4Z1+$MR
zHIXAo@#aY+6`9oH1`TUDv8~X>Wi-X>w9f!R2lGz1A2~=g5N7-n7A$%yiUnH!;SpB!
z_-}8C6XJR2vXNV--QV!x{k&~qURr@#)pMlB;C=VQXLu>URhW!#Gc;kS)~L>FIzl@-
zJ0>IiBY^9oCHX`L$jzyXCNM$SjQ<wJ0)=tq`V#UC@c)ccBII2*bC>*fP+W33es<>X
zI(5)w1sF4m8@A@q$ArGv#`e~uZ<qjhJmEd}=Nf+j9T7OCzv0i|K2d-~e$9`rCS#|d
zC{)|w{_nxtNXqY7A-Ju8&}`Ugh;*n_1dj)Yc**cI)VTig2n%%MUimMuQ|?`aGi4ne
zoImD|0B+Xr^90Zy+v2H$lqmGyXlLm+g+aHsHz%Tg32&^*^R8Y2()EtRq@i79gaO5C
z6qgq-HoDK&aq|NJY+gyC43%GfW}y>MvYI)Q>$p9uzYZ9uKw{pfym``af|MEG#%-H?
zq?*7j6!e+NE$31XkPQSCc*C5k`QeE_@InDVDZjwHxwreyt$P4L-ON(di@g^<!N>ei
z?XJ1#>jgQl1L$j~KjgWthg-3beI`2w@E={=nt{vFM(6^--KKLr*)tD-c=C6c{{{l<
z2moOCeLgV{05@cE*+MVn1+MP{c+_E$?n^8rk00U${(?_re#ymr(G+og<F|o-10M7<
z0FXxD2-jb@&AB|SB)KbqB?JEy0OI7IHhCpR-J^W`*8|t8uK>!#Fw|%KL!61f<9BR?
zp8){)Gs*w!=>Yy>n(&RTfLN6-@H}2H&cNUCXK>GO6#Y5wu$Ek`-POAabVdMd!+%tx
z?G~bOS^F#gf1XX!Fr1=K-zewY(jH*_7$A50X|yHy>l=RbU-MJD7L&G7F9560IGMlU
z&%l0Xim(fJkX*)4Z10>z@PGWDwW;{meD%2<)uYXJfd3gz=5P2jFgG0WXU-XSePfP}
z&p*@r0bDaZrD}T@A_x@X2LFQ3?r~fkd^iixeEPe&zXc|SqyNk~S)i2S*?HJA;-CLi
zbiiNm|9gs2)pN!O>*>ONu+&w_JnYHz3?TfB3;6$`j0oBX+uoAhH56%S$nmK-l@1X-
z#E#*4<Ba_siiK)r`Gkcs+~HluM$GiE4OAHc{w_<<yNhzaVEJwTPb9Z*e8GaWy2xsv
z2#?Y#(pNZ5Tpbd2HXZ4`YPD!uesIKmfktzGK#p6FuG&dtbrj3QrRd0y+Z7#m#~pvk
zKTw78MFn(+zfAJ^Qh81*P-SCs62>sIP3Rkov5r~~Ew2rd-nis>zW#Gvdr^FRwBvFq
z_HekN$O$24DUR7L=Lr+XR$G<&6r3*;<%PilmqRSmm)X^KLZDPvK;PibS}p4Qn^8~_
zvR3HN;(&Y6{GZgDDoB)4|Fw3me!YL!=JqBsYF>C_;R+DMHA&HW_uozOBcY!NLYs_K
zw*1f^+dWrl{SOV}_w+Ftlb|{#3$1szP)$~Y8R4^19ru_%{#&KWNgD?lSZ9Fm`kuFp
zz~+*TskJrD`jIHQPEFlPZ^u`$E&f^gHUvF2Tr0L5A$e>i+0O7(0wUAYkfwg>Bwd7K
zoOor4TL7=CG~~69l%v6>P-W%p&f;3{o0&-0n@)`-LWmAt)j-+aKbBh7u>+ZU`YA{5
zP2Cn?`Rop1?A?RTt+wwn<O(gD2e?ZLnH$)s_v0NO0;Q)R3ppQe4V6K|yQ`9K;md>}
zymSVjjhiKvP?4=B@x{^U81r&hZq8|=Z^oEW)g^b`#K@7Yu-6Xc1_tYJN0;pcK66zU
z)4c}PI;0Rt;?(uNgH;jj;PsL4Bo6l_{KZBXihgaPPFS40c7B0WPnMKaEh)u;duv!j
zH?0`9ERnF+tYsWEnzIlT1oA*cP4qI<tlt2kE9`#3qUtJ}<jTD*-*S#`)H&%Jhzs8q
zoOjV4Zb|5_-vg0f0rAj*?+Go5t*E3X_KYs^#!Qb=CP?Q*(5&V}7M~ELxE!^qH@fjW
zR@OhjXtv*wQlWn|qg3!oA<6u*sqj~|6lFjAeES#0`o_0s9iFcYIau~o5}|m&8wJwB
z)|vsdO<_`O%KeX6CE3_kRP3fC6f~X&N4rXTy)ZIYPpe{APuRBb`-qapocSybayq`O
z*<C*(e{{TCF>`j-IEOfVp2|Q#DK?(rwZ`%(_G~JK&0CjRDnqe1>mA(6p_-^LFUJoA
zg7^{Jp`8uYojuenP3YI;0!^}Mc<fhrBaKxaOIMoLE8Ni8sj7(ecjw@<EOH98*6i%@
zpQ7>0;^cnrkcn7F*~c(Ys;9aMHcE_>3=Dg<rgP^&lc-YF)V;<=DOl69!DA2;^U5P_
zy}DV!chYt~G^N<sJjTgDyc*_~h2UzrUTbxm!R3d+8=%Il-M%biYad>%lnbR|qWXKC
zdy<KSatwZ;`j{5;%$Fp7`-lqc^OZo6>5p3%UB%#Rv!Gw!QI(8a(_i|f9F%qGDkMl?
zaTNz!h7R7wI$Eq&V~-XdWDM%n?+U6mgnW5tP$Re*PVUiUqG!74^=JVek>)l*2+_f<
zq~a+$hf~Vq;1=H+4My`cv{)y%dE42aE4ce|qHARK_sYDZ5<i<$C)dq@JxqS?h$TFB
za`_bXBX00DmA_=6lSN{RqEUw}`jE%^Qyj<j9yjL%S!T_c_dD!Zhb6>xLotSz;-UCa
zT2`GO)A&f?j8$8Hn2Ux3rx&_-tK^l-%*|=N*-;&>g`JGNd^;W0&fTAl0wlD>A4pOX
zhd+z?EFyeT>BV5A{<T<pQ=KP`pIVZvmJe+7=+yPl&jmB}Ehq96w)m?Xgx=WED(mK@
zRNhzIpLh}wFqr)Sd<*s7#dpYjy7^3d$)&oJqpW|jtTu3heFjY9|7iFd{d6Cd*ZmiJ
z4@~<$z*<;^lF@#-u#Ytvh=8zP#^XY^yNFg5l`ntrZprclvhwB(7A9HNJO7;aE`U@7
z3F&dO7J5uc<wS)t9@5oS)z@3PQ6~khXl~jz28E4oLW-vYz$P6E0?BfsMWS2d{9GD?
zpUwlx8NtO1&-Dj+iJc{t^{URAAx>QG6j<?BJo{i8vt<)0s#41S+9^vUUxPGLE8z}R
zlVx?ftFe!EIGO!gI=zDE-jaIavvqHQGw@1t(v-SY_JK)lg5W>g*zsFadMPhq>j%dN
zU?9HDe-kl}&{*#cfX?IH1O6j^-^S%a#!iX6KXg0m+K26*$DL%1k`;8GmoCevc=IGy
za^J09hTh%nAkz!vWP8z-C^3EG?UFptqHjoCU+!0X=b2M*LeX-NT-fGW{{3$3j`V0j
z-%gvAUhst+r%G_^u(3}iEFmG)_dvev3W!<GqhIDP3Q4S!6R2DYk3Nlq9o&Hbv5}H5
zyvuTJ?b}i3$K6ipuXUTpx%raA_uGdHwy0uOE-pqI4|gkL!_yD82^ljN<@r}UW?{_m
z4_AQHQj~?lH#sFZ%Zjjt^Vbv3{q6bPoU@j(S@0lLSMv0+b_#A$2JJg}SQdXai<Oqm
zOX!-BMjv6$<=v~s>7froh2iMx-Y(MBi_%ciGwbCLk2j}$r%H3XR{)_(Ur2h=;uXMP
zy|5q9C5oH^F)#eQPv8UbMf&KWiAa*@ZQzsRnM;M3{Vdrgk1986<vYWO6f5UNLo@Gs
zUK348`(jJk)Hb7a#a~<JrSHg*pfS_D)zQ*beptP@UQQ!QLVbY`lEVsF_|aOW+MNI)
zE0+Z4rIhlXRaQbNHl4;~6H0Ht%&Hh);`X?yv3w($+u_4pVtwy2!*#V>I!{!@R}7Mj
zc=TDrsl(LDM6SCBIB(+J>aCZ51T8(C1u<`fhDH;@wzN$|YV7T928_cqi@1))E&`tJ
z@(Bsu;!DkN@6QM(&NLQE_DMh)-W3i1)zb^jVttslzINO_whD97aF%}-)Q1hxeoAj~
zbH~(NnC(S%<AB$U`u*~%6)h=jGOKquDcz<`!<sZ{V*WwksW|)3pnP&8j3GLqL(d{}
z<PhbGdU$Ad*u6KpGO5x0YW?ts_E-8CYpZS;xwBBYxA`~ZpkKpzd1tK7_)NlkGa=K9
zdkwLM5MzC`3BBu66BNU}xCyETbp0x6?o-QB5}KjvTq{>8QGF8=st>~kqsN8QD#DPJ
zd`YX$rXQ*gTMDXL+WH@S&l#Yv;5LqQG_R>9(l=6nTA$S;yUEHcoa3k%vcS`yvbdM`
zWoc}KLE+qWK)RQH=M_^)DRKiGcxZeNZsA|Xv!L=}U5wt&+x)9|RORT30%F75%!T*Y
zQmyBJ&QinN=)t~7YHE|2WLHT|D9BzUqK?`u0ruR&>`9g7Q{=uPSo9X$F};GT+~P$^
zWoaEqh3mnWiW+nKCx>oByJd}Zbq)izPKI9JMKls^*b1?QCA{8FN*W#zusBn(G_ztr
zIGG01`0gS_Dkmg7c#e}%d|0Po)1s0drCqixC$ud0xD%a&^kB|3*>@h@ta|XcxwI)V
zQ7Uc3a2Ih`<GV9bl7-fZ%VWxPXtGXB?@-52<Fs)HqhUN3;ELG798ZVK5~-r3xW#$;
zXfsLnOfePa!tHfb3?a1=0(RUBht}+gAJP>FPxfRND5eYyPzoPf#Ih+XBOM|IP;_sp
zuPLAAfCGaCmkw+^N=f%wd-%5sdc6>NT_I0fh~G<`*_Xzv75tiEVHBFlruN=I)LDU1
z*V=2T-3%s5rq@VTdG%YeGlf`TEV3BEdoAhu(HA@ibgW#6e_Z7K$3FF&b8G3lAH^EO
zUitQX?ZJiX#Ub!40=MuT;7VoKbKNVy0yeNn=;6g@;ajT0^T%2=<LTS$2R6tE+*f-=
zZ|Re@_0%@I!xOD)(12hBKtusj5|~G<862O7T3Y3s5C-PRb$Y>ZPn%5#8;9%vyzBN)
z@!%m}^tBBo7w<K19UOWf*SqJUsREL==&pdn(zVcx(@v(W)(EM4zjg4Eov0V!5X#l$
zz1GGH|6{<Eq27J2NaNBnw<G&-ySIU$?w?HmE72|U7Nq6XB~l`vdWm9z&ebylJh2=_
zeiEX0aXW?!sDoeQxDP0u+X9H!a9zI1>Z19@afC^xQpp@MIY_;{4bis#oKWXqt^O;`
zX4vXZF^|-UypRn`)ROx|B7T?st8eqKFxT~wpZlkPFjsMw^DpP3FPvw7ehW)bqnXyv
O?Eh-yznc!fn))Aia{h_{
literal 0
HcmV?d00001
diff --git a/app/design/frontend/magento_backup/theme.xml b/app/design/frontend/magento_backup/theme.xml
new file mode 100644
index 00000000000..8109c440bc4
--- /dev/null
+++ b/app/design/frontend/magento_backup/theme.xml
@@ -0,0 +1,33 @@
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category Magento
+ * @package Design
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<theme>
+ <title>Magento Backup</title>
+ <version>1.0.0.0</version>
+ <media>
+ <preview_image>media/preview.jpg</preview_image>
+ </media>
+</theme>
diff --git a/app/design/frontend/magento_blank/css/print.css b/app/design/frontend/magento_blank/css/print.css
index 77401e43f7e..f0fd31fdd03 100644
--- a/app/design/frontend/magento_blank/css/print.css
+++ b/app/design/frontend/magento_blank/css/print.css
@@ -17,8 +17,6 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category design
- * @package default_blank
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
diff --git a/app/design/frontend/magento_demo/css/print.css b/app/design/frontend/magento_demo/css/print.css
index b2ac6823c62..4910319f702 100644
--- a/app/design/frontend/magento_demo/css/print.css
+++ b/app/design/frontend/magento_demo/css/print.css
@@ -17,8 +17,6 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category design
- * @package default_default
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
diff --git a/app/design/frontend/magento_demo/theme.xml b/app/design/frontend/magento_demo/theme.xml
index b4097c78ac8..ef6fad5d654 100644
--- a/app/design/frontend/magento_demo/theme.xml
+++ b/app/design/frontend/magento_demo/theme.xml
@@ -27,6 +27,7 @@
<theme>
<title>Magento Demo</title>
<version>2.0.0.0</version>
+ <parent>magento_backup</parent>
<media>
<preview_image>media/preview_image.jpg</preview_image>
</media>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/catalog_product_view_type_bundle.xml b/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/catalog_product_view_type_bundle.xml
similarity index 83%
rename from app/design/frontend/magento_plushe/Magento_Bundle/layout/override/catalog_product_view_type_bundle.xml
rename to app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/catalog_product_view_type_bundle.xml
index fef09fb09da..79d22f571cc 100644
--- a/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/catalog_product_view_type_bundle.xml
+++ b/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Bundle)" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Bundle)" type="page">
<referenceBlock name="head">
<block class="Magento\Page\Block\Html\Head\Script" name="magento-bundle-bundle-js">
<arguments>
@@ -55,22 +55,10 @@
<referenceBlock name="product.info.options.wrapper">
<block class="Magento\Catalog\Block\Product\View" name="bundle.product.view.options.notice" template="Magento_Bundle::catalog/product/view/options/notice.phtml"/>
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle.options" as="type_bundle_options" template="catalog/product/view/type/bundle/options.phtml" before="-">
- <action method="addRenderer">
- <argument name="type" xsi:type="string">select</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select</argument>
- </action>
- <action method="addRenderer">
- <argument name="type" xsi:type="string">multi</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi</argument>
- </action>
- <action method="addRenderer">
- <argument name="type" xsi:type="string">radio</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio</argument>
- </action>
- <action method="addRenderer">
- <argument name="type" xsi:type="string">checkbox</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox</argument>
- </action>
+ <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select" name="product.info.bundle.options.select" as="select"/>
+ <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi" name="product.info.bundle.options.multi" as="multi"/>
+ <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio" name="product.info.bundle.options.radio" as="radio"/>
+ <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox" name="product.info.bundle.options.checkbox" as="checkbox"/>
</block>
</referenceBlock>
<referenceBlock name="product.info.options.wrapper.bottom">
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/checkout_cart_index.xml b/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/checkout_cart_index.xml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Bundle/layout/override/checkout_cart_index.xml
rename to app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/checkout_cart_index.xml
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/default.xml b/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/default.xml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Bundle/layout/override/default.xml
rename to app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/default.xml
diff --git a/app/design/frontend/magento_plushe/Magento_Captcha/layout/override/checkout_onepage_index.xml b/app/design/frontend/magento_plushe/Magento_Captcha/layout/override/base/checkout_onepage_index.xml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Captcha/layout/override/checkout_onepage_index.xml
rename to app/design/frontend/magento_plushe/Magento_Captcha/layout/override/base/checkout_onepage_index.xml
diff --git a/app/design/frontend/magento_plushe/Magento_Captcha/layout/override/customer_account_create.xml b/app/design/frontend/magento_plushe/Magento_Captcha/layout/override/base/customer_account_create.xml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Captcha/layout/override/customer_account_create.xml
rename to app/design/frontend/magento_plushe/Magento_Captcha/layout/override/base/customer_account_create.xml
diff --git a/app/design/frontend/magento_plushe/Magento_Captcha/layout/override/customer_account_forgotpassword.xml b/app/design/frontend/magento_plushe/Magento_Captcha/layout/override/base/customer_account_forgotpassword.xml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Captcha/layout/override/customer_account_forgotpassword.xml
rename to app/design/frontend/magento_plushe/Magento_Captcha/layout/override/base/customer_account_forgotpassword.xml
diff --git a/app/design/frontend/magento_plushe/Magento_Captcha/layout/override/customer_account_login.xml b/app/design/frontend/magento_plushe/Magento_Captcha/layout/override/base/customer_account_login.xml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Captcha/layout/override/customer_account_login.xml
rename to app/design/frontend/magento_plushe/Magento_Captcha/layout/override/base/customer_account_login.xml
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_view.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_view.xml
index 16e0c3b2030..f61f99f435f 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_view.xml
+++ b/app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_view.xml
@@ -29,9 +29,6 @@
<argument name="at_label" xsi:type="string">none</argument>
<argument name="title" translate="true" xsi:type="string">Overview</argument>
</arguments>
- <action method="addToParentGroup">
- <argument name="group" xsi:type="string">detailed_info</argument>
- </action>
</referenceBlock>
<move element="product.info" destination="product.info.main" after="product.tierprices"/>
<move element="page.main.title" destination="product.info.main" before="-"/>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_category_view.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view.xml
similarity index 98%
rename from app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_category_view.xml
rename to app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view.xml
index 34ec89d16c3..a8b8f191233 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_category_view.xml
+++ b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Category" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Category" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">2columns-left.phtml</argument>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_category_view_type_default.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view_type_default.xml
similarity index 93%
rename from app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_category_view_type_default.xml
rename to app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view_type_default.xml
index fd6d078f24f..0ec154a4b93 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_category_view_type_default.xml
+++ b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view_type_default.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Non Anchor Catalog Category" type="page" parent="catalog_category_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Non Anchor Catalog Category" type="page">
<referenceContainer name="left">
<block class="Magento\Catalog\Block\Navigation" name="catalog.leftnav" before="-" template="navigation/left.phtml"/>
</referenceContainer>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_category_view_type_layered.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view_type_layered.xml
similarity index 94%
rename from app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_category_view_type_layered.xml
rename to app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view_type_layered.xml
index 288770e392f..5731b6ad280 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_category_view_type_layered.xml
+++ b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Anchor Catalog Category" type="page" parent="catalog_category_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Anchor Catalog Category" type="page">
<referenceContainer name="left">
<block class="Magento\Catalog\Block\Layer\View" name="catalog.leftnav" before="-" template="layer/view.phtml"/>
</referenceContainer>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_product_compare_index.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_compare_index.xml
similarity index 95%
rename from app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_product_compare_index.xml
rename to app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_compare_index.xml
index 3a704346d3d..bb59f782413 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_product_compare_index.xml
+++ b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_compare_index.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product Compare List" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product Compare List" type="page">
<referenceContainer name="content">
<block class="Magento\Catalog\Block\Product\Compare\ListCompare" name="catalog.compare.list" template="product/compare/list.phtml"/>
</referenceContainer>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_product_view.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view.xml
similarity index 95%
rename from app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_product_view.xml
rename to app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view.xml
index 508164ddc25..09cfc4854ef 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_product_view.xml
+++ b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Any)" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Any)" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
@@ -80,7 +80,7 @@
</arguments>
</block>
<block class="Magento\Catalog\Block\Product\View" name="product.info.rating" template="product/view/rating.phtml"/>
- <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.overview" template="product/view/attribute.phtml">
+ <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.overview" template="product/view/attribute.phtml" group="detailed_info">
<arguments>
<argument name="at_call" xsi:type="string">getShortDescription</argument>
<argument name="at_code" xsi:type="string">short_description</argument>
@@ -105,7 +105,7 @@
</block>
</container>
<block class="Magento\Catalog\Block\Product\View\Description" name="product.info.details" template="product/view/details.phtml">
- <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.description" template="product/view/attribute.phtml">
+ <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.description" template="product/view/attribute.phtml" group="detailed_info">
<arguments>
<argument name="at_call" xsi:type="string">getDescription</argument>
<argument name="at_code" xsi:type="string">description</argument>
@@ -113,17 +113,11 @@
<argument name="at_label" xsi:type="string">none</argument>
<argument name="title" translate="true" xsi:type="string">Details</argument>
</arguments>
- <action method="addToParentGroup">
- <argument name="group" xsi:type="string">detailed_info</argument>
- </action>
</block>
- <block class="Magento\Catalog\Block\Product\View\Attributes" name="product.attributes" as="additional" template="product/view/attributes.phtml">
+ <block class="Magento\Catalog\Block\Product\View\Attributes" name="product.attributes" as="additional" template="product/view/attributes.phtml" group="detailed_info">
<arguments>
<argument translate="true" name="title" xsi:type="string">Additional Information</argument>
</arguments>
- <action method="addToParentGroup">
- <argument name="group" xsi:type="string">detailed_info</argument>
- </action>
</block>
</block>
</referenceContainer>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_product_view_type_configurable.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_configurable.xml
similarity index 95%
rename from app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_product_view_type_configurable.xml
rename to app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_configurable.xml
index c17f71b4eb1..3909d574507 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_product_view_type_configurable.xml
+++ b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Configurable)" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Configurable)" type="page">
<referenceBlock name="root">
<action method="addBodyClass">
<argument name="value" xsi:type="string">type-configurable</argument>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_product_view_type_grouped.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_grouped.xml
similarity index 94%
rename from app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_product_view_type_grouped.xml
rename to app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_grouped.xml
index c72de82bdac..04c859c9771 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_product_view_type_grouped.xml
+++ b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Grouped)" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Grouped)" type="page">
<referenceContainer name="product.info.form.content">
<block class="Magento\Catalog\Block\Product\View\Type\Grouped" name="product.info.grouped" before="product.info.addtocart" template="product/view/type/grouped.phtml"/>
<container name="product.info.grouped.extra" after="product.info.grouped" before="product.info.grouped" as="product_type_data_extra" label="Product Extra Info"/>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_product_view_type_simple.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_simple.xml
similarity index 94%
rename from app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_product_view_type_simple.xml
rename to app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_simple.xml
index 7ed2cfd9131..3ab144a1bf3 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_product_view_type_simple.xml
+++ b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Simple)" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Simple)" type="page">
<referenceContainer name="product.info.type">
<block class="Magento\Catalog\Block\Product\View\Type\Simple" name="product.info.simple" as="product_type_data" template="product/view/type/default.phtml"/>
<container name="product.info.simple.extra" after="product.info.simple" as="product_type_data_extra" label="Product Extra Info"/>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_product_view_type_virtual.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_virtual.xml
similarity index 94%
rename from app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_product_view_type_virtual.xml
rename to app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_virtual.xml
index 29c391803b6..75d9277f3a1 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/catalog_product_view_type_virtual.xml
+++ b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_virtual.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Virtual)" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Virtual)" type="page">
<referenceContainer name="product.info.type">
<block class="Magento\Catalog\Block\Product\View\Type\Virtual" name="product.info.virtual" as="product_type_data" template="product/view/type/default.phtml"/>
<container name="product.info.virtual.extra" after="product.info.virtual" as="product_type_data_extra" label="Product Extra Info"/>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/default.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/default.xml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Catalog/layout/override/default.xml
rename to app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/default.xml
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/base-image.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/base-image.phtml
index 9e8ee027a8a..a46a1b61be1 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/base-image.phtml
+++ b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/base-image.phtml
@@ -26,7 +26,7 @@
/**
* Product media data template
*
- * @see \Magento\Catalog\Block\Product\View\Media
+ * @see \Magento\Catalog\Block\Product\View\BaseImage
*/
?>
<?php
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/tierprices.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/tierprices.phtml
index 7c30a8862ef..96aa074aa1b 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/tierprices.phtml
+++ b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/tierprices.phtml
@@ -51,20 +51,20 @@ if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(1,
<li class="item">
<?php if ($_catalogHelper->canApplyMsrp($_product)): ?>
<?php if ($this->getInGrouped()): ?>
- <?php echo __('Buy %1$s for', $_price['price_qty']) ?>:
+ <?php echo __('Buy %1 for', $_price['price_qty']) ?>:
<?php else: ?>
- <?php echo __('Buy %1$s', $_price['price_qty']) ?>
+ <?php echo __('Buy %1', $_price['price_qty']) ?>
<?php endif; ?>
<?php else: ?>
<?php if ($this->helper('Magento\Tax\Helper\Data')->displayBothPrices()): ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 0)): ?>
- <?php echo __('Buy %1$s for %2$s (%3$s incl. tax) each', $_price['price_qty'], $_price['formated_price_incl_weee_only'], $_price['formated_price_incl_weee']) ?>
+ <?php echo __('Buy %1 for %2 (%3 incl. tax) each', $_price['price_qty'], $_price['formated_price_incl_weee_only'], $_price['formated_price_incl_weee']) ?>
<?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 1)): ?>
- <?php echo __('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
+ <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
<?php if ($_weeeTaxAttributes): ?>
(<small>
- <?php echo __('%1$s incl tax.', $_price['formated_price_incl_weee']); ?>
+ <?php echo __('%1 incl tax.', $_price['formated_price_incl_weee']); ?>
<?php $separator = ' + '; foreach ($_weeeTaxAttributes as $_attribute): ?>
<?php echo $separator; ?>
<?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
@@ -73,10 +73,10 @@ if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(1,
<?php endif; ?>
<?php echo __('each') ?>
<?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 4)): ?>
- <?php echo __('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
+ <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
<?php if ($_weeeTaxAttributes): ?>
(<small>
- <?php echo __('%1$s incl tax.', $_price['formated_price_incl_weee']); ?>
+ <?php echo __('%1 incl tax.', $_price['formated_price_incl_weee']); ?>
<?php $separator = ' + '; foreach ($_weeeTaxAttributes as $_attribute): ?>
<?php echo $separator; ?>
<?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()+$_attribute->getTaxAmount()); ?>
@@ -85,25 +85,25 @@ if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(1,
<?php endif; ?>
<?php echo __('each') ?>
<?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)): ?>
- <?php echo __('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price']); ?>
+ <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price']); ?>
<?php if ($_weeeTaxAttributes): ?>
(<small>
<?php foreach ($_weeeTaxAttributes as $_attribute): ?>
<?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
<?php endforeach; ?>
- <?php echo __('Total incl. Tax: %1$s', $_price['formated_price_incl_weee']); ?>
+ <?php echo __('Total incl. Tax: %1', $_price['formated_price_incl_weee']); ?>
</small>)
<?php endif; ?>
<?php echo __('each') ?>
<?php else: ?>
- <?php echo __('Buy %1$s for %2$s (%3$s incl. tax) each', $_price['price_qty'], $_price['formated_price'], $_price['formated_price_incl_tax']) ?>
+ <?php echo __('Buy %1 for %2 (%3 incl. tax) each', $_price['price_qty'], $_price['formated_price'], $_price['formated_price_incl_tax']) ?>
<?php endif; ?>
<?php else: ?>
<?php if ($this->helper('Magento\Tax\Helper\Data')->displayPriceIncludingTax()): ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 0)): ?>
- <?php echo __('Buy %1$s for %2$s each', $_price['price_qty'], $_price['formated_price_incl_weee']) ?>
+ <?php echo __('Buy %1 for %2 each', $_price['price_qty'], $_price['formated_price_incl_weee']) ?>
<?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 1)): ?>
- <?php echo __('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee']); ?>
+ <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee']); ?>
<?php if ($_weeeTaxAttributes): ?>
(<small>
<?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
@@ -114,7 +114,7 @@ if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(1,
<?php endif; ?>
<?php echo __('each') ?>
<?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 4)): ?>
- <?php echo __('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee']); ?>
+ <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee']); ?>
<?php if ($_weeeTaxAttributes): ?>
(<small>
<?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
@@ -125,24 +125,24 @@ if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(1,
<?php endif; ?>
<?php echo __('each') ?>
<?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)): ?>
- <?php echo __('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_tax']); ?>
+ <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_tax']); ?>
<?php if ($_weeeTaxAttributes): ?>
(<small>
<?php foreach ($_weeeTaxAttributes as $_attribute): ?>
<?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
<?php endforeach; ?>
- <?php echo __('Total incl. Tax: %1$s', $_price['formated_price_incl_weee']); ?>
+ <?php echo __('Total incl. Tax: %1', $_price['formated_price_incl_weee']); ?>
</small>)
<?php endif; ?>
<?php echo __('each') ?>
<?php else: ?>
- <?php echo __('Buy %1$s for %2$s each', $_price['price_qty'], $_price['formated_price_incl_tax']) ?>
+ <?php echo __('Buy %1 for %2 each', $_price['price_qty'], $_price['formated_price_incl_tax']) ?>
<?php endif; ?>
<?php else: ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 0)): ?>
- <?php echo __('Buy %1$s for %2$s each', $_price['price_qty'], $_price['formated_price_incl_weee_only']) ?>
+ <?php echo __('Buy %1 for %2 each', $_price['price_qty'], $_price['formated_price_incl_weee_only']) ?>
<?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 1)): ?>
- <?php echo __('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
+ <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
<?php if ($_weeeTaxAttributes): ?>
(<small>
<?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
@@ -153,7 +153,7 @@ if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(1,
<?php endif; ?>
<?php echo __('each') ?>
<?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 4)): ?>
- <?php echo __('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
+ <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
<?php if ($_weeeTaxAttributes): ?>
(<small>
<?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
@@ -164,18 +164,18 @@ if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(1,
<?php endif; ?>
<?php echo __('each') ?>
<?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)): ?>
- <?php echo __('Buy %1$s for %2$s', $_price['price_qty'], $_price['formated_price']); ?>
+ <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price']); ?>
<?php if ($_weeeTaxAttributes): ?>
(<small>
<?php foreach ($_weeeTaxAttributes as $_attribute): ?>
<?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
<?php endforeach; ?>
- <?php echo __('Total incl. Tax: %1$s', $_price['formated_price_incl_weee_only']); ?>
+ <?php echo __('Total incl. Tax: %1', $_price['formated_price_incl_weee_only']); ?>
</small>)
<?php endif; ?>
<?php echo __('each') ?>
<?php else: ?>
- <?php echo __('Buy %1$s for %2$s each', $_price['price_qty'], $_price['formated_price']) ?>
+ <?php echo __('Buy %1 for %2 each', $_price['price_qty'], $_price['formated_price']) ?>
<?php endif; ?>
<?php endif; ?>
<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/grouped.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/grouped.phtml
index bcde8441944..5f7b68c66ef 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/grouped.phtml
+++ b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/grouped.phtml
@@ -26,7 +26,7 @@
/**
* Grouped product data template
*
- * @see \Magento\Catalog\Block\Product\View\Media
+ * @see \Magento\Catalog\Block\Product\View\BaseImage
* @see \Magento\Catalog\Block\Product\View\Type\Grouped
*/
?>
diff --git a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/override/catalogsearch_result_index.xml b/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/override/base/catalogsearch_result_index.xml
similarity index 97%
rename from app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/override/catalogsearch_result_index.xml
rename to app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/override/base/catalogsearch_result_index.xml
index e6bc30b72bf..6dcffd213fa 100644
--- a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/override/catalogsearch_result_index.xml
+++ b/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/override/base/catalogsearch_result_index.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Quick Search Form" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Quick Search Form" type="page">
<update handle="page_two_columns_left"/>
<referenceContainer name="left">
<block class="Magento\CatalogSearch\Block\Layer" name="catalogsearch.leftnav" before="-" template="Magento_Catalog::layer/view.phtml"/>
diff --git a/app/design/frontend/magento_plushe/Magento_Checkout/cart/item/default.phtml b/app/design/frontend/magento_plushe/Magento_Checkout/cart/item/default.phtml
index fd3eb94d980..9871473d843 100644
--- a/app/design/frontend/magento_plushe/Magento_Checkout/cart/item/default.phtml
+++ b/app/design/frontend/magento_plushe/Magento_Checkout/cart/item/default.phtml
@@ -31,9 +31,12 @@ $canApplyMsrp = $this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($_ite
<tbody class="cart item">
<tr class="item info">
<td class="col item">
- <?php if ($this->hasProductUrl()):?><a href="<?php echo $this->getProductUrl() ?>" title="<?php echo $this->escapeHtml($this->getProductName()) ?>" class="product photo"><?php endif;?>
+ <?php if ($this->hasProductUrl()):?><a href="<?php echo $this->getProductUrl() ?>" title="<?php echo $this->escapeHtml($this->getProductName()) ?>" class="product photo">
+ <?php else:?>
+ <span class="product photo">
+ <?php endif;?>
<?php echo $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image')->init($_item->getProduct(), 'cart_page_product_thumbnail')->toHtml(); ?>
- <?php if ($this->hasProductUrl()):?></a><?php endif;?>
+ <?php if ($this->hasProductUrl()):?></a><?php else: ?></span><?php endif; ?>
<div class="product details">
<strong class="product name">
<?php if ($this->hasProductUrl()):?>
diff --git a/app/design/frontend/magento_plushe/Magento_Checkout/js/opcheckout.js b/app/design/frontend/magento_plushe/Magento_Checkout/js/opcheckout.js
index fab21c08936..192c4ebd6b6 100644
--- a/app/design/frontend/magento_plushe/Magento_Checkout/js/opcheckout.js
+++ b/app/design/frontend/magento_plushe/Magento_Checkout/js/opcheckout.js
@@ -43,7 +43,11 @@
updateSelectorPrefix: '#checkout-',
updateSelectorSuffix: '-load',
backSelector: '.action.back',
- minBalance: 0.0001
+ minBalance: 0.0001,
+ methodsListContainer: 'dl',
+ methodContainer: 'dt',
+ methodDescription : 'dd ul',
+ methodOn: 'dt input:radio'
},
_create: function() {
@@ -417,11 +421,11 @@
*/
_paymentMethodHandler: function(e) {
var _this = $(e.target),
- parentsDl = _this.closest('dl');
- parentsDl.find('dt input:radio').prop('checked', false);
+ parentsDl = _this.closest(this.options.methodsListContainer);
+ parentsDl.find(this.options.methodOn).prop('checked', false);
_this.prop('checked', true);
- parentsDl.find('dd ul').hide().find('[name^="payment["]').prop('disabled', true);
- _this.parent().nextUntil('dt').find('ul').show().find('[name^="payment["]').prop('disabled', false);
+ parentsDl.find(this.options.methodDescription).hide().find('[name^="payment["]').prop('disabled', true);
+ _this.parent().nextUntil(this.options.methodContainer).find(this.options.methodDescription).show().find('[name^="payment["]').prop('disabled', false);
},
/**
diff --git a/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/checkout_cart_index.xml b/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/base/checkout_cart_index.xml
similarity index 95%
rename from app/design/frontend/magento_plushe/Magento_Checkout/layout/override/checkout_cart_index.xml
rename to app/design/frontend/magento_plushe/Magento_Checkout/layout/override/base/checkout_cart_index.xml
index 3ada6793dae..2acfe731270 100644
--- a/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/checkout_cart_index.xml
+++ b/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/base/checkout_cart_index.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Shopping Cart" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Shopping Cart" type="page">
<referenceContainer name="content">
<block class="Magento\Checkout\Block\Cart" name="checkout.cart" template="cart.phtml">
<container name="checkout.cart.items" label="invisible" as="with-items">
@@ -50,10 +50,10 @@
</block>
</container>
<container name="checkout.cart.noitems" label="invisible" as="no-items">
- <block class="Magento\Checkout\Block\Cart" name="checkout.cart.empty" template="cart/noItems.phtml"/>
+ <block class="Magento\Checkout\Block\Cart" name="checkout.cart.empty" before="-" template="cart/noItems.phtml"/>
<container name="checkout.cart.empty.widget" as="checkout_cart_empty_widget" label="Empty Shopping Cart Content Before"/>
</container>
</block>
</referenceContainer>
- <container name="additional.product.info" label="Additional Product Info"/>
+ <!-- <container name="additional.product.info" label="Additional Product Info"/> -->
</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/checkout_multishipping_customer_address.xml b/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/base/checkout_multishipping_customer_address.xml
similarity index 97%
rename from app/design/frontend/magento_plushe/Magento_Checkout/layout/override/checkout_multishipping_customer_address.xml
rename to app/design/frontend/magento_plushe/Magento_Checkout/layout/override/base/checkout_multishipping_customer_address.xml
index 0ea12f489c4..5b2daa464c7 100644
--- a/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/checkout_multishipping_customer_address.xml
+++ b/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/base/checkout_multishipping_customer_address.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Customer Address Edit Form" type="page" parent="customer_address_form">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout Customer Address Edit Form" type="page">
<referenceContainer name="content">
<block class="Magento\Customer\Block\Address\Edit" name="customer_address_edit" template="address/edit.phtml"/>
</referenceContainer>
diff --git a/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/base/checkout_onepage_additional.xml b/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/base/checkout_onepage_additional.xml
new file mode 100644
index 00000000000..46344f85d91
--- /dev/null
+++ b/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/base/checkout_onepage_additional.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <block class="Magento\Checkout\Block\Onepage\Shipping\Method\Additional" name="shipping_method_available" output="1" template="onepage/shipping_method/additional.phtml">
+ <action method="setDontDisplayContainer">
+ <argument name="param" xsi:type="string">1</argument>
+ </action>
+ </block>
+</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/checkout_onepage_failure.xml b/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/base/checkout_onepage_failure.xml
similarity index 95%
rename from app/design/frontend/magento_plushe/Magento_Checkout/layout/override/checkout_onepage_failure.xml
rename to app/design/frontend/magento_plushe/Magento_Checkout/layout/override/base/checkout_onepage_failure.xml
index 2ec8a0fd124..64a1a2d348e 100644
--- a/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/checkout_onepage_failure.xml
+++ b/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/base/checkout_onepage_failure.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="One Page Checkout Failure" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="One Page Checkout Failure" type="page">
<update handle="page_one_column"/>
<referenceBlock name="page.main.title">
<action method="setPageTitle">
diff --git a/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/checkout_onepage_index.xml b/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/base/checkout_onepage_index.xml
similarity index 98%
rename from app/design/frontend/magento_plushe/Magento_Checkout/layout/override/checkout_onepage_index.xml
rename to app/design/frontend/magento_plushe/Magento_Checkout/layout/override/base/checkout_onepage_index.xml
index d0d050a6d3a..0c87238d37a 100644
--- a/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/checkout_onepage_index.xml
+++ b/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/base/checkout_onepage_index.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="One Page Checkout" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="One Page Checkout" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
diff --git a/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/checkout_onepage_success.xml b/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/base/checkout_onepage_success.xml
similarity index 95%
rename from app/design/frontend/magento_plushe/Magento_Checkout/layout/override/checkout_onepage_success.xml
rename to app/design/frontend/magento_plushe/Magento_Checkout/layout/override/base/checkout_onepage_success.xml
index 8eb136e4ea3..a0878de06ad 100644
--- a/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/checkout_onepage_success.xml
+++ b/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/base/checkout_onepage_success.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="One Page Checkout Success" type="page" parent="default">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="One Page Checkout Success" type="page">
<update handle="page_one_column"/>
<referenceBlock name="page.main.title">
<action method="setPageTitle">
diff --git a/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/default.xml b/app/design/frontend/magento_plushe/Magento_Checkout/layout/override/base/default.xml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Checkout/layout/override/default.xml
rename to app/design/frontend/magento_plushe/Magento_Checkout/layout/override/base/default.xml
diff --git a/app/design/frontend/magento_plushe/Magento_Checkout/multishipping/addresses.phtml b/app/design/frontend/magento_plushe/Magento_Checkout/multishipping/addresses.phtml
index 6c8f5f322c3..61e84340c67 100644
--- a/app/design/frontend/magento_plushe/Magento_Checkout/multishipping/addresses.phtml
+++ b/app/design/frontend/magento_plushe/Magento_Checkout/multishipping/addresses.phtml
@@ -52,13 +52,17 @@
<tr>
<td class="col product"><?php echo $this->getItemHtml($_item->getQuoteItem()) ?></td>
<td class="col qty">
- <input type="text" name="ship[<?php echo $_index ?>][<?php echo $_item->getQuoteItemId() ?>][qty]" value="<?php echo $this->escapeHtml($_item->getQty()) ?>" size="2" class="input-text qty" data-validate="{number: true}"/>
+ <div class="control qty">
+ <input type="text" name="ship[<?php echo $_index ?>][<?php echo $_item->getQuoteItemId() ?>][qty]" value="<?php echo $this->escapeHtml($_item->getQty()) ?>" size="2" class="input-text qty" data-validate="{number: true}"/>
+ </div>
</td>
<td class="col address">
<?php if ($_item->getProduct()->getIsVirtual()): ?>
<div class="applicable"><?php echo __('Shipping selection is not applicable.'); ?></div>
<?php else: ?>
- <?php echo $this->getAddressesHtmlSelect($_item, $_index); ?>
+ <div class="control address">
+ <?php echo $this->getAddressesHtmlSelect($_item, $_index); ?>
+ </div>
<?php endif; ?>
</td>
<td class="col delete">
diff --git a/app/design/frontend/magento_plushe/Magento_Checkout/onepage.phtml b/app/design/frontend/magento_plushe/Magento_Checkout/onepage.phtml
index 7e00b188d24..f1b0e3f9486 100644
--- a/app/design/frontend/magento_plushe/Magento_Checkout/onepage.phtml
+++ b/app/design/frontend/magento_plushe/Magento_Checkout/onepage.phtml
@@ -86,7 +86,8 @@ $_registerParam = $this->getRequest()->getParam('register');
review: {
saveUrl: '<?php echo $this->getUrl('checkout/onepage/saveOrder') ?>',
successUrl: '<?php echo $this->getUrl('checkout/onepage/success') ?>'
- }
+ },
+ methodDescription : '.items'
});
});
})(jQuery);
diff --git a/app/design/frontend/magento_plushe/Magento_Contacts/form.phtml b/app/design/frontend/magento_plushe/Magento_Contacts/form.phtml
deleted file mode 100644
index 44de81662b0..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Contacts/form.phtml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<form class="form contact" action="<?php echo $this->getFormAction(); ?>" id="contact-form" method="post" data-hasrequired="<?php echo __('* Required Fields') ?>">
- <fieldset class="fieldset">
- <legend class="legend"><span><?php echo __('Contact Information') ?></span></legend><br />
- <div class="field name required">
- <label class="label" for="name"><span><?php echo __('Name') ?></span></label>
- <div class="control">
- <input name="name" id="name" title="<?php echo __('Name') ?>" value="<?php echo $this->escapeHtml($this->helper('Magento\Contacts\Helper\Data')->getUserName()) ?>" class="input-text" type="text" data-validate="{required:true}"/>
- </div>
- </div>
- <div class="field email required">
- <label class="label" for="email"><span><?php echo __('Email') ?></span></label>
- <div class="control">
- <input name="email" id="email" title="<?php echo __('Email') ?>" value="<?php echo $this->escapeHtml($this->helper('Magento\Contacts\Helper\Data')->getUserEmail()) ?>" class="input-text" type="text" data-validate="{required:true, 'validate-email':true}"/>
- </div>
- </div>
- <div class="field telephone">
- <label class="label" for="telephone"><span><?php echo __('Telephone') ?></span></label>
- <div class="control">
- <input name="telephone" id="telephone" title="<?php echo __('Telephone') ?>" value="" class="input-text" type="text" />
- </div>
- </div>
- <div class="field comment required">
- <label class="label" for="comment"><span><?php echo __('Comment') ?></span></label>
- <div class="control">
- <textarea name="comment" id="comment" title="<?php echo __('Comment') ?>" class="input-text" cols="5" rows="3" data-validate="{required:true}"></textarea>
- </div>
- </div>
- </fieldset>
- <div class="actions">
- <input type="hidden" name="hideit" id="hideit" value="" />
- <button type="submit" title="<?php echo __('Submit') ?>" class="action submit">
- <span><?php echo __('Submit') ?></span>
- </button>
- </div>
-</form>
-<script type="text/javascript">
- (function($) {
- head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
- "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
- "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
- "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>", function() {
- $('#contact-form').validation();
- });
- })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_plushe/Magento_Customer/layout/override/customer_account_create.xml b/app/design/frontend/magento_plushe/Magento_Customer/layout/override/base/customer_account_create.xml
similarity index 95%
rename from app/design/frontend/magento_plushe/Magento_Customer/layout/override/customer_account_create.xml
rename to app/design/frontend/magento_plushe/Magento_Customer/layout/override/base/customer_account_create.xml
index 7dd7c664bdd..f44b4fa9e81 100644
--- a/app/design/frontend/magento_plushe/Magento_Customer/layout/override/customer_account_create.xml
+++ b/app/design/frontend/magento_plushe/Magento_Customer/layout/override/base/customer_account_create.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Account Registration Form" type="page" parent="customer_account">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Account Registration Form" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
diff --git a/app/design/frontend/magento_plushe/Magento_Customer/layout/override/customer_account_edit.xml b/app/design/frontend/magento_plushe/Magento_Customer/layout/override/base/customer_account_edit.xml
similarity index 95%
rename from app/design/frontend/magento_plushe/Magento_Customer/layout/override/customer_account_edit.xml
rename to app/design/frontend/magento_plushe/Magento_Customer/layout/override/base/customer_account_edit.xml
index df916091a3c..0082acde99e 100644
--- a/app/design/frontend/magento_plushe/Magento_Customer/layout/override/customer_account_edit.xml
+++ b/app/design/frontend/magento_plushe/Magento_Customer/layout/override/base/customer_account_edit.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Account Edit Form" type="page" parent="customer_account">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Account Edit Form" type="page">
<update handle="customer_account"/>
<referenceBlock name="page.main.title">
<action method="setPageTitle">
diff --git a/app/design/frontend/magento_plushe/Magento_Customer/layout/override/customer_account_forgotpassword.xml b/app/design/frontend/magento_plushe/Magento_Customer/layout/override/base/customer_account_forgotpassword.xml
similarity index 96%
rename from app/design/frontend/magento_plushe/Magento_Customer/layout/override/customer_account_forgotpassword.xml
rename to app/design/frontend/magento_plushe/Magento_Customer/layout/override/base/customer_account_forgotpassword.xml
index 128f5326091..d91fa6040c3 100644
--- a/app/design/frontend/magento_plushe/Magento_Customer/layout/override/customer_account_forgotpassword.xml
+++ b/app/design/frontend/magento_plushe/Magento_Customer/layout/override/base/customer_account_forgotpassword.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Forgot Password Form" type="page" parent="customer_account">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Forgot Password Form" type="page">
<referenceBlock name="head">
<action method="setTitle">
<argument translate="true" name="title" xsi:type="string">Forgot Your Password</argument>
diff --git a/app/design/frontend/magento_plushe/Magento_Customer/layout/override/customer_account_index.xml b/app/design/frontend/magento_plushe/Magento_Customer/layout/override/base/customer_account_index.xml
similarity index 96%
rename from app/design/frontend/magento_plushe/Magento_Customer/layout/override/customer_account_index.xml
rename to app/design/frontend/magento_plushe/Magento_Customer/layout/override/base/customer_account_index.xml
index 3aa28cf3207..f5b29358931 100644
--- a/app/design/frontend/magento_plushe/Magento_Customer/layout/override/customer_account_index.xml
+++ b/app/design/frontend/magento_plushe/Magento_Customer/layout/override/base/customer_account_index.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Dashboard" type="page" parent="customer_account">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Dashboard" type="page">
<update handle="customer_account"/>
<update handle="page_two_columns_left"/>
<referenceBlock name="page.main.title">
diff --git a/app/design/frontend/magento_plushe/Magento_Customer/layout/override/customer_account_login.xml b/app/design/frontend/magento_plushe/Magento_Customer/layout/override/base/customer_account_login.xml
similarity index 96%
rename from app/design/frontend/magento_plushe/Magento_Customer/layout/override/customer_account_login.xml
rename to app/design/frontend/magento_plushe/Magento_Customer/layout/override/base/customer_account_login.xml
index 50e86321f02..e661706b1e7 100644
--- a/app/design/frontend/magento_plushe/Magento_Customer/layout/override/customer_account_login.xml
+++ b/app/design/frontend/magento_plushe/Magento_Customer/layout/override/base/customer_account_login.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Account Login Form" type="page" parent="customer_account">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer Account Login Form" type="page">
<referenceBlock name="root">
<action method="setTemplate">
<argument name="template" xsi:type="string">1column.phtml</argument>
diff --git a/app/design/frontend/magento_plushe/Magento_Customer/layout/override/customer_address_index.xml b/app/design/frontend/magento_plushe/Magento_Customer/layout/override/base/customer_address_index.xml
similarity index 94%
rename from app/design/frontend/magento_plushe/Magento_Customer/layout/override/customer_address_index.xml
rename to app/design/frontend/magento_plushe/Magento_Customer/layout/override/base/customer_address_index.xml
index c864da39dd2..d8484e97dfc 100644
--- a/app/design/frontend/magento_plushe/Magento_Customer/layout/override/customer_address_index.xml
+++ b/app/design/frontend/magento_plushe/Magento_Customer/layout/override/base/customer_address_index.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Address Book" type="page" parent="customer_account_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Address Book" type="page">
<update handle="customer_account"/>
<referenceBlock name="page.main.title">
<block class="Magento\Customer\Block\Address\Book" name="address.book.button" template="address/button.phtml"/>
diff --git a/app/design/frontend/magento_plushe/Magento_Directory/currency.phtml b/app/design/frontend/magento_plushe/Magento_Directory/currency.phtml
deleted file mode 100644
index 74171ad140c..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Directory/currency.phtml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Currency switcher
- *
- * @see \Magento\Directory\Block\Currency
- */
-?>
-<?php if ($this->getCurrencyCount() > 1): ?>
-<?php $currencies = $this->getCurrencies(); ?>
-<?php $currentCurrencyCode = $this->getCurrentCurrencyCode(); ?>
-<div class="switcher currency">
- <strong class="label"><span><?php echo __('Currency') ?></span></strong>
- <div class="options">
- <strong class="language-<?php echo $this->escapeHtml($this->getCurrentCurrencyCode()) ?>">
- <span><?php echo $this->escapeHtml($currentCurrencyCode) ?> - <?php echo @$this->escapeHtml($currencies[$currentCurrencyCode]) ?></span>
- </strong>
- <button type="button" data-toggle="dropdown" class="action switch"><span><?php echo __('Change')?></span></button>
- <ul data-target="dropdown">
- <?php foreach ($currencies as $_code => $_name): ?>
- <?php if($_code != $currentCurrencyCode): ?>
- <li class="currency-<?php echo $_code ?>">
- <a href="<?php echo $this->getSwitchCurrencyUrl($_code) ?>"><?php echo $_code ?> - <?php echo $_name ?></a>
- </li>
- <?php endif; ?>
- <?php endforeach; ?>
- </ul>
- </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/catalog_product_view_type_downloadable.xml b/app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/base/catalog_product_view_type_downloadable.xml
similarity index 95%
rename from app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/catalog_product_view_type_downloadable.xml
rename to app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/base/catalog_product_view_type_downloadable.xml
index d1f574903d6..0f7f15fe927 100644
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/catalog_product_view_type_downloadable.xml
+++ b/app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/base/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)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Downloadable)" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product View (Downloadable)" type="page">
<referenceContainer name="product.info.type">
<block class="Magento\Downloadable\Block\Catalog\Product\View\Type" name="product.info.downloadable" as="product_type_data" template="catalog/product/type.phtml">
<block class="Magento\Downloadable\Block\Catalog\Product\Samples" name="product.info.downloadable.samples" as="samples" template="catalog/product/samples.phtml"/>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/checkout_cart_index.xml b/app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/base/checkout_cart_index.xml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/checkout_cart_index.xml
rename to app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/base/checkout_cart_index.xml
diff --git a/app/design/frontend/magento_plushe/Magento_Newsletter/layout/override/default.xml b/app/design/frontend/magento_plushe/Magento_Newsletter/layout/override/base/default.xml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Newsletter/layout/override/default.xml
rename to app/design/frontend/magento_plushe/Magento_Newsletter/layout/override/base/default.xml
diff --git a/app/design/frontend/magento_plushe/Magento_Newsletter/layout/override/newsletter_manage_index.xml b/app/design/frontend/magento_plushe/Magento_Newsletter/layout/override/base/newsletter_manage_index.xml
similarity index 93%
rename from app/design/frontend/magento_plushe/Magento_Newsletter/layout/override/newsletter_manage_index.xml
rename to app/design/frontend/magento_plushe/Magento_Newsletter/layout/override/base/newsletter_manage_index.xml
index cbcc9786b9c..3b7c0b011b5 100644
--- a/app/design/frontend/magento_plushe/Magento_Newsletter/layout/override/newsletter_manage_index.xml
+++ b/app/design/frontend/magento_plushe/Magento_Newsletter/layout/override/base/newsletter_manage_index.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Newsletter Subscriptions" type="page" parent="customer_account_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account Newsletter Subscriptions" type="page">
<update handle="customer_account"/>
<referenceBlock name="my.account.wrapper">
<block class="Magento\Customer\Block\Newsletter" name="customer_newsletter">
diff --git a/app/design/frontend/magento_plushe/Magento_Page/2columns-left.phtml b/app/design/frontend/magento_plushe/Magento_Page/2columns-left.phtml
deleted file mode 100644
index 1f1cdf3674f..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Page/2columns-left.phtml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Template for \Magento\Page\Block\Html
- */
-$bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
-?>
-<!doctype html>
-<html lang="<?php echo $this->getLang() ?>" class="no-js">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width">
- <?php echo $this->getChildHtml('head') ?>
-</head>
-<body class="col2-left-layout<?php echo $bodyCss ?>">
- <?php echo $this->getChildHtml('after_body_start') ?>
- <div class="page wrapper">
- <?php echo $this->getChildHtml('global_notices') ?>
- <?php echo $this->getChildHtml('header-container') ?>
- <?php echo $this->getChildHtml('page_top') ?>
- <section class="page main">
- <?php echo $this->getChildHtml('columns_top') ?>
- <div class="columns">
- <?php
- echo $this->getChildHtml('main');
- // Inside of <php> to avoid spaces between tags
- echo '<div class="column left sidebar">';
- echo $this->getChildHtml('left');
- echo '</div>';
- ?>
- </div>
- </section>
- <?php echo $this->getChildHtml('page_bottom') ?>
-
- <?php echo $this->getChildHtml('footer') ?>
-
- <?php echo $this->getChildHtml('before_body_end') ?>
- </div>
- <?php echo $this->getAbsoluteFooter() ?>
-</body>
-</html>
diff --git a/app/design/frontend/magento_plushe/Magento_Page/2columns-right.phtml b/app/design/frontend/magento_plushe/Magento_Page/2columns-right.phtml
deleted file mode 100644
index 59de2698952..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Page/2columns-right.phtml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Template for \Magento\Page\Block\Html
- */
-$bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
-?>
-<!doctype html>
-<html lang="<?php echo $this->getLang() ?>" class="no-js">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width">
- <?php echo $this->getChildHtml('head') ?>
-</head>
-<body class="col2-right-layout<?php echo $bodyCss ?>">
- <?php echo $this->getChildHtml('after_body_start') ?>
- <div class="page wrapper">
- <?php echo $this->getChildHtml('global_notices') ?>
- <?php echo $this->getChildHtml('header-container') ?>
- <?php echo $this->getChildHtml('page_top') ?>
- <section class="page main">
- <?php echo $this->getChildHtml('columns_top') ?>
- <div class="columns">
- <?php
- echo $this->getChildHtml('main');
- // Inside of <php> to avoid spaces between tags
- echo '<div class="column right sidebar">';
- echo $this->getChildHtml('right');
- echo '</div>';
- ?>
- </div>
- </section>
- <?php echo $this->getChildHtml('page_bottom') ?>
-
- <?php echo $this->getChildHtml('footer') ?>
-
- <?php echo $this->getChildHtml('before_body_end') ?>
- </div>
- <?php echo $this->getAbsoluteFooter() ?>
-</body>
-</html>
diff --git a/app/design/frontend/magento_plushe/Magento_Page/3columns.phtml b/app/design/frontend/magento_plushe/Magento_Page/3columns.phtml
deleted file mode 100644
index b87d7e01b3e..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Page/3columns.phtml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Template for \Magento\Page\Block\Html
- */
-$bodyCss = $this->getBodyClass() ? $this->getBodyClass() : '';
-?>
-<!doctype html>
-<html lang="<?php echo $this->getLang() ?>" class="no-js">
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="viewport" content="width=device-width">
- <?php echo $this->getChildHtml('head') ?>
-</head>
-<body class="col3-layout<?php echo $bodyCss ?>">
- <?php echo $this->getChildHtml('after_body_start') ?>
- <div class="page wrapper">
- <?php echo $this->getChildHtml('global_notices') ?>
- <?php echo $this->getChildHtml('header-container') ?>
- <?php echo $this->getChildHtml('page_top') ?>
- <section class="page main">
- <?php echo $this->getChildHtml('columns_top') ?>
- <div class="columns">
- <?php
- echo $this->getChildHtml('main');
- // Inside of <php> to avoid spaces between tags
- echo '<div class="column left sidebar">';
- echo $this->getChildHtml('left');
- echo '</div>';
- echo '<div class="column right sidebar">';
- echo $this->getChildHtml('right');
- echo '</div>';
- ?>
- </div>
- </section>
- <?php echo $this->getChildHtml('page_bottom') ?>
-
- <?php echo $this->getChildHtml('footer') ?>
-
- <?php echo $this->getChildHtml('before_body_end') ?>
- </div>
- <?php echo $this->getAbsoluteFooter() ?>
-</body>
-</html>
diff --git a/app/design/frontend/magento_plushe/Magento_Page/html/pager.phtml b/app/design/frontend/magento_plushe/Magento_Page/html/pager.phtml
deleted file mode 100644
index 689cd83158f..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Page/html/pager.phtml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Pager template
- *
- * @see \Magento\Page\Block\Html\Pager
- */
-?>
-<?php if($this->getCollection()->getSize()): ?>
-
- <?php if($this->getUseContainer()): ?>
- <div class="pager">
- <?php endif ?>
-
- <?php if($this->getShowAmounts()): ?>
- <p class="amount">
- <?php if($this->getLastPageNum()>1): ?>
- <?php echo __('Items %1 to %2 of %3 total', $this->getFirstNum(), $this->getLastNum(), $this->getTotalNum()) ?>
- <?php elseif ($this->getLastPageNum() == 1): ?>
- <?php echo __('%1 Item', $this->getTotalNum()) ?>
- <?php else: ?>
- <?php echo __('%1 Item(s)', $this->getTotalNum()) ?>
- <?php endif; ?>
- </p>
- <?php endif ?>
-
- <?php if($this->getShowPerPage()): ?>
- <div class="limiter">
- <strong class="label"><?php echo __('Show') ?></strong>
- <select id="limiter" data-mage-redirect="{'event':'change'}">
- <?php foreach ($this->getAvailableLimit() as $_key => $_limit): ?>
- <option value="<?php echo $this->getLimitUrl($_key) ?>"<?php if ($this->isLimitCurrent($_key)): ?>
- selected="selected"<?php endif ?>>
- <?php echo $_limit ?>
- </option>
- <?php endforeach; ?>
- </select>
- <span class="text"><?php echo __('per page') ?></span>
- </div>
- <?php endif ?>
-
- <?php if($this->getLastPageNum()>1): ?>
- <div class="pages">
- <strong class="label"><?php echo __('Page') ?></strong>
- <ol class="items">
- <?php if (!$this->isFirstPage()): ?>
- <li class="item">
- <?php $text = $this->getAnchorTextForPrevious() ? $this->getAnchorTextForPrevious() : '';?>
- <a class="<?php echo $text ? 'link ' : 'action '?> previous" href="<?php echo $this->getPreviousPageUrl() ?>" title="<?php echo $text ? $text : __('Previous') ?>">
- <span><?php echo $text ? $text : __('Previous') ?></span>
- </a>
- </li>
- <?php endif;?>
-
- <?php if ($this->canShowFirst()): ?>
- <li class="item"><a class="first" href="<?php echo $this->getFirstPageUrl() ?>"><span>1</span></a></li>
- <?php endif;?>
-
- <?php if ($this->canShowPreviousJump()): ?>
- <li class="item"><a class="previous jump" title="" href="<?php echo $this->getPreviousJumpUrl() ?>"><span>...</span></a></li>
- <?php endif;?>
-
- <?php foreach ($this->getFramePages() as $_page): ?>
- <?php if ($this->isPageCurrent($_page)): ?>
- <li class="item current"><strong><span><?php echo $_page ?></span></strong></li>
- <?php else: ?>
- <li class="item"><a href="<?php echo $this->getPageUrl($_page) ?>"><span><?php echo $_page ?></span></a></li>
- <?php endif;?>
- <?php endforeach;?>
-
- <?php if ($this->canShowNextJump()): ?>
- <li class="item"><a class="next jump" title="" href="<?php echo $this->getNextJumpUrl() ?>"><span>...</span></a></li>
- <?php endif;?>
-
- <?php if ($this->canShowLast()): ?>
- <li class="item"><a class="last" href="<?php echo $this->getLastPageUrl() ?>"><span><?php echo $this->getLastPageNum() ?></span></a></li>
- <?php endif;?>
-
- <?php if (!$this->isLastPage()): ?>
- <li class="item">
- <?php $text = $this->getAnchorTextForNext() ? $this->getAnchorTextForNext() : '';?>
- <a class="<?php echo $text ? 'link ' : 'action '?> next" href="<?php echo $this->getNextPageUrl() ?>" title="<?php echo $text ? $text : __('Next') ?>">
- <span><?php echo $text ? $text : __('Next') ?></span>
- </a>
- </li>
- <?php endif;?>
- </ol>
- </div>
- <?php endif; ?>
-
- <?php if($this->getUseContainer()): ?>
- </div>
- <?php endif ?>
-
-<?php endif ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Page/layout/override/default.xml b/app/design/frontend/magento_plushe/Magento_Page/layout/override/default.xml
deleted file mode 100644
index f005e0a0a0a..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Page/layout/override/default.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="All Pages" type="page">
- <block class="Magento\Page\Block\Html" name="root" output="1" template="3columns.phtml">
- <block class="Magento\Page\Block\Html\Head" name="head" as="head">
- <block class="Magento\Page\Block\Js\Cookie" name="js_cookies" template="js/cookie.phtml"/>
- </block>
- <container name="after_body_start" as="after_body_start" label="Page Top"/>
- <container name="header-container" label="Page Header Container" as="header-container" htmlTag="header" htmlClass="header">
- <container name="header.panel" label="Page Header Panel" htmlTag="div" htmlClass="panel">
- <block class="Magento\Page\Block\Switcher" name="store_language" as="store_language" template="switch/languages.phtml"/>
- </container>
- <container name="header" label="Page Header" as="header" htmlTag="div" htmlClass="content">
- <block class="Magento\Page\Block\Html\Header" name="logo">
- <arguments>
- <argument name="show_part" xsi:type="string">logo</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Links" name="top.links"/>
- </container>
- </container>
- <container name="page_top" as="page_top" label="After Page Header">
- <block class="Magento\Page\Block\Html\Topmenu" name="catalog.topnav" template="html/topmenu.phtml"/>
- <container name="top.container" as="topContainer" label="Page Header" htmlTag="div" htmlClass="top-container"/>
- <block class="Magento\Page\Block\Html\Breadcrumbs" name="breadcrumbs" as="breadcrumbs"/>
- </container>
- <!--
- <container name="page_main" as="page_main" label="Page main" htmlTag="div" htmlClass="columns">
- <container name="main" as="main" label="Main Content Container" htmlTag="div" htmlClass="column main">
- <container name="content-top" label="Main Content Top" />
- <container name="content" label="Main Content Area" />
- <container name="content-aside" label="Main Content Aside" />
- <container name="content-bottom" label="Main Content Bottom" />
- </container>
- </container>
- -->
- <container name="columns.top" label="Before Main Columns" as="columns_top">
- <block class="Magento\Page\Block\Html\Title" name="page.main.title" template="html/title.phtml"/>
- <container name="page.messages" label="invisible" htmlTag="div" htmlClass="page messages">
- <block class="Magento\Core\Block\Messages" name="global_messages" as="global_messages"/>
- <block class="Magento\Core\Block\Messages" name="messages" as="messages"/>
- </container>
- </container>
- <container name="main" as="main" label="Main Content Container" htmlTag="div" htmlClass="column main">
- <container name="content.top" label="Main Content Top"/>
- <container name="content" label="Main Content Area"/>
- <container name="content.aside" label="Main Content Aside"/>
- <container name="content.bottom" label="Main Content Bottom"/>
- </container>
- <container name="left" as="left" label="Left Column"/>
- <container name="right" as="right" label="Right Column"/>
- <container name="page.bottom.container" as="page_bottom" label="Before Page Footer Container" htmlTag="div" htmlClass="page bottom">
- <container name="page.bottom" label="Before Page Footer" htmlTag="div" htmlClass="content"/>
- </container>
- <container name="footer-container" as="footer" label="Page Footer Container" htmlTag="footer" htmlClass="footer">
- <container name="footer" as="footer" label="Page Footer" htmlTag="div" htmlClass="content">
- <block class="Magento\Page\Block\Switcher" name="store_switcher" as="store_switcher" template="switch/stores.phtml"/>
- <block class="Magento\Page\Block\Links" name="footer_links"/>
- <block class="Magento\Page\Block\Html\Footer" name="copyright" template="html/copyright.phtml"/>
- <!--<block class="Magento\Page\Block\Html\Footer" name="report.bugs" template="html/reportbugs.phtml" />-->
- </container>
- </container>
- <container name="before_body_end" as="before_body_end" label="Page Bottom">
- <block class="Magento\Page\Block\Html\Notices" name="global_notices" template="html/notices.phtml"/>
- </container>
- </block>
- <referenceBlock name="head">
- <block class="Magento\Page\Block\Html\Head\Css" name="mage-calendar-css">
- <arguments>
- <argument name="file" xsi:type="string">mage/calendar.css</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="jquery-jquery-js">
- <arguments>
- <argument name="file" xsi:type="string">jquery/jquery.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="mage-jquery-no-conflict-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/jquery-no-conflict.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="head-load-min-js">
- <arguments>
- <argument name="file" xsi:type="string">head.load.min.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="mage-mage-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/mage.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="mage-decorate-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/decorate.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="mage-translate-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/translate.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="mage-cookies-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/cookies.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="jquery-jquery-ui-js">
- <arguments>
- <argument name="file" xsi:type="string">jquery/jquery-ui.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="jquery-jquery-tmpl-min-js">
- <arguments>
- <argument name="file" xsi:type="string">jquery/jquery.tmpl.min.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="mage-bootstrap-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/bootstrap.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-page-js-truncate-js">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Page::js/truncate.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="mage-common-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/common.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="mage-toggle-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/toggle.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="mage-popup-window-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/popup-window.js</argument>
- </arguments>
- </block>
- <block class="Magento\Core\Block\Template" name="head.components" as="components" template="Magento_Page::js/components.phtml"/>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Page/layout/override/print.xml b/app/design/frontend/magento_plushe/Magento_Page/layout/override/print.xml
deleted file mode 100644
index befe0f664c0..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Page/layout/override/print.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="All Pages (Print Version)" type="page">
- <block class="Magento\Page\Block\Html" name="root" output="1" template="print.phtml">
- <block class="Magento\Page\Block\Html\Head" name="head" as="head"/>
- <container name="after_body_start" as="after_body_start" label="Page Top"/>
- <container name="content" as="content" label="Main Content Area"/>
- </block>
- <referenceBlock name="head">
- <block class="Magento\Page\Block\Html\Head\Css" name="css-print-css">
- <arguments>
- <argument name="file" xsi:type="string">css/print.css</argument>
- </arguments>
- </block>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Page/switch/languages.phtml b/app/design/frontend/magento_plushe/Magento_Page/switch/languages.phtml
deleted file mode 100644
index 3b6a76e6cb6..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Page/switch/languages.phtml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<?php
-/**
- * Language switcher template
- *
- * @see \Magento\Page\Block\Switch
- */
-?>
-
-<?php if(count($this->getStores())>1): ?>
-<div class="switcher language">
- <strong class="label"><span><?php echo __('Language') ?></span></strong>
- <div class="options">
- <strong class="view-<?php echo $this->escapeHtml($this->getCurrentStoreCode()) ?>">
- <span><?php echo $this->escapeHtml($this->getStoreName()) ?></span>
- </strong>
- <button type="button" data-toggle="dropdown" class="action switch"><span><?php echo __('Change')?></span></button>
- <ul data-target="dropdown">
- <?php foreach ($this->getStores() as $_lang): ?>
- <?php if($_lang->getId()!=$this->getCurrentStoreId()): ?>
- <li class="view-<?php echo $this->escapeHtml($_lang->getCode()); ?>">
- <a href="<?php echo $_lang->getCurrentUrl() ?>"><?php echo $this->escapeHtml($_lang->getName()) ?></a>
- </li>
- <?php endif; ?>
- <?php endforeach; ?>
- </ul>
- </div>
-</div>
-<?php endif; ?>
-
diff --git a/app/design/frontend/magento_plushe/Magento_Paypal/express/review.phtml b/app/design/frontend/magento_plushe/Magento_Paypal/express/review.phtml
deleted file mode 100644
index ed52fbe4f8b..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Paypal/express/review.phtml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @package base_default
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-/** @var $this \Magento\Paypal\Block\Express\Review */
-
-$billingBlock = $this->getChildBlock('billing')->setFieldNamePrefix('billing')->setHideEmailAddress(true);
-$shippingAddress = $this->getShippingAddress();
-?>
-<hgroup class="page title">
- <h1 class="title"><span class="base"><?php echo __('Review Order') ?></span></h1>
-</hgroup>
-<?php echo $this->getMessagesBlock()->toHtml() ?>
-<div class="paypal review view">
- <div class="paypal subtitle caption"><strong>Please confirm your addresses</strong></div>
-
- <form method="post" id="order-review-form" action="<?php echo $this->getPlaceOrderUrl() ?>" class="form paypal review">
- <?php if(!$billingBlock->isCustomerLoggedIn()): ?>
- <fieldset class="fieldset customer email">
- <legend class="legend"><span><?php echo __('Customer Information') ?></span></legend>
- <br>
- <div id="customer-info-form" class="field email required">
- <label for="customer:email" class="label"><?php echo __('Email Address') ?></label>
- <div class="control">
- <input type="text" name="customer-email" id="customer:email" value="<?php echo $this->escapeHtml($billingBlock->getAddress()->getEmail()) ?>" title="<?php echo __('Email Address') ?>" class="input-text" />
- </div>
- </div>
- </fieldset>
- <?php endif ?>
-
- <fieldset class="fieldset billing address" id="billing-address">
- <legend class="legend"><span><?php echo __('Billing Address') ?></span></legend>
- <br>
- <?php if ($shippingAddress): ?>
- <?php echo $billingBlock->setShowAsShippingCheckbox(true)->toHtml(); ?>
- <?php else: ?>
- <?php echo $billingBlock->toHtml(); ?>
- <?php endif; ?>
- </fieldset>
-
- <?php if ($shippingAddress): ?>
- <fieldset class="fieldset shipping address" id="shipping-address">
- <legend class="legend"><span><?php echo __('Shipping Address') ?></span></legend>
- <br>
- <?php echo $this->getChildBlock('shipping')->setFieldNamePrefix('shipping')->setHideEmailAddress(true)->toHtml(); ?>
- </fieldset>
-
- <fieldset class="fieldset shipping method">
- <legend class="legend"><span><?php echo __('Shipping Method') ?></span></legend>
- <br>
- <?php echo $this->getChildBlock('shipping_method')->toHtml(); ?>
- </fieldset>
- <?php endif; ?>
-
- <div class="paypal review items">
- <div class="paypal subtitle caption">
- <strong><?php echo __('Items in Your Shopping Cart') ?></strong>
- <a href="<?php echo $this->getUrl('checkout/cart') ?>" class="action edit"><?php echo __('Edit Shopping Cart') ?></a>
- </div>
-
- <div id="details-reload">
- <?php echo $this->getChildHtml('details') ?>
- </div>
- </div>
-
- <?php echo $this->getChildHtml('agreements'); ?>
- <div class="actions" id="review-buttons-container">
- <button type="button" id="review-button" value="<?php echo __('Place Order') ?>" class="action checkout"><span><?php echo __('Place Order') ?></span></button>
- <button type="button" id="review-submit" value="<?php echo __('Place Order') ?>" class="action checkout"><span><?php echo __('Place Order') ?></span></button>
- <button type="button" id="update-order" class="action update"><span><?php echo __('Update Order Data') ?></span></button>
- <span class="please-wait load indicator" id="review-please-wait" style="display:none;">
- <span><?php echo __('Submitting order information...') ?></span>
- </span>
- </div>
- </form>
-</div>
-<script type="text/javascript">
- head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
- "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
- "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
- "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
- "<?php echo $this->getViewFileUrl('Magento_Paypal::order-review.js') ?>",
- function() {
- jQuery('#order-review-form').validation().orderReview({
- shippingMethodUpdateUrl: '<?php echo $this->escapeHtml($this->getUpdateShippingMethodsUrl()) ?>',
- updateOrderSubmitUrl: '<?php echo $this->escapeHtml($this->getUpdateOrderSubmitUrl()) ?>',
- isAjax: <?php echo $this->getUseAjax() ? 'true' : 'false' ?>
- });
- });
-</script>
diff --git a/app/design/frontend/magento_plushe/Magento_Paypal/express/review/address.phtml b/app/design/frontend/magento_plushe/Magento_Paypal/express/review/address.phtml
deleted file mode 100644
index 2cf078fc786..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Paypal/express/review/address.phtml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category Mage
- * @package Magento_Paypal
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<?php $prefix = $this->getFieldNamePrefix();?>
- <input type="hidden" name="<?php echo $prefix ?>[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="<?php echo $prefix ?>:address_id" />
- <?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($this->getAddress()->getFirstname() ? $this->getAddress() : $this->getQuote()->getCustomer())->setForceUseCustomerRequiredAttributes(!$this->isCustomerLoggedIn())->setFieldIdFormat($prefix . ':%s')->setFieldNameFormat($prefix . '[%s]')->toHtml() ?>
-
- <div class="field company">
- <label for="<?php echo $prefix ?>:company" class="label"><span><?php echo __('Company') ?></span></label>
- <div class="control">
- <input type="text" id="<?php echo $prefix ?>:company" name="<?php echo $prefix ?>[company]" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" title="<?php echo __('Company') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>" />
- </div>
- </div>
-
- <?php if(!$this->isCustomerLoggedIn() && !$this->getHideEmailAddress()): ?>
- <div class="field email required">
- <label for="<?php echo $prefix ?>:email" class="label"><span><?php echo __('Email Address') ?></span></label>
- <div class="control">
- <input type="text" name="<?php echo $prefix ?>[email]" id="<?php echo $prefix ?>:email" value="<?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?>" title="<?php echo __('Email Address') ?>" class="input-text validate-email required-entry" />
- </div>
- </div>
- <?php endif; ?>
-
- <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
- <div class="field street required">
- <label for="<?php echo $prefix ?>:street1" class="label"><span><?php echo __('Address') ?></span></label>
- <div class="control">
- <input type="text" title="<?php echo __('Street Address') ?>" name="<?php echo $prefix ?>[street][]" id="<?php echo $prefix ?>:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text required-entry <?php echo $_streetValidationClass ?>" />
- <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
- <?php for ($_i = 2, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i <= $_n; $_i++): ?>
- <div class="nested">
- <input type="text" title="<?php echo __('Street Address %1', $_i) ?>" name="<?php echo $prefix ?>[street][]" id="<?php echo $prefix ?>:street<?php echo $_i?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
- </div>
- <?php endfor; ?>
- </div>
- </div>
-
- <?php if ($this->helper('Magento\Customer\Helper\Address')->isVatAttributeVisible()) : ?>
- <div class="field vat_id">
- <label for="<?php echo $prefix ?>:vat_id" class="label"><span><?php echo __('VAT Number') ?></span></label>
- <div class="control">
- <input type="text" id="<?php echo $prefix ?>:vat_id" name="<?php echo $prefix ?>[vat_id]" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo __('VAT Number') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id') ?>" />
- </div>
- </div>
- <?php endif; ?>
-
- <div class="field city required">
- <label for="<?php echo $prefix ?>:city" class="label"><span><?php echo __('City') ?></span></label>
- <div class="control">
- <input type="text" title="<?php echo __('City') ?>" name="<?php echo $prefix ?>[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text required-entry <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="<?php echo $prefix ?>:city" />
- </div>
- </div>
-
- <div class="field regionid required">
- <label for="<?php echo $prefix ?>:region_id" class="label"><span><?php echo __('State/Province') ?></span></label>
- <div class="control">
- <select id="<?php echo $prefix ?>:region_id" name="<?php echo $prefix ?>[region_id]" title="<?php echo __('State/Province') ?>" class="validate-select required-entry" style="display:none;">
- <option value=""><?php echo __('Please select region, state or province') ?></option>
- </select>
- <input type="text" id="<?php echo $prefix ?>:region" name="<?php echo $prefix ?>[region]" value="<?php echo $this->escapeHtml($this->getAddress()->getRegion()) ?>" title="<?php echo __('State/Province') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>" style="display:none;" />
- </div>
- </div>
-
- <div class="field postcode required">
- <label for="<?php echo $prefix ?>:postcode" class="label"><span><?php echo __('Zip/Postal Code') ?></span></label>
- <div class="control">
- <input type="text" title="<?php echo __('Zip/Postal Code') ?>" name="<?php echo $prefix ?>[postcode]" id="<?php echo $prefix ?>:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international required-entry <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" />
- </div>
- </div>
-
- <div class="field country_id required">
- <label for="<?php echo $prefix ?>:country_id" class="label"><span><?php echo __('Country') ?></span></label>
- <div class="control">
- <?php echo $this->getCountryHtmlSelect($prefix) ?>
- </div>
- </div>
-
- <div class="field telephone required">
- <label for="<?php echo $prefix ?>:telephone" class="label"><span><?php echo __('Telephone') ?></span></label>
- <div class="control">
- <input type="text" name="<?php echo $prefix ?>[telephone]" value="<?php echo $this->escapeHtml($this->getAddress()->getTelephone()) ?>" title="<?php echo __('Telephone') ?>" class="input-text required-entry <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>" id="<?php echo $prefix ?>:telephone" />
- </div>
- </div>
-
- <div class="field fax">
- <label for="<?php echo $prefix ?>:fax" class="label"><span><?php echo __('Fax') ?></span></label>
- <div class="control">
- <input type="text" name="<?php echo $prefix ?>[fax]" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" title="<?php echo __('Fax') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>" id="<?php echo $prefix ?>:fax" />
- </div>
- </div>
-
- <?php echo $this->getChildHtml('form.additional.info'); ?>
- <?php if ($this->getShowAsShippingCheckbox()): ?>
- <div class="field choice as_shipping">
- <input type="checkbox" name="<?php echo $prefix ?>[as_shipping]" class="checkbox" value="1" title="<?php echo __('Same as shipping') ?>" id="<?php echo $prefix ?>:as_shipping" <?php if ($this->getAddress()->getSameAsBilling()):?>checked="checked"<?php endif;?>/>
- <label for="<?php echo $prefix ?>:as_shipping" class="label"><span><?php echo __('Same as shipping') ?></span></label>
- </div>
- <?php endif; ?>
-
-<script type="text/javascript">
- (function($) {
- head.js(
- "<?php echo $this->getViewFileUrl('Magento_Checkout::js/region-updater.js') ?>",
- "<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
- "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js') ?>",
- "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
- "<?php echo $this->getViewFileUrl('mage/validation/validation.js') ?>",
- function() {
- $('#<?php echo $prefix ?>\\:country_id').regionUpdater({
- optionalRegionAllowed: <?php echo ($this->getConfig('general/region/display_all')? 'true' : 'false'); ?>,
- regionListId: '#<?php echo $prefix ?>\\:region_id',
- regionInputId: '#<?php echo $prefix ?>\\:region',
- postcodeId: '#<?php echo $prefix ?>\\:postcode',
- regionJson: <?php echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
- defaultRegion: "<?php echo $this->getAddress()->getRegionId() ?>",
- countriesWithOptionalZip: <?php echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
- });
- });
- })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_plushe/Magento_Paypal/express/review/shipping/method.phtml b/app/design/frontend/magento_plushe/Magento_Paypal/express/review/shipping/method.phtml
deleted file mode 100644
index a3f9482b40a..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Paypal/express/review/shipping/method.phtml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @package base_default
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-/** @var $this \Magento\Paypal\Block\Express\Review */
-?>
-<div id="shipping-method-container">
- <?php if ($this->getCanEditShippingMethod() || !$this->getCurrentShippingRate()): ?>
- <?php if ($groups = $this->getShippingRateGroups()): ?>
- <?php $currentRate = $this->getCurrentShippingRate(); ?>
- <select name="shipping_method" id="shipping_method" class="required-entry">
- <?php if (!$currentRate): ?>
- <option value=""><?php echo __('Please select a shipping method...') ?></option>
- <?php endif; ?>
- <?php foreach ($groups as $code => $rates): ?>
- <optgroup label="<?php echo $this->escapeHtml($this->getCarrierName($code)) ?>" style="font-style:normal;">
- <?php foreach ($rates as $rate): ?>
- <option
- value="<?php echo $this->renderShippingRateValue($rate) ?>"<?php echo ($currentRate === $rate) ? ' selected="selected"' : ''; ?>>
- <?php echo $this->renderShippingRateOption($rate) ?>
- </option>
- <?php endforeach; ?>
- </optgroup>
- <?php endforeach; ?>
- </select>
- <?php else: ?>
- <p><strong><?php echo __('Sorry, no quotes are available for this order at this time.') ?></strong></p>
- <?php endif; ?>
- <?php else: ?>
- <p><strong><?php echo $this->renderShippingRateOption($this->getCurrentShippingRate()) ?></strong></p>
- <?php endif; ?>
-</div>
-<div style="display:none" id="shipping_method_update">
- <p><?php echo __('Please update order data to get shipping methods and rates') ?></p>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Persistent/layout/override/checkout_onepage_index.xml b/app/design/frontend/magento_plushe/Magento_Persistent/layout/override/base/checkout_onepage_index.xml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Persistent/layout/override/checkout_onepage_index.xml
rename to app/design/frontend/magento_plushe/Magento_Persistent/layout/override/base/checkout_onepage_index.xml
diff --git a/app/design/frontend/magento_plushe/Magento_Persistent/layout/override/customer_account_create.xml b/app/design/frontend/magento_plushe/Magento_Persistent/layout/override/base/customer_account_create.xml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Persistent/layout/override/customer_account_create.xml
rename to app/design/frontend/magento_plushe/Magento_Persistent/layout/override/base/customer_account_create.xml
diff --git a/app/design/frontend/magento_plushe/Magento_Persistent/layout/override/customer_account_login.xml b/app/design/frontend/magento_plushe/Magento_Persistent/layout/override/base/customer_account_login.xml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Persistent/layout/override/customer_account_login.xml
rename to app/design/frontend/magento_plushe/Magento_Persistent/layout/override/base/customer_account_login.xml
diff --git a/app/design/frontend/magento_plushe/Magento_Reports/layout/override/default.xml b/app/design/frontend/magento_plushe/Magento_Reports/layout/override/base/default.xml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Reports/layout/override/default.xml
rename to app/design/frontend/magento_plushe/Magento_Reports/layout/override/base/default.xml
diff --git a/app/design/frontend/magento_plushe/Magento_Cms/layout/override/print.xml b/app/design/frontend/magento_plushe/Magento_Reports/layout/override/base/print.xml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Cms/layout/override/print.xml
rename to app/design/frontend/magento_plushe/Magento_Reports/layout/override/base/print.xml
diff --git a/app/design/frontend/magento_plushe/Magento_Review/customer/list.phtml b/app/design/frontend/magento_plushe/Magento_Review/customer/list.phtml
deleted file mode 100644
index a1bfcc3a450..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Review/customer/list.phtml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<?php if( $this->getCollection() && $this->count()): ?>
- <div class="toolbar reviews">
- <?php echo $this->getToolbarHtml() ?>
- </div>
- <table class="data table reviews" id="my-reviews-table">
- <thead>
- <tr>
- <th class="col date"><?php echo __('Created') ?></th>
- <th class="col item"><?php echo __('Product Name') ?></th>
- <th class="col summary"><?php echo __('Summary') ?></th>
- <th class="col description"><?php echo __('Description') ?></th>
- <th class="col actions"> </th>
- </tr>
- </thead>
- <tbody>
- <?php foreach ($this->getCollection() as $_review): ?>
- <tr>
- <td class="col date"><?php echo $this->dateFormat($_review->getReviewCreatedAt()); ?></td>
- <td class="col item">
- <strong class="product name">
- <a href="<?php echo $this->getProductLink() ?>id/<?php echo $_review->getEntityPkValue() ?>"><?php echo $this->escapeHtml($_review->getName()) ?></a>
- </strong>
- </td>
- <td class="col summary">
- <?php if($_review->getSum()): ?>
- <div class="rating">
- <span style="width:<?php echo ( $_review->getSum() / $_review->getCount() ) ?>%;"></span>
- </div>
- <?php endif; ?>
- </td>
- <td class="col description">
- <div class="text">
- <?php echo $this->helper('Magento\Review\Helper\Data')->getDetailHtml($_review->getDetail()) ?>
- </div>
- </td>
- <td class="col actions">
- <a href="<?php echo $this->getReviewLink() ?>id/<?php echo $_review->getReviewId() ?>" class="action more">
- <span><?php echo __('View Details') ?></span>
- </a>
- </td>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
- <div class="toolbar reviews bottom">
- <?php echo $this->getToolbarHtml() ?>
- </div>
-<?php else: ?>
- <p class="empty"><?php echo __('You have submitted no reviews.') ?></p>
-<?php endif; ?>
-<div class="actions">
- <div class="secondary">
- <a class="action back" href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>">
- <span><?php echo __('Back') ?></span>
- </a>
- </div>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Review/customer/recent.phtml b/app/design/frontend/magento_plushe/Magento_Review/customer/recent.phtml
deleted file mode 100644
index 3b25d298b0e..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Review/customer/recent.phtml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<?php if( $this->getCollection() && $this->count()): ?>
-<div class="block reviews dashboard">
- <div class="title">
- <strong><?php echo __('My Recent Reviews') ?></strong>
- <a class="action view" href="<?php echo $this->getAllReviewsUrl() ?>"><span><?php echo __('View All Reviews') ?></span></a>
- </div>
- <div class="content">
- <ol class="items">
- <?php foreach ($this->getCollection() as $_review): ?>
- <li class="item">
- <strong class="product name"><a href="<?php echo $this->getReviewUrl($_review->getReviewId()) ?>"><?php echo $this->escapeHtml($_review->getName()) ?></a></strong>
- <?php if($_review->getSum()): ?>
- <?php $rating = $_review->getSum() / $_review->getCount() ?>
- <div class="rating" title="<?php echo $rating; ?>%">
- <span style="width:<?php echo $rating; ?>%">
- <?php echo $rating; ?>
- </span>
- </div>
- <?php endif; ?>
- </li>
- <?php endforeach; ?>
- </ol>
- </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Review/customer/view.phtml b/app/design/frontend/magento_plushe/Magento_Review/customer/view.phtml
deleted file mode 100644
index d4816e5e5e7..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Review/customer/view.phtml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<?php if($this->getProductData()->getId()): ?>
-<?php $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image'); ?>
-<div class="customer review view">
- <h2 class="product name"><?php echo $this->escapeHtml($this->getProductData()->getName()) ?></h2>
- <div class="product details">
- <a class="product photo" href="<?php echo $this->getProductData()->getProductUrl() ?>">
- <!-- customer_account_product_review_page -->
- <?php echo $imageBlock->init($this->getProductData(), 'customer_account_product_review_page')->toHtml() ?>
- </a>
- <?php if( $this->getRating() && $this->getRating()->getSize()): ?>
- <p><?php echo __('Average Customer Rating:') ?></p>
- <?php echo $this->getReviewsSummaryHtml($this->getProductData()) ?>
- <?php endif; ?>
- </div>
- <div class="review details">
-
- <?php if( $this->getRating() && $this->getRating()->getSize()): ?>
- <div class="ratings summary">
- <strong><?php echo ($this->isReviewOwner()) ? __('Your Rating:') : __('Rating:'); ?></strong>
-
- <?php foreach ($this->getRating() as $_rating): ?>
- <?php if($_rating->getPercent()): ?>
- <?php $rating = ceil($_rating->getPercent()) ?>
- <div class="reviews summary item">
- <div class="label"><?php echo $this->escapeHtml($_rating->getRatingCode()) ?></div>
- <div class="rating" title="<?php echo $rating; ?>%">
- <span style="width:<?php echo $rating; ?>%">
- <?php echo $rating; ?>
- </span>
- </div>
- </div>
- <?php endif; ?>
- <?php endforeach; ?>
- </div>
- <?php endif; ?>
-
- <div class="review title"><?php echo $this->escapeHtml($this->getReviewData()->getTitle()) ?></div>
- <p class="review date">
- <?php if ($this->isReviewOwner()): ?>
- <?php echo __('Your Review (submitted on %1):', '<time class="date">' . $this->dateFormat($this->getReviewData()->getCreatedAt()) . '</time>') ?>
- <?php else :?>
- <?php echo __('Review (submitted on %1):', '<time class="date">' . $this->dateFormat($this->getReviewData()->getCreatedAt()) . '</time>') ?>
- <?php endif;?>
- </p>
- <div class="review content"><?php echo nl2br($this->escapeHtml($this->getReviewData()->getDetail())) ?></div>
- </div>
-</div>
-<div class="actions">
- <div class="secondary">
- <a class="action back" href="<?php echo $this->getBackUrl() ?>"><span><?php echo __('Back to My Reviews') ?></span></a>
- </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Review/form.phtml b/app/design/frontend/magento_plushe/Magento_Review/form.phtml
deleted file mode 100644
index 16724df55f4..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Review/form.phtml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<div class="block add review">
- <div class="title"><strong><?php echo __('Write Your Own Review') ?></strong></div>
-<div class="content">
-<?php if ($this->getAllowWriteReviewFlag()): ?>
-<form action="<?php echo $this->getAction() ?>" method="post" id="review-form">
- <?php echo $this->getChildHtml('form_fields_before')?>
- <fieldset class="fieldset" data-hasrequired="<?php __('* Required Fields'); ?>">
- <legend class="legend"><span><?php echo __("You're reviewing:"); ?></span><strong><?php echo $this->escapeHtml($this->getProductInfo()->getName()) ?></strong></legend><br />
- <?php if ($this->getRatings() && $this->getRatings()->getSize()): ?>
- <span id="input-message-box"></span>
- <div class="field ratings required">
- <label class="label"><span><?php echo __('How do you rate this product?') ?></span></label>
- <div class="control">
- <div class="nested" id="product-review-table">
- <?php foreach ($this->getRatings() as $_rating): ?>
- <div class="field rating">
- <label class="label"><span><?php echo $this->escapeHtml($_rating->getRatingCode()) ?></span></label>
- <div class="control">
- <?php $options = $_rating->getOptions();?>
- <?php $iterator = 1; foreach ($options as $_option): ?>
- <input type="radio" name="ratings[<?php echo $_rating->getId() ?>]" id="<?php echo $this->escapeHtml($_rating->getRatingCode()) ?>_<?php echo $_option->getValue() ?>" value="<?php echo $_option->getId() ?>" class="radio" data-validate="{required:true, messages:{required:'Please select one of each of the ratings above.'}}" />
- <label class="rating-<?php echo $iterator; ?>" for="<?php echo $this->escapeHtml($_rating->getRatingCode()) ?>_<?php echo $_option->getValue() ?>" title="<?php echo __('%1 %2', $iterator, $iterator > 1 ? 'stars' : 'star') ?>">
- <span><?php echo __('%1 %2', $iterator, $iterator > 1 ? 'stars' : 'star') ?></span>
- </label>
- <?php $iterator++; ?>
- <?php endforeach; ?>
- </div>
- </div>
- <?php endforeach; ?>
- </div>
- <input type="hidden" name="validate_rating" class="validate-rating" value="" />
- </div>
- </div>
- <?php endif ?>
- <div class="field nickname required">
- <label for="nickname_field" class="label"><span><?php echo __('Nickname') ?></span></label>
- <div class="control">
- <input type="text" name="nickname" id="nickname_field" class="input-text" data-validate="{required:true}" value="<?php echo $this->escapeHtml($data->getNickname()) ?>" />
- </div>
- </div>
- <div class="field summary required">
- <label for="summary_field" class="label"><span><?php echo __('Summary of Your Review') ?></span></label>
- <div class="control">
- <input type="text" name="title" id="summary_field" class="input-text" data-validate="{required:true}" value="<?php echo $this->escapeHtml($data->getTitle()) ?>" />
- </div>
- </div>
- <div class="field text required">
- <label for="review_field" class="label"><span><?php echo __('Review') ?></span></label>
- <div class="control">
- <textarea name="detail" id="review_field" cols="5" rows="3" data-validate="{required:true}"><?php echo $this->escapeHtml($data->getDetail()) ?></textarea>
- </div>
- </div>
- </fieldset>
- <div class="actions form">
- <button type="submit" class="action submit"><span><?php echo __('Submit Review') ?></span></button>
- <!-- <button type="button" class="action cancel"><span><?php echo __('Cancel') ?></span></button> -->
- </div>
-</form>
-<script>
- (function($) {
- head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
- "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
- "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
- "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
- function() {
- $('#review-form').validation({
- errorPlacement: function (error, element) {
- if (element.parents('#product-review-table').length) {
- $('#product-review-table').siblings(this.errorElement + '.' + this.errorClass).remove();
- $('#product-review-table').after(error);
- } else {
- element.after(error);
- }
- }
- });
- });
- })(jQuery);
-</script>
-<?php else: ?>
- <p class="review notlogged" id="review-form">
- <?php echo __('Only registered users can write reviews. Please, <a href="%1">log in</a> or <a href="%2">register</a>', $this->getLoginLink(), $this->helper('Magento\Customer\Helper\Data')->getRegisterUrl()) ?>
- </p>
-<?php endif ?>
-</div>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Review/helper/summary.phtml b/app/design/frontend/magento_plushe/Magento_Review/helper/summary.phtml
deleted file mode 100644
index a6ebbe00232..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Review/helper/summary.phtml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<?php $url = $this->getReviewsUrl(); ?>
-<?php $urlForm = $this->getReviewsUrl() . '#review-form'; ?>
-<?php //$url = $this->getProduct()->getProductUrl() . '#info-product_reviews' ?>
-<?php //$urlForm = $this->getProduct()->getProductUrl() . '#info-product_reviews' ?>
-<?php if ($this->getReviewsCount()): ?>
-<?php $rating = $this->getRatingSummary(); ?>
-<div class="product reviews summary<?php echo !$rating ? ' no-rating' :''?>">
- <?php if ($rating):?>
- <div class="rating" title="<?php echo $rating; ?>%">
- <span style="width:<?php echo $rating; ?>%">
- <?php echo $rating; ?>
- </span>
- </div>
- <?php endif;?>
- <div class="reviews actions">
- <?php /* <a class="action view" href="#" onclick="var t = opener ? opener.window : window; t.location.href='<?php echo $this->getReviewsUrl() ?>'; return false;"> */ ?>
- <a class="action view" href="<?php echo $url ?>"><?php echo $this->getReviewsCount() ?><span><?php echo __('Review(s)') ?></span></a>
- <a class="action add" href="<?php echo $urlForm ?>"><?php echo __('Add Your Review') ?></a>
- </div>
-</div>
-<?php elseif ($this->getDisplayIfEmpty()): ?>
-<div class="product reviews summary no-reviews">
- <a class="action add" href="<?php echo $urlForm; ?>">
- <?php echo __('Be the first to review this product') ?>
- </a>
-</div>
-<?php endif; ?>
-<script type="text/javascript">
- (function($) {
- $(document).ready(function() {
- $('.reviews.summary .action').click(function(evt){
- if($('#product_reviews').length > 0) {
- evt.preventDefault();
- $('[data-sections]').terms({start:'product_reviews'});
- } else {
- return
- }
- })
- });
- })(jQuery);
-</script>
\ No newline at end of file
diff --git a/app/design/frontend/magento_plushe/Magento_Review/helper/summary_short.phtml b/app/design/frontend/magento_plushe/Magento_Review/helper/summary_short.phtml
deleted file mode 100644
index c2c7fde574c..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Review/helper/summary_short.phtml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<?php $url = $this->getReviewsUrl(); ?>
-<?php $urlForm = $this->getReviewsUrl() . '#review-form'; ?>
-<?php //$url = $this->getProduct()->getProductUrl() . '#info-product_reviews' ?>
-<?php //$urlForm = $this->getProduct()->getProductUrl() . '#info-product_reviews' ?>
-<?php if ($this->getReviewsCount()): ?>
-<?php $rating = $this->getRatingSummary(); ?>
-<div class="product reviews summary short<?php echo !$rating ? ' no-rating' :''?>">
- <?php if ($rating):?>
- <div class="rating" title="<?php echo $rating; ?>%">
- <span style="width:<?php echo $rating; ?>%">
- <?php echo $rating; ?>
- </span>
- </div>
- <?php endif;?>
- <div class="reviews actions">
- <?php /* <a class="action view" href="#" onclick="var t = opener ? opener.window : window; t.location.href='<?php echo $this->getReviewsUrl() ?>'; return false;"> */ ?>
- <a class="action view" href="<?php echo $urlForm ?>"><?php echo $this->getReviewsCount() ?><span><?php echo __('Review(s)') ?></span></a>
- </div>
-</div>
-<?php elseif ($this->getDisplayIfEmpty()): ?>
-<div class="product reviews summary short no-reviews">
- <a class="action add" href="<?php echo $urlForm; ?>">
- <?php echo __('Be the first to review this product') ?>
- </a>
-</div>
-<?php endif; ?>
-<script type="text/javascript">
- (function($) {
- $(document).ready(function() {
- $('.reviews.summary .action').click(function(evt){
- if($('#product_reviews').length > 0) {
- evt.preventDefault();
- $('[data-sections]').terms({start:'product_reviews'});
- } else {
- return
- }
- })
- });
- })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_plushe/Magento_Review/layout/catalog_product_view.xml b/app/design/frontend/magento_plushe/Magento_Review/layout/catalog_product_view.xml
index c3e14735591..246ee1c172a 100644
--- a/app/design/frontend/magento_plushe/Magento_Review/layout/catalog_product_view.xml
+++ b/app/design/frontend/magento_plushe/Magento_Review/layout/catalog_product_view.xml
@@ -25,18 +25,13 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="product.info.details">
- <block class="Magento\Catalog\Block\Product\View\Additional" name="product.info.reviews.tab" as="product_reviews">
+ <block class="Magento\Catalog\Block\Product\View\Additional" name="product.info.reviews.tab" as="product_reviews" group="detailed_info">
<arguments>
<argument name="title" translate="true" xsi:type="string">Reviews</argument>
</arguments>
- <action method="addToParentGroup">
- <argument name="group" xsi:type="string">detailed_info</argument>
- </action>
<block class="Magento\Review\Block\Form" name="product.review.form" as="review_form">
<container name="product.review.form.fields.before" as="form_fields_before" label="Review Form Fields Before" htmlTag="div" htmlClass="rewards"/>
</block>
- <!-- <block class="Magento\Page\Block\Html\Pager" name="product_review_list.toolbar"/> -->
- <!-- <block class="Magento\Core\Block\Template" name="product_review_list.count" template="Magento_Review::product/view/count.phtml"/> -->
<block class="Magento\Review\Block\Product\View\ListView" name="product.info.product_additional_data" as="product_additional_data" template="product/view/list.phtml"/>
</block>
</referenceBlock>
diff --git a/app/design/frontend/magento_plushe/Magento_Review/product/view/list.phtml b/app/design/frontend/magento_plushe/Magento_Review/product/view/list.phtml
deleted file mode 100644
index fc4b25f7e03..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Review/product/view/list.phtml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-
-<?php
- $_items = $this->getReviewsCollection()->getItems();
- $format = $this->getDateFormat() ?: 'short';
-?>
-<?php if (count($_items)):?>
-<div class="block reviews list" id="customer-reviews">
- <div class="title">
- <strong><?php echo __('Customer Reviews') ?></strong>
- </div>
- <div class="content">
- <?php echo $this->getChildHtml('toolbar') ?>
- <ol class="reviews items">
- <?php foreach ($_items as $_review):?>
- <li class="item review">
- <div class="reviews summary">
- <?php foreach ($_review->getRatingVotes() as $_vote): ?>
- <span class="label"><?php echo $this->escapeHtml($_vote->getRatingCode()) ?></span>
- <div class="rating" title="<?php echo $_vote->getPercent() ?>%">
- <span style="width:<?php echo $_vote->getPercent() ?>%">
- <?php echo $_vote->getPercent() ?>
- </span>
- </div>
- <?php endforeach; ?>
- </div>
- <div class="review details">
- <p class="author">
- <span><?php echo __('Review by')?></span>
- <strong class="nickname"><?php echo $this->escapeHtml($_review->getNickname()) ?></strong>
- </p>
- <p class="review date">
- <span><?php echo __('Posted on') ?></span>
- <time class="date"><?php echo $this->formatDate($_review->getCreatedAt(), $format) ?></time>
- </p>
- </div>
- <div class="review title"><?php echo $this->escapeHtml($_review->getTitle()) ?></div>
- <?php /*
- <a href="<?php echo $this->getReviewUrl($_review->getId()) ?>"></a>
- */?>
- <div class="review content">
- <?php echo nl2br($this->escapeHtml($_review->getDetail())) ?>
- </div>
- </li>
- <?php endforeach; ?>
- </ol>
- <?php echo $this->getChildHtml('toolbar') ?>
- </div>
-</div>
-<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/billing/agreement/view.phtml b/app/design/frontend/magento_plushe/Magento_Sales/billing/agreement/view.phtml
deleted file mode 100644
index f352e60e34c..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Sales/billing/agreement/view.phtml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<?php /* @var $this \Magento\Sales\Block\Billing\Agreement\View */ ?>
-<div class="block billing agreements">
- <div class="title">
- <strong><?php echo __('Billing Agreement # %1', $this->escapeHtml($this->getReferenceId())) ?></strong>
- <?php if ($this->getCanCancel()): ?>
- <button type="button" title="<?php echo __('Cancel') ?>" class="secondary action cancel" onclick="if( confirm('<?php echo __('Are you sure you want to do this?') ?>') ) { window.location.href = '<?php echo $this->getCancelUrl() ?>'; } return false;">
- <span><?php echo __('Cancel') ?></span>
- </button>
- <?php endif; ?>
- </div>
- <div class="content">
- <h2 class="subtitle caption"><?php echo __('Agreement Information') ?></h2>
- <table class="data table">
- <thead>
- <tr>
- <th class="col id"><?php echo __('Reference ID:'); ?></th>
- <th class="col status"><?php echo __('Status:'); ?></th>
- <th class="col created"><?php echo __('Created:'); ?></th>
- <?php if($this->getAgreementUpdatedAt()): ?>
- <th class="col updated"><?php echo __('Updated:'); ?></th>
- <?php endif; ?>
- <th class="col payment"><?php echo __('Payment Method:'); ?></th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="col id"><?php echo $this->escapeHtml($this->getReferenceId()); ?></td>
- <td class="col status"><?php echo $this->getAgreementStatus() ?></td>
- <td class="col created"><?php echo $this->escapeHtml($this->getAgreementCreatedAt()) ?></td>
- <?php if($this->getAgreementUpdatedAt()): ?>
- <td class="col updated"><?php echo $this->escapeHtml($this->getAgreementUpdatedAt()); ?></td>
- <?php endif; ?>
- <td class="col payment"><?php echo $this->getPaymentMethodTitle() ?></td>
- </tr>
- </tbody>
- </table>
-
- <?php $relatedOrders = $this->getRelatedOrders() ?>
- <?php if(count($relatedOrders) > 0): ?>
- <?php echo $this->getChildHtml('pager'); ?>
- <h2 class="subtitle caption"><?php echo __('Related Orders') ?></h2>
- <table class="data table" id="related-orders-table">
- <thead>
- <tr>
- <th class="col id"><?php echo __('Order #') ?></th>
- <th class="col date"><?php echo __('Date') ?></th>
- <th class="col shipto"><?php echo __('Ship To') ?></th>
- <th class="col total"><?php echo __('Order Total') ?></th>
- <th class="col status"><?php echo __('Order Status') ?></th>
- <th class="col actions"> </th>
- </tr>
- </thead>
- <tbody>
- <?php foreach ($relatedOrders as $order): ?>
- <tr>
- <th class="col id"><?php echo $this->getOrderItemValue($order, 'order_increment_id') ?></th>
- <th class="col date"><?php echo $this->getOrderItemValue($order, 'created_at') ?></th>
- <th class="col shipto"><?php echo $this->getOrderItemValue($order, 'shipping_address') ?></th>
- <th class="col total"><?php echo $this->getOrderItemValue($order, 'order_total') ?></th>
- <th class="col status"><?php echo $this->getOrderItemValue($order, 'status_label') ?></th>
- <th class="col actions">
- <a href="<?php echo $this->getOrderItemValue($order, 'view_url') ?>"><?php echo __('View Order') ?></a>
- </th>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
- <?php endif; ?>
-
- <div class="actions">
- <div class="secondary">
- <a href="<?php echo $this->getBackUrl() ?>" class="action back"><?php echo __('Back to Billing Agreements') ?></a>
- </div>
- </div>
- </div>
-</div>
\ No newline at end of file
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/billing/agreements.phtml b/app/design/frontend/magento_plushe/Magento_Sales/billing/agreements.phtml
deleted file mode 100644
index e8d240d9002..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Sales/billing/agreements.phtml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<?php /* @var $this \Magento\Sales\Block\Billing\Agreements */ ?>
-<div class="block billing agreements">
- <?php $billingAgreements = $this->getBillingAgreements(); ?>
- <?php if (count($billingAgreements) > 0): ?>
- <?php echo $this->getChildHtml('pager'); ?>
- <table id="billing-agreements" class="data table billing agreements">
- <thead>
- <tr>
- <th class="col id"><?php echo __('Reference ID'); ?></th>
- <th class="col status"><?php echo __('Status'); ?></th>
- <th class="col created"><?php echo __('Created At'); ?></th>
- <th class="col updated"><?php echo __('Updated At'); ?></th>
- <th class="col payment"><?php echo __('Payment Method'); ?></th>
- <th class="col actions"> </th>
- </tr>
- </thead>
- <tbody>
- <?php foreach($billingAgreements as $item): ?>
- <tr>
- <td class="col id"><?php echo $this->getItemValue($item, 'reference_id') ?></td>
- <td class="col status"><?php echo $this->getItemValue($item, 'status') ?></td>
- <td class="col created"><?php echo $this->getItemValue($item, 'created_at') ?></td>
- <td class="col updated"><?php echo $this->getItemValue($item, 'updated_at') ?></td>
- <td class="col payment"><?php echo $this->getItemValue($item, 'payment_method_label') ?></td>
- <td class="col actions">
- <a href="<?php echo $this->getItemValue($item, 'edit_url') ?>"><?php echo __('View') ?></a>
- </td>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
- <?php else: ?>
- <p class="no agreements"><?php echo __('There are no billing agreements yet.')?></p>
- <?php endif; ?>
-
- <?php $paymentMethods = $this->getWizardPaymentMethodOptions() ?>
- <?php if ($paymentMethods): ?>
- <h2 class="subtitle caption"><?php echo __('New Billing Agreement') ?></h2>
-
- <form action="<?php echo $this->getCreateUrl() ?>" method="post" class="form new agreement">
- <fieldset class="fieldset">
- <p class="note"><?php echo __('You will be redirected to the payment system website.') ?></p>
-
- <div class="field payment method">
- <div class="control">
- <select id="payment_method" name="payment_method">
- <option value=""><?php echo __('-- Please Select --') ?></option>
- <?php foreach ($paymentMethods as $code => $title): ?>
- <option value="<?php echo $code ?>"><?php echo $title ?></option>
- <?php endforeach; ?>
- </select>
- </div>
- </div>
- <button type="submit" class="primary action create">
- <span><?php echo __('Create...') ?></span>
- </button>
- </fieldset>
- </form>
- <?php endif; ?>
-
- <div class="actions">
- <div class="secondary">
- <a href="<?php echo $this->escapeHtml($this->getBackUrl()) ?>" class="action back"><span><?php echo __('Back') ?></span></a>
- </div>
- </div>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/guest/form.phtml b/app/design/frontend/magento_plushe/Magento_Sales/guest/form.phtml
deleted file mode 100644
index 7965d508ecf..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Sales/guest/form.phtml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<form class="form orders search" id="oar-widget-orders-and-returns-form" action="<?php echo $this->getActionUrl() ?>" method="post" class="search-form" name="guest_post">
- <fieldset class="fieldset">
- <legend class="legend"><span><?php echo __('Order Information') ?></span></legend><br />
- <div class="field required">
- <label class="label" for="oar-order-id"><span><?php echo __('Order ID') ?></span></label>
- <div class="control">
- <input type="text" class="input-text" id="oar-order-id" name="oar_order_id" data-validate="{required:true}"/>
- </div>
- </div>
- <div class="field required">
- <label class="label" for="oar-billing-lastname"><span><?php echo __('Billing Last Name') ?></span></label>
- <div class="control">
- <input type="text" class="input-text" id="oar-billing-lastname" name="oar_billing_lastname" data-validate="{required:true}"/>
- </div>
- </div>
- <div class="field required">
- <label class="label" for="quick-search-type-id"><span><?php echo __('Find Order By:') ?></span></label>
- <div class="control">
- <select name="oar_type" id="quick-search-type-id" class="select">
- <option value="email"><?php echo __('Email Address'); ?></option>
- <option value="zip"><?php echo __('ZIP Code'); ?></option>
- </select>
- </div>
- </div>
- <div id="oar-email" class="field required">
- <label class="label" for="oar_email"><span><?php echo __('Email Address') ?></span></label>
- <div class="control">
- <input type="text" class="input-text" id="oar_email" name="oar_email" data-validate="{required:true, 'validate-email':true}"/>
- </div>
- </div>
- <div id="oar-zip" class="field required">
- <label class="label" for="oar_zip"><span><?php echo __('Billing ZIP Code') ?></span></label>
- <div class="control">
- <input type="text" class="input-text" id="oar_zip" name="oar_zip" data-validate="{required:true}"/>
- </div>
- </div>
- </fieldset>
- <div class="actions">
- <button type="submit" title="<?php echo __('Continue') ?>" class="action submit"><span><?php echo __('Continue') ?></span></button>
- </div>
-</form>
-<script type="text/javascript">
- head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>",
- "<?php echo $this->getViewFileUrl('jquery/jquery.metadata.js')?>",
- "<?php echo $this->getViewFileUrl('mage/validation.js')?>",
- "<?php echo $this->getViewFileUrl('mage/validation/validation.js')?>",
- "<?php echo $this->getViewFileUrl('Magento_Sales::orders-returns.js');?>", function() {
- jQuery('#oar-widget-orders-and-returns-form').ordersReturns().validation();
- });
-</script>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/order/history.phtml b/app/design/frontend/magento_plushe/Magento_Sales/order/history.phtml
deleted file mode 100644
index e5bc8f2590c..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Sales/order/history.phtml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<?php $_orders = $this->getOrders(); ?>
-<?php echo $this->getChildHtml('info');?>
-<div class="order toolbar"><?php echo $this->getPagerHtml(); ?></div>
-<?php if($_orders->getSize()): ?>
-<table class="data table orders history" id="my-orders-table">
- <thead>
- <tr>
- <th class="col id"><?php echo __('Order #') ?></th>
- <th class="col date"><?php echo __('Date') ?></th>
- <th class="col shipping"><?php echo __('Ship To') ?></th>
- <th class="col total"><?php echo __('Order Total') ?></th>
- <th class="col status"><?php echo __('Status') ?></th>
- <th class="col actions"> </th>
- </tr>
- </thead>
- <tbody>
- <?php foreach ($_orders as $_order): ?>
- <tr>
- <td class="col id"><?php echo $_order->getRealOrderId() ?></td>
- <td class="col date"><?php echo $this->formatDate($_order->getCreatedAtStoreDate()) ?></td>
- <td class="col shipping"><?php echo $_order->getShippingAddress() ? $this->escapeHtml($_order->getShippingAddress()->getName()) : ' ' ?></td>
- <td class="col total"><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
- <td class="col status"><em><?php echo $_order->getStatusLabel() ?></em></td>
- <td class="col actions">
- <a href="<?php echo $this->getViewUrl($_order) ?>" class="action view">
- <span><?php echo __('View Order') ?></span>
- </a>
- <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order)) : ?>
- <a href="<?php echo $this->getReorderUrl($_order) ?>" class="action order">
- <span><?php echo __('Reorder') ?></span>
- </a>
- <?php endif ?>
- </td>
- </tr>
- <?php endforeach; ?>
- </tbody>
-</table>
-<div class="order toolbar bottom"><?php echo $this->getPagerHtml(); ?></div>
-<?php else: ?>
- <p><?php echo __('You have placed no orders.'); ?></p>
-<?php endif ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/order/info.phtml b/app/design/frontend/magento_plushe/Magento_Sales/order/info.phtml
deleted file mode 100644
index d5491807095..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Sales/order/info.phtml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<?php /** @var $this \Magento\Sales\Block\Order\Info */ ?>
-<?php $_order = $this->getOrder() ?>
-<div class="order details view">
- <strong class="order status"><?php echo $_order->getStatusLabel() ?></strong>
- <div class="order toolbar">
- <?php echo $this->getChildHtml('buttons') ?>
- <?php echo $this->getStatusHistoryRssUrl($_order) ?>
- </div>
- <dl class="order info">
- <dt><?php echo __('About This Order:') ?></dt>
- <dd>
- <?php echo $this->getChildHtml('links') ?>
- </dd>
- </dl>
- <p class="order date"><?php echo __('<span class="label">Order Date:</span> %1', '<date>' . $this->formatDate($_order->getCreatedAtStoreDate(), 'long') . '</date>' ) ?></p>
-<?php if (!$_order->getIsVirtual()): ?>
- <div class="block order shipping address">
- <div class="title"><strong><?php echo __('Shipping Address') ?></strong></div>
- <div class="content">
- <address><?php echo $_order->getShippingAddress()->format('html') ?></address>
- </div>
- </div>
-
- <div class="block order shipping method">
- <div class="title"><strong><?php echo __('Shipping Method') ?></strong></div>
- <div class="content">
- <?php if ($_order->getShippingDescription()): ?>
- <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
- <?php else: ?>
- <?php echo __('No shipping information available'); ?>
- <?php endif; ?>
- </div>
- </div>
-
-<?php endif; ?>
- <div class="block order billing address">
- <div class="title">
- <strong><?php echo __('Billing Address') ?></strong>
- </div>
- <div class="content">
- <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
- </div>
- </div>
- <div class="block order billing method">
- <div class="title">
- <strong><?php echo __('Payment Method') ?></strong>
- </div>
- <div class="content">
- <?php echo $this->getPaymentInfoHtml() ?>
- </div>
- </div>
-</div>
\ No newline at end of file
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/order/info/buttons.phtml b/app/design/frontend/magento_plushe/Magento_Sales/order/info/buttons.phtml
deleted file mode 100644
index 345c5e73577..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Sales/order/info/buttons.phtml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<div class="actions">
- <?php $_order = $this->getOrder() ?>
- <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order)) : ?>
- <a class="action reorder" href="<?php echo $this->getReorderUrl($_order) ?>">
- <span><?php echo __('Reorder') ?></span>
- </a>
- <?php endif ?>
- <a class="action print"
- href="<?php echo $this->getPrintUrl($_order) ?>"
- onclick="this.target='_blank';">
- <span><?php echo __('Print Order') ?></span>
- </a>
- <?php if($this->helper('Magento\Rss\Helper\Order')->isStatusNotificationAllow()): ?>
- <a href="<?php echo $this->helper('Magento\Rss\Helper\Order')->getStatusHistoryRssUrl($_order) ?>"
- class="action rss">
- <span><?php echo __('Subscribe to Order Status') ?></span>
- </a>
- <?php endif; ?>
- <?php echo $this->getChildHtml(); ?>
-</div>
\ No newline at end of file
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/order/print.phtml b/app/design/frontend/magento_plushe/Magento_Sales/order/print.phtml
deleted file mode 100644
index 90b9eaacd63..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Sales/order/print.phtml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @package base_default
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<?php $_order = $this->getOrder() ?>
-<div class="page title">
- <h1 class="title"><?php echo __('Order #%1', $_order->getRealOrderId()) ?></h1>
-</div>
-<p class="order-date"><?php echo __('Order Date: %1', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
-
-<div class="order details view">
- <div class="block order shipping address">
- <div class="title">
- <strong><?php echo __('Shipping Address') ?></strong>
- </div>
- <div class="content">
- <address><?php echo $_order->getShippingAddress()->format('html') ?></address>
- </div>
- </div>
- <div class="block order billing address">
- <div class="title">
- <strong><?php echo __('Billing Address') ?></strong>
- </div>
- <div class="content">
- <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
- </div>
- </div>
- <?php if (!$_order->getIsVirtual()): ?>
- <div class="block order shipping method">
- <div class="title">
- <strong><?php echo __('Shipping Method') ?></strong>
- </div>
- <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
- </div>
- <?php endif; ?>
- <div class="block order shipping">
- <div class="title">
- <strong><?php echo __('Payment Method') ?></strong>
- </div>
- <div class="content">
- <?php echo $this->getPaymentInfoHtml() ?>
- </div>
- </div>
-</div>
-
-<div class="order details items">
- <div class="order subtitle caption">
- <strong><?php echo __('Items Ordered') ?></strong>
- </div>
- <table class="data table order items" id="my-orders-table">
- <thead>
- <tr>
- <th class="col name"><?php echo __('Product Name') ?></th>
- <th class="col sku"><?php echo __('SKU') ?></th>
- <th class="col price"><?php echo __('Price') ?></th>
- <th class="col qty"><?php echo __('Qty') ?></th>
- <th class="a-right"><?php echo __('Subtotal') ?></th>
- </tr>
- </thead>
- <tfoot>
- <?php echo $this->getChildHtml('order_totals') ?>
- </tfoot>
- <?php $_items = $_order->getItemsCollection(); ?>
- <?php $_count = $_items->count(); ?>
- <?php foreach ($_items as $_item): ?>
- <?php if ($_item->getParentItem()) continue; ?>
- <tbody>
- <?php echo $this->getItemHtml($_item) ?>
- </tbody>
- <?php endforeach; ?>
- </table>
-</div>
-<script type="text/javascript">(function ($) {
- $('#my-orders-table').decorate('table', {'tbody':['odd', 'even'], 'tbody tr':['first', 'last']})
-})(jQuery)</script>
-<script type="text/javascript">window.print();</script>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/order/print/creditmemo.phtml b/app/design/frontend/magento_plushe/Magento_Sales/order/print/creditmemo.phtml
deleted file mode 100644
index 4d2a53c668e..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Sales/order/print/creditmemo.phtml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @package base_default
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<?php $_order = $this->getOrder() ?>
-<div class="page title">
- <h1 class="title"><?php echo __('Order #%1', $_order->getRealOrderId()) ?></h1>
-</div>
-<p class="order-date"><?php echo __('Order Date: %1', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
-<?php $_creditmemo = $this->getCreditmemo() ?>
-<?php if($_creditmemo): ?>
- <?php $_creditmemos = array($_creditmemo); ?>
-<?php else: ?>
- <?php $_creditmemos = $_order->getCreditmemosCollection() ?>
-<?php endif; ?>
-<?php foreach ($_creditmemos as $_creditmemo): ?>
- <div class="order details view">
- <div class="title">
- <strong><?php echo __('Refund #%1', $_creditmemo->getIncrementId()) ?></strong>
- </div>
-
- <div class="block order shipping address">
- <?php if (!$_order->getIsVirtual()): ?>
- <div class="title">
- <strong><?php echo __('Shipping Address') ?></strong>
- </div>
- <div class="content">
- <?php $_shipping = $_creditmemo->getShippingAddress() ?>
- <address><?php echo $_shipping->format('html') ?></address>
- </div>
- </div>
-
- <div class="block order billing address">
- <?php endif; ?>
- <div class="title">
- <strong><?php echo __('Billing Address') ?></strong>
- </div>
- <div class="content">
- <?php $_billing = $_creditmemo->getbillingAddress() ?>
- <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
- </div>
- </div>
-
- <?php if (!$_order->getIsVirtual()): ?>
- <div class="block order shipping method">
- <div class="title">
- <strong><?php echo __('Shipping Method') ?></strong>
- </div>
- <div class="content">
- <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
- </div>
- </div>
- <?php endif; ?>
- <div class="block order payment method">
- <div class="title">
- <strong><?php echo __('Payment Method') ?></strong>
- </div>
- <div class="content">
- <?php echo $this->getPaymentInfoHtml() ?>
- </div>
- </div>
-
- </div>
- <div class="order details items">
- <div class="order subtitle caption">
- <strong><?php echo __('Items Refunded') ?></strong>
- </div>
- <table class="data table order items" id="my-refund-table-<?php echo $_creditmemo->getId(); ?>">
- <thead>
- <tr>
- <th class="col name"><?php echo __('Product Name') ?></th>
- <th class="col sku"><?php echo __('SKU') ?></th>
- <th class="col price"><?php echo __('Price') ?></th>
- <th class="col qty"><?php echo __('Qty') ?></th>
- <th class="col subtotal"><?php echo __('Subtotal') ?></th>
- <th class="col discount"><?php echo __('Discount Amount') ?></th>
- <th class="col rowtotal"><?php echo __('Row Total') ?></th>
- </tr>
- </thead>
- <tfoot>
- <?php echo $this->getTotalsHtml($_creditmemo);?>
- </tfoot>
- <?php $_items = $_creditmemo->getAllItems(); ?>
- <?php $_count = count($_items); ?>
- <?php foreach ($_items as $_item): ?>
- <?php if ($_item->getOrderItem()->getParentItem()) continue; ?>
- <tbody>
- <?php echo $this->getItemHtml($_item) ?>
- </tbody>
- <?php endforeach; ?>
- </table>
- </div>
-<script type="text/javascript">(function($) {$('#my-refund-table-<?php echo $_creditmemo->getId(); ?>').decorate('table', {'tbody': ['odd','even'], 'tbody tr': ['first','last']})})(jQuery)</script>
-<?php endforeach; ?>
-<script type="text/javascript">window.print();</script>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/order/print/invoice.phtml b/app/design/frontend/magento_plushe/Magento_Sales/order/print/invoice.phtml
deleted file mode 100644
index 0c5043a86c6..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Sales/order/print/invoice.phtml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @package base_default
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<?php $_order = $this->getOrder() ?>
-<div class="page title">
- <h1 class="title"><?php echo __('Order #%1', $_order->getRealOrderId()) ?></h1>
-</div>
-<p class="order date"><?php echo __('Order Date: %1', $this->formatDate($_order->getCreatedAtStoreDate(), 'long')) ?></p>
-<?php $_invoice = $this->getInvoice() ?>
-<?php if ($_invoice): ?>
-<?php $_invoices = array($_invoice); ?>
-<?php else: ?>
-<?php $_invoices = $_order->getInvoiceCollection() ?>
-<?php endif; ?>
-<?php foreach ($_invoices as $_invoice): ?>
-<div class="order details view">
- <div class="title">
- <strong><?php echo __('Invoice #%1', $_invoice->getIncrementId()) ?></strong>
- </div>
-
- <div class="block order shipping address">
- <?php if (!$_order->getIsVirtual()): ?>
- <div class="title">
- <strong><?php echo __('Shipping Address') ?></strong>
- </div>
- <div class="content">
- <?php $_shipping = $_invoice->getShippingAddress() ?>
- <address><?php echo $_shipping->format('html') ?></address>
- </div>
- </div>
- <div class="block order billing address">
- <?php endif; ?>
- <div class="title">
- <strong><?php echo __('Billing Address') ?></strong>
- </div>
- <div class="content">
- <?php $_billing = $_invoice->getbillingAddress() ?>
- <address><?php echo $_order->getBillingAddress()->format('html') ?></address>
- </div>
- </div>
- <?php if (!$_order->getIsVirtual()): ?>
-
- <div class="block order shipping method">
- <div class="title">
- <strong><?php echo __('Shipping Method') ?></strong>
- </div>
- <div class="content">
- <?php echo $this->escapeHtml($_order->getShippingDescription()) ?>
- </div>
- </div>
- <?php endif; ?>
- <div class="block order payment method">
- <div class="title">
- <strong><?php echo __('Payment Method') ?></strong>
- </div>
- <div class="content">
- <?php echo $this->getPaymentInfoHtml() ?>
- </div>
- </div>
-</div>
-<div class="order details items">
- <div class="order subtitle caption">
- <strong><?php echo __('Items Invoiced') ?></strong>
- </div>
- <table class="data table order items" id="my-invoice-table-<?php echo $_invoice->getId(); ?>">
- <thead>
- <tr>
- <th class="col name"><?php echo __('Product Name') ?></th>
- <th class="col sku"><?php echo __('SKU') ?></th>
- <th class="col price"><?php echo __('Price') ?></th>
- <th class="col qty"><span class="nobr"><?php echo __('Qty Invoiced') ?></span></th>
- <th class="col subtotal"><?php echo __('Subtotal') ?></th>
- </tr>
- </thead>
- <tfoot>
- <?php echo $this->getInvoiceTotalsHtml($_invoice)?>
- </tfoot>
- <?php $_items = $_invoice->getItemsCollection(); ?>
- <?php $_count = $_items->count(); ?>
- <?php foreach ($_items as $_item): ?>
- <?php if ($_item->getOrderItem()->getParentItem()) continue; ?>
- <tbody>
- <?php echo $this->getItemHtml($_item) ?>
- </tbody>
- <?php endforeach; ?>
- </table>
-</div>
-<script type="text/javascript">(function ($) {
- $('#my-invoice-table-<?php echo $_invoice->getId(); ?>').decorate('table', {'tbody':['odd', 'even'], 'tbody tr':['first', 'last']})
-})(jQuery)</script>
-<?php endforeach; ?>
-<script type="text/javascript">window.print();</script>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/order/print/shipment.phtml b/app/design/frontend/magento_plushe/Magento_Sales/order/print/shipment.phtml
deleted file mode 100644
index dd0510a86cc..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Sales/order/print/shipment.phtml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @package base_default
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<?php /* @var $this \Magento\Sales\Block\Order\PrintOrder\Shipment */ ?>
-<?php $order = $this->getOrder(); ?>
-<div class="page title">
- <h1 class="title">
- <?php echo __('Order #%1', $this->getObjectData($order, 'real_order_id')); ?>
- </h1>
-</div>
-<p class="order-date"><?php echo __('Order Date: %1', $this->formatDate($this->getObjectData($order, 'created_at_store_date'), 'long')) ?></p>
-<?php if (!$this->getObjectData($order, 'is_virtual')): ?>
-<?php foreach ($this->getShipmentsCollection() as $shipment): ?>
- <div class="order details view">
- <div class="title">
- <strong><?php echo __('Shipment #%1', $this->getObjectData($shipment, 'increment_id')); ?></strong>
- </div>
-
- <div class="block order shipping address">
- <div class="title">
- <strong><?php echo __('Shipping Address') ?></strong>
- </div>
- <div class="content">
- <address><?php echo $this->getShipmentAddressFormattedHtml($shipment); ?></address>
- </div>
- </div>
-
- <div class="block order billing address">
- <div class="title">
- <strong><?php echo __('Billing Address') ?></strong>
- </div>
- <div class="content">
- <address><?php echo $this->getBillingAddressFormattedHtml($order); ?></address>
- </div>
- </div>
-
- <div class="block order shipping method">
- <div class="title">
- <strong><?php echo __('Shipping Method') ?></strong>
- </div>
- <?php echo $this->escapeHtml($this->getObjectData($order, 'shipping_description')); ?>
- <?php $tracks = $this->getShipmentTracks($shipment);
- if ($tracks): ?>
- <table class="data table order tracking" id="my-shipment-tracking">
- <thead>
- <tr>
- <th class="label"><?php echo __('Title')?></th>
- <th><?php echo __('Number')?></th>
- </tr>
- </thead>
- <tbody>
- <?php foreach ($tracks as $track): ?>
- <tr>
- <td class="label"><?php echo $this->escapeHtml($this->getObjectData($track, 'title')); ?></td>
- <td><?php echo $this->escapeHtml($this->getObjectData($track, 'number')); ?></td>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
- <script type="text/javascript">(function ($) {
- $('#my-shipment-tracking').decorate('table')
- })(jQuery)</script>
- <?php endif; ?>
- </div>
-
- <div class="block order payment method">
- <div class="title">
- <strong><?php echo __('Payment Method') ?></strong>
- </div>
- <div class="content">
- <?php echo $this->getPaymentInfoHtml() ?>
- </div>
- </div>
-
- </div>
- <div class="order details items">
- <div class="order subtitle caption">
- <strong><?php echo __('Items Shipped') ?></strong>
- </div>
- <table class="data table order items" id="my-shipment-table-<?php echo $this->getObjectData($shipment, 'id') ?>">
- <thead>
- <tr>
- <th class="col name"><?php echo __('Product Name') ?></th>
- <th class="col sku"><?php echo __('SKU') ?></th>
- <th class="col price"><span class="nobr"><?php echo __('Qty Shipped') ?></span></th>
- </tr>
- </thead>
- <?php foreach ($this->getShipmentItems($shipment) as $item): ?>
- <tbody>
- <?php echo $this->getItemHtml($item) ?>
- </tbody>
- <?php endforeach; ?>
- </table>
- </div>
- <script type="text/javascript">(function ($) {
- $('#my-shipment-table-<?php echo $this->getObjectData($shipment, 'id')?>').decorate('table', {'tbody':['odd', 'even'], 'tbody tr':['first', 'last']})
- })(jQuery)</script>
- <?php endforeach; ?>
-<?php endif; ?>
-<script type="text/javascript">window.print();</script>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/order/recent.phtml b/app/design/frontend/magento_plushe/Magento_Sales/order/recent.phtml
deleted file mode 100644
index 35af465a6a1..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Sales/order/recent.phtml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<div class="block dashboard orders">
-<?php $_orders = $this->getOrders(); ?>
- <div class="order title">
- <strong><?php echo __('Recent Orders') ?></strong>
- <?php if( sizeof($_orders->getItems()) > 0 ): ?>
- <a class="action view" href="<?php echo $this->getUrl('sales/order/history') ?>">
- <span><?php echo __('View All') ?></span>
- </a>
- <?php endif; ?>
- </div>
- <div class="content">
- <?php echo $this->getChildHtml()?>
- <?php if( sizeof($_orders->getItems()) > 0 ): ?>
- <table class="data table orders recent" id="my-orders-table">
- <thead>
- <tr>
- <th class="col id"><?php echo __('Order #') ?></th>
- <th class="col date"><?php echo __('Date') ?></th>
- <th class="col shipping"><?php echo __('Ship To') ?></th>
- <th class="col total"><?php echo __('Order Total') ?></th>
- <th class="col status"><?php echo __('Status') ?></th>
- <th class="col actions"> </th>
- </tr>
- </thead>
- <tbody>
- <?php foreach ($_orders as $_order): ?>
- <tr>
- <td class="col id"><?php echo $_order->getRealOrderId() ?></td>
- <td class="col date"><?php echo $this->formatDate($_order->getCreatedAtStoreDate()) ?></td>
- <td class="col shipping"><?php echo $_order->getShippingAddress() ? $this->escapeHtml($_order->getShippingAddress()->getName()) : ' ' ?></td>
- <td class="col total"><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
- <td class="col status"><em><?php echo $_order->getStatusLabel() ?></em></td>
- <td class="col actions">
- <a href="<?php echo $this->getViewUrl($_order) ?>" class="action view">
- <span><?php echo __('View Order') ?></span>
- </a>
- <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order)) : ?>
- <a href="<?php echo $this->getReorderUrl($_order) ?>" class="action order">
- <span><?php echo __('Reorder') ?></span>
- </a>
- <?php endif ?>
- </td>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
- <?php else: ?>
- <p class="empty"><?php echo __('You have placed no orders.'); ?></p>
- <?php endif; ?>
- </div>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/order/shipment/items.phtml b/app/design/frontend/magento_plushe/Magento_Sales/order/shipment/items.phtml
deleted file mode 100644
index 23843a765be..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Sales/order/shipment/items.phtml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<?php $_order = $this->getOrder() ?>
-<div class="order toolbar">
- <div class="actions">
- <?php if ($_order->getTracksCollection()->count()) : ?>
- <a href="#"
- data-mage-init="{popupWindow: {windowURL:'<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_order) ?>',windowName:'trackorder',width:800,height:600,top:0,left:0,resizable:1,scrollbars:1}}" title="<?php echo __('Track all shipment(s)') ?>"
- class="action track">
- <span><?php echo __('Track all shipments') ?></span>
- </a>
- <?php endif; ?>
- <a href="<?php echo $this->getPrintAllShipmentsUrl($_order) ?>"
- onclick="this.target='_blank'"
- class="action print">
- <span><?php echo __('Print All Shipments') ?></span>
- </a>
- </div>
-</div>
-<?php foreach ($_order->getShipmentsCollection() as $_shipment): ?>
-<div class="order title">
- <strong><?php echo __('Shipment #') ?><?php echo $_shipment->getIncrementId(); ?></strong>
- <a href="<?php echo $this->getPrintShipmentUrl($_shipment) ?>"
- onclick="this.target='_blank'"
- class="action print">
- <span><?php echo __('Print Shipment') ?></span
- </a>
- <a href="#"
- data-mage-init="{popupWindow: {windowURL:'<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_shipment) ?>',windowName:'trackshipment',width:800,height:600,top:0,left:0,resizable:1,scrollbars:1}}"
- title="<?php echo __('Track this shipment') ?>"
- class="action track">
- <span><?php echo __('Track this shipment') ?></span>
- </a>
-</div>
-<?php $tracks = $_shipment->getTracksCollection(); ?>
-<?php if ($tracks->count()): ?>
- <table class="data table order tracking" id="my-tracking-table-<?php echo $_shipment->getId(); ?>">
- <tbody>
- <tr>
- <th class="label"><?php echo __('Tracking Number(s):') ?></th>
- <td>
- <?php
- $i = 1;
- $_size = $tracks->count();
- foreach($tracks as $track): ?>
- <?php if($track->isCustom()): ?>
- <?php echo $this->escapeHtml($track->getNumber()) ?>
- <?php else: ?>
- <a href="#"
- data-mage-init="{popupWindow: {windowURL:'<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($track) ?>',windowName:'trackorder',width:800,height:600,left:0,top:0,resizable:1,scrollbars:1}}"
- class="action track">
- <span><?php echo $this->escapeHtml($track->getNumber()) ?></span>
- </a>
- <?php endif; ?>
- <?php if($i!=$_size): ?>, <?php endif; ?>
- <?php $i++;
- endforeach; ?>
- </td>
- </tr>
- </tbody>
- </table>
-<?php endif; ?>
-<div class="order subtitle caption"><strong><?php echo __('Items Shipped') ?></strong></div>
-<table class="data table order items shipment" id="my-shipment-table-<?php echo $_shipment->getId(); ?>">
- <thead>
- <tr>
- <th class="col name"><?php echo __('Product Name') ?></th>
- <th class="col sku"><?php echo __('SKU') ?></th>
- <th class="col qty"><?php echo __('Qty Shipped') ?></th>
- </tr>
- </thead>
- <?php $_items = $_shipment->getAllItems(); ?>
- <?php $_count = count($_items) ?>
- <?php foreach ($_items as $_item): ?>
- <?php if ($_item->getOrderItem()->getParentItem()) continue; ?>
- <tbody>
- <?php echo $this->getItemHtml($_item) ?>
- </tbody>
- <?php endforeach; ?>
-</table>
-<?php echo $this->getCommentsHtml($_shipment)?>
-<?php endforeach; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/order/view.phtml b/app/design/frontend/magento_plushe/Magento_Sales/order/view.phtml
deleted file mode 100644
index 5c6065afbe0..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Sales/order/view.phtml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<div class="order details items">
- <?php $_order = $this->getOrder() ?>
-
- <div class="order subtitle caption">
- <strong><?php echo __('Items Ordered') ?></strong>
- <?php if ($_order->getTracksCollection()->count()) : ?>
- <a href="#"
- data-mage-init="{popupWindow: {windowURL:'<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_order) ?>',windowName:'trackorder',top:0,left:0,width:800,height:600,resizable:1,scrollbars:1}}"
- title="<?php echo __('Track your order') ?>"
- class="action track">
- <span><?php echo __('Track your order') ?></span>
- </a>
- <?php endif; ?>
- </div>
-
- <?php echo $this->getChildHtml('order_items') ?>
-
- <?php if($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order', $_order) && $_order->getGiftMessageId()): ?>
- <div class="order additional details gift">
- <div class="order subtitle caption"><strong><?php echo __('Gift Message for This Order') ?></strong></div>
- <?php $_giftMessage=$this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessageForEntity($_order); ?>
- <dl class="gift message">
- <dt class="gift sender"><strong class="label"><?php echo __('From:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getSender()) ?></dt>
- <dt class="gift recipient"><strong class="label"><?php echo __('To:') ?></strong> <?php echo $this->escapeHtml($_giftMessage->getRecipient()) ?></dt>
- <dd class="message text"><?php echo $this->helper('Magento\GiftMessage\Helper\Message')->getEscapedGiftMessage($_order) ?></dd>
- </dl>
- </div>
- <?php endif; ?>
- <?php $_history = $this->getOrder()->getVisibleStatusHistory() ?>
- <?php if (count($_history)): ?>
- <div class="order additional details comments">
- <div class="order subtitle caption"><strong><?php echo __('About Your Order') ?></strong></div>
- <dl class="order comments">
- <?php foreach ($_history as $_historyItem): ?>
- <dt class="comment date"><?php echo $this->formatDate($_historyItem->getCreatedAtStoreDate(), 'medium', true) ?></dt>
- <dd class="comment text"><?php echo $this->escapeHtml($_historyItem->getComment()) ?></dd>
- <?php endforeach; ?>
- </dl>
- </div>
- <?php endif; ?>
- <div class="actions">
- <div class="secondary">
- <a class="action back" href="<?php echo $this->getBackUrl() ?>">
- <span><?php echo $this->getBackTitle() ?></span>
- </a>
- </div>
- </div>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Sales/success.phtml b/app/design/frontend/magento_plushe/Magento_Sales/success.phtml
deleted file mode 100644
index 737dfe3fca9..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Sales/success.phtml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category design
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
-?>
-<div class="page-title">
- <h1><?php echo __('Your order has been received.') ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<h2 class="sub-title"><?php echo __('Thank you for your purchase!') ?></h2>
-
-<?php if ($this->getOrderId()):?>
-<?php if ($this->getCanViewOrder()) :?>
- <p><?php echo __('Your order # is: %1.', sprintf('<a href="%s">%s</a>', $this->escapeHtml($this->getViewOrderUrl()), $this->escapeHtml($this->getOrderId()))) ?></p>
-<?php else :?>
- <p><?php echo __('Your order # is: %1.', $this->escapeHtml($this->getOrderId())) ?></p>
-<?php endif;?>
- <p><?php echo __('You will receive an order confirmation email with details of your order and a link to track its progress.') ?></p>
-<?php if ($this->getCanViewOrder() && $this->getCanPrintOrder()) :?>
- <p>
- <?php echo __('Click <a href="%1" onclick="this.target=\'_blank\'">here to print</a> a copy of your order confirmation.', $this->getPrintUrl()) ?>
- <?php echo $this->getChildHtml() ?>
- </p>
-<?php endif;?>
-<?php endif;?>
-
-<?php if ($this->getAgreementRefId()): ?>
- <p><?php echo __('Your billing agreement # is: %1.', sprintf('<a href="%s">%s</a>', $this->escapeHtml($this->getAgreementUrl()), $this->escapeHtml($this->getAgreementRefId())))?></p>
-<?php endif;?>
-
-<?php if ($profiles = $this->getRecurringProfiles()):?>
-<p><?php echo __('Your recurring payment profiles:'); ?></p>
-<ul class="disc">
-<?php foreach($profiles as $profile):?>
-<?php $profileIdHtml = ($this->getCanViewProfiles() ? sprintf('<a href="%s">%s</a>', $this->escapeHtml($this->getProfileUrl($profile)), $this->escapeHtml($this->getObjectData($profile, 'reference_id'))) : $this->escapeHtml($this->getObjectData($profile, 'reference_id')));?>
- <li><?php echo __('Payment profile # %1: "%2".', $profileIdHtml, $this->escapeHtml($this->getObjectData($profile, 'schedule_description')))?></li>
-<?php endforeach;?>
-</ul>
-<?php endif;?>
-
-<div class="actions">
- <button type="button" class="a" title="<?php echo __('Continue Shopping') ?>" onclick="window.location='<?php echo $this->getUrl() ?>'"><span><span><?php echo __('Continue Shopping') ?></span></span></button>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Sendfriend/layout/override/sendfriend_product_send.xml b/app/design/frontend/magento_plushe/Magento_Sendfriend/layout/override/base/sendfriend_product_send.xml
similarity index 94%
rename from app/design/frontend/magento_plushe/Magento_Sendfriend/layout/override/sendfriend_product_send.xml
rename to app/design/frontend/magento_plushe/Magento_Sendfriend/layout/override/base/sendfriend_product_send.xml
index 9e24f817f9d..cac967d5d01 100644
--- a/app/design/frontend/magento_plushe/Magento_Sendfriend/layout/override/sendfriend_product_send.xml
+++ b/app/design/frontend/magento_plushe/Magento_Sendfriend/layout/override/base/sendfriend_product_send.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product Email to a Friend" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Product Email to a Friend" type="page">
<update handle="page_one_column"/>
<referenceBlock name="page.main.title">
<action method="setPageTitle">
diff --git a/app/design/frontend/magento_plushe/Magento_Widget/layout/override/default.xml b/app/design/frontend/magento_plushe/Magento_Widget/layout/override/default.xml
deleted file mode 100644
index 6c60196129d..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Widget/layout/override/default.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
diff --git a/app/design/frontend/magento_plushe/Magento_Widget/layout/override/print.xml b/app/design/frontend/magento_plushe/Magento_Widget/layout/override/print.xml
deleted file mode 100644
index 6c60196129d..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Widget/layout/override/print.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
diff --git a/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/wishlist_index_configure.xml b/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/base/wishlist_index_configure.xml
similarity index 95%
rename from app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/wishlist_index_configure.xml
rename to app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/base/wishlist_index_configure.xml
index 8321608c8c1..6324d2fa14b 100644
--- a/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/wishlist_index_configure.xml
+++ b/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/base/wishlist_index_configure.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Wishlist Item" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Wishlist Item" type="page">
<update handle="catalog_product_view"/>
<referenceContainer name="product.info.main">
<block class="Magento\Wishlist\Block\Item\Configure" name="product.info.addto" as="addto" template="Magento_Wishlist::item/configure/addto.phtml"/>
diff --git a/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/wishlist_index_configure_type_bundle.xml b/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_bundle.xml
similarity index 83%
rename from app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/wishlist_index_configure_type_bundle.xml
rename to app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_bundle.xml
index 33c45528fb4..f2e28217a51 100644
--- a/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/wishlist_index_configure_type_bundle.xml
+++ b/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_bundle.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Wishlist Item (Bundle)" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Wishlist Item (Bundle)" type="page">
<referenceBlock name="head">
<block class="Magento\Page\Block\Html\Head\Script" name="magento-bundle-bundle-js">
<arguments>
@@ -55,22 +55,10 @@
<referenceBlock name="product.info.options.wrapper">
<block class="Magento\Catalog\Block\Product\View" name="bundle.product.view.options.notice" template="Magento_Bundle::catalog/product/view/options/notice.phtml"/>
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle.options" as="type_bundle_options" template="catalog/product/view/type/bundle/options.phtml" before="-">
- <action method="addRenderer">
- <argument name="type" xsi:type="string">select</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select</argument>
- </action>
- <action method="addRenderer">
- <argument name="type" xsi:type="string">multi</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi</argument>
- </action>
- <action method="addRenderer">
- <argument name="type" xsi:type="string">radio</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio</argument>
- </action>
- <action method="addRenderer">
- <argument name="type" xsi:type="string">checkbox</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox</argument>
- </action>
+ <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select" name="product.info.bundle.options.select" as="select"/>
+ <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi" name="product.info.bundle.options.multi" as="multi"/>
+ <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio" name="product.info.bundle.options.radio" as="radio"/>
+ <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox" name="product.info.bundle.options.checkbox" as="checkbox"/>
</block>
</referenceBlock>
<referenceBlock name="product.info.options.wrapper.bottom">
diff --git a/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/wishlist_index_configure_type_configurable.xml b/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_configurable.xml
similarity index 95%
rename from app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/wishlist_index_configure_type_configurable.xml
rename to app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_configurable.xml
index 9ed018ba6bc..afd8ebcc819 100644
--- a/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/wishlist_index_configure_type_configurable.xml
+++ b/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_configurable.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Wishlist Item (Configurable)" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Wishlist Item (Configurable)" type="page">
<referenceBlock name="root">
<action method="addBodyClass">
<argument name="value" xsi:type="string">type-configurable</argument>
diff --git a/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/wishlist_index_configure_type_grouped.xml b/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_grouped.xml
similarity index 94%
rename from app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/wishlist_index_configure_type_grouped.xml
rename to app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_grouped.xml
index 6bceb727e4c..1659d4b3e0f 100644
--- a/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/wishlist_index_configure_type_grouped.xml
+++ b/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_grouped.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Wishlist Item (Grouped)" type="page" parent="catalog_product_view">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Configure Wishlist Item (Grouped)" type="page">
<referenceContainer name="product.info.form.content">
<block class="Magento\Catalog\Block\Product\View\Type\Grouped" name="product.info.grouped" before="product.info.addtocart" template="product/view/type/grouped.phtml"/>
<container name="product.info.grouped.extra" after="product.info.grouped" before="product.info.grouped" as="product_type_data_extra" label="Product Extra Info"/>
diff --git a/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/wishlist_index_configure_type_simple.xml b/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_simple.xml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/wishlist_index_configure_type_simple.xml
rename to app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_simple.xml
diff --git a/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/wishlist_index_index.xml b/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/base/wishlist_index_index.xml
similarity index 97%
rename from app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/wishlist_index_index.xml
rename to app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/base/wishlist_index_index.xml
index 26a3cfbd6a2..04d7e457913 100644
--- a/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/wishlist_index_index.xml
+++ b/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/base/wishlist_index_index.xml
@@ -23,7 +23,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account My Wish List" type="page" parent="customer_account_index">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Customer My Account My Wish List" type="page">
<update handle="customer_account"/>
<referenceBlock name="my.account.wrapper">
<block class="Magento\Wishlist\Block\Customer\Wishlist" name="customer.wishlist" template="view.phtml">
diff --git a/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/wishlist_shared_index.xml b/app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/base/wishlist_shared_index.xml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/wishlist_shared_index.xml
rename to app/design/frontend/magento_plushe/Magento_Wishlist/layout/override/base/wishlist_shared_index.xml
diff --git a/app/design/frontend/magento_plushe/css/print.css b/app/design/frontend/magento_plushe/css/print.css
index c522d1b9e47..943e35622f0 100644
--- a/app/design/frontend/magento_plushe/css/print.css
+++ b/app/design/frontend/magento_plushe/css/print.css
@@ -17,7 +17,6 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category design
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
diff --git a/app/design/frontend/magento_plushe/css/styles.css b/app/design/frontend/magento_plushe/css/styles.css
index 85ba910cf2f..593148c2520 100644
--- a/app/design/frontend/magento_plushe/css/styles.css
+++ b/app/design/frontend/magento_plushe/css/styles.css
@@ -482,6 +482,7 @@ input[type="button"],
.form.contact .action,
.data.table.wishlist + .actions .primary .action.share,
.data.table.wishlist + .actions .primary .action.update,
+.recurring.order.details > .actions .primary .action,
.action.myPrimary,
input[type="submit"],
input[type="button"],
@@ -542,7 +543,8 @@ input[type="button"],
.form.orders.search .action,
.form.contact .action,
.data.table.wishlist + .actions .primary .action.share,
-.data.table.wishlist + .actions .primary .action.update {
+.data.table.wishlist + .actions .primary .action.update,
+.recurring.order.details > .actions .primary .action {
background-color: #da370a;
color: #ffffff;
}
@@ -731,7 +733,10 @@ input[type="button"]:hover,
.data.table.wishlist + .actions .primary .action.share:hover,
.data.table.wishlist + .actions .primary .action.update:focus,
.data.table.wishlist + .actions .primary .action.update:active,
-.data.table.wishlist + .actions .primary .action.update:hover {
+.data.table.wishlist + .actions .primary .action.update:hover,
+.recurring.order.details > .actions .primary .action:focus,
+.recurring.order.details > .actions .primary .action:active,
+.recurring.order.details > .actions .primary .action:hover {
background-color: #a92b08;
}
.secondary.action,
@@ -740,8 +745,8 @@ input[type="reset"],
.action.mySecondaryButton,
.popup .actions .action.cancel,
.multicheckout .action.update,
-.cart.main.actions .action.update,
-.cart.main.actions .action.clear,
+.cart.actions .action.update,
+.cart.actions .action.clear,
.block.compare .action.compare,
.data.comparison .cell.remove .action.delete,
.form.send.friend .actions > .primary .action.add,
@@ -752,8 +757,8 @@ input[type="reset"],
.action.mySecondaryButton,
.popup .actions .action.cancel,
.multicheckout .action.update,
-.cart.main.actions .action.update,
-.cart.main.actions .action.clear,
+.cart.actions .action.update,
+.cart.actions .action.clear,
.block.compare .action.compare,
.data.comparison .cell.remove .action.delete,
.form.send.friend .actions > .primary .action.add,
@@ -780,12 +785,12 @@ input[type="reset"]:hover,
.multicheckout .action.update:focus,
.multicheckout .action.update:active,
.multicheckout .action.update:hover,
-.cart.main.actions .action.update:focus,
-.cart.main.actions .action.update:active,
-.cart.main.actions .action.update:hover,
-.cart.main.actions .action.clear:focus,
-.cart.main.actions .action.clear:active,
-.cart.main.actions .action.clear:hover,
+.cart.actions .action.update:focus,
+.cart.actions .action.update:active,
+.cart.actions .action.update:hover,
+.cart.actions .action.clear:focus,
+.cart.actions .action.clear:active,
+.cart.actions .action.clear:hover,
.block.compare .action.compare:focus,
.block.compare .action.compare:active,
.block.compare .action.compare:hover,
@@ -853,8 +858,8 @@ input[type="reset"],
.multicheckout .action.continue,
.multicheckout .action.submit,
.multicheckout .action.add,
-.cart.main.actions .action.update,
-.cart.main.actions .action.clear,
+.cart.actions .action.update,
+.cart.actions .action.clear,
.cart.summary .block .action,
.action.checkout,
.form.newsletter.manage .action.save,
@@ -905,7 +910,8 @@ input[type="reset"],
.paypal.review.view .actions .action.update,
.data.table.wishlist + .actions .primary .action.share,
.data.table.wishlist + .actions .primary .action.update,
-.shipping-tracking-popup .action.close {
+.shipping-tracking-popup .action.close,
+.recurring.order.details > .actions .primary .action {
border: none;
border-radius: 0;
font: 600 14px/16px;
@@ -3923,7 +3929,7 @@ strong {
Forms
-------------------------------------- */
.field.required > .label > span:first-child:after {
- content: ' *';
+ content: '*';
color: #da370a;
}
/*
@@ -4298,6 +4304,12 @@ body {
.sidebar .block > .title strong {
font-size: 18px;
}
+/*
+ Sidebar Paypal logo
+-------------------------------------- */
+.sidebar .paypal.acceptance {
+ margin-bottom: 45px;
+}
/*
Breadcrumbs
-------------------------------------- */
@@ -4370,15 +4382,15 @@ body {
}
.footer .bugs {
margin-top: 25px;
- font-size: 11px;
+ font-size: 12px;
+}
+.footer .bugs span:after {
+ content: '\00a0\2014\00a0';
+ display: inline-block;
}
.footer .bugs a {
font-weight: bold;
}
-.footer .bugs a:before {
- content: ' - ';
- display: inline-block;
-}
/*
Switchers
-------------------------------------- */
@@ -4924,12 +4936,12 @@ body {
float: left;
width: 200px;
}
-.block.progress.onepage dt {
+.block.progress.onepage .content > dt {
font-size: 16px;
font-weight: 400;
margin: 0 0 10px 0;
}
-.block.progress.onepage dt a {
+.block.progress.onepage .content > dt a {
font-size: 14px;
}
.block.progress.onepage dd.complete {
@@ -4939,6 +4951,38 @@ body {
.block.progress.onepage address {
font-style: normal;
}
+.block.progress.onepage .payment.method,
+.order.details .block.order .payment.method {
+ margin: 0;
+}
+.block.progress.onepage .payment.method .content,
+.order.details .block.order .payment.method .content {
+ margin: 5px 0;
+ padding: 0;
+}
+.block.progress.onepage .payment.method.purchase.order .content strong:after,
+.order.details .block.order .payment.method.purchase.order .content strong:after,
+.block.progress.onepage .payment.method.checkmemo .content strong:after,
+.order.details .block.order .payment.method.checkmemo .content strong:after {
+ content: ": ";
+}
+.block.progress.onepage .payment.method.purchase.order .content .number,
+.order.details .block.order .payment.method.purchase.order .content .number,
+.block.progress.onepage .payment.method.checkmemo .content .number,
+.order.details .block.order .payment.method.checkmemo .content .number {
+ white-space: nowrap;
+}
+.block.progress.onepage .payment.method .data.table th,
+.order.details .block.order .payment.method .data.table th {
+ font-size: 14px;
+ padding: 5px 0;
+ text-align: left;
+ width: 50%;
+}
+.block.progress.onepage .payment.method .data.table td,
+.order.details .block.order .payment.method .data.table td {
+ padding: 5px;
+}
.opc.wrapper {
float: right;
width: 725px;
@@ -4995,6 +5039,7 @@ body {
padding: 0;
margin: 20px 0;
border: 0;
+ position: relative;
}
.opc.wrapper .form:not(.login) .fieldset .field {
display: inline-block;
@@ -5073,6 +5118,91 @@ body {
word-spacing: normal;
color: #da370a;
}
+.opc.wrapper .form:not(.login) .field.date .nested {
+ display: inline-block;
+ margin-right: 5px;
+}
+.opc.wrapper .form:not(.login) .field.date select {
+ width: auto;
+}
+.opc.wrapper .tooltip {
+ background: #ffffff;
+ border: 1px solid #c2c2c2;
+ display: block;
+ cursor: default;
+ padding: 30px;
+ position: absolute;
+ left: 20px;
+ top: 10px;
+}
+.opc.wrapper .tooltip.hidden {
+ display: none;
+}
+.opc.wrapper .tooltip .action.close {
+ position: absolute;
+ right: 5px;
+ top: 5px;
+}
+.opc.wrapper .tooltip .action.close span {
+ width: 11px;
+ display: block;
+ line-height: 0;
+ white-space: nowrap;
+ vertical-align: middle;
+ text-align: center;
+ text-indent: -999em;
+}
+.opc.wrapper .tooltip .action.close span:after {
+ font-family: "icons";
+ font-size: 11px;
+ line-height: 11px;
+ height: 11px;
+ margin: 0;
+ overflow: hidden;
+ content: "\e012";
+ font-style: normal;
+ speak: none;
+ font-weight: normal;
+ -webkit-font-smoothing: antialiased;
+ display: inline-block;
+ vertical-align: middle;
+ text-align: center;
+}
+.opc.wrapper .tooltip .action.close span:active {
+ outline: 0;
+}
+.opc.wrapper .tooltip .action.close span:after {
+ text-indent: 0;
+ display: block;
+ margin: 0;
+}
+.opc.wrapper .check.payable {
+ margin: 0 0 0 20px;
+}
+.opc.wrapper .check.payable .title {
+ display: inline-block;
+ padding: 5px 0;
+ width: 30%;
+}
+.opc.wrapper .check.payable .content {
+ display: inline-block;
+ margin: 0;
+ padding: 5px 0;
+ width: 68%;
+}
+.opc.wrapper .sp-methods .items,
+.opc.wrapper .sp-methods .fieldset.items {
+ margin: 0 0 0 6px;
+}
+.opc.wrapper .sp-methods .paypal.field.items {
+ padding: 0;
+ width: 100%;
+}
+.opc.wrapper .sp-methods .paypal.icon {
+ display: inline-block;
+ margin-right: 5px;
+ vertical-align: middle;
+}
.opc.loading .active {
position: relative;
z-index: 1;
@@ -5420,6 +5550,15 @@ body {
font-size: 24px;
font-weight: 700;
}
+.multicheckout.overview .box.method .payment.method {
+ margin: 0;
+}
+.multicheckout.overview .box.method .title {
+ margin: 0 0 5px;
+}
+.multicheckout.overview .box.method .content {
+ margin: 0 0 0 10px;
+}
.multicheckout.change.billing .box {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
@@ -5484,13 +5623,6 @@ body {
.multicheckout .product.name {
margin-bottom: 0;
}
-.multicheckout .items.data td.col.address {
- padding-top: 10px;
-}
-.multicheckout .items.data td.col.delete,
-.multicheckout .items.data td.col.product {
- padding-top: 18px;
-}
.multicheckout .items.data .col.item {
padding-left: 0;
text-align: left;
@@ -5552,7 +5684,10 @@ body {
margin: 0 0 15px;
padding: 10px;
}
-.multicheckout.form.address .col.address select {
+.multicheckout.form.address .control.address {
+ margin-top: -6px;
+}
+.multicheckout.form.address .control.address select {
max-width: 450px;
}
.checkout-multishipping-address-newshipping .form.address.edit,
@@ -5764,10 +5899,10 @@ body {
.cart.container:after {
clear: both;
}
-.cart.main.actions {
+.cart.actions {
padding: 20px 0;
}
-.cart.main.actions .action.continue {
+.cart.actions .action.continue {
position: absolute;
text-decoration: underline;
right: 0;
@@ -5779,16 +5914,18 @@ body {
.items.data thead tr:last-child th {
padding-bottom: 10px;
}
+.items.data th > span {
+ white-space: nowrap;
+}
.items.data th.col.item > span {
display: none;
}
.items.data td.col.qty {
width: 40px;
- padding-top: 20px;
text-align: center;
}
-.review .items.data td.col.qty {
- padding-top: 16px;
+.items.data td.col.qty .control {
+ margin-top: -6px;
}
.items.data th.col.qty {
text-transform: uppercase;
@@ -5801,12 +5938,18 @@ body {
.items.data td.col.subtotal {
text-align: right;
}
+.items.data .img.photo.container,
.items.data .product.photo {
padding-right: 20px;
display: table-cell;
width: 1%;
vertical-align: top;
}
+.items.data .product.photo .img.photo.container {
+ display: block;
+ padding: 0;
+ width: auto;
+}
.items.data .product.details {
display: table-cell;
width: 99%;
@@ -6808,6 +6951,9 @@ body {
vertical-align: middle;
margin: 0 5px;
}
+.box.tocart .checkout.paypal {
+ margin-top: 10px;
+}
.box.tocart .checkout.paypal.after:after {
display: none;
}
@@ -6845,10 +6991,11 @@ body {
}
.block.reorder .actions {
margin: 15px 0 0;
+ text-align: left;
}
.block.reorder .actions .primary,
.block.reorder .actions .secondary {
- margin-right: 5px;
+ margin: 0 10px 10px 0;
display: inline-block;
vertical-align: middle;
}
@@ -8322,6 +8469,10 @@ body {
.product.main.info .product.options.wrapper .fieldset .datetime-picker + .ui-datepicker-trigger {
margin: 0 15px 0 7px;
}
+.product.main.info .product.options.wrapper .fieldset .payment.product.options .content,
+.product.main.info .product.options.wrapper .fieldset .payment.product.schedule .content {
+ margin: 5px 0 0;
+}
.action.primary.customize,
.action.primary.tocart {
line-height: 16px;
@@ -8921,6 +9072,10 @@ img[align="right"] {
z-index: 1;
cursor: pointer;
}
+.customer.welcome .menu {
+ padding: 0;
+ margin: 0;
+}
.customer.welcome .menu > ul {
font-weight: 600;
font-size: 12px;
@@ -10159,6 +10314,9 @@ img[align="right"] {
.paypal.review.view .actions .action.update {
margin-left: 10px;
}
+.paypal.review.view .paypal.review.items {
+ clear: left;
+}
.paypal.review.view .data.table.paypal.review.items {
width: 100%;
}
@@ -10182,6 +10340,67 @@ img[align="right"] {
border-top: 3px solid #e5e5e5;
padding-top: 15px;
}
+.paypal.review.view .block.shipping.information,
+.paypal.review.view .block.billing.information {
+ margin-bottom: 45px;
+}
+.paypal.review.view .block.shipping.information > .content,
+.paypal.review.view .block.billing.information > .content {
+ *zoom: 1;
+}
+.paypal.review.view .block.shipping.information > .content:before,
+.paypal.review.view .block.billing.information > .content:before,
+.paypal.review.view .block.shipping.information > .content:after,
+.paypal.review.view .block.billing.information > .content:after {
+ content: "";
+ display: table;
+}
+.paypal.review.view .block.shipping.information > .content:after,
+.paypal.review.view .block.billing.information > .content:after {
+ clear: both;
+}
+.paypal.review.view .block.shipping.information .box,
+.paypal.review.view .block.billing.information .box {
+ float: left;
+ padding-right: 2%;
+ width: 48%;
+}
+.paypal.review.view .block.shipping.information .box > .content,
+.paypal.review.view .block.billing.information .box > .content {
+ background: #f8f8f8;
+ padding: 30px;
+}
+.paypal.review.view .block.shipping.information .box > .content .select,
+.paypal.review.view .block.billing.information .box > .content .select {
+ width: 100%;
+}
+.paypal.review.view .block.shipping.information .box > .content .actions,
+.paypal.review.view .block.billing.information .box > .content .actions {
+ margin: 25px 0 0;
+}
+.paypal.review.view .block.shipping.information address,
+.paypal.review.view .block.billing.information address {
+ font-style: normal;
+}
+.paypal.review.view .block.shipping.information .subtitle,
+.paypal.review.view .block.billing.information .subtitle {
+ display: block;
+ font-size: 18px;
+ font-weight: 200;
+ margin-bottom: 20px;
+}
+.paypal.review.view .block.shipping.information .subtitle .action,
+.paypal.review.view .block.billing.information .subtitle .action {
+ display: inline-block;
+ font-size: 14px;
+ font-weight: 400;
+ margin-left: 20px;
+ text-decoration: underline;
+ text-transform: lowercase;
+}
+.paypal.iframe {
+ display: none;
+}
/*
MISC
-------------------------------------- */
@@ -10610,6 +10829,12 @@ img[align="right"] {
background: #f8f8f8;
padding: 30px;
}
+.order.details .block.order p {
+ margin-top: 0;
+}
+.order.details .block.order p:last-child {
+ margin-bottom: 0;
+}
.order.details .order.info {
clear: both;
}
@@ -10619,12 +10844,13 @@ img[align="right"] {
font-size: 20px;
}
.order.details .order.info > dd {
- margin: 10px 0 0 0;
- background: #f8f8f8;
- padding: 30px;
+ margin: 0;
}
.order.details .order.info > dd .items {
*zoom: 1;
+ background: #f8f8f8;
+ margin: 10px 0 0 0;
+ padding: 30px;
}
.order.details .order.info > dd .items:before,
.order.details .order.info > dd .items:after {
@@ -10680,7 +10906,7 @@ img[align="right"] {
height: 12px;
margin: 0;
overflow: hidden;
- content: "\e029";
+ content: "\e02c";
font-style: normal;
speak: none;
font-weight: normal;
@@ -10690,7 +10916,37 @@ img[align="right"] {
text-align: center;
}
.order.details.items .action.show.expanded:after {
- content: "\e02c";
+ content: "\e029";
+}
+.order.details.items .gift.message.details {
+ position: relative;
+}
+.order.details.items .gift.message {
+ margin: 0;
+}
+.order.details.items .action.close {
+ position: absolute;
+ right: 0;
+ top: 0;
+}
+.order.details.items .action.close span:after {
+ font-family: "icons";
+ font-size: 12px;
+ line-height: 12px;
+ height: 12px;
+ margin: 0;
+ overflow: hidden;
+ content: "\e012";
+ font-style: normal;
+ speak: none;
+ font-weight: normal;
+ -webkit-font-smoothing: antialiased;
+ display: inline-block;
+ vertical-align: middle;
+ text-align: center;
+}
+.order.details.items + .order.details.view {
+ margin-top: 45px;
}
.shipping-tracking-popup .action.close {
text-indent: 0;
@@ -10778,6 +11034,15 @@ img[align="right"] {
.data.table.order.tracking .label {
width: 40%;
}
+.data.table.order .qty.summary {
+ padding: 0;
+ margin: 0;
+ list-style-type: none;
+ list-style-image: none;
+}
+.data.table.order .qty.summary .label:after {
+ content: ": ";
+}
/*
My Account -> Billing agreements
-------------------------------------- */
@@ -10806,6 +11071,52 @@ img[align="right"] {
padding-top: 7px;
padding-bottom: 6px;
}
+/*
+ My Account -> Recurring profiles
+-------------------------------------- */
+.recurring.order.details .block.view.info {
+ *zoom: 1;
+}
+.recurring.order.details .block.view.info:before,
+.recurring.order.details .block.view.info:after {
+ content: "";
+ display: table;
+}
+.recurring.order.details .block.view.info:after {
+ clear: both;
+}
+.recurring.order.details .block.view.info .box {
+ float: left;
+ padding-right: 2%;
+ width: 48%;
+}
+.recurring.order.details .block.view.info .box .subtitle {
+ font-size: 20px;
+ font-weight: 200;
+ line-height: 1.2;
+ display: inline-block;
+ margin-bottom: 15px;
+}
+.recurring.order.details .block.view.info .box .content {
+ background: #f8f8f8;
+ padding: 30px;
+ *zoom: 1;
+}
+.recurring.order.details .block.view.info .box .content:before,
+.recurring.order.details .block.view.info .box .content:after {
+ content: "";
+ display: table;
+}
+.recurring.order.details .block.view.info .box .content:after {
+ clear: both;
+}
+.recurring.order.details .block.view.info .box .data.table th,
+.recurring.order.details .block.view.info .box .data.table td {
+ padding: 4px 7px;
+}
+.recurring.order.details > .actions .primary {
+ text-align: right;
+}
/*
Overlay popup
-------------------------------------- */
diff --git a/app/design/frontend/magento_plushe/less/styles.less b/app/design/frontend/magento_plushe/less/styles.less
index e9cdfbb7f61..81383e8041f 100644
--- a/app/design/frontend/magento_plushe/less/styles.less
+++ b/app/design/frontend/magento_plushe/less/styles.less
@@ -49,7 +49,7 @@ strong {
Forms
-------------------------------------- */
.field.required > .label > span:first-child:after {
- content: ' *';
+ content: '*';
color: @requiredField;
}
@@ -366,6 +366,13 @@ body {
font-size: 18px;
}
+/*
+ Sidebar Paypal logo
+-------------------------------------- */
+.sidebar .paypal.acceptance {
+ margin-bottom: 45px;
+}
+
/*
Breadcrumbs
-------------------------------------- */
@@ -420,14 +427,15 @@ body {
}
.bugs {
margin-top: 25px;
- font-size: 11px;
- a {
- font-weight: bold;
- &:before {
- content: ' - ';
+ font-size: 12px;
+ span {
+ &:after {
+ content: '\00a0\2014\00a0';
display: inline-block;
}
-
+ }
+ a {
+ font-weight: bold;
}
}
}
@@ -791,7 +799,7 @@ body {
.block.progress.onepage {
float: left;
width: 200px;
- dt {
+ .content > dt {
font-size: @baseFontSizeBigger;
font-weight: @baseFontWeight;
margin: 0 0 10px 0;
@@ -808,6 +816,39 @@ body {
}
}
+// Payment methods - for OPC and Order pages
+.payment.method {
+ .block.progress.onepage &,
+ .order.details .block.order & {
+ margin: 0;
+ .content {
+ margin: 5px 0;
+ padding: 0;
+ }
+ &.purchase.order,
+ &.checkmemo {
+ .content strong:after {
+ content: ": ";
+ }
+ .content .number {
+ white-space: nowrap;
+ }
+ }
+ .data.table {
+ th {
+ font-size: 14px;
+ padding: 5px 0;
+ text-align: left;
+ width: 50%;
+ }
+ td {
+ padding: 5px;
+ }
+ }
+ }
+}
+
+
.opc.wrapper {
float: right;
width: 725px;
@@ -864,6 +905,7 @@ body {
padding: 0;
margin: 20px 0;
border: 0;
+ position: relative;
}
.field {
.fieldStyle();
@@ -916,6 +958,66 @@ body {
word-spacing: normal;
color: @secondary1;
}
+ .field.date {
+ .nested {
+ display: inline-block;
+ margin-right: 5px;
+ }
+ select {
+ width: auto;
+ }
+ }
+ }
+ .tooltip {
+ background: @primary7;
+ border: 1px solid @primary3;
+ display: block;
+ cursor: default;
+ padding: 30px;
+ position: absolute;
+ left: 20px;
+ top: 10px;
+ &.hidden {
+ display: none;
+ }
+ .action.close {
+ position: absolute;
+ right: 5px;
+ top: 5px;
+ span {
+ .iconAfter(@content: @icon-close-thick, @size: 11px, @font: 'icons');
+ .iconHideText(11px);
+ }
+ }
+ }
+ .check.payable {
+ margin: 0 0 0 20px;
+ .title {
+ display: inline-block;
+ padding: 5px 0;
+ width: 30%;
+ }
+ .content {
+ display: inline-block;
+ margin: 0;
+ padding: 5px 0;
+ width: 68%;
+ }
+ }
+ .sp-methods {
+ .items,
+ .fieldset.items {
+ margin: 0 0 0 6px;
+ }
+ .paypal.field.items {
+ padding: 0;
+ width: 100%;
+ }
+ .paypal.icon {
+ display: inline-block;
+ margin-right: 5px;
+ vertical-align: middle;
+ }
}
}
@@ -1229,6 +1331,17 @@ body {
}
}
}
+ .box.method {
+ .payment.method {
+ margin: 0;
+ }
+ .title {
+ margin: 0 0 5px;
+ }
+ .content {
+ margin: 0 0 0 10px;
+ }
+ }
}
// Oher goods (can't be shipped: virtual, downloadable)
@@ -1306,13 +1419,6 @@ body {
margin-bottom: 0;
}
.items.data {
- td.col.address {
- padding-top: 10px;
- }
- td.col.delete,
- td.col.product {
- padding-top: 18px;
- }
.col {
&.item {
padding-left: 0;
@@ -1387,9 +1493,13 @@ body {
}
}
}
+
&.form.address {
- .col.address select {
- max-width: 450px;
+ .control.address {
+ margin-top: -6px;
+ select {
+ max-width: 450px;
+ }
}
}
}
@@ -1590,7 +1700,7 @@ body {
z-index: 1;
}
-.cart.main.actions {
+.cart.actions {
padding: 20px 0;
.action.continue {
position: absolute;
@@ -1609,15 +1719,17 @@ body {
thead tr:last-child th {
padding-bottom: 10px;
}
+ th > span {
+ white-space: nowrap
+ }
th.col.item > span {
display: none;
}
td.col.qty {
width: 40px;
- padding-top: 20px;
text-align: center;
- .review & {
- padding-top: @baseFontSizeBigger;
+ .control {
+ margin-top: -6px;
}
}
th.col.qty {
@@ -1631,12 +1743,20 @@ body {
td.col.subtotal {
text-align: right;
}
+ .img.photo.container,
.product.photo {
padding-right: 20px;
display: table-cell;
width: 1%;
vertical-align: top;
}
+ .product.photo {
+ .img.photo.container {
+ display: block;
+ padding:0;
+ width:auto;
+ }
+ }
.product.details {
display: table-cell;
width: 99%;
@@ -2512,6 +2632,9 @@ body {
vertical-align: middle;
margin: 0 5px;
}
+ .box.tocart & {
+ margin-top: 10px;
+ }
}
.box.tocart .checkout.paypal {
@@ -2556,9 +2679,10 @@ body {
}
.actions {
margin: 15px 0 0;
+ text-align: left;
.primary,
.secondary {
- margin-right: 5px;
+ margin: 0 10px 10px 0;
display: inline-block;
vertical-align: middle;
}
@@ -3644,6 +3768,12 @@ body {
.datetime-picker + .ui-datepicker-trigger {
margin: 0 15px 0 7px;
}
+ .payment.product.options,
+ .payment.product.schedule {
+ .content {
+ margin: 5px 0 0;
+ }
+ }
}
}
@@ -4067,6 +4197,10 @@ img[align="right"] {
position: relative;
z-index: 1;
cursor: pointer;
+ .menu {
+ padding:0;
+ margin: 0;
+ }
.menu > ul {
font-weight: 600;
font-size: @baseFontSizeMiddle;
@@ -4470,11 +4604,13 @@ img[align="right"] {
.actions {
margin-top: 35px;
.action.update {
- &:extend(.secondary.action all)
- ;
+ &:extend(.secondary.action all);
margin-left: 10px;
}
}
+ .paypal.review.items {
+ clear: left;
+ }
.data.table.paypal.review.items {
width: 100%;
td,
@@ -4497,6 +4633,50 @@ img[align="right"] {
padding-top: 15px;
}
}
+
+ .block.shipping.information,
+ .block.billing.information {
+ margin-bottom: 45px;
+ > .content {
+ .clearfix();
+ }
+ .box {
+ float: left;
+ padding-right: 2%;
+ width: 48%;
+ > .content {
+ background: @primary1;
+ padding: 30px;
+ .select {
+ width: 100%;
+ }
+ .actions {
+ margin: 25px 0 0;
+ }
+ }
+ }
+ address {
+ font-style: normal;
+ }
+ .subtitle {
+ display: block;
+ font-size: 18px;
+ font-weight: 200;
+ margin-bottom: 20px;
+ .action {
+ display: inline-block;
+ font-size: 14px;
+ font-weight: 400;
+ margin-left: 20px;
+ text-decoration: underline;
+ text-transform: lowercase;
+ }
+ }
+ }
+}
+
+.paypal.iframe {
+ display: none;
}
/*
@@ -4942,6 +5122,12 @@ img[align="right"] {
background: @primary1;
padding: 30px;
}
+ p {
+ margin-top: 0;
+ &:last-child {
+ margin-bottom: 0;
+ }
+ }
}
.order.info {
@@ -4954,12 +5140,12 @@ img[align="right"] {
}
> dd {
- margin: 10px 0 0 0;
- background: @primary1;
- padding: 30px;
-
+ margin: 0;
.items {
.clearfix();
+ background: @primary1;
+ margin: 10px 0 0 0;
+ padding: 30px;
.item {
float: left;
margin-right: 15px;
@@ -5007,11 +5193,28 @@ img[align="right"] {
}
.action.show {
text-decoration: none;
- .iconAfter(@content: @icon-arrow-up-filled, @size: 12px, @font: "icons");
+ .iconAfter(@content: @icon-arrow-bottom-filled, @size: 12px, @font: "icons");
&.expanded:after {
- content: @icon-arrow-bottom-filled;
+ content: @icon-arrow-up-filled;
}
}
+ .gift.message.details {
+ position: relative;
+ }
+ .gift.message {
+ margin: 0;
+ }
+ .action.close {
+ position: absolute;
+ right: 0;
+ top: 0;
+ span {
+ .iconAfter(@content: @icon-close-thick, @size: 12px, @font: "icons");
+ }
+ }
+ + .order.details.view {
+ margin-top: 45px;
+ }
}
.shipping-tracking-popup {
@@ -5114,6 +5317,14 @@ img[align="right"] {
width: 40%;
}
}
+ .qty.summary {
+ .resetList();
+ .label {
+ &:after {
+ content: ": ";
+ }
+ }
+ }
}
/*
@@ -5140,6 +5351,46 @@ img[align="right"] {
}
}
+/*
+ My Account -> Recurring profiles
+-------------------------------------- */
+.recurring.order.details {
+ .block.view.info {
+ .clearfix();
+ .box {
+ float: left;
+ padding-right: 2%;
+ width: 48%;
+ .subtitle {
+ font-size: 20px;
+ font-weight: 200;
+ line-height: 1.2;
+ display: inline-block;
+ margin-bottom: 15px;
+ }
+ .content {
+ background: @primary1;
+ padding: 30px;
+ .clearfix();
+ }
+ .data.table {
+ th,
+ td {
+ padding: 4px 7px;
+ }
+ }
+ }
+ }
+ > .actions {
+ .primary {
+ text-align: right;
+ .action {
+ &:extend(.primary.action all);
+ }
+ }
+ }
+}
+
/*
Overlay popup
-------------------------------------- */
diff --git a/app/etc/di.xml b/app/etc/di.xml
index 3d1c255a248..d4e183fa70c 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -53,6 +53,13 @@
<preference for="Magento\Event\ManagerInterface" type="Magento\Event\Manager\Proxy" />
<preference for="Magento\View\LayoutInterface" type="Magento\Core\Model\Layout" />
<preference for="Magento\View\Layout\ProcessorInterface" type="Magento\Core\Model\Layout\Merge" />
+ <type name="Magento\View\Layout\Structure" shared="false" />
+ <type name="Magento\View\BlockPool" shared="false" />
+ <type name="Magento\Data\Form\Factory">
+ <param name="session">
+ <instance type="Magento\Core\Model\Session" />
+ </param>
+ </type>
<type name="Magento\App\State">
<param name="installDate">
<value type="argument">Magento\App\State::PARAM_INSTALL_DATE</value>
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Application.php b/dev/tests/integration/framework/Magento/TestFramework/Application.php
index 27a5696660f..2c0f8b6b9ea 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Application.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Application.php
@@ -225,7 +225,7 @@ class Application
$objectManager->get('Magento\Core\Model\ObjectManager\ConfigLoader')->load('global')
);
$objectManager->configure(array(
- 'Magento\Core\Model\Design\FileResolution\Strategy\Fallback\CachingProxy' => array(
+ 'Magento\View\Design\FileResolution\Strategy\Fallback\CachingProxy' => array(
'parameters' => array('canSaveMap' => false)
),
'default_setup' => array(
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Customer/Edit/Tab/View/AccordionTest.php b/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Customer/Edit/Tab/View/AccordionTest.php
index f6761a9c2f1..dbc7d19495c 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Customer/Edit/Tab/View/AccordionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Customer/Edit/Tab/View/AccordionTest.php
@@ -47,7 +47,7 @@ class AccordionTest extends \PHPUnit_Framework_TestCase
/** @var $objectManager \Magento\TestFramework\ObjectManager */
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
$objectManager->get('Magento\Core\Model\Registry')->register('current_customer', $customer);
- /** @var $layout \Magento\Core\Model\Layout */
+ /** @var $layout \Magento\View\LayoutInterface */
$layout = $objectManager->create(
'Magento\Core\Model\Layout',
array('area' => \Magento\Core\Model\App\Area::AREA_ADMINHTML)
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Customer/OnlineTest.php b/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Customer/OnlineTest.php
index 5bc49a870f4..7073646abc1 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Customer/OnlineTest.php
+++ b/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Customer/OnlineTest.php
@@ -38,7 +38,7 @@ class OnlineTest extends \PHPUnit_Framework_TestCase
*/
public function testGetFilterFormHtml()
{
- /** @var $layout \Magento\Core\Model\Layout */
+ /** @var $layout \Magento\View\LayoutInterface */
$layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
'Magento\Core\Model\Layout',
array('area' => \Magento\Core\Model\App\Area::AREA_ADMINHTML)
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/System/Account/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/Adminhtml/Block/System/Account/Edit/FormTest.php
index 5a3db2399e6..c1f0d7263fd 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/System/Account/Edit/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/Adminhtml/Block/System/Account/Edit/FormTest.php
@@ -53,7 +53,7 @@ class FormTest extends \PHPUnit_Framework_TestCase
$this->assertInstanceOf('Magento\Data\Form', $form);
$this->assertEquals('post', $form->getData('method'));
- $this->assertEquals($block->getUrl('*/system_account/save'), $form->getData('action'));
+ $this->assertEquals($block->getUrl('adminhtml/system_account/save'), $form->getData('action'));
$this->assertEquals('edit_form', $form->getId());
$this->assertTrue($form->getUseContainer());
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/Catalog/Category/EditTest.php b/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/Catalog/Category/EditTest.php
index b707414a519..37d1681c4d1 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/Catalog/Category/EditTest.php
+++ b/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/Catalog/Category/EditTest.php
@@ -43,7 +43,7 @@ class EditTest extends \PHPUnit_Framework_TestCase
*/
public function testPrepareLayout($blockAttributes, $expected)
{
- /** @var $layout \Magento\Core\Model\Layout */
+ /** @var $layout \Magento\View\LayoutInterface */
$layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
'Magento\Core\Model\Layout',
array('area' => \Magento\Core\Model\App\Area::AREA_ADMINHTML)
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/Catalog/Product/EditTest.php b/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/Catalog/Product/EditTest.php
index b1af3b158d9..eee7225b498 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/Catalog/Product/EditTest.php
+++ b/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/Catalog/Product/EditTest.php
@@ -43,7 +43,7 @@ class EditTest extends \PHPUnit_Framework_TestCase
*/
public function testPrepareLayout($blockAttributes, $expected)
{
- /** @var $layout \Magento\Core\Model\Layout */
+ /** @var $layout \Magento\View\LayoutInterface */
$layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
'Magento\Core\Model\Layout',
array('area' => \Magento\Core\Model\App\Area::AREA_ADMINHTML)
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/Catalog/Product/GridTest.php b/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/Catalog/Product/GridTest.php
index da55945ba15..cc71567f730 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/Catalog/Product/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/Catalog/Product/GridTest.php
@@ -52,8 +52,11 @@ class GridTest extends \PHPUnit_Framework_TestCase
'Grid URL is invalid');
$row = new \Magento\Object(array('id' => 1));
- $this->assertStringStartsWith('http://localhost/index.php/product/1', $gridBlock->getRowUrl($row),
- 'Grid row URL is invalid');
+ $this->assertStringStartsWith(
+ 'http://localhost/index.php/backend/admin/index/edit/product/1',
+ $gridBlock->getRowUrl($row),
+ 'Grid row URL is invalid'
+ );
$this->assertStringEndsWith('/category', $gridBlock->getRowUrl($row), 'Grid row URL is invalid');
$this->assertEmpty(0, $gridBlock->getMassactionBlock()->getItems(), 'Grid should not have mass action items');
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/Cms/Page/EditTest.php b/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/Cms/Page/EditTest.php
index 961fad8a980..d6f30792cee 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/Cms/Page/EditTest.php
+++ b/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/Cms/Page/EditTest.php
@@ -43,7 +43,7 @@ class EditTest extends \PHPUnit_Framework_TestCase
*/
public function testPrepareLayout($blockAttributes, $expected)
{
- /** @var $layout \Magento\Core\Model\Layout */
+ /** @var $layout \Magento\View\LayoutInterface */
$layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
'Magento\Core\Model\Layout',
array('area' => \Magento\Core\Model\App\Area::AREA_ADMINHTML)
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/Cms/Page/GridTest.php b/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/Cms/Page/GridTest.php
index 2968ce70603..d39908ae07e 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/Cms/Page/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/Cms/Page/GridTest.php
@@ -52,7 +52,8 @@ class GridTest extends \PHPUnit_Framework_TestCase
'Grid URL is invalid');
$row = new \Magento\Object(array('id' => 1));
- $this->assertStringStartsWith('http://localhost/index.php/cms_page/1', $gridBlock->getRowUrl($row),
+ $this->assertStringStartsWith(
+ 'http://localhost/index.php/backend/admin/index/edit/cms_page/1', $gridBlock->getRowUrl($row),
'Grid row URL is invalid');
$this->assertEmpty(0, $gridBlock->getMassactionBlock()->getItems(), 'Grid should not have mass action items');
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/EditTest.php b/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/EditTest.php
index 317169b9107..d0a33097768 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/EditTest.php
+++ b/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Urlrewrite/EditTest.php
@@ -44,7 +44,7 @@ class EditTest extends \PHPUnit_Framework_TestCase
public function testPrepareLayout($blockAttributes, $expected)
{
- /** @var $layout \Magento\Core\Model\Layout */
+ /** @var $layout \Magento\View\LayoutInterface */
$layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
'Magento\Core\Model\Layout',
array('area' => \Magento\Core\Model\App\Area::AREA_ADMINHTML)
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Widget/ContainerTest.php b/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Widget/ContainerTest.php
index d6a71c72e59..bba5ceb5c6c 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Widget/ContainerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Widget/ContainerTest.php
@@ -73,7 +73,7 @@ class ContainerTest extends \PHPUnit_Framework_TestCase
*/
protected function _buildBlock($titles)
{
- /** @var $layout \Magento\Core\Model\Layout */
+ /** @var $layout \Magento\View\LayoutInterface */
$layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
'Magento\Core\Model\Layout',
array('area' => \Magento\Core\Model\App\Area::AREA_ADMINHTML)
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/System/DesignTest.php b/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/System/DesignTest.php
index dd79d464ac7..f3a6d012a54 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/System/DesignTest.php
+++ b/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/System/DesignTest.php
@@ -33,7 +33,7 @@ namespace Magento\Adminhtml\Controller\System;
class DesignTest extends \Magento\Backend\Utility\Controller
{
/**
- * @covers \Magento\Adminhtml\Controller\Action::_addLeft
+ * @covers \Magento\Backend\Controller\Adminhtml\Action::_addLeft
*/
public function testEditAction()
{
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/System/VariableTest.php b/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/System/VariableTest.php
index f99532cd32b..77e5301153a 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/System/VariableTest.php
+++ b/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/System/VariableTest.php
@@ -33,7 +33,7 @@ namespace Magento\Adminhtml\Controller\System;
class VariableTest extends \Magento\Backend\Utility\Controller
{
/**
- * @covers \Magento\Adminhtml\Controller\Action::_addLeft
+ * @covers \Magento\Backend\Controller\Adminhtml\Action::_addLeft
*/
public function testEditAction()
{
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/DashboardTest.php b/dev/tests/integration/testsuite/Magento/Adminhtml/DashboardTest.php
index 3f35bb5bc8b..38080f0a1c2 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/DashboardTest.php
+++ b/dev/tests/integration/testsuite/Magento/Adminhtml/DashboardTest.php
@@ -31,7 +31,7 @@ class DashboardTest extends \Magento\Backend\Utility\Controller
{
public function testTunnelAction()
{
- $testUrl = \Magento\Adminhtml\Block\Dashboard\Graph::API_URL .
+ $testUrl = \Magento\Backend\Block\Dashboard\Graph::API_URL .
'?cht=p3&chd=t:60,40&chs=250x100&chl=Hello|World';
$handle = curl_init();
curl_setopt($handle, CURLOPT_URL, $testUrl);
@@ -59,9 +59,9 @@ class DashboardTest extends \Magento\Backend\Utility\Controller
);
$gaFixture = urlencode(base64_encode(json_encode($gaData)));
- /** @var $helper \Magento\Adminhtml\Helper\Dashboard\Data */
+ /** @var $helper \Magento\Backend\Helper\Dashboard\Data */
$helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->get('Magento\Adminhtml\Helper\Dashboard\Data');
+ ->get('Magento\Backend\Helper\Dashboard\Data');
$hash = $helper->getChartDataHash($gaFixture);
$this->getRequest()->setParam('ga', $gaFixture)->setParam('h', $hash);
$this->dispatch('backend/admin/dashboard/tunnel');
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/Sales/_files/address_data.php b/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/Sales/_files/address_data.php
deleted file mode 100644
index 3485c4e467e..00000000000
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/Sales/_files/address_data.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category Magento
- * @package Magento_Adminhtml
- * @subpackage integration_tests
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-
-return array(
- 'region' => 'CA',
- 'postcode' => '11111',
- 'lastname' => 'lastname',
- 'firstname' => 'firstname',
- 'street' => 'street',
- 'city' => 'Los Angeles',
- 'email' => 'admin@example.com',
- 'telephone' => '11111111',
- 'country_id' => 'US',
-);
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Dashboard/GraphTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/GraphTest.php
similarity index 85%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Dashboard/GraphTest.php
rename to dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/GraphTest.php
index 8fd9077f8ca..97bbd990070 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Dashboard/GraphTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Dashboard/GraphTest.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Dashboard;
+namespace Magento\Backend\Block\Dashboard;
/**
* @magentoAppArea adminhtml
@@ -33,7 +33,7 @@ namespace Magento\Adminhtml\Block\Dashboard;
class GraphTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Adminhtml\Block\Dashboard\Graph
+ * @var \Magento\Backend\Block\Dashboard\Graph
*/
protected $_block;
@@ -41,8 +41,8 @@ class GraphTest extends \PHPUnit_Framework_TestCase
{
parent::setUp();
$this->_block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
- ->createBlock('Magento\Adminhtml\Block\Dashboard\Graph');
- $this->_block->setDataHelperName('Magento\Adminhtml\Helper\Dashboard\Order');
+ ->createBlock('Magento\Backend\Block\Dashboard\Graph');
+ $this->_block->setDataHelperName('Magento\Backend\Helper\Dashboard\Order');
}
public function testGetChartUrl()
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/System/Config/FormTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/System/Config/FormTest.php
index 82de257d0f2..7988f069caf 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/System/Config/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/System/Config/FormTest.php
@@ -50,7 +50,7 @@ class FormTest extends \PHPUnit_Framework_TestCase
public function testDependenceHtml()
{
- /** @var $layout \Magento\Core\Model\Layout */
+ /** @var $layout \Magento\View\LayoutInterface */
$layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->create('Magento\Core\Model\Layout', array('area' => 'adminhtml'));
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Config\ScopeInterface')
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Router/DefaultRouterTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Router/DefaultRouterTest.php
index 255820105e6..0913771b6b1 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Router/DefaultRouterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Router/DefaultRouterTest.php
@@ -102,7 +102,6 @@ class DefaultRouterTest extends \PHPUnit_Framework_TestCase
/**
* @covers \Magento\Backend\Controller\Router\DefaultRouter::fetchDefault
- * @covers \Magento\Backend\Controller\Router\DefaultRouter::getDefaultModuleFrontName
*/
public function testFetchDefault()
{
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Model/UrlTest.php b/dev/tests/integration/testsuite/Magento/Backend/Model/UrlTest.php
index 28564204508..43bd2212de6 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Model/UrlTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Model/UrlTest.php
@@ -47,7 +47,7 @@ class UrlTest extends \PHPUnit_Framework_TestCase
}
/**
- * @covers \Magento\Backend\Model\Url::getSecure
+ * @covers \Magento\Backend\Model\Url::isSecure
*/
public function testIsSecure()
{
@@ -68,7 +68,7 @@ class UrlTest extends \PHPUnit_Framework_TestCase
}
/**
- * @covers \Magento\Backend\Model\Url::getSecure
+ * @covers \Magento\Backend\Model\Url::setRouteParams
*/
public function testSetRouteParams()
{
@@ -82,7 +82,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase
/**
* App isolation is enabled to protect next tests from polluted registry by getUrl()
*
- * @covers \Magento\Backend\Model\Url::getSecure
* @magentoAppIsolation enabled
*/
public function testGetUrl()
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/GridTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/GridTest.php
index 847738ec121..f8404edc8cc 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/GridTest.php
@@ -37,7 +37,7 @@ class GridTest
{
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\DesignInterface')
->setArea(\Magento\Core\Model\App\Area::AREA_ADMINHTML);
- /** @var $layout \Magento\Core\Model\Layout */
+ /** @var $layout \Magento\View\LayoutInterface */
$layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
'Magento\Core\Model\Layout',
array('area' => \Magento\Core\Model\App\Area::AREA_ADMINHTML)
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/SearchTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/SearchTest.php
index 8988537a815..62d35083fc1 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/SearchTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/SearchTest.php
@@ -38,7 +38,7 @@ class SearchTest
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\DesignInterface')
->setArea(\Magento\Core\Model\App\Area::AREA_ADMINHTML);
- /** @var $layout \Magento\Core\Model\Layout */
+ /** @var $layout \Magento\View\LayoutInterface */
$layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
'Magento\Core\Model\Layout',
array('area' => \Magento\Core\Model\App\Area::AREA_ADMINHTML)
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Category/TreeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Category/TreeTest.php
similarity index 88%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Category/TreeTest.php
rename to dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Category/TreeTest.php
index aedca72c52e..883ba14c7fe 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Category/TreeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Category/TreeTest.php
@@ -19,27 +19,27 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Catalog\Category;
+namespace Magento\Catalog\Block\Adminhtml\Category;
/**
* @magentoAppArea adminhtml
*/
class TreeTest extends \PHPUnit_Framework_TestCase
{
- /** @var \Magento\Adminhtml\Block\Catalog\Category\Tree */
+ /** @var \Magento\Catalog\Block\Adminhtml\Category\Tree */
protected $_block;
protected function setUp()
{
parent::setUp();
$this->_block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create('Magento\Adminhtml\Block\Catalog\Category\Tree');
+ ->create('Magento\Catalog\Block\Adminhtml\Category\Tree');
}
public function testGetSuggestedCategoriesJson()
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/AddTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/AddTest.php
similarity index 88%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/AddTest.php
rename to dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/AddTest.php
index dd6c8726f3f..35600bf3f9e 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/AddTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/AddTest.php
@@ -19,13 +19,13 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Attribute\Set\Toolbar;
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Toolbar;
/**
* @magentoAppArea adminhtml
@@ -37,7 +37,8 @@ class AddTest extends \PHPUnit_Framework_TestCase
/** @var $layout \Magento\Core\Model\Layout */
$layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface');
- $block = $layout->addBlock('Magento\Adminhtml\Block\Catalog\Product\Attribute\Set\Toolbar\Add', 'block');
+ $block = $layout->addBlock('Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Toolbar\Add',
+ 'block');
$block->setArea('adminhtml')->unsetChild('setForm');
$childBlock = $layout->addBlock('Magento\Core\Block\Template', 'setForm', 'block');
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/OptionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/OptionTest.php
similarity index 94%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/OptionTest.php
rename to dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/OptionTest.php
index 81e11184211..8f46f03bbd1 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/OptionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/OptionTest.php
@@ -19,13 +19,13 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options;
/**
* @magentoAppArea adminhtml
@@ -35,7 +35,7 @@ class OptionTest extends \PHPUnit_Framework_TestCase
public function testGetOptionValuesCaching()
{
$block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
- ->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Option');
+ ->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Option');
/** @var $productWithOptions \Magento\Catalog\Model\Product */
$productWithOptions = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->create('Magento\Catalog\Model\Product');
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/SelectTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/SelectTest.php
similarity index 82%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/SelectTest.php
rename to dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/SelectTest.php
index b5a1ad6dc4c..7db9a0f8ae5 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/SelectTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/SelectTest.php
@@ -19,13 +19,13 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Type;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type;
/**
* @magentoAppArea adminhtml
@@ -36,8 +36,11 @@ class SelectTest extends \PHPUnit_Framework_TestCase
{
/** @var $layout \Magento\Core\Model\Layout */
$layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface');
- /** @var $block \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Type_Select */
- $block = $layout->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Options\Type\Select', 'select');
+ /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type_Select */
+ $block = $layout->createBlock(
+ 'Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Select',
+ 'select'
+ );
$html = $block->getPriceTypeSelectHtml();
$this->assertContains('select_${select_id}', $html);
$this->assertContains('[${select_id}]', $html);
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/MatrixTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/MatrixTest.php
similarity index 94%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/MatrixTest.php
rename to dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/MatrixTest.php
index baf77d4275d..405a9c458a3 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/MatrixTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/MatrixTest.php
@@ -19,13 +19,13 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config;
/**
* @magentoAppArea adminhtml
@@ -53,7 +53,7 @@ class MatrixTest extends \PHPUnit_Framework_TestCase
'test_configurable'
);
$attributeOptions = $usedAttribute->getSource()->getAllOptions(false);
- /** @var $block \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config_Matrix */
+ /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config_Matrix */
$block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
->createBlock(preg_replace('/Test$/', '', __CLASS__));
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/ConfigTest.php
similarity index 89%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/ConfigTest.php
rename to dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/ConfigTest.php
index 82f474152bd..08e26287253 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/ConfigTest.php
@@ -19,13 +19,13 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super;
/**
* @magentoAppArea adminhtml
@@ -41,9 +41,9 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
$objectManager->get('Magento\Core\Model\Registry')
->register('current_product', $objectManager->create('Magento\Catalog\Model\Product'));
- /** @var $block \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config */
+ /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config */
$block = $objectManager->get('Magento\View\LayoutInterface')
- ->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config');
+ ->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config');
$this->assertEquals(array(), $block->getSelectedAttributes());
}
@@ -63,9 +63,9 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
->getEntityType('catalog_product')->getId(),
'test_configurable'
);
- /** @var $block \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config */
+ /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config */
$block = $objectManager->get('Magento\View\LayoutInterface')
- ->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config');
+ ->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config');
$selectedAttributes = $block->getSelectedAttributes();
$this->assertEquals(array($usedAttribute->getId()), array_keys($selectedAttributes));
$selectedAttribute = reset($selectedAttributes);
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/SettingsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/SettingsTest.php
similarity index 92%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/SettingsTest.php
rename to dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/SettingsTest.php
index b1f4ba55737..39dada5e106 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/SettingsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/SettingsTest.php
@@ -19,12 +19,12 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super;
class SettingsTest extends \PHPUnit_Framework_TestCase
{
@@ -58,9 +58,9 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
$context = $objectManager->create('Magento\Backend\Block\Template\Context', array('urlBuilder' => $urlModel));
/** @var $layout \Magento\Core\Model\Layout */
$layout = $objectManager->get('Magento\View\LayoutInterface');
- /** @var $block \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Settings */
+ /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Settings */
$block = $layout->createBlock(
- 'Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Settings',
+ 'Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Settings',
'block',
array(
'context' => $context
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Edit/TabsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/TabsTest.php
similarity index 87%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Edit/TabsTest.php
rename to dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/TabsTest.php
index 4424a309dd8..0e2d6557814 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Edit/TabsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/TabsTest.php
@@ -19,13 +19,13 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit;
/**
* @magentoAppArea adminhtml
@@ -53,9 +53,9 @@ class TabsTest extends \PHPUnit_Framework_TestCase
$layout = $objectManager->get('Magento\View\LayoutInterface');
$layout->addBlock('Magento\Core\Block\Text', 'head');
$layout->setArea('nonexisting'); // prevent block templates rendering
- /** @var $block \Magento\Adminhtml\Block\Catalog\Product\Edit\Tabs */
- $block = $layout->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit\Tabs');
+ /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs */
+ $block = $layout->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs');
$this->assertArrayHasKey(0, $block->getTabsIds());
- $this->assertNotEmpty($layout->getBlock('catalog\product\edit\tabs'));
+ $this->assertNotEmpty($layout->getBlock('adminhtml\product\edit\tabs'));
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/EditTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/EditTest.php
similarity index 91%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/EditTest.php
rename to dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/EditTest.php
index 55139cb21f4..d4f721a8151 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/EditTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/EditTest.php
@@ -19,14 +19,14 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Catalog\Product;
+namespace Magento\Catalog\Block\Adminhtml\Product;
/**
* @magentoAppArea adminhtml
@@ -34,7 +34,7 @@ namespace Magento\Adminhtml\Block\Catalog\Product;
class EditTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Adminhtml\Block\Catalog\Product\Edit
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Edit
*/
protected $_block;
@@ -51,7 +51,7 @@ class EditTest extends \PHPUnit_Framework_TestCase
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
$objectManager->get('Magento\Core\Model\Registry')->register('current_product', $product);
$this->_block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
- ->createBlock('Magento\Adminhtml\Block\Catalog\Product\Edit');
+ ->createBlock('Magento\Catalog\Block\Adminhtml\Product\Edit');
}
public function testGetTypeSwitcherData()
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/CategoryTest.php
similarity index 91%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/CategoryTest.php
rename to dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/CategoryTest.php
index b690ba83c00..5c77706f60c 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/CategoryTest.php
@@ -21,7 +21,7 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Helper\Form;
+namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
class CategoryTest extends \PHPUnit_Framework_TestCase
{
@@ -36,7 +36,7 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
array('area' => \Magento\Core\Model\App\Area::AREA_ADMINHTML)
);
- $block = $objectManager->create('Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Category',
+ $block = $objectManager->create('Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Category',
array('layout' => $layout));
/** @var $formFactory \Magento\Data\Form\Factory */
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/ContentTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
similarity index 82%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/ContentTest.php
rename to dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
index 2579bf435a8..2fffdd8105b 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/ContentTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
@@ -19,13 +19,13 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Gallery;
+namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery;
/**
* @magentoAppArea adminhtml
@@ -36,8 +36,11 @@ class ContentTest extends \PHPUnit_Framework_TestCase
{
/** @var $layout \Magento\Core\Model\Layout */
$layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface');
- /** @var $block \Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Gallery\Content */
- $block = $layout->createBlock('Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Gallery\Content', 'block');
+ /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content */
+ $block = $layout->createBlock(
+ 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content',
+ 'block'
+ );
$this->assertInstanceOf('Magento\Adminhtml\Block\Media\Uploader', $block->getUploader());
}
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/WeightTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/WeightTest.php
similarity index 88%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/WeightTest.php
rename to dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/WeightTest.php
index 5f5601de840..e7c81f2ed0a 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/WeightTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/WeightTest.php
@@ -19,13 +19,13 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Helper\Form;
+namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
class WeightTest extends \PHPUnit_Framework_TestCase
{
@@ -54,8 +54,8 @@ class WeightTest extends \PHPUnit_Framework_TestCase
/** @var $currentProduct \Magento\Catalog\Model\Product */
$currentProduct = $this->_objectManager->create('Magento\Catalog\Model\Product');
$currentProduct->setTypeInstance($this->_objectManager->create($type));
- /** @var $block \Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Weight */
- $block = $this->_objectManager->create('Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Weight');
+ /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight */
+ $block = $this->_objectManager->create('Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight');
$form = $this->_formFactory->create();
$form->setDataObject($currentProduct);
$block->setForm($form);
@@ -85,8 +85,8 @@ class WeightTest extends \PHPUnit_Framework_TestCase
$currentProduct = $this->_objectManager->create('Magento\Catalog\Model\Product');
$currentProduct->setTypeInstance($this->_objectManager->create($type));
- /** @var $block \Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Weight */
- $block = $this->_objectManager->create('Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Weight');
+ /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight */
+ $block = $this->_objectManager->create('Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight');
$form = $this->_formFactory->create();
$form->setDataObject($currentProduct);
$block->setForm($form);
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Options/AjaxTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Options/AjaxTest.php
similarity index 90%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Options/AjaxTest.php
rename to dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Options/AjaxTest.php
index 41c13382db5..aaec1705b99 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Catalog/Product/Options/AjaxTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Options/AjaxTest.php
@@ -19,13 +19,13 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Options;
+namespace Magento\Catalog\Block\Adminhtml\Product\Options;
/**
* @magentoAppArea adminhtml
@@ -33,7 +33,7 @@ namespace Magento\Adminhtml\Block\Catalog\Product\Options;
class AjaxTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Adminhtml\Block\Catalog\Product\Options\Ajax
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Options\Ajax
*/
protected $_block = null;
@@ -41,7 +41,7 @@ class AjaxTest extends \PHPUnit_Framework_TestCase
{
parent::setUp();
$this->_block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
- ->createBlock('Magento\Adminhtml\Block\Catalog\Product\Options\Ajax');
+ ->createBlock('Magento\Catalog\Block\Adminhtml\Product\Options\Ajax');
}
public function testToHtmlWithoutProducts()
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Catalog/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
similarity index 96%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Catalog/CategoryTest.php
rename to dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
index 6a569168cae..e066593db4d 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Catalog/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Controller\Catalog;
+namespace Magento\Catalog\Controller\Adminhtml;
/**
* @magentoAppArea adminhtml
@@ -51,7 +51,7 @@ class CategoryTest extends \Magento\Backend\Utility\Controller
$this->getRequest()->setPost($inputData);
$this->getRequest()->setParam('store', $storeId);
$this->getRequest()->setParam('id', 2);
- $this->dispatch('backend/admin/catalog_category/save');
+ $this->dispatch('backend/catalog/category/save');
$this->assertSessionMessages(
$this->equalTo(array('You saved the category.')), \Magento\Core\Model\Message::SUCCESS
@@ -93,12 +93,12 @@ class CategoryTest extends \Magento\Backend\Utility\Controller
{
$this->getRequest()->setPost($postData);
- $this->dispatch('backend/admin/catalog_category/save');
+ $this->dispatch('backend/catalog/category/save');
$body = $this->getResponse()->getBody();
if (empty($postData['return_session_messages_only'])) {
$this->assertRegExp(
- '~<script type="text/javascript">parent\.updateContent\("[^"]+/backend/admin/catalog_category/edit/'
+ '~<script type="text/javascript">parent\.updateContent\("[^"]+/backend/catalog/category/edit/'
. 'id/\d+/key/[0-9a-f]+/", {}, true\);</script>~',
$body
);
@@ -143,7 +143,7 @@ class CategoryTest extends \Magento\Backend\Utility\Controller
public function testSuggestCategoriesActionDefaultCategoryFound()
{
$this->getRequest()->setParam('label_part', 'Default');
- $this->dispatch('backend/admin/catalog_category/suggestCategories');
+ $this->dispatch('backend/catalog/category/suggestCategories');
$this->assertEquals(
'[{"id":"2","children":[],"is_active":"1","label":"Default Category"}]',
$this->getResponse()->getBody()
@@ -153,7 +153,7 @@ class CategoryTest extends \Magento\Backend\Utility\Controller
public function testSuggestCategoriesActionNoSuggestions()
{
$this->getRequest()->setParam('label_part', strrev('Default'));
- $this->dispatch('backend/admin/catalog_category/suggestCategories');
+ $this->dispatch('backend/catalog/category/suggestCategories');
$this->assertEquals('[]', $this->getResponse()->getBody());
}
@@ -303,7 +303,7 @@ class CategoryTest extends \Magento\Backend\Utility\Controller
'default_sort_by' => 'name',
),
));
- $this->dispatch('backend/admin/catalog_category/save');
+ $this->dispatch('backend/catalog/category/save');
$this->assertSessionMessages(
$this->equalTo(array('Unable to save the category')), \Magento\Core\Model\Message::ERROR
);
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Catalog/Product/Action/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
similarity index 88%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Catalog/Product/Action/AttributeTest.php
rename to dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
index 85f8bdf9b9c..11bf6b89e18 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Catalog/Product/Action/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
@@ -26,7 +26,7 @@
*/
-namespace Magento\Adminhtml\Controller\Catalog\Product\Action;
+namespace Magento\Catalog\Controller\Adminhtml\Product\Action;
/**
* @magentoAppArea adminhtml
@@ -34,7 +34,7 @@ namespace Magento\Adminhtml\Controller\Catalog\Product\Action;
class AttributeTest extends \Magento\Backend\Utility\Controller
{
/**
- * @covers \Magento\Adminhtml\Controller\Catalog\Product\Action\Attribute::saveAction
+ * @covers \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute::saveAction
*
* @magentoDataFixture Magento/Catalog/_files/product_simple.php
*/
@@ -44,11 +44,11 @@ class AttributeTest extends \Magento\Backend\Utility\Controller
$session = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Adminhtml\Model\Session');
$session->setProductIds(array(1));
- $this->dispatch('backend/admin/catalog_product_action_attribute/save/store/0');
+ $this->dispatch('backend/catalog/product_action_attribute/save/store/0');
$this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
$expectedUrl = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\Url')->
- getUrl('backend/admin/catalog_product/index');
+ getUrl('backend/catalog/product/index');
$isRedirectPresent = false;
foreach ($this->getResponse()->getHeaders() as $header) {
if ($header['name'] === 'Location' && strpos($header['value'], $expectedUrl) === 0) {
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Catalog/Product/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
similarity index 94%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Catalog/Product/AttributeTest.php
rename to dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
index 6d3869318f6..d5f3db00921 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Catalog/Product/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
@@ -26,7 +26,7 @@
*/
-namespace Magento\Adminhtml\Controller\Catalog\Product;
+namespace Magento\Catalog\Controller\Adminhtml\Product;
/**
* @magentoAppArea adminhtml
@@ -40,7 +40,7 @@ class AttributeTest extends \Magento\Backend\Utility\Controller
{
$postData = $this->_getAttributeData() + array('attribute_id' => '2');
$this->getRequest()->setPost($postData);
- $this->dispatch('backend/admin/catalog_product_attribute/save');
+ $this->dispatch('backend/catalog/product_attribute/save');
$model = $this->_objectManager->create('Magento\Catalog\Model\Resource\Eav\Attribute');
$model->load($postData['attribute_id']);
$this->assertNull($model->getData('apply_to'));
@@ -53,7 +53,7 @@ class AttributeTest extends \Magento\Backend\Utility\Controller
{
$postData = $this->_getAttributeData() + array('attribute_id' => '1');
$this->getRequest()->setPost($postData);
- $this->dispatch('backend/admin/catalog_product_attribute/save');
+ $this->dispatch('backend/catalog/product_attribute/save');
$model = $this->_objectManager->create('Magento\Catalog\Model\Resource\Eav\Attribute');
$model->load($postData['attribute_id']);
$this->assertEquals('simple,configurable', $model->getData('apply_to'));
@@ -67,7 +67,7 @@ class AttributeTest extends \Magento\Backend\Utility\Controller
$postData = $this->_getAttributeData() + array('attribute_id' => '3');
unset($postData['apply_to']);
$this->getRequest()->setPost($postData);
- $this->dispatch('backend/admin/catalog_product_attribute/save');
+ $this->dispatch('backend/catalog/product_attribute/save');
$model = $this->_objectManager->create('Magento\Catalog\Model\Resource\Eav\Attribute');
$model->load($postData['attribute_id']);
$this->assertEquals(array('simple', 'configurable'), $model->getApplyTo());
@@ -95,7 +95,7 @@ class AttributeTest extends \Magento\Backend\Utility\Controller
$postData = $this->_getAttributeData() + array('attribute_id' => 1);
$this->getRequest()->setPost($postData);
- $this->dispatch('backend/admin/catalog_product_attribute/save');
+ $this->dispatch('backend/catalog/product_attribute/save');
$this->assertEquals(
'New Db Translation', $this->_translate('Fixture String'), 'Translation cache is expected to be flushed'
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Catalog/Product/ReviewTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/ReviewTest.php
similarity index 92%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Catalog/Product/ReviewTest.php
rename to dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/ReviewTest.php
index 8d5fde63a14..1eead4ab05d 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Catalog/Product/ReviewTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/ReviewTest.php
@@ -26,7 +26,7 @@
*/
-namespace Magento\Adminhtml\Controller\Catalog\Product;
+namespace Magento\Catalog\Controller\Adminhtml\Product;
/**
* @magentoAppArea adminhtml
@@ -40,7 +40,7 @@ class ReviewTest extends \Magento\Backend\Utility\Controller
{
$reviewId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->create('Magento\Review\Model\Review')->load(1, 'entity_pk_value')->getId();
- $this->dispatch('backend/admin/catalog_product_review/edit/id/' . $reviewId);
+ $this->dispatch('backend/catalog/product_review/edit/id/' . $reviewId);
$responseBody = $this->getResponse()->getBody();
$this->assertContains('<script>alert("xss");</script>', $responseBody);
$this->assertNotContains('<script>alert("xss");</script>', $responseBody);
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Catalog/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php
similarity index 89%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Catalog/ProductTest.php
rename to dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php
index 81a997321ef..22880b178c8 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Catalog/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Controller\Catalog;
+namespace Magento\Catalog\Controller\Adminhtml;
/**
* @magentoAppArea adminhtml
@@ -43,7 +43,7 @@ class ProductTest extends \Magento\Backend\Utility\Controller
'associated_product_ids' => $associatedProductIds,
));
- $this->dispatch('backend/admin/catalog_product/save');
+ $this->dispatch('backend/catalog/product/save');
/** @var $objectManager \Magento\TestFramework\ObjectManager */
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -78,11 +78,11 @@ class ProductTest extends \Magento\Backend\Utility\Controller
'entity_id' => 15
),
));
- $this->dispatch('backend/admin/catalog_product/save');
+ $this->dispatch('backend/catalog/product/save');
$this->assertSessionMessages(
$this->equalTo(array('Unable to save product')), \Magento\Core\Model\Message::ERROR
);
- $this->assertRedirect($this->stringContains('/backend/admin/catalog_product/edit'));
+ $this->assertRedirect($this->stringContains('/backend/catalog/product/edit'));
}
/**
@@ -91,8 +91,8 @@ class ProductTest extends \Magento\Backend\Utility\Controller
public function testSaveActionAndNew()
{
$this->getRequest()->setPost(array('back' => 'new'));
- $this->dispatch('backend/admin/catalog_product/save/id/1');
- $this->assertRedirect($this->stringStartsWith('http://localhost/index.php/backend/admin/catalog_product/new/'));
+ $this->dispatch('backend/catalog/product/save/id/1');
+ $this->assertRedirect($this->stringStartsWith('http://localhost/index.php/backend/catalog/product/new/'));
$this->assertSessionMessages(
$this->contains('You saved the product.'), \Magento\Core\Model\Message::SUCCESS
);
@@ -104,12 +104,12 @@ class ProductTest extends \Magento\Backend\Utility\Controller
public function testSaveActionAndDuplicate()
{
$this->getRequest()->setPost(array('back' => 'duplicate'));
- $this->dispatch('backend/admin/catalog_product/save/id/1');
+ $this->dispatch('backend/catalog/product/save/id/1');
$this->assertRedirect(
- $this->stringStartsWith('http://localhost/index.php/backend/admin/catalog_product/edit/')
+ $this->stringStartsWith('http://localhost/index.php/backend/catalog/product/edit/')
);
$this->assertRedirect($this->logicalNot(
- $this->stringStartsWith('http://localhost/index.php/backend/admin/catalog_product/edit/id/1')
+ $this->stringStartsWith('http://localhost/index.php/backend/catalog/product/edit/id/1/')
));
$this->assertSessionMessages(
$this->contains('You saved the product.'), \Magento\Core\Model\Message::SUCCESS
@@ -121,7 +121,7 @@ class ProductTest extends \Magento\Backend\Utility\Controller
public function testIndexAction()
{
- $this->dispatch('backend/admin/catalog_product');
+ $this->dispatch('backend/catalog/product');
$body = $this->getResponse()->getBody();
$this->assertSelectCount('#add_new_product', 1, $body,
@@ -139,7 +139,7 @@ class ProductTest extends \Magento\Backend\Utility\Controller
*/
public function testEditAction()
{
- $this->dispatch('backend/admin/catalog_product/edit/id/1');
+ $this->dispatch('backend/catalog/product/edit/id/1');
$body = $this->getResponse()->getBody();
$this->assertSelectCount('#save-split-button', 1, $body,
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/ViewTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/ViewTest.php
index 4d17a88e15e..fe57266a56d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/ViewTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/ViewTest.php
@@ -147,7 +147,6 @@ class ViewTest extends \PHPUnit_Framework_TestCase
*
* @magentoDataFixture Magento/Catalog/_files/multiple_products.php
* @magentoAppIsolation enabled
- * @covers \Magento\Catalog\Helper\Product\View::_getSessionMessageModels
* @magentoAppArea frontend
*/
public function testGetSessionMessageModels()
diff --git a/dev/tests/integration/testsuite/Magento/Centinel/CreateOrderTest.php b/dev/tests/integration/testsuite/Magento/Centinel/CreateOrderTest.php
index 6cf473540da..4189f655d94 100644
--- a/dev/tests/integration/testsuite/Magento/Centinel/CreateOrderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Centinel/CreateOrderTest.php
@@ -38,8 +38,8 @@ class CreateOrderTest extends \Magento\Backend\Utility\Controller
*/
public function testIndexAction()
{
- /** @var $order \Magento\Adminhtml\Model\Sales\Order\Create */
- $order = $this->_objectManager->get('Magento\Adminhtml\Model\Sales\Order\Create');
+ /** @var $order \Magento\Sales\Model\AdminOrder\Create */
+ $order = $this->_objectManager->get('Magento\Sales\Model\AdminOrder\Create');
$paymentData = array(
'cc_owner' => 'Test User',
'cc_type' => 'visa',
@@ -50,7 +50,7 @@ class CreateOrderTest extends \Magento\Backend\Utility\Controller
'method' => 'ccsave',
);
$order->addProducts(array(1 => array('qty' => 1)))->getQuote()->getPayment()->addData($paymentData);
- $this->dispatch('backend/admin/sales_order_create/index');
+ $this->dispatch('backend/sales/order_create/index');
$this->assertContains('<div class="centinel">', $this->getResponse()->getBody());
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/MultishippingTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/MultishippingTest.php
index 7026197fd62..9c3f98e3f5d 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/Controller/MultishippingTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/MultishippingTest.php
@@ -58,7 +58,9 @@ class MultishippingTest extends \Magento\TestFramework\TestCase\AbstractControll
$this->getRequest()->setPost('payment', array('method' => 'checkmo'));
$this->dispatch('checkout/multishipping/overview');
$html = $this->getResponse()->getBody();
- $this->assertContains('<p>' . $quote->getPayment()->getMethodInstance()->getTitle() . '</p>', $html);
+ $this->assertContains('<div class="box method">', $html);
+ $this->assertContains('<dt class="title">'
+ . $quote->getPayment()->getMethodInstance()->getTitle() . '</dt>', $html);
$this->assertContains('<span class="price">$10.00</span>', $html);
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/OnepageTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/OnepageTest.php
index 73642804091..acc61a59d2e 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/Controller/OnepageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/OnepageTest.php
@@ -18,11 +18,11 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package Magento_Checkout
- * @subpackage integration_tests
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @category Magento
+ * @package Magento_Checkout
+ * @subpackage integration_tests
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
namespace Magento\Checkout\Controller;
@@ -77,7 +77,7 @@ class OnepageTest extends \Magento\TestFramework\TestCase\AbstractController
->getPayment()
->getMethodInstance()
->getTitle();
- $this->assertContains('<p>' . $methodTitle . '</p>', $html);
+ $this->assertContains('<dt class="title">' . $methodTitle . '</dt>', $html);
}
public function testShippingMethodAction()
@@ -93,3 +93,5 @@ class OnepageTest extends \Magento\TestFramework\TestCase\AbstractController
$this->assertContains('checkout-review', $this->getResponse()->getBody());
}
}
+
+
diff --git a/dev/tests/integration/testsuite/Magento/Core/Block/AbstractBlockTest.php b/dev/tests/integration/testsuite/Magento/Core/Block/AbstractBlockTest.php
index d7b67ca72cb..24802c11f91 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Block/AbstractBlockTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Block/AbstractBlockTest.php
@@ -445,8 +445,8 @@ class AbstractBlockTest extends \PHPUnit_Framework_TestCase
$block1 = $this->_createBlockWithLayout('block1', 'block1');
$block2 = $this->_createBlockWithLayout('block2', 'block2');
$parent->setChild('block1', $block1)->setChild('block2', $block2);
- $block1->addToParentGroup('group');
- $block2->addToParentGroup('group');
+ $this->_layout->addToParentGroup('block1', 'group');
+ $this->_layout->addToParentGroup('block2', 'group');
$group = $parent->getGroupChildNames('group');
$this->assertContains('block1', $group);
$this->assertContains('block2', $group);
diff --git a/dev/tests/integration/testsuite/Magento/Core/Controller/Varien/ActionTest.php b/dev/tests/integration/testsuite/Magento/Core/Controller/Varien/ActionTest.php
index d3dae252969..bb082db8b1b 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Controller/Varien/ActionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Controller/Varien/ActionTest.php
@@ -188,66 +188,29 @@ class ActionTest extends \PHPUnit_Framework_TestCase
);
}
- /**
- * @param string $route
- * @param string $controller
- * @param string $action
- * @param array $expected
- *
- * @magentoAppIsolation enabled
- * @dataProvider addActionLayoutHandlesInheritedDataProvider
- */
- public function testAddActionLayoutHandlesInherited($route, $controller, $action, $expected)
- {
- $arguments = array(
- 'request' => $this->_objectManager->get('Magento\TestFramework\Request'),
- 'response' => $this->_objectManager->get('Magento\TestFramework\Response'),
- 'isRenderInherited' => true,
- );
- $context = $this->_objectManager->create('Magento\Core\Controller\Varien\Action\Context', $arguments);
- $this->_object = $this->getMockForAbstractClass('Magento\Core\Controller\Varien\Action',
- array('context' => $context));
-
- $this->_object->getRequest()
- ->setRouteName($route)
- ->setControllerName($controller)
- ->setActionName($action);
- $this->_object->addActionLayoutHandles();
- $handles = $this->_object->getLayout()->getUpdate()->getHandles();
- foreach ($expected as $expectedHandle) {
- $this->assertContains($expectedHandle, $handles);
- }
- }
-
- /**
- * @return array
- */
- public function addActionLayoutHandlesInheritedDataProvider()
- {
- return array(
- array('test', 'controller', 'action', array('test_controller_action')),
- array('catalog', 'product', 'gallery', array('default', 'catalog_product_view', 'catalog_product_gallery'))
- );
- }
-
/**
* @magentoAppIsolation enabled
*/
public function testAddPageLayoutHandles()
{
+ /* @var $update \Magento\Core\Model\Layout\Merge */
+ $update = $this->_object->getLayout()->getUpdate();
+
$this->_object->getRequest()->setRouteName('test')
->setControllerName('controller')
->setActionName('action');
$result = $this->_object->addPageLayoutHandles();
$this->assertFalse($result);
- $this->assertEmpty($this->_object->getLayout()->getUpdate()->getHandles());
+ $this->assertEmpty($update->getHandles());
$this->_object->getRequest()->setRouteName('catalog')
->setControllerName('product')
->setActionName('view');
+ $update->addHandle('default');
$result = $this->_object->addPageLayoutHandles(array('type' => 'simple'));
+
$this->assertTrue($result);
- $handles = $this->_object->getLayout()->getUpdate()->getHandles();
+ $handles = $update->getHandles();
$this->assertContains('default', $handles);
$this->assertContains('catalog_product_view', $handles);
$this->assertContains('catalog_product_view_type_simple', $handles);
@@ -376,7 +339,7 @@ class ActionTest extends \PHPUnit_Framework_TestCase
'Magento\Core\Controller\Varien\Action\Context'
),
'backend' => array(
- 'Magento\Adminhtml\Controller\Action',
+ 'Magento\Backend\Controller\Adminhtml\Action',
'adminhtml',
'admin',
'magento_backend',
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/DataService/LayoutTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/DataService/LayoutTest.php
index 0fa7ef0c086..046516e0864 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/DataService/LayoutTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/DataService/LayoutTest.php
@@ -103,7 +103,7 @@ class LayoutTest extends \Magento\TestFramework\TestCase\AbstractController
*/
protected function _getLayoutModel($fixtureFile)
{
- /** @var $layout \Magento\Core\Model\Layout */
+ /** @var $layout \Magento\View\LayoutInterface */
$layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
'Magento\View\LayoutInterface',
array('dataServiceGraph' => $this->_dataServiceGraph)
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Email/Template/FilterTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/Email/Template/FilterTest.php
index 764228b32bf..e57a2e380f9 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Email/Template/FilterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/Email/Template/FilterTest.php
@@ -126,7 +126,7 @@ class FilterTest extends \PHPUnit_Framework_TestCase
$design = $objectManager->create('Magento\Core\Model\View\Design', array('themes' => $themes));
$objectManager->addSharedInstance($design, 'Magento\Core\Model\View\Design');
- /** @var $layout \Magento\Core\Model\Layout */
+ /** @var $layout \Magento\View\LayoutInterface */
$layout = $objectManager->create('Magento\Core\Model\Layout', array('area' => $area));
$objectManager->addSharedInstance($layout, 'Magento\Core\Model\Layout');
$this->assertEquals($area, $layout->getArea());
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/LayoutDirectivesTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/LayoutDirectivesTest.php
index 28fd7f0383c..9d3a7ea2da1 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/LayoutDirectivesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/LayoutDirectivesTest.php
@@ -259,6 +259,7 @@ class LayoutDirectivesTest extends \PHPUnit_Framework_TestCase
/**
* @magentoConfigFixture current_store true_options 1
+ * @magentoAppIsolation enabled
*/
public function testIfConfigForBlock()
{
@@ -268,5 +269,16 @@ class LayoutDirectivesTest extends \PHPUnit_Framework_TestCase
$this->assertInstanceOf('Magento\View\Element\BlockInterface', $layout->getBlock('block3'));
$this->assertFalse($layout->getBlock('block4'));
}
+
+ /**
+ * @magentoConfigFixture current_store true_options 1
+ * @magentoAppIsolation enabled
+ */
+ public function testBlockGroups()
+ {
+ $layout = $this->_getLayoutModel('group.xml');
+ $childNames = $layout->getBlock('block1')->getGroupChildNames('group1');
+ $this->assertEquals(array('block2', 'block3'), $childNames);
+ }
}
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/LayoutTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/LayoutTest.php
index 3b12498494f..6e518d9a788 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/LayoutTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/LayoutTest.php
@@ -71,7 +71,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
{
$structure = new \Magento\Data\Structure;
$structure->createElement('test.container', array());
- /** @var $layout \Magento\Core\Model\Layout */
+ /** @var $layout \Magento\View\LayoutInterface */
$layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->create('Magento\Core\Model\Layout', array('structure' => $structure));
$this->assertTrue($layout->hasElement('test.container'));
@@ -96,7 +96,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
public function testGenerateXml()
{
$layoutUtility = new \Magento\Core\Utility\Layout($this);
- /** @var $layout \Magento\Core\Model\Layout */
+ /** @var $layout \Magento\View\LayoutInterface */
$layout = $this->getMock('Magento\Core\Model\Layout', array('getUpdate'),
$layoutUtility->getLayoutDependencies());
$merge = $this->getMock('StdClass', array('asSimplexml'));
@@ -321,10 +321,10 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
}
/**
- * @param \Magento\Core\Model\Layout $layout
+ * @param \Magento\View\LayoutInterface $layout
* @depends testSetChild
*/
- public function testReorderChild(\Magento\Core\Model\Layout $layout)
+ public function testReorderChild(\Magento\View\LayoutInterface $layout)
{
$layout->addContainer('four', 'Four', array(), 'one');
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Theme/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Theme/CollectionTest.php
index 7fe2d3e9a3c..b97204f9297 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Theme/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Theme/CollectionTest.php
@@ -98,7 +98,6 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
* @magentoDataFixture setThemeFixture
* @magentoDbIsolation enabled
* @dataProvider addAreaFilterDataProvider
- * @covers \Magento\Core\Model\Theme::addAreaFilter
*/
public function testAddAreaFilter($area, $themeCount)
{
@@ -125,7 +124,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
* @magentoDataFixture setThemeFixture
* @magentoDbIsolation enabled
* @dataProvider addTypeFilterDataProvider
- * @covers \Magento\Core\Model\Theme::addTypeFilter
+ * @covers \Magento\Core\Model\Resource\Theme\Collection::addAreaFilter
*/
public function testAddTypeFilter($themeType, $themeCount)
{
@@ -155,7 +154,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
/**
* @magentoDataFixture setThemeFixture
* @magentoDbIsolation enabled
- * @covers \Magento\Core\Model\Theme::filterVisibleThemes
+ * @covers \Magento\Core\Model\Resource\Theme\Collection::filterVisibleThemes
*/
public function testFilterVisibleThemes()
{
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Design/Source/DesignTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/ThemeTest.php
similarity index 79%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Design/Source/DesignTest.php
rename to dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/ThemeTest.php
index 244973f1034..d5698738d47 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Design/Source/DesignTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/ThemeTest.php
@@ -25,18 +25,24 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\Design\Source;
+namespace Magento\Core\Model\Theme\Source;
-class DesignTest extends \PHPUnit_Framework_TestCase
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Theme Test
+ *
+ * @package Magento\View
+ */
+class ThemeTest extends \PHPUnit_Framework_TestCase
{
public function testGetAllOptions()
{
- /** @var $model \Magento\Core\Model\Design\Source\Design */
- $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create('Magento\Core\Model\Design\Source\Design');
+ /** @var $model \Magento\Core\Model\Theme\Source\Theme */
+ $model = Bootstrap::getObjectManager()->create('\Magento\Core\Model\Theme\Source\Theme');
/** @var $expectedCollection \Magento\Core\Model\Theme\Collection */
- $expectedCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ $expectedCollection = Bootstrap::getObjectManager()
->create('Magento\Core\Model\Resource\Theme\Collection');
$expectedCollection->addFilter('area', 'frontend');
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Design/Source/_files/design/frontend/a_d/file b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/file
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Design/Source/_files/design/frontend/a_d/file
rename to dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/file
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Design/Source/_files/design/frontend/a_d/theme.xml b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/theme.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Design/Source/_files/design/frontend/a_d/theme.xml
rename to dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/theme.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Design/Source/_files/design/frontend/b_e/file b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/file
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Design/Source/_files/design/frontend/b_e/file
rename to dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/file
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Design/Source/_files/design/frontend/b_e/theme.xml b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/theme.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Design/Source/_files/design/frontend/b_e/theme.xml
rename to dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/theme.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Design/Source/_files/design/frontend/magento_default/file b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/file
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Design/Source/_files/design/frontend/magento_default/file
rename to dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/file
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Design/Source/_files/design/frontend/magento_default/theme.xml b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/theme.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Design/Source/_files/design/frontend/magento_default/theme.xml
rename to dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/theme.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Design/Source/_files/design/frontend/magento_g/file b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/file
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Design/Source/_files/design/frontend/magento_g/file
rename to dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/file
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Design/Source/_files/design/frontend/magento_g/theme.xml b/dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/theme.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Design/Source/_files/design/frontend/magento_g/theme.xml
rename to dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/theme.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_category_view_type_default.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_category_view_type_default.xml
index 3e7aa91f0cf..57302e555b5 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_category_view_type_default.xml
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_category_view_type_default.xml
@@ -26,4 +26,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" type="page" parent="catalog_category_view"/>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" type="page"/>
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_product_view_type_simple.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_product_view_type_simple.xml
index c62da5352c4..57302e555b5 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_product_view_type_simple.xml
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Catalog/catalog_product_view_type_simple.xml
@@ -26,4 +26,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" type="page" parent="catalog_product_view"/>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" type="page"/>
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/layout_directives_test/group.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/layout_directives_test/group.xml
new file mode 100644
index 00000000000..997f9b349da
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/layout_directives_test/group.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <block class="Magento\Core\Block\Text" name="block1">
+ <block class="Magento\Core\Block\Text" name="block2" group="group1">
+ <argumrnts>
+ <argument xsi:type="string" name="text">blok2</argument>
+ </argumrnts>
+ </block>
+ <block class="Magento\Core\Block\Text" name="block3" group="group1" >
+ <argumrnts>
+ <argument xsi:type="string" name="text">blok3</argument>
+ </argumrnts>
+ </block>
+ <block class="Magento\Core\Block\Text" name="block4">
+ <argumrnts>
+ <argument xsi:type="string" name="text">blok4</argument>
+ </argumrnts>
+ </block>
+ </block>
+</layout>
diff --git a/dev/tests/integration/testsuite/Magento/Core/Utility/Layout.php b/dev/tests/integration/testsuite/Magento/Core/Utility/Layout.php
index 03471c70427..519a410cce0 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Utility/Layout.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Utility/Layout.php
@@ -51,13 +51,13 @@ class Layout
public function getLayoutUpdateFromFixture($layoutUpdatesFile)
{
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
- /** @var \Magento\Core\Model\Layout\File\Factory $fileFactory */
- $fileFactory = $objectManager->get('Magento\Core\Model\Layout\File\Factory');
+ /** @var \Magento\View\Layout\File\Factory $fileFactory */
+ $fileFactory = $objectManager->get('Magento\View\Layout\File\Factory');
$files = array();
foreach ((array)$layoutUpdatesFile as $filename) {
$files[] = $fileFactory->create($filename, 'Magento_Core');
}
- $fileSource = $this->_testCase->getMockForAbstractClass('Magento\Core\Model\Layout\File\SourceInterface');
+ $fileSource = $this->_testCase->getMockForAbstractClass('Magento\View\Layout\File\SourceInterface');
$fileSource->expects(\PHPUnit_Framework_TestCase::any())
->method('getFiles')
->will(\PHPUnit_Framework_TestCase::returnValue($files));
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php b/dev/tests/integration/testsuite/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
index a6c95a813c4..f01226a154a 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/LinksTest.php
@@ -44,7 +44,7 @@ class LinksTest
*/
public static function performUploadButtonTest(\Magento\Core\Block\AbstractBlock $block)
{
- /** @var $layout \Magento\Core\Model\Layout */
+ /** @var $layout \Magento\View\LayoutInterface */
$layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->create('Magento\Core\Model\Layout');
$layout->addBlock($block, 'links');
diff --git a/dev/tests/integration/testsuite/Magento/File/SizeTest.php b/dev/tests/integration/testsuite/Magento/File/SizeTest.php
index 9f13bc64bbe..b5aa1f961f1 100644
--- a/dev/tests/integration/testsuite/Magento/File/SizeTest.php
+++ b/dev/tests/integration/testsuite/Magento/File/SizeTest.php
@@ -43,7 +43,6 @@ class SizeTest extends \PHPUnit_Framework_TestCase
}
/**
- * @covers \Magento\Core\Helper\File\Storage::getMaxFileSize
* @backupStaticAttributes
*/
public function testGetMaxFileSize()
@@ -53,7 +52,6 @@ class SizeTest extends \PHPUnit_Framework_TestCase
}
/**
- * @covers \Magento\Core\Helper\File\Storage::convertSizeToInteger
* @dataProvider getConvertSizeToIntegerDataProvider
* @backupStaticAttributes
* @param string $value
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/Entity/EavAbstractTest.php b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/Entity/AbstractEavTest.php
similarity index 98%
rename from dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/Entity/EavAbstractTest.php
rename to dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/Entity/AbstractEavTest.php
index 92f2f7bc683..b95f8a77f35 100644
--- a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/Entity/EavAbstractTest.php
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/Entity/AbstractEavTest.php
@@ -30,7 +30,7 @@
*/
namespace Magento\ImportExport\Model\Export\Entity;
-class EavAbstractTest extends \PHPUnit_Framework_TestCase
+class AbstractEavTest extends \PHPUnit_Framework_TestCase
{
/**
* Skipped attribute codes
@@ -93,7 +93,7 @@ class EavAbstractTest extends \PHPUnit_Framework_TestCase
/**
* Test for method _getExportAttrCodes()
*
- * @covers \Magento\ImportExport\Model\Export\Entity\AbstractEav::_getExportAttrCodes
+ * @covers \Magento\ImportExport\Model\Export\Entity\AbstractEav::_getExportAttributeCodes
*/
public function testGetExportAttrCodes()
{
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Import/Entity/Eav/CustomerImportTest.php b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Import/Entity/Eav/CustomerImportTest.php
index 5811c019475..76e5f8eec88 100644
--- a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Import/Entity/Eav/CustomerImportTest.php
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Import/Entity/Eav/CustomerImportTest.php
@@ -52,7 +52,6 @@ class CustomerImportTest extends \PHPUnit_Framework_TestCase
*
* @covers \Magento\ImportExport\Model\Import\Entity\Eav\Customer::_importData
* @covers \Magento\ImportExport\Model\Import\Entity\Eav\Customer::_prepareDataForUpdate
- * @covers \Magento\ImportExport\Model\Import\Entity\Eav\Customer::_saveCustomerEntity
* @covers \Magento\ImportExport\Model\Import\Entity\Eav\Customer::_saveCustomerAttributes
*
* @magentoDataFixture Magento/ImportExport/_files/customer.php
@@ -121,9 +120,6 @@ class CustomerImportTest extends \PHPUnit_Framework_TestCase
/**
* Test importData() method (delete behavior)
*
- * @covers \Magento\ImportExport\Model\Import\Entity\Eav\Customer::_importData
- * @covers \Magento\ImportExport\Model\Import\Entity\Eav\Customer::_deleteCustomers
- *
* @magentoDataFixture Magento/ImportExport/_files/customers.php
*/
public function testDeleteData()
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Import/Entity/ProductTest.php b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Import/Entity/ProductTest.php
index 6dab6350f52..14c3b3cfef2 100644
--- a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Import/Entity/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Import/Entity/ProductTest.php
@@ -175,7 +175,6 @@ class ProductTest extends \PHPUnit_Framework_TestCase
*
* @magentoDataFixture Magento/Catalog/_files/product_simple.php
* @dataProvider getBehaviorDataProvider
- * @covers \Magento\ImportExport\Model\Import\Entity\Product::_saveCustomOptions
*/
public function testSaveCustomOptionsDuplicate($behavior)
{
diff --git a/dev/tests/integration/testsuite/Magento/Install/Block/AdminTest.php b/dev/tests/integration/testsuite/Magento/Install/Block/AdminTest.php
index 350b4232bae..dac49101f15 100644
--- a/dev/tests/integration/testsuite/Magento/Install/Block/AdminTest.php
+++ b/dev/tests/integration/testsuite/Magento/Install/Block/AdminTest.php
@@ -42,7 +42,7 @@ class AdminTest extends \PHPUnit_Framework_TestCase
$session = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Install\Model\Session');
$session->setAdminData(array_merge($preserve, $omit));
- /** @var $layout \Magento\Core\Model\Layout */
+ /** @var $layout \Magento\View\LayoutInterface */
$layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->create('Magento\Core\Model\Layout', array('area' => 'install'));
/** @var $block \Magento\Install\Block\Admin */
diff --git a/dev/tests/integration/testsuite/Magento/ObjectManager/ObjectManagerTest.php b/dev/tests/integration/testsuite/Magento/ObjectManager/ObjectManagerTest.php
index 65e7cd4c107..3de25e917a3 100644
--- a/dev/tests/integration/testsuite/Magento/ObjectManager/ObjectManagerTest.php
+++ b/dev/tests/integration/testsuite/Magento/ObjectManager/ObjectManagerTest.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\ObjectManager
+ * @package Magento_ObjectManager
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/integration/testsuite/Magento/Page/Helper/RobotsTest.php b/dev/tests/integration/testsuite/Magento/Page/Helper/RobotsTest.php
index e88fc5e7359..5c916bf7a51 100644
--- a/dev/tests/integration/testsuite/Magento/Page/Helper/RobotsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Page/Helper/RobotsTest.php
@@ -43,7 +43,7 @@ class RobotsTest extends \PHPUnit_Framework_TestCase
}
/**
- * @covers \Magento\Page\Helper\RobotsTest::getRobotsDefaultCustomInstructions
+ * @covers \Magento\Page\Helper\Robots::getRobotsDefaultCustomInstructions
*/
public function testGetRobotsDefaultCustomInstructions()
{
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/StandardTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/StandardTest.php
index 168c9890865..6ae30baa079 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Controller/StandardTest.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Controller/StandardTest.php
@@ -58,7 +58,7 @@ class StandardTest extends \Magento\TestFramework\TestCase\AbstractController
$this->dispatch('paypal/standard/redirect');
$this->assertContains(
'<form action="https://www.paypal.com/cgi-bin/webscr" id="paypal_standard_checkout"'
- . ' name="paypal_standard_checkout" method="POST">',
+ . ' name="paypal_standard_checkout" method="POST">',
$this->getResponse()->getBody()
);
}
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Rating/Edit/Tab/FormTest.php b/dev/tests/integration/testsuite/Magento/Rating/Block/Adminhtml/Edit/Tab/FormTest.php
similarity index 87%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Rating/Edit/Tab/FormTest.php
rename to dev/tests/integration/testsuite/Magento/Rating/Block/Adminhtml/Edit/Tab/FormTest.php
index bddd226d6fe..01ba5486c95 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Rating/Edit/Tab/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/Rating/Block/Adminhtml/Edit/Tab/FormTest.php
@@ -22,7 +22,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Rating\Edit\Tab;
+namespace Magento\Rating\Block\Adminhtml\Edit\Tab;
/**
* @magentoAppArea adminhtml
@@ -32,9 +32,9 @@ class FormTest extends \PHPUnit_Framework_TestCase
public function testConstruct()
{
$this->assertInstanceOf(
- 'Magento\Adminhtml\Block\Rating\Edit\Tab\Form',
+ 'Magento\Rating\Block\Adminhtml\Edit\Tab\Form',
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
- ->createBlock('Magento\Adminhtml\Block\Rating\Edit\Tab\Form')
+ ->createBlock('Magento\Rating\Block\Adminhtml\Edit\Tab\Form')
);
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Sales/Items/AbstractTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Items/AbstractTest.php
similarity index 88%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Sales/Items/AbstractTest.php
rename to dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Items/AbstractTest.php
index 09f4998df14..fc0bd995c01 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Sales/Items/AbstractTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Items/AbstractTest.php
@@ -19,13 +19,13 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Sales\Items;
+namespace Magento\Sales\Block\Adminhtml\Items;
/**
* @magentoAppArea adminhtml
@@ -36,8 +36,8 @@ class AbstractTest extends \PHPUnit_Framework_TestCase
{
/** @var $layout \Magento\Core\Model\Layout */
$layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface');
- /** @var $block \Magento\Adminhtml\Block\Sales\Items\AbstractItems */
- $block = $layout->createBlock('Magento\Adminhtml\Block\Sales\Items\AbstractItems', 'block');
+ /** @var $block \Magento\Sales\Block\Adminhtml\Items\AbstractItems */
+ $block = $layout->createBlock('Magento\Sales\Block\Adminhtml\Items\AbstractItems', 'block');
$item = new \Magento\Object;
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Sales/Order/Create/Form/AbstractTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractTest.php
similarity index 85%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Sales/Order/Create/Form/AbstractTest.php
rename to dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractTest.php
index c78a8840864..064a3c9053a 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Sales/Order/Create/Form/AbstractTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractTest.php
@@ -19,16 +19,16 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Test class for \Magento\Adminhtml\Block\Sales\Order\Create\Form\AbstractForm
+ * Test class for \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Form;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
class AbstractTest
extends \PHPUnit_Framework_TestCase
@@ -45,17 +45,17 @@ class AbstractTest
$arguments = array(
$objectManager->get('Magento\Data\Form\Factory'),
$objectManager->get('Magento\Adminhtml\Model\Session\Quote'),
- $objectManager->get('Magento\Adminhtml\Model\Sales\Order\Create'),
+ $objectManager->get('Magento\Sales\Model\AdminOrder\Create'),
$objectManager->get('Magento\Core\Helper\Data'),
$objectManager->get('Magento\Backend\Block\Template\Context'),
);
- /** @var $block \Magento\Adminhtml\Block\Sales\Order\Create\Form\AbstractForm */
+ /** @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm */
$block = $this
- ->getMockForAbstractClass('Magento\Adminhtml\Block\Sales\Order\Create\Form\AbstractForm', $arguments);
+ ->getMockForAbstractClass('Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm', $arguments);
$block->setLayout($objectManager->create('Magento\Core\Model\Layout'));
$method = new \ReflectionMethod(
- 'Magento\Adminhtml\Block\Sales\Order\Create\Form\AbstractForm', '_addAttributesToForm');
+ 'Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractForm', '_addAttributesToForm');
$method->setAccessible(true);
/** @var $formFactory \Magento\Data\Form\Factory */
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Sales/Order/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php
similarity index 85%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Sales/Order/CreateTest.php
rename to dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php
index c2a18f1d2e7..b815f224dc4 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Sales/Order/CreateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php
@@ -19,14 +19,14 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Controller\Sales\Order;
+namespace Magento\Sales\Controller\Adminhtml\Order;
/**
* @magentoAppArea adminhtml
@@ -37,7 +37,7 @@ class CreateTest extends \Magento\Backend\Utility\Controller
{
$this->getRequest()->setParam('block', ',');
$this->getRequest()->setParam('json', 1);
- $this->dispatch('backend/admin/sales_order_create/loadBlock');
+ $this->dispatch('backend/sales/order_create/loadBlock');
$this->assertEquals('{"message":""}', $this->getResponse()->getBody());
}
@@ -46,11 +46,11 @@ class CreateTest extends \Magento\Backend\Utility\Controller
*/
public function testLoadBlockActionData()
{
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Adminhtml\Model\Sales\Order\Create')
+ \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Sales\Model\AdminOrder\Create')
->addProducts(array(1 => array('qty' => 1)));
$this->getRequest()->setParam('block', 'data');
$this->getRequest()->setParam('json', 1);
- $this->dispatch('backend/admin/sales_order_create/loadBlock');
+ $this->dispatch('backend/sales/order_create/loadBlock');
$html = $this->getResponse()->getBody();
$this->assertContains('<div id=\"sales_order_create_search_grid\">', $html);
$this->assertContains('<div id=\"order-billing_method_form\">', $html);
@@ -65,7 +65,7 @@ class CreateTest extends \Magento\Backend\Utility\Controller
{
$this->getRequest()->setParam('block', $block);
$this->getRequest()->setParam('json', 1);
- $this->dispatch('backend/admin/sales_order_create/loadBlock');
+ $this->dispatch('backend/sales/order_create/loadBlock');
$html = $this->getResponse()->getBody();
$this->assertContains($expected, $html);
}
@@ -86,11 +86,11 @@ class CreateTest extends \Magento\Backend\Utility\Controller
*/
public function testLoadBlockActionItems()
{
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Adminhtml\Model\Sales\Order\Create')
+ \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Sales\Model\AdminOrder\Create')
->addProducts(array(1 => array('qty' => 1)));
$this->getRequest()->setParam('block', 'items');
$this->getRequest()->setParam('json', 1);
- $this->dispatch('backend/admin/sales_order_create/loadBlock');
+ $this->dispatch('backend/sales/order_create/loadBlock');
$html = $this->getResponse()->getBody();
$this->assertContains('id=\"coupons:code\"', $html);
}
@@ -100,11 +100,11 @@ class CreateTest extends \Magento\Backend\Utility\Controller
*/
public function testIndexAction()
{
- /** @var $order \Magento\Adminhtml\Model\Sales\Order\Create */
+ /** @var $order \Magento\Sales\Model\AdminOrder\Create */
$order = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->get('Magento\Adminhtml\Model\Sales\Order\Create');
+ ->get('Magento\Sales\Model\AdminOrder\Create');
$order->addProducts(array(1 => array('qty' => 1)));
- $this->dispatch('backend/admin/sales_order_create/index');
+ $this->dispatch('backend/sales/order_create/index');
$html = $this->getResponse()->getBody();
$this->assertContains('<div id="order-customer-selector"', $html);
$this->assertContains('<div id="sales_order_create_customer_grid">', $html);
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Sales/Order/CreditmemoTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreditmemoTest.php
similarity index 90%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Sales/Order/CreditmemoTest.php
rename to dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreditmemoTest.php
index 91045ae4de6..6dc79395db9 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Sales/Order/CreditmemoTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreditmemoTest.php
@@ -19,14 +19,14 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Controller\Sales\Order;
+namespace Magento\Sales\Controller\Adminhtml\Order;
/**
* @magentoAppArea adminhtml
@@ -35,7 +35,7 @@ class CreditmemoTest extends \Magento\Backend\Utility\Controller
{
/**
* @magentoConfigFixture current_store cataloginventory/item_options/auto_return 1
- * @magentoDataFixture Magento/Adminhtml/controllers/Sales/_files/order_info.php
+ * @magentoDataFixture Magento/Sales/_files/order_info.php
*/
public function testAddCommentAction()
{
@@ -58,7 +58,7 @@ class CreditmemoTest extends \Magento\Backend\Utility\Controller
$this->getRequest()->setParam('creditmemo_id', $creditmemo->getId());
$this->getRequest()->setPost('comment', array(
'comment' => $comment));
- $this->dispatch('backend/admin/sales_order_creditmemo/addComment/id/' . $creditmemo->getId());
+ $this->dispatch('backend/sales/order_creditmemo/addComment/id/' . $creditmemo->getId());
$html = $this->getResponse()->getBody();
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Sales/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/OrderTest.php
similarity index 87%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Sales/OrderTest.php
rename to dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/OrderTest.php
index eac2e042197..529f13c4816 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Sales/OrderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/OrderTest.php
@@ -19,14 +19,14 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Controller\Sales;
+namespace Magento\Sales\Controller\Adminhtml;
/**
* @magentoAppArea adminhtml
@@ -35,7 +35,7 @@ class OrderTest extends \Magento\Backend\Utility\Controller
{
public function testIndexAction()
{
- $this->dispatch('backend/admin/sales_order/index');
+ $this->dispatch('backend/sales/order/index');
$this->assertContains('Total 0 records found', $this->getResponse()->getBody());
}
@@ -44,7 +44,7 @@ class OrderTest extends \Magento\Backend\Utility\Controller
*/
public function testIndexActionWithOrder()
{
- $this->dispatch('backend/admin/sales_order/index');
+ $this->dispatch('backend/sales/order/index');
$this->assertContains('Total 1 records found', $this->getResponse()->getBody());
}
@@ -57,19 +57,19 @@ class OrderTest extends \Magento\Backend\Utility\Controller
$order = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->create('Magento\Sales\Model\Order');
$order->load('100000001', 'increment_id');
- $this->dispatch('backend/admin/sales_order/view/order_id/' . $order->getId());
+ $this->dispatch('backend/sales/order/view/order_id/' . $order->getId());
$this->assertContains('Los Angeles', $this->getResponse()->getBody());
}
public function testAddressActionNonExistingAddress()
{
$this->getRequest()->setParam('address_id', -1);
- $this->dispatch('backend/admin/sales_order/address');
+ $this->dispatch('backend/sales/order/address');
$this->assertRedirect();
}
/**
- * @magentoDataFixture Magento/Adminhtml/controllers/Sales/_files/address.php
+ * @magentoDataFixture Magento/Sales/_files/address.php
*/
public function testAddressActionNoVAT()
{
@@ -78,7 +78,7 @@ class OrderTest extends \Magento\Backend\Utility\Controller
->create('Magento\Sales\Model\Order\Address');
$address->load('a_unique_firstname', 'firstname');
$this->getRequest()->setParam('address_id', $address->getId());
- $this->dispatch('backend/admin/sales_order/address');
+ $this->dispatch('backend/sales/order/address');
$html = $this->getResponse()->getBody();
$prohibitedStrings = array('validate-vat', 'validateVat', 'Validate VAT');
foreach ($prohibitedStrings as $string) {
@@ -103,7 +103,7 @@ class OrderTest extends \Magento\Backend\Utility\Controller
$order->load('100000001', 'increment_id');
$this->getRequest()->setPost(array('history' => array('status' => $status, 'comment' => $comment)));
- $this->dispatch('backend/admin/sales_order/addComment/order_id/' . $order->getId());
+ $this->dispatch('backend/sales/order/addComment/order_id/' . $order->getId());
$html = $this->getResponse()->getBody();
$this->assertContains($response, $html);
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Model/Sales/Order/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
similarity index 94%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Model/Sales/Order/CreateTest.php
rename to dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
index 807d2369339..a964eb36f84 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Model/Sales/Order/CreateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
@@ -19,13 +19,13 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Model\Sales\Order;
+namespace Magento\Sales\Model\AdminOrder;
/**
* @magentoAppArea adminhtml
@@ -35,7 +35,7 @@ class CreateTest extends \PHPUnit_Framework_TestCase
/**
* Model instance
*
- * @var \Magento\Adminhtml\Model\Sales\Order\Create
+ * @var \Magento\Sales\Model\AdminOrder\Create
*/
protected $_model;
@@ -44,7 +44,7 @@ class CreateTest extends \PHPUnit_Framework_TestCase
parent::setUp();
$this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create('Magento\Adminhtml\Model\Sales\Order\Create');
+ ->create('Magento\Sales\Model\AdminOrder\Create');
}
/**
@@ -70,7 +70,7 @@ class CreateTest extends \PHPUnit_Framework_TestCase
/**
* @magentoDataFixture Magento/Downloadable/_files/product.php
* @magentoDataFixture Magento/Downloadable/_files/order_with_downloadable_product.php
- * @magentoDataFixture Magento/Adminhtml/_files/order_shipping_address_same_as_billing.php
+ * @magentoDataFixture Magento/Sales/_files/order_shipping_address_same_as_billing.php
*/
public function testInitFromOrderShippingAddressSameAsBillingWhenSame()
{
@@ -92,7 +92,7 @@ class CreateTest extends \PHPUnit_Framework_TestCase
/**
* @magentoDataFixture Magento/Downloadable/_files/product.php
* @magentoDataFixture Magento/Downloadable/_files/order_with_downloadable_product.php
- * @magentoDataFixture Magento/Adminhtml/_files/order_shipping_address_different_to_billing.php
+ * @magentoDataFixture Magento/Sales/_files/order_shipping_address_different_to_billing.php
*/
public function testInitFromOrderShippingAddressSameAsBillingWhenDifferent()
{
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/Sales/_files/address.php b/dev/tests/integration/testsuite/Magento/Sales/_files/address.php
similarity index 97%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/Sales/_files/address.php
rename to dev/tests/integration/testsuite/Magento/Sales/_files/address.php
index e8f6098df92..19db16a6044 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/Sales/_files/address.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/address.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/address_data.php b/dev/tests/integration/testsuite/Magento/Sales/_files/address_data.php
index 648b9bcce1a..3c8adaef5ff 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/address_data.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/address_data.php
@@ -29,6 +29,7 @@ return array(
'region' => 'CA',
'postcode' => '11111',
'lastname' => 'lastname',
+ 'firstname' => 'firstname',
'street' => 'street',
'city' => 'Los Angeles',
'email' => 'admin@example.com',
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/Sales/_files/order_info.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php
similarity index 99%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/Sales/_files/order_info.php
rename to dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php
index dd10a9f2963..b9c645176fa 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/Sales/_files/order_info.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/_files/order_shipping_address_different_to_billing.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_shipping_address_different_to_billing.php
similarity index 98%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/_files/order_shipping_address_different_to_billing.php
rename to dev/tests/integration/testsuite/Magento/Sales/_files/order_shipping_address_different_to_billing.php
index c0fb2a036d5..c13e1ca3050 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/_files/order_shipping_address_different_to_billing.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_shipping_address_different_to_billing.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/_files/order_shipping_address_same_as_billing.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_shipping_address_same_as_billing.php
similarity index 98%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/_files/order_shipping_address_same_as_billing.php
rename to dev/tests/integration/testsuite/Magento/Sales/_files/order_shipping_address_same_as_billing.php
index 31be3e403a7..2fca97251d2 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/_files/order_shipping_address_same_as_billing.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_shipping_address_same_as_billing.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Tax/Rate/ImportExportTest.php b/dev/tests/integration/testsuite/Magento/Tax/Block/Adminhtml/Rate/ImportExportTest.php
similarity index 85%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Tax/Rate/ImportExportTest.php
rename to dev/tests/integration/testsuite/Magento/Tax/Block/Adminhtml/Rate/ImportExportTest.php
index 3b3dd3f0559..0b4b9ec283a 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Tax/Rate/ImportExportTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Block/Adminhtml/Rate/ImportExportTest.php
@@ -19,24 +19,24 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Tax\Rate;
+namespace Magento\Tax\Block\Adminhtml\Rate;
class ImportExportTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Adminhtml\Block\Catalog\Product\Attribute\Edit\Tab\Main
+ * @var \Magento\Adminhtml\Block\Tax\Rate\ImportExport
*/
protected $_block = null;
protected function setUp()
{
$this->_block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
- ->createBlock('Magento\Adminhtml\Block\Tax\Rate\ImportExport')
+ ->createBlock('Magento\Tax\Block\Adminhtml\Rate\ImportExport')
->setArea('adminhtml');
}
@@ -47,7 +47,7 @@ class ImportExportTest extends \PHPUnit_Framework_TestCase
public function testCreateBlock()
{
- $this->assertInstanceOf('Magento\Adminhtml\Block\Tax\Rate\ImportExport', $this->_block);
+ $this->assertInstanceOf('Magento\Tax\Block\Adminhtml\Rate\ImportExport', $this->_block);
}
public function testFormExists()
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Tax/RateTest.php b/dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/RateTest.php
similarity index 97%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Tax/RateTest.php
rename to dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/RateTest.php
index 28f0a2f0aad..c445ad93f3c 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Tax/RateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/RateTest.php
@@ -19,13 +19,13 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Controller\Tax;
+namespace Magento\Tax\Controller\Adminhtml;
/**
* @magentoAppArea adminhtml
@@ -39,7 +39,7 @@ class RateTest extends \Magento\Backend\Utility\Controller
{
$this->getRequest()->setPost($postData);
- $this->dispatch('backend/admin/tax_rate/ajaxSave');
+ $this->dispatch('backend/tax/rate/ajaxSave');
$jsonBody = $this->getResponse()->getBody();
$result = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Helper\Data')
@@ -108,7 +108,7 @@ class RateTest extends \Magento\Backend\Utility\Controller
{
$this->getRequest()->setPost($postData);
- $this->dispatch('backend/admin/tax_rate/ajaxSave');
+ $this->dispatch('backend/tax/rate/ajaxSave');
$jsonBody = $this->getResponse()->getBody();
$result = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Helper\Data')
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Tax/TaxTest.php b/dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/TaxTest.php
similarity index 95%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Tax/TaxTest.php
rename to dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/TaxTest.php
index 4991769d56e..25a4a9fc02f 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/Tax/TaxTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/TaxTest.php
@@ -19,13 +19,13 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Tax
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Controller\Tax;
+namespace Magento\Tax\Controller\Adminhtml;
/**
* @magentoAppArea adminhtml
@@ -43,7 +43,7 @@ class TaxTest extends \Magento\Backend\Utility\Controller
{
$this->getRequest()->setPost($postData);
- $this->dispatch('backend/admin/tax_tax/ajaxSave');
+ $this->dispatch('backend/tax/tax/ajaxSave');
$jsonBody = $this->getResponse()->getBody();
$result = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Helper\Data')
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php
index 665e29622fd..3f6658e2e72 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php
@@ -43,46 +43,6 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
self::$_cachedFiles = array(); // Free memory
}
- public function testHandlesHierarchy()
- {
- $invoker = new \Magento\TestFramework\Utility\AggregateInvoker($this);
- $invoker(
- /**
- * @param \Magento\View\Design\ThemeInterface $theme
- */
- function (\Magento\View\Design\ThemeInterface $theme) {
- $xml = $this->_composeXml($theme);
-
- /**
- * There could be used an xpath "/layouts/*[@type or @owner or @parent]", but it randomly produced bugs,
- * by selecting all nodes in depth. Thus it was refactored into manual nodes extraction.
- */
- $handles = array();
- foreach ($xml->children() as $handleNode) {
- if ($handleNode->getAttribute('type')
- || $handleNode->getAttribute('owner')
- || $handleNode->getAttribute('parent')
- ) {
- $handles[] = $handleNode;
- }
- }
-
- /** @var \Magento\View\Layout\Element $node */
- $errors = array();
- foreach ($handles as $node) {
- $this->_collectHierarchyErrors($node, $xml, $errors);
- }
-
- if ($errors) {
- $this->fail("There are errors while checking the page type and fragment types hierarchy at:\n"
- . var_export($errors, 1)
- );
- }
- },
- $this->areasAndThemesDataProvider()
- );
- }
-
/**
* Composes full layout xml for designated parameters
*
@@ -107,8 +67,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
protected function _collectHierarchyErrors($node, $xml, &$errors)
{
$name = $node->getName();
- $refName = $node->getAttribute('type') == \Magento\Core\Model\Layout\Merge::TYPE_FRAGMENT
- ? $node->getAttribute('owner') : $node->getAttribute('parent');
+ $refName = $node->getAttribute('type') == $node->getAttribute('parent');
if ($refName) {
$refNode = $xml->xpath("/layouts/{$refName}");
if (!$refNode) {
@@ -116,8 +75,6 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
$this->markTestIncomplete('MAGETWO-9182');
}
$errors[$name][] = "Node '{$refName}', referenced in hierarchy, does not exist";
- } elseif ($refNode[0]->getAttribute('type') == \Magento\Core\Model\Layout\Merge::TYPE_FRAGMENT) {
- $errors[$name][] = "Page fragment type '{$refName}', cannot be an ancestor in a hierarchy";
}
}
}
@@ -160,8 +117,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
$xml = $this->_composeXml($theme);
$xpath = '/layouts/*['
- . '@type="' . \Magento\Core\Model\Layout\Merge::TYPE_PAGE . '"'
- . ' or @type="' . \Magento\Core\Model\Layout\Merge::TYPE_FRAGMENT . '"]';
+ . '@type="' . \Magento\Core\Model\Layout\Merge::TYPE_PAGE . '"]';
$handles = $xml->xpath($xpath) ?: array();
/** @var \Magento\View\Layout\Element $node */
@@ -190,7 +146,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
/**
* Check whether page types are declared only in layout update files allowed for it - base ones
*/
- function (\Magento\Core\Model\Layout\File $layout) {
+ function (\Magento\View\Layout\File $layout) {
$content = simplexml_load_file($layout->getFilename());
$this->assertEmpty(
$content->xpath(\Magento\Core\Model\Layout\Merge::XPATH_HANDLE_DECLARATION),
@@ -204,21 +160,21 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
/**
* Get theme layout updates
*
- * @return \Magento\Core\Model\Layout\File[]
+ * @return \Magento\View\Layout\File[]
*/
public function pageTypesDeclarationDataProvider()
{
- /** @var $themeUpdates \Magento\Core\Model\Layout\File\Source\Theme */
+ /** @var $themeUpdates \Magento\View\Layout\File\Source\Theme */
$themeUpdates = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create('Magento\Core\Model\Layout\File\Source\Theme');
- /** @var $themeUpdatesOverride \Magento\Core\Model\Layout\File\Source\Override\Theme */
+ ->create('Magento\View\Layout\File\Source\Theme');
+ /** @var $themeUpdatesOverride \Magento\View\Layout\File\Source\Override\Theme */
$themeUpdatesOverride = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create('Magento\Core\Model\Layout\File\Source\Override\Theme');
+ ->create('Magento\View\Layout\File\Source\Override\Theme');
/** @var $themeCollection \Magento\Core\Model\Theme\Collection */
$themeCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->create('Magento\Core\Model\Theme\Collection');
$themeCollection->addDefaultPattern('*');
- /** @var $themeLayouts \Magento\Core\Model\Layout\File[] */
+ /** @var $themeLayouts \Magento\View\Layout\File[] */
$themeLayouts = array();
/** @var $theme \Magento\View\Design\ThemeInterface */
foreach ($themeCollection as $theme) {
@@ -239,13 +195,13 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
/**
* Check, that for an overriding file ($themeFile) in a theme ($theme), there is a corresponding base file
*
- * @param \Magento\Core\Model\Layout\File $themeFile
+ * @param \Magento\View\Layout\File $themeFile
* @param \Magento\View\Design\ThemeInterface $theme
*/
function ($themeFile, $theme) {
$baseFiles = self::_getCachedFiles(
$theme->getArea(),
- 'Magento\Core\Model\Layout\File\Source\Base',
+ 'Magento\View\Layout\File\Source\Base',
$theme
);
$fileKey = $themeFile->getModule() . '/' . $themeFile->getName();
@@ -265,7 +221,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
* Check, that for an ancestor-overriding file ($themeFile) in a theme ($theme),
* there is a corresponding file in that ancestor theme
*
- * @param \Magento\Core\Model\Layout\File $themeFile
+ * @param \Magento\View\Layout\File $themeFile
* @param \Magento\View\Design\ThemeInterface $theme
*/
function ($themeFile, $theme) {
@@ -288,7 +244,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
// Search for the overridden file in the ancestor theme
$ancestorFiles = self::_getCachedFiles($ancestorTheme->getFullPath(),
- 'Magento\Core\Model\Layout\File\Source\Theme', $ancestorTheme);
+ 'Magento\View\Layout\File\Source\Theme', $ancestorTheme);
$fileKey = $themeFile->getModule() . '/' . $themeFile->getName();
$this->assertArrayHasKey($fileKey, $ancestorFiles,
sprintf("Could not find original file in '%s' theme, overridden by file '%s'.",
@@ -305,12 +261,12 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
* @param string $cacheKey
* @param string $sourceClass
* @param \Magento\View\Design\ThemeInterface $theme
- * @return \Magento\Core\Model\Layout\File[]
+ * @return \Magento\View\Layout\File[]
*/
protected static function _getCachedFiles($cacheKey, $sourceClass, \Magento\View\Design\ThemeInterface $theme)
{
if (!isset(self::$_cachedFiles[$cacheKey])) {
- /* @var $fileList \Magento\Core\Model\Layout\File[] */
+ /* @var $fileList \Magento\View\Layout\File[] */
$fileList = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->create($sourceClass)->getFiles($theme);
$files = array();
@@ -329,7 +285,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
{
return $this->_retrieveFilesForEveryTheme(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create('Magento\Core\Model\Layout\File\Source\Override\Base')
+ ->create('Magento\View\Layout\File\Source\Override\Base')
);
}
@@ -340,7 +296,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
{
return $this->_retrieveFilesForEveryTheme(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create('Magento\Core\Model\Layout\File\Source\Override\Theme')
+ ->create('Magento\View\Layout\File\Source\Override\Theme')
);
}
@@ -348,10 +304,10 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
* Scan all the themes in the system, for each theme retrieve list of files via $filesRetriever,
* and return them as array of pairs [file, theme].
*
- * @param \Magento\Core\Model\Layout\File\SourceInterface $filesRetriever
+ * @param \Magento\View\Layout\File\SourceInterface $filesRetriever
* @return array
*/
- protected function _retrieveFilesForEveryTheme(\Magento\Core\Model\Layout\File\SourceInterface $filesRetriever)
+ protected function _retrieveFilesForEveryTheme(\Magento\View\Layout\File\SourceInterface $filesRetriever)
{
$result = array();
/** @var $themeCollection \Magento\Core\Model\Theme\Collection */
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/_files/skip_blocks_ce.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/_files/skip_blocks_ce.php
index 8376a2ec944..5c04054be34 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/_files/skip_blocks_ce.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/_files/skip_blocks_ce.php
@@ -36,7 +36,7 @@ return array(
// Fails because of bug in \Magento\Webapi\Model\Acl\Loader\Resource\ConfigReader constructor
'Magento\Adminhtml\Block\Cms\Page',
'Magento\Adminhtml\Block\Cms\Page\Edit',
- 'Magento\Adminhtml\Block\Sales\Order',
+ 'Magento\Sales\Block\Adminhtml\Order',
'Magento\Oauth\Block\Adminhtml\Oauth\Consumer',
'Magento\Oauth\Block\Adminhtml\Oauth\Consumer\Grid',
'Magento\Paypal\Block\Adminhtml\Settlement\Report',
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/ViewFileReferenceTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/ViewFileReferenceTest.php
index 3a9fbc811f9..0e9a42648db 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/ViewFileReferenceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/ViewFileReferenceTest.php
@@ -41,12 +41,12 @@ namespace Magento\Test\Integrity;
class ViewFileReferenceTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Design\Fallback\Rule\RuleInterface
+ * @var \Magento\View\Design\Fallback\Rule\RuleInterface
*/
static protected $_fallbackRule;
/**
- * @var \Magento\Core\Model\Design\FileResolution\Strategy\Fallback
+ * @var \Magento\View\Design\FileResolution\Strategy\Fallback
*/
static protected $_fallback;
@@ -64,11 +64,11 @@ class ViewFileReferenceTest extends \PHPUnit_Framework_TestCase
{
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
- /** @var $fallbackFactory \Magento\Core\Model\Design\Fallback\Factory */
- $fallbackFactory = $objectManager->get('Magento\Core\Model\Design\Fallback\Factory');
+ /** @var $fallbackFactory \Magento\View\Design\Fallback\Factory */
+ $fallbackFactory = $objectManager->get('Magento\View\Design\Fallback\Factory');
self::$_fallbackRule = $fallbackFactory->createViewFileRule();
- self::$_fallback = $objectManager->get('Magento\Core\Model\Design\FileResolution\Strategy\Fallback');
+ self::$_fallback = $objectManager->get('Magento\View\Design\FileResolution\Strategy\Fallback');
// Themes to be checked
self::$_themeCollection = $objectManager->get('Magento\Core\Model\Theme\Collection');
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Design/FileResolution/Strategy/FallbackTest.php b/dev/tests/integration/testsuite/Magento/View/Design/FileResolution/Strategy/FallbackTest.php
similarity index 95%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Design/FileResolution/Strategy/FallbackTest.php
rename to dev/tests/integration/testsuite/Magento/View/Design/FileResolution/Strategy/FallbackTest.php
index f54b9c6658f..fff9ea875e7 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Design/FileResolution/Strategy/FallbackTest.php
+++ b/dev/tests/integration/testsuite/Magento/View/Design/FileResolution/Strategy/FallbackTest.php
@@ -25,8 +25,16 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\Design\FileResolution\Strategy;
+namespace Magento\View\Design\FileResolution\Strategy;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\View\Design\Fallback\Factory;
+
+/**
+ * Fallback Test
+ *
+ * @package Magento\View
+ */
class FallbackTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -48,7 +56,7 @@ class FallbackTest extends \PHPUnit_Framework_TestCase
/**
* Build a model to test
*
- * @return \Magento\Core\Model\Design\FileResolution\Strategy\Fallback
+ * @return \Magento\View\Design\FileResolution\Strategy\Fallback
*/
protected function _buildModel()
{
@@ -59,9 +67,9 @@ class FallbackTest extends \PHPUnit_Framework_TestCase
array(\Magento\App\Dir::THEMES => $this->_viewDir)
);
- return \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- 'Magento\Core\Model\Design\FileResolution\Strategy\Fallback',
- array('fallbackFactory' => new \Magento\Core\Model\Design\Fallback\Factory($dirs))
+ return Bootstrap::getObjectManager()->create(
+ 'Magento\View\Design\FileResolution\Strategy\Fallback',
+ array('fallbackFactory' => new Factory($dirs))
);
}
@@ -75,7 +83,7 @@ class FallbackTest extends \PHPUnit_Framework_TestCase
protected function _getThemeModel($area, $themePath)
{
/** @var $collection \Magento\Core\Model\Theme\Collection */
- $collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ $collection = Bootstrap::getObjectManager()
->create('Magento\Core\Model\Theme\Collection');
$themeModel = $collection->setBaseDir($this->_viewDir)
->addDefaultPattern()
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_custom_theme/Fixture_Module/fixture_script_two.js b/dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_custom_theme/Fixture_Module/fixture_script_two.js
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_custom_theme/Fixture_Module/fixture_script_two.js
rename to dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_custom_theme/Fixture_Module/fixture_script_two.js
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_custom_theme/Fixture_Module/fixture_template_two.phtml b/dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_custom_theme/Fixture_Module/fixture_template_two.phtml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_custom_theme/Fixture_Module/fixture_template_two.phtml
rename to dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_custom_theme/Fixture_Module/fixture_template_two.phtml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_custom_theme/fixture_script_two.js b/dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_custom_theme/fixture_script_two.js
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_custom_theme/fixture_script_two.js
rename to dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_custom_theme/fixture_script_two.js
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_custom_theme/fixture_template_two.phtml b/dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_custom_theme/fixture_template_two.phtml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_custom_theme/fixture_template_two.phtml
rename to dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_custom_theme/fixture_template_two.phtml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_custom_theme/i18n/en_US.csv b/dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_custom_theme/i18n/en_US.csv
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_custom_theme/i18n/en_US.csv
rename to dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_custom_theme/i18n/en_US.csv
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_custom_theme/mage/script.js b/dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_custom_theme/mage/script.js
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_custom_theme/mage/script.js
rename to dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_custom_theme/mage/script.js
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_custom_theme/theme.xml b/dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_custom_theme/theme.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_custom_theme/theme.xml
rename to dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_custom_theme/theme.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_custom_theme2/theme.xml b/dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_custom_theme2/theme.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_custom_theme2/theme.xml
rename to dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_custom_theme2/theme.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_default/Fixture_Module/fixture_script.js b/dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_default/Fixture_Module/fixture_script.js
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_default/Fixture_Module/fixture_script.js
rename to dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_default/Fixture_Module/fixture_script.js
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_default/Fixture_Module/fixture_template.phtml b/dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_default/Fixture_Module/fixture_template.phtml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_default/Fixture_Module/fixture_template.phtml
rename to dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_default/Fixture_Module/fixture_template.phtml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_default/fixture_script.js b/dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_default/fixture_script.js
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_default/fixture_script.js
rename to dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_default/fixture_script.js
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_default/fixture_template.phtml b/dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_default/fixture_template.phtml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_default/fixture_template.phtml
rename to dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_default/fixture_template.phtml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_default/i18n/en_US.csv b/dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_default/i18n/en_US.csv
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_default/i18n/en_US.csv
rename to dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_default/i18n/en_US.csv
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_default/i18n/ru_RU/Fixture_Module/fixture_script.js b/dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_default/i18n/ru_RU/Fixture_Module/fixture_script.js
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_default/i18n/ru_RU/Fixture_Module/fixture_script.js
rename to dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_default/i18n/ru_RU/Fixture_Module/fixture_script.js
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_default/i18n/ru_RU/fixture_script.js b/dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_default/i18n/ru_RU/fixture_script.js
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_default/i18n/ru_RU/fixture_script.js
rename to dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_default/i18n/ru_RU/fixture_script.js
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_default/theme.xml b/dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_default/theme.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_default/theme.xml
rename to dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_default/theme.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_standalone_theme/theme.xml b/dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_standalone_theme/theme.xml
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/design/frontend/vendor_standalone_theme/theme.xml
rename to dev/tests/integration/testsuite/Magento/View/_files/fallback/design/frontend/vendor_standalone_theme/theme.xml
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/pub/lib/mage/script.js b/dev/tests/integration/testsuite/Magento/View/_files/fallback/pub/lib/mage/script.js
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/Model/_files/fallback/pub/lib/mage/script.js
rename to dev/tests/integration/testsuite/Magento/View/_files/fallback/pub/lib/mage/script.js
diff --git a/dev/tests/integration/testsuite/Magento/Webapi/Block/Adminhtml/AbstractFormTest.php b/dev/tests/integration/testsuite/Magento/Webapi/Block/Adminhtml/AbstractFormTest.php
index 1c22013f27b..9cc4f1a13e5 100644
--- a/dev/tests/integration/testsuite/Magento/Webapi/Block/Adminhtml/AbstractFormTest.php
+++ b/dev/tests/integration/testsuite/Magento/Webapi/Block/Adminhtml/AbstractFormTest.php
@@ -97,7 +97,7 @@ abstract class AbstractFormTest extends \PHPUnit_Framework_TestCase
$this->_urlBuilder->expects($this->once())
->method('getUrl')
- ->with('*/*/save', array())
+ ->with('adminhtml/*/save', array())
->will($this->returnValue('action_url'));
$this->_block->toHtml();
diff --git a/dev/tests/integration/testsuite/Magento/Webhook/Block/Adminhtml/Registration/ActivateTest.php b/dev/tests/integration/testsuite/Magento/Webhook/Block/Adminhtml/Registration/ActivateTest.php
index d0ab155da88..997f03dc03a 100644
--- a/dev/tests/integration/testsuite/Magento/Webhook/Block/Adminhtml/Registration/ActivateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Webhook/Block/Adminhtml/Registration/ActivateTest.php
@@ -63,7 +63,7 @@ class ActivateTest extends \PHPUnit_Framework_TestCase
->create('Magento\Webhook\Block\Adminhtml\Registration\Activate', array($context, $registry));
$urlBuilder = $context->getUrlBuilder();
- $expectedUrl = $urlBuilder->getUrl('*/*/accept', array('id' => $subscriptionId));
+ $expectedUrl = $urlBuilder->getUrl('adminhtml/*/accept', array('id' => $subscriptionId));
$this->assertEquals($expectedUrl, $block->getAcceptUrl());
$this->assertEquals('name', $block->getSubscriptionName());
diff --git a/dev/tests/integration/testsuite/Magento/Webhook/Block/Adminhtml/Registration/Create/Form/ContainerTest.php b/dev/tests/integration/testsuite/Magento/Webhook/Block/Adminhtml/Registration/Create/Form/ContainerTest.php
index 504c55fd815..e389d67d462 100644
--- a/dev/tests/integration/testsuite/Magento/Webhook/Block/Adminhtml/Registration/Create/Form/ContainerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Webhook/Block/Adminhtml/Registration/Create/Form/ContainerTest.php
@@ -63,7 +63,7 @@ class ContainerTest extends \PHPUnit_Framework_TestCase
));
$urlBuilder = $context->getUrlBuilder();
- $expectedUrl = $urlBuilder->getUrl('*/*/register', array('id' => $subscriptionId));
+ $expectedUrl = $urlBuilder->getUrl('adminhtml/*/register', array('id' => $subscriptionId));
$this->assertEquals($expectedUrl, $block->getSubmitUrl());
$this->assertEquals('name', $block->getSubscriptionName());
diff --git a/dev/tests/integration/testsuite/Magento/Webhook/Block/Adminhtml/Registration/Create/FormTest.php b/dev/tests/integration/testsuite/Magento/Webhook/Block/Adminhtml/Registration/Create/FormTest.php
index e8cfd469f58..a80a8cc1ebb 100644
--- a/dev/tests/integration/testsuite/Magento/Webhook/Block/Adminhtml/Registration/Create/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/Webhook/Block/Adminhtml/Registration/Create/FormTest.php
@@ -35,7 +35,7 @@ class FormTest extends \PHPUnit_Framework_TestCase
{
public function testPrepareForm()
{
- /** @var $layout \Magento\Core\Model\Layout */
+ /** @var $layout \Magento\View\LayoutInterface */
$layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Core\Model\Layout');
/** @var \Magento\Core\Model\Registry $registry */
@@ -59,7 +59,7 @@ class FormTest extends \PHPUnit_Framework_TestCase
$this->assertInstanceOf('Magento\Data\Form', $form);
$this->assertEquals('post', $form->getData('method'));
- $this->assertEquals($block->getUrl('*/*/register', array('id' => 333)), $form->getData('action'));
+ $this->assertEquals($block->getUrl('adminhtml/*/register', array('id' => 333)), $form->getData('action'));
$this->assertEquals('api_user', $form->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Webhook/Block/Adminhtml/Subscription/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/Webhook/Block/Adminhtml/Subscription/Edit/FormTest.php
index f679d7498af..d9899520ef7 100644
--- a/dev/tests/integration/testsuite/Magento/Webhook/Block/Adminhtml/Subscription/Edit/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/Webhook/Block/Adminhtml/Subscription/Edit/FormTest.php
@@ -35,7 +35,7 @@ class FormTest extends \PHPUnit_Framework_TestCase
{
public function testPrepareForm()
{
- /** @var $layout \Magento\Core\Model\Layout */
+ /** @var $layout \Magento\View\LayoutInterface */
$layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Core\Model\Layout');
/** @var \Magento\Core\Model\Registry $registry */
diff --git a/dev/tests/integration/testsuite/Magento/Webhook/Model/Resource/EventTest.php b/dev/tests/integration/testsuite/Magento/Webhook/Model/Resource/EventTest.php
index 429a147a1a6..66c7cdb0aa8 100644
--- a/dev/tests/integration/testsuite/Magento/Webhook/Model/Resource/EventTest.php
+++ b/dev/tests/integration/testsuite/Magento/Webhook/Model/Resource/EventTest.php
@@ -33,7 +33,7 @@ namespace Magento\Webhook\Model\Resource;
class EventTest extends \PHPUnit_Framework_TestCase
{
/**
- * @covers \Magento\Webhook\Model\Resource\Event::init
+ * @covers \Magento\Webhook\Model\Resource\Event::_init
*/
public function testInit()
{
diff --git a/dev/tests/integration/testsuite/Magento/Webhook/Model/Resource/JobTest.php b/dev/tests/integration/testsuite/Magento/Webhook/Model/Resource/JobTest.php
index 93d071a101b..2cba6e970fe 100644
--- a/dev/tests/integration/testsuite/Magento/Webhook/Model/Resource/JobTest.php
+++ b/dev/tests/integration/testsuite/Magento/Webhook/Model/Resource/JobTest.php
@@ -30,7 +30,7 @@ namespace Magento\Webhook\Model\Resource;
class JobTest extends \PHPUnit_Framework_TestCase
{
/**
- * @covers \Magento\Webhook\Model\Resource\Job::init
+ * @covers \Magento\Webhook\Model\Resource\Job::_init
*/
public function testInit()
{
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/catalogsearch_ajax_suggest.xml b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/catalogsearch_ajax_suggest.xml
index 4659f9e5353..9d2b1564038 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/catalogsearch_ajax_suggest.xml
+++ b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/catalogsearch_ajax_suggest.xml
@@ -23,4 +23,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Quick Search Form Suggestions" type="fragment" owner="root_page_with_own_containers"/>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Catalog Quick Search Form Suggestions" type="page"/>
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_inherited_containers.xml b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_inherited_containers.xml
index a4b67274874..6a9e09d4c58 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_inherited_containers.xml
+++ b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_inherited_containers.xml
@@ -23,4 +23,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" type="page" parent="root_page_with_own_containers" label="Child Page with Inherited Containers"/>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" type="page" label="Child Page with Inherited Containers"/>
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_inherited_imported_containers.xml b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_inherited_imported_containers.xml
index 5fdd2e18e59..e6804e12867 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_inherited_imported_containers.xml
+++ b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_inherited_imported_containers.xml
@@ -23,4 +23,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" type="page" parent="root_page_with_imported_containers" label="Child Page with Inherited Imported Containers"/>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" type="page" label="Child Page with Inherited Imported Containers"/>
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_own_containers.xml b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_own_containers.xml
index b02a5005ce3..fb150a481cc 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_own_containers.xml
+++ b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_with_own_containers.xml
@@ -23,6 +23,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" type="page" parent="root_page_without_own_containers" label="Child Page with Own Containers">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" type="page" label="Child Page with Own Containers">
<container name="container_three" label="Container Three"/>
</layout>
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_without_containers.xml b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_without_containers.xml
index 8513658805a..f7009faad20 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_without_containers.xml
+++ b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/layout/child_page_without_containers.xml
@@ -23,4 +23,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" type="page" parent="root_page_without_own_containers" label="Child Page without Containers"/>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" type="page" label="Child Page without Containers"/>
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/page_types_select.html b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/page_types_select.html
index 664cbc4e076..b187a400c53 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/page_types_select.html
+++ b/dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Chooser/_files/page_types_select.html
@@ -27,14 +27,17 @@
-->
<select name="page_type" id="page_types_select" class="page-types-select" title="Page Types Select">
<option value="">-- Please Select --</option>
- <!--
+ <!-- alpha order, without page type hierarchy
+ <option value="child_page_with_own_containers">Child Page with Own Containers</option>
<option value="root_page_without_own_containers">Root Page without Own Containers</option>
- <option value="child_page_with_own_containers">. Child Page with Own Containers</option>
-->
- <option value="root_page_with_imported_containers">Root Page with Imported Containers</option>
- <option value="child_page_with_inherited_imported_containers">. Child Page with Inherited Imported Containers</option>
-
- <option value="root_page_with_own_containers">Root Page with Own Containers</option>
- <option value="catalogsearch_ajax_suggest" class="fragment">. Catalog Quick Search Form Suggestions</option>
- <option value="child_page_with_inherited_containers">. Child Page with Inherited Containers</option>
+ <option value="catalogsearch_ajax_suggest">Catalog Quick Search Form Suggestions</option>
+ <option value="child_page_with_inherited_containers" >Child Page with Inherited Containers</option>
+ <option value="child_page_with_inherited_imported_containers" >Child Page with Inherited Imported Containers</option>
+ <option value="child_page_with_own_containers" >Child Page with Own Containers</option>
+ <option value="child_page_without_containers" >Child Page without Containers</option>
+ <option value="root_page_with_imported_containers" >Root Page with Imported Containers</option>
+ <option value="root_page_with_own_containers" >Root Page with Own Containers</option>
+ <option value="root_page_without_containers" >Root Page without Containers</option>
+ <option value="root_page_without_own_containers" >Root Page without Own Containers</option>
</select>
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/code/Magento/Test/etc/widget.xml b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/code/Magento/Test/etc/widget.xml
index fdfb91ece4f..1b9ee3eafa5 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/code/Magento/Test/etc/widget.xml
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/code/Magento/Test/etc/widget.xml
@@ -57,7 +57,7 @@
</parameter>
<parameter name="id_path" xsi:type="block" visible="true" required="true" sort_order="10">
<label translate="true">Product</label>
- <block class="Magento\Adminhtml\Block\Catalog\Product\Widget\Chooser">
+ <block class="Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser">
<data>
<item name="button" xsi:type="array">
<item name="open" xsi:type="string">Select Product...</item>
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/expectedGlobalArray.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/expectedGlobalArray.php
index cef5b7728f2..9d4b5a92de3 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/expectedGlobalArray.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/expectedGlobalArray.php
@@ -78,7 +78,7 @@ return array(
'type' => 'complex',
),
'helper_block' => array(
- 'type' => 'Magento\Adminhtml\Block\Catalog\Product\Widget\Chooser',
+ 'type' => 'Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser',
'data' => array(
'button' => array(
'open' => 'Select Product...'
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/expectedGlobalDesignArray.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/expectedGlobalDesignArray.php
index 5665d1c7aad..e7c55554b4e 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/expectedGlobalDesignArray.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/_files/expectedGlobalDesignArray.php
@@ -78,7 +78,7 @@ return array(
'type' => 'complex',
),
'helper_block' => array(
- 'type' => 'Magento\Adminhtml\Block\Catalog\Product\Widget\Chooser',
+ 'type' => 'Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser',
'data' => array(
'button' => array(
'open' => 'Select Product...'
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/ConfigTest.php
index b8b6742e265..340aa83fa6e 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/ConfigTest.php
@@ -62,7 +62,10 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
$this->assertInternalType('array', $settings['widget_placeholders']);
- $this->assertStringStartsWith('http://localhost/index.php/key', $settings['widget_window_url']);
+ $this->assertStringStartsWith(
+ 'http://localhost/index.php/backend/admin/widget/index/key',
+ $settings['widget_window_url']
+ );
}
public function testGetWidgetWindowUrl()
@@ -71,6 +74,6 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
$url = $this->_model->getWidgetWindowUrl($config);
- $this->assertStringStartsWith('http://localhost/index.php/skip_widgets/', $url);
+ $this->assertStringStartsWith('http://localhost/index.php/backend/admin/widget/index/skip_widgets', $url);
}
}
diff --git a/dev/tests/static/framework/Magento/TestFramework/Utility/AggregateInvoker.php b/dev/tests/static/framework/Magento/TestFramework/Utility/AggregateInvoker.php
index 3e0dc8e6dbd..4bdcb1aeb3e 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Utility/AggregateInvoker.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Utility/AggregateInvoker.php
@@ -31,7 +31,7 @@ namespace Magento\TestFramework\Utility;
class AggregateInvoker
{
/**
- * @var PHPUnit_Framework_TestCase
+ * @var \PHPUnit_Framework_TestCase
*/
protected $_testCase;
@@ -91,7 +91,7 @@ class AggregateInvoker
} catch (\PHPUnit_Framework_SkippedTestError $exception) {
$results[get_class($exception)][] = $exceptionDumper($exception, $dataSet);
} catch (\PHPUnit_Framework_AssertionFailedError $exception) {
- $results[get_class($exception)][] = $exceptionDumper($exception, $dataSet);
+ $results['PHPUnit_Framework_AssertionFailedError'][] = $exceptionDumper($exception, $dataSet);
}
}
$this->processResults($results, $passed);
diff --git a/dev/tests/static/framework/Magento/TestFramework/Utility/Classes.php b/dev/tests/static/framework/Magento/TestFramework/Utility/Classes.php
index 74b0f8e0fe3..6760c50ea07 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Utility/Classes.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Utility/Classes.php
@@ -170,8 +170,7 @@ class Classes
$classes = self::getXmlAttributeValues($xml, '/layout//block[@type]', 'type');
$classes = array_merge($classes, self::getXmlNodeValues($xml,
'/layout//action/attributeType | /layout//action[@method="addTab"]/content
- | /layout//action[@method="addRenderer"or @method="addColumnRender"
- or @method="addPriceBlockType" or @method="addMergeSettingsBlockType"
+ | /layout//action[@method="addPriceBlockType" or @method="addMergeSettingsBlockType"
or @method="addInformationRenderer"
or @method="addDatabaseBlock"]/*[2]
| /layout//action[@method="setMassactionBlockName"]/name
diff --git a/dev/tests/static/framework/tests/unit/phpunit.xml.dist b/dev/tests/static/framework/tests/unit/phpunit.xml.dist
index 0c5e98d6538..5132c968832 100644
--- a/dev/tests/static/framework/tests/unit/phpunit.xml.dist
+++ b/dev/tests/static/framework/tests/unit/phpunit.xml.dist
@@ -28,7 +28,7 @@
<phpunit bootstrap="../../bootstrap.php">
<testsuites>
<testsuite name="Magento Unit Tests for Static Code Analysis Framework">
- <directory suffix="Test.php">testsuite/Magento/Test</directory>
+ <directory suffix="Test.php">testsuite/Magento/TestFramework</directory>
</testsuite>
</testsuites>
<php>
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/CodingStandard/Tool/CodeMessDetectorTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeMessDetectorTest.php
similarity index 96%
rename from dev/tests/static/framework/tests/unit/testsuite/Magento/Test/CodingStandard/Tool/CodeMessDetectorTest.php
rename to dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeMessDetectorTest.php
index 7acb1183893..b64f1938bf0 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/CodingStandard/Tool/CodeMessDetectorTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeMessDetectorTest.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Test\CodingStandard\Tool;
+namespace Magento\TestFramework\CodingStandard\Tool;
class CodeMessDetectorTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/CodingStandard/Tool/CodeSniffer/WrapperTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/WrapperTest.php
similarity index 95%
rename from dev/tests/static/framework/tests/unit/testsuite/Magento/Test/CodingStandard/Tool/CodeSniffer/WrapperTest.php
rename to dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/WrapperTest.php
index 3173281da60..47dc2129449 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/CodingStandard/Tool/CodeSniffer/WrapperTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/WrapperTest.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Test\CodingStandard\Tool\CodeSniffer;
+namespace Magento\TestFramework\CodingStandard\Tool\CodeSniffer;
class WrapperTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/CodingStandard/Tool/CodeSnifferTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php
similarity index 98%
rename from dev/tests/static/framework/tests/unit/testsuite/Magento/Test/CodingStandard/Tool/CodeSnifferTest.php
rename to dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php
index 0675dead7ed..f27a21bc43b 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/CodingStandard/Tool/CodeSnifferTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Test\CodingStandard\Tool;
+namespace Magento\TestFramework\CodingStandard\Tool;
class CodeSnifferTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/JsHint/CommandTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/JsHint/CommandTest.php
similarity index 99%
rename from dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/JsHint/CommandTest.php
rename to dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/JsHint/CommandTest.php
index 432c5363e2c..a4ed9df4f72 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/JsHint/CommandTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/JsHint/CommandTest.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Test\Inspection\JsHint;
+namespace Magento\TestFramework\Inspection\JsHint;
class CommandTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/WordsFinderTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/WordsFinderTest.php
similarity index 99%
rename from dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/WordsFinderTest.php
rename to dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/WordsFinderTest.php
index 619d66b45c2..5c6e63e69c9 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/WordsFinderTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/WordsFinderTest.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Test\Inspection;
+namespace Magento\TestFramework\Inspection;
class WordsFinderTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/broken_config.xml b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/broken_config.xml
similarity index 100%
rename from dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/broken_config.xml
rename to dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/broken_config.xml
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/config.xml b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/config.xml
similarity index 100%
rename from dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/config.xml
rename to dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/config.xml
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/config_additional.xml b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/config_additional.xml
similarity index 100%
rename from dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/config_additional.xml
rename to dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/config_additional.xml
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/empty_whitelist_path.xml b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/empty_whitelist_path.xml
similarity index 100%
rename from dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/empty_whitelist_path.xml
rename to dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/empty_whitelist_path.xml
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/empty_words_config.xml b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/empty_words_config.xml
similarity index 100%
rename from dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/empty_words_config.xml
rename to dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/empty_words_config.xml
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/words_finder/buffy.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/buffy.php
similarity index 100%
rename from dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/words_finder/buffy.php
rename to dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/buffy.php
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/words_finder/buffy.zip b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/buffy.zip
similarity index 100%
rename from dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/words_finder/buffy.zip
rename to dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/buffy.zip
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/words_finder/interview_with_the_vampire.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/interview_with_the_vampire.php
similarity index 100%
rename from dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/words_finder/interview_with_the_vampire.php
rename to dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/interview_with_the_vampire.php
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/words_finder/interview_with_the_vampire.zip b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/interview_with_the_vampire.zip
similarity index 100%
rename from dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/words_finder/interview_with_the_vampire.zip
rename to dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/interview_with_the_vampire.zip
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/words_finder/self_tested_config.xml b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/self_tested_config.xml
similarity index 100%
rename from dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/words_finder/self_tested_config.xml
rename to dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/self_tested_config.xml
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/words_finder/twilight/eclipse.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/twilight/eclipse.php
similarity index 100%
rename from dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/words_finder/twilight/eclipse.php
rename to dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/twilight/eclipse.php
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/words_finder/twilight/newmoon.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/twilight/newmoon.php
similarity index 100%
rename from dev/tests/static/framework/tests/unit/testsuite/Magento/Test/Inspection/_files/words_finder/twilight/newmoon.php
rename to dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/twilight/newmoon.php
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/AggregateInvokerTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/AggregateInvokerTest.php
new file mode 100644
index 00000000000..44eb9f889f3
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/AggregateInvokerTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\TestFramework\Utility;
+
+class AggregateInvokerTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\TestFramework\Utility\AggregateInvoker
+ */
+ protected $_invoker;
+
+ /**
+ * @var \PHPUnit_Framework_TestCase|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_testCase;
+
+ protected function setUp()
+ {
+ $this->_testCase = $this->getMock('PHPUnit_Framework_TestCase');
+ $this->_invoker = new AggregateInvoker($this->_testCase, []);
+ }
+
+ /**
+ * @dataProvider callbackDataProvider
+ *
+ * @param string $expectedMessage
+ * @param string $expectedMethod
+ * @param string $exceptionClass
+ * @throws
+ */
+ public function testMainFlow($expectedMessage, $expectedMethod, $exceptionClass)
+ {
+ $this->_testCase->expects($this->any())
+ ->method($expectedMethod)
+ ->with($this->stringStartsWith($expectedMessage));
+ $this->_invoker->__invoke(
+ function () use ($exceptionClass) {
+ throw new $exceptionClass('Some meaningful message.');
+ },
+ [[0]]
+ );
+ }
+
+ /**
+ * @return array
+ */
+ public function callbackDataProvider()
+ {
+ return [
+ [
+ 'Passed: 0, Failed: 1, Incomplete: 0, Skipped: 0.',
+ 'fail',
+ 'PHPUnit_Framework_AssertionFailedError'
+ ],
+ [
+ 'Passed: 0, Failed: 1, Incomplete: 0, Skipped: 0.',
+ 'fail',
+ 'PHPUnit_Framework_OutputError'
+ ],
+ [
+ 'Passed: 0, Failed: 1, Incomplete: 0, Skipped: 0.',
+ 'fail',
+ 'PHPUnit_Framework_ExpectationFailedException'
+ ],
+ [
+ 'Passed: 0, Failed: 0, Incomplete: 1, Skipped: 0.',
+ 'markTestIncomplete',
+ 'PHPUnit_Framework_IncompleteTestError'
+ ],
+ [
+ 'Passed: 0, Failed: 0, Incomplete: 0, Skipped: 1.',
+ 'markTestCkipped',
+ 'PHPUnit_Framework_SkippedTestError'
+ ],
+ ];
+ }
+}
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/AdminhtmlTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/AdminhtmlTest.php
new file mode 100644
index 00000000000..f46801e1a38
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/AdminhtmlTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category tests
+ * @package static
+ * @subpackage Integrity
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Test\Integrity;
+use \Magento\TestFramework\Utility\Files;
+
+class AdminhtmlTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @dataProvider decouplingDataProvider
+ *
+ * @param $file
+ */
+ public function testAdminhtmlDecoupling($file)
+ {
+ $blackList = $this->_getDecouplingBlackList();
+ $blackList = array_map(
+ function ($element) {
+ $element = str_replace('/', DIRECTORY_SEPARATOR, $element);
+ return preg_quote($element, '/');
+ },
+ $blackList
+ );
+ $this->assertRegExp('/(' . implode('|', $blackList) . ')/', $file);
+ }
+
+ /**
+ * @return array
+ */
+ public function decouplingDataProvider()
+ {
+ $pathToModule = Files::init()->getPathToSource()
+ . DIRECTORY_SEPARATOR . 'app'
+ . DIRECTORY_SEPARATOR . 'code'
+ . DIRECTORY_SEPARATOR . 'Magento'
+ . DIRECTORY_SEPARATOR . 'Adminhtml'
+ ;
+
+ $result = glob(
+ $pathToModule . DIRECTORY_SEPARATOR . '{Block,Controller,Helper,Model}'. DIRECTORY_SEPARATOR . '*',
+ GLOB_BRACE | GLOB_NOSORT
+ );
+ // append views
+ $result = array_merge($result, glob(
+ $pathToModule . DIRECTORY_SEPARATOR . 'view[^layout]'
+ . DIRECTORY_SEPARATOR . 'adminhtml' . DIRECTORY_SEPARATOR . '*',
+ GLOB_BRACE | GLOB_NOSORT
+ ));
+ // append layouts
+ $result = array_merge($result, glob(
+ $pathToModule . DIRECTORY_SEPARATOR . 'view' . DIRECTORY_SEPARATOR . 'adminhtml'
+ . DIRECTORY_SEPARATOR . 'layout' . DIRECTORY_SEPARATOR . '*',
+ GLOB_BRACE | GLOB_NOSORT
+ ));
+
+ return Files::composeDataSets($result);
+ }
+
+ /**
+ * @return array
+ */
+ protected function _getDecouplingBlackList()
+ {
+ return require __DIR__ . DIRECTORY_SEPARATOR
+ . '_files' . DIRECTORY_SEPARATOR
+ . 'blacklist' . DIRECTORY_SEPARATOR
+ . 'adminhtml_decoupling.php';
+ }
+}
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
index 364734d929f..179b69d371d 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
@@ -465,6 +465,7 @@ class ClassesTest extends \PHPUnit_Framework_TestCase
// Remove usage of classes that have been declared as "use" or "include"
// Also deals with case like: "use \Zend\Code\Scanner\FileScanner, Magento\Tools\Di\Compiler\Log\Log;"
+ // (continued) where there is a comma separating two different classes.
if (preg_match('/use\s.*[\\n]?.*' . str_replace('\\', '\\\\', $badClass) . '[\,\;]/', $contents)) {
unset($badClasses[array_search($badClass, $badClasses)]);
}
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/HandlesTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/HandlesTest.php
index 2c8e1bd43b0..4807f52c5a7 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/HandlesTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/HandlesTest.php
@@ -43,32 +43,11 @@ class HandlesTest extends \PHPUnit_Framework_TestCase
$issues = array();
$node = simplexml_load_file($layoutFile);
$type = $node['type'];
- $parent = $node['parent'];
- $owner = $node['owner'];
$label = $node['label'];
- if ($type) {
- switch ($type) {
- case 'page':
- if ($owner) {
- $issues[] = 'Attribute "owner" is inappropriate for page types';
- }
- break;
- case 'fragment':
- if ($parent) {
- $issues[] = 'Attribute "parent" is inappropriate for page fragment types';
- }
- if (!$owner) {
- $issues[] = 'No attribute "owner" is specified for page fragment type';
- }
- break;
- }
- } else {
+ if (!$type) {
if ($label) {
$issues[] = 'Attribute "label" is defined, but "type" is not';
}
- if ($parent || $owner) {
- $issues[] = 'Attribute "parent" and/or "owner" is defined, but "type" is not';
- }
}
if ($issues) {
$this->fail("Issues found in handle declaration:\n" . implode("\n", $issues) . "\n");
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/adminhtml_decoupling.php b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/adminhtml_decoupling.php
new file mode 100644
index 00000000000..472e37de550
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/adminhtml_decoupling.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category tests
+ * @package static
+ * @subpackage Integrity
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+return array(
+ // Blocks
+ 'Block/Admin',
+ 'Block/Backup',
+ 'Block/Cache',
+ 'Block/Checkout',
+ 'Block/Cms',
+ 'Block/Customer',
+ 'Block/Dashboard',
+ 'Block/Denied',
+ 'Block/Html',
+ 'Block/Media',
+ 'Block/Messages',
+ 'Block/Newsletter',
+ 'Block/Page',
+ 'Block/Promo',
+ 'Block/Rating',
+ 'Block/Report',
+ 'Block/Review',
+ 'Block/Shipping',
+ 'Block/Sitemap',
+ 'Block/System',
+ 'Block/Template',
+ 'Block/Text',
+ 'Block/Urlrewrite',
+ 'Block/Widget',
+
+ // Controllers
+ 'Controller/Checkout',
+ 'Controller/Cms',
+ 'Controller/Customer',
+ 'Controller/Newsletter',
+ 'Controller/Promo',
+ 'Controller/Report',
+ 'Controller/System',
+ 'Controller/Promo',
+ 'Controller/Report',
+ 'Controller/Urlrewrite',
+
+ // Helpers
+ 'Helper/Addresses',
+ 'Helper/Media',
+ 'Helper/Data',
+ 'Helper/Js',
+
+ // Models
+ 'Model/Customer',
+ 'Model/Email',
+ 'Model/Giftmessage',
+ 'Model/LayoutUpdate',
+ 'Model/Newsletter',
+ 'Model/Observer',
+ 'Model/Report',
+ 'Model/Search',
+ 'Model/Session',
+
+ // Views
+ 'view/adminhtml/admin',
+ 'view/adminhtml/backup',
+ 'view/adminhtml/cms',
+ 'view/adminhtml/customer',
+ 'view/adminhtml/email',
+ 'view/adminhtml/images',
+ 'view/adminhtml/media',
+ 'view/adminhtml/newsletter',
+ 'view/adminhtml/page',
+ 'view/adminhtml/promo',
+ 'view/adminhtml/report',
+ 'view/adminhtml/review',
+ 'view/adminhtml/store',
+ 'view/adminhtml/system',
+ 'view/adminhtml/urlrewrite',
+ 'view/adminhtml/widget',
+ 'view/adminhtml/validation-rules.js',
+ 'view/adminhtml/variables.js',
+
+ // Layouts
+ 'layout/adminhtml_cache',
+ 'layout/adminhtml_cms',
+ 'layout/adminhtml_customer',
+ 'layout/adminhtml_denied',
+ 'layout/adminhtml_newsletter',
+ 'layout/adminhtml_noroute',
+ 'layout/adminhtml_promo',
+ 'layout/adminhtml_report',
+ 'layout/adminhtml_system',
+ 'layout/adminhtml_urlrewrite',
+ 'layout/default',
+ 'layout/editor',
+ 'layout/empty',
+ 'layout/formkey',
+ 'layout/newsletter',
+ 'layout/overlay_popup',
+ 'layout/popup',
+ 'layout/preview',
+ 'layout/report_sales',
+ 'layout/systemPreview',
+);
\ No newline at end of file
diff --git a/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/core.txt b/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/core.txt
index b79ebe6d785..cfcaf9992ef 100644
--- a/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/core.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/core.txt
@@ -9,12 +9,12 @@ app/code/Magento/Checkout/view/frontend/multishipping/payment.js
app/code/Magento/Checkout/view/frontend/onepage/accordion.js
app/code/Magento/Checkout/view/frontend/opcheckout.js
app/code/Magento/Captcha/view/frontend/onepage.js
-app/code/Magento/Adminhtml/view/adminhtml/catalog/category/edit.js
-app/code/Magento/Adminhtml/view/adminhtml/catalog/product/composite/configure.js
-app/code/Magento/Adminhtml/view/adminhtml/catalog/product.js
+app/code/Magento/Catalog/view/adminhtml/catalog/category/edit.js
+app/code/Magento/Catalog/view/adminhtml/catalog/product/composite/configure.js
+app/code/Magento/Catalog/view/adminhtml/catalog/product.js
app/code/Magento/Adminhtml/view/adminhtml/promo/rules.js
-app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/giftmessage.js
-app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/scripts.js
-app/code/Magento/Adminhtml/view/adminhtml/sales/order/giftoptions_tooltip.js
-app/code/Magento/Adminhtml/view/adminhtml/sales/order/shipment/packaging.js
+app/code/Magento/Sales/view/adminhtml/order/create/giftmessage.js
+app/code/Magento/Sales/view/adminhtml/order/create/scripts.js
+app/code/Magento/Sales/view/adminhtml/order/giftoptions_tooltip.js
+app/code/Magento/Sales/view/adminhtml/order/shipment/packaging.js
app/code/Magento/Adminhtml/view/adminhtml/variables.js
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php
index 26599006318..52dd0f986c9 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php
@@ -137,7 +137,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
}
if (false
- !== strpos($layoutFile, 'app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_sales_order')
+ !== strpos($layoutFile, 'app/code/Magento/Sales/view/adminhtml/layout/sales_order')
) {
$this->markTestIncomplete("The file {$layoutFile} has to use \\Magento\\Core\\Block\\Text\\List, \n"
. 'there is no solution to get rid of it right now.'
@@ -206,18 +206,15 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
'addBodyClass',
'addButtons',
'addColumnCountLayoutDepend',
- 'addColumnRender',
'addCrumb',
'addDatabaseBlock',
'addInputTypeTemplate',
'addNotice',
'addPriceBlockType',
- 'addRenderer',
'addReportTypeOption',
'addTab',
'addTabAfter',
'addText',
- 'addToParentGroup',
'append',
'removeTab',
'setActive',
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
index e3021b8f889..c7f028459d5 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
@@ -205,7 +205,11 @@ class ObsoleteCodeTest extends \PHPUnit_Framework_TestCase
{
foreach (self::$_classes as $row) {
list($class, , $replacement) = $row;
- $this->_assertNotRegExp('/[^a-z\d_;\\\\]' . preg_quote($class, '/') . '[^a-z\d_;\\\\]/iS', $content,
+ /* avoid collision between obsolete class name and valid namespace */
+ $content = preg_replace('/namespace[^;]+;/', '', $content);
+ $this->_assertNotRegExp(
+ '/[^a-z\d_]' . preg_quote($class, '/') . '[^a-z\d_\\\\]/iS',
+ $content,
$this->_suggestReplacement(sprintf("Class '%s' is obsolete.", $class), $replacement)
);
}
@@ -504,13 +508,13 @@ class ObsoleteCodeTest extends \PHPUnit_Framework_TestCase
$invoker = new \Magento\TestFramework\Utility\AggregateInvoker($this);
$invoker(
/**
- * Check elimination of "Mage" class usages
+ * Check absence of obsolete Mage class usages
*
* @param string $file
*/
function ($file) {
$this->_assertNotRegExp(
- '/[^a-z\d_]Mage::[^\s]+?\(/i',
+ '/[^a-z\d_]Mage\s*::/i',
file_get_contents($file),
'"Mage" class methods are obsolete'
);
@@ -524,11 +528,7 @@ class ObsoleteCodeTest extends \PHPUnit_Framework_TestCase
*/
public function mageObsoleteDataProvider()
{
- $blackList = include(
- __DIR__ . DIRECTORY_SEPARATOR .'_files'
- . DIRECTORY_SEPARATOR . 'blacklist'
- . DIRECTORY_SEPARATOR . 'obsolete_mage.php'
- );
+ $blackList = include(__DIR__ . '/_files/blacklist/obsolete_mage.php');
$ignored = array();
$appPath = \Magento\TestFramework\Utility\Files::init()->getPathToSource();
foreach ($blackList as $file) {
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/blacklist/obsolete_mage.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/blacklist/obsolete_mage.php
index fbaf6c66240..040fa388744 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/blacklist/obsolete_mage.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/blacklist/obsolete_mage.php
@@ -30,4 +30,5 @@ return array(
'downloader/app/Magento/Downloader/Model/Session.php',
'downloader/lib/Magento/Backup/Db.php',
'downloader/lib/Magento/Backup/Snapshot.php',
+ 'dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php'
);
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index 43d2b754e16..e3dbeedaaa5 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -1005,7 +1005,6 @@ return array(
array('Magento\Poll\Model\Resource\Poll\Answer\Collection'),
array('Magento\Poll\Model\Resource\Poll\Collection'),
array('Magento\Poll\Model\Resource\Poll\Vote'),
- array('Mage:'),
array('Magento\Backup', 'Magento\Backup\Factory'),
array('Magento\Core\Controller\Front\Router', 'Magento\Core\Controller\Request\HttpProxy'),
array('Magento\Core\Controller\Response\Http', 'Magento\Core\Controller\Varien\Action\Forward'),
@@ -1043,4 +1042,46 @@ return array(
array('Magento\Core\Model\ThemeInterface', 'Magento\View\Design\ThemeInterface'),
array('Magento\Core\Model\View\DesignInterface', 'Magento\View\DesignInterface'),
array('Magento\Core\Model\Layout\Element', 'Magento\View\Layout\Element'),
+ array('Magento\Core\Model\Design\Fallback\Rule\ModularSwitch', 'Magento\View\Design\Fallback\Rule\ModularSwitch'),
+ array('Magento\Core\Model\Design\Fallback\Rule\RuleInterface', 'Magento\View\Design\Fallback\Rule\RuleInterface'),
+ array('Magento\Core\Model\Design\Fallback\Rule\Simple', 'Magento\View\Design\Fallback\Rule\Simple'),
+ array('Magento\Core\Model\Design\Fallback\Factory', 'Magento\View\Design\Fallback\Factory'),
+ array(
+ 'Magento\Core\Model\Design\FileResolution\Strategy\Fallback\CachingProxy',
+ 'Magento\View\Design\FileResolution\Strategy\Fallback\CachingProxy'
+ ),
+ array(
+ 'Magento\Core\Model\Design\FileResolution\Strategy\Fallback',
+ 'Magento\View\Design\FileResolution\Strategy\Fallback'
+ ),
+ array(
+ 'Magento\Core\Model\Design\FileResolution\StrategyPool',
+ 'Magento\View\Design\FileResolution\StrategyPool'
+ ),
+ array('Magento\Core\Model\Layout\File','Magento\View\Layout\File'),
+ array('Magento\Core\Model\Layout\File\Factory','Magento\View\Layout\File\Factory'),
+ array('Magento\Core\Model\Layout\File\FileList\Factory','Magento\View\Layout\File\FileList\Factory'),
+ array('Magento\Core\Model\Layout\File\ListFile','Magento\View\Layout\File\FileList'),
+ array('Magento\Core\Model\Layout\File\Source\Aggregated','Magento\View\Layout\File\Source\Aggregated'),
+ array('Magento\Core\Model\Layout\File\Source\Base','Magento\View\Layout\File\Source\Base'),
+ array(
+ 'Magento\Core\Model\Layout\File\Source\Decorator\ModuleDependency',
+ 'Magento\View\Layout\File\Source\Decorator\ModuleDependency'
+ ),
+ array(
+ 'Magento\Core\Model\Layout\File\Source\Decorator\ModuleOutput',
+ 'Magento\View\Layout\File\Source\Decorator\ModuleOutput'
+ ),
+ array('Magento\Core\Model\Layout\File\Source\Override\Base', 'Magento\View\Layout\File\Override\Base'),
+ array('Magento\Core\Model\Layout\File\Source\Override\Theme', 'Magento\View\Layout\File\Override\Theme'),
+ array('Magento\Core\Model\Layout\File\Source\Theme', 'Magento\View\Layout\File\Source\Theme'),
+ array('Magento\Core\Model\Layout\File\SourceInterface', 'Magento\View\Layout\File\SourceInterface'),
+ array('Magento\Core\Model\LayoutFactory', 'Magento\View\LayoutFactory'),
+ array('Magento\Core\Model\TemplateEngine\EngineInterface','Magento\View\TemplateEngineInterface'),
+ array('Magento\Core\Model\TemplateEngine\Factory','Magento\View\TemplateEngineFactory'),
+ array('Magento\Core\Model\TemplateEngine\Php','Magento\View\TemplateEngine\Php'),
+ array('Magento\Core\Model\TemplateEngine\Pool'),
+ array('Magento\Media\Model\File\Image'),
+ array('Magento\Media\Model\Image'),
+ array('Magento\Media\Helper\Data'),
);
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
index 0cee99fdcec..212afbd9e02 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -53,13 +53,13 @@ return array(
array('_canUseLocalModules'),
array('_checkCookieStore', 'Magento\Core\Model\App'),
array('_checkGetStore', 'Magento\Core\Model\App'),
- array('_checkUrlSettings', 'Magento\Adminhtml\Controller\Action'),
+ array('_checkUrlSettings', 'Magento\Backend\Controller\Adminhtml\Action'),
array('_collectOrigData', 'Magento\Catalog\Model\Resource\AbstractResource'),
- array('_decodeInput', 'Magento\Adminhtml\Controller\Catalog\Product'),
+ array('_decodeInput', 'Magento\Catalog\Controller\Adminhtml\Product'),
array('_emailOrderConfirmation', 'Magento\Checkout\Model\Type\AbstractType'),
array('_escapeValue', 'Magento\Adminhtml\Block\Widget\Grid\Column\Filter\AbstractFilter'),
array('_extractData', 'Magento\ObjectManager\Config\Reader\Dom'),
- array('_filterPostData', 'Magento\Adminhtml\Controller\Catalog\Product\Attribute'),
+ array('_filterPostData', 'Magento\Catalog\Controller\Adminhtml\Product\Attribute'),
array('_generateCssHtml', 'Magento\Page\Block\Html\Head'),
array('_generateJsHtml', 'Magento\Page\Block\Html\Head'),
array('_getAddressTaxRequest', 'Magento\Tax\Model\Sales\Total\Quote\Shipping'),
@@ -87,7 +87,7 @@ return array(
array('_getExistingBasePopularity'),
array('_getFieldTableAlias', 'Magento\Newsletter\Model\Resource\Subscriber\Collection'),
array('_getForeignKeyName', 'Magento\DB\Adapter\Pdo\Mysql'),
- array('_getGiftmessageSaveModel', 'Magento\Adminhtml\Block\Sales\Order\Create\Search\Grid'),
+ array('_getGiftmessageSaveModel', 'Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid'),
array('_getGlobalAggregation'),
array('_getGroupByDateFormat', 'Magento\Log\Model\Resource\Visitor\Collection'),
array('_getIdAttributes', 'Magento\ObjectManager\Config\Reader\Dom'),
@@ -155,7 +155,7 @@ return array(
array('_processItem', 'Magento\Weee\Model\Total\Quote\Weee'),
array('_processShippingAmount'),
array('_processValidateCustomer', 'Magento\Checkout\Model\Type\Onepage'),
- array('_putCustomerIntoQuote', 'Magento\Adminhtml\Model\Sales\Order\Create'),
+ array('_putCustomerIntoQuote', 'Magento\Sales\Model\AdminOrder\Create'),
array('_quoteRow', 'Magento\Backup\Model\Resource\Db'),
array('_recollectItem', 'Magento\Tax\Model\Sales\Total\Quote\Subtotal'),
array('_removeCache', 'Magento\Core\Model\Config'),
@@ -163,8 +163,8 @@ return array(
array('_resetItemPriceInclTax'),
array('_saveCache', 'Magento\Backend\Model\Menu\Config'),
array('_saveCache', 'Magento\Core\Model\Config'),
- array('_saveCustomerAfterOrder', 'Magento\Adminhtml\Model\Sales\Order\Create'),
- array('_saveCustomers', 'Magento\Adminhtml\Model\Sales\Order\Create'),
+ array('_saveCustomerAfterOrder', 'Magento\Sales\Model\AdminOrder\Create'),
+ array('_saveCustomers', 'Magento\Sales\Model\AdminOrder\Create'),
array('_saveSectionCache', 'Magento\Core\Model\Config'),
array('_sendUploadResponse', 'Magento\Adminhtml\Controller\Customer'),
array('_sendUploadResponse', 'Magento\Adminhtml\Controller\Newsletter\Subscriber'),
@@ -182,6 +182,7 @@ return array(
array('addCartLink', 'Magento\Checkout\Block\Links'),
array('addCheckoutLink', 'Magento\Checkout\Block\Links'),
array('addColumnInputName', 'Magento\Backend\Block\Widget\Grid\Serializer'),
+ array('addColumnRender', 'Magento\Sales\Block\Adminhtml\Items\AbstractItems', 'setColumnRenders'),
array('addConfigField', 'Magento\Core\Model\Resource\Setup'),
array('addConstraint', 'Magento\DB\Adapter\Pdo\Mysql'),
array('addCss', 'Magento\Page\Block\Html\Head'),
@@ -189,7 +190,7 @@ return array(
array('addCustomersToAlertQueueAction'),
array('addCustomerToSegments'),
array('addHandle', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'),
- array('addItemRender', 'Magento\Adminhtml\Block\Sales\Items\AbstractItems'),
+ array('addItemRender', 'Magento\Sales\Block\Adminhtml\Items\AbstractItems'),
array('addItemRender', 'Magento\Checkout\Block\Cart\AbstractCart'),
array('addItemRender', 'Magento\Sales\Block\Items\AbstractItems'),
array('addJs', 'Magento\Page\Block\Html\Head'),
@@ -203,6 +204,7 @@ return array(
array('addPageHandles', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'),
array('addPagerLimit', 'Magento\Catalog\Block\Product\ProductList\Toolbar'),
array('addRegisterLink', 'Magento\Customer\Block\Account\Link'),
+ array('addRenderer', 'Magento\Bundle\Block\Catalog\Product\View\Type\Bundle'),
array('addReviewSummaryTemplate', 'Magento\Catalog\Block\Product\AbstractProduct'),
array('addRowItemRender', 'Magento\Checkout\Block\Multishipping\Overview'),
array('addSaleableFilterToCollection'),
@@ -210,6 +212,7 @@ return array(
array('addTemplateData', 'Magento\Newsletter\Model\Queue'),
array('addToAlersAction'),
array('addToChildGroup'),
+ array('addToParentGroup', '\Magento\Core\Block\AbstractBlock'),
array('addUpdate', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'),
array('addVisibleFilterToCollection', 'Magento\Catalog\Model\Product\Status'),
array('addVisibleInCatalogFilterToCollection', '',
@@ -234,7 +237,7 @@ return array(
array('authFrontend'),
array('authValidate', '', 'Magento_Core_Helper_Http::getHttpAuthCredentials()'),
array('baseInit', 'Magento\Core\Model\App'),
- array('bundlesAction', 'Magento\Adminhtml\Controller\Catalog\Product'),
+ array('bundlesAction', 'Magento\Catalog\Controller\Adminhtml\Product'),
array('calcTaxAmount', 'Magento\Sales\Model\Quote\Item\AbstractItem'),
array('callbackQueryHook', 'Magento\Core\Model\Resource\Setup'),
array('calculateSpecialPrice', 'Magento\Bundle\Model\Product\Price'),
@@ -249,7 +252,7 @@ return array(
array('catalog' . 'EventProductCollectionAfterLoad', 'Magento\GiftMessage\Model\Observer'),
array('catalogProductCompareClean', 'Magento\Catalog\Model\Observer'),
array('catalogProductLoadAfter', 'Magento\Bundle\Model\Observer'),
- array('changeLocaleAction', 'Magento\Adminhtml\Controller\Index'),
+ array('changeLocaleAction', 'Magento\Backend\Controller\Adminhtml\Index'),
array('chechAllowedExtension'),
array('checkConfigurableProducts', 'Magento\Eav\Model\Resource\Entity\Attribute\Collection'),
array('checkDatabase', 'Magento\Install\Model\Installer\Db'),
@@ -280,7 +283,7 @@ return array(
array('createDirIfNotExists', '', 'mkdir()'),
array('createOrderItem', 'Magento\CatalogInventory\Model\Observer'),
array('debugRequest', 'Magento\Paypal\Model\Api\Standard'),
- array('deleteAction', 'Magento\Adminhtml\Controller\Catalog\Product'),
+ array('deleteAction', 'Magento\Catalog\Controller\Adminhtml\Product'),
array('deleteConfig', 'Magento\Core\Model\Config'),
array('deleteProductPrices', 'Magento\Catalog\Model\Resource\Product\Attribute\Backend\Tierprice'),
array('display', 'Magento\Image\Adapter\AbstractAdapter', 'getImage()'),
@@ -336,7 +339,7 @@ return array(
array('getConfigDataModel', 'Magento\Core\Model\Config'),
array('getConnectionTypeInstance', 'Magento\Core\Model\Resource'),
array('getContainers', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'),
- array('getCustomerData', 'Magento\Adminhtml\Block\Sales\Order\Create\Form\Account'),
+ array('getCustomerData', 'Magento\Sales\Block\Adminhtml\Order\Create\Form\Account'),
array('getDataForSave', 'Magento\Wishlist\Model\Item'),
array('getDataMaxSize'),
array('getDataMaxSizeInBytes', 'Magento\Adminhtml\Block\Media\Uploader', 'Magento_File_Size::getMaxFileSize()'),
@@ -367,7 +370,7 @@ return array(
array('getFileLayoutUpdatesXml', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'),
array('getFormated', '', "getFormated(true) -> format('html'), getFormated() -> format('text')"),
array('getFormObject', 'Magento\Adminhtml\Block\Widget\Form'),
- array('getGiftmessageHtml', 'Magento\Adminhtml\Block\Sales\Order\View\Tab\Info'),
+ array('getGiftmessageHtml', 'Magento\Sales\Block\Adminhtml\Order\View\Tab\Info'),
array('getHandles', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'),
array('getHeaderCssClass', 'Magento_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option_Search'),
array('getHeaderText', 'Magento_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option_Search'),
@@ -434,9 +437,7 @@ return array(
array('getPackage', 'Magento\Widget\Model\Widget\Instance'),
array('getPackageTheme', 'Magento\Widget\Model\Widget\Instance', 'getThemeId'),
array('getPageHandleLabel', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'),
- array('getPageHandleParents', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'),
array('getPageHandles', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'),
- array('getPageHandlesHierarchy', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'),
array('getPageHandleType', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'),
array('getPageTemplateProcessor', 'Magento\Cms\Helper\Data'),
array('getBlockTemplateProcessor', 'Magento\Cms\Helper\Data'),
@@ -494,7 +495,7 @@ return array(
'Magento_Core_Model_RouterList::getRouterByFrontName'
),
array('getRouters', 'Magento\Core\Model\Config'),
- array('getRowId', 'Magento\Adminhtml\Block\Sales\Order\Create\Customer\Grid'),
+ array('getRowId', 'Magento\Sales\Block\Adminhtml\Order\Create\Customer\Grid'),
array('getRowId', 'Magento\Adminhtml\Block\Widget\Grid'),
array('getSaveTemplateFlag', 'Magento\Newsletter\Model\Queue'),
array('getSectionNode', 'Magento\Core\Model\Config'),
@@ -723,7 +724,7 @@ return array(
array('shouldShowOneBalance'),
array('sortChildren'),
array('substDistroServerVars', 'Magento\Core\Model\Config'),
- array('superGroupGridOnlyAction', 'Magento\Adminhtml\Controller\Catalog\Product'),
+ array('superGroupGridOnlyAction', 'Magento\Catalog\Controller\Adminhtml\Product'),
array('toOptionArray', 'Magento\Cms\Model\Resource\Page\Collection'),
array('toOptionArray', 'Magento\Sendfriend\Model\Sendfriend'),
array('truncate', 'Magento\DB\Adapter\Pdo\Mysql'),
@@ -861,7 +862,7 @@ return array(
array('_getSession', 'Magento\Review\Helper\Action\Pager'),
array('_getProductType', 'Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config\Matrix'),
array('_getProductType', 'Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config'),
- array('_getSession', 'Magento\Adminhtml\Model\Sales\Order'),
+ array('_getSession', 'Magento\Sales\Model\AdminOrder'),
array('setIsSerializable', 'Magento\App\State'),
array('getIsSerializable', 'Magento\App\State'),
array('_getInventoryItemResource', 'Magento\Reports\Model\Resource\Product\Lowstock\Collection'),
@@ -879,4 +880,6 @@ return array(
array('setModuleDir', 'Magento\Core\Model\Config'),
array('getAreaConfig', 'Magento\Core\Model\Config'),
array('getViewConfig', '\Magento\Core\Model\View\Config', 'get'),
+ array('_getSession', '\Magento\Catalog\Helper\Product\Compare', '$this->_catalogSession'),
+ array('getEnginePool', '\Magento\Core\Block\Template\Context', 'getEngineFactory'),
);
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
index 3696180a5ff..4d6d59c9447 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
@@ -115,4 +115,5 @@ return array(
array('_areaFrontName', 'Magento\Backend\Helper\Data'),
array('_backendFrontName', 'Magento\Backend\Helper\Data'),
array('_app', 'Magento\Backend\Block\Widget\Grid\Column\Renderer\Currency'),
+ array('_enginePool', '\Magento\Core\Block\Template\Context', '_engineFactory'),
);
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
index 29cb09a805e..862f6c19e67 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -46,7 +46,7 @@ class LiveCodeTest extends \PHPUnit_Framework_TestCase
*/
protected static $_blackList = array();
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass()
{
self::$_reportDir = \Magento\TestFramework\Utility\Files::init()->getPathToSource()
. '/dev/tests/static/report';
@@ -61,8 +61,8 @@ class LiveCodeTest extends \PHPUnit_Framework_TestCase
if ($type != '' && !preg_match('/\/$/', $type)) {
$type = $type . '/';
}
- self::$_whiteList = self::_readLists(__DIR__ . '/_files/'.$type.'whitelist/*.txt');
- self::$_blackList = self::_readLists(__DIR__ . '/_files/'.$type.'blacklist/*.txt');
+ self::$_whiteList = self::_readLists(__DIR__ . '/_files/' . $type . 'whitelist/*.txt');
+ self::$_blackList = self::_readLists(__DIR__ . '/_files/' . $type . 'blacklist/*.txt');
}
/**
@@ -111,7 +111,7 @@ class LiveCodeTest extends \PHPUnit_Framework_TestCase
$this->markTestSkipped('PHP Code Sniffer is not installed.');
}
self::setupFileLists();
- $result = $codeSniffer->run(self::$_whiteList, self::$_blackList, array('php','phtml'));
+ $result = $codeSniffer->run(self::$_whiteList, self::$_blackList, array('php', 'phtml'));
$this->assertEquals(
0,
$result,
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/blacklist/common.txt
index 0c86795a6b3..f51bc4fce82 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/blacklist/common.txt
@@ -27,8 +27,10 @@ dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest/phpcs/expecte
dev/tests/static/testsuite/Magento/Test/Legacy/_files
dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/MysqlStub.php
dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/ValueTest.php
+dev/tests/unit/testsuite/Magento/Code/Plugin/GeneratorTest/SimpleObjectManager.php
dev/tests/unit/testsuite/Magento/Core/Model/Resource/Db/AbstractTest.php
-dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/_files
+dev/tests/unit/testsuite/Magento/View/TemplateEngine/_files
+dev/tools/Magento/Tools/I18n/Zend
lib/Magento/Archive
lib/Magento/Autoload/Simple.php
lib/Magento/Backup
@@ -93,7 +95,9 @@ lib/Magento/Data/Tree/Dbp.php
lib/Magento/Data/Tree/Node.php
lib/Magento/Data/Tree/Node/Collection.php
lib/Magento/Date.php
+lib/Magento/DB
lib/Magento/Debug.php
+lib/Magento/Event.php
lib/Magento/Event
lib/Magento/File/Csv.php
lib/Magento/File/CsvMulty.php
@@ -107,13 +111,16 @@ lib/Magento/HTTP/Client/Curl.php
lib/Magento/HTTP/Client/Socket.php
lib/Magento/HTTP/IClient.php
lib/Magento/Image
+lib/Magento/Image.php
lib/Magento/Io
lib/Magento/Object
+lib/Magento/Object.php
lib/Magento/Pear
+lib/Magento/Pear.php
lib/Magento/Simplexml
lib/Magento/System
lib/Magento/Util.php
-lib/Magento/Validator
lib/Magento/Xml
+lib/Magento/Validator
dev/tests/unit/testsuite/Magento/Code/Plugin/GeneratorTest/SimpleObjectManager.php
dev/tools/Magento/Tools/I18n/Zend
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
index f128360d4c0..2b12c8effe6 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
@@ -18,6 +18,7 @@ Magento/Paypal
Magento/Paygate
Magento/Downloadable
Magento/Core/Model/Resource/Helper
+Magento/Catalog/Block/Adminhtml
Magento/Catalog/Model/Resource/Product/Indexer
Magento/CatalogInventory/Model/Resource/Indexer/Stock
Magento/Sales/Model/Order
@@ -34,6 +35,7 @@ Magento/GiftMessage/Model
Magento/GoogleShopping/Model/Attribute
Magento/Oauth/Controller
Magento/Sales/Block/Order
+Magento/Sales/Controller/Adminhtml/Order
Magento/Sales/Model/Resource/Helper
Magento/Sales/Model/Resource/Order
Magento/Catalog/Model/Resource/Product
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt
index b08b6286eb5..0e31503b64c 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt
@@ -5,15 +5,15 @@
# Formatter intorduces long line
app/bootstrap.php
# Formatter intorduces long line
-app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/NewCategory.php
+app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/NewCategory.php
# Formatter intorduces long line
-app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Search.php
+app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
# Formatter intorduces long line
-app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Category.php
+app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
# Formatter intorduces long line
-app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php
+app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
# Formatter intorduces long line
-app/code/Magento/Adminhtml/Block/Catalog/Product/Options/Ajax.php
+app/code/Magento/Catalog/Block/Adminhtml/Product/Options/Ajax.php
# Formatter intorduces long line
app/code/Magento/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php
# Formatter intorduces long line
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/ruleset.xml b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/ruleset.xml
index 22f237e9803..f5d34c3cd44 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/ruleset.xml
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/ruleset.xml
@@ -39,7 +39,9 @@
<rule ref="Generic.Files.LineEndings"/>
<rule ref="PEAR.NamingConventions.ValidClassName"/>
<rule ref="Squiz.Functions.GlobalFunction"/>
- <rule ref="Zend.NamingConventions.ValidVariableName"/>
+ <rule ref="Zend.NamingConventions.ValidVariableName">
+ <exclude name="Zend.NamingConventions.ValidVariableName.PrivateNoUnderscore"/>
+ </rule>
<rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
<rule ref="Generic.PHP.DisallowShortOpenTag"/>
<rule ref="PEAR.Classes.ClassDeclaration"/>
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt
index 6cbba2ed7d3..85e7a4d5454 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt
@@ -2,12 +2,6 @@
# Glob patterns are supported
#
app/bootstrap.php
-app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/NewCategory.php
-app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes/Search.php
-app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Popup/Grid.php
-app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Category.php
-app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php
-app/code/Magento/Adminhtml/Block/Catalog/Product/Options/Ajax.php
app/code/Magento/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php
app/code/Magento/Adminhtml/Block/Customer/Edit/Tab/Account.php
app/code/Magento/Adminhtml/Model/Observer.php
@@ -20,6 +14,12 @@ app/code/Magento/Adminhtml/Controller/Report/Product.php
app/code/Magento/Adminhtml/Controller/Report/Product.php
app/code/Magento/Adminhtml/Controller/Urlrewrite.php
app/code/Magento/Bundle/Model/Plugin
+app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/NewCategory.php
+app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
+app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Popup/Grid.php
+app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
+app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
+app/code/Magento/Catalog/Block/Adminhtml/Product/Options/Ajax.php
app/code/Magento/Catalog/Block/Product/Configurable
app/code/Magento/Catalog/Block/Product/Grouped
app/code/Magento/Catalog/Block/Product/TemplateSelector.php
@@ -47,9 +47,6 @@ app/code/Magento/Core/Model/Config
app/code/Magento/Core/Model/Cache
app/code/Magento/Core/Model/DataService
app/code/Magento/Core/Model/Design.php
-app/code/Magento/Core/Model/Design/FileResolution
-app/code/Magento/Core/Model/Design/Fallback
-app/code/Magento/Core/Model/Design/Source/Design.php
app/code/Magento/Core/Model/Email/Template/Config
app/code/Magento/Core/Model/Email/Template/Config.php
app/code/Magento/Core/Model/EntryPoint
@@ -67,7 +64,6 @@ app/code/Magento/Core/Model/Resource/Theme.php
app/code/Magento/Core/Model/Sender.php
app/code/Magento/Core/Model/Session/Validator.php
app/code/Magento/Core/Model/AbstractShell.php
-app/code/Magento/Core/Model/TemplateEngine
app/code/Magento/Core/Model/Theme
app/code/Magento/Core/Model/Theme.php
app/code/Magento/Core/Model/Url/SecurityInfo.php
@@ -155,3 +151,4 @@ lib/Magento/Convert
lib/Magento/Date.php
lib/Magento/Object.php
lib/Magento/App
+lib/Magento/View
diff --git a/dev/tests/unit/framework/Magento/Test/Block/Adminhtml.php b/dev/tests/unit/framework/Magento/Test/Block/Adminhtml.php
index b5d3e3e4ccf..64a3009dc11 100644
--- a/dev/tests/unit/framework/Magento/Test/Block/Adminhtml.php
+++ b/dev/tests/unit/framework/Magento/Test/Block/Adminhtml.php
@@ -93,7 +93,7 @@ class Adminhtml extends \PHPUnit_Framework_TestCase
protected function setUp()
{
// These mocks are accessed via context
- $this->_designMock = $this->_makeMock('Magento\View\DesignInterface');
+ $this->_designMock = $this->_makeMock('Magento\View\DesignInterface');
$this->_sessionMock = $this->_makeMock('Magento\Core\Model\Session');
$this->_translatorMock = $this->_makeMock('Magento\Core\Model\Translate');
$this->_layoutMock = $this->_makeMock('Magento\Core\Model\Layout');
@@ -112,7 +112,7 @@ class Adminhtml extends \PHPUnit_Framework_TestCase
$viewUrlMock = $this->_makeMock('Magento\Core\Model\View\Url');
$viewConfigMock = $this->_makeMock('Magento\View\ConfigInterface');
$viewFileSystemMock = $this->_makeMock('Magento\Core\Model\View\FileSystem');
- $templatePoolMock = $this->_makeMock('Magento\Core\Model\TemplateEngine\Pool');
+ $templateFactoryMock = $this->_makeMock('Magento\View\TemplateEngineFactory');
$authorizationMock = $this->_makeMock('Magento\AuthorizationInterface');
$cacheStateMock = $this->_makeMock('Magento\Core\Model\Cache\StateInterface');
$appMock = $this->_makeMock('Magento\Core\Model\App');
@@ -144,7 +144,7 @@ class Adminhtml extends \PHPUnit_Framework_TestCase
$this->_loggerMock,
$this->_filesystemMock,
$viewFileSystemMock,
- $templatePoolMock,
+ $templateFactoryMock,
$authorizationMock,
$appMock,
$backendSessionMock,
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/UrlrewriteTest.php b/dev/tests/unit/testsuite/Magento/Adminhtml/Block/UrlrewriteTest.php
index 2f7c1fe0023..b8494c86996 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/UrlrewriteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Adminhtml/Block/UrlrewriteTest.php
@@ -48,7 +48,7 @@ class UrlrewriteTest extends \PHPUnit_Framework_TestCase
$testedBlock->setSelectorBlock($selectorBlock);
$testedBlock->expects($this->once())
->method('getUrl')
- ->with('*/*/edit')
+ ->with('adminhtml/*/edit')
->will($this->returnValue('http://localhost/admin/urlrewrite/edit/'));
$this->assertEquals($expectedUrl, $testedBlock->getCreateUrl());
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/Controller/CacheTest.php b/dev/tests/unit/testsuite/Magento/Adminhtml/Controller/CacheTest.php
index 1c90bbe975e..920b1ebde62 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/Controller/CacheTest.php
+++ b/dev/tests/unit/testsuite/Magento/Adminhtml/Controller/CacheTest.php
@@ -68,7 +68,7 @@ class CacheTest extends \PHPUnit_Framework_TestCase
$cacheStateMock = $this->getMock('Magento\Core\Model\Cache\StateInterface');
$cacheFrontendPool = $this->getMock('Magento\Core\Model\Cache\Frontend\Pool', array(), array(), '', false);
- $controller = new \Magento\Adminhtml\Controller\Cache(
+ $controller = new \Magento\Backend\Controller\Adminhtml\Cache(
$context,
$cacheTypeListMock,
$cacheStateMock,
@@ -95,7 +95,7 @@ class CacheTest extends \PHPUnit_Framework_TestCase
$backendHelper->expects($this->once())
->method('getUrl')
- ->with('*/*')
+ ->with('adminhtml/*')
->will($this->returnValue('redirect_url'));
$response->expects($this->once())
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/Controller/CustomerTest.php b/dev/tests/unit/testsuite/Magento/Adminhtml/Controller/CustomerTest.php
index e8cf25106fe..e00c0a8668c 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/Controller/CustomerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Adminhtml/Controller/CustomerTest.php
@@ -157,7 +157,7 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
);
$this->_helper->expects($this->once())
->method('getUrl')
- ->with($this->equalTo('*/customer'), $this->equalTo(array()))
+ ->with($this->equalTo('adminhtml/customer'), $this->equalTo(array()))
->will($this->returnValue($redirectLink));
$this->_response->expects($this->once())->method('setRedirect')->with($this->equalTo($redirectLink));
@@ -187,7 +187,7 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
$this->_helper->expects($this->any())
->method('getUrl')
- ->with($this->equalTo('*/customer'), $this->equalTo(array()))
+ ->with($this->equalTo('adminhtml/customer'), $this->equalTo(array()))
->will($this->returnValue($redirectLink));
$this->_response->expects($this->once())->method('setRedirect')->with($this->equalTo($redirectLink));
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/DashboardTest.php b/dev/tests/unit/testsuite/Magento/Adminhtml/DashboardTest.php
index 69288d11317..43a5caa5ff4 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/DashboardTest.php
+++ b/dev/tests/unit/testsuite/Magento/Adminhtml/DashboardTest.php
@@ -58,8 +58,8 @@ class DashboardTest extends \PHPUnit_Framework_TestCase
$httpClient = $this->getMock('Magento\HTTP\ZendClient',
array('setUri', 'setParameterGet', 'setConfig', 'request', 'getHeaders')
);
- /** @var $helper \Magento\Adminhtml\Helper\Dashboard\Data|PHPUnit_Framework_MockObject_MockObject */
- $helper = $this->getMock('Magento\Adminhtml\Helper\Dashboard\Data',
+ /** @var $helper \Magento\Backend\Helper\Dashboard\Data|PHPUnit_Framework_MockObject_MockObject */
+ $helper = $this->getMock('Magento\Backend\Helper\Dashboard\Data',
array('getChartDataHash'), array(), '', false, false
);
$helper->expects($this->any())->method('getChartDataHash')->will($this->returnValue($fixture));
@@ -67,7 +67,7 @@ class DashboardTest extends \PHPUnit_Framework_TestCase
$objectManager = $this->getMock('Magento\ObjectManager');
$objectManager->expects($this->at(0))
->method('get')
- ->with('Magento\Adminhtml\Helper\Dashboard\Data')
+ ->with('Magento\Backend\Helper\Dashboard\Data')
->will($this->returnValue($helper));
$objectManager->expects($this->at(1))
->method('create')
@@ -112,8 +112,8 @@ class DashboardTest extends \PHPUnit_Framework_TestCase
->method('getParam')->with('ga')
->will($this->returnValue(urlencode(base64_encode(json_encode(array(1))))));
$this->_request->expects($this->at(1))->method('getParam')->with('h')->will($this->returnValue($fixture));
- /** @var $helper \Magento\Adminhtml\Helper\Dashboard\Data|PHPUnit_Framework_MockObject_MockObject */
- $helper = $this->getMock('Magento\Adminhtml\Helper\Dashboard\Data',
+ /** @var $helper \Magento\Backend\Helper\Dashboard\Data|PHPUnit_Framework_MockObject_MockObject */
+ $helper = $this->getMock('Magento\Backend\Helper\Dashboard\Data',
array('getChartDataHash'), array(), '', false, false
);
$helper->expects($this->any())->method('getChartDataHash')->will($this->returnValue($fixture));
@@ -121,7 +121,7 @@ class DashboardTest extends \PHPUnit_Framework_TestCase
$objectManager = $this->getMock('Magento\ObjectManager');
$objectManager->expects($this->at(0))
->method('get')
- ->with('Magento\Adminhtml\Helper\Dashboard\Data')
+ ->with('Magento\Backend\Helper\Dashboard\Data')
->will($this->returnValue($helper));
$exceptionMock = new \Exception();
$objectManager->expects($this->at(1))
@@ -156,7 +156,7 @@ class DashboardTest extends \PHPUnit_Framework_TestCase
* @param Magento\App\Request\Http $request
* @param \Magento\App\Response\Http|null $response
* @param \Magento\ObjectManager|null $objectManager
- * @return \Magento\Adminhtml\Controller\Dashboard|PHPUnit_Framework_MockObject_MockObject
+ * @return \Magento\Backend\Controller\Adminhtml\Dashboard|PHPUnit_Framework_MockObject_MockObject
*/
protected function _factory($request, $response = null, $objectManager = null)
{
@@ -181,7 +181,7 @@ class DashboardTest extends \PHPUnit_Framework_TestCase
'frontController' => $varienFront,
);
$context = $helper->getObject('Magento\Backend\Controller\Context', $arguments);
- return new \Magento\Adminhtml\Controller\Dashboard($context);
+ return new \Magento\Backend\Controller\Adminhtml\Dashboard($context);
}
}
diff --git a/dev/tests/unit/testsuite/Magento/App/UpdaterTest.php b/dev/tests/unit/testsuite/Magento/App/UpdaterTest.php
index 9e7217083fe..f2b763fe7ae 100644
--- a/dev/tests/unit/testsuite/Magento/App/UpdaterTest.php
+++ b/dev/tests/unit/testsuite/Magento/App/UpdaterTest.php
@@ -89,7 +89,7 @@ class UpdaterTest extends \PHPUnit_Framework_TestCase
}
/**
- * @covers \Magento\Core\Model\Db\Updater::updateScheme
+ * @covers \Magento\App\Updater::updateScheme
*/
public function testUpdateSchemeWithUpdateSkip()
{
@@ -104,7 +104,7 @@ class UpdaterTest extends \PHPUnit_Framework_TestCase
}
/**
- * @covers \Magento\Core\Model\Db\Updater::updateScheme
+ * @covers \Magento\App\Updater::updateScheme
*/
public function testUpdateScheme()
{
@@ -132,7 +132,7 @@ class UpdaterTest extends \PHPUnit_Framework_TestCase
}
/**
- * @covers \Magento\Core\Model\Db\Updater::updateData
+ * @covers \Magento\App\Updater::updateData
*/
public function testUpdateData()
{
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/SerializerTest.php b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/SerializerTest.php
index 63708a65fce..58ae90848ca 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/SerializerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/SerializerTest.php
@@ -42,8 +42,8 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
{
$objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
- $grid = $this->getMock('Magento\Adminhtml\Block\Catalog\Product\Widget\Chooser', array('getSelectedProducts'),
- array(), '', false);
+ $grid = $this->getMock('Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser',
+ array('getSelectedProducts'), array(), '', false);
$grid->expects($this->once())->method('getSelectedProducts')->will($this->returnValue(array('product1')));
$arguments = array(
'data' => array(
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/System/Config/SaveTest.php b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/System/Config/SaveTest.php
index c53d734e842..a3342f3175c 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/System/Config/SaveTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/System/Config/SaveTest.php
@@ -108,7 +108,7 @@ class SaveTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue($this->_sectionMock));
$helperMock->expects($this->any())->method('getUrl')->will($this->returnArgument(0));
- $this->_responseMock->expects($this->once())->method('setRedirect')->with('*/system_config/edit');
+ $this->_responseMock->expects($this->once())->method('setRedirect')->with('adminhtml/system_config/edit');
$helper = new \Magento\TestFramework\Helper\ObjectManager($this);
$arguments = array(
diff --git a/dev/tests/unit/testsuite/Magento/Backup/MediaTest.php b/dev/tests/unit/testsuite/Magento/Backup/MediaTest.php
index 6930943cfc1..256b0e09c8c 100644
--- a/dev/tests/unit/testsuite/Magento/Backup/MediaTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backup/MediaTest.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Backup/NomediaTest.php b/dev/tests/unit/testsuite/Magento/Backup/NomediaTest.php
index 68eec9fd048..2f7f3fe4213 100644
--- a/dev/tests/unit/testsuite/Magento/Backup/NomediaTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backup/NomediaTest.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Backup/SnapshotTest.php b/dev/tests/unit/testsuite/Magento/Backup/SnapshotTest.php
index 91c711777eb..0c125082e25 100644
--- a/dev/tests/unit/testsuite/Magento/Backup/SnapshotTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backup/SnapshotTest.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Block/Catalog/Product/View/Type/BundleTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Block/Catalog/Product/View/Type/BundleTest.php
new file mode 100644
index 00000000000..186c62e085f
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Block/Catalog/Product/View/Type/BundleTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Bundle\Block\Catalog\Product\View\Type;
+
+class BundleTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\TestFramework\Helper\ObjectManager
+ */
+ protected $_objectHelper;
+
+ /**
+ * @var \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle
+ */
+ protected $_bundleBlock;
+
+ protected function setUp()
+ {
+ $objectHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $this->_bundleBlock = $objectHelper->getObject('Magento\Bundle\Block\Catalog\Product\View\Type\Bundle');
+ }
+
+ public function testGetOptionHtmlNoRenderer()
+ {
+ $option = $this->getMock('\Magento\Bundle\Model\Option', ['getType'], [], '', false);
+ $option->expects($this->exactly(2))->method('getType')->will($this->returnValue('checkbox'));
+
+ $this->assertEquals(
+ 'There is no defined renderer for "checkbox" option type.',
+ $this->_bundleBlock->getOptionHtml($option)
+ );
+ }
+
+ public function testGetOptionHtml()
+ {
+ $option = $this->getMock('\Magento\Bundle\Model\Option', ['getType'], [], '', false);
+ $option->expects($this->exactly(1))->method('getType')->will($this->returnValue('checkbox'));
+
+ $optionBlock = $this->getMock(
+ '\Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox',
+ ['setOption', 'toHtml', 'getPriceBlockTypes'],
+ [],
+ '',
+ false
+ );
+ $optionBlock->expects($this->any())->method('setOption')->will($this->returnValue($optionBlock));
+ $optionBlock->expects($this->any())->method('getPriceBlockTypes')->will($this->returnValue([]));
+ $optionBlock->expects($this->any())->method('toHtml')->will($this->returnValue('option html'));
+ $layout = $this->getMock('\Magento\Core\Model\Layout', ['getChildName', 'getBlock'], [], '', false);
+ $layout->expects($this->any())->method('getChildName')->will($this->returnValue('name'));
+ $layout->expects($this->any())->method('getBlock')->will($this->returnValue($optionBlock));
+ $this->_bundleBlock->setLayout($layout);
+
+ $this->assertEquals('option html', $this->_bundleBlock->getOptionHtml($option));
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Attribute/GridTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Attribute/GridTest.php
new file mode 100644
index 00000000000..c6fc8bdbdc1
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Attribute/GridTest.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category Magento
+ * @package Magento_Catalog
+ * @subpackage unit_tests
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Catalog\Block\Adminhtml\Product\Attribute;
+
+class GridTest extends \PHPUnit_Framework_TestCase
+{
+ public function testGetRowUrl()
+ {
+ $attribute = $this->getMock('Magento\Catalog\Model\Resource\Eav\Attribute', array(), array(), '', false);
+ $attribute->expects($this->once())
+ ->method('getAttributeId')
+ ->will($this->returnValue(2));
+
+ $dirs = $this->getMock('Magento\App\Module\Dir', array(), array(), '', false);
+
+ $urlBuilder = $this->getMock('Magento\UrlInterface', array(), array(), '', false);
+ $urlBuilder->expects($this->once())
+ ->method('getUrl')
+ ->with($this->equalTo('catalog/*/edit'), $this->equalTo(array('attribute_id' => 2)))
+ ->will($this->returnValue('catalog/product_attribute/edit/id/2'));
+
+ $context = $this->getMock('Magento\Backend\Block\Template\Context', array(), array(), '', false);
+ $context->expects($this->once())
+ ->method('getUrlBuilder')
+ ->will($this->returnValue($urlBuilder));
+ $context->expects($this->any())
+ ->method('getDirs')
+ ->will($this->returnValue($dirs));
+
+ $data = array(
+ 'context' => $context,
+ );
+
+ $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
+ /** @var \Magento\Catalog\Block\Adminhtml\Product\Attribute\Grid $block */
+ $block = $helper->getObject(
+ 'Magento\Catalog\Block\Adminhtml\Product\Attribute\Grid', $data
+ );
+
+ $this->assertEquals('catalog/product_attribute/edit/id/2', $block->getRowUrl($attribute));
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/Catalog/Product/Composite/Fieldset/OptionsTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/OptionsTest.php
similarity index 92%
rename from dev/tests/unit/testsuite/Magento/Adminhtml/Block/Catalog/Product/Composite/Fieldset/OptionsTest.php
rename to dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/OptionsTest.php
index fc27c6ee76c..e09fd59acbb 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/Catalog/Product/Composite/Fieldset/OptionsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/OptionsTest.php
@@ -19,16 +19,16 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Catalog
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Composite\Fieldset;
+namespace Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset;
/**
- * Test class for \Magento\Adminhtml\Block\Catalog\Product\Composite\Fieldset\Options
+ * Test class for \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options
*
* @SuppressWarnings(PHPMD.LongVariable)
*/
@@ -40,7 +40,7 @@ class OptionsTest extends \PHPUnit_Framework_TestCase
protected $_objectHelper;
/**
- * @var \Magento\Adminhtml\Block\Catalog\Product\Composite\Fieldset\Options
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options
*/
protected $_optionsBlock;
@@ -70,7 +70,7 @@ class OptionsTest extends \PHPUnit_Framework_TestCase
'resource' => $this->_optionResource,
'optionValueFactory' => $optionFactoryMock,
));
- $dateBlock = $this->getMock('Magento\Adminhtml\Block\Catalog\Product\Composite\Fieldset\Options',
+ $dateBlock = $this->getMock('Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options',
array('setSkipJsReloadPrice'), array('context' => $context, 'option' => $option), '', false);
$dateBlock->expects($this->any())
->method('setSkipJsReloadPrice')->will($this->returnValue($dateBlock));
@@ -83,7 +83,7 @@ class OptionsTest extends \PHPUnit_Framework_TestCase
->method('renderElement')->with('date', false)->will($this->returnValue('html'));
$this->_optionsBlock = $this->_objectHelper->getObject(
- 'Magento\Adminhtml\Block\Catalog\Product\Composite\Fieldset\Options',
+ 'Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options',
array(
'context' => $context,
'option' => $option,
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/MatrixTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/MatrixTest.php
similarity index 93%
rename from dev/tests/unit/testsuite/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/MatrixTest.php
rename to dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/MatrixTest.php
index 09f89503c21..d32dd65321f 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/MatrixTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Super/Config/MatrixTest.php
@@ -22,14 +22,14 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config;
+namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config;
class MatrixTest extends \PHPUnit_Framework_TestCase
{
/**
* Object under test
*
- * @var \Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config_Matrix
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config_Matrix
*/
protected $_block;
@@ -56,7 +56,7 @@ class MatrixTest extends \PHPUnit_Framework_TestCase
$helper = new \Magento\TestFramework\Helper\ObjectManager($this);
$this->_object = $helper->getObject('Magento\Backend\Block\System\Config\Form', $data);
$this->_block = $helper->getObject(
- 'Magento\Adminhtml\Block\Catalog\Product\Edit\Tab\Super\Config\Matrix', $data
+ 'Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Super\Config\Matrix', $data
);
}
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/WeightTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/WeightTest.php
similarity index 88%
rename from dev/tests/unit/testsuite/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/WeightTest.php
rename to dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/WeightTest.php
index 8e0eef78c45..9dac38efc2d 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/WeightTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/WeightTest.php
@@ -25,14 +25,14 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Catalog\Product\Helper\Form;
+namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
class WeightTest extends \PHPUnit_Framework_TestCase
{
const VIRTUAL_FIELD_HTML_ID = 'weight_and_type_switcher';
/**
- * @var \Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Weight
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight
*/
protected $_model;
@@ -45,11 +45,10 @@ class WeightTest extends \PHPUnit_Framework_TestCase
{
$coreHelper = $this->getMock('Magento\Core\Helper\Data', array(), array(), '', false);
$factory = $this->getMock('Magento\Data\Form\Element\Factory', array(), array(), '', false);
- $session = $this->getMock('Magento\Core\Model\Session', array(), array(), '', false);
$collectionFactory = $this->getMock('Magento\Data\Form\Element\CollectionFactory', array('create'),
array(), '', false);
- $form = new \Magento\Data\Form($session, $factory, $collectionFactory);
+ $form = new \Magento\Data\Form($factory, $collectionFactory);
$helper = $this->getMock('Magento\Catalog\Helper\Product', array('getTypeSwitcherControlLabel'),
array(), '', false, false
@@ -79,7 +78,7 @@ class WeightTest extends \PHPUnit_Framework_TestCase
->with($this->equalTo('checkbox'))
->will($this->returnValue($this->_virtual));
- $this->_model = new \Magento\Adminhtml\Block\Catalog\Product\Helper\Form\Weight($coreHelper, $factory,
+ $this->_model = new \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight($coreHelper, $factory,
$collectionFactory, $helper);
$this->_model->setForm($form);
}
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Product/View/OptionsTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Product/View/OptionsTest.php
index b15164de7f4..70982674423 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Product/View/OptionsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Product/View/OptionsTest.php
@@ -70,7 +70,7 @@ class OptionsTest extends \PHPUnit_Framework_TestCase
'optionValueFactory' => $optValFactoryMock,
));
$dateBlock = $this->getMock('Magento\Adminhtml\Block\Catalog\Product\Composite\Fieldset\Options',
- array('setProduct'), array('context' => $context, 'option' => $option), '', false);
+ array('setProduct', 'setOption'), array('context' => $context, 'option' => $option), '', false);
$dateBlock->expects($this->any())
->method('setProduct')->will($this->returnValue($dateBlock));
@@ -120,6 +120,8 @@ class OptionsTest extends \PHPUnit_Framework_TestCase
array('resource' => $this->_optionResource)
);
$option->setType('date');
+ $dateBlock->expects($this->any())
+ ->method('setOption')->with($this->equalTo($option))->will($this->returnValue($dateBlock));
$this->assertEquals('html', $this->_optionsBlock->getOptionHtml($option));
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Block/Cart/AbstractTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Block/Cart/AbstractTest.php
index d71d3a39654..94969e0559b 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Block/Cart/AbstractTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Block/Cart/AbstractTest.php
@@ -94,7 +94,7 @@ class AbstractTest extends \PHPUnit_Framework_TestCase
public function testPrepareLayout()
{
$childBlock = $this->getMock('Magento\Core\Block\AbstractBlock', array(), array(), '', false);
- /** @var $layout \Magento\Core\Model\Layout */
+ /** @var $layout \Magento\View\LayoutInterface */
$layout = $this->getMock('Magento\Core\Model\Layout', array(
'createBlock', 'getChildName', 'setChild'
), array(), '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Block/Cart/SidebarTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Block/Cart/SidebarTest.php
index 4ab4a5d68af..7f21493b05b 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Block/Cart/SidebarTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Block/Cart/SidebarTest.php
@@ -36,7 +36,7 @@ class SidebarTest extends \PHPUnit_Framework_TestCase
public function testDeserializeRenders()
{
$childBlock = $this->getMock('Magento\Core\Block\AbstractBlock', array(), array(), '', false);
- /** @var $layout \Magento\Core\Model\Layout */
+ /** @var $layout \Magento\View\LayoutInterface */
$layout = $this->getMock('Magento\Core\Model\Layout', array(
'createBlock', 'getChildName', 'setChild'
), array(), '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Core/Block/TemplateTest.php b/dev/tests/unit/testsuite/Magento/Core/Block/TemplateTest.php
index b126cc7262c..da0aba30b63 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Block/TemplateTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Block/TemplateTest.php
@@ -40,7 +40,7 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
protected $_filesystem;
/**
- * @var \Magento\Core\Model\TemplateEngine\EngineInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\View\TemplateEngineInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $_templateEngine;
@@ -62,16 +62,16 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
$this->_filesystem = $this->getMock('\Magento\Filesystem', array(), array(), '', false);
- $this->_templateEngine = $this->getMock('\Magento\Core\Model\TemplateEngine\EngineInterface');
+ $this->_templateEngine = $this->getMock('\Magento\View\TemplateEngineInterface');
- $enginePool = $this->getMock('Magento\Core\Model\TemplateEngine\Pool', array(), array(), '', false);
+ $enginePool = $this->getMock('Magento\View\TemplateEngineFactory', array(), array(), '', false);
$enginePool->expects($this->any())
->method('get')
->with('phtml')
->will($this->returnValue($this->_templateEngine));
$context = $this->getMock('\Magento\Core\Block\Template\Context', array(), array(), '', false);
- $context->expects($this->any())->method('getEnginePool')->will($this->returnValue($enginePool));
+ $context->expects($this->any())->method('getEngineFactory')->will($this->returnValue($enginePool));
$context->expects($this->any())->method('getDirs')->will($this->returnValue($dirs));
$context->expects($this->any())->method('getFilesystem')->will($this->returnValue($this->_filesystem));
$context->expects($this->any())->method('getViewFileSystem')->will($this->returnValue($this->_viewFileSystem));
diff --git a/dev/tests/unit/testsuite/Magento/Core/Controller/Response/HttpTest.php b/dev/tests/unit/testsuite/Magento/Core/Controller/Response/HttpTest.php
index c11641f9994..a58ed65a4c3 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Controller/Response/HttpTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Controller/Response/HttpTest.php
@@ -32,13 +32,11 @@ namespace Magento\Core\Controller\Response;
class HttpTest extends \PHPUnit_Framework_TestCase
{
-
/**
* Test for getHeader method
*
* @dataProvider headersDataProvider
- * @covers \Magento\App\ResponseInterface::getHeader
- *
+ * @covers \Magento\App\Response\Http::getHeader
* @param string $header
*/
public function testGetHeaderExists($header)
@@ -75,8 +73,7 @@ class HttpTest extends \PHPUnit_Framework_TestCase
/**
* Test for getHeader method. Validation for attempt to get not existing header
*
- * @covers \Magento\App\ResponseInterface::getHeader
- *
+ * @covers \Magento\App\Response\Http::getHeader
*/
public function testGetHeaderNotExists()
{
diff --git a/dev/tests/unit/testsuite/Magento/Core/Controller/Varien/AbstractActionTest.php b/dev/tests/unit/testsuite/Magento/Core/Controller/Varien/AbstractActionTest.php
index 0c7142f0a54..3e3349b41dc 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Controller/Varien/AbstractActionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Controller/Varien/AbstractActionTest.php
@@ -64,7 +64,7 @@ class AbstractActionTest extends \PHPUnit_Framework_TestCase
* Test for getRequest method
*
* @test
- * @covers \Magento\Core\Controller\Varien\AbstractAction::getRequest
+ * @covers \Magento\App\Action\AbstractAction::getRequest
*/
public function testGetRequest()
{
@@ -75,7 +75,7 @@ class AbstractActionTest extends \PHPUnit_Framework_TestCase
* Test for getResponse method
*
* @test
- * @covers \Magento\Core\Controller\Varien\AbstractAction::getResponse
+ * @covers \Magento\App\Action\AbstractAction::getResponse
*/
public function testGetResponse()
{
@@ -86,7 +86,7 @@ class AbstractActionTest extends \PHPUnit_Framework_TestCase
* Test for getResponse med. Checks that response headers are set correctly
*
* @test
- * @covers \Magento\Core\Controller\Varien\AbstractAction::getResponse
+ * @covers \Magento\App\Action\AbstractAction::getResponse
*/
public function testResponseHeaders()
{
@@ -111,7 +111,7 @@ class AbstractActionTest extends \PHPUnit_Framework_TestCase
* Test for getFullActionName method
*
* @test
- * @covers \Magento\Core\Controller\Varien\AbstractAction::getFullActionName
+ * @covers \Magento\App\Action\AbstractAction::getFullActionName
*/
public function testGetFullActionName()
{
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Design/FileResolution/StrategyPoolTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Design/FileResolution/StrategyPoolTest.php
deleted file mode 100644
index c1e1d51ee51..00000000000
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Design/FileResolution/StrategyPoolTest.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category Magento
- * @package Magento_Core
- * @subpackage unit_tests
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-namespace Magento\Core\Model\Design\FileResolution;
-
-class StrategyPoolTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @var \Magento\Core\Model\ObjectManager|PHPUnit_Framework_MockObject_MockObject
- */
- protected $_objectManager;
-
- /**
- * @var \Magento\App\State|PHPUnit_Framework_MockObject_MockObject
- */
- protected $_appState;
-
- /**
- * @var \Magento\App\Dir|PHPUnit_Framework_MockObject_MockObject
- */
- protected $_dirs;
-
- /**
- * @var \Magento\Filesystem|PHPUnit_Framework_MockObject_MockObject
- */
- protected $_filesystem;
-
- /**
- * @var \Magento\Core\Model\Design\FileResolution\StrategyPool|PHPUnit_Framework_MockObject_MockObject
- */
- protected $_model;
-
- protected function setUp()
- {
- $this->_objectManager = $this->getMock('Magento\Core\Model\ObjectManager', array(), array(), '', false);
- $this->_appState = $this->getMock('Magento\App\State', array(), array(), '', false);
-
- $this->_dirs = new \Magento\App\Dir('base_dir');
-
- $this->_filesystem = $this->getMock('Magento\Filesystem', array(), array(), '', false);
-
- $this->_model = new \Magento\Core\Model\Design\FileResolution\StrategyPool($this->_objectManager,
- $this->_appState, $this->_dirs, $this->_filesystem);
- }
-
- /**
- * Test, that strategy creation works and a strategy is returned.
- *
- * Do not test exact strategy returned, as it depends on configuration, which can be changed any time.
- *
- * @param string $mode
- * @dataProvider getStrategyDataProvider
- */
- public function testGetStrategy($mode)
- {
- $this->_appState->expects($this->exactly(3)) // 3 similar methods tested at once
- ->method('getMode')
- ->will($this->returnValue($mode));
-
- $strategy = new \StdClass;
- $mapDir = 'base_dir/var/' . \Magento\Core\Model\Design\FileResolution\StrategyPool::FALLBACK_MAP_DIR;
- $mapDir = str_replace('/', DIRECTORY_SEPARATOR, $mapDir);
- $map = array(
- array(
- 'Magento\Core\Model\Design\FileResolution\Strategy\Fallback\CachingProxy',
- array(
- 'mapDir' => $mapDir,
- 'baseDir' => 'base_dir'
- ),
- $strategy
- ),
- array('Magento\Core\Model\Design\FileResolution\Strategy\Fallback', array(), $strategy),
- );
- $this->_objectManager->expects($this->atLeastOnce())
- ->method('create')
- ->will($this->returnValueMap($map));
-
- // Test
- $actual = call_user_func(array($this->_model, 'getFileStrategy'));
- $this->assertSame($strategy, $actual);
-
- $actual = call_user_func(array($this->_model, 'getLocaleStrategy'));
- $this->assertSame($strategy, $actual);
-
- $actual = call_user_func(array($this->_model, 'getViewStrategy'));
- $this->assertSame($strategy, $actual);
- }
-
- public static function getStrategyDataProvider()
- {
- return array(
- 'default mode' => array(
- \Magento\App\State::MODE_DEFAULT
- ),
- 'production mode' => array(
- \Magento\App\State::MODE_PRODUCTION
- ),
- 'developer mode' => array(
- \Magento\App\State::MODE_DEVELOPER
- ),
- );
- }
-}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/BaseTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/BaseTest.php
deleted file mode 100644
index 9debddd6e38..00000000000
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/BaseTest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-
-namespace Magento\Core\Model\Layout\File\Source;
-
-class BaseTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @var \Magento\Core\Model\Layout\File\Source\Base
- */
- private $_model;
-
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- private $_filesystem;
-
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- private $_dirs;
-
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- private $_fileFactory;
-
- protected function setUp()
- {
- $this->_filesystem = $this->getMock('Magento\Filesystem', array(), array(), '', false);
- $this->_dirs = $this->getMock('Magento\App\Dir', array(), array(), '', false);
- $this->_dirs->expects($this->any())->method('getDir')->will($this->returnArgument(0));
- $this->_fileFactory = $this->getMock('Magento\Core\Model\Layout\File\Factory', array(), array(), '', false);
- $this->_model = new \Magento\Core\Model\Layout\File\Source\Base(
- $this->_filesystem, $this->_dirs, $this->_fileFactory
- );
- }
-
- public function testGetFiles()
- {
- $theme = $this->getMockForAbstractClass('Magento\View\Design\ThemeInterface');
- $theme->expects($this->once())->method('getArea')->will($this->returnValue('area'));
-
- $this->_filesystem
- ->expects($this->once())
- ->method('searchKeys')
- ->with('code', '*/*/view/area/layout/*.xml')
- ->will($this->returnValue(array(
- 'code/Module/One/view/area/layout/1.xml',
- 'code/Module/One/view/area/layout/2.xml',
- 'code/Module/Two/view/area/layout/3.xml',
- )))
- ;
-
- $fileOne = new \Magento\Core\Model\Layout\File('1.xml', 'Module_One');
- $fileTwo = new \Magento\Core\Model\Layout\File('2.xml', 'Module_One');
- $fileThree = new \Magento\Core\Model\Layout\File('3.xml', 'Module_Two');
- $this->_fileFactory
- ->expects($this->exactly(3))
- ->method('create')
- ->will($this->returnValueMap(array(
- array('code/Module/One/view/area/layout/1.xml', 'Module_One', null, $fileOne),
- array('code/Module/One/view/area/layout/2.xml', 'Module_One', null, $fileTwo),
- array('code/Module/Two/view/area/layout/3.xml', 'Module_Two', null, $fileThree),
- )))
- ;
-
- $this->assertSame(array($fileOne, $fileTwo, $fileThree), $this->_model->getFiles($theme));
- }
-}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/Override/BaseTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/Override/BaseTest.php
deleted file mode 100644
index 107b208cf15..00000000000
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/Override/BaseTest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-
-namespace Magento\Core\Model\Layout\File\Source\Override;
-
-class BaseTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @var \Magento\Core\Model\Layout\File\Source\Override\Base
- */
- private $_model;
-
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- private $_filesystem;
-
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- private $_dirs;
-
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- private $_fileFactory;
-
- protected function setUp()
- {
- $this->_filesystem = $this->getMock('Magento\Filesystem', array(), array(), '', false);
- $this->_dirs = $this->getMock('Magento\App\Dir', array(), array(), '', false);
- $this->_dirs->expects($this->any())->method('getDir')->will($this->returnArgument(0));
- $this->_fileFactory = $this->getMock('Magento\Core\Model\Layout\File\Factory', array(), array(), '', false);
- $this->_model = new \Magento\Core\Model\Layout\File\Source\Override\Base(
- $this->_filesystem, $this->_dirs, $this->_fileFactory
- );
- }
-
- public function testGetFiles()
- {
- $theme = $this->getMockForAbstractClass('Magento\View\Design\ThemeInterface');
- $theme->expects($this->once())->method('getFullPath')->will($this->returnValue('area/theme/path'));
-
- $this->_filesystem
- ->expects($this->once())
- ->method('searchKeys')
- ->with('design', 'area/theme/path/*_*/layout/override/*.xml')
- ->will($this->returnValue(array(
- 'design/area/theme/path/Module_One/layout/override/1.xml',
- 'design/area/theme/path/Module_One/layout/override/2.xml',
- 'design/area/theme/path/Module_Two/layout/override/3.xml',
- )))
- ;
-
- $fileOne = new \Magento\Core\Model\Layout\File('1.xml', 'Module_One');
- $fileTwo = new \Magento\Core\Model\Layout\File('2.xml', 'Module_One');
- $fileThree = new \Magento\Core\Model\Layout\File('3.xml', 'Module_Two');
- $this->_fileFactory
- ->expects($this->exactly(3))
- ->method('create')
- ->will($this->returnValueMap(array(
- array('design/area/theme/path/Module_One/layout/override/1.xml', 'Module_One', null, $fileOne),
- array('design/area/theme/path/Module_One/layout/override/2.xml', 'Module_One', null, $fileTwo),
- array('design/area/theme/path/Module_Two/layout/override/3.xml', 'Module_Two', null, $fileThree),
- )))
- ;
-
- $this->assertSame(array($fileOne, $fileTwo, $fileThree), $this->_model->getFiles($theme));
- }
-}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
index 9161a567a5a..53298aebc47 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
@@ -65,9 +65,9 @@ class MergeTest extends \PHPUnit_Framework_TestCase
{
$files = array();
foreach (glob(__DIR__ . '/_files/layout/*.xml') as $filename) {
- $files[] = new \Magento\Core\Model\Layout\File($filename, 'Magento_Core');
+ $files[] = new \Magento\View\Layout\File($filename, 'Magento_Core');
}
- $fileSource = $this->getMockForAbstractClass('Magento\Core\Model\Layout\File\SourceInterface');
+ $fileSource = $this->getMockForAbstractClass('Magento\View\Layout\File\SourceInterface');
$fileSource->expects($this->any())->method('getFiles')->will($this->returnValue($files));
$design = $this->getMockForAbstractClass('Magento\View\DesignInterface');
@@ -134,7 +134,8 @@ class MergeTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($nonPageHandles, $this->_model->getHandles());
/* test that only the first existing handle is taken into account */
- $handlesToTry = array('catalog_product_view_type_simple', 'checkout_onepage_index');
+ $handlesToTry = array(
+ 'default', 'catalog_category_default', 'catalog_product_view', 'catalog_product_view_type_simple');
$expectedPageHandles = array(
'default', 'catalog_category_default', 'catalog_product_view', 'catalog_product_view_type_simple'
);
@@ -144,51 +145,14 @@ class MergeTest extends \PHPUnit_Framework_TestCase
/* test that new handles override the previous ones */
$expectedPageHandles = array('default', 'checkout_onepage_index');
- $this->assertTrue($this->_model->addPageHandles(array('checkout_onepage_index')));
+ $this->_model->removeHandle('catalog_category_default');
+ $this->_model->removeHandle('catalog_product_view');
+ $this->_model->removeHandle('catalog_product_view_type_simple');
+ $this->assertTrue($this->_model->addPageHandles(array('default', 'checkout_onepage_index')));
$this->assertEquals($expectedPageHandles, $this->_model->getPageHandles());
$this->assertEquals(array_merge($nonPageHandles, $expectedPageHandles), $this->_model->getHandles());
}
- /**
- * @param string $inputPageHandle
- * @param bool $isPageTypeOnly
- * @param array $expectedResult
- * @dataProvider getPageHandleParentsDataProvider
- */
- public function testGetPageHandleParents($inputPageHandle, $isPageTypeOnly, $expectedResult)
- {
- $this->assertSame($expectedResult, $this->_model->getPageHandleParents($inputPageHandle, $isPageTypeOnly));
- }
-
- public function getPageHandleParentsDataProvider()
- {
- return array(
- 'non-existing handle' => array('non_existing_handle', false, array()),
- 'non page type handle' => array('not_a_page_type', false, array()),
- 'page type with no parent' => array('default', false, array()),
- 'page type with parent' => array(
- 'catalog_category_default', false, array('default')
- ),
- 'deeply nested page type' => array(
- 'catalog_category_layered', false, array('default', 'catalog_category_default')
- ),
- 'page fragment is not processed' => array(
- 'checkout_onepage_progress', true, array()
- ),
- 'page fragment is processed' => array(
- 'checkout_onepage_progress', false, array('default', 'checkout_onepage_index')
- )
- );
- }
-
- public function testGetPageHandlesHierarchy()
- {
- $expected = require(__DIR__ . '/_files/pages_hierarchy.php');
- $actual = $this->_model->getPageHandlesHierarchy();
- $this->assertEquals($expected, $actual);
- $this->assertInternalType('string', $actual['default']['label']);
- }
-
/**
* @dataProvider pageHandleExistsDataProvider
*/
@@ -276,6 +240,8 @@ class MergeTest extends \PHPUnit_Framework_TestCase
public function testGetContainers()
{
+ $this->_model->addPageHandles(array('default'));
+ $this->_model->addPageHandles(array('catalog_product_view'));
$this->_model->addPageHandles(array('catalog_product_view_type_configurable'));
$this->_model->load();
$expected = array(
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_category_default.xml b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_category_default.xml
index ff62b5b9878..0d89580372c 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_category_default.xml
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_category_default.xml
@@ -23,4 +23,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout label="Catalog Category (Non-Anchor)" type="page" parent="default"/>
+<layout label="Catalog Category (Non-Anchor)" type="page"/>
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_category_layered.xml b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_category_layered.xml
index 193bac402fb..12ec004bb44 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_category_layered.xml
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_category_layered.xml
@@ -23,4 +23,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout label="Catalog Category (Anchor)" type="page" parent="catalog_category_default"/>
+<layout label="Catalog Category (Anchor)" type="page"/>
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view.xml b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view.xml
index c5b4b6f309d..b9c1c3551df 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view.xml
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view.xml
@@ -23,6 +23,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout label="Catalog Product View (Any)" type="page" parent="catalog_category_default">
+<layout label="Catalog Product View (Any)" type="page">
<container name="product.info.extrahint" as="extrahint" label="Product View Extra Hint"/>
</layout>
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view_type_configurable.xml b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view_type_configurable.xml
index 8abaa81f1e9..ca654ec8fc8 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view_type_configurable.xml
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view_type_configurable.xml
@@ -23,6 +23,6 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout label="Catalog Product View (Configurable)" type="page" parent="catalog_product_view">
+<layout label="Catalog Product View (Configurable)" type="page">
<container name="product.info.configurable.extra" as="product_type_data_extra" label="Configurable Product Extra Info"/>
</layout>
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view_type_grouped.xml b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view_type_grouped.xml
index 20ac8436305..91e7aa59a2d 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view_type_grouped.xml
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view_type_grouped.xml
@@ -23,4 +23,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout label="Catalog Product View (Grouped)" type="page" parent="catalog_product_view"/>
+<layout label="Catalog Product View (Grouped)" type="page"/>
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view_type_simple.xml b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view_type_simple.xml
index 5c1464e2d2e..5d6c257d001 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view_type_simple.xml
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view_type_simple.xml
@@ -23,4 +23,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout label="Catalog Product View (Simple)" type="page" parent="catalog_product_view"/>
+<layout label="Catalog Product View (Simple)" type="page"/>
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalogsearch_ajax_suggest.xml b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalogsearch_ajax_suggest.xml
deleted file mode 100644
index 4507bc8c92d..00000000000
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalogsearch_ajax_suggest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout label="Catalog Quick Search Form Suggestions" type="fragment" owner="default"/>
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/checkout_onepage_index.xml b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/checkout_onepage_index.xml
index 1bdc03a7562..591d79b8237 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/checkout_onepage_index.xml
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/checkout_onepage_index.xml
@@ -23,4 +23,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout label="One Page Checkout" type="page" parent="default"/>
+<layout label="One Page Checkout" type="page"/>
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/checkout_onepage_progress.xml b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/checkout_onepage_progress.xml
deleted file mode 100644
index e39c03f20e2..00000000000
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/checkout_onepage_progress.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License (AFL 3.0)
- * that is bundled with this package in the file LICENSE_AFL.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/afl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
- */
--->
-<layout label="One Page Checkout Progress" type="fragment" owner="checkout_onepage_index"/>
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/sales_guest_print.xml b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/sales_guest_print.xml
index 8fac68e8201..05482591e8f 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/sales_guest_print.xml
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/sales_guest_print.xml
@@ -23,4 +23,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout label="Sales Order Print View (Guest)" type="page" parent="print"/>
+<layout label="Sales Order Print View (Guest)" type="page"/>
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/sales_order_print.xml b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/sales_order_print.xml
index 6bb9a1e3870..bc0e1a10b1d 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/sales_order_print.xml
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/sales_order_print.xml
@@ -23,4 +23,4 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-->
-<layout label="Sales Order Print View" type="page" parent="print"/>
+<layout label="Sales Order Print View" type="page"/>
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/merged.xml b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/merged.xml
index b1dd538025c..9de751d0c92 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/merged.xml
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/merged.xml
@@ -26,19 +26,17 @@
*/
-->
<layouts>
- <handle id="catalog_category_default" label="Catalog Category (Non-Anchor)" type="page" parent="default"/>
- <handle id="catalog_category_layered" label="Catalog Category (Anchor)" type="page" parent="catalog_category_default"/>
- <handle id="catalog_product_view" label="Catalog Product View (Any)" type="page" parent="catalog_category_default">
+ <handle id="catalog_category_default" label="Catalog Category (Non-Anchor)" type="page"/>
+ <handle id="catalog_category_layered" label="Catalog Category (Anchor)" type="page"/>
+ <handle id="catalog_product_view" label="Catalog Product View (Any)" type="page">
<container name="product.info.extrahint" as="extrahint" label="Product View Extra Hint"/>
</handle>
- <handle id="catalog_product_view_type_configurable" label="Catalog Product View (Configurable)" type="page" parent="catalog_product_view">
+ <handle id="catalog_product_view_type_configurable" label="Catalog Product View (Configurable)" type="page">
<container name="product.info.configurable.extra" as="product_type_data_extra" label="Configurable Product Extra Info"/>
</handle>
- <handle id="catalog_product_view_type_grouped" label="Catalog Product View (Grouped)" type="page" parent="catalog_product_view"/>
- <handle id="catalog_product_view_type_simple" label="Catalog Product View (Simple)" type="page" parent="catalog_product_view"/>
- <handle id="catalogsearch_ajax_suggest" label="Catalog Quick Search Form Suggestions" type="fragment" owner="default"/>
- <handle id="checkout_onepage_index" label="One Page Checkout" type="page" parent="default"/>
- <handle id="checkout_onepage_progress" label="One Page Checkout Progress" type="fragment" owner="checkout_onepage_index"/>
+ <handle id="catalog_product_view_type_grouped" label="Catalog Product View (Grouped)" type="page"/>
+ <handle id="catalog_product_view_type_simple" label="Catalog Product View (Simple)" type="page"/>
+ <handle id="checkout_onepage_index" label="One Page Checkout" type="page"/>
<handle id="default" label="All Pages" type="page">
<container name="content" as="content" label="Main Content Area"/>
</handle>
@@ -50,6 +48,6 @@
</handle>
<handle id="not_a_page_type" label="Handle that Is Not a Page Type"/>
<handle id="print" label="All Pages (Print Version)" type="page"/>
- <handle id="sales_guest_print" label="Sales Order Print View (Guest)" type="page" parent="print"/>
- <handle id="sales_order_print" label="Sales Order Print View" type="page" parent="print"/>
+ <handle id="sales_guest_print" label="Sales Order Print View (Guest)" type="page"/>
+ <handle id="sales_order_print" label="Sales Order Print View" type="page"/>
</layouts>
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/pages_hierarchy.php b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/pages_hierarchy.php
deleted file mode 100644
index c49c13b7bb0..00000000000
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/pages_hierarchy.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-?>
-<?php
-return array(
- 'print' => array(
- 'name' => 'print',
- 'label' => 'All Pages (Print Version)',
- 'type' => 'page',
- 'children' => array(
- 'sales_order_print' => array(
- 'name' => 'sales_order_print',
- 'label' => 'Sales Order Print View',
- 'type' => 'page',
- 'children' => array(),
- ),
- 'sales_guest_print' => array(
- 'name' => 'sales_guest_print',
- 'label' => 'Sales Order Print View (Guest)',
- 'type' => 'page',
- 'children' => array(),
- ),
- ),
- ),
- 'default' => array(
- 'name' => 'default',
- 'label' => 'All Pages',
- 'type' => 'page',
- 'children' => array(
- 'catalog_category_default' => array(
- 'name' => 'catalog_category_default',
- 'label' => 'Catalog Category (Non-Anchor)',
- 'type' => 'page',
- 'children' => array(
- 'catalog_category_layered' => array(
- 'name' => 'catalog_category_layered',
- 'label' => 'Catalog Category (Anchor)',
- 'type' => 'page',
- 'children' => array(),
- ),
- 'catalog_product_view' => array(
- 'name' => 'catalog_product_view',
- 'label' => 'Catalog Product View (Any)',
- 'type' => 'page',
- 'children' => array(
- 'catalog_product_view_type_simple' => array(
- 'name' => 'catalog_product_view_type_simple',
- 'label' => 'Catalog Product View (Simple)',
- 'type' => 'page',
- 'children' => array(),
- ),
- 'catalog_product_view_type_configurable' => array(
- 'name' => 'catalog_product_view_type_configurable',
- 'label' => 'Catalog Product View (Configurable)',
- 'type' => 'page',
- 'children' => array(),
- ),
- 'catalog_product_view_type_grouped' => array(
- 'name' => 'catalog_product_view_type_grouped',
- 'label' => 'Catalog Product View (Grouped)',
- 'type' => 'page',
- 'children' => array(),
- ),
- ),
- ),
- ),
- ),
- 'catalogsearch_ajax_suggest' => array(
- 'name' => 'catalogsearch_ajax_suggest',
- 'label' => 'Catalog Quick Search Form Suggestions',
- 'type' => 'fragment',
- 'children' => array(),
- ),
- 'checkout_onepage_index' => array(
- 'name' => 'checkout_onepage_index',
- 'label' => 'One Page Checkout',
- 'type' => 'page',
- 'children' => array(
- 'checkout_onepage_progress' => array(
- 'name' => 'checkout_onepage_progress',
- 'label' => 'One Page Checkout Progress',
- 'type' => 'fragment',
- 'children' => array()
- ),
- ),
- ),
- ),
- ),
-);
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Source/Urlrewrite/OptionsTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Source/Urlrewrite/OptionsTest.php
index acc71efcb15..cb2a26e5044 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Source/Urlrewrite/OptionsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Source/Urlrewrite/OptionsTest.php
@@ -33,7 +33,7 @@ namespace Magento\Core\Model\Source\Urlrewrite;
class OptionsTest extends \PHPUnit_Framework_TestCase
{
/**
- * @covers \Magento\Core\Model\Source\Urlrewrite\OptionsTest::getAllOptions
+ * @covers \Magento\Core\Model\Source\Urlrewrite\Options::getAllOptions
*/
public function testGetAllOptions()
{
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Store/StorageFactoryTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Store/StorageFactoryTest.php
index 02115dd140c..6bd253b0572 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Store/StorageFactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Store/StorageFactoryTest.php
@@ -93,8 +93,15 @@ class StorageFactoryTest extends \PHPUnit_Framework_TestCase
$this->_eventManagerMock = $this->getMock('Magento\Event\ManagerInterface', array(), array(), '', false);
$this->_logMock = $this->getMock('Magento\Core\Model\Logger', array(), array(), '', false);
$this->_configMock = $this->getMock('Magento\Core\Model\ConfigInterface', array(), array(), '', false);
- $this->_appMock
- = $this->getMock('Magento\Core\Model\App\Proxy', array('setUseSessionInUrl'), array(), '', false);
+ $this->_appMock = $this->getMockForAbstractClass(
+ 'Magento\Core\Model\AppInterface',
+ [],
+ '',
+ false,
+ false,
+ false,
+ ['setUseSessionInUrl']
+ );
$this->_appStateMock = $this->getMock('Magento\App\State', array(), array(), '', false);
$this->_storage = $this->getMock('Magento\Core\Model\Store\StorageInterface');
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/Decorator/DebugHintsTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/Decorator/DebugHintsTest.php
index b0db664d169..153c0ddf172 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/Decorator/DebugHintsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/Decorator/DebugHintsTest.php
@@ -32,7 +32,7 @@ class DebugHintsTest extends \PHPUnit_Framework_TestCase
*/
public function testRender($showBlockHints)
{
- $subject = $this->getMock('Magento\Core\Model\TemplateEngine\EngineInterface');
+ $subject = $this->getMock('Magento\View\TemplateEngineInterface');
$block = $this->getMock('Magento\Core\Block\Template', array(), array(), 'TestBlock', false);
$subject
->expects($this->once())
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/FactoryTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/FactoryTest.php
deleted file mode 100644
index 6bdf3d4a83f..00000000000
--- a/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/FactoryTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-
-namespace Magento\Core\Model\TemplateEngine;
-
-class FactoryTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @var Factory
- */
- protected $_model;
-
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $_objectManager;
-
- protected function setUp()
- {
- $this->_objectManager = $this->getMock('Magento\ObjectManager');
- $this->_model = new Factory($this->_objectManager, array(
- 'test' => 'Fixture\Module\Model\TemplateEngine',
- ));
- }
-
- public function testCreateKnownEngine()
- {
- $engine = $this->getMock('Magento\Core\Model\TemplateEngine\EngineInterface');
- $this->_objectManager
- ->expects($this->once())
- ->method('create')
- ->with('Fixture\Module\Model\TemplateEngine')
- ->will($this->returnValue($engine))
- ;
- $this->assertSame($engine, $this->_model->create('test'));
- }
-
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage Unknown template engine 'non_existing'
- */
- public function testCreateUnknownEngine()
- {
- $this->_objectManager->expects($this->never())->method('create');
- $this->_model->create('non_existing');
- }
-
- /**
- * @expectedException \UnexpectedValueException
- * @expectedExceptionMessage Fixture\Module\Model\TemplateEngine has to implement the template engine interface
- */
- public function testCreateInvalidEngine()
- {
- $this->_objectManager
- ->expects($this->once())
- ->method('create')
- ->with('Fixture\Module\Model\TemplateEngine')
- ->will($this->returnValue(new \stdClass()))
- ;
- $this->_model->create('test');
- }
-}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/Plugin/DebugHintsTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/Plugin/DebugHintsTest.php
index 5e78237ce6f..e7d61120f84 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/Plugin/DebugHintsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/Plugin/DebugHintsTest.php
@@ -62,8 +62,8 @@ class DebugHintsTest extends \PHPUnit_Framework_TestCase
{
$this->_coreData->expects($this->once())->method('isDevAllowed')->will($this->returnValue(true));
$this->_setupConfigFixture(true, $showBlockHints);
- $engine = $this->getMock('Magento\Core\Model\TemplateEngine\EngineInterface');
- $engineDecorated = $this->getMock('Magento\Core\Model\TemplateEngine\EngineInterface');
+ $engine = $this->getMock('Magento\View\TemplateEngineInterface');
+ $engineDecorated = $this->getMock('Magento\View\TemplateEngineInterface');
$this->_objectManager
->expects($this->once())
->method('create')
@@ -94,7 +94,7 @@ class DebugHintsTest extends \PHPUnit_Framework_TestCase
$this->_coreData->expects($this->any())->method('isDevAllowed')->will($this->returnValue($isDevAllowed));
$this->_setupConfigFixture($showTemplateHints, true);
$this->_objectManager->expects($this->never())->method('create');
- $engine = $this->getMock('Magento\Core\Model\TemplateEngine\EngineInterface');
+ $engine = $this->getMock('Magento\View\TemplateEngineInterface');
$this->assertSame($engine, $this->_model->afterCreate($engine));
}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/View/FileSystemTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/View/FileSystemTest.php
index a0b161bb7c7..463a3a3308d 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/View/FileSystemTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/View/FileSystemTest.php
@@ -38,7 +38,7 @@ class FileSystemTest extends \PHPUnit_Framework_TestCase
protected $_model;
/**
- * @var \Magento\Core\Model\Design\FileResolution\StrategyPool|PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\View\Design\FileResolution\StrategyPool|PHPUnit_Framework_MockObject_MockObject
*/
protected $_strategyPool;
@@ -50,7 +50,7 @@ class FileSystemTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->_strategyPool = $this->getMock('Magento\Core\Model\Design\FileResolution\StrategyPool', array(),
+ $this->_strategyPool = $this->getMock('Magento\View\Design\FileResolution\StrategyPool', array(),
array(), '', false
);
$this->_viewService = $this->getMock('Magento\Core\Model\View\Service',
@@ -71,7 +71,7 @@ class FileSystemTest extends \PHPUnit_Framework_TestCase
$file = 'Some_Module::some_file.ext';
$expected = 'path/to/some_file.ext';
- $strategyMock = $this->getMock('Magento\Core\Model\Design\FileResolution\Strategy\FileInterface');
+ $strategyMock = $this->getMock('Magento\View\Design\FileResolution\Strategy\FileInterface');
$strategyMock->expects($this->once())
->method('getFile')
->with($params['area'], $params['themeModel'], 'some_file.ext', 'Some_Module')
@@ -101,7 +101,7 @@ class FileSystemTest extends \PHPUnit_Framework_TestCase
$file = 'some_file.ext';
$expected = 'path/to/some_file.ext';
- $strategyMock = $this->getMock('Magento\Core\Model\Design\FileResolution\Strategy\LocaleInterface');
+ $strategyMock = $this->getMock('Magento\View\Design\FileResolution\Strategy\LocaleInterface');
$strategyMock->expects($this->once())
->method('getLocaleFile')
->with($params['area'], $params['themeModel'], $params['locale'], 'some_file.ext')
@@ -128,7 +128,7 @@ class FileSystemTest extends \PHPUnit_Framework_TestCase
$file = 'Some_Module::some_file.ext';
$expected = 'path/to/some_file.ext';
- $strategyMock = $this->getMock('Magento\Core\Model\Design\FileResolution\Strategy\ViewInterface');
+ $strategyMock = $this->getMock('Magento\View\Design\FileResolution\Strategy\ViewInterface');
$strategyMock->expects($this->once())
->method('getViewFile')
->with($params['area'], $params['themeModel'], $params['locale'], 'some_file.ext', 'Some_Module')
diff --git a/dev/tests/unit/testsuite/Magento/CryptTest.php b/dev/tests/unit/testsuite/Magento/CryptTest.php
index 9f21d294906..9b9f503e16a 100755
--- a/dev/tests/unit/testsuite/Magento/CryptTest.php
+++ b/dev/tests/unit/testsuite/Magento/CryptTest.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Crypt
+ * @package Magento_Crypt
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Data/Form/FactoryTest.php b/dev/tests/unit/testsuite/Magento/Data/Form/FactoryTest.php
new file mode 100644
index 00000000000..ed73af499f3
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Data/Form/FactoryTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Data\Form;
+
+/**
+ * Tests for \Magento\Data\Form\Factory
+ */
+class FactoryTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_objectManagerMock;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_sessionMock;
+
+ protected function setUp()
+ {
+ $this->_objectManagerMock = $this->getMock('Magento\ObjectManager\ObjectManager', array(), array(), '', false);
+ $this->_sessionMock = $this->getMock('Magento\Core\Model\Session', array(), array(), '', false);
+ }
+
+ /**
+ * @expectedException \Magento\Exception
+ * @expectedExceptionMessage WrongClass doesn't extends \Magento\Data\Form
+ */
+ public function testWrongTypeException()
+ {
+ $className = 'WrongClass';
+
+ $formMock = $this->getMock($className, array(), array(), '', false);
+ $this->_objectManagerMock->expects($this->once())->method('create')->will($this->returnValue($formMock));
+
+ $formFactory = new Factory($this->_objectManagerMock, $this->_sessionMock, $className);
+ $formFactory->create();
+ }
+
+ public function testCreate()
+ {
+ $className = 'Magento\Data\Form';
+ $formMock = $this->getMock($className, array(), array(), '', false);
+ $this->_objectManagerMock->expects($this->once())
+ ->method('create')
+ ->with($className)
+ ->will($this->returnValue($formMock));
+ $formMock->expects($this->once())
+ ->method('setSession')
+ ->with($this->_sessionMock);
+
+ $formFactory = new Factory($this->_objectManagerMock, $this->_sessionMock, $className);
+ $this->assertSame($formMock, $formFactory->create());
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Data/FormTest.php b/dev/tests/unit/testsuite/Magento/Data/FormTest.php
new file mode 100644
index 00000000000..76cd58b11ad
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Data/FormTest.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Data;
+
+/**
+ * Tests for \Magento\Data\Form\Factory
+ * @SuppressWarnings(PHPMD.LongVariable)
+ */
+class FormTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_factoryElementMock;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_factoryCollectionMock;
+
+ /**
+ * @var \Magento\Data\Form
+ */
+ protected $_form;
+
+ protected function setUp()
+ {
+ $this->_factoryElementMock = $this->getMock('Magento\Data\Form\Element\Factory',
+ array('create'), array(), '', false);
+ $this->_factoryCollectionMock = $this->getMock('Magento\Data\Form\Element\CollectionFactory',
+ array('create'), array(), '', false);
+ $this->_factoryCollectionMock->expects($this->any())->method('create')->will($this->returnValue(array()));
+
+ $this->_form = new Form($this->_factoryElementMock, $this->_factoryCollectionMock);
+ }
+
+ /**
+ * @expectedException \Magento\Exception
+ */
+ public function testRenderWithoutSetSession()
+ {
+ $this->_form->setUseContainer(true);
+ $this->_form->setMethod('post');
+ $this->_form->toHtml();
+ }
+
+ public function testFormKeyUsing()
+ {
+ $formKey = 'form-key';
+ $sessionMock = $this->getMock('Magento\Core\Model\Session\AbstractSession', array('getFormKey'), array(), '',
+ false);
+ $sessionMock->expects($this->once())->method('getFormKey')->will($this->returnValue($formKey));
+
+ $this->_form->setUseContainer(true);
+ $this->_form->setMethod('post');
+ $this->_form->setSession($sessionMock);
+ $this->assertContains($formKey, $this->_form->toHtml());
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/CustomTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/CustomTest.php
index 5f9e901f4ad..bd69efb763d 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/CustomTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/CustomTest.php
@@ -94,7 +94,7 @@ class CustomTest extends \PHPUnit_Framework_TestCase
$this->_urlBuilder->expects($this->once())
->method('getUrl')
- ->with('*/system_design_theme/downloadCustomCss', array('theme_id' => self::TEST_THEME_ID))
+ ->with('adminhtml/system_design_theme/downloadCustomCss', array('theme_id' => self::TEST_THEME_ID))
->will($this->returnValue($expectedUrl));
$this->assertEquals($expectedUrl, $this->_model->getDownloadCustomCssUrl());
@@ -106,7 +106,7 @@ class CustomTest extends \PHPUnit_Framework_TestCase
$this->_urlBuilder->expects($this->once())
->method('getUrl')
- ->with('*/system_design_editor_tools/saveCssContent', array('theme_id' => self::TEST_THEME_ID))
+ ->with('adminhtml/system_design_editor_tools/saveCssContent', array('theme_id' => self::TEST_THEME_ID))
->will($this->returnValue($expectedUrl));
$this->assertEquals($expectedUrl, $this->_model->getSaveCustomCssUrl());
diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/JsTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/JsTest.php
index 0ab89c59318..95cb6d6f3e7 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/JsTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/JsTest.php
@@ -97,7 +97,7 @@ class JsTest extends \PHPUnit_Framework_TestCase
$expectedUrl = 'some_url';
$this->_urlBuilder->expects($this->once())
->method('getUrl')
- ->with('*/system_design_editor_tools/uploadjs', array('theme_id' => self::TEST_THEME_ID))
+ ->with('adminhtml/system_design_editor_tools/uploadjs', array('theme_id' => self::TEST_THEME_ID))
->will($this->returnValue($expectedUrl));
$this->assertEquals($expectedUrl, $this->_model->getJsUploadUrl());
@@ -111,7 +111,7 @@ class JsTest extends \PHPUnit_Framework_TestCase
$expectedUrl = 'some_url';
$this->_urlBuilder->expects($this->once())
->method('getUrl')
- ->with('*/system_design_editor_tools/reorderjs', array('theme_id' => self::TEST_THEME_ID))
+ ->with('adminhtml/system_design_editor_tools/reorderjs', array('theme_id' => self::TEST_THEME_ID))
->will($this->returnValue($expectedUrl));
$this->assertEquals($expectedUrl, $this->_model->getJsReorderUrl());
diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/ContentTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/ContentTest.php
index 5321102c2aa..4c18956dd86 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/ContentTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/ContentTest.php
@@ -86,7 +86,7 @@ class ContentTest extends \PHPUnit_Framework_TestCase
$this->_urlBuilder->expects($this->once())
->method('getUrl')
- ->with('*/*/newFolder', $requestParams)
+ ->with('adminhtml/*/newFolder', $requestParams)
->will($this->returnValue($expectedUrl));
$this->assertEquals($expectedUrl, $this->_filesContent->getNewfolderUrl());
@@ -106,7 +106,7 @@ class ContentTest extends \PHPUnit_Framework_TestCase
$this->_urlBuilder->expects($this->once())
->method('getUrl')
- ->with('*/*/deleteFiles', $requestParams)
+ ->with('adminhtml/*/deleteFiles', $requestParams)
->will($this->returnValue($expectedUrl));
$this->assertEquals($expectedUrl, $this->_filesContent->getDeleteFilesUrl());
@@ -126,7 +126,7 @@ class ContentTest extends \PHPUnit_Framework_TestCase
$this->_urlBuilder->expects($this->once())
->method('getUrl')
- ->with('*/*/onInsert', $requestParams)
+ ->with('adminhtml/*/onInsert', $requestParams)
->will($this->returnValue($expectedUrl));
$this->assertEquals($expectedUrl, $this->_filesContent->getOnInsertUrl());
@@ -173,7 +173,7 @@ class ContentTest extends \PHPUnit_Framework_TestCase
$this->_urlBuilder->expects($this->once())
->method('getUrl')
- ->with('*/*/contents', array('type' => $expectedRequest) + $requestParams)
+ ->with('adminhtml/*/contents', array('type' => $expectedRequest) + $requestParams)
->will($this->returnValue($expectedUrl));
$this->_request->expects($this->once())
diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/TreeTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/TreeTest.php
index ffc35d0ed04..d980d7d9ebf 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/TreeTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/TreeTest.php
@@ -79,7 +79,7 @@ class TreeTest extends \PHPUnit_Framework_TestCase
$this->_urlBuilder->expects($this->once())
->method('getUrl')
- ->with('*/*/treeJson', $requestParams)
+ ->with('adminhtml/*/treeJson', $requestParams)
->will($this->returnValue($expectedUrl));
$this->assertEquals($expectedUrl, $this->_filesTree->getTreeLoaderUrl());
diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/AbstractTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/AbstractTest.php
index d8de79fdc79..18b4016d32e 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/AbstractTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/AbstractTest.php
@@ -87,7 +87,7 @@ class AbstractTest
$themeBlockMock = $this->getMock(
'Magento\DesignEditor\Block\Adminhtml\Theme', array('getTheme'), array(), '', false
);
- /** @var $layoutMock \Magento\Core\Model\Layout */
+ /** @var $layoutMock \Magento\View\LayoutInterface */
$layoutMock = $this->getMock('Magento\Core\Model\Layout', array('createBlock'), array(), '', false);
/** @var $buttonMock \Magento\Backend\Block\Widget\Button */
$buttonMock = $this->getMock('Magento\Backend\Block\Widget\Button', array(), array(), '', false);
diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Adminhtml/System/Design/EditorTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Adminhtml/System/Design/EditorTest.php
index 2c484716f7f..012d50a7f48 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Adminhtml/System/Design/EditorTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Adminhtml/System/Design/EditorTest.php
@@ -64,7 +64,7 @@ class EditorTest extends \PHPUnit_Framework_TestCase
'getMessagesBlock'
),
array(), '', false);
- /** @var $layoutMock \Magento\Core\Model\Layout */
+ /** @var $layoutMock \Magento\View\LayoutInterface */
$layoutMock->expects($this->any())->method('generateXml')->will($this->returnSelf());
$layoutMock->expects($this->any())->method('getNode')
->will($this->returnValue(new \Magento\Simplexml\Element('<root />')));
diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Model/StateTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Model/StateTest.php
index 5392e502d01..5fe57a6e8f1 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Model/StateTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Model/StateTest.php
@@ -256,8 +256,7 @@ class StateTest extends \PHPUnit_Framework_TestCase
$this->_layoutFactory->expects($this->once())
->method('createLayout')
->with(array('area' => self::AREA_CODE), self::LAYOUT_NAVIGATION_CLASS_NAME);
-
- $controller = $this->getMock('Magento\Adminhtml\Controller\Action', array(), array(), '', false);
+ $controller = $this->getMock('Magento\Backend\Controller\Adminhtml\Action', array(), array(), '', false);
$this->assertNull($this->_model->update(self::AREA_CODE, $request, $controller));
}
diff --git a/dev/tests/unit/testsuite/Magento/GoogleOptimizer/Model/Observer/Block/Category/TabTest.php b/dev/tests/unit/testsuite/Magento/GoogleOptimizer/Model/Observer/Block/Category/TabTest.php
index 03ac2a20ec4..d8dd7c7a9a9 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleOptimizer/Model/Observer/Block/Category/TabTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleOptimizer/Model/Observer/Block/Category/TabTest.php
@@ -61,7 +61,8 @@ class TabTest extends \PHPUnit_Framework_TestCase
{
$this->_helperMock = $this->getMock('Magento\GoogleOptimizer\Helper\Data', array(), array(), '', false);
$this->_layoutMock = $this->getMock('Magento\Core\Model\Layout', array(), array(), '', false);
- $this->_tabsMock = $this->getMock('Magento\Adminhtml\Block\Catalog\Category\Tabs', array(), array(), '', false);
+ $this->_tabsMock = $this->getMock('Magento\Catalog\Block\Adminhtml\Category\Tabs',
+ array(), array(), '', false);
$this->_eventObserverMock = $this->getMock('Magento\Event\Observer', array(), array(), '', false);
$objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
diff --git a/dev/tests/unit/testsuite/Magento/Image/Adapter/AbstractTest.php b/dev/tests/unit/testsuite/Magento/Image/Adapter/AbstractTest.php
index 38449eec8ff..d13ced31e7d 100644
--- a/dev/tests/unit/testsuite/Magento/Image/Adapter/AbstractTest.php
+++ b/dev/tests/unit/testsuite/Magento/Image/Adapter/AbstractTest.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Image
+ * @package Magento_Image
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Image/Adapter/ImageMagickTest.php b/dev/tests/unit/testsuite/Magento/Image/Adapter/ImageMagickTest.php
index 184a7b19d26..13514fb7850 100644
--- a/dev/tests/unit/testsuite/Magento/Image/Adapter/ImageMagickTest.php
+++ b/dev/tests/unit/testsuite/Magento/Image/Adapter/ImageMagickTest.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Image
+ * @package Magento_Image
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/EavAbstractTest.php b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/AbstractEavTest.php
similarity index 98%
rename from dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/EavAbstractTest.php
rename to dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/AbstractEavTest.php
index 08ecaa730c8..2767be13ba5 100644
--- a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/EavAbstractTest.php
+++ b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/AbstractEavTest.php
@@ -27,7 +27,7 @@
namespace Magento\ImportExport\Model\Export\Entity;
-class EavAbstractTest extends \PHPUnit_Framework_TestCase
+class AbstractEavTest extends \PHPUnit_Framework_TestCase
{
/**
* Abstract eav export model
@@ -77,7 +77,7 @@ class EavAbstractTest extends \PHPUnit_Framework_TestCase
/**
* Test for methods _addAttributeValuesToRow()
*
- * @covers \Magento\ImportExport\Model\Export\Entity\AbstractEav::_initAttrValues
+ * @covers \Magento\ImportExport\Model\Export\Entity\AbstractEav::_initAttributeValues
* @covers \Magento\ImportExport\Model\Export\Entity\AbstractEav::_addAttributeValuesToRow
*/
public function testAddAttributeValuesToRow()
diff --git a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/CustomerCompositeTest.php b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/CustomerCompositeTest.php
index 7bf437c208f..5ac6b8e72e7 100644
--- a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/CustomerCompositeTest.php
+++ b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/CustomerCompositeTest.php
@@ -717,7 +717,7 @@ class CustomerCompositeTest extends \PHPUnit_Framework_TestCase
}
/**
- * @covers \Magento\ImportExport\Model\Import\Entity\CustomerComposite::setErrorMessages
+ * @covers \Magento\ImportExport\Model\Import\Entity\CustomerComposite::getErrorMessages
*/
public function testGetErrorMessages()
{
diff --git a/dev/tests/unit/testsuite/Magento/Payment/Block/Form/ContainerTest.php b/dev/tests/unit/testsuite/Magento/Payment/Block/Form/ContainerTest.php
index 5df717cca9c..a87b9bd12b2 100644
--- a/dev/tests/unit/testsuite/Magento/Payment/Block/Form/ContainerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Payment/Block/Form/ContainerTest.php
@@ -26,14 +26,14 @@
*/
/**
- * Test class for \Magento\Payment\Block\Form\AbstractContainer
+ * Test class for \Magento\Payment\Block\Form\Container
*/
namespace Magento\Payment\Block\Form;
class ContainerTest extends \PHPUnit_Framework_TestCase
{
/**
- * @covers \Magento\Payment\Block\Form\AbstractContainer::getChildBlock
+ * @covers \Magento\Payment\Block\Form\Container::getChildBlock
*/
public function testSetMethodFormTemplate()
{
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Items/AbstractItemsTest.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Items/AbstractItemsTest.php
new file mode 100644
index 00000000000..41138a22f0a
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Items/AbstractItemsTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Sales\Block\Adminhtml\Items;
+
+class AbstractItemsTest extends \PHPUnit_Framework_TestCase
+{
+ public function testGetItemRenderer()
+ {
+ $layout = $this->getMock(
+ 'Magento\Core\Model\Layout', array('getChildName', 'getBlock', 'getGroupChildNames'), array(), '', false
+ );
+ $layout->expects($this->any())
+ ->method('getChildName')
+ ->with(null, 'some-type')
+ ->will($this->returnValue('column_block-name'));
+ $layout->expects($this->any())
+ ->method('getGroupChildNames')
+ ->with(null, 'column')
+ ->will($this->returnValue(array('column_block-name')));
+
+ $context = $this->getMock('Magento\Backend\Block\Template\Context', array('getLayout'), array(), '', false);
+ $context->expects($this->any())
+ ->method('getLayout')
+ ->will($this->returnValue($layout));
+
+ $product = $this->getMock('\Magento\Catalog\Model\ProductFactory', array(), array(), '', false);
+ $coreData = $this->getMock('\Magento\Core\Helper\Data', array(), array(), '', false);
+ $registry = $this->getMock('\Magento\Core\Model\Registry', array(), array(), '', false);
+
+ $renderer = new \Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer\DefaultRenderer(
+ $product, $coreData, $context, $registry
+ );
+
+ $layout->expects($this->any())
+ ->method('getBlock')
+ ->with('column_block-name')
+ ->will($this->returnValue($renderer));
+
+ $block = new \Magento\Sales\Block\Adminhtml\Items\AbstractItems($product, $coreData, $context, $registry);
+
+ $this->assertSame($renderer, $block->getItemRenderer('some-type'));
+ $this->assertSame($renderer, $renderer->getColumnRenderer('block-name'));
+ }
+
+ /**
+ * @expectedException \RuntimeException
+ * @expectedExceptionMessage Renderer for type "some-type" does not exist.
+ */
+ public function testGetItemRendererThrowsExceptionForNonexistentRenderer()
+ {
+ $renderer = $this->getMock('StdClass');
+ $layout = $this->getMock('Magento\Core\Model\Layout', array('getChildName', 'getBlock'), array(), '', false);
+ $layout->expects($this->at(0))
+ ->method('getChildName')
+ ->with(null, 'some-type')
+ ->will($this->returnValue('some-block-name'));
+ $layout->expects($this->at(1))
+ ->method('getBlock')
+ ->with('some-block-name')
+ ->will($this->returnValue($renderer));
+
+ /** @var $block \Magento\Sales\Block\Adminhtml\Items\AbstractItems */
+ $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $block = $objectManager->getObject(
+ 'Magento\Sales\Block\Adminhtml\Items\AbstractItems',
+ array(
+ 'context' => $objectManager->getObject(
+ 'Magento\Backend\Block\Template\Context',
+ array(
+ 'layout' => $layout,
+ )
+ )
+ )
+ );
+
+ $block->getItemRenderer('some-type');
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/Sales/Items/AbstractTest.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Items/AbstractTest.php
similarity index 77%
rename from dev/tests/unit/testsuite/Magento/Adminhtml/Block/Sales/Items/AbstractTest.php
rename to dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Items/AbstractTest.php
index 87cc13f9ef8..904541d250c 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/Sales/Items/AbstractTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Items/AbstractTest.php
@@ -21,7 +21,7 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Sales\Items;
+namespace Magento\Sales\Block\Adminhtml\Items;
class AbstractTest extends \PHPUnit_Framework_TestCase
{
@@ -35,15 +35,9 @@ class AbstractTest extends \PHPUnit_Framework_TestCase
public function testGetItemRenderer()
{
- $renderer = $this->getMock('Magento\Core\Block\AbstractBlock', array('addColumnRender'), array(), '', false);
- $renderer->expects($this->at(0))
- ->method('addColumnRender')
- ->with('qty', 'Magento\Adminhtml\Block\Sales\Items\Column\Qty', 'sales/items/column/qty.phtml');
- $renderer->expects($this->at(1))
- ->method('addColumnRender')
- ->with('name', 'Magento\Adminhtml\Block\Sales\Items\Column\Name', 'sales/items/column/name.phtml');
+ $renderer = $this->getMock('Magento\Core\Block\AbstractBlock', array(), array(), '', false);
$layout = $this->getMock('Magento\Core\Model\Layout', array(
- 'getChildName', 'getBlock'
+ 'getChildName', 'getBlock', 'getGroupChildNames'
), array(), '', false);
$layout->expects($this->at(0))
->method('getChildName')
@@ -54,8 +48,8 @@ class AbstractTest extends \PHPUnit_Framework_TestCase
->with('some-block-name')
->will($this->returnValue($renderer));
- /** @var $block \Magento\Adminhtml\Block\Sales\Items\AbstractItems */
- $block = $this->_objectManager->getObject('Magento\Adminhtml\Block\Sales\Items\AbstractItems', array(
+ /** @var $block \Magento\Sales\Block\Adminhtml\Items\AbstractItems */
+ $block = $this->_objectManager->getObject('Magento\Sales\Block\Adminhtml\Items\AbstractItems', array(
'context' => $this->_objectManager->getObject('Magento\Backend\Block\Template\Context', array(
'layout' => $layout,
))
@@ -83,8 +77,8 @@ class AbstractTest extends \PHPUnit_Framework_TestCase
->with('some-block-name')
->will($this->returnValue($renderer));
- /** @var $block \Magento\Adminhtml\Block\Sales\Items\AbstractItems */
- $block = $this->_objectManager->getObject('Magento\Adminhtml\Block\Sales\Items\AbstractItems', array(
+ /** @var $block \Magento\Sales\Block\Adminhtml\Items\AbstractItems */
+ $block = $this->_objectManager->getObject('Magento\Sales\Block\Adminhtml\Items\AbstractItems', array(
'context' => $this->_objectManager->getObject('Magento\Backend\Block\Template\Context', array(
'layout' => $layout,
))
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/Sales/Order/Create/Items/GridTest.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Items/GridTest.php
similarity index 94%
rename from dev/tests/unit/testsuite/Magento/Adminhtml/Block/Sales/Order/Create/Items/GridTest.php
rename to dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Items/GridTest.php
index 34fb1a20143..e1ac1d24ec1 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/Sales/Order/Create/Items/GridTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Items/GridTest.php
@@ -22,12 +22,12 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Create\Items;
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Items;
class GridTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Adminhtml\Block\Sales\Order\Create\Items\Grid
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid
*/
protected $_block;
@@ -36,7 +36,7 @@ class GridTest extends \PHPUnit_Framework_TestCase
*/
protected function setUp()
{
- $orderCreateMock = $this->getMock('Magento\Adminhtml\Model\Sales\Order\Create', array(), array(), '', false);
+ $orderCreateMock = $this->getMock('Magento\Sales\Model\AdminOrder\Create', array(), array(), '', false);
$helperFactory = $this->getMockBuilder('Magento\Core\Model\Factory\Helper')
->disableOriginalConstructor()
->setMethods(array('get'))
@@ -85,7 +85,7 @@ class GridTest extends \PHPUnit_Framework_TestCase
$taxConfig = $this->getMockBuilder('Magento\Tax\Model\Config')->disableOriginalConstructor()->getMock();
- $this->_block = $this->getMockBuilder('Magento\Adminhtml\Block\Sales\Order\Create\Items\Grid')
+ $this->_block = $this->getMockBuilder('Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid')
->setConstructorArgs(
array(
$wishlistFactoryMock, $giftMessageSave, $taxConfig, $taxData,
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/Sales/Order/Invoice/ViewTest.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Invoice/ViewTest.php
similarity index 88%
rename from dev/tests/unit/testsuite/Magento/Adminhtml/Block/Sales/Order/Invoice/ViewTest.php
rename to dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Invoice/ViewTest.php
index 625022632d0..18ca19f515c 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/Sales/Order/Invoice/ViewTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Invoice/ViewTest.php
@@ -19,16 +19,16 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Test class for \Magento\Adminhtml\Block\Sales\Order\Invoice\View
+ * Test class for \Magento\Sales\Block\Adminhtml\Order\Invoice\View
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Invoice;
+namespace Magento\Sales\Block\Adminhtml\Order\Invoice;
class ViewTest extends \PHPUnit_Framework_TestCase
{
@@ -61,14 +61,14 @@ class ViewTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue($order));
// Prepare block to test protected method
- $block = $this->getMockBuilder('Magento\Adminhtml\Block\Sales\Order\Invoice\View')
+ $block = $this->getMockBuilder('Magento\Sales\Block\Adminhtml\Order\Invoice\View')
->disableOriginalConstructor()
->setMethods(array('getInvoice'))
->getMock();
$block->expects($this->once())
->method('getInvoice')
->will($this->returnValue($invoice));
- $testMethod = new \ReflectionMethod('Magento\Adminhtml\Block\Sales\Order\Invoice\View', '_isPaymentReview');
+ $testMethod = new \ReflectionMethod('Magento\Sales\Block\Adminhtml\Order\Invoice\View', '_isPaymentReview');
$testMethod->setAccessible(true);
$this->assertEquals($expectedResult, $testMethod->invoke($block));
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/Sales/Order/Totals/TaxTest.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Totals/TaxTest.php
similarity index 89%
rename from dev/tests/unit/testsuite/Magento/Adminhtml/Block/Sales/Order/Totals/TaxTest.php
rename to dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Totals/TaxTest.php
index e9ca1976436..11242f34ae8 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/Sales/Order/Totals/TaxTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Totals/TaxTest.php
@@ -19,21 +19,21 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Test class for \Magento\Adminhtml\Block\Sales\Order\Totals\TaxTest
+ * Test class for \Magento\Sales\Block\Adminhtml\Order\Totals\TaxTest
*/
-namespace Magento\Adminhtml\Block\Sales\Order\Totals;
+namespace Magento\Sales\Block\Adminhtml\Order\Totals;
class TaxTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Adminhtml\Block\Sales\Order\Totals\Tax
+ * @var \Magento\Sales\Block\Adminhtml\Order\Totals\Tax
*/
protected $_block;
@@ -43,18 +43,18 @@ class TaxTest extends \PHPUnit_Framework_TestCase
protected $_objectManager;
/**
- * Instantiate \Magento\Adminhtml\Block\Sales\Order\Totals\Tax block
+ * Instantiate \Magento\Sales\Block\Adminhtml\Order\Totals\Tax block
*/
protected function setUp()
{
- $this->_block = $this->getMockBuilder('Magento\Adminhtml\Block\Sales\Order\Totals\Tax')
+ $this->_block = $this->getMockBuilder('Magento\Sales\Block\Adminhtml\Order\Totals\Tax')
->setConstructorArgs($this->_getModelArgument())
->setMethods(array('getOrder'))
->getMock();
}
/**
- * Module arguments for \Magento\Adminhtml\Block\Sales\Order\Totals\Tax
+ * Module arguments for \Magento\Sales\Block\Adminhtml\Order\Totals\Tax
*
* @return array
*/
@@ -74,7 +74,7 @@ class TaxTest extends \PHPUnit_Framework_TestCase
array('create'), array(), '', false);
return $objectManagerHelper->getConstructArguments(
- 'Magento\Adminhtml\Block\Sales\Order\Totals\Tax',
+ 'Magento\Sales\Block\Adminhtml\Order\Totals\Tax',
array(
'taxHelper' => $taxHelperMock,
'taxOrderFactory' => $taxOrderFactory,
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/Sales/Order/View/GiftmessageTest.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/View/GiftmessageTest.php
similarity index 89%
rename from dev/tests/unit/testsuite/Magento/Adminhtml/Block/Sales/Order/View/GiftmessageTest.php
rename to dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/View/GiftmessageTest.php
index f39be05e010..2d8b184164c 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/Sales/Order/View/GiftmessageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/View/GiftmessageTest.php
@@ -19,13 +19,13 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Sales
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Sales\Order\View;
+namespace Magento\Sales\Block\Adminhtml\Order\View;
class GiftmessageTest extends \PHPUnit_Framework_TestCase
{
@@ -34,8 +34,8 @@ class GiftmessageTest extends \PHPUnit_Framework_TestCase
$item = new \Magento\Object;
$expectedHtml = 'some_value';
- /** @var $block \Magento\Adminhtml\Block\Sales\Order\View\Giftmessage */
- $block = $this->getMock('Magento\Adminhtml\Block\Sales\Order\View\Giftmessage',
+ /** @var $block \Magento\Sales\Block\Adminhtml\Order\View\Giftmessage */
+ $block = $this->getMock('Magento\Sales\Block\Adminhtml\Order\View\Giftmessage',
array('getChildBlock', 'getChildHtml'), array(), '', false);
$block->setEntity(new \Magento\Object);
$block->expects($this->once())
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/Controller/Sales/Order/CreditmemoTest.php b/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreditmemoTest.php
similarity index 96%
rename from dev/tests/unit/testsuite/Magento/Adminhtml/Controller/Sales/Order/CreditmemoTest.php
rename to dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreditmemoTest.php
index 31471bf54a8..5f184065b13 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/Controller/Sales/Order/CreditmemoTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreditmemoTest.php
@@ -21,12 +21,12 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Controller\Sales\Order;
+namespace Magento\Sales\Controller\Adminhtml\Order;
class CreditmemoTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Adminhtml\Controller\Sales\Order\Creditmemo
+ * @var \Magento\Sales\Controller\Adminhtml\Order\Creditmemo
*/
protected $_controller;
@@ -77,7 +77,7 @@ class CreditmemoTest extends \PHPUnit_Framework_TestCase
$context = $helper->getObject('Magento\Backend\Controller\Context', $arguments);
- $this->_controller = $helper->getObject('Magento\Adminhtml\Controller\Sales\Order\Creditmemo',
+ $this->_controller = $helper->getObject('Magento\Sales\Controller\Adminhtml\Order\Creditmemo',
array('context' => $context));
}
diff --git a/dev/tests/unit/testsuite/Magento/ShellTest.php b/dev/tests/unit/testsuite/Magento/ShellTest.php
index 6cbb82ff1d3..bf871e2234a 100644
--- a/dev/tests/unit/testsuite/Magento/ShellTest.php
+++ b/dev/tests/unit/testsuite/Magento/ShellTest.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Shell
+ * @package Magento_Shell
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Test/Tools/View/Generator/CopyRuleTest.php b/dev/tests/unit/testsuite/Magento/Test/Tools/View/Generator/CopyRuleTest.php
index 8dde5621796..0e01dc54dcd 100644
--- a/dev/tests/unit/testsuite/Magento/Test/Tools/View/Generator/CopyRuleTest.php
+++ b/dev/tests/unit/testsuite/Magento/Test/Tools/View/Generator/CopyRuleTest.php
@@ -63,7 +63,7 @@ class CopyRuleTest extends \PHPUnit_Framework_TestCase
)
);
$this->_themeCollection->expects($this->any())->method('isLoaded')->will($this->returnValue(true));
- $this->_fallbackRule = $this->getMockForAbstractClass('Magento\Core\Model\Design\Fallback\Rule\RuleInterface');
+ $this->_fallbackRule = $this->getMockForAbstractClass('Magento\View\Design\Fallback\Rule\RuleInterface');
$this->_object = new \Magento\Tools\View\Generator\CopyRule(
$this->_filesystem,
$this->_themeCollection,
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Tab/JsTest.php b/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Tab/JsTest.php
index 10927ce6d67..7267972f60c 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Tab/JsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Tab/JsTest.php
@@ -110,7 +110,7 @@ class JsTest extends \PHPUnit_Framework_TestCase
$this->_urlBuilder
->expects($this->once())
->method('getUrl')
- ->with('*/system_design_theme/uploadjs', array('id' => $themeId))
+ ->with('adminhtml/system_design_theme/uploadjs', array('id' => $themeId))
->will($this->returnValue($uploadUrl));
$this->assertEquals($uploadUrl, $this->_model->getJsUploadUrl());
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/ContentTest.php b/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/ContentTest.php
index 44590978f8f..c87eae9c330 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/ContentTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/ContentTest.php
@@ -86,7 +86,7 @@ class ContentTest extends \PHPUnit_Framework_TestCase
$this->_urlBuilder->expects($this->once())
->method('getUrl')
- ->with('*/*/newFolder', $requestParams)
+ ->with('adminhtml/*/newFolder', $requestParams)
->will($this->returnValue($expectedUrl));
$this->assertEquals($expectedUrl, $this->_filesContent->getNewfolderUrl());
@@ -106,7 +106,7 @@ class ContentTest extends \PHPUnit_Framework_TestCase
$this->_urlBuilder->expects($this->once())
->method('getUrl')
- ->with('*/*/deleteFiles', $requestParams)
+ ->with('adminhtml/*/deleteFiles', $requestParams)
->will($this->returnValue($expectedUrl));
$this->assertEquals($expectedUrl, $this->_filesContent->getDeleteFilesUrl());
@@ -126,7 +126,7 @@ class ContentTest extends \PHPUnit_Framework_TestCase
$this->_urlBuilder->expects($this->once())
->method('getUrl')
- ->with('*/*/onInsert', $requestParams)
+ ->with('adminhtml/*/onInsert', $requestParams)
->will($this->returnValue($expectedUrl));
$this->assertEquals($expectedUrl, $this->_filesContent->getOnInsertUrl());
@@ -173,7 +173,7 @@ class ContentTest extends \PHPUnit_Framework_TestCase
$this->_urlBuilder->expects($this->once())
->method('getUrl')
- ->with('*/*/contents', array('type' => $expectedRequest) + $requestParams)
+ ->with('adminhtml/*/contents', array('type' => $expectedRequest) + $requestParams)
->will($this->returnValue($expectedUrl));
$this->_request->expects($this->once())
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/TreeTest.php b/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/TreeTest.php
index ee77ee86755..383f41b7065 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/TreeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/TreeTest.php
@@ -79,7 +79,7 @@ class TreeTest extends \PHPUnit_Framework_TestCase
$this->_urlBuilder->expects($this->once())
->method('getUrl')
- ->with('*/*/treeJson', $requestParams)
+ ->with('adminhtml/*/treeJson', $requestParams)
->will($this->returnValue($expectedUrl));
$this->assertEquals($expectedUrl, $this->_filesTree->getTreeLoaderUrl());
diff --git a/dev/tests/unit/testsuite/Magento/Validator/Constraint/Option/CallbackTest.php b/dev/tests/unit/testsuite/Magento/Validator/Constraint/Option/CallbackTest.php
index 641ee562fad..458e0b7af2e 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/Constraint/Option/CallbackTest.php
+++ b/dev/tests/unit/testsuite/Magento/Validator/Constraint/Option/CallbackTest.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/Constraint/OptionTest.php b/dev/tests/unit/testsuite/Magento/Validator/Constraint/OptionTest.php
index b75bb4b7d97..0ca8506f73e 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/Constraint/OptionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Validator/Constraint/OptionTest.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/Constraint/PropertyTest.php b/dev/tests/unit/testsuite/Magento/Validator/Constraint/PropertyTest.php
index 099852c2a61..5996d8626ce 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/Constraint/PropertyTest.php
+++ b/dev/tests/unit/testsuite/Magento/Validator/Constraint/PropertyTest.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/ConstraintTest.php b/dev/tests/unit/testsuite/Magento/Validator/ConstraintTest.php
index d43cafd47ef..b3f2019097a 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/ConstraintTest.php
+++ b/dev/tests/unit/testsuite/Magento/Validator/ConstraintTest.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/Entity/PropertiesTest.php b/dev/tests/unit/testsuite/Magento/Validator/Entity/PropertiesTest.php
index 159c72bec3a..8d00cd3f0ed 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/Entity/PropertiesTest.php
+++ b/dev/tests/unit/testsuite/Magento/Validator/Entity/PropertiesTest.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/ExceptionTest.php b/dev/tests/unit/testsuite/Magento/Validator/ExceptionTest.php
index 8d31399703d..2d8e2d37517 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/ExceptionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Validator/ExceptionTest.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/StringLengthTest.php b/dev/tests/unit/testsuite/Magento/Validator/StringLengthTest.php
index e77bab65e59..e7651a8415f 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/StringLengthTest.php
+++ b/dev/tests/unit/testsuite/Magento/Validator/StringLengthTest.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/Test/Alnum.php b/dev/tests/unit/testsuite/Magento/Validator/Test/Alnum.php
index 2432fc20fa7..be3b36cc309 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/Test/Alnum.php
+++ b/dev/tests/unit/testsuite/Magento/Validator/Test/Alnum.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/Test/Callback.php b/dev/tests/unit/testsuite/Magento/Validator/Test/Callback.php
index 51c33cb23af..07f83856178 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/Test/Callback.php
+++ b/dev/tests/unit/testsuite/Magento/Validator/Test/Callback.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/Test/Int.php b/dev/tests/unit/testsuite/Magento/Validator/Test/Int.php
index 08afbaebcce..3f5747a09bd 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/Test/Int.php
+++ b/dev/tests/unit/testsuite/Magento/Validator/Test/Int.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/Test/NotEmpty.php b/dev/tests/unit/testsuite/Magento/Validator/Test/NotEmpty.php
index 4a7528983b1..74fc0d22e14 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/Test/NotEmpty.php
+++ b/dev/tests/unit/testsuite/Magento/Validator/Test/NotEmpty.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/Test/StringLength.php b/dev/tests/unit/testsuite/Magento/Validator/Test/StringLength.php
index 3a252731533..06b16476e26 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/Test/StringLength.php
+++ b/dev/tests/unit/testsuite/Magento/Validator/Test/StringLength.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/Test/True.php b/dev/tests/unit/testsuite/Magento/Validator/Test/True.php
index 4ded42371e0..88899427b83 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/Test/True.php
+++ b/dev/tests/unit/testsuite/Magento/Validator/Test/True.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/ValidatorAbstractTest.php b/dev/tests/unit/testsuite/Magento/Validator/ValidatorAbstractTest.php
index 06e6154bbca..d533fa8d628 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/ValidatorAbstractTest.php
+++ b/dev/tests/unit/testsuite/Magento/Validator/ValidatorAbstractTest.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_builder_class.xml b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_builder_class.xml
index 3bf6ebfec4f..f6a1a4efd68 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_builder_class.xml
+++ b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_builder_class.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_builder_instance.xml b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_builder_instance.xml
index f71ecc13d4e..ea5726b761e 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_builder_instance.xml
+++ b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_builder_instance.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_child_for_option.xml b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_child_for_option.xml
index b73afa875cc..739e066aa82 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_child_for_option.xml
+++ b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_child_for_option.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_constraint.xml b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_constraint.xml
index 5e39db413b1..62e75a739cb 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_constraint.xml
+++ b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_constraint.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_content_for callback.xml b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_content_for callback.xml
index eda3892520c..1e65bc0435f 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_content_for callback.xml
+++ b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_content_for callback.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_entity_callback.xml b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_entity_callback.xml
index 5dae97d0daa..3652412c7b5 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_entity_callback.xml
+++ b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_entity_callback.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_method.xml b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_method.xml
index 66982da938e..8aac05ed95a 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_method.xml
+++ b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_method.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_method_callback.xml b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_method_callback.xml
index 8d9c4cc9d57..361b1984a97 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_method_callback.xml
+++ b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/invalid_method_callback.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/multiple_callback_in_argument.xml b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/multiple_callback_in_argument.xml
index aba14592183..7526843649b 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/multiple_callback_in_argument.xml
+++ b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/multiple_callback_in_argument.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_class_for_constraint.xml b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_class_for_constraint.xml
index 7785163c6bd..e9a0647e6a3 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_class_for_constraint.xml
+++ b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_class_for_constraint.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_constraint.xml b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_constraint.xml
index e651a40b084..af32317c218 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_constraint.xml
+++ b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_constraint.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_name_for_entity.xml b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_name_for_entity.xml
index c5680b8cac9..d945925d332 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_name_for_entity.xml
+++ b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_name_for_entity.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_name_for_group.xml b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_name_for_group.xml
index 54b96b6e9fc..503a58fced4 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_name_for_group.xml
+++ b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_name_for_group.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_name_for_rule.xml b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_name_for_rule.xml
index 0a7c37eaa92..79040d2042c 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_name_for_rule.xml
+++ b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_name_for_rule.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_rule_for_reference.xml b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_rule_for_reference.xml
index 1136da90638..483267cca43 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_rule_for_reference.xml
+++ b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/no_rule_for_reference.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/not_unique_use.xml b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/not_unique_use.xml
index fe0eae1bd20..31178d1c25e 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/not_unique_use.xml
+++ b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/negative/not_unique_use.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/positive/builder/validation.xml b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/positive/builder/validation.xml
index c5c2a26ef65..ad84375a65a 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/positive/builder/validation.xml
+++ b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/positive/builder/validation.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/positive/module_a/validation.xml b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/positive/module_a/validation.xml
index c06046b4204..72abe8ebb1f 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/positive/module_a/validation.xml
+++ b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/positive/module_a/validation.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/positive/module_b/validation.xml b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/positive/module_b/validation.xml
index 2677ef1513a..40f8479a54a 100644
--- a/dev/tests/unit/testsuite/Magento/Validator/_files/validation/positive/module_b/validation.xml
+++ b/dev/tests/unit/testsuite/Magento/Validator/_files/validation/positive/module_b/validation.xml
@@ -20,7 +20,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/ValidatorTest.php b/dev/tests/unit/testsuite/Magento/ValidatorTest.php
index 4e68a59e9e0..4922c178d14 100644
--- a/dev/tests/unit/testsuite/Magento/ValidatorTest.php
+++ b/dev/tests/unit/testsuite/Magento/ValidatorTest.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @subpackage unit_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Design/Fallback/FactoryTest.php b/dev/tests/unit/testsuite/Magento/View/Design/Fallback/FactoryTest.php
similarity index 81%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Design/Fallback/FactoryTest.php
rename to dev/tests/unit/testsuite/Magento/View/Design/Fallback/FactoryTest.php
index e16bad41a1c..1bc0b96ba58 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Design/Fallback/FactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/View/Design/Fallback/FactoryTest.php
@@ -22,19 +22,24 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\Design\Fallback;
+namespace Magento\View\Design\Fallback;
+/**
+ * Factory Test
+ *
+ * @package Magento\View\Design\Fallback
+ */
class FactoryTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Design\Fallback\Factory
+ * @var Factory
*/
- protected $_model;
+ protected $model;
/**
* @var array
*/
- protected $_defaultParams;
+ protected $defaultParams;
protected function setUp()
{
@@ -43,7 +48,7 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
\Magento\App\Dir::MODULES => 'modules',
\Magento\App\Dir::PUB_LIB => 'pub_lib',
));
- $this->_model = new \Magento\Core\Model\Design\Fallback\Factory($dirs);
+ $this->model = new Factory($dirs);
$parentTheme = $this->getMockForAbstractClass('Magento\View\Design\ThemeInterface');
$parentTheme->expects($this->any())->method('getThemePath')->will($this->returnValue('parent_theme_path'));
@@ -52,7 +57,7 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
$theme->expects($this->any())->method('getThemePath')->will($this->returnValue('current_theme_path'));
$theme->expects($this->any())->method('getParentTheme')->will($this->returnValue($parentTheme));
- $this->_defaultParams = array(
+ $this->defaultParams = array(
'area' => 'area',
'theme' => $theme,
'namespace' => 'namespace',
@@ -63,15 +68,15 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
protected function tearDown()
{
- $this->_model = null;
- $this->_defaultParams = array();
+ $this->model = null;
+ $this->defaultParams = array();
}
public function testCreateLocaleFileRule()
{
- $actualResult = $this->_model->createLocaleFileRule();
- $this->assertInstanceOf('Magento\Core\Model\Design\Fallback\Rule\RuleInterface', $actualResult);
- $this->assertNotSame($actualResult, $this->_model->createLocaleFileRule());
+ $actualResult = $this->model->createLocaleFileRule();
+ $this->assertInstanceOf('\Magento\View\Design\Fallback\Rule\RuleInterface', $actualResult);
+ $this->assertNotSame($actualResult, $this->model->createLocaleFileRule());
}
public function testCreateLocaleFileRuleGetPatternDirs()
@@ -81,7 +86,8 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
'themes/area/parent_theme_path/i18n/en_US',
);
$this->assertSame(
- $expectedResult, $this->_model->createLocaleFileRule()->getPatternDirs($this->_defaultParams)
+ $expectedResult,
+ $this->model->createLocaleFileRule()->getPatternDirs($this->defaultParams)
);
}
@@ -93,9 +99,12 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
public function testCreateLocaleFileRuleGetPatternDirsException(array $overriddenParams, $expectedErrorMessage)
{
$this->setExpectedException('InvalidArgumentException', $expectedErrorMessage);
- $this->_model->createLocaleFileRule()->getPatternDirs($overriddenParams + $this->_defaultParams);
+ $this->model->createLocaleFileRule()->getPatternDirs($overriddenParams + $this->defaultParams);
}
+ /**
+ * @return array
+ */
public function createLocaleFileRuleGetPatternDirsExceptionDataProvider()
{
return array(
@@ -116,9 +125,9 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
public function testCreateFileRule()
{
- $actualResult = $this->_model->createFileRule();
- $this->assertInstanceOf('Magento\Core\Model\Design\Fallback\Rule\RuleInterface', $actualResult);
- $this->assertNotSame($actualResult, $this->_model->createFileRule());
+ $actualResult = $this->model->createFileRule();
+ $this->assertInstanceOf('\Magento\View\Design\Fallback\Rule\RuleInterface', $actualResult);
+ $this->assertNotSame($actualResult, $this->model->createFileRule());
}
/**
@@ -128,10 +137,13 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
*/
public function testCreateFileRuleGetPatternDirs(array $overriddenParams, array $expectedResult)
{
- $actualResult = $this->_model->createFileRule()->getPatternDirs($overriddenParams + $this->_defaultParams);
+ $actualResult = $this->model->createFileRule()->getPatternDirs($overriddenParams + $this->defaultParams);
$this->assertEquals($expectedResult, $actualResult);
}
+ /**
+ * @return array
+ */
public function createFileRuleGetPatternDirsDataProvider()
{
return array(
@@ -161,14 +173,14 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
public function testCreateFileRuleGetPatternDirsException(array $overriddenParams, $expectedErrorMessage)
{
$this->setExpectedException('InvalidArgumentException', $expectedErrorMessage);
- $this->_model->createFileRule()->getPatternDirs($overriddenParams + $this->_defaultParams);
+ $this->model->createFileRule()->getPatternDirs($overriddenParams + $this->defaultParams);
}
public function testCreateViewFileRule()
{
- $actualResult = $this->_model->createViewFileRule();
- $this->assertInstanceOf('Magento\Core\Model\Design\Fallback\Rule\RuleInterface', $actualResult);
- $this->assertNotSame($actualResult, $this->_model->createViewFileRule());
+ $actualResult = $this->model->createViewFileRule();
+ $this->assertInstanceOf('\Magento\View\Design\Fallback\Rule\RuleInterface', $actualResult);
+ $this->assertNotSame($actualResult, $this->model->createViewFileRule());
}
/**
@@ -178,10 +190,13 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
*/
public function testCreateViewFileRuleGetPatternDirs(array $overriddenParams, array $expectedResult)
{
- $actualResult = $this->_model->createViewFileRule()->getPatternDirs($overriddenParams + $this->_defaultParams);
+ $actualResult = $this->model->createViewFileRule()->getPatternDirs($overriddenParams + $this->defaultParams);
$this->assertEquals($expectedResult, $actualResult);
}
+ /**
+ * @return array
+ */
public function createViewFileRuleGetPatternDirsDataProvider()
{
return array(
@@ -233,9 +248,12 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
public function testCreateViewFileRuleGetPatternDirsException(array $overriddenParams, $expectedErrorMessage)
{
$this->setExpectedException('InvalidArgumentException', $expectedErrorMessage);
- $this->_model->createViewFileRule()->getPatternDirs($overriddenParams + $this->_defaultParams);
+ $this->model->createViewFileRule()->getPatternDirs($overriddenParams + $this->defaultParams);
}
+ /**
+ * @return array
+ */
public function createRuleGetPatternDirsExceptionDataProvider()
{
return array(
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Design/Fallback/Rule/CompositeTest.php b/dev/tests/unit/testsuite/Magento/View/Design/Fallback/Rule/CompositeTest.php
similarity index 73%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Design/Fallback/Rule/CompositeTest.php
rename to dev/tests/unit/testsuite/Magento/View/Design/Fallback/Rule/CompositeTest.php
index c6895a02dac..4a8e3baa767 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Design/Fallback/Rule/CompositeTest.php
+++ b/dev/tests/unit/testsuite/Magento/View/Design/Fallback/Rule/CompositeTest.php
@@ -22,8 +22,13 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\Design\Fallback\Rule;
+namespace Magento\View\Design\Fallback\Rule;
+/**
+ * Composite Test
+ *
+ * @package Magento\View
+ */
class CompositeTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -32,30 +37,32 @@ class CompositeTest extends \PHPUnit_Framework_TestCase
*/
public function testConstructException()
{
- new \Magento\Core\Model\Design\Fallback\Rule\Composite(array(new \stdClass));
+ new Composite(array(new \stdClass));
}
public function testGetPatternDirs()
{
$inputParams = array('param_one' => 'value_one', 'param_two' => 'value_two');
- $ruleOne = $this->getMockForAbstractClass('Magento\Core\Model\Design\Fallback\Rule\RuleInterface');
+ $ruleOne = $this->getMockForAbstractClass('\Magento\View\Design\Fallback\Rule\RuleInterface');
$ruleOne
->expects($this->once())
->method('getPatternDirs')
->with($inputParams)
- ->will($this->returnValue(array('rule_one/path/one', 'rule_one/path/two')))
- ;
+ ->will(
+ $this->returnValue(array('rule_one/path/one', 'rule_one/path/two'))
+ );
- $ruleTwo = $this->getMockForAbstractClass('Magento\Core\Model\Design\Fallback\Rule\RuleInterface');
+ $ruleTwo = $this->getMockForAbstractClass('\Magento\View\Design\Fallback\Rule\RuleInterface');
$ruleTwo
->expects($this->once())
->method('getPatternDirs')
->with($inputParams)
- ->will($this->returnValue(array('rule_two/path/one', 'rule_two/path/two')))
- ;
+ ->will(
+ $this->returnValue(array('rule_two/path/one', 'rule_two/path/two'))
+ );
- $object = new \Magento\Core\Model\Design\Fallback\Rule\Composite(array($ruleOne, $ruleTwo));
+ $object = new Composite(array($ruleOne, $ruleTwo));
$expectedResult = array(
'rule_one/path/one',
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Design/Fallback/Rule/ModularSwitchTest.php b/dev/tests/unit/testsuite/Magento/View/Design/Fallback/Rule/ModularSwitchTest.php
similarity index 62%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Design/Fallback/Rule/ModularSwitchTest.php
rename to dev/tests/unit/testsuite/Magento/View/Design/Fallback/Rule/ModularSwitchTest.php
index 8bad64912b3..d69a091ced1 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Design/Fallback/Rule/ModularSwitchTest.php
+++ b/dev/tests/unit/testsuite/Magento/View/Design/Fallback/Rule/ModularSwitchTest.php
@@ -22,77 +22,76 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\Design\Fallback\Rule;
+namespace Magento\View\Design\Fallback\Rule;
+/**
+ * ModularSwitch Test
+ *
+ * @package Magento\View
+ */
class ModularSwitchTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Design\Fallback\Rule\ModularSwitch
+ * @var ModularSwitch
*/
- protected $_object;
+ protected $object;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var \PHPUnit_Framework_MockObject_MockObject|RuleInterface
*/
- protected $_ruleNonModular;
+ protected $ruleNonModular;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var \PHPUnit_Framework_MockObject_MockObject|RuleInterface
*/
- protected $_ruleModular;
+ protected $ruleModular;
protected function setUp()
{
- $this->_ruleNonModular = $this->getMockForAbstractClass(
- 'Magento\Core\Model\Design\Fallback\Rule\RuleInterface'
- );
- $this->_ruleModular = $this->getMockForAbstractClass(
- 'Magento\Core\Model\Design\Fallback\Rule\RuleInterface'
- );
- $this->_object = new \Magento\Core\Model\Design\Fallback\Rule\ModularSwitch(
- $this->_ruleNonModular, $this->_ruleModular
- );
+ $this->ruleNonModular = $this->getMockForAbstractClass('\Magento\View\Design\Fallback\Rule\RuleInterface');
+ $this->ruleModular = $this->getMockForAbstractClass('\Magento\View\Design\Fallback\Rule\RuleInterface');
+ $this->object = new ModularSwitch($this->ruleNonModular, $this->ruleModular);
}
protected function tearDown()
{
- $this->_object = null;
- $this->_ruleNonModular = null;
- $this->_ruleModular = null;
+ $this->object = null;
+ $this->ruleNonModular = null;
+ $this->ruleModular = null;
}
public function testGetPatternDirsNonModular()
{
$inputParams = array('param_one' => 'value_one', 'param_two' => 'value_two');
$expectedResult = new \stdClass();
- $this->_ruleNonModular
+ $this->ruleNonModular
->expects($this->once())
->method('getPatternDirs')
->with($inputParams)
- ->will($this->returnValue($expectedResult))
- ;
- $this->_ruleModular
+ ->will($this->returnValue($expectedResult));
+
+ $this->ruleModular
->expects($this->never())
- ->method('getPatternDirs')
- ;
- $this->assertSame($expectedResult, $this->_object->getPatternDirs($inputParams));
+ ->method('getPatternDirs');
+
+ $this->assertSame($expectedResult, $this->object->getPatternDirs($inputParams));
}
public function testGetPatternDirsModular()
{
$inputParams = array('param' => 'value', 'namespace' => 'Magento', 'module' => 'Core');
$expectedResult = new \stdClass();
- $this->_ruleNonModular
+ $this->ruleNonModular
->expects($this->never())
- ->method('getPatternDirs')
- ;
- $this->_ruleModular
+ ->method('getPatternDirs');
+
+ $this->ruleModular
->expects($this->once())
->method('getPatternDirs')
->with($inputParams)
- ->will($this->returnValue($expectedResult))
- ;
- $this->assertSame($expectedResult, $this->_object->getPatternDirs($inputParams));
+ ->will($this->returnValue($expectedResult));
+
+ $this->assertSame($expectedResult, $this->object->getPatternDirs($inputParams));
}
/**
@@ -103,9 +102,12 @@ class ModularSwitchTest extends \PHPUnit_Framework_TestCase
*/
public function testGetPatternDirsException(array $inputParams)
{
- $this->_object->getPatternDirs($inputParams);
+ $this->object->getPatternDirs($inputParams);
}
+ /**
+ * @return array
+ */
public function getPatternDirsExceptionDataProvider()
{
return array(
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Design/Fallback/Rule/SimpleTest.php b/dev/tests/unit/testsuite/Magento/View/Design/Fallback/Rule/SimpleTest.php
similarity index 90%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Design/Fallback/Rule/SimpleTest.php
rename to dev/tests/unit/testsuite/Magento/View/Design/Fallback/Rule/SimpleTest.php
index e0c2f81e921..01ecb045774 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Design/Fallback/Rule/SimpleTest.php
+++ b/dev/tests/unit/testsuite/Magento/View/Design/Fallback/Rule/SimpleTest.php
@@ -22,8 +22,13 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\Design\Fallback\Rule;
+namespace Magento\View\Design\Fallback\Rule;
+/**
+ * Simple Test
+ *
+ * @package Magento\View
+ */
class SimpleTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -32,7 +37,7 @@ class SimpleTest extends \PHPUnit_Framework_TestCase
*/
public function testGetPatternDirsException()
{
- $model = new \Magento\Core\Model\Design\Fallback\Rule\Simple('<required_parameter> other text');
+ $model = new Simple('<required_parameter> other text');
$model->getPatternDirs(array());
}
@@ -45,7 +50,7 @@ class SimpleTest extends \PHPUnit_Framework_TestCase
'optional_parameter' => $optionalParameter,
'required_parameter' => 'required_parameter',
);
- $model = new \Magento\Core\Model\Design\Fallback\Rule\Simple($pattern, array('optional_parameter'));
+ $model = new Simple($pattern, array('optional_parameter'));
$this->assertEquals(
$expectedResult,
@@ -53,6 +58,9 @@ class SimpleTest extends \PHPUnit_Framework_TestCase
);
}
+ /**
+ * @return array
+ */
public function getPatternDirsDataProvider()
{
$patternOptional = '<optional_parameter> <required_parameter> other text';
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Design/Fallback/Rule/ThemeTest.php b/dev/tests/unit/testsuite/Magento/View/Design/Fallback/Rule/ThemeTest.php
similarity index 85%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Design/Fallback/Rule/ThemeTest.php
rename to dev/tests/unit/testsuite/Magento/View/Design/Fallback/Rule/ThemeTest.php
index 6457e25bb64..cdcd8f949ed 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Design/Fallback/Rule/ThemeTest.php
+++ b/dev/tests/unit/testsuite/Magento/View/Design/Fallback/Rule/ThemeTest.php
@@ -22,8 +22,13 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\Design\Fallback\Rule;
+namespace Magento\View\Design\Fallback\Rule;
+/**
+ * Theme Test
+ *
+ * @package Magento\View\Design\Fallback\Rule
+ */
class ThemeTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -32,8 +37,9 @@ class ThemeTest extends \PHPUnit_Framework_TestCase
*/
public function testGetPatternDirsException()
{
- $rule = $this->getMockForAbstractClass('Magento\Core\Model\Design\Fallback\Rule\RuleInterface');
- $object = new \Magento\Core\Model\Design\Fallback\Rule\Theme($rule);
+ $rule = $this->getMockForAbstractClass('\Magento\View\Design\Fallback\Rule\RuleInterface');
+ /** @var $rule RuleInterface */
+ $object = new Theme($rule);
$object->getPatternDirs(array());
}
@@ -56,10 +62,10 @@ class ThemeTest extends \PHPUnit_Framework_TestCase
array('package/parent_theme/path/one', 'package/parent_theme/path/two')
)
);
- $rule = $this->getMockForAbstractClass('Magento\Core\Model\Design\Fallback\Rule\RuleInterface');
+ $rule = $this->getMockForAbstractClass('Magento\View\Design\Fallback\Rule\RuleInterface');
$rule->expects($this->any())->method('getPatternDirs')->will($this->returnValueMap($ruleDirsMap));
-
- $object = new \Magento\Core\Model\Design\Fallback\Rule\Theme($rule);
+ /** @var $rule RuleInterface */
+ $object = new Theme($rule);
$expectedResult = array(
'package/current_theme/path/one',
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Design/FileResolution/Strategy/Fallback/CachingProxyTest.php b/dev/tests/unit/testsuite/Magento/View/Design/FileResolution/Strategy/Fallback/CachingProxyTest.php
similarity index 58%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Design/FileResolution/Strategy/Fallback/CachingProxyTest.php
rename to dev/tests/unit/testsuite/Magento/View/Design/FileResolution/Strategy/Fallback/CachingProxyTest.php
index a7a19e2feb0..2fbcb2ca639 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Design/FileResolution/Strategy/Fallback/CachingProxyTest.php
+++ b/dev/tests/unit/testsuite/Magento/View/Design/FileResolution/Strategy/Fallback/CachingProxyTest.php
@@ -25,8 +25,18 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\Design\FileResolution\Strategy\Fallback;
+namespace Magento\View\Design\FileResolution\Strategy\Fallback;
+use Magento\Filesystem;
+use Magento\Filesystem\Adapter\Local;
+use Magento\Io\File;
+use Magento\TestFramework\Helper\ProxyTesting;
+
+/**
+ * CachingProxy Test
+ *
+ * @package Magento\View
+ */
class CachingProxyTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -34,43 +44,43 @@ class CachingProxyTest extends \PHPUnit_Framework_TestCase
*
* @var string
*/
- protected $_tmpDir;
+ protected $tmpDir;
/**
* Mock of the model to be tested. Operates the mocked fallback object.
*
- * @var \Magento\Core\Model\Design\FileResolution\Strategy\Fallback\CachingProxy
+ * @var CachingProxy
*/
- protected $_model;
+ protected $model;
/**
* Mocked fallback object, with file resolution methods ready to be substituted.
*
- * @var \Magento\Core\Model\Design\FileResolution\Strategy\Fallback|PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\View\Design\FileResolution\Strategy\Fallback|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $_fallback;
+ protected $fallback;
/**
* Theme model, pre-created in setUp() for usage in tests
*
- * @var \Magento\Core\Model\Theme|PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\View\Design\ThemeInterface|\PHPUnit_Framework_MockObject_MockObject
*/
- protected $_themeModel;
+ protected $themeModel;
protected function setUp()
{
- $this->_tmpDir = TESTS_TEMP_DIR . DIRECTORY_SEPARATOR . 'fallback';
- mkdir($this->_tmpDir);
+ $this->tmpDir = TESTS_TEMP_DIR . DIRECTORY_SEPARATOR . 'fallback';
+ mkdir($this->tmpDir);
- $this->_fallback = $this->getMock(
- 'Magento\Core\Model\Design\FileResolution\Strategy\Fallback',
+ $this->fallback = $this->getMock(
+ 'Magento\View\Design\FileResolution\Strategy\Fallback',
array(),
array(),
'',
false
);
- $this->_themeModel = \PHPUnit_Framework_MockObject_Generator::getMock(
+ $this->themeModel = \PHPUnit_Framework_MockObject_Generator::getMock(
'Magento\Core\Model\Theme',
array(),
array(),
@@ -78,18 +88,22 @@ class CachingProxyTest extends \PHPUnit_Framework_TestCase
false,
false
);
- $this->_themeModel->expects($this->any())
+ $this->themeModel->expects($this->any())
->method('getId')
->will($this->returnValue('t'));
- $this->_model = new \Magento\Core\Model\Design\FileResolution\Strategy\Fallback\CachingProxy(
- $this->_fallback, $this->_createFilesystem(), $this->_tmpDir, TESTS_TEMP_DIR, true
+ $this->model = new CachingProxy(
+ $this->fallback,
+ $this->createFilesystem(),
+ $this->tmpDir,
+ TESTS_TEMP_DIR,
+ true
);
}
protected function tearDown()
{
- \Magento\Io\File::rmdirRecursive($this->_tmpDir);
+ File::rmdirRecursive($this->tmpDir);
}
/**
@@ -97,22 +111,25 @@ class CachingProxyTest extends \PHPUnit_Framework_TestCase
*/
public function testConstructInvalidDir()
{
- $this->_model = new \Magento\Core\Model\Design\FileResolution\Strategy\Fallback\CachingProxy(
- $this->_fallback, $this->_createFilesystem(), $this->_tmpDir, TESTS_TEMP_DIR . '/invalid_dir'
+ $this->model = new CachingProxy(
+ $this->fallback,
+ $this->createFilesystem(),
+ $this->tmpDir,
+ TESTS_TEMP_DIR . '/invalid_dir'
);
}
public function testDestruct()
{
- $this->_fallback->expects($this->once())
+ $this->fallback->expects($this->once())
->method('getFile')
->will($this->returnValue(TESTS_TEMP_DIR . DIRECTORY_SEPARATOR . 'test.txt'));
- $expectedFile = $this->_tmpDir . DIRECTORY_SEPARATOR . 'a_t_.ser';
+ $expectedFile = $this->tmpDir . DIRECTORY_SEPARATOR . 'a_t_.ser';
- $this->_model->getFile('a', $this->_themeModel, 'does not matter', 'Some_Module');
+ $this->model->getFile('a', $this->themeModel, 'does not matter', 'Some_Module');
$this->assertFileNotExists($expectedFile);
- unset($this->_model);
+ unset($this->model);
$this->assertFileExists($expectedFile);
$contents = file_get_contents($expectedFile);
$this->assertContains('test.txt', $contents);
@@ -121,16 +138,20 @@ class CachingProxyTest extends \PHPUnit_Framework_TestCase
public function testDestructNoMapSaved()
{
- $this->_fallback->expects($this->once())
+ $this->fallback->expects($this->once())
->method('getFile')
->will($this->returnValue(TESTS_TEMP_DIR . DIRECTORY_SEPARATOR . 'test.txt'));
- $model = new \Magento\Core\Model\Design\FileResolution\Strategy\Fallback\CachingProxy(
- $this->_fallback, $this->_createFilesystem(), $this->_tmpDir, TESTS_TEMP_DIR, false
+ $model = new CachingProxy(
+ $this->fallback,
+ $this->createFilesystem(),
+ $this->tmpDir,
+ TESTS_TEMP_DIR,
+ false
);
- $unexpectedFile = $this->_tmpDir . DIRECTORY_SEPARATOR . 'a_t_.ser';
+ $unexpectedFile = $this->tmpDir . DIRECTORY_SEPARATOR . 'a_t_.ser';
- $model->getFile('a', $this->_themeModel, 'does not matter', 'Some_Module');
+ $model->getFile('a', $this->themeModel, 'does not matter', 'Some_Module');
unset($model);
$this->assertFileNotExists($unexpectedFile);
}
@@ -140,15 +161,20 @@ class CachingProxyTest extends \PHPUnit_Framework_TestCase
* @param array $params
* @param string $expectedResult
* @dataProvider proxyMethodsDataProvider
- * @covers \Magento\Core\Model\Design\FileResolution\Strategy\Fallback\CachingProxy::getFile
- * @covers \Magento\Core\Model\Design\FileResolution\Strategy\Fallback\CachingProxy::getLocaleFile
- * @covers \Magento\Core\Model\Design\FileResolution\Strategy\Fallback\CachingProxy::getViewFile
+ * @covers \Magento\View\Design\FileResolution\Strategy\Fallback\CachingProxy::getFile
+ * @covers \Magento\View\Design\FileResolution\Strategy\Fallback\CachingProxy::getLocaleFile
+ * @covers \Magento\View\Design\FileResolution\Strategy\Fallback\CachingProxy::getViewFile
*/
public function testProxyMethods($method, $params, $expectedResult)
{
- $helper = new \Magento\TestFramework\Helper\ProxyTesting();
- $actualResult = $helper->invokeWithExpectations($this->_model, $this->_fallback, $method, $params,
- $expectedResult);
+ $helper = new ProxyTesting();
+ $actualResult = $helper->invokeWithExpectations(
+ $this->model,
+ $this->fallback,
+ $method,
+ $params,
+ $expectedResult
+ );
$this->assertEquals($expectedResult, $actualResult);
}
@@ -189,21 +215,27 @@ class CachingProxyTest extends \PHPUnit_Framework_TestCase
{
$materializedFilePath = TESTS_TEMP_DIR . DIRECTORY_SEPARATOR . 'path' . DIRECTORY_SEPARATOR . 'file.txt';
- $result = $this->_model->setViewFilePathToMap('area51', $this->_themeModel, 'en_US', 'Some_Module', 'file.txt',
- $materializedFilePath);
- $this->assertEquals($this->_model, $result);
+ $result = $this->model->setViewFilePathToMap(
+ 'area51',
+ $this->themeModel,
+ 'en_US',
+ 'Some_Module',
+ 'file.txt',
+ $materializedFilePath
+ );
+ $this->assertEquals($this->model, $result);
- $this->_fallback->expects($this->never())
+ $this->fallback->expects($this->never())
->method('getViewFile');
- $result = $this->_model->getViewFile('area51', $this->_themeModel, 'en_US', 'file.txt', 'Some_Module');
+ $result = $this->model->getViewFile('area51', $this->themeModel, 'en_US', 'file.txt', 'Some_Module');
$this->assertEquals($materializedFilePath, $result);
}
/**
- * @return \Magento\Filesystem
+ * @return Filesystem
*/
- protected function _createFilesystem()
+ protected function createFilesystem()
{
- return new \Magento\Filesystem(new \Magento\Filesystem\Adapter\Local());
+ return new Filesystem(new Local());
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Design/FileResolution/Strategy/FallbackTest.php b/dev/tests/unit/testsuite/Magento/View/Design/FileResolution/Strategy/FallbackTest.php
similarity index 61%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Design/FileResolution/Strategy/FallbackTest.php
rename to dev/tests/unit/testsuite/Magento/View/Design/FileResolution/Strategy/FallbackTest.php
index 6f673705ea6..d9597c6d024 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Design/FileResolution/Strategy/FallbackTest.php
+++ b/dev/tests/unit/testsuite/Magento/View/Design/FileResolution/Strategy/FallbackTest.php
@@ -28,67 +28,72 @@
/**
* Test that Design Package delegates fallback resolution to a Fallback model
*/
-namespace Magento\Core\Model\Design\FileResolution\Strategy;
+namespace Magento\View\Design\FileResolution\Strategy;
+/**
+ * Fallback Test
+ *
+ * @package Magento\View
+ */
class FallbackTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\View\Design\Fallback\Factory
*/
- protected $_fallbackFactory;
+ protected $fallbackFactory;
/**
* @var \PHPUnit_Framework_MockObject_MockObject
*/
- protected $_fallbackFile;
+ protected $fallbackFile;
- /*
+ /**
* @var \PHPUnit_Framework_MockObject_MockObject
*/
- protected $_fallbackLocale;
+ protected $fallbackLocale;
/**
* @var \PHPUnit_Framework_MockObject_MockObject
*/
- protected $_fallbackViewFile;
+ protected $fallbackViewFile;
/**
- * @var \Magento\Core\Model\Theme
+ * @var \Magento\View\Design\ThemeInterface
*/
- protected $_theme;
+ protected $theme;
protected function setUp()
{
- $this->_fallbackFile = $this->getMockForAbstractClass('Magento\Core\Model\Design\Fallback\Rule\RuleInterface');
- $this->_fallbackLocale = $this->getMockForAbstractClass(
- 'Magento\Core\Model\Design\Fallback\Rule\RuleInterface'
+ $this->fallbackFile = $this->getMockForAbstractClass('Magento\View\Design\Fallback\Rule\RuleInterface');
+ $this->fallbackLocale = $this->getMockForAbstractClass(
+ 'Magento\View\Design\Fallback\Rule\RuleInterface'
);
- $this->_fallbackViewFile = $this->getMockForAbstractClass(
- 'Magento\Core\Model\Design\Fallback\Rule\RuleInterface'
+ $this->fallbackViewFile = $this->getMockForAbstractClass(
+ 'Magento\View\Design\Fallback\Rule\RuleInterface'
);
- $this->_fallbackFactory = $this->getMock(
- 'Magento\Core\Model\Design\Fallback\Factory',
+ $this->fallbackFactory = $this->getMock(
+ 'Magento\View\Design\Fallback\Factory',
array('createLocaleFileRule', 'createFileRule', 'createViewFileRule'),
array($this->getMock('Magento\App\Dir', array(), array(), '', false))
);
- $this->_fallbackFactory
- ->expects($this->any())->method('createLocaleFileRule')->will($this->returnValue($this->_fallbackLocale));
- $this->_fallbackFactory
- ->expects($this->any())->method('createFileRule')->will($this->returnValue($this->_fallbackFile));
- $this->_fallbackFactory
- ->expects($this->any())->method('createViewFileRule')->will($this->returnValue($this->_fallbackViewFile));
-
- $this->_theme = $this->getMock('Magento\View\Design\ThemeInterface', array(), array(), '', false);
+ $this->fallbackFactory
+ ->expects($this->any())->method('createLocaleFileRule')->will($this->returnValue($this->fallbackLocale));
+ $this->fallbackFactory
+ ->expects($this->any())->method('createFileRule')->will($this->returnValue($this->fallbackFile));
+ $this->fallbackFactory
+ ->expects($this->any())->method('createViewFileRule')->will($this->returnValue($this->fallbackViewFile));
+
+ $this->theme = $this->getMock('Magento\View\Design\ThemeInterface', array(), array(), '', false);
}
protected function tearDown()
{
- $this->_fallbackFactory = null;
- $this->_fallbackFile = null;
- $this->_fallbackLocale = null;
- $this->_fallbackViewFile = null;
- $this->_theme = null;
+ $this->fallbackFactory = null;
+ $this->fallbackFile = null;
+ $this->fallbackLocale = null;
+ $this->fallbackViewFile = null;
+ $this->theme = null;
}
/**
@@ -96,24 +101,28 @@ class FallbackTest extends \PHPUnit_Framework_TestCase
*/
public function testGetFile($fullModuleName, $namespace, $module, $targetFile, $expectedFileName)
{
- $filesystem = $this->_getFileSystemMock($targetFile);
+ $filesystem = $this->getFileSystemMock($targetFile);
- $fallback = new \Magento\Core\Model\Design\FileResolution\Strategy\Fallback(
- $filesystem, $this->_fallbackFactory
+ $fallback = new Fallback(
+ $filesystem,
+ $this->fallbackFactory
);
- $params = array('area' => 'area', 'theme' => $this->_theme, 'namespace' => $namespace, 'module' => $module);
+ $params = array('area' => 'area', 'theme' => $this->theme, 'namespace' => $namespace, 'module' => $module);
- $this->_fallbackFile->expects($this->once())
+ $this->fallbackFile->expects($this->once())
->method('getPatternDirs')
->with($params)
->will($this->returnValue(array('found_folder', 'not_found_folder')));
- $filename = $fallback->getFile('area', $this->_theme, 'file.txt', $fullModuleName);
+ $filename = $fallback->getFile('area', $this->theme, 'file.txt', $fullModuleName);
$this->assertEquals(str_replace('/', DIRECTORY_SEPARATOR, $expectedFileName), $filename);
}
+ /**
+ * @return array
+ */
public function getFileDataProvider()
{
return array(
@@ -153,24 +162,28 @@ class FallbackTest extends \PHPUnit_Framework_TestCase
*/
public function testGetLocaleFile($targetFile, $expectedFileName)
{
- $filesystem = $this->_getFileSystemMock($targetFile);
+ $filesystem = $this->getFileSystemMock($targetFile);
- $fallback = new \Magento\Core\Model\Design\FileResolution\Strategy\Fallback(
- $filesystem, $this->_fallbackFactory
+ $fallback = new Fallback(
+ $filesystem,
+ $this->fallbackFactory
);
- $params = array('area' => 'area', 'theme' => $this->_theme, 'locale' => 'locale');
+ $params = array('area' => 'area', 'theme' => $this->theme, 'locale' => 'locale');
- $this->_fallbackLocale->expects($this->once())
+ $this->fallbackLocale->expects($this->once())
->method('getPatternDirs')
->with($params)
->will($this->returnValue(array('found_folder', 'not_found_folder')));
- $filename = $fallback->getLocaleFile('area', $this->_theme, 'locale', 'file.txt');
+ $filename = $fallback->getLocaleFile('area', $this->theme, 'locale', 'file.txt');
$this->assertEquals(str_replace('/', DIRECTORY_SEPARATOR, $expectedFileName), $filename);
}
+ /**
+ * @return array
+ */
public function getLocaleFileDataProvider()
{
return array(
@@ -190,42 +203,44 @@ class FallbackTest extends \PHPUnit_Framework_TestCase
*/
public function testGetViewFile($fullModuleName, $namespace, $module, $targetFile, $expectedFileName)
{
- $filesystem = $this->_getFileSystemMock($targetFile);
+ $filesystem = $this->getFileSystemMock($targetFile);
- $fallback = new \Magento\Core\Model\Design\FileResolution\Strategy\Fallback(
+ $fallback = new Fallback(
$filesystem,
- $this->_fallbackFactory
+ $this->fallbackFactory
);
- $params = array('area' => 'area', 'theme' => $this->_theme, 'namespace' => $namespace, 'module' => $module,
+ $params = array('area' => 'area', 'theme' => $this->theme, 'namespace' => $namespace, 'module' => $module,
'locale' => 'locale');
- $this->_fallbackViewFile->expects($this->once())
+ $this->fallbackViewFile->expects($this->once())
->method('getPatternDirs')
->with($params)
->will($this->returnValue(array('found_folder', 'not_found_folder')));
- $filename = $fallback->getViewFile('area', $this->_theme, 'locale', 'file.txt', $fullModuleName);
+ $filename = $fallback->getViewFile('area', $this->theme, 'locale', 'file.txt', $fullModuleName);
$this->assertEquals(str_replace('/', DIRECTORY_SEPARATOR, $expectedFileName), $filename);
}
/**
* @param string $targetFile
- * @return \Magento\Filesystem|PHPUnit_Framework_MockObject_MockObject
+ * @return \Magento\Filesystem|\PHPUnit_Framework_MockObject_MockObject
*/
- protected function _getFileSystemMock($targetFile)
+ protected function getFileSystemMock($targetFile)
{
$targetFile = str_replace('/', DIRECTORY_SEPARATOR, $targetFile);
- /** @var $filesystem \Magento\Filesystem */
+
$filesystem = $this->getMock('Magento\Filesystem', array('has'), array(), '', false);
$filesystem->expects($this->any())
->method('has')
- ->will($this->returnCallback(
- function ($tryFile) use ($targetFile) {
- return ($tryFile == $targetFile);
- }
- ));
+ ->will(
+ $this->returnCallback(
+ function ($tryFile) use ($targetFile) {
+ return ($tryFile == $targetFile);
+ }
+ )
+ );
return $filesystem;
}
diff --git a/dev/tests/unit/testsuite/Magento/View/Design/FileResolution/StrategyPoolTest.php b/dev/tests/unit/testsuite/Magento/View/Design/FileResolution/StrategyPoolTest.php
new file mode 100644
index 00000000000..aa446ae6317
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/View/Design/FileResolution/StrategyPoolTest.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category Magento
+ * @package Magento_Core
+ * @subpackage unit_tests
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\View\Design\FileResolution;
+
+use Magento\App\State;
+use Magento\App\Dir;
+
+/**
+ * StrategyPool Test
+ *
+ * @package Magento\View
+ */
+class StrategyPoolTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\ObjectManager|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $objectManager;
+
+ /**
+ * @var State|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $appState;
+
+ /**
+ * @var Dir|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $dirs;
+
+ /**
+ * @var \Magento\Filesystem|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $filesystem;
+
+ /**
+ * @var StrategyPool|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $model;
+
+ protected function setUp()
+ {
+ $this->objectManager = $this->getMock('Magento\ObjectManager', array(), array(), '', false);
+ $this->appState = $this->getMock('Magento\App\State', array(), array(), '', false);
+ $this->dirs = new Dir('base_dir');
+ $this->filesystem = $this->getMock('Magento\Filesystem', array(), array(), '', false);
+
+ $this->model = new StrategyPool(
+ $this->objectManager,
+ $this->appState,
+ $this->dirs,
+ $this->filesystem
+ );
+ }
+
+ /**
+ * Test, that strategy creation works and a strategy is returned.
+ *
+ * Do not test exact strategy returned, as it depends on configuration, which can be changed any time.
+ *
+ * @param string $mode
+ * @dataProvider getStrategyDataProvider
+ */
+ public function testGetStrategy($mode)
+ {
+ $this->appState->expects($this->exactly(3)) // 3 similar methods tested at once
+ ->method('getMode')
+ ->will($this->returnValue($mode));
+
+ $strategy = new \StdClass;
+ $mapDir = 'base_dir/var/' . StrategyPool::FALLBACK_MAP_DIR;
+ $mapDir = str_replace('/', DIRECTORY_SEPARATOR, $mapDir);
+ $map = array(
+ array(
+ 'Magento\View\Design\FileResolution\Strategy\Fallback\CachingProxy',
+ array(
+ 'mapDir' => $mapDir,
+ 'baseDir' => 'base_dir'
+ ),
+ $strategy
+ ),
+ array('Magento\View\Design\FileResolution\Strategy\Fallback', array(), $strategy),
+ );
+ $this->objectManager->expects($this->atLeastOnce())
+ ->method('create')
+ ->will($this->returnValueMap($map));
+
+ // Test
+ $this->assertSame($strategy, $this->model->getFileStrategy());
+ $this->assertSame($strategy, $this->model->getLocaleStrategy());
+ $this->assertSame($strategy, $this->model->getViewStrategy());
+ }
+
+ /**
+ * @return array
+ */
+ public static function getStrategyDataProvider()
+ {
+ return array(
+ 'default mode' => array(State::MODE_DEFAULT),
+ 'production mode' => array(State::MODE_PRODUCTION),
+ 'developer mode' => array(State::MODE_DEVELOPER),
+ );
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/FactoryTest.php b/dev/tests/unit/testsuite/Magento/View/Layout/File/FactoryTest.php
similarity index 85%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/FactoryTest.php
rename to dev/tests/unit/testsuite/Magento/View/Layout/File/FactoryTest.php
index fd5f84d8588..368dfcc5676 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/FactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/View/Layout/File/FactoryTest.php
@@ -22,12 +22,12 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\Layout\File;
+namespace Magento\View\Layout\File;
class FactoryTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Layout\File\Factory
+ * @var \Magento\View\Layout\File\Factory
*/
private $_model;
@@ -39,18 +39,18 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->_objectManager = $this->getMockForAbstractClass('Magento\ObjectManager');
- $this->_model = new \Magento\Core\Model\Layout\File\Factory($this->_objectManager);
+ $this->_model = new \Magento\View\Layout\File\Factory($this->_objectManager);
}
public function testCreate()
{
$theme = $this->getMockForAbstractClass('Magento\View\Design\ThemeInterface');
- $file = new \Magento\Core\Model\Layout\File(__FILE__, 'Fixture_Module', $theme);
+ $file = new \Magento\View\Layout\File(__FILE__, 'Fixture_Module', $theme);
$this->_objectManager
->expects($this->once())
->method('create')
->with(
- 'Magento\Core\Model\Layout\File',
+ 'Magento\View\Layout\File',
$this->identicalTo(array(
'filename' => __FILE__,
'module' => 'Fixture_Module',
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/FileList/FactoryTest.php b/dev/tests/unit/testsuite/Magento/View/Layout/File/FileList/FactoryTest.php
similarity index 81%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/FileList/FactoryTest.php
rename to dev/tests/unit/testsuite/Magento/View/Layout/File/FileList/FactoryTest.php
index be21c350177..a3457b68819 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/FileList/FactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/View/Layout/File/FileList/FactoryTest.php
@@ -22,12 +22,12 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\Layout\File\FileList;
+namespace Magento\View\Layout\File\FileList;
class FactoryTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Layout\File\FileList\Factory
+ * @var \Magento\View\Layout\File\FileList\Factory
*/
private $_model;
@@ -39,16 +39,16 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->_objectManager = $this->getMockForAbstractClass('Magento\ObjectManager');
- $this->_model = new \Magento\Core\Model\Layout\File\FileList\Factory($this->_objectManager);
+ $this->_model = new \Magento\View\Layout\File\FileList\Factory($this->_objectManager);
}
public function testCreate()
{
- $list = new \Magento\Core\Model\Layout\File\ListFile();
+ $list = new \Magento\View\Layout\File\FileList();
$this->_objectManager
->expects($this->once())
->method('create')
- ->with('Magento\Core\Model\Layout\File\ListFile')
+ ->with('Magento\View\Layout\File\FileList')
->will($this->returnValue($list))
;
$this->assertSame($list, $this->_model->create());
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/ListTest.php b/dev/tests/unit/testsuite/Magento/View/Layout/File/FileListTest.php
similarity index 92%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/ListTest.php
rename to dev/tests/unit/testsuite/Magento/View/Layout/File/FileListTest.php
index 4e3fd900426..26edc2b4ea9 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/ListTest.php
+++ b/dev/tests/unit/testsuite/Magento/View/Layout/File/FileListTest.php
@@ -22,22 +22,22 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\Layout\File;
+namespace Magento\View\Layout\File;
-class ListTest extends \PHPUnit_Framework_TestCase
+class FileListTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Layout\File\ListFile
+ * @var \Magento\View\Layout\File\FileList
*/
private $_model;
/**
- * @var \Magento\Core\Model\Layout\File
+ * @var \Magento\View\Layout\File
*/
private $_baseFile;
/**
- * @var \Magento\Core\Model\Layout\File
+ * @var \Magento\View\Layout\File
*/
private $_themeFile;
@@ -45,7 +45,7 @@ class ListTest extends \PHPUnit_Framework_TestCase
{
$this->_baseFile = $this->_createLayoutFile('fixture.xml', 'Fixture_TestModule');
$this->_themeFile = $this->_createLayoutFile('fixture.xml', 'Fixture_TestModule', 'area/theme/path');
- $this->_model = new \Magento\Core\Model\Layout\File\ListFile();
+ $this->_model = new \Magento\View\Layout\File\FileList();
$this->_model->add(array($this->_baseFile, $this->_themeFile));
}
@@ -64,7 +64,7 @@ class ListTest extends \PHPUnit_Framework_TestCase
$theme = $this->getMockForAbstractClass('Magento\View\Design\ThemeInterface');
$theme->expects($this->any())->method('getFullPath')->will($this->returnValue($themeFullPath));
}
- return new \Magento\Core\Model\Layout\File($filename, $module, $theme);
+ return new \Magento\View\Layout\File($filename, $module, $theme);
}
public function testGetAll()
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/AggregateTest.php b/dev/tests/unit/testsuite/Magento/View/Layout/File/Source/AggregateTest.php
similarity index 75%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/AggregateTest.php
rename to dev/tests/unit/testsuite/Magento/View/Layout/File/Source/AggregateTest.php
index 7e2924946ca..23e95435dc3 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/AggregateTest.php
+++ b/dev/tests/unit/testsuite/Magento/View/Layout/File/Source/AggregateTest.php
@@ -22,12 +22,12 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\Layout\File\Source;
+namespace Magento\View\Layout\File\Source;
class AggregateTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Layout\File\Source\Aggregated
+ * @var \Magento\View\Layout\File\Source\Aggregated
*/
private $_model;
@@ -58,17 +58,20 @@ class AggregateTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->_fileList = $this->getMock('Magento\Core\Model\Layout\File\ListFile', array(), array(), '', false);
- $this->_baseFiles = $this->getMockForAbstractClass('Magento\Core\Model\Layout\File\SourceInterface');
- $this->_themeFiles = $this->getMockForAbstractClass('Magento\Core\Model\Layout\File\SourceInterface');
- $this->_overridingBaseFiles = $this->getMockForAbstractClass('Magento\Core\Model\Layout\File\SourceInterface');
- $this->_overridingThemeFiles = $this->getMockForAbstractClass('Magento\Core\Model\Layout\File\SourceInterface');
+ $this->_fileList = $this->getMock('Magento\View\Layout\File\FileList', array(), array(), '', false);
+ $this->_baseFiles = $this->getMockForAbstractClass('Magento\View\Layout\File\SourceInterface');
+ $this->_themeFiles = $this->getMockForAbstractClass('Magento\View\Layout\File\SourceInterface');
+ $this->_overridingBaseFiles = $this->getMockForAbstractClass('Magento\View\Layout\File\SourceInterface');
+ $this->_overridingThemeFiles = $this->getMockForAbstractClass('Magento\View\Layout\File\SourceInterface');
$fileListFactory =
- $this->getMock('Magento\Core\Model\Layout\File\FileList\Factory', array(), array(), '', false);
+ $this->getMock('Magento\View\Layout\File\FileList\Factory', array(), array(), '', false);
$fileListFactory->expects($this->once())->method('create')->will($this->returnValue($this->_fileList));
- $this->_model = new \Magento\Core\Model\Layout\File\Source\Aggregated(
- $fileListFactory, $this->_baseFiles, $this->_themeFiles,
- $this->_overridingBaseFiles, $this->_overridingThemeFiles
+ $this->_model = new \Magento\View\Layout\File\Source\Aggregated(
+ $fileListFactory,
+ $this->_baseFiles,
+ $this->_themeFiles,
+ $this->_overridingBaseFiles,
+ $this->_overridingThemeFiles
);
}
@@ -79,13 +82,13 @@ class AggregateTest extends \PHPUnit_Framework_TestCase
$theme->expects($this->once())->method('getParentTheme')->will($this->returnValue($parentTheme));
$files = array(
- new \Magento\Core\Model\Layout\File('0.xml', 'Module_One'),
- new \Magento\Core\Model\Layout\File('1.xml', 'Module_One', $parentTheme),
- new \Magento\Core\Model\Layout\File('2.xml', 'Module_One', $parentTheme),
- new \Magento\Core\Model\Layout\File('3.xml', 'Module_One', $parentTheme),
- new \Magento\Core\Model\Layout\File('4.xml', 'Module_One', $theme),
- new \Magento\Core\Model\Layout\File('5.xml', 'Module_One', $theme),
- new \Magento\Core\Model\Layout\File('6.xml', 'Module_One', $theme),
+ new \Magento\View\Layout\File('0.xml', 'Module_One'),
+ new \Magento\View\Layout\File('1.xml', 'Module_One', $parentTheme),
+ new \Magento\View\Layout\File('2.xml', 'Module_One', $parentTheme),
+ new \Magento\View\Layout\File('3.xml', 'Module_One', $parentTheme),
+ new \Magento\View\Layout\File('4.xml', 'Module_One', $theme),
+ new \Magento\View\Layout\File('5.xml', 'Module_One', $theme),
+ new \Magento\View\Layout\File('6.xml', 'Module_One', $theme),
);
$this->_baseFiles
diff --git a/dev/tests/unit/testsuite/Magento/View/Layout/File/Source/BaseTest.php b/dev/tests/unit/testsuite/Magento/View/Layout/File/Source/BaseTest.php
new file mode 100644
index 00000000000..219b83e15c6
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/View/Layout/File/Source/BaseTest.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\View\Layout\File\Source;
+
+class BaseTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\View\Layout\File\Source\Base
+ */
+ private $_model;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $_filesystem;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $_dirs;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $_fileFactory;
+
+ protected function setUp()
+ {
+ $this->_filesystem = $this->getMock('Magento\Filesystem', array(), array(), '', false);
+ $this->_dirs = $this->getMock('Magento\App\Dir', array(), array(), '', false);
+ $this->_dirs->expects($this->any())->method('getDir')->will($this->returnArgument(0));
+ $this->_fileFactory = $this->getMock('Magento\View\Layout\File\Factory', array(), array(), '', false);
+ $this->_model = new \Magento\View\Layout\File\Source\Base(
+ $this->_filesystem, $this->_dirs, $this->_fileFactory
+ );
+ }
+
+ /**
+ * @param array $files
+ * @param string $filePath
+ *
+ * @dataProvider dataProvider
+ */
+ public function testGetFiles($files, $filePath)
+ {
+ $theme = $this->getMockForAbstractClass('Magento\View\Design\ThemeInterface');
+ $theme->expects($this->once())->method('getArea')->will($this->returnValue('area'));
+
+ $handlePath = 'code/Module/%s/view/area/layout/%s.xml';
+ $returnKeys = array();
+ foreach ($files as $file) {
+ $returnKeys[] = sprintf($handlePath, $file['module'], $file['handle']);
+ }
+
+ $this->_filesystem
+ ->expects($this->once())
+ ->method('searchKeys')
+ ->with('code', "*/*/view/area/layout/{$filePath}.xml")
+ ->will($this->returnValue($returnKeys))
+ ;
+
+ $checkResult = array();
+ foreach ($files as $key => $file) {
+ $moduleName = 'Module_' . $file['module'];
+ $checkResult[$key] = new \Magento\View\Layout\File(
+ $file['handle'] . '.xml',
+ $moduleName,
+ $theme
+ );
+
+ $this->_fileFactory
+ ->expects($this->at($key))
+ ->method('create')
+ ->with(sprintf($handlePath, $file['module'], $file['handle']), $moduleName)
+ ->will($this->returnValue($checkResult[$key]))
+ ;
+ }
+
+ $this->assertSame($checkResult, $this->_model->getFiles($theme, $filePath));
+ }
+
+ /**
+ * @return array
+ */
+ public function dataProvider()
+ {
+ return array(
+ array(
+ array(
+ array('handle' => '1', 'module' => 'One'),
+ array('handle' => '2', 'module' => 'One'),
+ array('handle' => '3', 'module' => 'Two'),
+ ),
+ '*',
+ ),
+ array(
+ array(
+ array('handle' => 'preset/4', 'module' => 'Fourth'),
+ ),
+ 'preset/4',
+ ),
+ );
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/Decorator/ModuleDependencyTest.php b/dev/tests/unit/testsuite/Magento/View/Layout/File/Source/Decorator/ModuleDependencyTest.php
similarity index 83%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/Decorator/ModuleDependencyTest.php
rename to dev/tests/unit/testsuite/Magento/View/Layout/File/Source/Decorator/ModuleDependencyTest.php
index 716da4dc08d..342eb3f6de3 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/Decorator/ModuleDependencyTest.php
+++ b/dev/tests/unit/testsuite/Magento/View/Layout/File/Source/Decorator/ModuleDependencyTest.php
@@ -22,12 +22,12 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\Layout\File\Source\Decorator;
+namespace Magento\View\Layout\File\Source\Decorator;
class ModuleDependencyTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Layout\File\Source\Decorator\ModuleDependency
+ * @var \Magento\View\Layout\File\Source\Decorator\ModuleDependency
*/
private $_model;
@@ -55,10 +55,10 @@ class ModuleDependencyTest extends \PHPUnit_Framework_TestCase
),
);
- $this->_fileSource = $this->getMockForAbstractClass('Magento\Core\Model\Layout\File\SourceInterface');
+ $this->_fileSource = $this->getMockForAbstractClass('Magento\View\Layout\File\SourceInterface');
$this->_moduleListMock = $this->getMock('Magento\App\ModuleListInterface');
$this->_moduleListMock->expects($this->any())->method('getModules')->will($this->returnValue($modulesConfig));
- $this->_model = new \Magento\Core\Model\Layout\File\Source\Decorator\ModuleDependency(
+ $this->_model = new \Magento\View\Layout\File\Source\Decorator\ModuleDependency(
$this->_fileSource, $this->_moduleListMock
);
}
@@ -83,12 +83,12 @@ class ModuleDependencyTest extends \PHPUnit_Framework_TestCase
public function getFilesDataProvider()
{
- $fileOne = new \Magento\Core\Model\Layout\File('b.xml', 'Fixture_ModuleB');
- $fileTwo = new \Magento\Core\Model\Layout\File('a.xml', 'Fixture_ModuleA');
- $fileThree = new \Magento\Core\Model\Layout\File('b.xml', 'Fixture_ModuleA');
+ $fileOne = new \Magento\View\Layout\File('b.xml', 'Fixture_ModuleB');
+ $fileTwo = new \Magento\View\Layout\File('a.xml', 'Fixture_ModuleA');
+ $fileThree = new \Magento\View\Layout\File('b.xml', 'Fixture_ModuleA');
- $unknownFileOne = new \Magento\Core\Model\Layout\File('b.xml', 'Unknown_ModuleA');
- $unknownFileTwo = new \Magento\Core\Model\Layout\File('a.xml', 'Unknown_ModuleB');
+ $unknownFileOne = new \Magento\View\Layout\File('b.xml', 'Unknown_ModuleA');
+ $unknownFileTwo = new \Magento\View\Layout\File('a.xml', 'Unknown_ModuleB');
return array(
'same module' => array(
array($fileThree, $fileTwo),
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/Decorator/ModuleOutputTest.php b/dev/tests/unit/testsuite/Magento/View/Layout/File/Source/Decorator/ModuleOutputTest.php
similarity index 80%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/Decorator/ModuleOutputTest.php
rename to dev/tests/unit/testsuite/Magento/View/Layout/File/Source/Decorator/ModuleOutputTest.php
index 2623b2b7c7a..2d5f9fd36b9 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/Decorator/ModuleOutputTest.php
+++ b/dev/tests/unit/testsuite/Magento/View/Layout/File/Source/Decorator/ModuleOutputTest.php
@@ -22,12 +22,12 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\Layout\File\Source\Decorator;
+namespace Magento\View\Layout\File\Source\Decorator;
class ModuleOutputTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Layout\File\Source\Decorator\ModuleOutput
+ * @var \Magento\View\Layout\File\Source\Decorator\ModuleOutput
*/
private $_model;
@@ -43,7 +43,7 @@ class ModuleOutputTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->_fileSource = $this->getMockForAbstractClass('Magento\Core\Model\Layout\File\SourceInterface');
+ $this->_fileSource = $this->getMockForAbstractClass('Magento\View\Layout\File\SourceInterface');
$this->_moduleManager = $this->getMock('Magento\Core\Model\ModuleManager', array(), array(), '', false);
$this->_moduleManager
->expects($this->any())
@@ -53,7 +53,7 @@ class ModuleOutputTest extends \PHPUnit_Framework_TestCase
array('Module_OutputDisabled', false),
)))
;
- $this->_model = new \Magento\Core\Model\Layout\File\Source\Decorator\ModuleOutput(
+ $this->_model = new \Magento\View\Layout\File\Source\Decorator\ModuleOutput(
$this->_fileSource, $this->_moduleManager
);
}
@@ -61,9 +61,9 @@ class ModuleOutputTest extends \PHPUnit_Framework_TestCase
public function testGetFiles()
{
$theme = $this->getMockForAbstractClass('Magento\View\Design\ThemeInterface');
- $fileOne = new \Magento\Core\Model\Layout\File('1.xml', 'Module_OutputEnabled');
- $fileTwo = new \Magento\Core\Model\Layout\File('2.xml', 'Module_OutputDisabled');
- $fileThree = new \Magento\Core\Model\Layout\File('3.xml', 'Module_OutputEnabled', $theme);
+ $fileOne = new \Magento\View\Layout\File('1.xml', 'Module_OutputEnabled');
+ $fileTwo = new \Magento\View\Layout\File('2.xml', 'Module_OutputDisabled');
+ $fileThree = new \Magento\View\Layout\File('3.xml', 'Module_OutputEnabled', $theme);
$this->_fileSource
->expects($this->once())
->method('getFiles')
diff --git a/dev/tests/unit/testsuite/Magento/View/Layout/File/Source/Override/BaseTest.php b/dev/tests/unit/testsuite/Magento/View/Layout/File/Source/Override/BaseTest.php
new file mode 100644
index 00000000000..ad327780993
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/View/Layout/File/Source/Override/BaseTest.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\View\Layout\File\Source\Override;
+
+class BaseTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\View\Layout\File\Source\Override\Base
+ */
+ private $_model;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $_filesystem;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $_dirs;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $_fileFactory;
+
+ protected function setUp()
+ {
+ $this->_filesystem = $this->getMock('Magento\Filesystem', array(), array(), '', false);
+ $this->_dirs = $this->getMock('Magento\App\Dir', array(), array(), '', false);
+ $this->_dirs->expects($this->any())->method('getDir')->will($this->returnArgument(0));
+ $this->_fileFactory = $this->getMock('Magento\View\Layout\File\Factory', array(), array(), '', false);
+ $this->_model = new \Magento\View\Layout\File\Source\Override\Base(
+ $this->_filesystem, $this->_dirs, $this->_fileFactory
+ );
+ }
+
+ /**
+ * @param array $files
+ * @param string $filePath
+ *
+ * @dataProvider dataProvider
+ */
+ public function testGetFiles($files, $filePath)
+ {
+ $theme = $this->getMockForAbstractClass('Magento\View\Design\ThemeInterface');
+ $theme->expects($this->once())->method('getFullPath')->will($this->returnValue('area/theme/path'));
+
+ $handlePath = 'design/area/theme/path/%s/layout/override/base/%s.xml';
+ $returnKeys = array();
+ foreach ($files as $file) {
+ $returnKeys[] = sprintf($handlePath, $file['module'], $file['handle']);
+ }
+
+ $this->_filesystem
+ ->expects($this->once())
+ ->method('searchKeys')
+ ->with('design', "area/theme/path/*_*/layout/override/base/{$filePath}.xml")
+ ->will($this->returnValue($returnKeys))
+ ;
+
+ $checkResult = array();
+ foreach ($files as $key => $file) {
+ $checkResult[$key] = new \Magento\View\Layout\File($file['handle'] . '.xml', $file['module']);
+ $this->_fileFactory
+ ->expects($this->at($key))
+ ->method('create')
+ ->with(sprintf($handlePath, $file['module'], $file['handle']), $file['module'])
+ ->will($this->returnValue($checkResult[$key]))
+ ;
+ }
+
+ $this->assertSame($checkResult, $this->_model->getFiles($theme, $filePath));
+ }
+
+ /**
+ * @return array
+ */
+ public function dataProvider()
+ {
+ return array(
+ array(
+ array(
+ array('handle' => '1', 'module' => 'Module_One'),
+ array('handle' => '2', 'module' => 'Module_One'),
+ array('handle' => '3', 'module' => 'Module_Two'),
+ ),
+ '*',
+ ),
+ array(
+ array(
+ array('handle' => 'preset/4', 'module' => 'Module_Fourth'),
+ ),
+ 'preset/4',
+ ),
+ );
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/Override/ThemeTest.php b/dev/tests/unit/testsuite/Magento/View/Layout/File/Source/Override/ThemeTest.php
similarity index 65%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/Override/ThemeTest.php
rename to dev/tests/unit/testsuite/Magento/View/Layout/File/Source/Override/ThemeTest.php
index 1620bc5a694..29a28309c5e 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/Override/ThemeTest.php
+++ b/dev/tests/unit/testsuite/Magento/View/Layout/File/Source/Override/ThemeTest.php
@@ -22,12 +22,12 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\Layout\File\Source\Override;
+namespace Magento\View\Layout\File\Source\Override;
class ThemeTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Layout\File\Source\Override\Theme
+ * @var \Magento\View\Layout\File\Source\Override\Theme
*/
private $_model;
@@ -51,8 +51,8 @@ class ThemeTest extends \PHPUnit_Framework_TestCase
$this->_filesystem = $this->getMock('Magento\Filesystem', array(), array(), '', false);
$this->_dirs = $this->getMock('Magento\App\Dir', array(), array(), '', false);
$this->_dirs->expects($this->any())->method('getDir')->will($this->returnArgument(0));
- $this->_fileFactory = $this->getMock('Magento\Core\Model\Layout\File\Factory', array(), array(), '', false);
- $this->_model = new \Magento\Core\Model\Layout\File\Source\Override\Theme(
+ $this->_fileFactory = $this->getMock('Magento\View\Layout\File\Factory', array(), array(), '', false);
+ $this->_model = new \Magento\View\Layout\File\Source\Override\Theme(
$this->_filesystem, $this->_dirs, $this->_fileFactory
);
}
@@ -70,17 +70,17 @@ class ThemeTest extends \PHPUnit_Framework_TestCase
$theme->expects($this->once())->method('getFullPath')->will($this->returnValue('area/theme_path'));
$theme->expects($this->once())->method('getParentTheme')->will($this->returnValue($parentTheme));
- $filePathOne = 'design/area/theme_path/Module_One/layout/override/parent_theme/1.xml';
- $filePathTwo = 'design/area/theme_path/Module_Two/layout/override/grand_parent_theme/2.xml';
+ $filePathOne = 'design/area/theme_path/Module_One/layout/override/theme/parent_theme/1.xml';
+ $filePathTwo = 'design/area/theme_path/Module_Two/layout/override/theme/grand_parent_theme/2.xml';
$this->_filesystem
->expects($this->once())
->method('searchKeys')
- ->with('design', 'area/theme_path/*_*/layout/override/*/*.xml')
+ ->with('design', 'area/theme_path/*_*/layout/override/theme/*/*.xml')
->will($this->returnValue(array($filePathOne, $filePathTwo)))
;
- $fileOne = new \Magento\Core\Model\Layout\File('1.xml', 'Module_One', $parentTheme);
- $fileTwo = new \Magento\Core\Model\Layout\File('2.xml', 'Module_Two', $grandparentTheme);
+ $fileOne = new \Magento\View\Layout\File('1.xml', 'Module_One', $parentTheme);
+ $fileTwo = new \Magento\View\Layout\File('2.xml', 'Module_Two', $grandparentTheme);
$this->_fileFactory
->expects($this->exactly(2))
->method('create')
@@ -93,9 +93,41 @@ class ThemeTest extends \PHPUnit_Framework_TestCase
$this->assertSame(array($fileOne, $fileTwo), $this->_model->getFiles($theme));
}
+ public function testGetFilesWithPreset()
+ {
+ $grandparentTheme = $this->getMockForAbstractClass('Magento\View\Design\ThemeInterface');
+ $grandparentTheme->expects($this->once())->method('getCode')->will($this->returnValue('grand_parent_theme'));
+
+ $parentTheme = $this->getMockForAbstractClass('Magento\View\Design\ThemeInterface');
+ $parentTheme->expects($this->once())->method('getCode')->will($this->returnValue('parent_theme'));
+ $parentTheme->expects($this->once())->method('getParentTheme')->will($this->returnValue($grandparentTheme));
+
+ $theme = $this->getMockForAbstractClass('Magento\View\Design\ThemeInterface');
+ $theme->expects($this->once())->method('getFullPath')->will($this->returnValue('area/theme_path'));
+ $theme->expects($this->once())->method('getParentTheme')->will($this->returnValue($parentTheme));
+
+ $filePathOne = 'design/area/theme_path/Module_Two/layout/override/theme/grand_parent_theme/preset/3.xml';
+ $this->_filesystem
+ ->expects($this->once())
+ ->method('searchKeys')
+ ->with('design', 'area/theme_path/*_*/layout/override/theme/*/preset/3.xml')
+ ->will($this->returnValue(array($filePathOne)))
+ ;
+
+ $fileOne = new \Magento\View\Layout\File('3.xml', 'Module_Two', $grandparentTheme);
+ $this->_fileFactory
+ ->expects($this->once())
+ ->method('create')
+ ->with($filePathOne, 'Module_Two', $grandparentTheme)
+ ->will($this->returnValue($fileOne))
+ ;
+
+ $this->assertSame(array($fileOne), $this->_model->getFiles($theme, 'preset/3'));
+ }
+
public function testGetFilesWrongAncestor()
{
- $filePath = 'design/area/theme_path/Module_One/layout/override/parent_theme/1.xml';
+ $filePath = 'design/area/theme_path/Module_One/layout/override/theme/parent_theme/1.xml';
$this->setExpectedException(
'Magento\Core\Exception',
"Trying to override layout file '$filePath' for theme 'parent_theme'"
@@ -110,7 +142,7 @@ class ThemeTest extends \PHPUnit_Framework_TestCase
$this->_filesystem
->expects($this->once())
->method('searchKeys')
- ->with('design', 'area/theme_path/*_*/layout/override/*/*.xml')
+ ->with('design', 'area/theme_path/*_*/layout/override/theme/*/*.xml')
->will($this->returnValue(array($filePath)))
;
$this->_model->getFiles($theme);
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/ThemeTest.php b/dev/tests/unit/testsuite/Magento/View/Layout/File/Source/ThemeTest.php
similarity index 50%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/ThemeTest.php
rename to dev/tests/unit/testsuite/Magento/View/Layout/File/Source/ThemeTest.php
index 1bf60d2686b..7d511a35d83 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/File/Source/ThemeTest.php
+++ b/dev/tests/unit/testsuite/Magento/View/Layout/File/Source/ThemeTest.php
@@ -22,12 +22,12 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\Layout\File\Source;
+namespace Magento\View\Layout\File\Source;
class ThemeTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Layout\File\Source\Theme
+ * @var \Magento\View\Layout\File\Source\Theme
*/
private $_model;
@@ -51,50 +51,68 @@ class ThemeTest extends \PHPUnit_Framework_TestCase
$this->_filesystem = $this->getMock('Magento\Filesystem', array(), array(), '', false);
$this->_dirs = $this->getMock('Magento\App\Dir', array(), array(), '', false);
$this->_dirs->expects($this->any())->method('getDir')->will($this->returnArgument(0));
- $this->_fileFactory = $this->getMock('Magento\Core\Model\Layout\File\Factory', array(), array(), '', false);
- $this->_model = new \Magento\Core\Model\Layout\File\Source\Theme(
+ $this->_fileFactory = $this->getMock('Magento\View\Layout\File\Factory', array(), array(), '', false);
+ $this->_model = new \Magento\View\Layout\File\Source\Theme(
$this->_filesystem, $this->_dirs, $this->_fileFactory
);
}
- public function testGetFiles()
+ /**
+ * @param array $files
+ * @param string $filePath
+ *
+ * @dataProvider dataProvider
+ */
+ public function testGetFiles($files, $filePath)
{
$theme = $this->getMockForAbstractClass('Magento\View\Design\ThemeInterface');
$theme->expects($this->once())->method('getFullPath')->will($this->returnValue('area/theme/path'));
+ $handlePath = 'design/area/theme/path/%s/layout/%s.xml';
+ $returnKeys = array();
+ foreach ($files as $file) {
+ $returnKeys[] = sprintf($handlePath, $file['module'], $file['handle']);
+ }
$this->_filesystem
->expects($this->once())
->method('searchKeys')
- ->with('design', 'area/theme/path/*_*/layout/*.xml')
- ->will($this->returnValue(array(
- 'design/area/theme/path/Module_One/layout/1.xml',
- 'design/area/theme/path/Module_One/layout/2.xml',
- 'design/area/theme/path/Module_Two/layout/3.xml',
- )))
+ ->with('design', "area/theme/path/*_*/layout/{$filePath}.xml")
+ ->will($this->returnValue($returnKeys))
;
- $fileOne = new \Magento\Core\Model\Layout\File('1.xml', 'Module_One', $theme);
- $fileTwo = new \Magento\Core\Model\Layout\File('2.xml', 'Module_One', $theme);
- $fileThree = new \Magento\Core\Model\Layout\File('3.xml', 'Module_Two', $theme);
- $this->_fileFactory
- ->expects($this->at(0))
- ->method('create')
- ->with('design/area/theme/path/Module_One/layout/1.xml', 'Module_One', $theme)
- ->will($this->returnValue($fileOne))
- ;
- $this->_fileFactory
- ->expects($this->at(1))
- ->method('create')
- ->with('design/area/theme/path/Module_One/layout/2.xml', 'Module_One', $theme)
- ->will($this->returnValue($fileTwo))
- ;
- $this->_fileFactory
- ->expects($this->at(2))
- ->method('create')
- ->with('design/area/theme/path/Module_Two/layout/3.xml', 'Module_Two', $theme)
- ->will($this->returnValue($fileThree))
- ;
+ $checkResult = array();
+ foreach ($files as $key => $file) {
+ $checkResult[$key] = new \Magento\View\Layout\File($file['handle'] . '.xml', $file['module'], $theme);
+ $this->_fileFactory
+ ->expects($this->at($key))
+ ->method('create')
+ ->with(sprintf($handlePath, $file['module'], $file['handle']), $file['module'], $theme)
+ ->will($this->returnValue($checkResult[$key]))
+ ;
+ }
+ $this->assertSame($checkResult, $this->_model->getFiles($theme, $filePath));
+ }
- $this->assertSame(array($fileOne, $fileTwo, $fileThree), $this->_model->getFiles($theme));
+ /**
+ * @return array
+ */
+ public function dataProvider()
+ {
+ return array(
+ array(
+ array(
+ array('handle' => '1', 'module' => 'Module_One'),
+ array('handle' => '2', 'module' => 'Module_One'),
+ array('handle' => '3', 'module' => 'Module_Two'),
+ ),
+ '*',
+ ),
+ array(
+ array(
+ array('handle' => 'preset/4', 'module' => 'Module_Fourth'),
+ ),
+ 'preset/4',
+ ),
+ );
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/FileTest.php b/dev/tests/unit/testsuite/Magento/View/Layout/FileTest.php
similarity index 90%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/FileTest.php
rename to dev/tests/unit/testsuite/Magento/View/Layout/FileTest.php
index f033cb2d5f4..b96d8af3108 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/FileTest.php
+++ b/dev/tests/unit/testsuite/Magento/View/Layout/FileTest.php
@@ -22,12 +22,12 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\Layout;
+namespace Magento\View\Layout;
class FileTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Layout\File
+ * @var \Magento\View\Layout\File
*/
private $_model;
@@ -39,7 +39,7 @@ class FileTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->_theme = $this->getMockForAbstractClass('Magento\View\Design\ThemeInterface');
- $this->_model = new \Magento\Core\Model\Layout\File(__FILE__, 'Fixture_TestModule', $this->_theme);
+ $this->_model = new \Magento\View\Layout\File(__FILE__, 'Fixture_TestModule', $this->_theme);
}
public function testGetFilename()
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/PhpTest.php b/dev/tests/unit/testsuite/Magento/View/TemplateEngine/PhpTest.php
similarity index 94%
rename from dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/PhpTest.php
rename to dev/tests/unit/testsuite/Magento/View/TemplateEngine/PhpTest.php
index 8d789b7b6df..bccaf460e36 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/PhpTest.php
+++ b/dev/tests/unit/testsuite/Magento/View/TemplateEngine/PhpTest.php
@@ -22,13 +22,13 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\TemplateEngine;
+namespace Magento\View\TemplateEngine;
class PhpTest extends \PHPUnit_Framework_TestCase
{
const TEST_PROP_VALUE = 'TEST_PROP_VALUE';
- /** @var \Magento\Core\Model\TemplateEngine\Php */
+ /** @var \Magento\View\TemplateEngine\Php */
protected $_phpEngine;
/**
@@ -36,7 +36,7 @@ class PhpTest extends \PHPUnit_Framework_TestCase
*/
protected function setUp()
{
- $this->_phpEngine = new \Magento\Core\Model\TemplateEngine\Php();
+ $this->_phpEngine = new \Magento\View\TemplateEngine\Php();
}
/**
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/_files/simple.phtml b/dev/tests/unit/testsuite/Magento/View/TemplateEngine/_files/simple.phtml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/_files/simple.phtml
rename to dev/tests/unit/testsuite/Magento/View/TemplateEngine/_files/simple.phtml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/PoolTest.php b/dev/tests/unit/testsuite/Magento/View/TemplateEngineFactoryTest.php
similarity index 51%
rename from dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/PoolTest.php
rename to dev/tests/unit/testsuite/Magento/View/TemplateEngineFactoryTest.php
index 4c2bb471b90..089bc4eb9ee 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/TemplateEngine/PoolTest.php
+++ b/dev/tests/unit/testsuite/Magento/View/TemplateEngineFactoryTest.php
@@ -22,37 +22,44 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\TemplateEngine;
+namespace Magento\View;
-class PoolTest extends \PHPUnit_Framework_TestCase
+class TemplateEngineFactoryTest extends \PHPUnit_Framework_TestCase
{
- /**
- * @var Pool
- */
- protected $_model;
+ /** @var \PHPUnit_Framework_MockObject_MockObject */
+ protected $_objectManagerMock;
- /**
- * @var\PHPUnit_Framework_MockObject_MockObject
- */
+ /** @var \Magento\View\TemplateEngineFactory */
protected $_factory;
+ /**
+ * Setup a factory to test with an mocked object manager.
+ */
protected function setUp()
{
- $this->_factory = $this->getMock('Magento\Core\Model\TemplateEngine\Factory', array(), array(), '', false);
- $this->_model = new Pool($this->_factory);
+ $this->_objectManagerMock = $this->getMock('Magento\ObjectManager');
+ $this->_factory = new TemplateEngineFactory($this->_objectManagerMock);
}
- public function testGet()
+ public function testCreateKnownEngine()
{
- $engine = $this->getMock('Magento\Core\Model\TemplateEngine\EngineInterface');
- $this->_factory
+ $engine = $this->getMock('Magento\View\TemplateEngineInterface');
+ $this->_objectManagerMock
->expects($this->once())
- ->method('create')
- ->with('test')
+ ->method('get')
+ ->with('Magento\View\TemplateEngine\Php')
->will($this->returnValue($engine))
;
- $this->assertSame($engine, $this->_model->get('test'));
- // Make sure factory is invoked only once and the same instance is returned afterwards
- $this->assertSame($engine, $this->_model->get('test'));
+ $this->assertSame($engine, $this->_factory->get('phtml'));
+ }
+
+ /**
+ * @expectedException \InvalidArgumentException
+ * @expectedExceptionMessage Unknown template engine type: non_existing
+ */
+ public function testCreateUnknownEngine()
+ {
+ $this->_objectManagerMock->expects($this->never())->method('get');
+ $this->_factory->get('non_existing');
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Webapi/Block/Adminhtml/Role/EditTest.php b/dev/tests/unit/testsuite/Magento/Webapi/Block/Adminhtml/Role/EditTest.php
index 6cc1eff4e3d..62a84a0f20d 100644
--- a/dev/tests/unit/testsuite/Magento/Webapi/Block/Adminhtml/Role/EditTest.php
+++ b/dev/tests/unit/testsuite/Magento/Webapi/Block/Adminhtml/Role/EditTest.php
@@ -106,7 +106,7 @@ class EditTest extends \PHPUnit_Framework_TestCase
$this->_urlBuilder
->expects($this->once())
->method('getUrl')
- ->with('*/*/save', array('_current' => true, 'continue' => true))
+ ->with('adminhtml/*/save', array('_current' => true, 'continue' => true))
->will($this->returnValue($expectedUrl));
$this->assertEquals($expectedUrl, $this->_block->getSaveAndContinueUrl());
diff --git a/dev/tests/unit/testsuite/Magento/Webapi/Block/Adminhtml/RoleTest.php b/dev/tests/unit/testsuite/Magento/Webapi/Block/Adminhtml/RoleTest.php
index 4d7abf472bd..98283ab6d10 100644
--- a/dev/tests/unit/testsuite/Magento/Webapi/Block/Adminhtml/RoleTest.php
+++ b/dev/tests/unit/testsuite/Magento/Webapi/Block/Adminhtml/RoleTest.php
@@ -69,7 +69,7 @@ class RoleTest extends \PHPUnit_Framework_TestCase
$this->_urlBuilder
->expects($this->once())
->method('getUrl')
- ->with('*/*/edit', array())
+ ->with('adminhtml/*/edit', array())
->will($this->returnValue($expectedUrl));
$this->assertEquals($expectedUrl, $this->_block->getCreateUrl());
diff --git a/dev/tests/unit/testsuite/Magento/Webhook/Block/Adminhtml/Registration/ActivateTest.php b/dev/tests/unit/testsuite/Magento/Webhook/Block/Adminhtml/Registration/ActivateTest.php
index bb5686b1ed7..bb1c636824d 100644
--- a/dev/tests/unit/testsuite/Magento/Webhook/Block/Adminhtml/Registration/ActivateTest.php
+++ b/dev/tests/unit/testsuite/Magento/Webhook/Block/Adminhtml/Registration/ActivateTest.php
@@ -68,7 +68,7 @@ class ActivateTest extends \PHPUnit_Framework_TestCase
$url = 'example.url.com/id/333';
$this->_urlBuilder->expects($this->once())
->method('getUrl')
- ->with('*/*/accept', array('id' => 333))
+ ->with('adminhtml/*/accept', array('id' => 333))
->will($this->returnValue($url));
$this->assertEquals($url, $this->_block->getAcceptUrl());
diff --git a/dev/tests/unit/testsuite/Magento/Webhook/Block/Adminhtml/Registration/Create/Form/ContainerTest.php b/dev/tests/unit/testsuite/Magento/Webhook/Block/Adminhtml/Registration/Create/Form/ContainerTest.php
index 5a71f16d4db..a1cfc0db90b 100644
--- a/dev/tests/unit/testsuite/Magento/Webhook/Block/Adminhtml/Registration/Create/Form/ContainerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Webhook/Block/Adminhtml/Registration/Create/Form/ContainerTest.php
@@ -69,7 +69,7 @@ class ContainerTest extends \PHPUnit_Framework_TestCase
$url = 'example.url.com/id/333';
$this->_urlBuilder->expects($this->once())
->method('getUrl')
- ->with('*/*/register', array('id' => 333))
+ ->with('adminhtml/*/register', array('id' => 333))
->will($this->returnValue($url));
$this->assertEquals($url, $this->_block->getSubmitUrl());
diff --git a/dev/tests/unit/testsuite/Magento/Webhook/Controller/Adminhtml/Webhook/RegistrationTest.php b/dev/tests/unit/testsuite/Magento/Webhook/Controller/Adminhtml/Webhook/RegistrationTest.php
index 769203b4fa2..d4b772630f3 100644
--- a/dev/tests/unit/testsuite/Magento/Webhook/Controller/Adminhtml/Webhook/RegistrationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Webhook/Controller/Adminhtml/Webhook/RegistrationTest.php
@@ -244,7 +244,7 @@ class RegistrationTest extends \PHPUnit_Framework_TestCase
// Verify redirect to success page
$this->_mockBackendHlpData->expects($this->once())
->method('getUrl')
- ->with($this->equalTo('*/webhook_registration/succeeded'), array('id' => '1'));
+ ->with($this->equalTo('adminhtml/webhook_registration/succeeded'), array('id' => '1'));
$registrationContr->registerAction();
}
diff --git a/dev/tools/Magento/Tools/Layout/processors/addToParentGroup.xsl b/dev/tools/Magento/Tools/Layout/processors/addToParentGroup.xsl
new file mode 100644
index 00000000000..4659953e2aa
--- /dev/null
+++ b/dev/tools/Magento/Tools/Layout/processors/addToParentGroup.xsl
@@ -0,0 +1,54 @@
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+ */
+-->
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:php="http://php.net/xsl"
+ xsl:extension-element-prefixes="php"
+ exclude-result-prefixes="xsl php"
+ >
+
+ <!-- Copy nodes -->
+ <xsl:template match="node()|@*">
+ <xsl:copy>
+ <xsl:apply-templates select="node()|@*" />
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="block[action[@method='addToParentGroup']]">
+ <xsl:copy>
+ <xsl:copy-of select="@*" />
+ <xsl:attribute name="group">
+ <xsl:value-of select="action[@method='addToParentGroup']/*[1]" />
+ </xsl:attribute>
+ <xsl:apply-templates select="*" />
+ </xsl:copy>
+ </xsl:template>
+
+ <!-- Delete action -->
+ <xsl:template match="action[@method='addToParentGroup']">
+ </xsl:template>
+
+</xsl:stylesheet>
diff --git a/dev/tools/Magento/Tools/View/Generator/CopyRule.php b/dev/tools/Magento/Tools/View/Generator/CopyRule.php
index 84f7b27643c..5f396c728d8 100644
--- a/dev/tools/Magento/Tools/View/Generator/CopyRule.php
+++ b/dev/tools/Magento/Tools/View/Generator/CopyRule.php
@@ -42,7 +42,7 @@ class CopyRule
private $_themes;
/**
- * @var \Magento\Core\Model\Design\Fallback\Rule\RuleInterface
+ * @var \Magento\View\Design\Fallback\Rule\RuleInterface
*/
private $_fallbackRule;
@@ -58,12 +58,12 @@ class CopyRule
*
* @param \Magento\Filesystem $filesystem
* @param \Magento\Core\Model\Theme\Collection $themes
- * @param \Magento\Core\Model\Design\Fallback\Rule\RuleInterface $fallbackRule
+ * @param \Magento\View\Design\Fallback\Rule\RuleInterface $fallbackRule
*/
public function __construct(
\Magento\Filesystem $filesystem,
\Magento\Core\Model\Theme\Collection $themes,
- \Magento\Core\Model\Design\Fallback\Rule\RuleInterface $fallbackRule
+ \Magento\View\Design\Fallback\Rule\RuleInterface $fallbackRule
) {
$this->_filesystem = $filesystem;
$this->_themes = $themes;
diff --git a/dev/tools/Magento/Tools/View/generator.php b/dev/tools/Magento/Tools/View/generator.php
index bdf9fd03ad6..0e826808e3e 100644
--- a/dev/tools/Magento/Tools/View/generator.php
+++ b/dev/tools/Magento/Tools/View/generator.php
@@ -69,7 +69,7 @@ try {
$themes->setItemObjectClass(' \Magento\Tools\View\Generator\ThemeLight');
$themes->addDefaultPattern('*');
- $fallbackFactory = new \Magento\Core\Model\Design\Fallback\Factory($dirs);
+ $fallbackFactory = new \Magento\View\Design\Fallback\Factory($dirs);
$generator = new \Magento\Tools\View\Generator\CopyRule($filesystem, $themes,
$fallbackFactory->createViewFileRule());
$copyRules = $generator->getCopyRules();
diff --git a/downloader/app/Magento/Downloader/Controller.php b/downloader/app/Magento/Downloader/Controller.php
index 89a7b31da55..c1819344efb 100755
--- a/downloader/app/Magento/Downloader/Controller.php
+++ b/downloader/app/Magento/Downloader/Controller.php
@@ -1025,7 +1025,8 @@ final class Controller
try {
$type = $this->_getBackupTypeByCode($archiveType);
- $backupManager = \Magento\Backup::getBackupInstance($type)
+ $backupManager = \Magento\Core\Model\ObjectManager::getInstance()->get('Magento\Backup\Factory')
+ ->create($type)
->setBackupExtension($this->_getExtensionType($type))
->setTime(time())
->setName($archiveName)
diff --git a/downloader/lib/Magento/Archive.php b/downloader/lib/Magento/Archive.php
index 1df0ea3d92f..4066c7deff5 100644
--- a/downloader/lib/Magento/Archive.php
+++ b/downloader/lib/Magento/Archive.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Class to work with archives
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento;
diff --git a/downloader/lib/Magento/Archive/AbstractArchive.php b/downloader/lib/Magento/Archive/AbstractArchive.php
index 974a63f15d8..b09fe958f15 100644
--- a/downloader/lib/Magento/Archive/AbstractArchive.php
+++ b/downloader/lib/Magento/Archive/AbstractArchive.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Class to work with archives
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Archive;
diff --git a/downloader/lib/Magento/Archive/ArchiveInterface.php b/downloader/lib/Magento/Archive/ArchiveInterface.php
index accf8e0de58..a83e726d2b0 100644
--- a/downloader/lib/Magento/Archive/ArchiveInterface.php
+++ b/downloader/lib/Magento/Archive/ArchiveInterface.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Interface for work with archives
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Archive;
diff --git a/downloader/lib/Magento/Archive/Bz.php b/downloader/lib/Magento/Archive/Bz.php
index e120c7ca455..ea48d4668a6 100644
--- a/downloader/lib/Magento/Archive/Bz.php
+++ b/downloader/lib/Magento/Archive/Bz.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Class to work with bzip2 archives
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Archive;
diff --git a/downloader/lib/Magento/Archive/Gz.php b/downloader/lib/Magento/Archive/Gz.php
index f841dc1a6e1..cd7b3e59159 100644
--- a/downloader/lib/Magento/Archive/Gz.php
+++ b/downloader/lib/Magento/Archive/Gz.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Class to work with gz archives
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Archive;
diff --git a/downloader/lib/Magento/Archive/Helper/File.php b/downloader/lib/Magento/Archive/Helper/File.php
index 90eefaedb88..2a0cddf21f9 100755
--- a/downloader/lib/Magento/Archive/Helper/File.php
+++ b/downloader/lib/Magento/Archive/Helper/File.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Helper class that simplifies files stream reading and writing
*
* @category Magento
-* @package \Magento\Archive
+* @package Magento_Archive
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Archive\Helper;
diff --git a/downloader/lib/Magento/Archive/Helper/File/Bz.php b/downloader/lib/Magento/Archive/Helper/File/Bz.php
index 448a6b9ec9d..188171f899b 100755
--- a/downloader/lib/Magento/Archive/Helper/File/Bz.php
+++ b/downloader/lib/Magento/Archive/Helper/File/Bz.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Helper class that simplifies bz2 files stream reading and writing
*
* @category Magento
-* @package \Magento\Archive
+* @package Magento_Archive
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Archive\Helper\File;
diff --git a/downloader/lib/Magento/Archive/Helper/File/Gz.php b/downloader/lib/Magento/Archive/Helper/File/Gz.php
index e0819b231b7..91b6010449a 100755
--- a/downloader/lib/Magento/Archive/Helper/File/Gz.php
+++ b/downloader/lib/Magento/Archive/Helper/File/Gz.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Helper class that simplifies gz files stream reading and writing
*
* @category Magento
-* @package \Magento\Archive
+* @package Magento_Archive
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Archive\Helper\File;
diff --git a/downloader/lib/Magento/Archive/Tar.php b/downloader/lib/Magento/Archive/Tar.php
index ed860c1f156..d0cb245011b 100644
--- a/downloader/lib/Magento/Archive/Tar.php
+++ b/downloader/lib/Magento/Archive/Tar.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Class to work with tar archives
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Archive;
diff --git a/downloader/lib/Magento/Backup.php b/downloader/lib/Magento/Backup.php
index 1bdbc6b51a1..41a30fb89c1 100755
--- a/downloader/lib/Magento/Backup.php
+++ b/downloader/lib/Magento/Backup.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Class to work with backups
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento;
diff --git a/downloader/lib/Magento/Backup/AbstractBackup.php b/downloader/lib/Magento/Backup/AbstractBackup.php
index cae25a70114..da7e8ede317 100644
--- a/downloader/lib/Magento/Backup/AbstractBackup.php
+++ b/downloader/lib/Magento/Backup/AbstractBackup.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -27,12 +27,12 @@
* Class to work with archives
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup;
-abstract class AbstractBackup implements \Magento\Backup\BackupInterface
+abstract class AbstractBackup implements \Magento\Backup\BackupInterface
{
/**
* Backup name
diff --git a/downloader/lib/Magento/Backup/Archive/Tar.php b/downloader/lib/Magento/Backup/Archive/Tar.php
index a80ae93f99f..0c084336f8f 100644
--- a/downloader/lib/Magento/Backup/Archive/Tar.php
+++ b/downloader/lib/Magento/Backup/Archive/Tar.php
@@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package \Magento\Backup
+ * @category Magento
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Extended version of \Magento\Archive\Tar that supports filtering
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Archive;
diff --git a/downloader/lib/Magento/Backup/Exception.php b/downloader/lib/Magento/Backup/BackupException.php
old mode 100755
new mode 100644
similarity index 90%
rename from downloader/lib/Magento/Backup/Exception.php
rename to downloader/lib/Magento/Backup/BackupException.php
index 3688e6ffd37..89671781590
--- a/downloader/lib/Magento/Backup/Exception.php
+++ b/downloader/lib/Magento/Backup/BackupException.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,11 +28,11 @@
* \Exception
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup;
-class Exception extends \Magento\Exception
+class BackupException extends \Magento\Exception
{
}
diff --git a/downloader/lib/Magento/Backup/BackupInterface.php b/downloader/lib/Magento/Backup/BackupInterface.php
index 869e45474d3..6df166caa59 100644
--- a/downloader/lib/Magento/Backup/BackupInterface.php
+++ b/downloader/lib/Magento/Backup/BackupInterface.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Interface for work with archives
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup;
@@ -49,7 +49,7 @@ interface BackupInterface
*/
public function rollback();
- /**
+ /**
* Set Backup Extension
*
* @param string $backupExtension
@@ -74,10 +74,10 @@ interface BackupInterface
public function setTime($time);
/**
- * Get Backup Type
- *
- * @return string
- */
+ * Get Backup Type
+ *
+ * @return string
+ */
public function getType();
/**
diff --git a/downloader/lib/Magento/Backup/Db.php b/downloader/lib/Magento/Backup/Db.php
index 6406145b478..93f221b8b14 100755
--- a/downloader/lib/Magento/Backup/Db.php
+++ b/downloader/lib/Magento/Backup/Db.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,13 +28,26 @@
* Class to work with database backups
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup;
class Db extends \Magento\Backup\AbstractBackup
{
+ /**
+ * @var \Magento\Backup\Db\BackupFactory
+ */
+ protected $_backupFactory;
+
+ /**
+ * @param \Magento\Backup\Db\BackupFactory $backupFactory
+ */
+ public function __construct(\Magento\Backup\Db\BackupFactory $backupFactory)
+ {
+ $this->_backupFactory = $backupFactory;
+ }
+
/**
* Implements Rollback functionality for Db
*
@@ -73,9 +86,9 @@ class Db extends \Magento\Backup\AbstractBackup
$lineLength = strlen($cleanLine);
$returnResult = false;
- if ($lineLength > 0){
+ if ($lineLength > 0) {
$lastSymbolIndex = $lineLength-1;
- if ($cleanLine[$lastSymbolIndex] == ';'){
+ if ($cleanLine[$lastSymbolIndex] == ';') {
$returnResult = true;
}
}
@@ -95,13 +108,13 @@ class Db extends \Magento\Backup\AbstractBackup
$this->_lastOperationSucceed = false;
- $backup = \Mage::getModel('Magento\Backup\Model\Backup')
+ $backup = $this->_backupFactory->createBackupModel()
->setTime($this->getTime())
->setType($this->getType())
->setPath($this->getBackupsDir())
->setName($this->getName());
- $backupDb = \Mage::getModel('Magento\Backup\Model\Db');
+ $backupDb = $this->_backupFactory->createBackupDbModel();
$backupDb->createBackup($backup);
$this->_lastOperationSucceed = true;
diff --git a/downloader/lib/Magento/Backup/Db/BackupDbInterface.php b/downloader/lib/Magento/Backup/Db/BackupDbInterface.php
new file mode 100644
index 00000000000..fd18033fa6e
--- /dev/null
+++ b/downloader/lib/Magento/Backup/Db/BackupDbInterface.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Backup\Db;
+
+interface BackupDbInterface
+{
+ /**
+ * Create DB backup
+ *
+ * @param BackupInterface $backup
+ * @return void
+ */
+ public function createBackup(\Magento\Backup\Db\BackupInterface $backup);
+}
diff --git a/app/code/Magento/Core/Model/TemplateEngine/Factory.php b/downloader/lib/Magento/Backup/Db/BackupFactory.php
similarity index 50%
rename from app/code/Magento/Core/Model/TemplateEngine/Factory.php
rename to downloader/lib/Magento/Backup/Db/BackupFactory.php
index bfa8d00ca74..b2ebaf3cf07 100644
--- a/app/code/Magento/Core/Model/TemplateEngine/Factory.php
+++ b/downloader/lib/Magento/Backup/Db/BackupFactory.php
@@ -1,7 +1,5 @@
<?php
/**
- * Factory that is able to create any template engine in the system
- *
* Magento
*
* NOTICE OF LICENSE
@@ -23,50 +21,61 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\TemplateEngine;
+namespace Magento\Backup\Db;
-class Factory
+class BackupFactory
{
/**
+ * Object manager
+ *
* @var \Magento\ObjectManager
*/
- protected $_objectManager;
+ private $_objectManager;
+
+ /**
+ * @var string
+ */
+ private $_backupInstanceName;
/**
- * @var array
+ * @var string
*/
- protected $_engines;
+ private $_backupDbInstanceName;
/**
* @param \Magento\ObjectManager $objectManager
- * @param array $engines Format: array('<name>' => 'TemplateEngine\Class', ...)
+ * @param string $backupInstanceName
+ * @param string $backupDbInstanceName
*/
public function __construct(
\Magento\ObjectManager $objectManager,
- array $engines
+ $backupInstanceName,
+ $backupDbInstanceName
) {
$this->_objectManager = $objectManager;
- $this->_engines = $engines;
+ $this->_backupInstanceName = $backupInstanceName;
+ $this->_backupDbInstanceName = $backupDbInstanceName;
+ }
+
+ /**
+ * Create backup model
+ *
+ * @param array $arguments
+ * @return \Magento\Backup\Db\BackupInterface
+ */
+ public function createBackupModel(array $arguments = array())
+ {
+ return $this->_objectManager->create($this->_backupInstanceName, $arguments);
}
/**
- * Retrieve a template engine instance by its unique name
+ * Create backup Db model
*
- * @param string $name
- * @return \Magento\Core\Model\TemplateEngine\EngineInterface
- * @throws \InvalidArgumentException If template engine doesn't exist
- * @throws \UnexpectedValueException If template engine doesn't implement the necessary interface
+ * @param array $arguments
+ * @return \Magento\Backup\Db\BackupDbInterface
*/
- public function create($name)
+ public function createBackupDbModel(array $arguments = array())
{
- if (!isset($this->_engines[$name])) {
- throw new \InvalidArgumentException("Unknown template engine '$name'.");
- }
- $engineClass = $this->_engines[$name];
- $engineInstance = $this->_objectManager->create($engineClass);
- if (!($engineInstance instanceof \Magento\Core\Model\TemplateEngine\EngineInterface)) {
- throw new \UnexpectedValueException("$engineClass has to implement the template engine interface.");
- }
- return $engineInstance;
+ return $this->_objectManager->create($this->_backupDbInstanceName, $arguments);
}
}
diff --git a/downloader/lib/Magento/Backup/Db/BackupInterface.php b/downloader/lib/Magento/Backup/Db/BackupInterface.php
new file mode 100644
index 00000000000..4c1e0ba5f2a
--- /dev/null
+++ b/downloader/lib/Magento/Backup/Db/BackupInterface.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Backup\Db;
+
+interface BackupInterface
+{
+ /**
+ * Set backup time
+ *
+ * @param int $time
+ * @return \Magento\Backup\Db\BackupInterface
+ */
+ public function setTime($time);
+
+ /**
+ * Set backup type
+ *
+ * @param string $type
+ * @return \Magento\Backup\Db\BackupInterface
+ */
+ public function setType($type);
+
+ /**
+ * Set backup path
+ *
+ * @param string $path
+ * @return \Magento\Backup\Db\BackupInterface
+ */
+ public function setPath($path);
+
+ /**
+ * Set backup name
+ *
+ * @param string $name
+ * @return \Magento\Backup\Db\BackupInterface
+ */
+ public function setName($name);
+
+ /**
+ * Open backup file (write or read mode)
+ *
+ * @param bool $write
+ * @return \Magento\Backup\Db\BackupInterface
+ */
+ public function open($write = false);
+
+ /**
+ * Write to backup file
+ *
+ * @param string $data
+ * @return \Magento\Backup\Db\BackupInterface
+ */
+ public function write($data);
+
+ /**
+ * Close open backup file
+ *
+ * @return \Magento\Backup\Db\BackupInterface
+ */
+ public function close();
+}
diff --git a/downloader/lib/Magento/Backup/Exception/CantLoadSnapshot.php b/downloader/lib/Magento/Backup/Exception/CantLoadSnapshot.php
index ebfe37024fa..d2eb5e4f2dc 100755
--- a/downloader/lib/Magento/Backup/Exception/CantLoadSnapshot.php
+++ b/downloader/lib/Magento/Backup/Exception/CantLoadSnapshot.php
@@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package \Magento\Backup
+ * @category Magento
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,11 +28,11 @@
* \Exception
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Exception;
-class CantLoadSnapshot extends \Magento\Backup\Exception
+class CantLoadSnapshot extends \Magento\Backup\BackupException
{
}
diff --git a/downloader/lib/Magento/Backup/Exception/FtpConnectionFailed.php b/downloader/lib/Magento/Backup/Exception/FtpConnectionFailed.php
index f2464466b4d..db618b538d4 100755
--- a/downloader/lib/Magento/Backup/Exception/FtpConnectionFailed.php
+++ b/downloader/lib/Magento/Backup/Exception/FtpConnectionFailed.php
@@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package \Magento\Backup
+ * @category Magento
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,11 +28,11 @@
* \Exception
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Exception;
-class FtpConnectionFailed extends \Magento\Backup\Exception
+class FtpConnectionFailed extends \Magento\Backup\BackupException
{
}
diff --git a/downloader/lib/Magento/Backup/Exception/FtpValidationFailed.php b/downloader/lib/Magento/Backup/Exception/FtpValidationFailed.php
index 0aea5c4cd99..2bc7c7a2956 100755
--- a/downloader/lib/Magento/Backup/Exception/FtpValidationFailed.php
+++ b/downloader/lib/Magento/Backup/Exception/FtpValidationFailed.php
@@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package \Magento\Backup
+ * @category Magento
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,11 +28,11 @@
* \Exception
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Exception;
-class FtpValidationFailed extends \Magento\Backup\Exception
+class FtpValidationFailed extends \Magento\Backup\BackupException
{
}
diff --git a/downloader/lib/Magento/Backup/Exception/NotEnoughFreeSpace.php b/downloader/lib/Magento/Backup/Exception/NotEnoughFreeSpace.php
index 782daa38889..4f8f7d234ab 100755
--- a/downloader/lib/Magento/Backup/Exception/NotEnoughFreeSpace.php
+++ b/downloader/lib/Magento/Backup/Exception/NotEnoughFreeSpace.php
@@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package \Magento\Backup
+ * @category Magento
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,11 +28,11 @@
* \Exception
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Exception;
-class NotEnoughFreeSpace extends \Magento\Backup\Exception
+class NotEnoughFreeSpace extends \Magento\Backup\BackupException
{
}
diff --git a/downloader/lib/Magento/Backup/Exception/NotEnoughPermissions.php b/downloader/lib/Magento/Backup/Exception/NotEnoughPermissions.php
index e17037684f1..64ddbdad716 100755
--- a/downloader/lib/Magento/Backup/Exception/NotEnoughPermissions.php
+++ b/downloader/lib/Magento/Backup/Exception/NotEnoughPermissions.php
@@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package \Magento\Backup
+ * @category Magento
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,11 +28,11 @@
* \Exception
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Exception;
-class NotEnoughPermissions extends \Magento\Backup\Exception
+class NotEnoughPermissions extends \Magento\Backup\BackupException
{
}
diff --git a/downloader/lib/Magento/Backup/Factory.php b/downloader/lib/Magento/Backup/Factory.php
new file mode 100644
index 00000000000..4001ecf1d80
--- /dev/null
+++ b/downloader/lib/Magento/Backup/Factory.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Backup object factory.
+ *
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Backup;
+
+class Factory
+{
+ /**
+ * Object manager
+ *
+ * @var \Magento\ObjectManager
+ */
+ private $_objectManager;
+
+ /**
+ * List of supported a backup types
+ *
+ * @var array
+ */
+ private $_allowedTypes = array('db', 'snapshot', 'filesystem', 'media', 'nomedia');
+
+ /**
+ * @param \Magento\ObjectManager $objectManager
+ */
+ public function __construct(\Magento\ObjectManager $objectManager)
+ {
+ $this->_objectManager = $objectManager;
+ }
+
+ /**
+ * Create new backup instance
+ *
+ * @param string $type
+ * @return \Magento\Backup\BackupInterface
+ * @throws \Magento\Exception
+ */
+ public function create($type)
+ {
+ if (!in_array($type, $this->_allowedTypes)) {
+ throw new \Magento\Exception('Current implementation not supported this type (' . $type . ') of backup.');
+ }
+ $class = 'Magento\Backup\\' . ucfirst($type);
+ return $this->_objectManager->create($class);
+ }
+}
diff --git a/downloader/lib/Magento/Backup/Filesystem.php b/downloader/lib/Magento/Backup/Filesystem.php
index d5fcee8129b..450192c6b81 100755
--- a/downloader/lib/Magento/Backup/Filesystem.php
+++ b/downloader/lib/Magento/Backup/Filesystem.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Class to work with filesystem backups
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup;
@@ -196,8 +196,7 @@ class Filesystem extends \Magento\Backup\AbstractBackup
if (!in_array($paths, $this->_ignorePaths)) {
$this->_ignorePaths[] = $paths;
}
- }
- else if (is_array($paths)) {
+ } else if (is_array($paths)) {
foreach ($paths as $path) {
$this->addIgnorePaths($path);
}
@@ -219,7 +218,7 @@ class Filesystem extends \Magento\Backup\AbstractBackup
/**
* Set directory where backups saved and add it to ignore paths
*
- * @see \Magento\Backup\AbstractBackupBackup::setBackupsDir()
+ * @see \Magento\Backup\AbstractBackup::setBackupsDir()
* @param string $backupsDir
* @return \Magento\Backup\Filesystem
*/
diff --git a/downloader/lib/Magento/Backup/Filesystem/Helper.php b/downloader/lib/Magento/Backup/Filesystem/Helper.php
index 282a903d78f..ad992b7d3d8 100755
--- a/downloader/lib/Magento/Backup/Filesystem/Helper.php
+++ b/downloader/lib/Magento/Backup/Filesystem/Helper.php
@@ -18,17 +18,17 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package \Magento\Backup
+ * @category Magento
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Filesystem helper for \Magento\Backup library
+ * Filesystem helper
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Filesystem;
@@ -121,6 +121,10 @@ class Helper
$iterator = new \Magento\Backup\Filesystem\Iterator\Filter($filesystemIterator, $skipFiles);
foreach ($iterator as $item) {
+ if ($item->isLink()) {
+ continue;
+ }
+
if (($infoOptions & self::INFO_WRITABLE) && !$item->isWritable()) {
$info['writable'] = false;
}
diff --git a/downloader/lib/Magento/Backup/Filesystem/Iterator/File.php b/downloader/lib/Magento/Backup/Filesystem/Iterator/File.php
index de1d4902b5c..9cd75a9a0b5 100644
--- a/downloader/lib/Magento/Backup/Filesystem/Iterator/File.php
+++ b/downloader/lib/Magento/Backup/Filesystem/Iterator/File.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,7 +29,7 @@
* File lines iterator
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Filesystem\Iterator;
diff --git a/downloader/lib/Magento/Backup/Filesystem/Iterator/Filter.php b/downloader/lib/Magento/Backup/Filesystem/Iterator/Filter.php
index ed20e313340..61b744a736b 100755
--- a/downloader/lib/Magento/Backup/Filesystem/Iterator/Filter.php
+++ b/downloader/lib/Magento/Backup/Filesystem/Iterator/Filter.php
@@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package \Magento\Backup
+ * @category Magento
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Filter \Iterator
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Filesystem\Iterator;
diff --git a/downloader/lib/Magento/Backup/Filesystem/Rollback/AbstractRollback.php b/downloader/lib/Magento/Backup/Filesystem/Rollback/AbstractRollback.php
index 04e6fa262a7..14604eb7045 100644
--- a/downloader/lib/Magento/Backup/Filesystem/Rollback/AbstractRollback.php
+++ b/downloader/lib/Magento/Backup/Filesystem/Rollback/AbstractRollback.php
@@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package \Magento\Backup
+ * @category Magento
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Filesystem rollback workers abstract class
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Filesystem\Rollback;
diff --git a/downloader/lib/Magento/Backup/Filesystem/Rollback/Fs.php b/downloader/lib/Magento/Backup/Filesystem/Rollback/Fs.php
index fc685be98e9..f3864ee7bc0 100755
--- a/downloader/lib/Magento/Backup/Filesystem/Rollback/Fs.php
+++ b/downloader/lib/Magento/Backup/Filesystem/Rollback/Fs.php
@@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package \Magento\Backup
+ * @category Magento
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Rollback worker for rolling back via local filesystem
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Filesystem\Rollback;
diff --git a/downloader/lib/Magento/Backup/Filesystem/Rollback/Ftp.php b/downloader/lib/Magento/Backup/Filesystem/Rollback/Ftp.php
index 6e5cc562f0e..6733d5e1c74 100755
--- a/downloader/lib/Magento/Backup/Filesystem/Rollback/Ftp.php
+++ b/downloader/lib/Magento/Backup/Filesystem/Rollback/Ftp.php
@@ -18,8 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package \Magento\Backup
+ * @category Magento
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Rollback worker for rolling back via ftp
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Filesystem\Rollback;
@@ -182,6 +182,10 @@ class Ftp extends \Magento\Backup\Filesystem\Rollback\AbstractRollback
$ftpPath = $this->_snapshot->getFtpPath() . DS . str_replace($tmpDir, '', $item->__toString());
$ftpPath = str_replace(DS, '/', $ftpPath);
+ if ($item->isLink()) {
+ continue;
+ }
+
if ($item->isDir()) {
$this->_ftpClient->mkdirRecursive($ftpPath);
} else {
diff --git a/downloader/lib/Magento/Backup/Media.php b/downloader/lib/Magento/Backup/Media.php
index 1f861bb0fe9..78d99dedac6 100644
--- a/downloader/lib/Magento/Backup/Media.php
+++ b/downloader/lib/Magento/Backup/Media.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Class to work media folder and database backups
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup;
diff --git a/downloader/lib/Magento/Backup/Nomedia.php b/downloader/lib/Magento/Backup/Nomedia.php
index bc06c047198..378708a207e 100755
--- a/downloader/lib/Magento/Backup/Nomedia.php
+++ b/downloader/lib/Magento/Backup/Nomedia.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Class to work system backup that excludes media folder
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup;
diff --git a/downloader/lib/Magento/Backup/Snapshot.php b/downloader/lib/Magento/Backup/Snapshot.php
index c765c5e11ca..c971c2ae51c 100755
--- a/downloader/lib/Magento/Backup/Snapshot.php
+++ b/downloader/lib/Magento/Backup/Snapshot.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Class to work with full filesystem and database backups
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup;
@@ -42,10 +42,34 @@ class Snapshot extends \Magento\Backup\Filesystem
*/
protected $_dbBackupManager;
+ /**
+ * Dirs instance
+ *
+ * @var \Magento\Core\Model\Dir
+ */
+ protected $_dirs;
+
+ /**
+ * @var \Magento\Backup\Factory
+ */
+ protected $_backupFactory;
+
+ /**
+ * @param \Magento\Core\Model\Dir $dirs
+ * @param \Magento\Backup\Factory $backupFactory
+ */
+ public function __construct(
+ \Magento\Core\Model\Dir $dirs,
+ \Magento\Backup\Factory $backupFactory
+ ) {
+ $this->_dirs = $dirs;
+ $this->_backupFactory = $backupFactory;
+ }
+
/**
* Implementation Rollback functionality for Snapshot
*
- * @throws \Magento\Exception
+ * @throws \Exception
* @return bool
*/
public function rollback()
@@ -70,7 +94,7 @@ class Snapshot extends \Magento\Backup\Filesystem
/**
* Implementation Create Backup functionality for Snapshot
*
- * @throws \Magento\Exception
+ * @throws \Exception
* @return bool
*/
public function create()
@@ -109,10 +133,10 @@ class Snapshot extends \Magento\Backup\Filesystem
*/
protected function _createDbBackupInstance()
{
- return \Magento\Backup::getBackupInstance(\Magento\Backup\Helper\Data::TYPE_DB)
+ return $this->_backupFactory->create(\Magento\Backup\Helper\Data::TYPE_DB)
->setBackupExtension('gz')
->setTime($this->getTime())
- ->setBackupsDir(\Mage::getBaseDir("var"))
+ ->setBackupsDir($this->_dirs->getDir('var'))
->setResourceModel($this->getResourceModel());
}
@@ -157,7 +181,8 @@ class Snapshot extends \Magento\Backup\Filesystem
*
* @return \Magento\Backup\Snapshot
*/
- protected function _removeDbBackup(){
+ protected function _removeDbBackup()
+ {
@unlink($this->_getDbBackupManager()->getBackupPath());
return $this;
}
diff --git a/app/design/frontend/magento_plushe/Magento_Reports/layout/override/print.xml b/downloader/template/copyright.phtml
similarity index 87%
rename from app/design/frontend/magento_plushe/Magento_Reports/layout/override/print.xml
rename to downloader/template/copyright.phtml
index 6c60196129d..913b04e48f9 100644
--- a/app/design/frontend/magento_plushe/Magento_Reports/layout/override/print.xml
+++ b/downloader/template/copyright.phtml
@@ -1,5 +1,4 @@
-<?xml version="1.0"?>
-<!--
+<?php
/**
* Magento
*
@@ -22,5 +21,5 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
+?>
+<?php echo __('Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved.', date('Y')) ?>
diff --git a/downloader/template/footer.phtml b/downloader/template/footer.phtml
index 55d9f1bf0a1..036f52548d7 100755
--- a/downloader/template/footer.phtml
+++ b/downloader/template/footer.phtml
@@ -33,7 +33,7 @@
<script type="text/javascript">
$('bug_tracking_link').target = "varien_external";
</script>
- Magento® is a trademark of X.commerce, Inc. Copyright © 2012 X.commerce, Inc.
+ <?php echo $this->template('copyright.phtml'); ?>
</p>
</div>
</body>
diff --git a/downloader/template/install/footer.phtml b/downloader/template/install/footer.phtml
index fc037af4384..882fbc072be 100644
--- a/downloader/template/install/footer.phtml
+++ b/downloader/template/install/footer.phtml
@@ -41,7 +41,8 @@
<script type="text/javascript">
$('bug_tracking_link').target = "varien_external";
</script>
- Magento® is a trademark of X.commerce, Inc. Copyright © 2012 X.commerce, Inc.</p>
+ <?php echo $this->template('copyright.phtml'); ?>
+ </p>
</div>
</div>
<!-- [end] footer -->
diff --git a/lib/Magento/Archive.php b/lib/Magento/Archive.php
index 25e10cd0555..cca7837ce70 100644
--- a/lib/Magento/Archive.php
+++ b/lib/Magento/Archive.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Class to work with archives
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento;
diff --git a/lib/Magento/Archive/AbstractArchive.php b/lib/Magento/Archive/AbstractArchive.php
index f5608ddd2bb..24a384c1858 100644
--- a/lib/Magento/Archive/AbstractArchive.php
+++ b/lib/Magento/Archive/AbstractArchive.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Class to work with archives
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Archive;
diff --git a/lib/Magento/Archive/ArchiveInterface.php b/lib/Magento/Archive/ArchiveInterface.php
index accf8e0de58..a83e726d2b0 100644
--- a/lib/Magento/Archive/ArchiveInterface.php
+++ b/lib/Magento/Archive/ArchiveInterface.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Interface for work with archives
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Archive;
diff --git a/lib/Magento/Archive/Bz.php b/lib/Magento/Archive/Bz.php
index e120c7ca455..ea48d4668a6 100644
--- a/lib/Magento/Archive/Bz.php
+++ b/lib/Magento/Archive/Bz.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Class to work with bzip2 archives
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Archive;
diff --git a/lib/Magento/Archive/Gz.php b/lib/Magento/Archive/Gz.php
index f841dc1a6e1..cd7b3e59159 100644
--- a/lib/Magento/Archive/Gz.php
+++ b/lib/Magento/Archive/Gz.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Class to work with gz archives
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Archive;
diff --git a/lib/Magento/Archive/Helper/File.php b/lib/Magento/Archive/Helper/File.php
index 9a554c17050..3a08f844436 100644
--- a/lib/Magento/Archive/Helper/File.php
+++ b/lib/Magento/Archive/Helper/File.php
@@ -19,16 +19,13 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
* Helper class that simplifies files stream reading and writing
-*
-* @category Magento* @package \Magento\Archive
-* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Archive\Helper;
diff --git a/lib/Magento/Archive/Helper/File/Bz.php b/lib/Magento/Archive/Helper/File/Bz.php
index b5ad7479357..52671719d94 100644
--- a/lib/Magento/Archive/Helper/File/Bz.php
+++ b/lib/Magento/Archive/Helper/File/Bz.php
@@ -18,17 +18,13 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento * @package \Magento\Archive
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
-* Helper class that simplifies bz2 files stream reading and writing
-*
-* @category Magento* @package \Magento\Archive
-* @author Magento Core Team <core@magentocommerce.com>
-*/
+ * Helper class that simplifies bz2 files stream reading and writing
+ */
namespace Magento\Archive\Helper\File;
class Bz extends \Magento\Archive\Helper\File
diff --git a/lib/Magento/Archive/Helper/File/Gz.php b/lib/Magento/Archive/Helper/File/Gz.php
index c493dc882ad..9aa0af14bbb 100644
--- a/lib/Magento/Archive/Helper/File/Gz.php
+++ b/lib/Magento/Archive/Helper/File/Gz.php
@@ -18,16 +18,12 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento * @package \Magento\Archive
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
* Helper class that simplifies gz files stream reading and writing
-*
-* @category Magento* @package \Magento\Archive
-* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Archive\Helper\File;
diff --git a/lib/Magento/Archive/Tar.php b/lib/Magento/Archive/Tar.php
index ed860c1f156..d0cb245011b 100644
--- a/lib/Magento/Archive/Tar.php
+++ b/lib/Magento/Archive/Tar.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Class to work with tar archives
*
* @category Magento
- * @package \Magento\Archive
+ * @package Magento_Archive
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Archive;
diff --git a/lib/Magento/Backup/AbstractBackup.php b/lib/Magento/Backup/AbstractBackup.php
index 43455adea38..da7e8ede317 100644
--- a/lib/Magento/Backup/AbstractBackup.php
+++ b/lib/Magento/Backup/AbstractBackup.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -27,7 +27,7 @@
* Class to work with archives
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup;
diff --git a/lib/Magento/Backup/Archive/Tar.php b/lib/Magento/Backup/Archive/Tar.php
index e0dbcee3767..0c084336f8f 100644
--- a/lib/Magento/Backup/Archive/Tar.php
+++ b/lib/Magento/Backup/Archive/Tar.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Extended version of \Magento\Archive\Tar that supports filtering
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Archive;
diff --git a/lib/Magento/Backup/BackupException.php b/lib/Magento/Backup/BackupException.php
index 6bb2844dbdf..89671781590 100644
--- a/lib/Magento/Backup/BackupException.php
+++ b/lib/Magento/Backup/BackupException.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* \Exception
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup;
diff --git a/lib/Magento/Backup/BackupInterface.php b/lib/Magento/Backup/BackupInterface.php
index 86a30b958fe..6df166caa59 100644
--- a/lib/Magento/Backup/BackupInterface.php
+++ b/lib/Magento/Backup/BackupInterface.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Interface for work with archives
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup;
diff --git a/lib/Magento/Backup/Db.php b/lib/Magento/Backup/Db.php
index 879d9e01e8a..93f221b8b14 100644
--- a/lib/Magento/Backup/Db.php
+++ b/lib/Magento/Backup/Db.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Class to work with database backups
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup;
diff --git a/lib/Magento/Backup/Exception/CantLoadSnapshot.php b/lib/Magento/Backup/Exception/CantLoadSnapshot.php
index a174922e798..d2eb5e4f2dc 100644
--- a/lib/Magento/Backup/Exception/CantLoadSnapshot.php
+++ b/lib/Magento/Backup/Exception/CantLoadSnapshot.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* \Exception
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Exception;
diff --git a/lib/Magento/Backup/Exception/FtpConnectionFailed.php b/lib/Magento/Backup/Exception/FtpConnectionFailed.php
index d9b27437c63..db618b538d4 100644
--- a/lib/Magento/Backup/Exception/FtpConnectionFailed.php
+++ b/lib/Magento/Backup/Exception/FtpConnectionFailed.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* \Exception
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Exception;
diff --git a/lib/Magento/Backup/Exception/FtpValidationFailed.php b/lib/Magento/Backup/Exception/FtpValidationFailed.php
index 42368968c61..2bc7c7a2956 100644
--- a/lib/Magento/Backup/Exception/FtpValidationFailed.php
+++ b/lib/Magento/Backup/Exception/FtpValidationFailed.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* \Exception
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Exception;
diff --git a/lib/Magento/Backup/Exception/NotEnoughFreeSpace.php b/lib/Magento/Backup/Exception/NotEnoughFreeSpace.php
index a50d72f865b..4f8f7d234ab 100644
--- a/lib/Magento/Backup/Exception/NotEnoughFreeSpace.php
+++ b/lib/Magento/Backup/Exception/NotEnoughFreeSpace.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* \Exception
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Exception;
diff --git a/lib/Magento/Backup/Exception/NotEnoughPermissions.php b/lib/Magento/Backup/Exception/NotEnoughPermissions.php
index 1413aa61e82..64ddbdad716 100644
--- a/lib/Magento/Backup/Exception/NotEnoughPermissions.php
+++ b/lib/Magento/Backup/Exception/NotEnoughPermissions.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* \Exception
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Exception;
diff --git a/lib/Magento/Backup/Filesystem.php b/lib/Magento/Backup/Filesystem.php
index b13be572851..450192c6b81 100644
--- a/lib/Magento/Backup/Filesystem.php
+++ b/lib/Magento/Backup/Filesystem.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Class to work with filesystem backups
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup;
diff --git a/lib/Magento/Backup/Filesystem/Helper.php b/lib/Magento/Backup/Filesystem/Helper.php
index 35f4e40af44..ad992b7d3d8 100644
--- a/lib/Magento/Backup/Filesystem/Helper.php
+++ b/lib/Magento/Backup/Filesystem/Helper.php
@@ -19,16 +19,16 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Filesystem helper for \Magento\Backup library
+ * Filesystem helper
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Filesystem;
diff --git a/lib/Magento/Backup/Filesystem/Iterator/File.php b/lib/Magento/Backup/Filesystem/Iterator/File.php
index de1d4902b5c..9cd75a9a0b5 100644
--- a/lib/Magento/Backup/Filesystem/Iterator/File.php
+++ b/lib/Magento/Backup/Filesystem/Iterator/File.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,7 +29,7 @@
* File lines iterator
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Filesystem\Iterator;
diff --git a/lib/Magento/Backup/Filesystem/Iterator/Filter.php b/lib/Magento/Backup/Filesystem/Iterator/Filter.php
index 679571e6306..61b744a736b 100644
--- a/lib/Magento/Backup/Filesystem/Iterator/Filter.php
+++ b/lib/Magento/Backup/Filesystem/Iterator/Filter.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Filter \Iterator
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Filesystem\Iterator;
diff --git a/lib/Magento/Backup/Filesystem/Rollback/AbstractRollback.php b/lib/Magento/Backup/Filesystem/Rollback/AbstractRollback.php
index fa3375f542a..14604eb7045 100644
--- a/lib/Magento/Backup/Filesystem/Rollback/AbstractRollback.php
+++ b/lib/Magento/Backup/Filesystem/Rollback/AbstractRollback.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Filesystem rollback workers abstract class
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Filesystem\Rollback;
diff --git a/lib/Magento/Backup/Filesystem/Rollback/Fs.php b/lib/Magento/Backup/Filesystem/Rollback/Fs.php
index 6e80b13c529..f3864ee7bc0 100644
--- a/lib/Magento/Backup/Filesystem/Rollback/Fs.php
+++ b/lib/Magento/Backup/Filesystem/Rollback/Fs.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Rollback worker for rolling back via local filesystem
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Filesystem\Rollback;
diff --git a/lib/Magento/Backup/Filesystem/Rollback/Ftp.php b/lib/Magento/Backup/Filesystem/Rollback/Ftp.php
index e30230a99c4..6733d5e1c74 100644
--- a/lib/Magento/Backup/Filesystem/Rollback/Ftp.php
+++ b/lib/Magento/Backup/Filesystem/Rollback/Ftp.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Rollback worker for rolling back via ftp
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup\Filesystem\Rollback;
diff --git a/lib/Magento/Backup/Media.php b/lib/Magento/Backup/Media.php
index 1f861bb0fe9..78d99dedac6 100644
--- a/lib/Magento/Backup/Media.php
+++ b/lib/Magento/Backup/Media.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Class to work media folder and database backups
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup;
diff --git a/lib/Magento/Backup/Nomedia.php b/lib/Magento/Backup/Nomedia.php
index bc06c047198..378708a207e 100644
--- a/lib/Magento/Backup/Nomedia.php
+++ b/lib/Magento/Backup/Nomedia.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Class to work system backup that excludes media folder
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup;
diff --git a/lib/Magento/Backup/Snapshot.php b/lib/Magento/Backup/Snapshot.php
index eba6efa4907..3a3e8bfaf6e 100644
--- a/lib/Magento/Backup/Snapshot.php
+++ b/lib/Magento/Backup/Snapshot.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Class to work with full filesystem and database backups
*
* @category Magento
- * @package \Magento\Backup
+ * @package Magento_Backup
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Backup;
diff --git a/lib/Magento/BootstrapException.php b/lib/Magento/BootstrapException.php
index 0c7b20d2a2f..0f8177b40e8 100644
--- a/lib/Magento/BootstrapException.php
+++ b/lib/Magento/BootstrapException.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Exception
+ * @package Magento_Exception
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/lib/Magento/Code/Reader/ClassReader.php b/lib/Magento/Code/Reader/ClassReader.php
index 40b6cb2b2e0..22a3d32bf2c 100644
--- a/lib/Magento/Code/Reader/ClassReader.php
+++ b/lib/Magento/Code/Reader/ClassReader.php
@@ -57,6 +57,7 @@ class ClassReader
}
}
}
+
return $result;
}
diff --git a/lib/Magento/Crypt.php b/lib/Magento/Crypt.php
index 41611c5e20f..687e753c4b3 100755
--- a/lib/Magento/Crypt.php
+++ b/lib/Magento/Crypt.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Crypt
+ * @package Magento_Crypt
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/lib/Magento/Data/Form.php b/lib/Magento/Data/Form.php
index 20ac9aac3b2..14a79742a72 100644
--- a/lib/Magento/Data/Form.php
+++ b/lib/Magento/Data/Form.php
@@ -37,6 +37,8 @@
*/
namespace Magento\Data;
+use \Magento\Core\Model\Session\AbstractSession;
+
class Form extends \Magento\Data\Form\AbstractForm
{
/**
@@ -47,7 +49,9 @@ class Form extends \Magento\Data\Form\AbstractForm
protected $_allElements;
/**
- * @var \Magento\Core\Model\Session
+ * Session instance
+ *
+ * @var \Magento\Core\Model\Session\AbstractSession
*/
protected $_session;
@@ -63,20 +67,43 @@ class Form extends \Magento\Data\Form\AbstractForm
static protected $_defaultFieldsetElementRenderer;
/**
- * @param \Magento\Core\Model\Session $session
* @param \Magento\Data\Form\Element\Factory $factoryElement
* @param \Magento\Data\Form\Element\CollectionFactory $factoryCollection
* @param array $attributes
*/
public function __construct(
- \Magento\Core\Model\Session $session,
\Magento\Data\Form\Element\Factory $factoryElement,
\Magento\Data\Form\Element\CollectionFactory $factoryCollection,
$attributes = array()
) {
parent::__construct($factoryElement, $factoryCollection, $attributes);
$this->_allElements = $this->_factoryCollection->create(array('container' => $this));
+ }
+
+ /**
+ * Set session instance
+ *
+ * @param \Magento\Core\Model\Session\AbstractSession $session
+ * @return \Magento\Data\Form
+ */
+ public function setSession(AbstractSession $session)
+ {
$this->_session = $session;
+ return $this;
+ }
+
+ /**
+ * Get session instance
+ *
+ * @return \Magento\Core\Model\Session\AbstractSession
+ * @throws \Magento\Exception
+ */
+ protected function _getSession()
+ {
+ if (null == $this->_session) {
+ throw new \Magento\Exception('Session is not set');
+ }
+ return $this->_session;
}
public static function setElementRenderer(\Magento\Data\Form\Element\Renderer\RendererInterface $renderer = null)
@@ -263,7 +290,7 @@ class Form extends \Magento\Data\Form\AbstractForm
$html .= '<div>';
if (strtolower($this->getData('method')) == 'post') {
$html .= '<input name="form_key" type="hidden" value="'
- . $this->_session->getFormKey()
+ . $this->_getSession()->getFormKey()
. '" />';
}
$html .= '</div>';
diff --git a/lib/Magento/Data/Form/Factory.php b/lib/Magento/Data/Form/Factory.php
new file mode 100644
index 00000000000..0e283cbfd90
--- /dev/null
+++ b/lib/Magento/Data/Form/Factory.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category Magento
+ * @package Magento_Data
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+namespace Magento\Data\Form;
+
+/**
+ * Form factory class
+ */
+class Factory
+{
+ /**
+ * Object Manager instance
+ *
+ * @var \Magento\ObjectManager
+ */
+ protected $_objectManager;
+
+ /**
+ * Instance name to create
+ *
+ * @var string
+ */
+ protected $_instanceName;
+
+ /**
+ * Session instance
+ *
+ * @var \Magento\Core\Model\Session\AbstractSession
+ */
+ protected $_session;
+
+ /**
+ * Factory construct
+ *
+ * @param \Magento\ObjectManager $objectManager
+ * @param \Magento\Core\Model\Session\AbstractSession $session
+ * @param string $instanceName
+ */
+ public function __construct(
+ \Magento\ObjectManager $objectManager,
+ \Magento\Core\Model\Session\AbstractSession $session,
+ $instanceName = 'Magento\Data\Form'
+ ) {
+ $this->_objectManager = $objectManager;
+ $this->_session = $session;
+ $this->_instanceName = $instanceName;
+ }
+
+ /**
+ * Create form instance
+ *
+ * @param array $data
+ * @return \Magento\Data\Form
+ * @throws \Magento\Exception
+ */
+ public function create(array $data = array())
+ {
+ /** @var $form \Magento\Data\Form */
+ $form = $this->_objectManager->create($this->_instanceName, $data);
+ if (!$form instanceof \Magento\Data\Form) {
+ throw new \Magento\Exception($this->_instanceName . ' doesn\'t extends \Magento\Data\Form');
+ }
+ $form->setSession($this->_session);
+ return $form;
+ }
+}
diff --git a/lib/Magento/Date.php b/lib/Magento/Date.php
index 93ded5504e0..12cb0993e78 100644
--- a/lib/Magento/Date.php
+++ b/lib/Magento/Date.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Date
+ * @package Magento_Date
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,7 +29,7 @@
* Internal dates
*
* @category Magento
- * @package \Magento\Date
+ * @package Magento_Date
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento;
diff --git a/lib/Magento/Debug.php b/lib/Magento/Debug.php
index 943f07bf75b..14052488d21 100644
--- a/lib/Magento/Debug.php
+++ b/lib/Magento/Debug.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Debug
+ * @package Magento_Debug
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Magento Debug methods
*
* @category Magento
- * @package \Magento\Debug
+ * @package Magento_Debug
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento;
diff --git a/lib/Magento/Event.php b/lib/Magento/Event.php
index f7e2b24abfd..3f25c5ecc2f 100644
--- a/lib/Magento/Event.php
+++ b/lib/Magento/Event.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Event
+ * @package Magento_Event
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,7 +29,7 @@
* Event object and dispatcher
*
* @category Magento
- * @package \Magento\Event
+ * @package Magento_Event
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento;
diff --git a/lib/Magento/Event/Collection.php b/lib/Magento/Event/Collection.php
index 7bdd3af5f7e..c351f4c9a05 100644
--- a/lib/Magento/Event/Collection.php
+++ b/lib/Magento/Event/Collection.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Event
+ * @package Magento_Event
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,7 +29,7 @@
* Collection of events
*
* @category Magento
- * @package \Magento\Event
+ * @package Magento_Event
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Event;
diff --git a/lib/Magento/Event/Observer.php b/lib/Magento/Event/Observer.php
index 2009f2ca3af..866b615a1d6 100644
--- a/lib/Magento/Event/Observer.php
+++ b/lib/Magento/Event/Observer.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Event
+ * @package Magento_Event
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/lib/Magento/Event/Observer/Collection.php b/lib/Magento/Event/Observer/Collection.php
index 8f03db6d40a..84a4d0bb6c2 100644
--- a/lib/Magento/Event/Observer/Collection.php
+++ b/lib/Magento/Event/Observer/Collection.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Event
+ * @package Magento_Event
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,7 +29,7 @@
* Event observer collection
*
* @category Magento
- * @package \Magento\Event
+ * @package Magento_Event
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Event\Observer;
diff --git a/lib/Magento/Event/Observer/Cron.php b/lib/Magento/Event/Observer/Cron.php
index c838c3c3177..dea97fda99e 100644
--- a/lib/Magento/Event/Observer/Cron.php
+++ b/lib/Magento/Event/Observer/Cron.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Event
+ * @package Magento_Event
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,7 +29,7 @@
* Event cron observer object
*
* @category Magento
- * @package \Magento\Event
+ * @package Magento_Event
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Event\Observer;
diff --git a/lib/Magento/Event/Observer/Regex.php b/lib/Magento/Event/Observer/Regex.php
index 0b5d95aada3..b28c16047d0 100644
--- a/lib/Magento/Event/Observer/Regex.php
+++ b/lib/Magento/Event/Observer/Regex.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Event
+ * @package Magento_Event
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,7 +29,7 @@
* Event regex observer object
*
* @category Magento
- * @package \Magento\Event
+ * @package Magento_Event
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento\Event\Observer;
diff --git a/lib/Magento/Exception.php b/lib/Magento/Exception.php
index 71d510dd305..ba06ba8e6f1 100644
--- a/lib/Magento/Exception.php
+++ b/lib/Magento/Exception.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Exception
+ * @package Magento_Exception
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/lib/Magento/Image.php b/lib/Magento/Image.php
index 3adf8fd1a1c..1e928cb45c4 100644
--- a/lib/Magento/Image.php
+++ b/lib/Magento/Image.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Image
+ * @package Magento_Image
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Image handler library
*
* @category Magento
- * @package \Magento\Image
+ * @package Magento_Image
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento;
diff --git a/lib/Magento/Image/Adapter/AbstractAdapter.php b/lib/Magento/Image/Adapter/AbstractAdapter.php
index 74c68ab317e..20fd1e04c83 100644
--- a/lib/Magento/Image/Adapter/AbstractAdapter.php
+++ b/lib/Magento/Image/Adapter/AbstractAdapter.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Image
+ * @package Magento_Image
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/lib/Magento/Image/Adapter/Gd2.php b/lib/Magento/Image/Adapter/Gd2.php
index 7ee8bab9f85..51601f7755f 100644
--- a/lib/Magento/Image/Adapter/Gd2.php
+++ b/lib/Magento/Image/Adapter/Gd2.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Image
+ * @package Magento_Image
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/lib/Magento/Image/Adapter/ImageMagick.php b/lib/Magento/Image/Adapter/ImageMagick.php
index 5744d1dd100..356c0965938 100644
--- a/lib/Magento/Image/Adapter/ImageMagick.php
+++ b/lib/Magento/Image/Adapter/ImageMagick.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Image
+ * @package Magento_Image
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/lib/Magento/Object.php b/lib/Magento/Object.php
index 9733ae20c7e..54357b6736d 100644
--- a/lib/Magento/Object.php
+++ b/lib/Magento/Object.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Object
+ * @package Magento_Object
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -29,7 +29,7 @@
* Universal data container with array access implementation
*
* @category Magento
- * @package \Magento\Object
+ * @package Magento_Object
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento;
diff --git a/lib/Magento/Object/Cache.php b/lib/Magento/Object/Cache.php
index 31d9e5ba8cc..b9018452bd7 100644
--- a/lib/Magento/Object/Cache.php
+++ b/lib/Magento/Object/Cache.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Object
+ * @package Magento_Object
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/lib/Magento/Object/Factory.php b/lib/Magento/Object/Factory.php
index 7c1cf9ea091..7dc1f3c9247 100644
--- a/lib/Magento/Object/Factory.php
+++ b/lib/Magento/Object/Factory.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Object
+ * @package Magento_Object
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/lib/Magento/Object/Mapper.php b/lib/Magento/Object/Mapper.php
index 85c49413cc4..845fe261feb 100644
--- a/lib/Magento/Object/Mapper.php
+++ b/lib/Magento/Object/Mapper.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Object
+ * @package Magento_Object
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/lib/Magento/ObjectManager.php b/lib/Magento/ObjectManager.php
index 20bb741ff32..cb9ece5ec7d 100644
--- a/lib/Magento/ObjectManager.php
+++ b/lib/Magento/ObjectManager.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\ObjectManager
+ * @package Magento_ObjectManager
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/lib/Magento/Pear.php b/lib/Magento/Pear.php
index 6de264999df..c576f34a659 100644
--- a/lib/Magento/Pear.php
+++ b/lib/Magento/Pear.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Pear
+ * @package Magento_Pear
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Pear package routines
* *
* @category Magento
- * @package \Magento\Pear
+ * @package Magento_Pear
* @author Magento Core Team <core@magentocommerce.com>
*/
namespace Magento;
diff --git a/lib/Magento/Pear/Frontend.php b/lib/Magento/Pear/Frontend.php
index 2f7806f75a7..1418ec05330 100644
--- a/lib/Magento/Pear/Frontend.php
+++ b/lib/Magento/Pear/Frontend.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Pear
+ * @package Magento_Pear
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Pear frontend routines
* *
* @category Magento
- * @package \Magento\Pear
+ * @package Magento_Pear
* @author Magento Core Team <core@magentocommerce.com>
*/
diff --git a/lib/Magento/Pear/Package.php b/lib/Magento/Pear/Package.php
index c8cf87fe091..49cd8cbfdf9 100644
--- a/lib/Magento/Pear/Package.php
+++ b/lib/Magento/Pear/Package.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Pear
+ * @package Magento_Pear
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Pear package routines
* *
* @category Magento
- * @package \Magento\Pear
+ * @package Magento_Pear
* @author Magento Core Team <core@magentocommerce.com>
*/
/*
diff --git a/lib/Magento/Pear/Registry.php b/lib/Magento/Pear/Registry.php
index 120377cbf63..29c75e31c1c 100644
--- a/lib/Magento/Pear/Registry.php
+++ b/lib/Magento/Pear/Registry.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Pear
+ * @package Magento_Pear
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
@@ -28,7 +28,7 @@
* Pear Registry
*
* @category Magento
- * @package \Magento\Pear
+ * @package Magento_Pear
* @author Magento Core Team <core@magentocommerce.com>
*/
diff --git a/lib/Magento/Shell.php b/lib/Magento/Shell.php
index 2011d0f8fe3..0ad15adac7c 100644
--- a/lib/Magento/Shell.php
+++ b/lib/Magento/Shell.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Shell
+ * @package Magento_Shell
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/lib/Magento/Validator.php b/lib/Magento/Validator.php
index 887f32d5a9a..5211ad685ea 100644
--- a/lib/Magento/Validator.php
+++ b/lib/Magento/Validator.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package \Magento\Validator
+ * @package Magento_Validator
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
diff --git a/lib/Magento/View/BlockPool.php b/lib/Magento/View/BlockPool.php
new file mode 100644
index 00000000000..585444e31d1
--- /dev/null
+++ b/lib/Magento/View/BlockPool.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\View;
+
+use Magento\View\Layout;
+use Magento\View\Element\BlockInterface;
+use Magento\Core\Model\BlockFactory;
+use Magento\ObjectManager;
+
+class BlockPool
+{
+ /**
+ * @var \Magento\Core\Model\BlockFactory
+ */
+ protected $blockFactory;
+
+ /**
+ * @var array
+ */
+ protected $blocks = array();
+
+ /**
+ * @param ObjectManager $objectManager
+ * @param BlockFactory $blockFactory
+ */
+ public function __construct(ObjectManager $objectManager, BlockFactory $blockFactory)
+ {
+ $this->objectManager = $objectManager;
+ $this->blockFactory = $blockFactory;
+ }
+
+ /**
+ * @param string $name
+ * @param string $class
+ * @param array $arguments [optional]
+ * @return BlockPool
+ * @throws \InvalidArgumentException
+ */
+ public function add($name, $class, array $arguments = array())
+ {
+ if (!class_exists($class)) {
+ throw new \InvalidArgumentException(__('Invalid Block class name: ' . $class));
+ }
+
+ $block = $this->blockFactory->createBlock($class, $arguments);
+
+ $this->blocks[$name] = $block;
+
+ return $this;
+ }
+
+ /**
+ * @param string $name
+ * @return BlockInterface | null
+ */
+ public function get($name = null)
+ {
+ if (!isset($name)) {
+ return $this->blocks;
+ }
+
+ return isset($this->blocks[$name]) ? $this->blocks[$name] : null;
+ }
+}
diff --git a/lib/Magento/View/Context.php b/lib/Magento/View/Context.php
new file mode 100644
index 00000000000..911ce27216f
--- /dev/null
+++ b/lib/Magento/View/Context.php
@@ -0,0 +1,510 @@
+<?php
+/**
+ * Application Runtime Context
+ *
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\View;
+
+use Magento\App\Request\Http as Request;
+use Magento\App\FrontControllerInterface;
+
+use Magento\Core\Model\Translate;
+use Magento\Core\Model\Store\Config as StoreConfig;
+use Magento\Core\Model\Factory\Helper as FactoryHelper;
+use Magento\Core\Model\View\Url as ViewUrl;
+use Magento\View\ConfigInterface as ViewConfig;
+use Magento\Core\Model\Logger;
+use Magento\Core\Model\App;
+use Magento\App\State as AppState;
+
+use Magento\Core\Model\Session\AbstractSession;
+use Magento\Core\Model\CacheInterface as Cache;
+use Magento\Core\Model\Cache\StateInterface as CacheState;
+use Magento\UrlInterface;
+use Magento\Event\ManagerInterface;
+
+/**
+ * @todo Reduce fields number
+ * @todo Reduce class dependencies
+ *
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class Context
+{
+ /**
+ * @var Request
+ */
+ protected $request;
+
+ /**
+ * @var ManagerInterface
+ */
+ protected $eventManager;
+
+ /**
+ * @var \Magento\UrlInterface
+ */
+ protected $urlBuilder;
+
+ /**
+ * @var \Magento\Core\Model\Translate
+ */
+ protected $translator;
+
+ /**
+ * @var \Magento\Core\Model\CacheInterface
+ */
+ protected $cache;
+
+ /**
+ * @var \Magento\Core\Model\View\Design
+ */
+ protected $design;
+
+ /**
+ * @var \Magento\Core\Model\Session
+ */
+ protected $session;
+
+ /**
+ * @var \Magento\Core\Model\Store\Config
+ */
+ protected $storeConfig;
+
+ /**
+ * @var FrontControllerInterface
+ */
+ protected $frontController;
+
+ /**
+ * @var \Magento\Core\Model\Factory\Helper
+ */
+ protected $helperFactory;
+
+ /**
+ * @var \Magento\Core\Model\View\Url
+ */
+ protected $viewUrl;
+
+ /**
+ * View config model
+ *
+ * @var \Magento\Core\Model\View\Config
+ */
+ protected $viewConfig;
+
+ /**
+ * @var \Magento\Core\Model\Cache\StateInterface
+ */
+ protected $cacheState;
+
+ /**
+ * @var \Magento\Core\Model\Logger
+ */
+ protected $logger;
+
+ /**
+ * @var \Magento\Core\Model\App
+ */
+ protected $app;
+
+ /**
+ * @var \Magento\App\State
+ */
+ protected $appState;
+
+ /**
+ * @param Request $request
+ * @param ManagerInterface $eventManager
+ * @param UrlInterface $urlBuilder
+ * @param Translate $translator
+ * @param Cache $cache
+ * @param DesignInterface $design
+ * @param AbstractSession $session
+ * @param StoreConfig $storeConfig
+ * @param FrontControllerInterface $frontController
+ * @param FactoryHelper $helperFactory
+ * @param ViewUrl $viewUrl
+ * @param ViewConfig $viewConfig
+ * @param CacheState $cacheState
+ * @param Logger $logger
+ * @param App $app
+ * @param AppState $appState
+ * @todo reduce parameter number
+ *
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+ */
+ public function __construct(
+ Request $request,
+ ManagerInterface $eventManager,
+ UrlInterface $urlBuilder,
+ Translate $translator,
+ Cache $cache,
+ DesignInterface $design,
+ AbstractSession $session,
+ StoreConfig $storeConfig,
+ FrontControllerInterface $frontController,
+ FactoryHelper $helperFactory,
+ ViewUrl $viewUrl,
+ ViewConfig $viewConfig,
+ CacheState $cacheState,
+ Logger $logger,
+ App $app,
+ AppState $appState
+ ) {
+ $this->request = $request;
+ $this->eventManager = $eventManager;
+ $this->urlBuilder = $urlBuilder;
+ $this->translator = $translator;
+ $this->cache = $cache;
+ $this->design = $design;
+ $this->session = $session;
+ $this->storeConfig = $storeConfig;
+ $this->frontController = $frontController;
+ $this->helperFactory = $helperFactory;
+ $this->viewUrl = $viewUrl;
+ $this->viewConfig = $viewConfig;
+ $this->cacheState = $cacheState;
+ $this->logger = $logger;
+ $this->app = $app;
+ $this->appState = $appState;
+ }
+
+ /**
+ * @return \Magento\Core\Model\CacheInterface
+ */
+ public function getCache()
+ {
+ return $this->cache;
+ }
+
+ /**
+ * @return \Magento\Core\Model\View\Design
+ */
+ public function getDesignPackage()
+ {
+ return $this->design;
+ }
+
+ /**
+ * @return ManagerInterface
+ */
+ public function getEventManager()
+ {
+ return $this->eventManager;
+ }
+
+ /**
+ * @return FrontControllerInterface
+ */
+ public function getFrontController()
+ {
+ return $this->frontController;
+ }
+
+ /**
+ * @return \Magento\Core\Model\Factory\Helper
+ */
+ public function getHelperFactory()
+ {
+ return $this->helperFactory;
+ }
+
+ /**
+ * @return \Magento\View\LayoutInterface
+ */
+ public function getLayout()
+ {
+ return $this->layout;
+ }
+
+ /**
+ * @return Request
+ */
+ public function getRequest()
+ {
+ return $this->request;
+ }
+
+ /**
+ * @return \Magento\Core\Model\Session|\Magento\Core\Model\Session\AbstractSession
+ */
+ public function getSession()
+ {
+ return $this->session;
+ }
+
+ /**
+ * @return \Magento\Core\Model\Store\Config
+ */
+ public function getStoreConfig()
+ {
+ return $this->storeConfig;
+ }
+
+ /**
+ * @return \Magento\Core\Model\Translate
+ */
+ public function getTranslator()
+ {
+ return $this->translator;
+ }
+
+ /**
+ * @return \Magento\UrlInterface
+ */
+ public function getUrlBuilder()
+ {
+ return $this->urlBuilder;
+ }
+
+ /**
+ * @return \Magento\Core\Model\View\Url
+ */
+ public function getViewUrl()
+ {
+ return $this->viewUrl;
+ }
+
+ /**
+ * @return \Magento\View\ConfigInterface
+ */
+ public function getViewConfig()
+ {
+ return $this->viewConfig;
+ }
+
+ /**
+ * @return \Magento\Core\Model\Cache\StateInterface
+ */
+ public function getCacheState()
+ {
+ return $this->cacheState;
+ }
+
+ /**
+ * @return \Magento\Core\Model\Logger
+ */
+ public function getLogger()
+ {
+ return $this->logger;
+ }
+
+ /**
+ * @return \Magento\Core\Model\App
+ */
+ public function getApp()
+ {
+ return $this->app;
+ }
+
+ /**
+ * Retrieve layout area
+ *
+ * @return string
+ */
+ public function getArea()
+ {
+ return $this->app->getLayout()->getArea();
+ }
+
+ /**
+ * Retrieve the module name
+ *
+ * @return string
+ */
+ public function getModuleName()
+ {
+ return $this->getRequest()->getModuleName();
+ }
+
+ /**
+ * Retrieve the module name
+ *
+ * @return string
+ * @todo alias of getModuleName
+ */
+ public function getFrontName()
+ {
+ return $this->getRequest()->getModuleName();
+ }
+
+ /**
+ * Retrieve the controller name
+ *
+ * @return string
+ */
+ public function getControllerName()
+ {
+ return $this->getRequest()->getControllerName();
+ }
+
+ /**
+ * Retrieve the action name
+ *
+ * @return string
+ */
+ public function getActionName()
+ {
+ return $this->getRequest()->getActionName();
+ }
+
+ /**
+ * Retrieve the full action name
+ *
+ * @return string
+ */
+ public function getFullActionName()
+ {
+ return strtolower($this->getFrontName() . '_' . $this->getControllerName() . '_' . $this->getActionName());
+ }
+
+ /**
+ * @return string
+ */
+ public function getAcceptType()
+ {
+ // TODO: do intelligence here
+ $type = $this->getHeader('Accept', 'html');
+ if (strpos($type, 'json') !== false) {
+ return 'json';
+ } elseif (strpos($type, 'soap') !== false) {
+ return 'soap';
+ } elseif (strpos($type, 'text/html') !== false) {
+ return 'html';
+ } else {
+ return 'xml';
+ }
+ }
+
+ /**
+ * Retrieve a member of the $_POST superglobal
+ *
+ * @param string $key
+ * @param mixed $default Default value to use if key not found
+ * @return mixed Returns null if key does not exist
+ */
+ public function getPost($key = null, $default = null)
+ {
+ return $this->getRequest()->getPost($key, $default);
+ }
+
+ /**
+ * Retrieve a member of the $_POST superglobal
+ *
+ * @param string $key
+ * @param mixed $default Default value to use if key not found
+ * @return mixed alias of getPost
+ */
+ public function getQuery($key = null, $default = null)
+ {
+ return $this->getRequest()->getPost($key, $default);
+ }
+
+ /**
+ * Retrieve a parameter
+ *
+ * @param mixed $key
+ * @param mixed $default Default value to use if key not found
+ * @return mixed
+ */
+ public function getParam($key = null, $default = null)
+ {
+ return $this->getRequest()->getParam($key, $default);
+ }
+
+ /**
+ * Retrieve an array of parameters
+ *
+ * @return array
+ */
+ public function getParams()
+ {
+ return $this->getRequest()->getParams();
+ }
+
+ /**
+ * Return the value of the given HTTP header.
+ *
+ * @param $header
+ * @return string|false HTTP header value, or false if not found
+ */
+ public function getHeader($header)
+ {
+ return $this->getRequest()->getHeader($header);
+ }
+
+ /**
+ * Return the raw body of the request, if present
+ *
+ * @return string|false Raw body, or false if not present
+ */
+ public function getRawBody()
+ {
+ return $this->getRequest()->getRawBody();
+ }
+
+ /**
+ * @return \Magento\App\State
+ */
+ public function getAppState()
+ {
+ return $this->appState;
+ }
+
+ /**
+ * Retrieve design theme instance
+ *
+ * @return Design\ThemeInterface
+ */
+ public function getDesignTheme()
+ {
+ $theme = $this->design->getDesignTheme();
+ $theme->setCode('magento_plushe');
+ $theme->setThemePath('magento_plushe');
+ $theme->setId(8);
+
+ return $this->getPhysicalTheme($theme);
+ }
+
+ /**
+ * Retrieve parent theme instance
+ *
+ * @param Design\ThemeInterface $theme
+ * @return Design\ThemeInterface
+ * @throws \Exception
+ */
+ protected function getPhysicalTheme(Design\ThemeInterface $theme)
+ {
+ $result = $theme;
+ while ($result->getId() && !$result->isPhysical()) {
+ $result = $result->getParentTheme();
+ }
+ if (!$result) {
+ throw new \Exception("Unable to find a physical ancestor for a theme '{$theme->getThemeTitle()}'.");
+ }
+ return $result;
+ }
+}
diff --git a/lib/Magento/View/DataSourcePool.php b/lib/Magento/View/DataSourcePool.php
new file mode 100644
index 00000000000..e28205a73f6
--- /dev/null
+++ b/lib/Magento/View/DataSourcePool.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\View;
+
+use Magento\Core\Model\BlockFactory;
+
+class DataSourcePool
+{
+ /**
+ * @var \Magento\Core\Model\BlockFactory
+ */
+ protected $blockFactory;
+
+ /**
+ * @var array
+ */
+ protected $dataSources = array();
+
+ /**
+ * @var array
+ */
+ protected $assignments = array();
+
+ /**
+ * @param BlockFactory $blockFactory
+ */
+ public function __construct(BlockFactory $blockFactory)
+ {
+ $this->blockFactory = $blockFactory;
+ }
+
+ /**
+ * @param string $name
+ * @param string $class
+ * @return object
+ * @throws \Exception
+ */
+ public function add($name, $class)
+ {
+ if (!isset($this->dataSources[$name])) {
+
+ if (!class_exists($class)) {
+ throw new \Exception(__('Invalid Data Source class name: ' . $class));
+ }
+
+ $data = $this->blockFactory->createBlock($class);
+
+ $this->dataSources[$name] = $data;
+ }
+
+ return $this->dataSources[$name];
+ }
+
+ /**
+ * @param null $name
+ * @return array|object|null
+ */
+ public function get($name = null)
+ {
+ if (!isset($name)) {
+ return $this->dataSources;
+ }
+
+ return isset($this->dataSources[$name]) ? $this->dataSources[$name] : null;
+ }
+
+ /**
+ * @param $dataName
+ * @param $namespace
+ * @param $alias
+ */
+ public function assign($dataName, $namespace, $alias)
+ {
+ $alias = $alias ?: $dataName;
+ $data = $this->get($dataName);
+
+ $this->assignments[$namespace][$alias] = $data;
+ }
+
+ /**
+ * @param $namespace
+ * @return array
+ */
+ public function getNamespaceData($namespace)
+ {
+ return isset($this->assignments[$namespace]) ? $this->assignments[$namespace] : array();
+ }
+}
diff --git a/lib/Magento/View/Design/Fallback/Factory.php b/lib/Magento/View/Design/Fallback/Factory.php
new file mode 100644
index 00000000000..7732fdff2fd
--- /dev/null
+++ b/lib/Magento/View/Design/Fallback/Factory.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+/**
+ * Factory that produces all sorts of fallback rules
+ */
+namespace Magento\View\Design\Fallback;
+
+use Magento\App\Dir;
+use Magento\View\Design\Fallback\Rule\Composite;
+use Magento\View\Design\Fallback\Rule\ModularSwitch;
+use Magento\View\Design\Fallback\Rule\RuleInterface;
+use Magento\View\Design\Fallback\Rule\Simple;
+use Magento\View\Design\Fallback\Rule\Theme;
+
+/**
+ * Fallback Factory
+ *
+ * @package Magento\View
+ */
+class Factory
+{
+ /**
+ * @var Dir
+ */
+ protected $dirs;
+
+ /**
+ * Constructor
+ *
+ * @param Dir $dirs
+ */
+ public function __construct(Dir $dirs)
+ {
+ $this->dirs = $dirs;
+ }
+
+ /**
+ * Retrieve newly created fallback rule for locale files, such as CSV translation maps
+ *
+ * @return RuleInterface
+ */
+ public function createLocaleFileRule()
+ {
+ $themesDir = $this->dirs->getDir(Dir::THEMES);
+ return new Theme(
+ new Simple("$themesDir/<area>/<theme_path>/i18n/<locale>")
+ );
+ }
+
+ /**
+ * Retrieve newly created fallback rule for dynamic view files, such as layouts and templates
+ *
+ * @return RuleInterface
+ */
+ public function createFileRule()
+ {
+ $themesDir = $this->dirs->getDir(Dir::THEMES);
+ $modulesDir = $this->dirs->getDir(Dir::MODULES);
+ return new ModularSwitch(
+ new Theme(
+ new Simple(
+ "$themesDir/<area>/<theme_path>"
+ )
+ ),
+ new Composite(
+ array(
+ new Theme(
+ new Simple(
+ "$themesDir/<area>/<theme_path>/<namespace>_<module>"
+ )
+ ),
+ new Simple(
+ "$modulesDir/<namespace>/<module>/view/<area>"
+ ),
+ )
+ )
+ );
+ }
+
+ /**
+ * Retrieve newly created fallback rule for static view files, such as CSS, JavaScript, images, etc.
+ *
+ * @return RuleInterface
+ */
+ public function createViewFileRule()
+ {
+ $themesDir = $this->dirs->getDir(Dir::THEMES);
+ $modulesDir = $this->dirs->getDir(Dir::MODULES);
+ $pubLibDir = $this->dirs->getDir(Dir::PUB_LIB);
+ return new ModularSwitch(
+ new Composite(
+ array(
+ new Theme(
+ new Composite(
+ array(
+ new Simple(
+ "$themesDir/<area>/<theme_path>/i18n/<locale>",
+ array('locale')
+ ),
+ new Simple(
+ "$themesDir/<area>/<theme_path>"
+ ),
+ )
+ )
+ ),
+ new Simple($pubLibDir),
+ )
+ ),
+ new Composite(
+ array(
+ new Theme(
+ new Composite(
+ array(
+ new Simple(
+ "$themesDir/<area>/<theme_path>/i18n/<locale>/<namespace>_<module>",
+ array('locale')
+ ),
+ new Simple(
+ "$themesDir/<area>/<theme_path>/<namespace>_<module>"
+ ),
+ )
+ )
+ ),
+ new Simple(
+ "$modulesDir/<namespace>/<module>/view/<area>/i18n/<locale>",
+ array('locale')
+ ),
+ new Simple(
+ "$modulesDir/<namespace>/<module>/view/<area>"
+ ),
+ )
+ )
+ );
+ }
+}
diff --git a/app/code/Magento/Core/Model/Design/Fallback/Rule/Composite.php b/lib/Magento/View/Design/Fallback/Rule/Composite.php
similarity index 77%
rename from app/code/Magento/Core/Model/Design/Fallback/Rule/Composite.php
rename to lib/Magento/View/Design/Fallback/Rule/Composite.php
index 1caaa7a7d0d..3a5ef30cc8a 100644
--- a/app/code/Magento/Core/Model/Design/Fallback/Rule/Composite.php
+++ b/lib/Magento/View/Design/Fallback/Rule/Composite.php
@@ -25,29 +25,34 @@
/**
* Composite rule that represents sequence of child fallback rules
*/
-namespace Magento\Core\Model\Design\Fallback\Rule;
+namespace Magento\View\Design\Fallback\Rule;
-class Composite implements \Magento\Core\Model\Design\Fallback\Rule\RuleInterface
+/**
+ * Composite Rules
+ *
+ * @package Magento\View
+ */
+class Composite implements RuleInterface
{
/**
- * @var \Magento\Core\Model\Design\Fallback\Rule\RuleInterface[]
+ * @var RuleInterface[]
*/
- private $_rules = array();
+ protected $rules = array();
/**
* Constructor
*
- * @param \Magento\Core\Model\Design\Fallback\Rule\RuleInterface[] $rules
+ * @param RuleInterface[] $rules
* @throws \InvalidArgumentException
*/
public function __construct(array $rules)
{
foreach ($rules as $rule) {
- if (!($rule instanceof \Magento\Core\Model\Design\Fallback\Rule\RuleInterface)) {
+ if (!($rule instanceof RuleInterface)) {
throw new \InvalidArgumentException('Each item should implement the fallback rule interface.');
}
}
- $this->_rules = $rules;
+ $this->rules = $rules;
}
/**
@@ -58,7 +63,7 @@ class Composite implements \Magento\Core\Model\Design\Fallback\Rule\RuleInterfac
public function getPatternDirs(array $params)
{
$result = array();
- foreach ($this->_rules as $rule) {
+ foreach ($this->rules as $rule) {
$result = array_merge($result, $rule->getPatternDirs($params));
}
return $result;
diff --git a/app/code/Magento/Core/Model/Design/Fallback/Rule/ModularSwitch.php b/lib/Magento/View/Design/Fallback/Rule/ModularSwitch.php
similarity index 64%
rename from app/code/Magento/Core/Model/Design/Fallback/Rule/ModularSwitch.php
rename to lib/Magento/View/Design/Fallback/Rule/ModularSwitch.php
index 24ab8a88631..0159715e83e 100644
--- a/app/code/Magento/Core/Model/Design/Fallback/Rule/ModularSwitch.php
+++ b/lib/Magento/View/Design/Fallback/Rule/ModularSwitch.php
@@ -25,33 +25,37 @@
/**
* Fallback rule that delegates execution to either modular or non-modular sub-rule depending on input parameters
*/
-namespace Magento\Core\Model\Design\Fallback\Rule;
+namespace Magento\View\Design\Fallback\Rule;
-class ModularSwitch
- implements \Magento\Core\Model\Design\Fallback\Rule\RuleInterface
+/**
+ * Modular Switch
+ *
+ * @package Magento\View
+ */
+class ModularSwitch implements RuleInterface
{
/**
- * @var \Magento\Core\Model\Design\Fallback\Rule\RuleInterface
+ * @var RuleInterface
*/
- private $_ruleNonModular;
+ protected $ruleNonModular;
/**
- * @var \Magento\Core\Model\Design\Fallback\Rule\RuleInterface
+ * @var RuleInterface
*/
- private $_ruleModular;
+ protected $ruleModular;
/**
* Constructor
*
- * @param \Magento\Core\Model\Design\Fallback\Rule\RuleInterface $ruleNonModular
- * @param \Magento\Core\Model\Design\Fallback\Rule\RuleInterface $ruleModular
+ * @param RuleInterface $ruleNonModular
+ * @param RuleInterface $ruleModular
*/
public function __construct(
- \Magento\Core\Model\Design\Fallback\Rule\RuleInterface $ruleNonModular,
- \Magento\Core\Model\Design\Fallback\Rule\RuleInterface $ruleModular
+ RuleInterface $ruleNonModular,
+ RuleInterface $ruleModular
) {
- $this->_ruleNonModular = $ruleNonModular;
- $this->_ruleModular = $ruleModular;
+ $this->ruleNonModular = $ruleNonModular;
+ $this->ruleModular = $ruleModular;
}
/**
@@ -65,9 +69,9 @@ class ModularSwitch
$isNamespaceDefined = isset($params['namespace']);
$isModuleDefined = isset($params['module']);
if ($isNamespaceDefined && $isModuleDefined) {
- return $this->_ruleModular->getPatternDirs($params);
- } else if (!$isNamespaceDefined && !$isModuleDefined) {
- return $this->_ruleNonModular->getPatternDirs($params);
+ return $this->ruleModular->getPatternDirs($params);
+ } elseif (!$isNamespaceDefined && !$isModuleDefined) {
+ return $this->ruleNonModular->getPatternDirs($params);
}
throw new \InvalidArgumentException("Parameters 'namespace' and 'module' should either be both set or unset.");
}
diff --git a/app/code/Magento/Core/Model/Design/Fallback/Rule/RuleInterface.php b/lib/Magento/View/Design/Fallback/Rule/RuleInterface.php
similarity index 92%
rename from app/code/Magento/Core/Model/Design/Fallback/Rule/RuleInterface.php
rename to lib/Magento/View/Design/Fallback/Rule/RuleInterface.php
index 136cf75acae..5d0d1d12791 100644
--- a/app/code/Magento/Core/Model/Design/Fallback/Rule/RuleInterface.php
+++ b/lib/Magento/View/Design/Fallback/Rule/RuleInterface.php
@@ -25,8 +25,13 @@
/**
* Interface for search path resolution during fallback process
*/
-namespace Magento\Core\Model\Design\Fallback\Rule;
+namespace Magento\View\Design\Fallback\Rule;
+/**
+ * Rule Interface
+ *
+ * @package Magento\View
+ */
interface RuleInterface
{
/**
diff --git a/app/code/Magento/Core/Model/Design/Fallback/Rule/Simple.php b/lib/Magento/View/Design/Fallback/Rule/Simple.php
similarity index 84%
rename from app/code/Magento/Core/Model/Design/Fallback/Rule/Simple.php
rename to lib/Magento/View/Design/Fallback/Rule/Simple.php
index 933bc50109e..486cda2fd96 100644
--- a/app/code/Magento/Core/Model/Design/Fallback/Rule/Simple.php
+++ b/lib/Magento/View/Design/Fallback/Rule/Simple.php
@@ -25,23 +25,23 @@
/**
* Class with simple substitution parameters to values
*/
-namespace Magento\Core\Model\Design\Fallback\Rule;
+namespace Magento\View\Design\Fallback\Rule;
-class Simple implements \Magento\Core\Model\Design\Fallback\Rule\RuleInterface
+class Simple implements RuleInterface
{
/**
* Optional params for rule
*
* @var array
*/
- protected $_optionalParams;
+ protected $optionalParams;
/**
* Pattern for a simple rule
*
* @var string
*/
- protected $_pattern;
+ protected $pattern;
/**
* Constructor
@@ -51,8 +51,8 @@ class Simple implements \Magento\Core\Model\Design\Fallback\Rule\RuleInterface
*/
public function __construct($pattern, array $optionalParams = array())
{
- $this->_pattern = $pattern;
- $this->_optionalParams = $optionalParams;
+ $this->pattern = $pattern;
+ $this->optionalParams = $optionalParams;
}
/**
@@ -64,11 +64,11 @@ class Simple implements \Magento\Core\Model\Design\Fallback\Rule\RuleInterface
*/
public function getPatternDirs(array $params)
{
- $pattern = $this->_pattern;
+ $pattern = $this->pattern;
if (preg_match_all('/<([a-zA-Z\_]+)>/', $pattern, $matches)) {
foreach ($matches[1] as $placeholder) {
if (empty($params[$placeholder])) {
- if (in_array($placeholder, $this->_optionalParams)) {
+ if (in_array($placeholder, $this->optionalParams)) {
return array();
} else {
throw new \InvalidArgumentException("Required parameter '$placeholder' was not passed");
diff --git a/app/code/Magento/Core/Model/Design/Fallback/Rule/Theme.php b/lib/Magento/View/Design/Fallback/Rule/Theme.php
similarity index 75%
rename from app/code/Magento/Core/Model/Design/Fallback/Rule/Theme.php
rename to lib/Magento/View/Design/Fallback/Rule/Theme.php
index f6ee233caee..639e3686575 100644
--- a/app/code/Magento/Core/Model/Design/Fallback/Rule/Theme.php
+++ b/lib/Magento/View/Design/Fallback/Rule/Theme.php
@@ -25,23 +25,30 @@
/**
* An aggregate of a fallback rule that propagates it to every theme according to a hierarchy
*/
-namespace Magento\Core\Model\Design\Fallback\Rule;
+namespace Magento\View\Design\Fallback\Rule;
-class Theme implements \Magento\Core\Model\Design\Fallback\Rule\RuleInterface
+use Magento\View\Design\ThemeInterface;
+
+/**
+ * Theme
+ *
+ * @package Magento\View
+ */
+class Theme implements RuleInterface
{
/**
- * @var \Magento\Core\Model\Design\Fallback\Rule\RuleInterface
+ * @var RuleInterface
*/
- private $_rule;
+ protected $rule;
/**
* Constructor
*
- * @param \Magento\Core\Model\Design\Fallback\Rule\RuleInterface $rule
+ * @param RuleInterface $rule
*/
- public function __construct(\Magento\Core\Model\Design\Fallback\Rule\RuleInterface $rule)
+ public function __construct(RuleInterface $rule)
{
- $this->_rule = $rule;
+ $this->rule = $rule;
}
/**
@@ -52,19 +59,19 @@ class Theme implements \Magento\Core\Model\Design\Fallback\Rule\RuleInterface
*/
public function getPatternDirs(array $params)
{
- if (!array_key_exists('theme', $params) || !($params['theme'] instanceof \Magento\View\Design\ThemeInterface)) {
+ if (!array_key_exists('theme', $params) || !($params['theme'] instanceof ThemeInterface)) {
throw new \InvalidArgumentException(
'Parameter "theme" should be specified and should implement the theme interface.'
);
}
$result = array();
- /** @var $theme \Magento\View\Design\ThemeInterface */
+ /** @var $theme ThemeInterface */
$theme = $params['theme'];
unset($params['theme']);
while ($theme) {
if ($theme->getThemePath()) {
$params['theme_path'] = $theme->getThemePath();
- $result = array_merge($result, $this->_rule->getPatternDirs($params));
+ $result = array_merge($result, $this->rule->getPatternDirs($params));
}
$theme = $theme->getParentTheme();
}
diff --git a/app/code/Magento/Core/Model/Design/FileResolution/Strategy/Fallback.php b/lib/Magento/View/Design/FileResolution/Strategy/Fallback.php
similarity index 53%
rename from app/code/Magento/Core/Model/Design/FileResolution/Strategy/Fallback.php
rename to lib/Magento/View/Design/FileResolution/Strategy/Fallback.php
index e9eff08dfb5..0aa4eb3066e 100644
--- a/app/code/Magento/Core/Model/Design/FileResolution/Strategy/Fallback.php
+++ b/lib/Magento/View/Design/FileResolution/Strategy/Fallback.php
@@ -27,91 +27,94 @@
/**
* Resolver, which performs full search of files, according to fallback rules
*/
-namespace Magento\Core\Model\Design\FileResolution\Strategy;
+namespace Magento\View\Design\FileResolution\Strategy;
-class Fallback
- implements \Magento\Core\Model\Design\FileResolution\Strategy\FileInterface,
- \Magento\Core\Model\Design\FileResolution\Strategy\LocaleInterface,
- \Magento\Core\Model\Design\FileResolution\Strategy\ViewInterface
+use Magento\Filesystem;
+use Magento\View\Design\Fallback\Factory;
+use Magento\View\Design\Fallback\Rule\RuleInterface;
+use Magento\View\Design\ThemeInterface;
+
+/**
+ * Fallback
+ *
+ * @package Magento\View
+ */
+class Fallback implements FileInterface, LocaleInterface, ViewInterface
{
/**
- * @var \Magento\Core\Model\Design\Fallback\Factory
+ * @var Factory
*/
- protected $_fallbackFactory;
+ protected $fallbackFactory;
/**
- * @var \Magento\Core\Model\Design\Fallback\Rule\RuleInterface
+ * @var RuleInterface
*/
- protected $_ruleFile;
+ protected $ruleFile;
/**
- * @var \Magento\Core\Model\Design\Fallback\Rule\RuleInterface
+ * @var RuleInterface
*/
- protected $_ruleLocaleFile;
+ protected $ruleLocaleFile;
/**
- * @var \Magento\Core\Model\Design\Fallback\Rule\RuleInterface
+ * @var RuleInterface
*/
- protected $_ruleViewFile;
+ protected $ruleViewFile;
/**
- * Constructor
- *
- * @param \Magento\Filesystem $filesystem
- * @param \Magento\Core\Model\Design\Fallback\Factory $fallbackFactory
+ * @param Filesystem $filesystem
+ * @param Factory $fallbackFactory
*/
- public function __construct(
- \Magento\Filesystem $filesystem,
- \Magento\Core\Model\Design\Fallback\Factory $fallbackFactory
- ) {
+ public function __construct(Filesystem $filesystem, Factory $fallbackFactory)
+ {
$this->_filesystem = $filesystem;
- $this->_fallbackFactory = $fallbackFactory;
+ $this->fallbackFactory = $fallbackFactory;
}
/**
* Get existing file name, using fallback mechanism
*
* @param string $area
- * @param \Magento\View\Design\ThemeInterface $themeModel
+ * @param ThemeInterface $themeModel
* @param string $file
* @param string|null $module
* @return string
*/
- public function getFile($area, \Magento\View\Design\ThemeInterface $themeModel, $file, $module = null)
+ public function getFile($area, ThemeInterface $themeModel, $file, $module = null)
{
$params = array('area' => $area, 'theme' => $themeModel, 'namespace' => null, 'module' => null);
if ($module) {
list($params['namespace'], $params['module']) = explode('_', $module, 2);
}
- return $this->_resolveFile($this->_getFileRule(), $file, $params);
+ return $this->resolveFile($this->getFileRule(), $file, $params);
}
/**
* Get locale file name, using fallback mechanism
*
* @param string $area
- * @param \Magento\View\Design\ThemeInterface $themeModel
+ * @param ThemeInterface $themeModel
* @param string $locale
* @param string $file
* @return string
*/
- public function getLocaleFile($area, \Magento\View\Design\ThemeInterface $themeModel, $locale, $file)
+ public function getLocaleFile($area, ThemeInterface $themeModel, $locale, $file)
{
$params = array('area' => $area, 'theme' => $themeModel, 'locale' => $locale);
- return $this->_resolveFile($this->_getLocaleFileRule(), $file, $params);
+ return $this->resolveFile($this->getLocaleFileRule(), $file, $params);
}
/**
* Get theme file name, using fallback mechanism
*
* @param string $area
- * @param \Magento\View\Design\ThemeInterface $themeModel
+ * @param ThemeInterface $themeModel
* @param string $locale
* @param string $file
* @param string|null $module
* @return string
*/
- public function getViewFile($area, \Magento\View\Design\ThemeInterface $themeModel, $locale, $file, $module = null)
+ public function getViewFile($area, ThemeInterface $themeModel, $locale, $file, $module = null)
{
$params = array(
'area' => $area, 'theme' => $themeModel, 'locale' => $locale, 'namespace' => null, 'module' => null
@@ -119,59 +122,58 @@ class Fallback
if ($module) {
list($params['namespace'], $params['module']) = explode('_', $module, 2);
}
- return $this->_resolveFile($this->_getViewFileRule(), $file, $params);
+ return $this->resolveFile($this->getViewFileRule(), $file, $params);
}
/**
* Retrieve fallback rule for dynamic view files
*
- * @return \Magento\Core\Model\Design\Fallback\Rule\RuleInterface
+ * @return RuleInterface
*/
- protected function _getFileRule()
+ protected function getFileRule()
{
- if (!$this->_ruleFile) {
- $this->_ruleFile = $this->_fallbackFactory->createFileRule();
+ if (!$this->ruleFile) {
+ $this->ruleFile = $this->fallbackFactory->createFileRule();
}
- return $this->_ruleFile;
+ return $this->ruleFile;
}
/**
* Retrieve fallback rule for locale files
*
- * @return \Magento\Core\Model\Design\Fallback\Rule\RuleInterface
+ * @return RuleInterface
*/
- protected function _getLocaleFileRule()
+ protected function getLocaleFileRule()
{
- if (!$this->_ruleLocaleFile) {
- $this->_ruleLocaleFile = $this->_fallbackFactory->createLocaleFileRule();
+ if (!$this->ruleLocaleFile) {
+ $this->ruleLocaleFile = $this->fallbackFactory->createLocaleFileRule();
}
- return $this->_ruleLocaleFile;
+ return $this->ruleLocaleFile;
}
/**
* Retrieve fallback rule for static view files
*
- * @return \Magento\Core\Model\Design\Fallback\Rule\RuleInterface
+ * @return RuleInterface
*/
- protected function _getViewFileRule()
+ protected function getViewFileRule()
{
- if (!$this->_ruleViewFile) {
- $this->_ruleViewFile = $this->_fallbackFactory->createViewFileRule();
+ if (!$this->ruleViewFile) {
+ $this->ruleViewFile = $this->fallbackFactory->createViewFileRule();
}
- return $this->_ruleViewFile;
+ return $this->ruleViewFile;
}
/**
* Get path of file after using fallback rules
*
- * @param \Magento\Core\Model\Design\Fallback\Rule\RuleInterface $fallbackRule
+ * @param RuleInterface $fallbackRule
* @param string $file
* @param array $params
* @return string
*/
- protected function _resolveFile(
- \Magento\Core\Model\Design\Fallback\Rule\RuleInterface $fallbackRule, $file, $params = array()
- ) {
+ protected function resolveFile(RuleInterface $fallbackRule, $file, $params = array())
+ {
$path = '';
foreach ($fallbackRule->getPatternDirs($params) as $dir) {
$path = str_replace('/', DIRECTORY_SEPARATOR, "{$dir}/{$file}");
diff --git a/lib/Magento/View/Design/FileResolution/Strategy/Fallback/CachingProxy.php b/lib/Magento/View/Design/FileResolution/Strategy/Fallback/CachingProxy.php
new file mode 100644
index 00000000000..c79884a2cef
--- /dev/null
+++ b/lib/Magento/View/Design/FileResolution/Strategy/Fallback/CachingProxy.php
@@ -0,0 +1,298 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category Magento
+ * @package Magento_Core
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+/**
+ * A proxy for the Fallback resolver. This proxy processes fallback resolution calls by either using map of cached
+ * paths, or passing resolution to the Fallback resolver.
+ */
+namespace Magento\View\Design\FileResolution\Strategy\Fallback;
+
+use Magento\Filesystem;
+use Magento\View\Design\FileResolution\Strategy\Fallback;
+use Magento\View\Design\FileResolution\Strategy\FileInterface;
+use Magento\View\Design\FileResolution\Strategy\LocaleInterface;
+use Magento\View\Design\FileResolution\Strategy\View\NotifiableInterface;
+use Magento\View\Design\FileResolution\Strategy\ViewInterface;
+use Magento\View\Design\ThemeInterface;
+
+/**
+ * Caching Proxy
+ *
+ * @package Magento\View
+ */
+class CachingProxy implements FileInterface, LocaleInterface, ViewInterface, NotifiableInterface
+{
+ /**
+ * Proxied fallback model
+ *
+ * @var Fallback
+ */
+ protected $fallback;
+
+ /**
+ * @var Filesystem
+ */
+ protected $filesystem;
+
+ /**
+ * Path to maps directory
+ *
+ * @var string
+ */
+ protected $mapDir;
+
+ /**
+ * Path to Magento base directory
+ *
+ * @var string
+ */
+ protected $baseDir;
+
+ /**
+ * Whether object can save map changes upon destruction
+ *
+ * @var bool
+ */
+ protected $canSaveMap;
+
+ /**
+ * Cached fallback map sections
+ *
+ * @var array
+ */
+ protected $sections = array();
+
+ /**
+ * @param Fallback $fallback
+ * @param Filesystem $filesystem
+ * @param string $mapDir
+ * @param string $baseDir
+ * @param bool $canSaveMap
+ * @throws \InvalidArgumentException
+ */
+ public function __construct(
+ Fallback $fallback,
+ Filesystem $filesystem,
+ $mapDir,
+ $baseDir,
+ $canSaveMap = true
+ ) {
+ $this->fallback = $fallback;
+ $this->filesystem = $filesystem;
+ if (!$filesystem->isDirectory($baseDir)) {
+ throw new \InvalidArgumentException("Wrong base directory specified: '{$baseDir}'");
+ }
+ $this->baseDir = $baseDir;
+ $this->mapDir = $mapDir;
+ $this->canSaveMap = $canSaveMap;
+ }
+
+ /**
+ * Write the serialized map to the section files
+ */
+ public function __destruct()
+ {
+ if (!$this->canSaveMap) {
+ return;
+ }
+ if (!$this->filesystem->isDirectory($this->mapDir)) {
+ $this->filesystem->createDirectory($this->mapDir, 0777);
+ }
+ foreach ($this->sections as $sectionFile => $section) {
+ if (!$section['is_changed']) {
+ continue;
+ }
+ $filePath = $this->mapDir . DIRECTORY_SEPARATOR . $sectionFile;
+ $this->filesystem->write($filePath, serialize($section['data']));
+ }
+ }
+
+ /**
+ * Proxy to \Magento\View\Design\FileResolution\Strategy\Fallback::getFile()
+ *
+ * @param string $area
+ * @param ThemeInterface $themeModel
+ * @param string $file
+ * @param string|null $module
+ * @return string
+ */
+ public function getFile($area, ThemeInterface $themeModel, $file, $module = null)
+ {
+ $result = $this->getFromMap('file', $area, $themeModel, null, $module, $file);
+ if (!$result) {
+ $result = $this->fallback->getFile($area, $themeModel, $file, $module);
+ $this->setToMap('file', $area, $themeModel, null, $module, $file, $result);
+ }
+ return $result;
+ }
+
+ /**
+ * Proxy to \Magento\View\Design\FileResolution\Strategy\Fallback::getLocaleFile()
+ *
+ * @param string $area
+ * @param ThemeInterface $themeModel
+ * @param string $locale
+ * @param string $file
+ * @return string
+ */
+ public function getLocaleFile($area, ThemeInterface $themeModel, $locale, $file)
+ {
+ $result = $this->getFromMap('locale', $area, $themeModel, $locale, null, $file);
+ if (!$result) {
+ $result = $this->fallback->getLocaleFile($area, $themeModel, $locale, $file);
+ $this->getFromMap('locale', $area, $themeModel, $locale, null, $file, $result);
+ }
+ return $result;
+ }
+
+ /**
+ * Proxy to \Magento\View\Design\FileResolution\Strategy\Fallback::getViewFile()
+ *
+ * @param string $area
+ * @param ThemeInterface $themeModel
+ * @param string $locale
+ * @param string $file
+ * @param string|null $module
+ * @return string
+ */
+ public function getViewFile($area, ThemeInterface $themeModel, $locale, $file, $module = null)
+ {
+ $result = $this->getFromMap('view', $area, $themeModel, $locale, $module, $file);
+ if (!$result) {
+ $result = $this->fallback->getViewFile($area, $themeModel, $locale, $file, $module);
+ $this->getFromMap('view', $area, $themeModel, $locale, $module, $file, $result);
+ }
+ return $result;
+ }
+
+ /**
+ * Get stored full file path
+ *
+ * @param string $fileType
+ * @param string $area
+ * @param ThemeInterface $theme
+ * @param string|null $locale
+ * @param string|null $module
+ * @param string $file
+ * @return null|string
+ */
+ protected function getFromMap($fileType, $area, ThemeInterface $theme, $locale, $module, $file)
+ {
+ $sectionKey = $this->loadSection($area, $theme, $locale);
+ $fileKey = "$fileType|$file|$module";
+ if (isset($this->sections[$sectionKey]['data'][$fileKey])) {
+ $value = $this->sections[$sectionKey]['data'][$fileKey];
+ if ('' !== (string)$value) {
+ $value = $this->baseDir . DIRECTORY_SEPARATOR . $value;
+ }
+ return $value;
+ }
+ return null;
+ }
+
+ /**
+ * Set stored full file path
+ *
+ * @param string $fileType
+ * @param string $area
+ * @param ThemeInterface $theme
+ * @param string|null $locale
+ * @param string|null $module
+ * @param string $file
+ * @param string $filePath
+ * @throws \Magento\Exception
+ */
+ protected function setToMap($fileType, $area, ThemeInterface $theme, $locale, $module, $file, $filePath)
+ {
+ $pattern = $this->baseDir . DIRECTORY_SEPARATOR;
+ if (0 !== strpos($filePath, $pattern)) {
+ throw new \Magento\Exception(
+ "Attempt to store fallback path '{$filePath}', which is not within '{$pattern}'"
+ );
+ }
+ $value = substr($filePath, strlen($pattern));
+
+ $sectionKey = $this->loadSection($area, $theme, $locale);
+ $fileKey = "$fileType|$file|$module";
+ $this->sections[$sectionKey]['data'][$fileKey] = $value;
+ $this->sections[$sectionKey]['is_changed'] = true;
+ }
+
+ /**
+ * Compose section file name
+ *
+ * @param string $area
+ * @param ThemeInterface $themeModel
+ * @param string|null $locale
+ * @return string
+ */
+ protected function getSectionFile($area, ThemeInterface $themeModel, $locale)
+ {
+ $theme = $themeModel->getId() ?: md5($themeModel->getThemePath());
+ return "{$area}_{$theme}_{$locale}.ser";
+ }
+
+ /**
+ * Load section and return its key
+ *
+ * @param string $area
+ * @param ThemeInterface $themeModel
+ * @param string|null $locale
+ * @return string
+ */
+ protected function loadSection($area, ThemeInterface $themeModel, $locale)
+ {
+ $sectionFile = $this->getSectionFile($area, $themeModel, $locale);
+ if (!isset($this->sections[$sectionFile])) {
+ $filePath = $this->mapDir . DIRECTORY_SEPARATOR . $sectionFile;
+ $this->sections[$sectionFile] = array(
+ 'data' => array(),
+ 'is_changed' => false,
+ );
+ if ($this->filesystem->isFile($filePath)) {
+ $this->sections[$sectionFile]['data'] = unserialize($this->filesystem->read($filePath));
+ }
+ }
+ return $sectionFile;
+ }
+
+ /**
+ * Set file path to map.
+ *
+ * @param string $area
+ * @param ThemeInterface $themeModel
+ * @param string $locale
+ * @param string|null $module
+ * @param string $file
+ * @param string $newFilePath
+ * @return \Magento\View\Design\FileResolution\Strategy\Fallback\CachingProxy
+ */
+ public function setViewFilePathToMap($area, ThemeInterface $themeModel, $locale, $module, $file, $newFilePath)
+ {
+ $this->setToMap('view', $area, $themeModel, $locale, $module, $file, $newFilePath);
+ return $this;
+ }
+}
diff --git a/app/code/Magento/Core/Model/Design/FileResolution/Strategy/FileInterface.php b/lib/Magento/View/Design/FileResolution/Strategy/FileInterface.php
similarity index 81%
rename from app/code/Magento/Core/Model/Design/FileResolution/Strategy/FileInterface.php
rename to lib/Magento/View/Design/FileResolution/Strategy/FileInterface.php
index d78cc517678..94e2627fede 100644
--- a/app/code/Magento/Core/Model/Design/FileResolution/Strategy/FileInterface.php
+++ b/lib/Magento/View/Design/FileResolution/Strategy/FileInterface.php
@@ -27,18 +27,25 @@
/**
* Interface for 'file' file resolution strategy
*/
-namespace Magento\Core\Model\Design\FileResolution\Strategy;
+namespace Magento\View\Design\FileResolution\Strategy;
+use Magento\View\Design\ThemeInterface;
+
+/**
+ * File Interface
+ *
+ * @package Magento\View
+ */
interface FileInterface
{
/**
* Get a usual file path (e.g. template)
*
* @param string $area
- * @param \Magento\View\Design\ThemeInterface $themeModel
+ * @param ThemeInterface $themeModel
* @param string $file
* @param string|null $module
* @return string
*/
- public function getFile($area, \Magento\View\Design\ThemeInterface $themeModel, $file, $module = null);
+ public function getFile($area, ThemeInterface $themeModel, $file, $module = null);
}
diff --git a/app/code/Magento/Core/Model/Design/FileResolution/Strategy/LocaleInterface.php b/lib/Magento/View/Design/FileResolution/Strategy/LocaleInterface.php
similarity index 81%
rename from app/code/Magento/Core/Model/Design/FileResolution/Strategy/LocaleInterface.php
rename to lib/Magento/View/Design/FileResolution/Strategy/LocaleInterface.php
index 37e5e437682..0529778c964 100644
--- a/app/code/Magento/Core/Model/Design/FileResolution/Strategy/LocaleInterface.php
+++ b/lib/Magento/View/Design/FileResolution/Strategy/LocaleInterface.php
@@ -27,18 +27,25 @@
/**
* Interface for 'locale' file resolution strategy
*/
-namespace Magento\Core\Model\Design\FileResolution\Strategy;
+namespace Magento\View\Design\FileResolution\Strategy;
+use Magento\View\Design\ThemeInterface;
+
+/**
+ * Locale Interface
+ *
+ * @package Magento\View
+ */
interface LocaleInterface
{
/**
* Get locale file name (e.g. file with translations)
*
* @param string $area
- * @param \Magento\View\Design\ThemeInterface $themeModel
+ * @param ThemeInterface $themeModel
* @param string $locale
* @param string $file
* @return string
*/
- public function getLocaleFile($area, \Magento\View\Design\ThemeInterface $themeModel, $locale, $file);
+ public function getLocaleFile($area, ThemeInterface $themeModel, $locale, $file);
}
diff --git a/app/code/Magento/Core/Model/Design/FileResolution/Strategy/View/NotifiableInterface.php b/lib/Magento/View/Design/FileResolution/Strategy/View/NotifiableInterface.php
similarity index 76%
rename from app/code/Magento/Core/Model/Design/FileResolution/Strategy/View/NotifiableInterface.php
rename to lib/Magento/View/Design/FileResolution/Strategy/View/NotifiableInterface.php
index b0905dacd28..b1d8f4d485c 100644
--- a/app/code/Magento/Core/Model/Design/FileResolution/Strategy/View/NotifiableInterface.php
+++ b/lib/Magento/View/Design/FileResolution/Strategy/View/NotifiableInterface.php
@@ -27,8 +27,16 @@
/**
* Interface for a view strategy to be notifiable, that file location has changed
*/
-namespace Magento\Core\Model\Design\FileResolution\Strategy\View;
+namespace Magento\View\Design\FileResolution\Strategy\View;
+use Magento\View\Design\FileResolution\Strategy\Fallback\CachingProxy;
+use Magento\View\Design\ThemeInterface;
+
+/**
+ * Notifiable Interface
+ *
+ * @package Magento\View
+ */
interface NotifiableInterface
{
/**
@@ -36,14 +44,12 @@ interface NotifiableInterface
* new location.
*
* @param string $area
- * @param \Magento\View\Design\ThemeInterface $themeModel
+ * @param ThemeInterface $themeModel
* @param string $locale
* @param string|null $module
* @param string $file
* @param string $newFilePath
- * @return \Magento\Core\Model\Design\FileResolution\Strategy\Fallback\CachingProxy
+ * @return CachingProxy
*/
- public function setViewFilePathToMap(
- $area, \Magento\View\Design\ThemeInterface $themeModel, $locale, $module, $file, $newFilePath
- );
+ public function setViewFilePathToMap($area, ThemeInterface $themeModel, $locale, $module, $file, $newFilePath);
}
diff --git a/app/code/Magento/Core/Model/Design/FileResolution/Strategy/ViewInterface.php b/lib/Magento/View/Design/FileResolution/Strategy/ViewInterface.php
similarity index 81%
rename from app/code/Magento/Core/Model/Design/FileResolution/Strategy/ViewInterface.php
rename to lib/Magento/View/Design/FileResolution/Strategy/ViewInterface.php
index 5717bd25e6a..d82bb7657bb 100644
--- a/app/code/Magento/Core/Model/Design/FileResolution/Strategy/ViewInterface.php
+++ b/lib/Magento/View/Design/FileResolution/Strategy/ViewInterface.php
@@ -27,19 +27,26 @@
/**
* Interface for 'view' file resolution strategy
*/
-namespace Magento\Core\Model\Design\FileResolution\Strategy;
+namespace Magento\View\Design\FileResolution\Strategy;
+use Magento\View\Design\ThemeInterface;
+
+/**
+ * View Interface
+ *
+ * @package Magento\View
+ */
interface ViewInterface
{
/**
* Get theme file name (e.g. a javascript file)
*
* @param string $area
- * @param \Magento\View\Design\ThemeInterface $themeModel
+ * @param ThemeInterface $themeModel
* @param string $locale
* @param string $file
* @param string|null $module
* @return string
*/
- public function getViewFile($area, \Magento\View\Design\ThemeInterface $themeModel, $locale, $file, $module = null);
+ public function getViewFile($area, ThemeInterface $themeModel, $locale, $file, $module = null);
}
diff --git a/lib/Magento/View/Design/FileResolution/StrategyPool.php b/lib/Magento/View/Design/FileResolution/StrategyPool.php
new file mode 100644
index 00000000000..f2617876ded
--- /dev/null
+++ b/lib/Magento/View/Design/FileResolution/StrategyPool.php
@@ -0,0 +1,213 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category Magento
+ * @package Magento_Core
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+/**
+ * Class for choosing the strategy for file resolution
+ */
+namespace Magento\View\Design\FileResolution;
+
+use Magento\Core\Exception;
+use Magento\App\State;
+use Magento\App\Dir;
+use Magento\Filesystem;
+use Magento\ObjectManager;
+
+/**
+ * Strategy Pool
+ *
+ * @package Magento\View
+ */
+class StrategyPool
+{
+ /**
+ * Sub-directory where to store maps of view files fallback (if used)
+ */
+ const FALLBACK_MAP_DIR = 'maps/fallback';
+
+ /**
+ * @var ObjectManager
+ */
+ protected $objectManager;
+
+ /**
+ * @var string
+ */
+ protected $appState;
+
+ /**
+ * @var Filesystem
+ */
+ protected $filesystem;
+
+ /**
+ * @var Dir
+ */
+ protected $dirs;
+
+ /**
+ * Pool of strategy objects
+ *
+ * @var array
+ */
+ protected $strategyPool = array();
+
+ /**
+ * Settings for strategies that are used to resolve file paths
+ *
+ * @var array
+ */
+ protected $strategies = array(
+ 'production_mode' => array(
+ 'file' => 'Magento\View\Design\FileResolution\Strategy\Fallback\CachingProxy',
+ 'locale' => 'Magento\View\Design\FileResolution\Strategy\Fallback',
+ 'view' => 'Magento\View\Design\FileResolution\Strategy\Fallback',
+ ),
+ 'caching_map' => array(
+ 'file' => 'Magento\View\Design\FileResolution\Strategy\Fallback\CachingProxy',
+ 'locale' => 'Magento\View\Design\FileResolution\Strategy\Fallback\CachingProxy',
+ 'view' => 'Magento\View\Design\FileResolution\Strategy\Fallback\CachingProxy',
+ ),
+ 'full_check' => array(
+ 'file' => 'Magento\View\Design\FileResolution\Strategy\Fallback',
+ 'locale' => 'Magento\View\Design\FileResolution\Strategy\Fallback',
+ 'view' => 'Magento\View\Design\FileResolution\Strategy\Fallback',
+ ),
+ );
+
+ /**
+ * @param ObjectManager $objectManager
+ * @param State $appState
+ * @param Dir $dirs
+ * @param Filesystem $filesystem
+ */
+ public function __construct(
+ ObjectManager $objectManager,
+ State $appState,
+ Dir $dirs,
+ Filesystem $filesystem
+ ) {
+ $this->objectManager = $objectManager;
+ $this->appState = $appState;
+ $this->filesystem = $filesystem;
+ $this->dirs = $dirs;
+ }
+
+ /**
+ * Get strategy to resolve dynamic files (e.g. templates)
+ *
+ * @param bool $skipProxy
+ * @return \Magento\View\Design\FileResolution\Strategy\FileInterface
+ */
+ public function getFileStrategy($skipProxy = false)
+ {
+ return $this->getStrategy('file', $skipProxy);
+ }
+
+ /**
+ * * Get strategy to resolve locale files (e.g. locale settings)
+ *
+ * @param bool $skipProxy
+ * @return \Magento\View\Design\FileResolution\Strategy\LocaleInterface
+ */
+ public function getLocaleStrategy($skipProxy = false)
+ {
+ return $this->getStrategy('locale', $skipProxy);
+ }
+
+ /**
+ * Get strategy to resolve static view files (e.g. javascripts)
+ *
+ * @param bool $skipProxy
+ * @return \Magento\View\Design\FileResolution\Strategy\ViewInterface
+ */
+ public function getViewStrategy($skipProxy = false)
+ {
+ return $this->getStrategy('view', $skipProxy);
+ }
+
+ /**
+ * Determine the strategy to be used. Create or get it from the pool.
+ *
+ * @param string $fileType
+ * @param bool $skipProxy
+ * @return mixed
+ */
+ protected function getStrategy($fileType, $skipProxy = false)
+ {
+ $strategyClass = $this->getStrategyClass($fileType, $skipProxy);
+ if (!isset($this->strategyPool[$strategyClass])) {
+ $this->strategyPool[$strategyClass] = $this->createStrategy($strategyClass);
+ }
+ return $this->strategyPool[$strategyClass];
+ }
+
+ /**
+ * Find the class of strategy, that must be used to resolve files of $fileType
+ *
+ * @param string $fileType
+ * @param bool $skipProxy
+ * @return string
+ * @throws Exception
+ */
+ protected function getStrategyClass($fileType, $skipProxy = false)
+ {
+ $mode = $this->appState->getMode();
+ if ($mode == State::MODE_PRODUCTION) {
+ $strategyClasses = $this->strategies['production_mode'];
+ } elseif (($mode == State::MODE_DEVELOPER) || $skipProxy) {
+ $strategyClasses = $this->strategies['full_check'];
+ } elseif ($mode == State::MODE_DEFAULT) {
+ $strategyClasses = $this->strategies['caching_map'];
+ } else {
+ throw new Exception("Unknown mode to choose strategy: {$mode}");
+ }
+ return $strategyClasses[$fileType];
+ }
+
+ /**
+ * Create strategy by its class name
+ *
+ * @param string $className
+ * @return mixed
+ */
+ protected function createStrategy($className)
+ {
+ switch ($className) {
+ case 'Magento\View\Design\FileResolution\Strategy\Fallback\CachingProxy':
+ $mapDir = $this->dirs->getDir(Dir::VAR_DIR) . DIRECTORY_SEPARATOR
+ . self::FALLBACK_MAP_DIR;
+ $arguments = array(
+ 'mapDir' => str_replace('/', DIRECTORY_SEPARATOR, $mapDir),
+ 'baseDir' => $this->dirs->getDir(Dir::ROOT),
+ );
+ break;
+ default:
+ $arguments = array();
+ break;
+ }
+ return $this->objectManager->create($className, $arguments);
+ }
+}
diff --git a/lib/Magento/View/Design/ThemeFactory.php b/lib/Magento/View/Design/ThemeFactory.php
new file mode 100644
index 00000000000..0dd7769edc5
--- /dev/null
+++ b/lib/Magento/View/Design/ThemeFactory.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Minimal required interface a theme has to implement
+ *
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\View\Design;
+
+use Magento\ObjectManager;
+
+class ThemeFactory
+{
+ /**
+ * @var ObjectManager
+ */
+ protected $objectManager;
+
+ /**
+ * @param ObjectManager $objectManager
+ */
+ public function __construct(ObjectManager $objectManager)
+ {
+ $this->objectManager = $objectManager;
+ }
+
+ /**
+ * @param $themeId
+ * @return \Magento\View\Design\ThemeInterface
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function getTheme($themeId)
+ {
+ return null;
+ }
+}
diff --git a/app/code/Magento/Media/Helper/Data.php b/lib/Magento/View/Element/RendererInterface.php
similarity index 76%
rename from app/code/Magento/Media/Helper/Data.php
rename to lib/Magento/View/Element/RendererInterface.php
index 6208414544d..674930b7594 100644
--- a/app/code/Magento/Media/Helper/Data.php
+++ b/lib/Magento/View/Element/RendererInterface.php
@@ -18,23 +18,25 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package Magento_Media
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-
/**
- * Media library data helper
- *
- * @category Magento
- * @package Magento_Media
- * @author Magento Core Team <core@magentocommerce.com>
+ * Magento Block interface
*/
-namespace Magento\Media\Helper;
+namespace Magento\View\Element;
-class Data extends \Magento\Core\Helper\Data
+/**
+ * @package Magento\View
+ */
+interface RendererInterface
{
-
+ /**
+ * Produce html output using the given data source
+ *
+ * @param mixed $data
+ * @return mixed
+ */
+ public function render($data);
}
diff --git a/lib/Magento/View/Layout/Element.php b/lib/Magento/View/Layout/Element.php
index 92245142838..d2f6624bdc1 100644
--- a/lib/Magento/View/Layout/Element.php
+++ b/lib/Magento/View/Layout/Element.php
@@ -24,11 +24,17 @@
namespace Magento\View\Layout;
+/**
+ * @package Magento\View
+ */
class Element extends \Magento\Simplexml\Element
{
/**#@+
* Supported layout directives
*/
+ const TYPE_RENDERER = 'renderer';
+ const TYPE_TEMPLATE = 'template';
+ const TYPE_DATA = 'data';
const TYPE_BLOCK = 'block';
const TYPE_CONTAINER = 'container';
const TYPE_ACTION = 'action';
@@ -40,42 +46,50 @@ class Element extends \Magento\Simplexml\Element
const TYPE_MOVE = 'move';
/**#@-*/
+ /**
+ * @return Element
+ *
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ */
public function prepare()
{
switch ($this->getName()) {
case self::TYPE_BLOCK:
+ case self::TYPE_RENDERER:
+ case self::TYPE_TEMPLATE:
+ case self::TYPE_DATA:
$this->prepareBlock();
break;
-
case self::TYPE_REFERENCE_BLOCK:
case self::TYPE_REFERENCE_CONTAINER:
$this->prepareReference();
break;
-
case self::TYPE_ACTION:
$this->prepareAction();
break;
-
case self::TYPE_ARGUMENT:
$this->prepareActionArgument();
break;
-
default:
break;
}
foreach ($this as $child) {
+ /** @var Element $child */
$child->prepare();
}
return $this;
}
+ /**
+ * @return bool|string
+ */
public function getBlockName()
{
$tagName = (string)$this->getName();
- if (empty($this['name']) || !in_array($tagName, array(
- self::TYPE_BLOCK,
- self::TYPE_REFERENCE_BLOCK,
- ))) {
+ $isThisBlock = empty($this['name'])
+ || !in_array($tagName, array(self::TYPE_BLOCK, self::TYPE_REFERENCE_BLOCK));
+
+ if ($isThisBlock) {
return false;
}
return (string)$this['name'];
@@ -91,12 +105,17 @@ class Element extends \Magento\Simplexml\Element
public function getElementName()
{
$tagName = $this->getName();
- if (!in_array($tagName, array(
- self::TYPE_BLOCK,
- self::TYPE_REFERENCE_BLOCK,
- self::TYPE_CONTAINER,
- self::TYPE_REFERENCE_CONTAINER
- ))) {
+ $isThisContainer = !in_array(
+ $tagName,
+ array(
+ self::TYPE_BLOCK,
+ self::TYPE_REFERENCE_BLOCK,
+ self::TYPE_CONTAINER,
+ self::TYPE_REFERENCE_CONTAINER
+ )
+ );
+
+ if ($isThisContainer) {
return false;
}
return $this->getAttribute('name');
diff --git a/app/code/Magento/Core/Model/Layout/File.php b/lib/Magento/View/Layout/File.php
similarity index 74%
rename from app/code/Magento/Core/Model/Layout/File.php
rename to lib/Magento/View/Layout/File.php
index 2f61b36365a..74fa444f484 100644
--- a/app/code/Magento/Core/Model/Layout/File.php
+++ b/lib/Magento/View/Layout/File.php
@@ -1,5 +1,7 @@
<?php
/**
+ * Layout file in the file system with context of its identity
+ *
* Magento
*
* NOTICE OF LICENSE
@@ -22,38 +24,40 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\View\Layout;
+
+use Magento\View\Design\ThemeInterface;
+
/**
- * Layout file in the file system with context of its identity
+ * @package Magento\View
*/
-namespace Magento\Core\Model\Layout;
-
class File
{
/**
* @var string
*/
- private $_filename;
+ private $filename;
/**
* @var string
*/
- private $_module;
+ private $module;
/**
- * @var \Magento\View\Design\ThemeInterface
+ * @var ThemeInterface
*/
- private $_theme;
+ private $theme;
/**
* @param string $filename
* @param string $module
- * @param \Magento\View\Design\ThemeInterface $theme
+ * @param ThemeInterface $theme
*/
- public function __construct($filename, $module, \Magento\View\Design\ThemeInterface $theme = null)
+ public function __construct($filename, $module, ThemeInterface $theme = null)
{
- $this->_filename = $filename;
- $this->_module = $module;
- $this->_theme = $theme;
+ $this->filename = $filename;
+ $this->module = $module;
+ $this->theme = $theme;
}
/**
@@ -63,7 +67,7 @@ class File
*/
public function getFilename()
{
- return $this->_filename;
+ return $this->filename;
}
/**
@@ -73,7 +77,7 @@ class File
*/
public function getName()
{
- return basename($this->_filename);
+ return basename($this->filename);
}
/**
@@ -83,17 +87,17 @@ class File
*/
public function getModule()
{
- return $this->_module;
+ return $this->module;
}
/**
* Retrieve instance of a theme a file belongs to
*
- * @return \Magento\View\Design\ThemeInterface|null
+ * @return ThemeInterface|null
*/
public function getTheme()
{
- return $this->_theme;
+ return $this->theme;
}
/**
@@ -103,6 +107,6 @@ class File
*/
public function isBase()
{
- return is_null($this->_theme);
+ return is_null($this->theme);
}
}
diff --git a/app/code/Magento/Core/Model/Layout/File/Factory.php b/lib/Magento/View/Layout/File/Factory.php
similarity index 63%
rename from app/code/Magento/Core/Model/Layout/File/Factory.php
rename to lib/Magento/View/Layout/File/Factory.php
index 9bc257d7422..2740e30c043 100644
--- a/app/code/Magento/Core/Model/Layout/File/Factory.php
+++ b/lib/Magento/View/Layout/File/Factory.php
@@ -1,5 +1,7 @@
<?php
/**
+ * Factory that produces layout file instances
+ *
* Magento
*
* NOTICE OF LICENSE
@@ -22,24 +24,24 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/**
- * Factory that produces layout file instances
- */
-namespace Magento\Core\Model\Layout\File;
+namespace Magento\View\Layout\File;
+
+use Magento\ObjectManager;
+use Magento\View\Design\ThemeInterface;
class Factory
{
/**
- * @var \Magento\ObjectManager
+ * @var ObjectManager
*/
- private $_objectManager;
+ private $objectManager;
/**
- * @param \Magento\ObjectManager $objectManager
+ * @param ObjectManager $objectManager
*/
- public function __construct(\Magento\ObjectManager $objectManager)
+ public function __construct(ObjectManager $objectManager)
{
- $this->_objectManager = $objectManager;
+ $this->objectManager = $objectManager;
}
/**
@@ -47,14 +49,18 @@ class Factory
*
* @param string $filename
* @param string $module
- * @param \Magento\View\Design\ThemeInterface $theme
- * @return \Magento\Core\Model\Layout\File
+ * @param ThemeInterface $theme
+ * @return \Magento\View\Layout\File
*/
- public function create($filename, $module, \Magento\View\Design\ThemeInterface $theme = null)
+ public function create($filename, $module, ThemeInterface $theme = null)
{
- return $this->_objectManager->create(
- 'Magento\Core\Model\Layout\File',
- array('filename' => $filename, 'module' => $module, 'theme' => $theme)
+ return $this->objectManager->create(
+ 'Magento\View\Layout\File',
+ array(
+ 'filename' => $filename,
+ 'module' => $module,
+ 'theme' => $theme,
+ )
);
}
}
diff --git a/app/code/Magento/Core/Model/Layout/File/ListFile.php b/lib/Magento/View/Layout/File/FileList.php
similarity index 71%
rename from app/code/Magento/Core/Model/Layout/File/ListFile.php
rename to lib/Magento/View/Layout/File/FileList.php
index 510be3912ed..50f7079b3e1 100644
--- a/app/code/Magento/Core/Model/Layout/File/ListFile.php
+++ b/lib/Magento/View/Layout/File/FileList.php
@@ -1,5 +1,7 @@
<?php
/**
+ * Unordered list of layout file instances with awareness of layout file identity
+ *
* Magento
*
* NOTICE OF LICENSE
@@ -22,74 +24,73 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/**
- * Unordered list of layout file instances with awareness of layout file identity
- */
-namespace Magento\Core\Model\Layout\File;
+namespace Magento\View\Layout\File;
+
+use Magento\View\Layout\File;
-class ListFile
+class FileList
{
/**
- * @var \Magento\Core\Model\Layout\File[]
+ * @var File[]
*/
- private $_files = array();
+ private $files = array();
/**
* Retrieve all layout file instances
*
- * @return \Magento\Core\Model\Layout\File[]
+ * @return File[]
*/
public function getAll()
{
- return array_values($this->_files);
+ return array_values($this->files);
}
/**
* Add layout file instances to the list, preventing identity coincidence
*
- * @param \Magento\Core\Model\Layout\File[] $files
+ * @param File[] $files
* @throws \LogicException
*/
public function add(array $files)
{
foreach ($files as $file) {
- $identifier = $this->_getFileIdentifier($file);
- if (array_key_exists($identifier, $this->_files)) {
- $filename = $this->_files[$identifier]->getFilename();
+ $identifier = $this->getFileIdentifier($file);
+ if (array_key_exists($identifier, $this->files)) {
+ $filename = $this->files[$identifier]->getFilename();
throw new \LogicException(
"Layout file '{$file->getFilename()}' is indistinguishable from the file '{$filename}'."
);
}
- $this->_files[$identifier] = $file;
+ $this->files[$identifier] = $file;
}
}
/**
* Replace already added layout files with specified ones, checking for identity match
*
- * @param \Magento\Core\Model\Layout\File[] $files
+ * @param File[] $files
* @throws \LogicException
*/
public function replace(array $files)
{
foreach ($files as $file) {
- $identifier = $this->_getFileIdentifier($file);
- if (!array_key_exists($identifier, $this->_files)) {
+ $identifier = $this->getFileIdentifier($file);
+ if (!array_key_exists($identifier, $this->files)) {
throw new \LogicException(
"Overriding layout file '{$file->getFilename()}' does not match to any of the files."
);
}
- $this->_files[$identifier] = $file;
+ $this->files[$identifier] = $file;
}
}
/**
* Calculate unique identifier for a layout file
*
- * @param \Magento\Core\Model\Layout\File $file
+ * @param File $file
* @return string
*/
- protected function _getFileIdentifier(\Magento\Core\Model\Layout\File $file)
+ protected function getFileIdentifier(File $file)
{
$theme = ($file->getTheme() ? 'theme:' . $file->getTheme()->getFullPath() : 'base');
return $theme . '|module:' . $file->getModule() . '|file:' . $file->getName();
diff --git a/app/code/Magento/Core/Model/Layout/File/FileList/Factory.php b/lib/Magento/View/Layout/File/FileList/Factory.php
similarity index 72%
rename from app/code/Magento/Core/Model/Layout/File/FileList/Factory.php
rename to lib/Magento/View/Layout/File/FileList/Factory.php
index 576b7983b79..b8873456cb2 100644
--- a/app/code/Magento/Core/Model/Layout/File/FileList/Factory.php
+++ b/lib/Magento/View/Layout/File/FileList/Factory.php
@@ -1,5 +1,7 @@
<?php
/**
+ * Factory that produces layout file list instances
+ *
* Magento
*
* NOTICE OF LICENSE
@@ -22,33 +24,32 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/**
- * Factory that produces layout file list instances
- */
-namespace Magento\Core\Model\Layout\File\FileList;
+namespace Magento\View\Layout\File\FileList;
+
+use Magento\ObjectManager;
class Factory
{
/**
- * @var \Magento\ObjectManager
+ * @var ObjectManager
*/
- private $_objectManager;
+ private $objectManager;
/**
- * @param \Magento\ObjectManager $objectManager
+ * @param ObjectManager $objectManager
*/
- public function __construct(\Magento\ObjectManager $objectManager)
+ public function __construct(ObjectManager $objectManager)
{
- $this->_objectManager = $objectManager;
+ $this->objectManager = $objectManager;
}
/**
* Return newly created instance of a layout file list
*
- * @return \Magento\Core\Model\Layout\File\ListFile
+ * @return \Magento\View\Layout\File\FileList
*/
public function create()
{
- return $this->_objectManager->create('Magento\Core\Model\Layout\File\ListFile');
+ return $this->objectManager->create('Magento\View\Layout\File\FileList');
}
}
diff --git a/lib/Magento/View/Layout/File/Source/Aggregated.php b/lib/Magento/View/Layout/File/Source/Aggregated.php
new file mode 100644
index 00000000000..c9796ced27b
--- /dev/null
+++ b/lib/Magento/View/Layout/File/Source/Aggregated.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Source of layout files aggregated from a theme and its parents according to merging and overriding conventions
+ *
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\View\Layout\File\Source;
+
+use Magento\View\Layout\File\SourceInterface;
+use Magento\View\Design\ThemeInterface;
+use Magento\View\Layout\File\FileList\Factory;
+
+class Aggregated implements SourceInterface
+{
+ /**
+ * @var Factory
+ */
+ private $fileListFactory;
+
+ /**
+ * @var SourceInterface
+ */
+ private $baseFiles;
+
+ /**
+ * @var SourceInterface
+ */
+ private $themeFiles;
+
+ /**
+ * @var SourceInterface
+ */
+ private $overrideBaseFiles;
+
+ /**
+ * @var SourceInterface
+ */
+ private $overrideThemeFiles;
+
+ /**
+ * @param Factory $fileListFactory
+ * @param SourceInterface $baseFiles
+ * @param SourceInterface $themeFiles
+ * @param SourceInterface $overrideBaseFiles
+ * @param SourceInterface $overrideThemeFiles
+ */
+ public function __construct(
+ Factory $fileListFactory,
+ SourceInterface $baseFiles,
+ SourceInterface $themeFiles,
+ SourceInterface $overrideBaseFiles,
+ SourceInterface $overrideThemeFiles
+ ) {
+ $this->fileListFactory = $fileListFactory;
+ $this->baseFiles = $baseFiles;
+ $this->themeFiles = $themeFiles;
+ $this->overrideBaseFiles = $overrideBaseFiles;
+ $this->overrideThemeFiles = $overrideThemeFiles;
+ }
+
+ /**
+ * Aggregate layout files from modules and a theme and its ancestors
+ *
+ * {@inheritdoc}
+ */
+ public function getFiles(ThemeInterface $theme, $filePath = '*')
+ {
+ $list = $this->fileListFactory->create();
+ $list->add($this->baseFiles->getFiles($theme, $filePath));
+
+ foreach ($this->getInheritedThemes($theme) as $currentTheme) {
+ $list->add($this->themeFiles->getFiles($currentTheme, $filePath));
+ $list->replace($this->overrideBaseFiles->getFiles($currentTheme, $filePath));
+ $list->replace($this->overrideThemeFiles->getFiles($currentTheme, $filePath));
+ }
+ return $list->getAll();
+ }
+
+ /**
+ * Return the full theme inheritance sequence, from the root theme till a specified one
+ *
+ * @param ThemeInterface $theme
+ * @return Theme[] Format: array([<root_theme>, ..., <parent_theme>,] <current_theme>)
+ */
+ protected function getInheritedThemes(ThemeInterface $theme)
+ {
+ $result = array();
+ while ($theme) {
+ $result[] = $theme;
+ $theme = $theme->getParentTheme();
+ }
+ return array_reverse($result);
+ }
+}
diff --git a/lib/Magento/View/Layout/File/Source/Base.php b/lib/Magento/View/Layout/File/Source/Base.php
new file mode 100644
index 00000000000..ecb8c243dbb
--- /dev/null
+++ b/lib/Magento/View/Layout/File/Source/Base.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Source of base layout files introduced by modules
+ *
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\View\Layout\File\Source;
+
+use Magento\View\Layout\File\SourceInterface;
+use Magento\View\Design\ThemeInterface;
+use Magento\App\Dir;
+use Magento\Filesystem;
+use Magento\View\Layout\File\Factory;
+
+class Base implements SourceInterface
+{
+ /**
+ * @var Filesystem
+ */
+ private $filesystem;
+
+ /**
+ * @var Dir
+ */
+ private $dirs;
+
+ /**
+ * @var Factory
+ */
+ private $fileFactory;
+
+ /**
+ * @param Filesystem $filesystem
+ * @param Dir $dirs
+ * @param Factory $fileFactory
+ */
+ public function __construct(
+ Filesystem $filesystem,
+ Dir $dirs,
+ Factory $fileFactory
+ ) {
+ $this->filesystem = $filesystem;
+ $this->dirs = $dirs;
+ $this->fileFactory = $fileFactory;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getFiles(ThemeInterface $theme, $filePath = '*')
+ {
+ $namespace = $module = '*';
+ $area = $theme->getArea();
+ $files = $this->filesystem->searchKeys(
+ $this->dirs->getDir(Dir::MODULES),
+ "{$namespace}/{$module}/view/{$area}/layout/{$filePath}.xml"
+ );
+
+ $pattern = "#(?<namespace>[^/]+)/(?<module>[^/]+)/view/"
+ . preg_quote($area)
+ . "/layout/"
+ . preg_quote(rtrim($filePath, '*'))
+ . "[^/]*\.xml$#i";
+ $result = array();
+ foreach ($files as $filename) {
+ if (!preg_match($pattern, $filename, $matches)) {
+ continue;
+ }
+ $moduleFull = "{$matches['namespace']}_{$matches['module']}";
+ $result[] = $this->fileFactory->create($filename, $moduleFull);
+ }
+ return $result;
+ }
+}
diff --git a/app/code/Magento/Core/Model/Layout/File/Source/Decorator/ModuleDependency.php b/lib/Magento/View/Layout/File/Source/Decorator/ModuleDependency.php
similarity index 58%
rename from app/code/Magento/Core/Model/Layout/File/Source/Decorator/ModuleDependency.php
rename to lib/Magento/View/Layout/File/Source/Decorator/ModuleDependency.php
index 1fa4cb09466..fc0f1c686ae 100644
--- a/app/code/Magento/Core/Model/Layout/File/Source/Decorator/ModuleDependency.php
+++ b/lib/Magento/View/Layout/File/Source/Decorator/ModuleDependency.php
@@ -1,5 +1,7 @@
<?php
/**
+ * Decorator that sorts layout files according to dependencies between modules they belong to
+ *
* Magento
*
* NOTICE OF LICENSE
@@ -22,41 +24,42 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/**
- * Decorator that sorts layout files according to dependencies between modules they belong to
- */
-namespace Magento\Core\Model\Layout\File\Source\Decorator;
+namespace Magento\View\Layout\File\Source\Decorator;
+
+use Magento\View\Layout\File\SourceInterface;
+use Magento\View\Layout\File;
+use Magento\App\ModuleListInterface;
+use Magento\View\Design\ThemeInterface;
-class ModuleDependency
- implements \Magento\Core\Model\Layout\File\SourceInterface
+class ModuleDependency implements SourceInterface
{
/**
- * @var \Magento\Core\Model\Layout\File\SourceInterface
+ * @var SourceInterface
*/
- private $_subject;
+ private $subject;
/**
- * @var \Magento\App\ModuleListInterface
+ * @var ModuleListInterface
*/
- private $_moduleList;
+ private $moduleList;
/**
* Fully-qualified names of modules, ordered by their priority in the system
*
* @var array|null
*/
- private $_orderedModules = null;
+ private $orderedModules;
/**
- * @param \Magento\Core\Model\Layout\File\SourceInterface $subject
- * @param \Magento\App\ModuleListInterface $listInterface
+ * @param SourceInterface $subject
+ * @param ModuleListInterface $listInterface
*/
public function __construct(
- \Magento\Core\Model\Layout\File\SourceInterface $subject,
- \Magento\App\ModuleListInterface $listInterface
+ SourceInterface $subject,
+ ModuleListInterface $listInterface
) {
- $this->_subject = $subject;
- $this->_moduleList = $listInterface;
+ $this->subject = $subject;
+ $this->moduleList = $listInterface;
}
/**
@@ -64,9 +67,9 @@ class ModuleDependency
*
* {@inheritdoc}
*/
- public function getFiles(\Magento\View\Design\ThemeInterface $theme)
+ public function getFiles(ThemeInterface $theme, $filePath = '*')
{
- $result = $this->_subject->getFiles($theme);
+ $result = $this->subject->getFiles($theme, $filePath);
usort($result, array($this, 'compareFiles'));
return $result;
}
@@ -74,17 +77,17 @@ class ModuleDependency
/**
* Compare layout files according to the priority of modules they belong to. To be used as a callback for sorting.
*
- * @param \Magento\Core\Model\Layout\File $fileOne
- * @param \Magento\Core\Model\Layout\File $fileTwo
+ * @param File $fileOne
+ * @param File $fileTwo
* @return int
*/
- public function compareFiles(\Magento\Core\Model\Layout\File $fileOne, \Magento\Core\Model\Layout\File $fileTwo)
+ public function compareFiles(File $fileOne, File $fileTwo)
{
if ($fileOne->getModule() == $fileTwo->getModule()) {
return strcmp($fileOne->getName(), $fileTwo->getName());
}
- $moduleOnePriority = $this->_getModulePriority($fileOne->getModule());
- $moduleTwoPriority = $this->_getModulePriority($fileTwo->getModule());
+ $moduleOnePriority = $this->getModulePriority($fileOne->getModule());
+ $moduleTwoPriority = $this->getModulePriority($fileTwo->getModule());
if ($moduleOnePriority == $moduleTwoPriority) {
return strcmp($fileOne->getModule(), $fileTwo->getModule());
}
@@ -97,16 +100,16 @@ class ModuleDependency
* @param string $moduleName
* @return int
*/
- protected function _getModulePriority($moduleName)
+ protected function getModulePriority($moduleName)
{
- if ($this->_orderedModules === null) {
- $this->_orderedModules = array();
- foreach ($this->_moduleList->getModules() as $module) {
- $this->_orderedModules[] = $module['name'];
+ if ($this->orderedModules === null) {
+ $this->orderedModules = array();
+ foreach ($this->moduleList->getModules() as $module) {
+ $this->orderedModules[] = $module['name'];
}
}
- $result = array_search($moduleName, $this->_orderedModules);
- // assume unknown modules have the same priority, distinctive from known modules
+ $result = array_search($moduleName, $this->orderedModules);
+ // Assume unknown modules have the same priority, distinctive from known modules
if ($result === false) {
return -1;
}
diff --git a/app/code/Magento/Core/Model/Layout/File/Source/Decorator/ModuleOutput.php b/lib/Magento/View/Layout/File/Source/Decorator/ModuleOutput.php
similarity index 64%
rename from app/code/Magento/Core/Model/Layout/File/Source/Decorator/ModuleOutput.php
rename to lib/Magento/View/Layout/File/Source/Decorator/ModuleOutput.php
index f95a340b83c..8e24a4b4737 100644
--- a/app/code/Magento/Core/Model/Layout/File/Source/Decorator/ModuleOutput.php
+++ b/lib/Magento/View/Layout/File/Source/Decorator/ModuleOutput.php
@@ -1,5 +1,7 @@
<?php
/**
+ * Decorator that filters out layout files that belong to modules, output of which is prohibited
+ *
* Magento
*
* NOTICE OF LICENSE
@@ -22,33 +24,35 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/**
- * Decorator that filters out layout files that belong to modules, output of which is prohibited
- */
-namespace Magento\Core\Model\Layout\File\Source\Decorator;
+namespace Magento\View\Layout\File\Source\Decorator;
+
+use Magento\View\Layout\File\SourceInterface;
+use Magento\View\Layout\File;
+use Magento\Core\Model\ModuleManager;
+use Magento\View\Design\ThemeInterface;
-class ModuleOutput implements \Magento\Core\Model\Layout\File\SourceInterface
+class ModuleOutput implements SourceInterface
{
/**
- * @var \Magento\Core\Model\Layout\File\SourceInterface
+ * @var SourceInterface
*/
- private $_subject;
+ private $subject;
/**
* @var \Magento\Core\Model\ModuleManager
*/
- private $_moduleManager;
+ private $moduleManager;
/**
- * @param \Magento\Core\Model\Layout\File\SourceInterface $subject
- * @param \Magento\Core\Model\ModuleManager $moduleManager
+ * @param SourceInterface $subject
+ * @param ModuleManager $moduleManager
*/
public function __construct(
- \Magento\Core\Model\Layout\File\SourceInterface $subject,
- \Magento\Core\Model\ModuleManager $moduleManager
+ SourceInterface $subject,
+ ModuleManager $moduleManager
) {
- $this->_subject = $subject;
- $this->_moduleManager = $moduleManager;
+ $this->subject = $subject;
+ $this->moduleManager = $moduleManager;
}
/**
@@ -56,11 +60,11 @@ class ModuleOutput implements \Magento\Core\Model\Layout\File\SourceInterface
*
* {@inheritdoc}
*/
- public function getFiles(\Magento\View\Design\ThemeInterface $theme)
+ public function getFiles(ThemeInterface $theme, $filePath = '*')
{
$result = array();
- foreach ($this->_subject->getFiles($theme) as $file) {
- if ($this->_moduleManager->isOutputEnabled($file->getModule())) {
+ foreach ($this->subject->getFiles($theme, $filePath) as $file) {
+ if ($this->moduleManager->isOutputEnabled($file->getModule())) {
$result[] = $file;
}
}
diff --git a/app/code/Magento/Core/Model/Layout/File/Source/Override/Base.php b/lib/Magento/View/Layout/File/Source/Override/Base.php
similarity index 54%
rename from app/code/Magento/Core/Model/Layout/File/Source/Override/Base.php
rename to lib/Magento/View/Layout/File/Source/Override/Base.php
index 121c33d0ca5..52b5639c56f 100644
--- a/app/code/Magento/Core/Model/Layout/File/Source/Override/Base.php
+++ b/lib/Magento/View/Layout/File/Source/Override/Base.php
@@ -1,5 +1,7 @@
<?php
/**
+ * Source of layout files that explicitly override base files introduced by modules
+ *
* Magento
*
* NOTICE OF LICENSE
@@ -22,59 +24,67 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/**
- * Source of layout files that explicitly override base files introduced by modules
- */
-namespace Magento\Core\Model\Layout\File\Source\Override;
+namespace Magento\View\Layout\File\Source\Override;
+
+use Magento\View\Layout\File\SourceInterface;
+use Magento\View\Design\ThemeInterface;
+use Magento\App\Dir;
+use Magento\Filesystem;
+use Magento\View\Layout\File\Factory;
-class Base implements \Magento\Core\Model\Layout\File\SourceInterface
+class Base implements SourceInterface
{
/**
- * @var \Magento\Filesystem
+ * @var Filesystem
*/
- private $_filesystem;
+ private $filesystem;
/**
- * @var \Magento\App\Dir
+ * @var Dir
*/
- private $_dirs;
+ private $dirs;
/**
- * @var \Magento\Core\Model\Layout\File\Factory
+ * @var Factory
*/
- private $_fileFactory;
+ private $fileFactory;
/**
- * @param \Magento\Filesystem $filesystem
- * @param \Magento\App\Dir $dirs
- * @param \Magento\Core\Model\Layout\File\Factory $fileFactory
+ * @param Filesystem $filesystem
+ * @param Dir $dirs
+ * @param Factory $fileFactory
*/
public function __construct(
- \Magento\Filesystem $filesystem,
- \Magento\App\Dir $dirs,
- \Magento\Core\Model\Layout\File\Factory $fileFactory
+ Filesystem $filesystem,
+ Dir $dirs,
+ Factory $fileFactory
) {
- $this->_filesystem = $filesystem;
- $this->_dirs = $dirs;
- $this->_fileFactory = $fileFactory;
+ $this->filesystem = $filesystem;
+ $this->dirs = $dirs;
+ $this->fileFactory = $fileFactory;
}
/**
* {@inheritdoc}
*/
- public function getFiles(\Magento\View\Design\ThemeInterface $theme)
+ public function getFiles(ThemeInterface $theme, $filePath = '*')
{
$namespace = $module = '*';
$themePath = $theme->getFullPath();
- $files = $this->_filesystem->searchKeys(
- $this->_dirs->getDir(\Magento\App\Dir::THEMES),
- "{$themePath}/{$namespace}_{$module}/layout/override/*.xml"
+ $files = $this->filesystem->searchKeys(
+ $this->dirs->getDir(Dir::THEMES),
+ "{$themePath}/{$namespace}_{$module}/layout/override/base/{$filePath}.xml"
);
+
$result = array();
+ $pattern = "#/(?<moduleName>[^/]+)/layout/override/base/"
+ . preg_quote(rtrim($filePath, '*'))
+ . "[^/]*\.xml$#i";
foreach ($files as $filename) {
- $moduleDir = dirname(dirname(dirname($filename)));
- $moduleFull = basename($moduleDir);
- $result[] = $this->_fileFactory->create($filename, $moduleFull);
+ if (!preg_match($pattern, $filename, $matches)) {
+ continue;
+ }
+ $result[] = $this->fileFactory->create($filename, $matches['moduleName']);
}
return $result;
}
diff --git a/app/code/Magento/Core/Model/Layout/File/Source/Override/Theme.php b/lib/Magento/View/Layout/File/Source/Override/Theme.php
similarity index 52%
rename from app/code/Magento/Core/Model/Layout/File/Source/Override/Theme.php
rename to lib/Magento/View/Layout/File/Source/Override/Theme.php
index ad8e7065fba..7927f9e3091 100644
--- a/app/code/Magento/Core/Model/Layout/File/Source/Override/Theme.php
+++ b/lib/Magento/View/Layout/File/Source/Override/Theme.php
@@ -1,5 +1,7 @@
<?php
/**
+ * Source of layout files that explicitly override files of ancestor themes
+ *
* Magento
*
* NOTICE OF LICENSE
@@ -22,53 +24,57 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/**
- * Source of layout files that explicitly override files of ancestor themes
- */
-namespace Magento\Core\Model\Layout\File\Source\Override;
+namespace Magento\View\Layout\File\Source\Override;
+
+use Magento\View\Layout\File\SourceInterface;
+use Magento\View\Design\ThemeInterface;
+use Magento\App\Dir;
+use Magento\Filesystem;
+use Magento\View\Layout\File\Factory;
+use Magento\Core\Exception;
-class Theme implements \Magento\Core\Model\Layout\File\SourceInterface
+class Theme implements SourceInterface
{
/**
- * @var \Magento\Filesystem
+ * @var Filesystem
*/
- private $_filesystem;
+ private $filesystem;
/**
- * @var \Magento\App\Dir
+ * @var Dir
*/
- private $_dirs;
+ private $dirs;
/**
- * @var \Magento\Core\Model\Layout\File\Factory
+ * @var Factory
*/
- private $_fileFactory;
+ private $fileFactory;
/**
- * @param \Magento\Filesystem $filesystem
- * @param \Magento\App\Dir $dirs
- * @param \Magento\Core\Model\Layout\File\Factory $fileFactory
+ * @param Filesystem $filesystem
+ * @param Dir $dirs
+ * @param Factory $fileFactory
*/
public function __construct(
- \Magento\Filesystem $filesystem,
- \Magento\App\Dir $dirs,
- \Magento\Core\Model\Layout\File\Factory $fileFactory
+ Filesystem $filesystem,
+ Dir $dirs,
+ Factory $fileFactory
) {
- $this->_filesystem = $filesystem;
- $this->_dirs = $dirs;
- $this->_fileFactory = $fileFactory;
+ $this->filesystem = $filesystem;
+ $this->dirs = $dirs;
+ $this->fileFactory = $fileFactory;
}
/**
* {@inheritdoc}
*/
- public function getFiles(\Magento\View\Design\ThemeInterface $theme)
+ public function getFiles(ThemeInterface $theme, $filePath = '*')
{
$namespace = $module = '*';
$themePath = $theme->getFullPath();
- $files = $this->_filesystem->searchKeys(
- $this->_dirs->getDir(\Magento\App\Dir::THEMES),
- "{$themePath}/{$namespace}_{$module}/layout/override/*/*.xml"
+ $files = $this->filesystem->searchKeys(
+ $this->dirs->getDir(Dir::THEMES),
+ "{$themePath}/{$namespace}_{$module}/layout/override/theme/*/{$filePath}.xml"
);
if (empty($files)) {
@@ -82,18 +88,26 @@ class Theme implements \Magento\Core\Model\Layout\File\SourceInterface
}
$result = array();
+ $pattern = "#(?<module>[^/]+)/layout/override/theme/(?<themeName>[^/]+)/"
+ . preg_quote(rtrim($filePath, '*'))
+ . "[^/]*\.xml$#i";
foreach ($files as $filename) {
- if (preg_match("#([^/]+)/layout/override/([^/]+)/[^/]+\.xml$#i", $filename, $matches)) {
- $moduleFull = $matches[1];
- $ancestorThemeCode = $matches[2];
- if (!isset($themes[$ancestorThemeCode])) {
- throw new \Magento\Core\Exception(sprintf(
+ if (!preg_match($pattern, $filename, $matches)) {
+ continue;
+ }
+ $moduleFull = $matches['module'];
+ $ancestorThemeCode = $matches['themeName'];
+ if (!isset($themes[$ancestorThemeCode])) {
+ throw new Exception(
+ sprintf(
"Trying to override layout file '%s' for theme '%s', which is not ancestor of theme '%s'",
- $filename, $ancestorThemeCode, $theme->getCode()
- ));
- }
- $result[] = $this->_fileFactory->create($filename, $moduleFull, $themes[$ancestorThemeCode]);
+ $filename,
+ $ancestorThemeCode,
+ $theme->getCode()
+ )
+ );
}
+ $result[] = $this->fileFactory->create($filename, $moduleFull, $themes[$ancestorThemeCode]);
}
return $result;
}
diff --git a/app/code/Magento/Core/Model/Layout/File/Source/Theme.php b/lib/Magento/View/Layout/File/Source/Theme.php
similarity index 51%
rename from app/code/Magento/Core/Model/Layout/File/Source/Theme.php
rename to lib/Magento/View/Layout/File/Source/Theme.php
index 2cdd4d4eec6..0bad442387e 100644
--- a/app/code/Magento/Core/Model/Layout/File/Source/Theme.php
+++ b/lib/Magento/View/Layout/File/Source/Theme.php
@@ -1,5 +1,7 @@
<?php
/**
+ * Source of non-overriding layout files introduced by a theme
+ *
* Magento
*
* NOTICE OF LICENSE
@@ -22,59 +24,66 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/**
- * Source of non-overriding layout files introduced by a theme
- */
-namespace Magento\Core\Model\Layout\File\Source;
+namespace Magento\View\Layout\File\Source;
+
+use Magento\View\Layout\File\SourceInterface;
+use Magento\View\Design\ThemeInterface;
+use Magento\App\Dir;
+use Magento\Filesystem;
+use Magento\View\Layout\File\Factory;
-class Theme implements \Magento\Core\Model\Layout\File\SourceInterface
+class Theme implements SourceInterface
{
/**
- * @var \Magento\Filesystem
+ * @var Filesystem
*/
- private $_filesystem;
+ private $filesystem;
/**
- * @var \Magento\App\Dir
+ * @var Dir
*/
- private $_dirs;
+ private $dirs;
/**
- * @var \Magento\Core\Model\Layout\File\Factory
+ * @var Factory
*/
- private $_fileFactory;
+ private $fileFactory;
/**
- * @param \Magento\Filesystem $filesystem
- * @param \Magento\App\Dir $dirs
- * @param \Magento\Core\Model\Layout\File\Factory $fileFactory
+ * @param Filesystem $filesystem
+ * @param Dir $dirs
+ * @param Factory $fileFactory
*/
public function __construct(
- \Magento\Filesystem $filesystem,
- \Magento\App\Dir $dirs,
- \Magento\Core\Model\Layout\File\Factory $fileFactory
+ Filesystem $filesystem,
+ Dir $dirs,
+ Factory $fileFactory
) {
- $this->_filesystem = $filesystem;
- $this->_dirs = $dirs;
- $this->_fileFactory = $fileFactory;
+ $this->filesystem = $filesystem;
+ $this->dirs = $dirs;
+ $this->fileFactory = $fileFactory;
}
/**
* {@inheritdoc}
*/
- public function getFiles(\Magento\View\Design\ThemeInterface $theme)
+ public function getFiles(ThemeInterface $theme, $filePath = '*')
{
$namespace = $module = '*';
$themePath = $theme->getFullPath();
- $files = $this->_filesystem->searchKeys(
- $this->_dirs->getDir(\Magento\App\Dir::THEMES),
- "{$themePath}/{$namespace}_{$module}/layout/*.xml"
+ $files = $this->filesystem->searchKeys(
+ $this->dirs->getDir(Dir::THEMES),
+ "{$themePath}/{$namespace}_{$module}/layout/{$filePath}.xml"
);
$result = array();
+ $pattern = "#" . preg_quote($themePath) . "/(?<moduleName>[^/]+)/layout/"
+ . preg_quote(rtrim($filePath, '*'))
+ . "[^/]*\.xml$#i";
foreach ($files as $filename) {
- $moduleDir = dirname(dirname($filename));
- $moduleFull = basename($moduleDir);
- $result[] = $this->_fileFactory->create($filename, $moduleFull, $theme);
+ if (!preg_match($pattern, $filename, $matches)) {
+ continue;
+ }
+ $result[] = $this->fileFactory->create($filename, $matches['moduleName'], $theme);
}
return $result;
}
diff --git a/app/code/Magento/Core/Model/Layout/File/SourceInterface.php b/lib/Magento/View/Layout/File/SourceInterface.php
similarity index 77%
rename from app/code/Magento/Core/Model/Layout/File/SourceInterface.php
rename to lib/Magento/View/Layout/File/SourceInterface.php
index 5f95486b05e..57b9d7e9fcc 100644
--- a/app/code/Magento/Core/Model/Layout/File/SourceInterface.php
+++ b/lib/Magento/View/Layout/File/SourceInterface.php
@@ -1,5 +1,7 @@
<?php
/**
+ * Interface of locating layout files in the file system
+ *
* Magento
*
* NOTICE OF LICENSE
@@ -22,18 +24,18 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/**
- * Interface of locating layout files in the file system
- */
-namespace Magento\Core\Model\Layout\File;
+namespace Magento\View\Layout\File;
+
+use Magento\View\Design\ThemeInterface;
interface SourceInterface
{
/**
* Retrieve instances of layout files
*
- * @param \Magento\View\Design\ThemeInterface $theme Theme that defines the design context
- * @return \Magento\Core\Model\Layout\File[]
+ * @param ThemeInterface $theme Theme that defines the design context
+ * @param string $filePath [optional]
+ * @return \Magento\View\Layout\File[]
*/
- public function getFiles(\Magento\View\Design\ThemeInterface $theme);
+ public function getFiles(ThemeInterface $theme, $filePath = '*');
}
diff --git a/lib/Magento/View/Layout/ProcessorFactory.php b/lib/Magento/View/Layout/ProcessorFactory.php
index 5aa72ffe51b..798ac077105 100644
--- a/lib/Magento/View/Layout/ProcessorFactory.php
+++ b/lib/Magento/View/Layout/ProcessorFactory.php
@@ -34,14 +34,14 @@ class ProcessorFactory
*
* @var \Magento\ObjectManager
*/
- protected $_objectManager = null;
+ protected $objectManager;
/**
* Instance name to create
*
* @var string
*/
- protected $_instanceName = null;
+ protected $instanceName;
/**
* Factory constructor
@@ -53,8 +53,8 @@ class ProcessorFactory
\Magento\ObjectManager $objectManager,
$instanceName = 'Magento\View\Layout\ProcessorInterface'
) {
- $this->_objectManager = $objectManager;
- $this->_instanceName = $instanceName;
+ $this->objectManager = $objectManager;
+ $this->instanceName = $instanceName;
}
/**
@@ -65,6 +65,6 @@ class ProcessorFactory
*/
public function create(array $data = array())
{
- return $this->_objectManager->create($this->_instanceName, $data);
+ return $this->objectManager->create($this->instanceName, $data);
}
}
\ No newline at end of file
diff --git a/lib/Magento/View/Layout/ProcessorInterface.php b/lib/Magento/View/Layout/ProcessorInterface.php
index b6fc393a04c..a50a7da89f7 100644
--- a/lib/Magento/View/Layout/ProcessorInterface.php
+++ b/lib/Magento/View/Layout/ProcessorInterface.php
@@ -24,6 +24,9 @@
namespace Magento\View\Layout;
+/**
+ * @package Magento\View
+ */
interface ProcessorInterface
{
/**
@@ -81,31 +84,21 @@ interface ProcessorInterface
public function addPageHandles(array $handlesToTry);
/**
- * Retrieve full hierarchy of types and fragment types in the system
+ * Retrieve all page and fragment types that exist in the system.
*
* Result format:
* array(
* 'handle_name_1' => array(
* 'name' => 'handle_name_1',
* 'label' => 'Handle Name 1',
- * 'children' => array(
- * 'handle_name_2' => array(
- * 'name' => 'handle_name_2',
- * 'label' => 'Handle Name 2',
- * 'type' => self::TYPE_PAGE or self::TYPE_FRAGMENT,
- * 'children' => array(
- * // ...
- * )
- * ),
- * // ...
- * )
+ * 'type' => self::TYPE_PAGE,
* ),
* // ...
* )
*
* @return array
*/
- public function getPageHandlesHierarchy();
+ public function getAllPageHandles();
/**
* Load layout updates by handles
diff --git a/lib/Magento/View/LayoutInterface.php b/lib/Magento/View/LayoutInterface.php
index db3dfbacbec..113cd4d7fd2 100644
--- a/lib/Magento/View/LayoutInterface.php
+++ b/lib/Magento/View/LayoutInterface.php
@@ -208,7 +208,7 @@ interface LayoutInterface
/**
* Add a block to registry, create new object if needed
*
- * @param string|Element\BlockInterface $block
+ * @param string|\Magento\Core\Block\AbstractBlock $block
* @param string $name
* @param string $parent
* @param string $alias
diff --git a/lib/Magento/View/Render/Html.php b/lib/Magento/View/Render/Html.php
new file mode 100644
index 00000000000..8bc49c98ceb
--- /dev/null
+++ b/lib/Magento/View/Render/Html.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\View\Render;
+
+use Magento\View\RenderInterface;
+use Magento\View\TemplateEngineFactory;
+
+class Html implements RenderInterface
+{
+ /**
+ * Render type
+ */
+ const TYPE_HTML = 'html';
+
+ /**
+ * @var TemplateEngineFactory
+ */
+ protected $templateFactory;
+
+ /**
+ * @param TemplateEngineFactory $templateFactory
+ */
+ public function __construct(
+ TemplateEngineFactory $templateFactory
+ ) {
+ $this->templateFactory = $templateFactory;
+ }
+
+ /**
+ * @param string $template
+ * @param array $data
+ * @return string
+ */
+ public function renderTemplate($template, array $data)
+ {
+ // wrap block's result with ui data containers
+ return $this->fetchView($template, $data);
+ }
+
+ /**
+ * @param string $content
+ * @param array $containerInfo
+ * @return string
+ */
+ public function renderContainer($content, array $containerInfo = array())
+ {
+ if (isset($containerInfo['tag'])) {
+ $htmlId = $htmlClass = '';
+ if (isset($containerInfo['id'])) {
+ $htmlId = ' id="' . $containerInfo['id']. '"';
+ }
+ if (isset($containerInfo['class'])) {
+ $htmlClass = ' class="'. $containerInfo['class'] . '"';
+ }
+ $content = sprintf('<%1$s%2$s%3$s>%4$s</%1$s>', $containerInfo['tag'], $htmlId, $htmlClass, $content);
+ }
+ return $content;
+ }
+
+ /**
+ * Retrieve rendered output
+ *
+ * @param string $template
+ * @param array $data
+ * @return string
+ */
+ protected function fetchView($template, array $data = array())
+ {
+ $extension = pathinfo($template, PATHINFO_EXTENSION);
+ $templateEngine = $this->templateFactory->get($extension);
+ return $templateEngine->render($template, $data);
+ }
+}
\ No newline at end of file
diff --git a/lib/Magento/View/Render/RenderFactory.php b/lib/Magento/View/Render/RenderFactory.php
new file mode 100644
index 00000000000..f7f3fe38f49
--- /dev/null
+++ b/lib/Magento/View/Render/RenderFactory.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\View\Render;
+
+use Magento\ObjectManager;
+use Magento\View\RenderInterface;
+
+class RenderFactory
+{
+ /**
+ * @var ObjectManager
+ */
+ protected $objectManager;
+
+ /**
+ * @param ObjectManager $objectManager
+ */
+ public function __construct(ObjectManager $objectManager)
+ {
+ $this->objectManager = $objectManager;
+ }
+
+ /**
+ * @param string $type
+ * @return mixed
+ * @throws \InvalidArgumentException
+ */
+ public function get($type)
+ {
+ $className = 'Magento\\View\\Render\\' . ucfirst($type);
+ $model = $this->objectManager->get($className);
+
+ if (($model instanceof RenderInterface) === false) {
+ throw new \InvalidArgumentException(
+ sprintf('Type "%s" is not instance on Magento\View\RenderInterface', $type)
+ );
+ }
+
+ return $model;
+ }
+}
diff --git a/lib/Magento/View/RenderInterface.php b/lib/Magento/View/RenderInterface.php
new file mode 100644
index 00000000000..447a511b3a2
--- /dev/null
+++ b/lib/Magento/View/RenderInterface.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+namespace Magento\View;
+
+interface RenderInterface
+{
+ /**
+ * @param string $template
+ * @param array $data
+ * @return string
+ */
+ public function renderTemplate($template, array $data);
+
+ /**
+ * @param string $content
+ * @param array $containerInfo
+ * @return string
+ */
+ public function renderContainer($content, array $containerInfo = array());
+}
diff --git a/app/code/Magento/Core/Model/TemplateEngine/Php.php b/lib/Magento/View/TemplateEngine/Php.php
similarity index 91%
rename from app/code/Magento/Core/Model/TemplateEngine/Php.php
rename to lib/Magento/View/TemplateEngine/Php.php
index 9fe64a6faff..3e4891796b3 100644
--- a/app/code/Magento/Core/Model/TemplateEngine/Php.php
+++ b/lib/Magento/View/TemplateEngine/Php.php
@@ -20,14 +20,16 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package Magento_Core
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\TemplateEngine;
-class Php implements \Magento\Core\Model\TemplateEngine\EngineInterface
+namespace Magento\View\TemplateEngine;
+
+use Magento\View\TemplateEngineInterface;
+use Magento\Core\Block\Template;
+
+class Php implements TemplateEngineInterface
{
/**
* @var \Magento\Core\Block\Template
@@ -45,7 +47,7 @@ class Php implements \Magento\Core\Model\TemplateEngine\EngineInterface
* @return string
* @throws \Exception any exception that the template may throw
*/
- public function render(\Magento\Core\Block\Template $block, $fileName, array $dictionary = array())
+ public function render(Template $block, $fileName, array $dictionary = array())
{
ob_start();
try {
diff --git a/app/code/Magento/Core/Model/TemplateEngine/Pool.php b/lib/Magento/View/TemplateEngineFactory.php
similarity index 56%
rename from app/code/Magento/Core/Model/TemplateEngine/Pool.php
rename to lib/Magento/View/TemplateEngineFactory.php
index cffdaa8750d..49d2f3d488c 100644
--- a/app/code/Magento/Core/Model/TemplateEngine/Pool.php
+++ b/lib/Magento/View/TemplateEngineFactory.php
@@ -1,6 +1,6 @@
<?php
/**
- * In-memory pool of all template engines available in the system
+ * Factory class for Template Engine
*
* Magento
*
@@ -23,39 +23,44 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\TemplateEngine;
-class Pool
+namespace Magento\View;
+
+use Magento\ObjectManager;
+
+class TemplateEngineFactory
{
/**
- * @var Factory
+ * @var ObjectManager
*/
- protected $_factory;
+ protected $objectManager;
/**
- * @var EngineInterface[]
+ * Template engine type
*/
- protected $_engines = array();
+ const ENGINE_PHTML = 'phtml';
/**
- * @param Factory $factory
+ * @param ObjectManager $objectManager
*/
- public function __construct(Factory $factory)
+ public function __construct(ObjectManager $objectManager)
{
- $this->_factory = $factory;
+ $this->objectManager = $objectManager;
}
/**
- * Retrieve a template engine instance by its unique name
+ * Gets the singleton instance of the appropriate template engine
*
* @param string $name
- * @return EngineInterface
+ * @return \Magento\View\TemplateEngineInterface
+ * @throws \InvalidArgumentException if template engine doesn't exist
*/
public function get($name)
{
- if (!isset($this->_engines[$name])) {
- $this->_engines[$name] = $this->_factory->create($name);
+ if (self::ENGINE_PHTML == $name) {
+ return $this->objectManager->get('Magento\\View\\TemplateEngine\\Php');
}
- return $this->_engines[$name];
+ // Unknown type, throw exception
+ throw new \InvalidArgumentException('Unknown template engine type: ' . $name);
}
}
diff --git a/app/code/Magento/Core/Model/TemplateEngine/EngineInterface.php b/lib/Magento/View/TemplateEngineInterface.php
similarity index 94%
rename from app/code/Magento/Core/Model/TemplateEngine/EngineInterface.php
rename to lib/Magento/View/TemplateEngineInterface.php
index 85583db7cca..cbce33bc87f 100644
--- a/app/code/Magento/Core/Model/TemplateEngine/EngineInterface.php
+++ b/lib/Magento/View/TemplateEngineInterface.php
@@ -23,9 +23,10 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Core\Model\TemplateEngine;
-interface EngineInterface
+namespace Magento\View;
+
+interface TemplateEngineInterface
{
/**
* Render the named template in the context of a particular block and with
@@ -37,4 +38,4 @@ interface EngineInterface
* @return string rendered template
*/
public function render(\Magento\Core\Block\Template $block, $templateFile, array $dictionary = array());
-}
+}
\ No newline at end of file
diff --git a/pub/errors/default/page.phtml b/pub/errors/default/page.phtml
index b641b9a8952..6af6bd4d808 100644
--- a/pub/errors/default/page.phtml
+++ b/pub/errors/default/page.phtml
@@ -52,7 +52,9 @@
</div>
<div class="footer-container">
<div class="footer">
- <address class="copyright">Magento® is a trademark of X.commerce, Inc. Copyright © 2012 X.commerce, Inc.</address>
+ <address class="copyright">
+ <?php echo sprintf('Magento is an eBay Inc. company. Copyright© %s Magento, Inc. All rights reserved.', date('Y'));?>
+ </address>
</div>
</div>
</div>
diff --git a/pub/lib/mage/adminhtml/browser.js b/pub/lib/mage/adminhtml/browser.js
index f1fcf80ea32..df475b31fea 100644
--- a/pub/lib/mage/adminhtml/browser.js
+++ b/pub/lib/mage/adminhtml/browser.js
@@ -175,7 +175,7 @@
insertSelectedFiles: function(event) {
this.element.find('[data-row=file].selected').trigger('dblclick');
},
-
+
selectFile: function(event) {
var fileRow = $(event.currentTarget);
fileRow.toggleClass('selected');
@@ -203,7 +203,7 @@
throw "Target element not found for content update";
}
- $.ajax({
+ return $.ajax({
url: this.options.onInsertUrl,
data: {
filename: fileRow.attr('id'),
@@ -212,7 +212,7 @@
as_is: targetEl.is('textarea') ? 1 : 0,
form_key: FORM_KEY
},
- context: this.element,
+ context: this,
showLoader: true
}).done($.proxy(function(data) {
if (targetEl.is('textarea')) {
@@ -291,7 +291,7 @@
return false;
}
- $.ajax({
+ return $.ajax({
url: this.options.deleteFolderUrl,
dataType: 'json',
data: {
@@ -315,7 +315,7 @@
return $(this).attr('id');
}).toArray();
- $.ajax({
+ return $.ajax({
url: this.options.deleteFilesUrl,
data: {
files: ids,
diff --git a/pub/lib/mage/translate-inline.css b/pub/lib/mage/translate-inline.css
index fa93fa16c24..a3205650f66 100644
--- a/pub/lib/mage/translate-inline.css
+++ b/pub/lib/mage/translate-inline.css
@@ -23,16 +23,47 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-.trnslate-inline-area [data-translate], .trnslate-inline-area .translate-inline { /* background:black; font-weight:bold; color:red; */ outline: dotted 1px red!important;}
+.trnslate-inline-area [data-translate],
+.trnslate-inline-area .translate-inline {
+ outline: dotted 1px red!important;
+}
* html .translate-inline,
-*+html .translate-inline{ border: dotted 1px red !important;}
-.translate-inline-script, .translate-inline-title { background:yellow; color:black; font-weight:bold; }
-#translate-inline-trig { position:absolute;left:-1000px; opacity:.8; filter:alpha(opacity=80); cursor:pointer; margin-top:10px; z-index:2000;}
+*+html .translate-inline{
+ border: dotted 1px red !important;
+}
+.translate-inline-script, .translate-inline-title {
+ background: yellow;
+ color: black;
+ font-weight: bold;
+}
+#translate-inline-trig {
+ position: absolute;
+ left: -1000px;
+ opacity: .8;
+ filter: alpha(opacity=80);
+ cursor: pointer;
+ margin-top: 10px;
+ z-index: 2000;
+}
-.magento_table_container { background:#e7efef; margin:10px; padding:10px; }
-.magento_table_container table { width:100%; }
-.magento_table_container td { padding:2px 0 !important; text-align:left; }
-.magento_table_container th.label { width:150px; padding:2px 9px 2px 0 !important; font-weight:bold; }
-.magento_table_container td.value .input-text { width:98%; }
-.magento_table_container td.value textarea.input-text { height:8em; }
-p.accent { color:#d12c01; }
+.data.table.translate table {
+ width: 100%;
+}
+.data.table.translate td {
+ background: none;
+ padding: 5px 5px 5px 0;
+ text-align: left;
+}
+.data.table.translate th.label {
+ border: none;
+ font-weight: bold;
+ text-align: left;
+ padding: 5px 5px 5px 0;
+ width: 150px;
+}
+.data.table.translate td.value .input-text {
+ width: 98%;
+}
+p.accent {
+ color: #d12c01;
+}
diff --git a/var/.htaccess b/var/.htaccess
old mode 100755
new mode 100644
--
GitLab