From 6e24c0b89d2c9265f667a200a9a2131fbb3292db Mon Sep 17 00:00:00 2001
From: mage2-team <mage2-team@magento.com>
Date: Fri, 29 Nov 2013 09:20:29 -0800
Subject: [PATCH] 2.0.0.0-dev54 * Modularity improvements: * Breakdown of the
Adminhtml module: * Moved Newsletter, Report logic to the respective
modules * Moved blocks, config, view, layout files of other components
from Adminhtml folder to respective modules * Removed application
dependencies from the library * Move Magento\Core common blocks in the
library * Application areas rework: * Areas are independent from Store *
Removed deprecated annotation from the getArea methods * GitHub requests: *
[#245](https://github.com/magento/magento2/pull/245) -- Resolve design flaws
in core URL helper * [#247](https://github.com/magento/magento2/pull/247)
-- Bug in Mage_Page_Block_Html_Header->getIsHomePage *
[#259](https://github.com/magento/magento2/pull/259) -- Turkish Lira (TRY) is
supported for Turkish members. *
[#262](https://github.com/magento/magento2/pull/262) -- Update Rule.php *
[#373](https://github.com/magento/magento2/pull/373) -- [Magento/Sales] Fixed
typos * [#382](https://github.com/magento/magento2/pull/382) --
[Magento/Core] Fixed typos *
[#304](https://github.com/magento/magento2/pull/304) -- Removed Erroneous
closing " * [#323](https://github.com/magento/magento2/pull/323) --
InstanceController.php - made setBody protected *
[#349](https://github.com/magento/magento2/pull/349) -- Move Mage_Catalog
menu declaration into Mage_Catalog module. *
[#265](https://github.com/magento/magento2/pull/265) -- Update Merge.php *
[#271](https://github.com/magento/magento2/pull/271) -- Check Data should
validate gallery information *
[#305](https://github.com/magento/magento2/pull/305) -- Extra ", tidied up
nested quotes * [#352](https://github.com/magento/magento2/pull/352) -- Add
Croatia Country as part of European Union since 1st July 2013 for default
european local countries in configuration *
[#224](https://github.com/magento/magento2/pull/224) -- Tax formatting is
locale aware and should not *
[#338](https://github.com/magento/magento2/pull/338) -- Correcting SQL for
required_options column *
[#327](https://github.com/magento/magento2/pull/327) -- cart api bug fix &
partial invoice credit memo divide by zero warning * Themes update: * Old
frontend (magento_demo) and backend (magento_basic) themes are removed *
Updated templates and layout updates in the Bundle, Catalog,
CatalogInventory, CatalogSearch, Downloadable, ProductAlert, Reports,
Sendfriend modules * Fixed bugs: * Fixed the error when Magento cannot be
reinstalled to the same database with table prefix * Fixed report Products
in Cart * Fixed error on attempt to insert image to CMS pages under version
control * Fixed order status grid so that you can assign state, edit, and
view custom order status * Fixed Related Products Rule page so that
category can be selected on conditions tab * Fixed
Magento_Paypal_Controller_ExpressTest integration test so it is re-enabled
* Fixed the bug with international DHL quotes
---
CHANGELOG.md | 47 +-
.../Magento/AdminNotification/Model/Feed.php | 16 +-
.../Model/System/Message/Security.php | 12 +-
.../Model/Newsletter/Renderer/Text.php | 51 -
.../Adminhtml/etc/adminhtml/events.xml | 30 -
.../Magento/Adminhtml/etc/adminhtml/menu.xml | 54 -
app/code/Magento/Adminhtml/etc/config.xml | 78 -
app/code/Magento/Adminhtml/etc/di.xml | 42 -
app/code/Magento/Adminhtml/etc/module.xml | 19 -
app/code/Magento/Adminhtml/etc/sales.xml | 33 -
.../view/adminhtml/layout/default.xml | 301 ---
.../view/adminhtml/urlrewrite/selector.phtml | 2 +-
.../Authorizenet/Directpost/Payment.php | 2 +-
.../Controller/Directpost/Payment.php | 4 +-
.../Magento/Authorizenet/Helper/Backend.php | 102 +
app/code/Magento/Authorizenet/Helper/Data.php | 54 +-
.../Helper/HelperInterface.php} | 29 +-
.../Magento/Authorizenet/etc/adminhtml/di.xml | 1 +
.../Magento/Authorizenet/etc/frontend/di.xml | 1 +
.../view/adminhtml/directpost/iframe.phtml | 2 +-
.../view/adminhtml/directpost/info.phtml | 2 +-
.../view/frontend/directpost/iframe.phtml | 2 +-
.../Backend/App/Area/FrontNameResolver.php | 10 +-
app/code/Magento/Backend/App/Config.php | 88 +
.../Magento/Backend/App/ConfigInterface.php | 61 +
app/code/Magento/Backend/App/DefaultPath.php | 8 +-
.../Backend/App/Router/DefaultRouter.php | 66 +-
.../Block/Admin/Formkey.php | 6 +-
.../{Adminhtml => Backend}/Block/Cache.php | 4 +-
.../Block/Cache/Additional.php | 10 +-
app/code/Magento/Backend/Block/Dashboard.php | 4 +-
.../Searches/Renderer/Searchquery.php | 2 +-
.../Block/Dashboard/Tab/Customers/Newest.php | 4 +-
.../{Adminhtml => Backend}/Block/Denied.php | 6 +-
.../Block/Media/Uploader.php | 36 +-
.../{Adminhtml => Backend}/Block/Page.php | 8 +-
.../Block/Page/Footer.php | 8 +-
.../Block/Page/Head.php | 6 +-
.../Block/Page/Header.php | 8 +-
.../Block/Page/Notices.php | 8 +-
.../Block/Page/System/Config/Robots/Reset.php | 6 +-
.../Magento/Backend/Block/System/Design.php | 2 +-
.../Block/System/Store/Delete/Group.php | 2 +-
.../Block/System/Store/Delete/Website.php | 2 +-
.../Magento/Backend/Block/System/Variable.php | 2 +-
.../Block/Text/ListText.php | 6 +-
.../Backend/Block/Widget/Grid/Extended.php | 4 +-
.../Block/Widget/Grid/Massaction/Item.php | 6 +-
.../Controller/Adminhtml/System/Config.php | 4 +-
.../Magento/Backend/Model/Auth/Session.php | 31 +-
.../Template.php => Backend/Model/Cookie.php} | 26 +-
.../Model/Menu/Builder/AbstractCommand.php | 2 +-
.../Backend/Model/Resource/Translate.php | 20 +-
.../Model/Resource/Translate/String.php | 44 +
.../Model/Search/Catalog.php | 12 +-
.../Model/Search/Customer.php | 14 +-
.../Model/Search/Order.php | 14 +-
app/code/Magento/Backend/Model/Session.php | 21 +
.../Model/Translate/Inline.php} | 21 +-
.../Backend/Model/Translate/Inline/Config.php | 57 +
.../Model/Translate/Inline/ConfigFactory.php | 66 +
app/code/Magento/Backend/Model/Url.php | 66 +-
.../etc/adminhtml/acl.xml | 0
app/code/Magento/Backend/etc/adminhtml/di.xml | 15 +-
.../Magento/Backend/etc/adminhtml/events.xml | 3 +
.../Magento/Backend/etc/adminhtml/menu.xml | 17 +
app/code/Magento/Backend/etc/config.xml | 58 +
app/code/Magento/Backend/etc/di.xml | 11 +-
.../{Adminhtml => Backend}/etc/events.xml | 5 +-
.../Magento/Backend/etc/install/di.xml} | 6 +-
.../view/adminhtml/admin/access_denied.phtml | 2 +-
.../view/adminhtml/admin/formkey.phtml | 0
.../view/adminhtml/admin/overlay_popup.phtml | 0
.../view/adminhtml/admin/page.phtml | 2 +-
.../view/adminhtml/admin/popup.phtml | 4 +-
.../layout/adminhtml_cache_index.xml | 4 +-
.../adminhtml/layout/adminhtml_denied.xml | 2 +-
.../adminhtml/layout/adminhtml_noroute.xml | 0
.../Backend/view/adminhtml/layout/default.xml | 278 ++-
.../view/adminhtml/layout/editor.xml | 0
.../view/adminhtml/layout/empty.xml | 0
.../view/adminhtml/layout/formkey.xml | 2 +-
.../view/adminhtml/layout/overlay_popup.xml | 0
.../view/adminhtml/layout/popup.xml | 0
.../view/adminhtml/media/uploader.phtml | 2 +-
.../view/adminhtml/page/footer.phtml | 0
.../view/adminhtml/page/head.phtml | 2 +-
.../view/adminhtml/page/header.phtml | 2 +-
.../view/adminhtml/page/js/calendar.phtml | 0
.../view/adminhtml/page/js/components.phtml | 0
.../view/adminhtml/page/js/translate.phtml | 0
.../view/adminhtml/page/notices.phtml | 0
.../page/system/config/robots/reset.phtml | 2 +-
.../adminhtml/store/switcher/enhanced.phtml | 0
.../view/adminhtml/system/shipping/ups.phtml | 2 +-
.../Block/Adminhtml}/Backup.php | 14 +-
.../Block/Adminhtml}/Dialogs.php | 6 +-
.../Grid/Column/Renderer/Download.php | 2 +-
.../Controller/Adminhtml/Index.php} | 18 +-
app/code/Magento/Backup/Helper/Data.php | 61 +-
app/code/Magento/Backup/Model/Observer.php | 2 +-
app/code/Magento/Backup/Model/Resource/Db.php | 2 +-
.../Magento/Backup/etc/adminhtml/menu.xml | 2 +-
.../Magento/Backup/etc/adminhtml/routes.xml} | 10 +-
.../view/adminhtml/backup/dialogs.phtml | 9 +-
.../view/adminhtml/backup/left.phtml | 0
.../view/adminhtml/backup/list.phtml | 0
.../adminhtml/layout/backup_index_block.xml} | 0
.../adminhtml/layout/backup_index_grid.xml} | 2 +-
.../adminhtml/layout/backup_index_index.xml} | 4 +-
.../Product/Edit/Tab/Bundle/Option.php | 4 +-
.../Edit/Tab/Bundle/Option/Selection.php | 38 +-
.../Magento/Bundle/Model/Product/Type.php | 2 +-
.../Model/Resource/Option/Collection.php | 2 +-
.../Magento/Bundle/view/frontend/bundle.js | 4 +-
.../view/frontend/catalog/product/price.phtml | 276 ++-
.../catalog/product/view/backbutton.phtml | 6 +-
.../catalog/product/view/customize.phtml | 7 +-
.../catalog/product/view/options/notice.phtml | 2 -
.../frontend/catalog/product/view/price.phtml | 2 -
.../catalog/product/view/summary.phtml | 30 +-
.../catalog/product/view/tierprices.phtml | 6 +-
.../catalog/product/view/type/bundle.phtml | 49 +-
.../view/type/bundle/option/checkbox.phtml | 52 +-
.../view/type/bundle/option/multi.phtml | 48 +-
.../view/type/bundle/option/radio.phtml | 88 +-
.../view/type/bundle/option/select.phtml | 65 +-
.../product/view/type/bundle/options.phtml | 46 +-
.../Magento/Bundle/view/frontend/js/float.js | 2 -
.../view/frontend/js/product-summary.js | 2 -
.../Magento/Bundle/view/frontend/js/slide.js | 29 +-
.../catalog_product_view_type_bundle.xml | 40 +-
.../frontend/layout/checkout_cart_index.xml | 2 +-
.../Bundle/view/frontend/layout/default.xml | 11 +-
.../frontend/rss/catalog/product/price.phtml | 4 +-
.../order/creditmemo/items/renderer.phtml | 329 ++-
.../sales/order/invoice/items/renderer.phtml | 361 ++--
.../frontend/sales/order/items/renderer.phtml | 463 ++--
.../sales/order/shipment/items/renderer.phtml | 138 +-
.../Adminhtml/Captcha/DefaultCaptcha.php | 82 +
.../Captcha/Block/Captcha/DefaultCaptcha.php | 11 +-
.../Magento/Captcha/Helper/Adminhtml/Data.php | 88 +
app/code/Magento/Captcha/Helper/Data.php | 25 +-
app/code/Magento/Captcha/Model/Cron.php | 144 ++
app/code/Magento/Captcha/Model/Observer.php | 48 -
app/code/Magento/Captcha/etc/adminhtml/di.xml | 4 +
app/code/Magento/Captcha/etc/crontab.xml | 4 +-
.../etc/crontab/di.xml} | 6 +-
.../Catalog/Block/Adminhtml/Category/Tree.php | 4 +-
.../Form/Renderer/Fieldset/Element.php | 2 +-
.../Product/Attribute/Edit/Tab/Front.php | 10 +-
.../Product/Attribute/Edit/Tab/Main.php | 6 -
.../Attribute/Set/Main/Tree/Attribute.php | 2 +-
.../Product/Attribute/Set/Main/Tree/Group.php | 2 +-
.../Product/Attribute/Set/Toolbar/Add.php | 2 +-
.../Composite/Fieldset/Configurable.php | 2 +-
.../Edit/Action/Attribute/Tab/Attributes.php | 32 +-
.../Block/Adminhtml/Product/Edit/Js.php | 2 +-
.../Adminhtml/Product/Edit/Tab/Alerts.php | 2 +-
.../Product/Edit/Tab/Attributes/Create.php | 2 +-
.../Product/Edit/Tab/Options/Option.php | 42 +-
.../Edit/Tab/Options/Type/AbstractType.php | 24 +-
.../Adminhtml/Product/Edit/Tab/Reviews.php | 2 +-
.../Catalog/Block/Adminhtml/Product/Grid.php | 3 +-
.../Adminhtml/Product/Helper/Form/Gallery.php | 2 +-
.../Product/Helper/Form/Gallery/Content.php | 30 +-
.../Product/Widget/Chooser/Container.php | 2 +-
app/code/Magento/Catalog/Block/Navigation.php | 3 +-
.../Magento/Catalog/Block/Product/Gallery.php | 14 +-
.../Block/Product/ProductList/Toolbar.php | 2 +-
.../Block/Product/View/AbstractView.php | 2 +-
.../Block/Product/View/Type/Configurable.php | 2 +-
.../Catalog/Controller/Adminhtml/Product.php | 2 +-
.../Adminhtml/Product/Action/Attribute.php | 2 +-
.../Adminhtml/Product/Attribute.php | 2 +-
.../Controller/Adminhtml/Product/Review.php | 16 +-
.../Magento/Catalog/Helper/Category/Flat.php | 10 +-
.../Catalog/Helper/Flat/AbstractFlat.php | 16 +-
.../Catalog/Helper/Product/Compare.php | 4 +-
.../Helper/Product/Edit/Action/Attribute.php | 2 +-
.../Magento/Catalog/Helper/Product/Flat.php | 10 +-
.../Magento/Catalog/Model/AbstractModel.php | 6 -
.../Attribute/Backend/Customlayoutupdate.php | 8 +-
app/code/Magento/Catalog/Model/Category.php | 2 +-
app/code/Magento/Catalog/Model/Product.php | 8 +-
.../Model/Product/Attribute/Backend/Media.php | 4 +-
.../Model/Product/Media/ConfigInterface.php | 8 +-
.../Model/Product/Type/Configurable.php | 2 +-
.../Catalog/Model/Product/Type/Grouped.php | 12 +-
.../Model/Product/Type/Grouped/Backend.php | 44 +
.../Model/Resource/AbstractResource.php | 2 +-
.../Model/Resource/Category/Collection.php | 2 +-
.../Catalog/Model/Resource/Category/Flat.php | 14 +-
.../Resource/Category/Indexer/Product.php | 2 +-
.../Catalog/Model/Resource/Category/Tree.php | 2 +-
.../Collection/AbstractCollection.php | 2 +-
.../Product/Attribute/Backend/Media.php | 4 +-
.../Model/Resource/Product/Collection.php | 16 +-
.../Model/Resource/Product/Flat/Indexer.php | 2 +-
.../Resource/Product/Indexer/Eav/Decimal.php | 4 +-
.../Resource/Product/Indexer/Eav/Source.php | 4 +-
.../Catalog/Model/Resource/Product/Option.php | 16 +-
.../Resource/Product/Option/Collection.php | 4 +-
.../Model/Resource/Product/Option/Value.php | 12 +-
.../Product/Option/Value/Collection.php | 8 +-
.../Catalog/Model/Resource/Product/Status.php | 8 +-
.../Resource/Product/Type/Configurable.php | 2 +-
app/code/Magento/Catalog/etc/adminhtml/di.xml | 6 +
.../Magento/Catalog/etc/adminhtml/menu.xml | 2 +
.../catalog/product/attribute/labels.phtml | 2 +-
.../catalog/product/attribute/options.phtml | 2 +-
.../layout/catalog_product_attribute_edit.xml | 2 +-
.../view/adminhtml/product/product.css | 14 +-
.../Catalog/view/frontend/category/view.phtml | 44 +-
.../category/widget/link/link_block.phtml | 4 +-
.../category/widget/link/link_inline.phtml | 4 +-
.../view/frontend/images/i_asc_arrow.gif | Bin 115 -> 0 bytes
.../view/frontend/images/i_desc_arrow.gif | Bin 114 -> 0 bytes
.../view/frontend/images/i_widget-link.gif | Bin 57 -> 0 bytes
.../view/frontend/images/i_widget-new.gif | Bin 545 -> 0 bytes
.../images/media/col_left_callout.jpg | Bin 19102 -> 0 bytes
.../images/media/col_right_callout.jpg | Bin 14703 -> 0 bytes
.../Catalog/view/frontend/js/configurable.js | 6 +-
.../Magento/Catalog/view/frontend/js/list.js | 55 +-
.../Catalog/view/frontend/layer/filter.phtml | 28 +-
.../Catalog/view/frontend/layer/state.phtml | 43 +-
.../Catalog/view/frontend/layer/view.phtml | 36 +-
.../frontend/layout/catalog_category_view.xml | 68 +-
.../catalog_category_view_type_default.xml | 2 +-
.../catalog_category_view_type_layered.xml | 2 +-
.../layout/catalog_product_compare_index.xml | 14 +-
.../frontend/layout/catalog_product_view.xml | 144 +-
...catalog_product_view_type_configurable.xml | 12 +-
.../catalog_product_view_type_grouped.xml | 9 +-
.../catalog_product_view_type_simple.xml | 9 +-
.../catalog_product_view_type_virtual.xml | 9 +-
.../Catalog/view/frontend/layout/default.xml | 30 +-
.../Catalog/view/frontend/msrp/popup.phtml | 53 +-
.../view/frontend/navigation/left.phtml | 45 +-
.../view/frontend/navigation/top.phtml | 6 +-
.../view/frontend}/product/compare/link.phtml | 1 -
.../view/frontend/product/compare/list.phtml | 239 +--
.../frontend/product/compare/sidebar.phtml | 60 +-
.../view/frontend/product/gallery.phtml | 8 +-
.../Catalog/view/frontend/product/image.phtml | 8 +-
.../frontend/product/image_with_borders.phtml | 22 +-
.../Catalog/view/frontend/product/list.phtml | 200 +-
.../view/frontend}/product/list/items.phtml | 38 +-
.../view/frontend/product/list/related.phtml | 63 -
.../view/frontend/product/list/toolbar.phtml | 101 +-
.../view/frontend/product/list/upsell.phtml | 52 -
.../view/frontend}/product/listing.phtml | 3 -
.../Catalog/view/frontend/product/new.phtml | 63 -
.../view/frontend/product/price_msrp.phtml | 8 +-
.../frontend/product/price_msrp_item.phtml | 8 +-
.../Catalog/view/frontend/product/view.phtml | 132 --
.../frontend/product/view/additional.phtml | 2 -
.../view/frontend/product/view/addto.phtml | 33 +-
.../frontend/product/view/addtocart.phtml | 85 +-
.../frontend}/product/view/attribute.phtml | 4 +-
.../frontend/product/view/attributes.phtml | 13 +-
.../frontend/product/view/base-image.phtml | 137 +-
.../frontend/product/view/description.phtml | 11 +-
.../view/frontend}/product/view/details.phtml | 0
.../view/frontend}/product/view/form.phtml | 9 +-
.../view/frontend/product/view/gallery.phtml | 41 -
.../view/frontend}/product/view/mailto.phtml | 4 +-
.../view/frontend/product/view/options.phtml | 9 +-
.../frontend/product/view/options/js.phtml | 106 +-
.../product/view/options/type/date.phtml | 95 +-
.../product/view/options/type/default.phtml | 8 +-
.../product/view/options/type/file.phtml | 46 +-
.../product/view/options/type/select.phtml | 19 +-
.../product/view/options/type/text.phtml | 72 +-
.../product/view/options/wrapper.phtml | 18 +-
.../product/view/options/wrapper/bottom.phtml | 4 +-
.../view/frontend}/product/view/price.phtml | 0
.../frontend/product/view/price_clone.phtml | 2 -
.../view/frontend}/product/view/rating.phtml | 1 -
.../frontend/product/view/tierprices.phtml | 290 ++-
.../frontend/product/view/type/default.phtml | 12 +-
.../frontend/product/view/type/grouped.phtml | 68 +-
.../view/type/options/configurable.phtml | 29 +-
.../product/widget/link/link_block.phtml | 6 +-
.../product/widget/link/link_inline.phtml | 8 +-
.../widget/new/column/new_default_list.phtml | 69 +-
.../widget/new/column/new_images_list.phtml | 30 +-
.../widget/new/column/new_names_list.phtml | 30 +-
.../product/widget/new/content/new_grid.phtml | 134 +-
.../product/widget/new/content/new_list.phtml | 125 +-
.../view/frontend/rss/product/price.phtml | 4 +-
.../Magento/Catalog/view/frontend/widgets.css | 30 -
.../Magento/Catalog/view/frontend/zoom.css | 2 -
.../Model/Adminhtml/Stock/Item.php | 64 +
.../Magento/CatalogInventory/Model/Stock.php | 2 +-
.../CatalogInventory/Model/Stock/Item.php | 37 +-
.../CatalogInventory/etc/adminhtml/di.xml} | 6 +-
.../view/frontend/qtyincrements.phtml | 5 +-
.../view/frontend/stockqty/composite.phtml | 57 +-
.../view/frontend/stockqty/default.phtml | 9 +-
.../Block/Adminhtml/Promo/Catalog/Edit/Js.php | 2 +-
.../CatalogRule/Model/Resource/Rule.php | 15 +-
.../view/frontend/advanced/form.phtml | 167 +-
.../view/frontend/advanced/result.phtml | 54 +-
.../CatalogSearch/view/frontend/form-mini.js | 2 -
.../view/frontend/form.mini.phtml | 63 +-
.../layout/catalogsearch_advanced_index.xml | 6 +-
.../layout/catalogsearch_advanced_result.xml | 27 +-
.../layout/catalogsearch_result_index.xml | 37 +-
.../layout/catalogsearch_term_popular.xml | 8 +-
.../CatalogSearch/view/frontend/result.phtml | 44 +-
.../CatalogSearch/view/frontend/term.phtml | 18 +-
app/code/Magento/Centinel/Model/Service.php | 51 +-
.../Magento/Centinel/etc/adminhtml/di.xml | 10 +-
.../Checkout/Controller/Multishipping.php | 22 +-
app/code/Magento/Checkout/Helper/Cart.php | 4 +-
.../Checkout/Model/Type/Multishipping.php | 4 +-
.../view/frontend/onepage/login.phtml | 2 +-
.../Wysiwyg/Images/Content/Files.php | 2 +-
.../Wysiwyg/Images/Content/Newfolder.php | 2 +-
.../Wysiwyg/Images/Content/Uploader.php | 2 +-
.../Block/Adminhtml/Wysiwyg/Images/Tree.php | 2 +-
.../Magento/Cms/Controller/Adminhtml/Page.php | 4 +-
app/code/Magento/Cms/Model/Resource/Block.php | 4 +-
.../Cms/Model/Resource/Block/Collection.php | 2 +-
app/code/Magento/Cms/Model/Resource/Page.php | 8 +-
.../Cms/Model/Resource/Page/Collection.php | 2 +-
.../Extension/Custom/Edit/Tab/Load.php | 2 +-
.../Core/App/Request/PathInfoProcessor.php | 4 +-
app/code/Magento/Core/Helper/Url.php | 29 +-
app/code/Magento/Core/Model/AbstractModel.php | 15 +-
app/code/Magento/Core/Model/App.php | 4 +-
app/code/Magento/Core/Model/App/Emulation.php | 16 +-
app/code/Magento/Core/Model/AppInterface.php | 6 -
app/code/Magento/Core/Model/Context.php | 1 -
app/code/Magento/Core/Model/Cookie.php | 6 +-
app/code/Magento/Core/Model/EntityFactory.php | 2 +-
app/code/Magento/Core/Model/File/Storage.php | 2 +-
app/code/Magento/Core/Model/Layout.php | 1 -
.../Model/Layout/Argument/AbstractHandler.php | 2 +-
.../Layout/Argument/Handler/ArrayHandler.php | 2 +-
app/code/Magento/Core/Model/Layout/Merge.php | 39 +-
.../Model/Layout/Update}/Validator.php | 8 +-
app/code/Magento/Core/Model/Locale.php | 4 +-
.../Magento/Core/Model/LocaleInterface.php | 6 +-
.../Core/Model/Resource/Config/Data.php | 2 +-
.../Core/Model/Resource/Db/AbstractDb.php | 2 +-
.../Magento/Core/Model/Resource/Setup.php | 2 +-
.../Magento/Core/Model/Resource/Store.php | 2 +-
.../Core/Model/Resource/Transaction.php | 2 +-
.../Magento/Core/Model/Resource/Translate.php | 15 +-
.../Core/Model/Resource/Translate/String.php | 18 +-
.../Core/Model/Resource/Url/Rewrite.php | 4 +-
.../Magento/Core/Model/Resource/Variable.php | 6 +-
.../Model/Resource/Variable/Collection.php | 2 +-
.../Core/Model/Session/AbstractSession.php | 23 +-
app/code/Magento/Core/Model/Store.php | 65 +-
app/code/Magento/Core/Model/Store/Group.php | 2 +-
.../Model/Store/Storage/DefaultStorage.php | 2 +-
app/code/Magento/Core/Model/Template.php | 4 +-
app/code/Magento/Core/Model/Theme.php | 1 -
app/code/Magento/Core/Model/Translate.php | 1 +
.../Magento/Core/Model/Translate/Inline.php | 54 +-
.../Core/Model/Translate/Inline/Config.php | 60 +
.../Model/Translate/Inline/ConfigFactory.php | 58 +
.../Translate/Inline/ConfigInterface.php} | 22 +-
app/code/Magento/Core/Model/Url.php | 57 +-
.../Magento/Core/Model/Variable/Config.php | 2 +-
app/code/Magento/Core/Model/View/Design.php | 1 -
app/code/Magento/Core/Model/Website.php | 2 +-
app/code/Magento/Core/etc/config.xml | 2 +-
app/code/Magento/Core/etc/di.xml | 14 +-
app/code/Magento/Core/i18n/fr_FR.csv | 4 +-
.../System/Currency/Rate/Services.php | 24 +-
.../Customer/Block/Account/Dashboard.php | 2 +-
.../Address/Renderer/RendererInterface.php | 2 +-
.../Tab/Newsletter/Grid/Renderer/Action.php | 2 +-
.../Block/Adminhtml/Edit/Tab/Reviews.php | 2 +-
.../Block/Adminhtml/Edit/Tab/View.php | 2 +-
.../Customer/Block/Adminhtml/Online.php | 2 +-
.../Magento/Customer/Controller/Address.php | 23 +
.../Model/Backend/Customer.php} | 25 +-
app/code/Magento/Customer/Model/Customer.php | 13 +-
app/code/Magento/Customer/Model/Observer.php | 29 +-
.../Address/Attribute/Source/Country.php | 2 +-
.../Address/Attribute/Source/Region.php | 2 +-
.../Model/Resource/Customer/Collection.php | 17 +-
.../Model/Resource/Group/Collection.php | 4 +-
.../Magento/Customer/Model/Resource/Setup.php | 2 +-
.../Magento/Customer/etc/adminhtml/di.xml | 6 +
.../adminhtml/layout/customer_index_edit.xml | 4 +-
.../Customer/view/email/account_new.html | 8 +-
.../view/email/account_new_confirmed.html | 2 +-
.../frontend/account/dashboard/address.phtml | 4 +-
.../view/frontend/account/navigation.phtml | 4 +-
app/code/Magento/Directory/Helper/Url.php | 2 +-
.../adminhtml/js/optional_zip_countries.phtml | 2 +-
.../Product/Edit/Tab/Downloadable/Links.php | 48 +-
.../Downloadable/etc/adminhtml/menu.xml | 2 +-
.../view/frontend/catalog/product/links.phtml | 66 +-
.../frontend/catalog/product/samples.phtml | 12 +-
.../view/frontend/catalog/product/type.phtml | 15 +-
.../frontend/checkout/cart/item/default.phtml | 476 +++--
.../multishipping/item/downloadable.phtml | 59 +-
.../checkout/onepage/review/item.phtml | 243 ++-
.../view/frontend/checkout/success.phtml | 2 -
.../frontend/customer/products/list.phtml | 68 +-
.../view/frontend/downloadable.js | 2 -
...catalog_product_view_type_downloadable.xml | 4 +-
.../frontend/layout/checkout_cart_index.xml | 2 +-
.../view/frontend/layout/default.xml} | 4 +-
.../items/renderer/downloadable.phtml | 419 ++--
.../invoice/items/renderer/downloadable.phtml | 441 ++--
.../order/items/renderer/downloadable.phtml | 450 ++--
.../Eav/Block/Adminhtml/Attribute/Edit/Js.php | 2 +-
.../Attribute/Edit/Options/Options.php | 2 +-
.../Eav/Model/Entity/AbstractEntity.php | 8 +-
.../Magento/Eav/Model/Entity/Attribute.php | 12 +-
.../Attribute/Frontend/AbstractFrontend.php | 6 +-
.../Entity/Attribute/Frontend/Datetime.php | 2 +-
.../Entity/Collection/AbstractCollection.php | 6 +-
app/code/Magento/Eav/Model/Entity/Type.php | 16 +-
.../Eav/Model/Resource/Entity/Attribute.php | 2 +-
.../Model/Resource/Entity/Attribute/Group.php | 2 +-
.../Resource/Entity/Attribute/Option.php | 2 +-
.../Resource/Form/Attribute/Collection.php | 20 +-
.../Email/Block/Adminhtml/Template.php | 2 +-
.../Email/Block/Adminhtml/Template/Edit.php | 4 +-
.../Magento/Email/Model/Resource/Template.php | 8 +-
.../Magento/Email/Model/Template/Mailer.php | 4 +-
.../Adminhtml/Sales/Order/Create/Form.php | 2 +-
.../Sales/Order/Create/Giftoptions.php | 2 +-
.../Adminhtml/Sales/Order/Create/Items.php | 2 +-
.../Sales/Order/View/Giftoptions.php | 2 +-
.../Adminhtml/Sales/Order/View/Items.php | 16 +-
.../Magento/GiftMessage/Helper/Message.php | 12 +-
app/code/Magento/GiftMessage/Helper/Url.php | 8 +-
.../Magento/GiftMessage/Model/Observer.php | 2 +-
.../Model}/Save.php | 18 +-
.../layout/sales_order_create_index.xml | 2 +-
.../sales_order_create_load_block_data.xml | 2 +-
.../sales_order_create_load_block_items.xml | 2 +-
.../adminhtml/layout/sales_order_view.xml | 2 +-
.../Block/Adminhtml/Captcha.php | 2 +-
.../Block/Adminhtml/Store/Switcher.php | 2 +-
.../Block/Adminhtml/Types/Edit/Attributes.php | 28 +-
.../Block/Adminhtml/Types/Edit/Select.php | 2 +-
.../Block/Adminhtml/Import/Frame/Result.php | 2 +-
.../Model/Export/Entity/AbstractEav.php | 2 +-
.../Model/Export/Entity/AbstractEntity.php | 2 +-
.../Model/Export/Entity/Eav/Customer.php | 2 +-
.../Model/Export/Entity/Product.php | 2 +-
.../Entity/Product/Type/AbstractType.php | 2 +-
.../Export/Entity/Product/Type/Simple.php | 2 +-
.../Model/Import/Entity/AbstractEav.php | 2 +-
.../Model/Import/Entity/AbstractEntity.php | 2 +-
.../Model/Import/Entity/Product.php | 41 +-
.../Model/Import/Entity/Product/Option.php | 21 +-
.../Import/Entity/Product/Type/Grouped.php | 2 +-
.../layout/adminhtml_export_getfilter.xml | 2 +-
.../layout/adminhtml_export_index.xml | 2 +-
.../Block/Adminhtml}/Problem.php | 14 +-
.../Problem/Grid/Filter/Checkbox.php | 10 +-
.../Problem/Grid/Renderer/Checkbox.php | 10 +-
.../Block/Adminhtml}/Queue/Edit.php | 18 +-
.../Block/Adminhtml}/Queue/Edit/Form.php | 10 +-
.../Adminhtml}/Queue/Grid/Renderer/Action.php | 18 +-
.../Block/Adminhtml}/Queue/Preview.php | 8 +-
.../Block/Adminhtml}/Queue/Preview/Form.php | 8 +-
.../Block/Adminhtml}/Subscriber.php | 14 +-
.../Block/Adminhtml}/Subscriber/Grid.php | 8 +-
.../Subscriber/Grid/Filter/Checkbox.php | 10 +-
.../Subscriber/Grid/Filter/Website.php | 6 +-
.../Subscriber/Grid/Renderer/Checkbox.php | 10 +-
.../Block/Adminhtml}/Template.php | 16 +-
.../Block/Adminhtml}/Template/Edit.php | 22 +-
.../Block/Adminhtml}/Template/Edit/Form.php | 12 +-
.../Block/Adminhtml}/Template/Grid.php | 14 +-
.../Template/Grid/Renderer/Action.php | 12 +-
.../Template/Grid/Renderer/Sender.php | 8 +-
.../Block/Adminhtml}/Template/Preview.php | 8 +-
.../Adminhtml}/Template/Preview/Form.php | 8 +-
.../Controller/Adminhtml}/Problem.php | 8 +-
.../Controller/Adminhtml}/Queue.php | 34 +-
.../Controller/Adminhtml}/Subscriber.php | 12 +-
.../Controller/Adminhtml}/Template.php | 20 +-
.../Magento/Newsletter/Model/Subscriber.php | 2 +-
.../Magento/Newsletter/etc/adminhtml/menu.xml | 8 +-
.../etc/adminhtml/routes.xml} | 10 +-
.../layout/newsletter_problem_block.xml} | 4 +-
.../layout/newsletter_problem_grid.xml} | 2 +-
.../layout/newsletter_problem_index.xml} | 4 +-
.../layout/newsletter_queue_edit.xml} | 2 +-
...eue_grid.xml => newsletter_queue_grid.xml} | 2 +-
...ck.xml => newsletter_queue_grid_block.xml} | 2 +-
...e_index.xml => newsletter_queue_index.xml} | 2 +-
.../layout/newsletter_queue_preview.xml} | 6 +-
.../newsletter_queue_preview_popup.xml} | 6 +-
.../layout/newsletter_subscriber_block.xml} | 10 +-
.../newsletter_subscriber_exportcsv.xml} | 2 +-
.../newsletter_subscriber_exportxml.xml} | 2 +-
.../layout/newsletter_subscriber_grid.xml} | 2 +-
.../layout/newsletter_subscriber_index.xml} | 4 +-
.../layout/newsletter_template_edit.xml} | 2 +-
.../layout/newsletter_template_preview.xml} | 6 +-
.../newsletter_template_preview_popup.xml} | 6 +-
.../view/adminhtml/layout/preview.xml | 4 +-
.../adminhtml}/preview/iframeswitcher.phtml | 2 +-
.../view/adminhtml}/preview/store.phtml | 0
.../view/adminhtml}/problem/list.phtml | 0
.../view/adminhtml}/queue/edit.phtml | 2 +-
.../view/adminhtml}/queue/preview.phtml | 0
.../view/adminhtml}/subscriber/list.phtml | 0
.../view/adminhtml}/template/edit.phtml | 2 +-
.../view/adminhtml}/template/list.phtml | 0
.../view/adminhtml}/template/preview.phtml | 0
.../Newsletter/view/frontend/newsletter.js | 2 -
.../Newsletter/view/frontend/subscribe.phtml | 27 +-
app/code/Magento/Page/Block/Html/Header.php | 7 +-
.../Magento/Page/etc/adminhtml/system.xml | 2 +-
.../Magento/Page/view/frontend/1column.phtml | 11 +-
.../Page/view/frontend/2columns-left.phtml | 11 +-
.../Page/view/frontend/2columns-right.phtml | 11 +-
.../Magento/Page/view/frontend/3columns.phtml | 11 +-
.../Magento/Page/view/frontend/empty.phtml | 11 +-
.../Page/view/frontend/html/title.phtml | 4 +-
.../Magento/Page/view/frontend/page.phtml | 11 +-
.../Magento/Page/view/frontend/popup.phtml | 11 +-
.../Magento/Page/view/frontend/print.phtml | 5 +-
.../Paygate/Block/Authorizenet/Form/Cc.php | 2 +-
app/code/Magento/Payment/Block/Form/Cc.php | 2 +-
app/code/Magento/Payment/Block/Info.php | 4 +-
.../Model/Billing/AbstractAgreement.php | 4 +-
app/code/Magento/Paypal/Model/Api/Nvp.php | 2 +-
app/code/Magento/Paypal/Model/Config.php | 3 +
.../Magento/Paypal/Model/Express/Checkout.php | 10 +-
.../ProductAlert/Block/Email/Price.php | 2 +-
.../ProductAlert/Block/Email/Stock.php | 2 +-
.../view/frontend/product/view.phtml | 4 +-
.../Magento/Rating/Block/Adminhtml/Edit.php | 2 +-
.../Rating/Block/Adminhtml/Edit/Form.php | 2 +-
.../Rating/Block/Adminhtml/Edit/Tab/Form.php | 2 +-
.../Block/Adminhtml/Edit/Tab/Options.php | 2 +-
.../Rating/Block/Adminhtml/Edit/Tabs.php | 2 +-
.../Magento/Rating/Block/Adminhtml/Rating.php | 2 +-
.../Rating/Controller/Adminhtml/Index.php | 2 +-
.../Adminhtml}/Config/Form/Field/MtdStart.php | 6 +-
.../Adminhtml}/Config/Form/Field/YtdStart.php | 6 +-
.../Block/Adminhtml/Customer/Accounts.php | 3 +-
.../Block/Adminhtml/Customer/Orders.php | 3 +-
.../Block/Adminhtml/Customer/Totals.php | 3 +-
.../Block/Adminhtml}/Filter/Form.php | 12 +-
.../Block/Adminhtml}/Grid/AbstractGrid.php | 46 +-
.../Grid/Column/Renderer/Blanknumber.php | 6 +-
.../Grid/Column/Renderer/Currency.php | 6 +-
.../Grid/Column/Renderer/Customer.php | 6 +-
.../Grid/Column/Renderer/Product.php | 6 +-
.../Block/Adminhtml}/Grid/Shopcart.php | 8 +-
.../Block/Adminhtml}/Product.php | 9 +-
.../Block/Adminhtml}/Product/Downloads.php | 11 +-
.../Adminhtml}/Product/Downloads/Grid.php | 8 +-
.../Product/Downloads/Renderer/Purchases.php | 6 +-
.../Block/Adminhtml}/Product/Grid.php | 6 +-
.../Block/Adminhtml}/Product/Lowstock.php | 11 +-
.../Adminhtml}/Product/Lowstock/Grid.php | 6 +-
.../Reports/Block/Adminhtml/Product/Sold.php | 3 +-
.../Block/Adminhtml}/Product/Viewed.php | 11 +-
.../Block/Adminhtml}/Product/Viewed/Grid.php | 13 +-
.../Block/Adminhtml/Refresh/Statistics.php | 3 +-
.../Block/Adminhtml}/Review/Customer.php | 9 +-
.../Block/Adminhtml}/Review/Detail.php | 11 +-
.../Block/Adminhtml}/Review/Detail/Grid.php | 6 +-
.../Block/Adminhtml}/Review/Product.php | 9 +-
.../Block/Adminhtml}/Sales/Bestsellers.php | 11 +-
.../Adminhtml}/Sales/Bestsellers/Grid.php | 10 +-
.../Block/Adminhtml}/Sales/Coupons.php | 11 +-
.../Block/Adminhtml}/Sales/Coupons/Grid.php | 12 +-
.../Sales/Grid/Column/Renderer/Date.php | 4 +-
.../Block/Adminhtml}/Sales/Invoiced.php | 11 +-
.../Block/Adminhtml}/Sales/Invoiced/Grid.php | 10 +-
.../Block/Adminhtml}/Sales/Refunded.php | 11 +-
.../Block/Adminhtml}/Sales/Refunded/Grid.php | 10 +-
.../Block/Adminhtml}/Sales/Sales.php | 11 +-
.../Block/Adminhtml}/Sales/Sales/Grid.php | 10 +-
.../Block/Adminhtml}/Sales/Shipping.php | 11 +-
.../Block/Adminhtml}/Sales/Shipping/Grid.php | 10 +-
.../Block/Adminhtml}/Sales/Tax.php | 11 +-
.../Block/Adminhtml}/Sales/Tax/Grid.php | 12 +-
.../Block/Adminhtml}/Search.php | 9 +-
.../Block/Adminhtml}/Shopcart/Abandoned.php | 11 +-
.../Adminhtml}/Shopcart/Abandoned/Grid.php | 10 +-
.../Block/Adminhtml}/Shopcart/Customer.php | 9 +-
.../Adminhtml}/Shopcart/Customer/Grid.php | 10 +-
.../Block/Adminhtml}/Shopcart/Product.php | 9 +-
.../Adminhtml}/Shopcart/Product/Grid.php | 10 +-
.../Block/Adminhtml}/Wishlist.php | 8 +-
.../Block/Adminhtml}/Wishlist/Grid.php | 6 +-
.../Controller/Adminhtml/Index.php} | 8 +-
.../Adminhtml}/Report/AbstractReport.php | 18 +-
.../Controller/Adminhtml}/Report/Customer.php | 6 +-
.../Controller/Adminhtml}/Report/Product.php | 22 +-
.../Controller/Adminhtml}/Report/Review.php | 12 +-
.../Controller/Adminhtml}/Report/Sales.php | 56 +-
.../Controller/Adminhtml}/Report/Shopcart.php | 24 +-
.../Adminhtml}/Report/Statistics.php | 12 +-
app/code/Magento/Reports/Helper/Data.php | 6 +-
.../Model/Report => Reports/Model}/Item.php | 4 +-
.../Model/Resource/Customer/Collection.php | 6 +-
.../Model/Resource/Quote/Collection.php | 5 +-
.../Report/Product/Viewed/Collection.php | 6 +-
app/code/Magento/Reports/etc/adminhtml/di.xml | 5 +
.../Magento/Reports/etc/adminhtml/menu.xml | 34 +-
.../Magento/Reports/etc/adminhtml/routes.xml | 32 +
.../Magento/Reports/etc/adminhtml/system.xml | 4 +-
app/code/Magento/Reports/etc/module.xml | 1 -
.../Magento/Reports/view/adminhtml/grid.phtml | 2 +-
...html_report_customer_exportaccountscsv.xml | 29 -
...ml_report_customer_exportaccountsexcel.xml | 29 -
...inhtml_report_customer_exportorderscsv.xml | 29 -
...html_report_customer_exportordersexcel.xml | 29 -
.../adminhtml_report_product_lowstock.xml | 31 -
.../adminhtml_report_review_customer.xml | 31 -
...inhtml_report_review_exportcustomercsv.xml | 29 -
...html_report_review_exportcustomerexcel.xml | 29 -
.../layout/reports_index_exportsearchcsv.xml} | 2 +-
.../reports_index_exportsearchexcel.xml} | 2 +-
.../layout/reports_index_search.xml} | 4 +-
.../layout/reports_index_search_block.xml} | 4 +-
...l => reports_report_customer_accounts.xml} | 2 +-
...reports_report_customer_accounts_grid.xml} | 2 +-
...rts_report_customer_exportaccountscsv.xml} | 2 +-
...s_report_customer_exportaccountsexcel.xml} | 2 +-
...ports_report_customer_exportorderscsv.xml} | 2 +-
...rts_report_customer_exportordersexcel.xml} | 2 +-
...eports_report_customer_exporttotalscsv.xml | 29 +
...orts_report_customer_exporttotalsexcel.xml | 29 +
...xml => reports_report_customer_orders.xml} | 2 +-
...> reports_report_customer_orders_grid.xml} | 2 +-
...xml => reports_report_customer_totals.xml} | 2 +-
...> reports_report_customer_totals_grid.xml} | 2 +-
...eport_grid.xml => reports_report_grid.xml} | 0
...orts_report_product_exportlowstockcsv.xml} | 2 +-
...ts_report_product_exportlowstockexcel.xml} | 2 +-
... reports_report_product_exportsoldcsv.xml} | 2 +-
...eports_report_product_exportsoldexcel.xml} | 2 +-
.../reports_report_product_lowstock.xml | 31 +
... reports_report_product_lowstock_grid.xml} | 2 +-
...ld.xml => reports_report_product_sold.xml} | 2 +-
...l => reports_report_product_sold_grid.xml} | 2 +-
.../layout/reports_report_product_viewed.xml} | 4 +-
...xml => reports_report_review_customer.xml} | 4 +-
...> reports_report_review_customer_grid.xml} | 2 +-
...eports_report_review_exportcustomercsv.xml | 29 +
...orts_report_review_exportcustomerexcel.xml | 29 +
...reports_report_review_exportproductcsv.xml | 29 +
...ports_report_review_exportproductexcel.xml | 29 +
.../layout/reports_report_review_product.xml} | 4 +-
...=> reports_report_review_product_grid.xml} | 2 +-
.../reports_report_sales_bestsellers.xml} | 4 +-
.../layout/reports_report_sales_coupons.xml} | 4 +-
.../layout/reports_report_sales_invoiced.xml} | 4 +-
.../layout/reports_report_sales_refunded.xml} | 4 +-
.../layout/reports_report_sales_sales.xml} | 4 +-
.../layout/reports_report_sales_shipping.xml} | 4 +-
.../layout/reports_report_sales_tax.xml} | 4 +-
...ml => reports_report_statistics_index.xml} | 0
.../view/adminhtml/layout/reports_sales.xml} | 0
.../adminhtml/report/grid/container.phtml | 2 +-
.../adminhtml/report/refresh/statistics.phtml | 2 +-
.../view/adminhtml/report/wishlist.phtml | 2 +-
.../view/adminhtml/store/switcher.phtml | 2 +-
.../adminhtml/store/switcher/enhanced.phtml | 2 +-
.../view/frontend/home_product_compared.phtml | 60 -
.../view/frontend/home_product_viewed.phtml | 65 -
.../view/frontend/images/i_widget-list.gif | Bin 600 -> 0 bytes
.../Reports/view/frontend/layout/default.xml | 11 +-
.../Reports/view/frontend/layout/print.xml | 10 +-
.../view/frontend/product_compared.phtml | 31 +-
.../view/frontend/product_viewed.phtml | 33 +-
.../column/compared_default_list.phtml | 86 +-
.../column/compared_images_list.phtml | 53 +-
.../compared/column/compared_names_list.phtml | 35 +-
.../compared/content/compared_grid.phtml | 136 +-
.../compared/content/compared_list.phtml | 127 +-
.../viewed/column/viewed_default_list.phtml | 87 +-
.../viewed/column/viewed_images_list.phtml | 47 +-
.../viewed/column/viewed_names_list.phtml | 37 +-
.../widget/viewed/content/viewed_grid.phtml | 127 +-
.../widget/viewed/content/viewed_list.phtml | 128 +-
.../Magento/Reports/view/frontend/widgets.css | 42 -
.../Review => Review/Block/Adminhtml}/Add.php | 9 +-
.../Block/Adminhtml}/Add/Form.php | 10 +-
.../Block/Adminhtml}/Edit.php | 7 +-
.../Block/Adminhtml}/Edit/Form.php | 8 +-
.../Block/Adminhtml}/Grid.php | 18 +-
.../Block/Adminhtml}/Grid/Filter/Type.php | 8 +-
.../Block/Adminhtml}/Grid/Renderer/Type.php | 10 +-
.../Block/Adminhtml}/Main.php | 7 +-
.../Block/Adminhtml}/Product/Grid.php | 6 +-
.../Block/Adminhtml}/Rating/Detailed.php | 6 +-
.../Block/Adminhtml}/Rating/Summary.php | 6 +-
.../Resource/Review/Product/Collection.php | 8 +-
.../Magento/Review/etc/adminhtml/menu.xml | 6 +-
.../view/adminhtml}/add.phtml | 0
.../Condition/Product/AbstractProduct.php | 4 +-
.../Adminhtml/Billing/Agreement/View/Form.php | 2 +-
.../Adminhtml/Items/Column/DefaultColumn.php | 2 +-
.../Block/Adminhtml/Order/Comments/View.php | 2 +-
.../Adminhtml/Order/Create/Giftmessage.php | 36 +-
.../Order/Create/Giftmessage/Form.php | 44 +-
.../Adminhtml/Order/Create/Items/Grid.php | 46 +-
.../Block/Adminhtml/Order/Create/Messages.php | 2 +-
.../Order/Create/Sidebar/AbstractSidebar.php | 32 +-
.../Adminhtml/Order/Create/Totals/Table.php | 2 +-
.../Order/Creditmemo/Create/Adjustments.php | 2 +-
.../Order/Creditmemo/View/Comments.php | 2 +-
.../Order/Invoice/Create/Tracking.php | 2 +-
.../Adminhtml/Order/Invoice/View/Comments.php | 2 +-
.../Sales/Block/Adminhtml/Order/Payment.php | 2 +-
.../Order/Shipment/Create/Tracking.php | 2 +-
.../Adminhtml/Order/Shipment/Packaging.php | 2 +-
.../Order/Shipment/Packaging/Grid.php | 2 +-
.../Order/Shipment/Tracking/Info.php | 2 +-
.../Order/Shipment/View/Comments.php | 2 +-
.../Order/Shipment/View/Tracking.php | 30 +-
.../Block/Adminhtml/Order/Status/Assign.php | 1 +
.../Block/Adminhtml/Order/Status/Edit.php | 1 +
.../Sales/Block/Adminhtml/Order/View/Form.php | 2 +-
.../Adminhtml/Order/View/Giftmessage.php | 44 +-
.../Block/Adminhtml/Order/View/History.php | 2 +-
.../View/Items/Renderer/DefaultRenderer.php | 10 +-
.../Block/Adminhtml/Order/View/Messages.php | 2 +-
.../Adminhtml/Order/View/Tab/History.php | 2 +-
.../Adminhtml/Recurring/Profile/Edit/Form.php | 24 +-
.../Adminhtml/Recurring/Profile/View.php | 32 +-
.../Block/Adminhtml/Report/Filter/Form.php | 2 +-
.../Magento/Sales/Block/Order/Comments.php | 2 +-
.../Sales/Block/Order/PrintOrder/Invoice.php | 2 +-
.../Controller/Adminhtml/Order/Create.php | 4 +-
.../Controller/Adminhtml/Order/Shipment.php | 2 +-
.../Adminhtml/Order/View/Giftmessage.php | 4 +-
app/code/Magento/Sales/Model/Order.php | 6 +-
.../Magento/Sales/Model/Order/Creditmemo.php | 4 +-
.../Sales/Model/Order/Creditmemo/Item.php | 2 +-
.../Model/Order/Creditmemo/Total/Tax.php | 6 +-
.../Magento/Sales/Model/Order/Invoice.php | 6 +-
.../Model/Order/Invoice/Total/Discount.php | 10 +-
.../Sales/Model/Order/Invoice/Total/Tax.php | 4 +-
app/code/Magento/Sales/Model/Order/Item.php | 2 +-
.../Magento/Sales/Model/Order/Payment.php | 6 +-
.../Sales/Model/Order/Payment/Transaction.php | 2 +-
.../Magento/Sales/Model/Order/Shipment.php | 4 +-
app/code/Magento/Sales/Model/Order/Status.php | 11 +-
app/code/Magento/Sales/Model/Quote.php | 2 +-
.../Quote/Address/Total/AbstractTotal.php | 4 +-
.../Model/Quote/Address/Total/Subtotal.php | 2 +-
app/code/Magento/Sales/Model/Quote/Item.php | 6 +-
.../Sales/Model/Quote/Item/AbstractItem.php | 2 +-
.../Magento/Sales/Model/Recurring/Profile.php | 6 +-
.../Collection/AbstractCollection.php | 2 +-
.../Sales/Model/Resource/Order/Collection.php | 2 +-
.../Shipment/Attribute/Backend/Child.php | 2 +-
.../Quote/Address/Rate/Collection.php | 2 +-
.../Model/Resource/Report/Bestsellers.php | 4 +-
.../Report/Bestsellers/Collection.php | 4 +-
.../Report/Collection/AbstractCollection.php | 2 +-
.../Sales/Model/Resource/Report/Invoiced.php | 9 +-
.../Model/Resource/Report/Order/Createdat.php | 2 +-
.../Sales/Model/Resource/Report/Shipping.php | 10 +-
.../Magento/Sales/Model/Resource/Setup.php | 2 +-
.../Magento/Sales/Model/Service/Order.php | 4 +-
app/code/Magento/Sales/etc/sales.xml | 6 +
app/code/Magento/Sales/i18n/de_DE.csv | 2 +-
app/code/Magento/Sales/i18n/en_US.csv | 2 +-
app/code/Magento/Sales/i18n/es_ES.csv | 2 +-
app/code/Magento/Sales/i18n/fr_FR.csv | 2 +-
app/code/Magento/Sales/i18n/nl_NL.csv | 2 +-
app/code/Magento/Sales/i18n/pt_BR.csv | 2 +-
app/code/Magento/Sales/i18n/zh_CN.csv | 2 +-
.../layout/sales_order_create_index.xml | 6 +-
.../sales_order_create_load_block_data.xml | 2 +-
.../layout/sales_order_status_index.xml | 2 +-
.../adminhtml/layout/sales_order_view.xml | 2 +-
.../Promo/Quote/Edit/Tab/Coupons.php | 2 +-
.../layout/sales_rule_promo_quote_edit.xml | 2 +-
.../layout/sendfriend_product_send.xml | 10 +-
.../Sendfriend/view/frontend/send.phtml | 168 +-
.../Adminhtml}/Carrier/Tablerate/Grid.php | 12 +-
app/code/Magento/Shipping/Model/Shipping.php | 87 -
.../Shipping/Model/Shipping/Labels.php | 153 ++
.../Magento/Shipping/etc/adminhtml/di.xml} | 10 +-
.../Block/Adminhtml}/Edit.php | 5 +-
.../Block/Adminhtml}/Edit/Form.php | 2 +-
.../Block/Adminhtml}/Grid/Renderer/Action.php | 2 +-
.../Block/Adminhtml}/Grid/Renderer/Link.php | 2 +-
.../Block/Adminhtml}/Grid/Renderer/Time.php | 2 +-
.../Block/Adminhtml}/Sitemap.php | 5 +-
.../Sitemap/Controller/Adminhtml/Sitemap.php | 2 +-
.../Model/Resource/Catalog/Product.php | 3 +-
.../layout/adminhtml_sitemap_index.xml | 2 +-
.../adminhtml_sitemap_index_grid_block.xml | 4 +-
.../Tax/Block/Adminhtml/Rate/Toolbar/Add.php | 2 +-
.../Tax/Block/Adminhtml/Rate/Toolbar/Save.php | 2 +-
app/code/Magento/Tax/Helper/Data.php | 6 +-
app/code/Magento/Tax/Model/Calculation.php | 35 +-
app/code/Magento/Tax/Model/Config.php | 4 +-
.../Tax/Model/Resource/Calculation.php | 2 +-
.../Model/Resource/Report/Tax/Createdat.php | 2 +-
.../Wysiwyg/Files/Content/Uploader.php | 4 +-
.../Shipping/Carrier/Dhl/International.php | 4 +-
app/code/Magento/User/Helper/Data.php | 15 +-
app/code/Magento/User/Model/User.php | 20 +-
app/code/Magento/Webhook/etc/module.xml | 1 -
.../sql/webhook_setup/install-1.0.0.0.php | 8 +-
...dminhtml_webhook_registration_activate.xml | 2 +-
.../adminhtml_webhook_registration_failed.xml | 2 +-
...minhtml_webhook_registration_succeeded.xml | 2 +-
.../adminhtml_webhook_registration_user.xml | 2 +-
.../Widget/Instance/Edit/Tab/Main/Layout.php | 2 +-
.../Controller/Adminhtml/Widget/Instance.php | 2 +-
.../layout/adminhtml_widget_instance_edit.xml | 2 +-
.../Block/Customer/Wishlist/Items.php | 2 +-
.../Model/Resource/Item/Collection.php | 16 +-
.../Model/Resource/Item/Collection/Grid.php | 6 +-
app/code/Magento/Wishlist/Model/Wishlist.php | 17 +-
.../Magento/Wishlist/etc/adminhtml/di.xml | 5 +
.../adminhtml/magento_backend/css/styles.css | 148 +-
.../i18n/en_US.csv | 2 +-
.../magento_backend/less/styles/admin.less | 18 +-
.../magento_backend/less/styles/pages.less | 266 +--
.../Magento_Adminhtml/layout/default.xml | 87 -
.../adminhtml/magento_basic/below_ie7.css | 57 -
app/design/adminhtml/magento_basic/boxes.css | 1858 -----------------
app/design/adminhtml/magento_basic/custom.css | 22 -
app/design/adminhtml/magento_basic/ie7.css | 27 -
.../adminhtml/magento_basic/iestyles.css | 114 -
.../magento_basic/images/accordion_close.gif | Bin 394 -> 0 bytes
.../magento_basic/images/accordion_close.png | Bin 476 -> 0 bytes
.../magento_basic/images/accordion_open.gif | Bin 627 -> 0 bytes
.../magento_basic/images/accordion_open.png | Bin 548 -> 0 bytes
.../images/add_btn_icon-disabled.gif | Bin 234 -> 0 bytes
.../magento_basic/images/add_btn_icon.gif | Bin 344 -> 0 bytes
.../magento_basic/images/address_list_li.gif | Bin 72 -> 0 bytes
.../images/address_list_on_arrow.gif | Bin 185 -> 0 bytes
.../images/address_list_over_arrow.gif | Bin 184 -> 0 bytes
.../images/address_list_over_bg.gif | Bin 236 -> 0 bytes
.../magento_basic/images/ajax-loader-tr.gif | Bin 2608 -> 0 bytes
.../magento_basic/images/ajax-loader.gif | Bin 505 -> 0 bytes
.../images/application_view_tile.gif | Bin 377 -> 0 bytes
.../magento_basic/images/arrow_sort_move.gif | Bin 110 -> 0 bytes
.../magento_basic/images/bg_collapse.gif | Bin 86 -> 0 bytes
.../images/bg_create_order_totals.gif | Bin 141 -> 0 bytes
.../magento_basic/images/bg_notifications.gif | Bin 1962 -> 0 bytes
.../magento_basic/images/bg_window_mask.png | Bin 277 -> 0 bytes
.../magento_basic/images/bkg_btn-close.gif | Bin 146 -> 0 bytes
.../magento_basic/images/bkg_btn-close2.gif | Bin 356 -> 0 bytes
.../images/bkg_search-magnifier.png | Bin 1352 -> 0 bytes
.../adminhtml/magento_basic/images/blank.gif | Bin 43 -> 0 bytes
.../adminhtml/magento_basic/images/box_bg.gif | Bin 217 -> 0 bytes
.../magento_basic/images/breadcrumb_bg.gif | Bin 50 -> 0 bytes
.../images/btn_add-image_icon.gif | Bin 71 -> 0 bytes
.../images/btn_add-variable_icon.gif | Bin 80 -> 0 bytes
.../images/btn_add-widget_icon.gif | Bin 540 -> 0 bytes
.../images/btn_add-widget_icon2.gif | Bin 547 -> 0 bytes
.../magento_basic/images/btn_back_bg.gif | Bin 147 -> 0 bytes
.../magento_basic/images/btn_bare_bg.gif | Bin 1454 -> 0 bytes
.../magento_basic/images/btn_bg-disabled.gif | Bin 148 -> 0 bytes
.../adminhtml/magento_basic/images/btn_bg.png | Bin 1887 -> 0 bytes
.../magento_basic/images/btn_cancel_bg.gif | Bin 147 -> 0 bytes
.../magento_basic/images/btn_delete_bg.gif | Bin 173 -> 0 bytes
.../adminhtml/magento_basic/images/btn_go.gif | Bin 204 -> 0 bytes
.../magento_basic/images/btn_gr_bg.gif | Bin 148 -> 0 bytes
.../magento_basic/images/btn_gr_on.gif | Bin 137 -> 0 bytes
.../magento_basic/images/btn_gr_over.gif | Bin 147 -> 0 bytes
.../magento_basic/images/btn_loading-icon.gif | Bin 847 -> 0 bytes
.../magento_basic/images/btn_login.gif | Bin 1518 -> 0 bytes
.../images/btn_show-hide_icon.gif | Bin 1014 -> 0 bytes
.../magento_basic/images/btn_task_bg.gif | Bin 1735 -> 0 bytes
.../magento_basic/images/button-close.png | Bin 410 -> 0 bytes
.../images/cancel_btn_active_bg.gif | Bin 295 -> 0 bytes
.../magento_basic/images/cancel_btn_bg.gif | Bin 147 -> 0 bytes
.../magento_basic/images/cancel_btn_icon.gif | Bin 648 -> 0 bytes
.../images/cancel_btn_over_bg.gif | Bin 149 -> 0 bytes
.../magento_basic/images/cancel_icon.gif | Bin 600 -> 0 bytes
.../magento_basic/images/config_tab_dt_bg.gif | Bin 383 -> 0 bytes
.../magento_basic/images/dashboard-close.gif | Bin 373 -> 0 bytes
.../magento_basic/images/db-graph-bg.gif | Bin 820 -> 0 bytes
.../images/db-graph-bottom-bg.gif | Bin 823 -> 0 bytes
.../magento_basic/images/db-graph-line-bg.gif | Bin 815 -> 0 bytes
.../images/db-graph-line2-bg.gif | Bin 815 -> 0 bytes
.../magento_basic/images/db-graph-x-bg.png | Bin 142 -> 0 bytes
.../magento_basic/images/db-header-bg.png | Bin 1272 -> 0 bytes
.../magento_basic/images/db-menu-bg-hov.gif | Bin 817 -> 0 bytes
.../magento_basic/images/db-menu-bg-up.gif | Bin 821 -> 0 bytes
.../magento_basic/images/db-menu-bg.gif | Bin 824 -> 0 bytes
.../magento_basic/images/db-menu-sep-last.gif | Bin 826 -> 0 bytes
.../magento_basic/images/db-menu-sep.gif | Bin 879 -> 0 bytes
.../magento_basic/images/db-menu-start.gif | Bin 890 -> 0 bytes
.../magento_basic/images/db-scroll-bg.gif | Bin 1551 -> 0 bytes
.../images/db-scroll-but-bot-roll.png | Bin 565 -> 0 bytes
.../images/db-scroll-but-bot.png | Bin 583 -> 0 bytes
.../images/db-scroll-but-top-roll.png | Bin 610 -> 0 bytes
.../images/db-scroll-but-top.png | Bin 631 -> 0 bytes
.../magento_basic/images/db-scroll-roller.png | Bin 1258 -> 0 bytes
.../images/db-tab-bottom-left-bg.gif | Bin 812 -> 0 bytes
.../images/db-tab-bottom-mid-bg.gif | Bin 809 -> 0 bytes
.../images/db-tab-bottom-right-bg.gif | Bin 812 -> 0 bytes
.../magento_basic/images/db-tab-footer.gif | Bin 809 -> 0 bytes
.../images/db-tab-header-sep.gif | Bin 832 -> 0 bytes
.../magento_basic/images/db-tab-header.gif | Bin 809 -> 0 bytes
.../magento_basic/images/db-tab-left.gif | Bin 808 -> 0 bytes
.../magento_basic/images/db-tab-right.gif | Bin 808 -> 0 bytes
.../images/dotted_divider_dark.gif | Bin 43 -> 0 bytes
.../images/dotted_divider_light.gif | Bin 43 -> 0 bytes
.../magento_basic/images/edit_icon.gif | Bin 561 -> 0 bytes
.../images/entry_edit_head_arrow_down.gif | Bin 677 -> 0 bytes
.../images/entry_edit_head_arrow_down2.gif | Bin 670 -> 0 bytes
.../images/entry_edit_head_arrow_up.gif | Bin 637 -> 0 bytes
.../images/entry_edit_head_bg.gif | Bin 43 -> 0 bytes
.../magento_basic/images/error-msg.png | Bin 1411 -> 0 bytes
.../magento_basic/images/fam_account.gif | Bin 358 -> 0 bytes
.../images/fam_application_form_delete.png | Bin 605 -> 0 bytes
.../images/fam_application_view_tile.gif | Bin 377 -> 0 bytes
.../images/fam_asterisk_orange.gif | Bin 1019 -> 0 bytes
.../magento_basic/images/fam_bin.gif | Bin 288 -> 0 bytes
.../magento_basic/images/fam_bullet_disk.gif | Bin 542 -> 0 bytes
.../magento_basic/images/fam_calendar.gif | Bin 1036 -> 0 bytes
.../magento_basic/images/fam_cart.gif | Bin 257 -> 0 bytes
.../magento_basic/images/fam_comment.gif | Bin 329 -> 0 bytes
.../magento_basic/images/fam_creditcards.gif | Bin 599 -> 0 bytes
.../images/fam_folder_database.gif | Bin 1043 -> 0 bytes
.../images/fam_folder_palette.gif | Bin 1051 -> 0 bytes
.../magento_basic/images/fam_folder_table.gif | Bin 1039 -> 0 bytes
.../magento_basic/images/fam_group.gif | Bin 1014 -> 0 bytes
.../magento_basic/images/fam_help.gif | Bin 1024 -> 0 bytes
.../magento_basic/images/fam_house.gif | Bin 1024 -> 0 bytes
.../magento_basic/images/fam_layout.gif | Bin 574 -> 0 bytes
.../magento_basic/images/fam_leaf.png | Bin 3695 -> 0 bytes
.../magento_basic/images/fam_link.gif | Bin 220 -> 0 bytes
.../magento_basic/images/fam_lorry.gif | Bin 580 -> 0 bytes
.../magento_basic/images/fam_money.gif | Bin 380 -> 0 bytes
.../magento_basic/images/fam_money_add.gif | Bin 1034 -> 0 bytes
.../magento_basic/images/fam_monitor.gif | Bin 1027 -> 0 bytes
.../magento_basic/images/fam_newspaper.gif | Bin 606 -> 0 bytes
.../images/fam_newspaper_delete.gif | Bin 639 -> 0 bytes
.../images/fam_newspaper_error.gif | Bin 628 -> 0 bytes
.../magento_basic/images/fam_newspaper_go.gif | Bin 1035 -> 0 bytes
.../magento_basic/images/fam_package.gif | Bin 1054 -> 0 bytes
.../magento_basic/images/fam_package_go.gif | Bin 645 -> 0 bytes
.../magento_basic/images/fam_page_white.gif | Bin 379 -> 0 bytes
.../images/fam_page_white_edit.gif | Bin 604 -> 0 bytes
.../magento_basic/images/fam_rainbow.gif | Bin 644 -> 0 bytes
.../magento_basic/images/fam_refresh.gif | Bin 324 -> 0 bytes
.../images/fam_server_database.gif | Bin 1045 -> 0 bytes
.../images/fam_status_online.gif | Bin 997 -> 0 bytes
.../magento_basic/images/fam_tag_orange.gif | Bin 592 -> 0 bytes
.../magento_basic/images/fam_user.gif | Bin 583 -> 0 bytes
.../magento_basic/images/fam_user_comment.gif | Bin 606 -> 0 bytes
.../magento_basic/images/fam_user_edit.gif | Bin 614 -> 0 bytes
.../magento_basic/images/filter_row_bg.gif | Bin 111 -> 0 bytes
.../magento_basic/images/footer_bg.gif | Bin 332 -> 0 bytes
.../images/gift-message-collapse.gif | Bin 258 -> 0 bytes
.../images/gift-message-expand.gif | Bin 152 -> 0 bytes
.../images/gift-message-grid-column-bg.gif | Bin 42 -> 0 bytes
.../magento_basic/images/grid-cal.gif | Bin 391 -> 0 bytes
.../magento_basic/images/grid_sort_asc.gif | Bin 105 -> 0 bytes
.../magento_basic/images/grid_sort_desc.gif | Bin 106 -> 0 bytes
.../magento_basic/images/grid_th_bg.gif | Bin 49 -> 0 bytes
.../images/grid_th_onclick_bg.gif | Bin 1242 -> 0 bytes
.../images/grouped_to_order_icon.png | Bin 902 -> 0 bytes
.../magento_basic/images/header_bg.gif | Bin 268 -> 0 bytes
.../magento_basic/images/header_top_bg.gif | Bin 286 -> 0 bytes
.../magento_basic/images/horiz_tabs_ul_bg.gif | Bin 50 -> 0 bytes
.../magento_basic/images/i_notice.gif | Bin 802 -> 0 bytes
.../magento_basic/images/i_question-mark.png | Bin 1654 -> 0 bytes
.../magento_basic/images/ico_success.gif | Bin 338 -> 0 bytes
.../magento_basic/images/icon-tooltip.png | Bin 1441 -> 0 bytes
.../magento_basic/images/icon_btn_add.gif | Bin 344 -> 0 bytes
.../magento_basic/images/icon_btn_back.gif | Bin 216 -> 0 bytes
.../magento_basic/images/icon_btn_delete.gif | Bin 220 -> 0 bytes
.../magento_basic/images/icon_btn_save.gif | Bin 203 -> 0 bytes
.../images/icon_edit_address.gif | Bin 540 -> 0 bytes
.../magento_basic/images/icon_export.gif | Bin 1022 -> 0 bytes
.../magento_basic/images/icon_export.png | Bin 694 -> 0 bytes
.../magento_basic/images/icon_feed.gif | Bin 351 -> 0 bytes
.../magento_basic/images/icon_feed.png | Bin 530 -> 0 bytes
.../magento_basic/images/icon_note_list.gif | Bin 189 -> 0 bytes
.../images/icon_remove_address.gif | Bin 349 -> 0 bytes
.../magento_basic/images/loader-small.gif | Bin 1849 -> 0 bytes
.../magento_basic/images/login_box_bg.gif | Bin 23788 -> 0 bytes
.../magento_basic/images/login_box_bg.jpg | Bin 23561 -> 0 bytes
.../images/login_box_bg_auth.jpg | Bin 51012 -> 0 bytes
.../magento_basic/images/login_box_bottom.jpg | Bin 1259 -> 0 bytes
.../images/login_box_legal_bg.gif | Bin 884 -> 0 bytes
.../magento_basic/images/login_logo.gif | Bin 816 -> 0 bytes
.../magento_basic/images/logo-large.gif | Bin 5636 -> 0 bytes
.../adminhtml/magento_basic/images/logo.gif | Bin 3144 -> 0 bytes
.../magento_basic/images/massaction_bg.gif | Bin 151 -> 0 bytes
.../images/massaction_button_bg.gif | Bin 87 -> 0 bytes
.../images/massaction_links_delimiter.gif | Bin 57 -> 0 bytes
.../magento_basic/images/middle_bg.gif | Bin 327 -> 0 bytes
.../magento_basic/images/more_arrow.gif | Bin 90 -> 0 bytes
.../magento_basic/images/nav1_active.gif | Bin 1315 -> 0 bytes
.../magento_basic/images/nav1_bg.gif | Bin 50 -> 0 bytes
.../magento_basic/images/nav1_off.gif | Bin 154 -> 0 bytes
.../magento_basic/images/nav1_on.gif | Bin 1315 -> 0 bytes
.../magento_basic/images/nav1_over.gif | Bin 368 -> 0 bytes
.../magento_basic/images/nav1_sep.gif | Bin 154 -> 0 bytes
.../magento_basic/images/nav2_last_li_bg.png | Bin 350 -> 0 bytes
.../images/nav2_last_li_over_bg.png | Bin 351 -> 0 bytes
.../magento_basic/images/nav2_li_bg.gif | Bin 75 -> 0 bytes
.../magento_basic/images/nav2_li_bg.png | Bin 163 -> 0 bytes
.../magento_basic/images/nav2_li_over_bg.png | Bin 162 -> 0 bytes
.../magento_basic/images/nav2_link_bg.gif | Bin 43 -> 0 bytes
.../images/nav2_parent_arrow.gif | Bin 84 -> 0 bytes
.../magento_basic/images/nav3_bg.png | Bin 164 -> 0 bytes
.../adminhtml/magento_basic/images/nav_bg.gif | Bin 50 -> 0 bytes
.../magento_basic/images/nav_list_bg.gif | Bin 1514 -> 0 bytes
.../magento_basic/images/nav_nest_link_bg.gif | Bin 43 -> 0 bytes
.../images/nav_nest_link_over_bg.gif | Bin 328 -> 0 bytes
.../magento_basic/images/nav_on_bg.gif | Bin 151 -> 0 bytes
.../magento_basic/images/nav_parent_arrow.gif | Bin 240 -> 0 bytes
.../magento_basic/images/note_bg.gif | Bin 107 -> 0 bytes
.../magento_basic/images/note_cell_bg.gif | Bin 106 -> 0 bytes
.../magento_basic/images/notice-msg.png | Bin 1375 -> 0 bytes
.../magento_basic/images/pager_arrow_left.gif | Bin 334 -> 0 bytes
.../images/pager_arrow_left_off.gif | Bin 218 -> 0 bytes
.../images/pager_arrow_right.gif | Bin 332 -> 0 bytes
.../images/pager_arrow_right_off.gif | Bin 219 -> 0 bytes
.../magento_basic/images/process_spinner.gif | Bin 1849 -> 0 bytes
.../images/product_rating_blank_star.gif | Bin 304 -> 0 bytes
.../images/product_rating_full_star.gif | Bin 306 -> 0 bytes
.../magento_basic/images/rule-ajax-loader.gif | Bin 1849 -> 0 bytes
.../images/rule_chooser_trigger.gif | Bin 591 -> 0 bytes
.../images/rule_component_add.gif | Bin 340 -> 0 bytes
.../images/rule_component_apply.gif | Bin 1024 -> 0 bytes
.../images/rule_component_remove.gif | Bin 343 -> 0 bytes
.../magento_basic/images/save_btn_icon.gif | Bin 203 -> 0 bytes
.../magento_basic/images/sec_nav_bg.gif | Bin 43 -> 0 bytes
.../magento_basic/images/section_menu_bg.gif | Bin 49 -> 0 bytes
.../images/section_menu_bottom.gif | Bin 1036 -> 0 bytes
.../images/section_menu_link_bg.gif | Bin 43 -> 0 bytes
.../images/section_menu_link_over_bg.gif | Bin 600 -> 0 bytes
.../images/section_menu_over_span_bg.gif | Bin 316 -> 0 bytes
.../images/section_menu_span_bg.gif | Bin 43 -> 0 bytes
.../images/section_menu_ul_bg.gif | Bin 64 -> 0 bytes
.../magento_basic/images/side_col_bg.gif | Bin 49 -> 0 bytes
.../images/simple_container_bg.gif | Bin 49 -> 0 bytes
.../magento_basic/images/sort-arrow-down.gif | Bin 117 -> 0 bytes
.../magento_basic/images/sort-arrow-down.png | Bin 2944 -> 0 bytes
.../magento_basic/images/sort-arrow-up.gif | Bin 117 -> 0 bytes
.../magento_basic/images/sort-arrow-up.png | Bin 2940 -> 0 bytes
.../magento_basic/images/sort_heading_bg.gif | Bin 55 -> 0 bytes
.../magento_basic/images/sort_on_bg.gif | Bin 1244 -> 0 bytes
.../magento_basic/images/sort_row_bg.gif | Bin 535 -> 0 bytes
.../adminhtml/magento_basic/images/spacer.gif | Bin 43 -> 0 bytes
.../magento_basic/images/sub_button_bg.gif | Bin 62 -> 0 bytes
.../magento_basic/images/success-msg.png | Bin 1662 -> 0 bytes
.../magento_basic/images/tabs_link_bg.gif | Bin 49 -> 0 bytes
.../images/tabs_link_over_bg.gif | Bin 49 -> 0 bytes
.../magento_basic/images/tabs_span_bg.gif | Bin 43 -> 0 bytes
.../magento_basic/images/tag_blue_edit.gif | Bin 1021 -> 0 bytes
.../magento_basic/images/tn_cancel_bg.gif | Bin 147 -> 0 bytes
.../magento_basic/images/tooltip_bg.gif | Bin 294 -> 0 bytes
.../magento_basic/images/tooltip_corner.gif | Bin 854 -> 0 bytes
.../magento_basic/images/tooltip_top.gif | Bin 295 -> 0 bytes
.../magento_basic/images/tree_icons/join.gif | Bin 69 -> 0 bytes
.../images/tree_icons/joinbottom.gif | Bin 66 -> 0 bytes
.../magento_basic/images/tree_icons/line.gif | Bin 66 -> 0 bytes
.../magento_basic/images/tree_icons/minus.gif | Bin 86 -> 0 bytes
.../images/tree_icons/minusbottom.gif | Bin 85 -> 0 bytes
.../images/tree_icons/nolines_minus.gif | Bin 861 -> 0 bytes
.../images/tree_icons/nolines_plus.gif | Bin 870 -> 0 bytes
.../images/validation_advice_bg.gif | Bin 134 -> 0 bytes
.../magento_basic/images/varien_logo.gif | Bin 403 -> 0 bytes
.../magento_basic/images/window_close.png | Bin 872 -> 0 bytes
.../magento_basic/images/window_content.png | Bin 158 -> 0 bytes
.../magento_basic/images/window_top.png | Bin 166 -> 0 bytes
.../adminhtml/magento_basic/media/editor.swf | Bin 266207 -> 0 bytes
.../adminhtml/magento_basic/media/flex.swf | Bin 19507 -> 0 bytes
.../magento_basic/media/uploader.swf | Bin 180912 -> 0 bytes
.../magento_basic/media/uploaderSingle.swf | Bin 181368 -> 0 bytes
app/design/adminhtml/magento_basic/menu.css | 99 -
app/design/adminhtml/magento_basic/print.css | 41 -
app/design/adminhtml/magento_basic/reset.css | 73 -
.../magento_backup/Magento_Captcha/captcha.js | 71 -
.../Magento_Captcha/default.phtml | 57 -
.../override/base/checkout_onepage_index.xml | 75 -
.../override/base/contacts_index_index.xml | 40 -
.../override/base/customer_account_create.xml | 42 -
.../base/customer_account_forgotpassword.xml | 42 -
.../override/base/customer_account_login.xml | 42 -
.../magento_backup/Magento_Captcha/onepage.js | 36 -
.../magento_backup/Magento_Captcha/reload.png | Bin 1538 -> 0 bytes
.../Magento_Checkout/cart.phtml | 172 --
.../Magento_Checkout/cart/coupon.phtml | 60 -
.../Magento_Checkout/cart/crosssell.phtml | 59 -
.../cart/item/configure/updatecart.phtml | 62 -
.../Magento_Checkout/cart/item/default.phtml | 291 ---
.../Magento_Checkout/cart/shipping.phtml | 127 --
.../Magento_Checkout/cart/sidebar.phtml | 96 -
.../cart/sidebar/default.phtml | 145 --
.../Magento_Checkout/cart/totals.phtml | 48 -
.../magento_backup/Magento_Checkout/cvv.gif | Bin 18112 -> 0 bytes
.../Magento_Checkout/js/accordion.js | 58 -
.../Magento_Checkout/js/components.phtml | 40 -
.../Magento_Checkout/js/discount-codes.js | 47 -
.../Magento_Checkout/js/multi-shipping.js | 63 -
.../Magento_Checkout/js/opcheckout.js | 518 -----
.../Magento_Checkout/js/overview.js | 61 -
.../js/payment-authentication.js | 49 -
.../Magento_Checkout/js/payment.js | 133 --
.../Magento_Checkout/js/region-updater.js | 177 --
.../Magento_Checkout/js/shopping-cart.js | 41 -
.../Magento_Checkout/js/sidebar.js | 44 -
.../override/base/checkout_cart_configure.xml | 41 -
.../override/base/checkout_cart_index.xml | 56 -
.../override/base/checkout_multishipping.xml | 35 -
...kout_multishipping_address_editaddress.xml | 29 -
...kout_multishipping_address_editbilling.xml | 29 -
...out_multishipping_address_editshipping.xml | 29 -
...ckout_multishipping_address_newbilling.xml | 29 -
...kout_multishipping_address_newshipping.xml | 29 -
.../checkout_multishipping_address_select.xml | 31 -
...ut_multishipping_address_selectbilling.xml | 31 -
.../base/checkout_multishipping_addresses.xml | 35 -
.../base/checkout_multishipping_billing.xml | 36 -
...heckout_multishipping_customer_address.xml | 30 -
.../base/checkout_multishipping_login.xml | 28 -
.../base/checkout_multishipping_overview.xml | 46 -
.../base/checkout_multishipping_register.xml | 28 -
.../base/checkout_multishipping_shipping.xml | 40 -
.../base/checkout_multishipping_success.xml | 31 -
.../base/checkout_onepage_additional.xml | 32 -
.../base/checkout_onepage_failure.xml | 35 -
.../override/base/checkout_onepage_index.xml | 61 -
.../base/checkout_onepage_paymentmethod.xml | 33 -
.../base/checkout_onepage_progress.xml | 35 -
.../override/base/checkout_onepage_review.xml | 37 -
.../base/checkout_onepage_shippingmethod.xml | 28 -
.../base/checkout_onepage_success.xml | 35 -
.../layout/override/base/default.xml | 46 -
.../multishipping/address/select.phtml | 58 -
.../multishipping/addresses.phtml | 93 -
.../multishipping/agreements.phtml | 49 -
.../multishipping/billing.phtml | 111 -
.../multishipping/billing/items.phtml | 54 -
.../multishipping/item/default.phtml | 45 -
.../Magento_Checkout/multishipping/link.phtml | 27 -
.../multishipping/overview.phtml | 217 --
.../multishipping/overview/item.phtml | 238 ---
.../multishipping/shipping.phtml | 130 --
.../multishipping/state.phtml | 39 -
.../multishipping/success.phtml | 50 -
.../Magento_Checkout/onepage.phtml | 98 -
.../Magento_Checkout/onepage/accordion.js | 112 -
.../Magento_Checkout/onepage/agreements.phtml | 51 -
.../Magento_Checkout/onepage/billing.phtml | 218 --
.../Magento_Checkout/onepage/failure.phtml | 32 -
.../Magento_Checkout/onepage/link.phtml | 29 -
.../Magento_Checkout/onepage/login.phtml | 120 --
.../Magento_Checkout/onepage/payment.phtml | 39 -
.../onepage/payment/methods.phtml | 66 -
.../Magento_Checkout/onepage/progress.phtml | 115 -
.../Magento_Checkout/onepage/review.phtml | 29 -
.../onepage/review/button.phtml | 27 -
.../onepage/review/info.phtml | 74 -
.../onepage/review/item.phtml | 239 ---
.../onepage/review/totals.phtml | 47 -
.../Magento_Checkout/onepage/shipping.phtml | 164 --
.../onepage/shipping_method.phtml | 41 -
.../onepage/shipping_method/additional.phtml | 29 -
.../onepage/shipping_method/available.phtml | 65 -
.../Magento_Checkout/success.phtml | 64 -
.../Magento_Checkout/total/default.phtml | 38 -
.../Magento_Checkout/total/nominal.phtml | 56 -
.../Magento_Checkout/total/tax.phtml | 68 -
.../Magento_Cms/content_heading.phtml | 31 -
.../Magento_Cms/images/i_widget-link.gif | Bin 57 -> 0 bytes
.../Magento_Cms/layout/override/default.xml | 45 -
.../Magento_Cms/layout/override/print.xml | 34 -
.../widget/static_block/default.phtml | 27 -
.../magento_backup/Magento_Cms/widgets.css | 37 -
.../Magento_Contacts/form.phtml | 79 -
.../Magento_Core/fam_book_open.png | Bin 622 -> 0 bytes
.../Magento_Core/prototype/magento.css | 94 -
.../Magento_Core/prototype/magento/btn_bg.gif | Bin 148 -> 0 bytes
.../prototype/magento/content_bg.gif | Bin 283 -> 0 bytes
.../Magento_Core/prototype/magento/top_bg.gif | Bin 154 -> 0 bytes
.../prototype/magento/window_close.png | Bin 872 -> 0 bytes
.../Magento_Core/translate_inline.phtml | 72 -
.../Magento_Customer/account/dashboard.phtml | 45 -
.../account/dashboard/address.phtml | 50 -
.../account/dashboard/hello.phtml | 30 -
.../account/dashboard/info.phtml | 64 -
.../account/dashboard/newsletter.phtml | 31 -
.../Magento_Customer/account/link/back.phtml | 29 -
.../Magento_Customer/account/navigation.phtml | 36 -
.../Magento_Customer/address.js | 73 -
.../Magento_Customer/address.phtml | 96 -
.../Magento_Customer/address/book.phtml | 105 -
.../Magento_Customer/address/edit.phtml | 176 --
.../Magento_Customer/balance.phtml | 31 -
.../Magento_Customer/form/address.phtml | 154 --
.../form/changepassword.phtml | 103 -
.../Magento_Customer/form/confirmation.phtml | 61 -
.../Magento_Customer/form/edit.phtml | 131 --
.../form/forgotpassword.phtml | 62 -
.../Magento_Customer/form/login.phtml | 99 -
.../Magento_Customer/form/mini.login.phtml | 40 -
.../Magento_Customer/form/newsletter.phtml | 48 -
.../Magento_Customer/form/register.phtml | 222 --
.../form/resetforgottenpassword.phtml | 66 -
.../Magento_Customer/js/checkout-balance.js | 52 -
.../layout/override/base/customer_account.xml | 60 -
.../base/customer_account_confirmation.xml | 38 -
.../override/base/customer_account_create.xml | 37 -
.../base/customer_account_createpassword.xml | 43 -
.../override/base/customer_account_edit.xml | 36 -
.../base/customer_account_forgotpassword.xml | 43 -
.../override/base/customer_account_index.xml | 42 -
.../override/base/customer_account_login.xml | 35 -
.../base/customer_account_logoutsuccess.xml | 35 -
.../override/base/customer_address_form.xml | 31 -
.../override/base/customer_address_index.xml | 31 -
.../layout/override/base/default.xml | 35 -
.../Magento_Customer/logout.phtml | 35 -
.../Magento_Customer/set-password.js | 58 -
.../Magento_Customer/widget/dob.phtml | 82 -
.../Magento_Customer/widget/gender.phtml | 36 -
.../Magento_Customer/widget/name.phtml | 101 -
.../Magento_Customer/widget/taxvat.phtml | 30 -
.../Magento_Directory/currency.phtml | 49 -
.../Magento_Directory/currency/switch.phtml | 31 -
.../js/optional_zip_countries.phtml | 34 -
.../layout/override/catalog_category_view.xml | 30 -
.../override/catalogsearch_advanced_index.xml | 30 -
.../catalogsearch_advanced_result.xml | 30 -
.../override/catalogsearch_result_index.xml | 30 -
.../Magento_GiftMessage/gift-options.js | 95 -
.../Magento_GiftMessage/inline.phtml | 252 ---
.../layout/override/checkout_cart_index.xml | 33 -
.../Magento_GoogleCheckout/link.phtml | 37 -
.../layout/override/base/customer_account.xml | 36 -
.../layout/override/base/default.xml | 30 -
.../override/base/newsletter_manage_index.xml | 33 -
.../Magento_Newsletter/newsletter.js | 47 -
.../Magento_Newsletter/subscribe.phtml | 64 -
.../magento_backup/Magento_Page/1column.phtml | 58 -
.../Magento_Page/2columns-left.phtml | 59 -
.../Magento_Page/2columns-right.phtml | 59 -
.../Magento_Page/3columns.phtml | 62 -
.../magento_backup/Magento_Page/empty.phtml | 46 -
.../Magento_Page/html/breadcrumbs.phtml | 46 -
.../Magento_Page/html/head.phtml | 40 -
.../Magento_Page/html/header.phtml | 46 -
.../Magento_Page/html/notices.phtml | 72 -
.../Magento_Page/html/pager.phtml | 124 --
.../Magento_Page/html/topmenu.phtml | 48 -
.../magento_backup/Magento_Page/js/menu.js | 71 -
.../Magento_Page/js/popup-menu.js | 141 --
.../Magento_Page/js/row-builder.js | 222 --
.../Magento_Page/link/current.phtml | 40 -
.../magento_backup/Magento_Page/popup.phtml | 45 -
.../magento_backup/Magento_Page/print.phtml | 53 -
.../Magento_Page/switch/languages.phtml | 44 -
.../Magento_Page/switch/stores.phtml | 47 -
.../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 | 64 -
.../express/review/shipping/method.phtml | 53 -
.../Magento_Paypal/express/shortcut.phtml | 68 -
.../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 | 39 -
.../layout/override/catalog_category_view.xml | 31 -
.../layout/override/checkout_cart_index.xml | 42 -
.../override/checkout_onepage_review.xml | 38 -
.../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 | 28 -
.../override/paypal_payflow_cancelpayment.xml | 28 -
.../layout/override/paypal_payflow_form.xml | 28 -
.../override/paypal_payflow_returnurl.xml | 28 -
.../paypal_payflowadvanced_cancelpayment.xml | 28 -
.../override/paypal_payflowadvanced_form.xml | 28 -
.../paypal_payflowadvanced_returnurl.xml | 28 -
.../override/paypal_standard_redirect.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 | 37 -
.../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 | 30 -
.../paypal_express_review_details.xml | 33 -
.../override/paypaluk_express_review.xml | 46 -
.../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 -
.../checkout/onepage/billing.phtml | 215 --
.../checkout/onepage/login.phtml | 136 --
.../customer/form/login.phtml | 103 -
.../customer/form/register.phtml | 223 --
.../override/checkout_onepage_index.xml | 40 -
.../override/customer_account_create.xml | 34 -
.../override/customer_account_login.xml | 34 -
.../Magento_Persistent/remember-me-popup.js | 106 -
.../Magento_Persistent/remember_me.phtml | 41 -
.../remember_me_tooltip.phtml | 59 -
.../Magento_Persistent/splitbutton.js | 74 -
.../Magento_ProductAlert/email/price.phtml | 50 -
.../Magento_ProductAlert/email/stock.phtml | 50 -
.../layout/override/catalog_product_view.xml | 49 -
.../Magento_ProductAlert/product/view.phtml | 30 -
.../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 | 35 -
.../Magento_Review/product/view/list.phtml | 66 -
.../magento_backup/Magento_Review/view.phtml | 72 -
.../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 -
.../layout/override/sales_guest_print.xml | 46 -
.../override/sales_guest_printcreditmemo.xml | 42 -
.../override/sales_guest_printinvoice.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 | 53 -
.../override/sales_order_creditmemo.xml | 51 -
.../override/sales_order_guest_info_links.xml | 58 -
.../layout/override/sales_order_history.xml | 34 -
.../layout/override/sales_order_invoice.xml | 51 -
.../override/sales_order_printcreditmemo.xml | 43 -
.../override/sales_order_printinvoice.xml | 43 -
.../override/sales_order_printshipment.xml | 33 -
.../layout/override/sales_order_shipment.xml | 41 -
.../layout/override/sales_order_view.xml | 50 -
.../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 | 43 -
.../Magento_Sales/order/creditmemo.phtml | 32 -
.../order/creditmemo/items.phtml | 65 -
.../creditmemo/items/renderer/default.phtml | 302 ---
.../Magento_Sales/order/history.phtml | 76 -
.../Magento_Sales/order/info.phtml | 92 -
.../Magento_Sales/order/info/buttons.phtml | 38 -
.../Magento_Sales/order/invoice.phtml | 32 -
.../Magento_Sales/order/invoice/items.phtml | 61 -
.../invoice/items/renderer/default.phtml | 299 ---
.../Magento_Sales/order/items.phtml | 77 -
.../order/items/renderer/default.phtml | 323 ---
.../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 | 32 -
.../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 | 41 -
.../Magento_Sales/reorder/sidebar.phtml | 83 -
.../Magento_Sales/widget/guest/form.phtml | 87 -
.../layout/base/shipping_tracking_popup.xml | 35 -
.../Magento_Shipping/tracking/popup.phtml | 177 --
.../Magento_Tax/checkout/discount.phtml | 25 -
.../Magento_Tax/checkout/grandtotal.phtml | 58 -
.../Magento_Tax/checkout/shipping.phtml | 66 -
.../Magento_Tax/checkout/subtotal.phtml | 57 -
.../Magento_Tax/checkout/tax.phtml | 74 -
.../Magento_Tax/order/tax.phtml | 81 -
.../Magento_Weee/layout/override/default.xml | 34 -
.../magento_backup/Magento_Weee/tax-toggle.js | 37 -
.../layout/override/default.xml | 34 -
.../Magento_Widget/layout/override/print.xml | 34 -
.../magento_backup/Magento_Widget/widgets.css | 32 -
.../Magento_Wishlist/button/share.phtml | 31 -
.../Magento_Wishlist/button/tocart.phtml | 30 -
.../Magento_Wishlist/button/update.phtml | 30 -
.../Magento_Wishlist/email/items.phtml | 56 -
.../Magento_Wishlist/email/rss.phtml | 31 -
.../Magento_Wishlist/item/column/cart.phtml | 59 -
.../Magento_Wishlist/item/column/image.phtml | 33 -
.../Magento_Wishlist/item/column/info.phtml | 41 -
.../Magento_Wishlist/item/column/remove.phtml | 29 -
.../item/configure/addto.phtml | 39 -
.../Magento_Wishlist/item/list.phtml | 57 -
.../Magento_Wishlist/js/add-to-wishlist.js | 50 -
.../Magento_Wishlist/js/search.js | 57 -
.../layout/override/base/customer_account.xml | 35 -
.../layout/override/base/default.xml | 33 -
.../base/wishlist_index_configure.xml | 38 -
.../wishlist_index_configure_type_bundle.xml | 73 -
...list_index_configure_type_configurable.xml | 35 -
.../wishlist_index_configure_type_grouped.xml | 33 -
.../wishlist_index_configure_type_simple.xml | 28 -
.../override/base/wishlist_index_index.xml | 55 -
.../override/base/wishlist_index_share.xml | 31 -
.../override/base/wishlist_shared_index.xml | 30 -
.../Magento_Wishlist/options_list.phtml | 51 -
.../Magento_Wishlist/render/item/price.phtml | 39 -
.../render/item/price_msrp_item.phtml | 88 -
.../render/item/price_msrp_rss.phtml | 38 -
.../Magento_Wishlist/shared.phtml | 85 -
.../Magento_Wishlist/sharing.phtml | 75 -
.../Magento_Wishlist/sidebar.phtml | 61 -
.../Magento_Wishlist/view.phtml | 85 -
.../Magento_Wishlist/wishlist.js | 208 --
.../frontend/magento_backup/css/print.css | 37 -
.../magento_backup/media/preview_image.jpg | Bin 11420 -> 0 bytes
app/design/frontend/magento_backup/theme.xml | 33 -
.../images/slider_btn_zoom_in.gif | Bin 443 -> 0 bytes
.../images/slider_btn_zoom_out.gif | Bin 432 -> 0 bytes
app/design/frontend/magento_blank/theme.xml | 1 -
app/design/frontend/magento_blank/view.xml | 298 +++
.../Magento_Page/layout/default.xml | 51 -
.../Magento_Page/layout/print.xml | 51 -
.../frontend/magento_demo/css/print.css | 39 -
.../frontend/magento_demo/css/styles-ie.css | 146 --
.../frontend/magento_demo/css/styles.css | 1765 ----------------
.../i18n/de_DE/Magento_Core/logo_email.gif | Bin 3306 -> 0 bytes
.../magento_demo/i18n/de_DE/images/logo.gif | Bin 3383 -> 0 bytes
.../i18n/de_DE/images/logo_print.gif | Bin 3306 -> 0 bytes
.../frontend/magento_demo/i18n/en_US.csv | 1 -
.../i18n/fr_FR/Magento_Core/logo_email.gif | Bin 3271 -> 0 bytes
.../magento_demo/i18n/fr_FR/images/logo.gif | Bin 3267 -> 0 bytes
.../i18n/fr_FR/images/logo_print.gif | Bin 3271 -> 0 bytes
.../images/best_selling_tr_even_bg.gif | Bin 49 -> 0 bytes
.../images/best_selling_tr_odd_bg.gif | Bin 49 -> 0 bytes
.../magento_demo/images/bkg_account_box.gif | Bin 117 -> 0 bytes
.../magento_demo/images/bkg_block-actions.gif | Bin 63 -> 0 bytes
.../images/bkg_block-currency.gif | Bin 2697 -> 0 bytes
.../images/bkg_block-layered-dd.gif | Bin 43 -> 0 bytes
.../images/bkg_block-layered-dt.gif | Bin 182 -> 0 bytes
.../images/bkg_block-layered-label.gif | Bin 184 -> 0 bytes
.../images/bkg_block-layered-li.gif | Bin 149 -> 0 bytes
.../images/bkg_block-layered-title.gif | Bin 1907 -> 0 bytes
.../images/bkg_block-layered1.gif | Bin 43 -> 0 bytes
.../images/bkg_block-title-account.gif | Bin 173 -> 0 bytes
.../magento_demo/images/bkg_block-title.gif | Bin 96 -> 0 bytes
.../frontend/magento_demo/images/bkg_body.gif | Bin 72 -> 0 bytes
.../magento_demo/images/bkg_buttons-set1.gif | Bin 49 -> 0 bytes
.../magento_demo/images/bkg_checkout.gif | Bin 149 -> 0 bytes
.../magento_demo/images/bkg_collapse-gm.gif | Bin 89 -> 0 bytes
.../magento_demo/images/bkg_collapse.gif | Bin 86 -> 0 bytes
.../magento_demo/images/bkg_divider1.gif | Bin 43 -> 0 bytes
.../magento_demo/images/bkg_form-search.gif | Bin 1724 -> 0 bytes
.../magento_demo/images/bkg_grand-total.gif | Bin 5505 -> 0 bytes
.../frontend/magento_demo/images/bkg_grid.gif | Bin 53 -> 0 bytes
.../magento_demo/images/bkg_header.jpg | Bin 35290 -> 0 bytes
.../magento_demo/images/bkg_login-box.gif | Bin 285 -> 0 bytes
.../magento_demo/images/bkg_main1.gif | Bin 7629 -> 0 bytes
.../magento_demo/images/bkg_main2.gif | Bin 32524 -> 0 bytes
.../frontend/magento_demo/images/bkg_nav0.jpg | Bin 5089 -> 0 bytes
.../frontend/magento_demo/images/bkg_nav1.gif | Bin 43 -> 0 bytes
.../frontend/magento_demo/images/bkg_nav2.gif | Bin 67 -> 0 bytes
.../magento_demo/images/bkg_opc-title-off.gif | Bin 49 -> 0 bytes
.../magento_demo/images/bkg_pipe1.gif | Bin 51 -> 0 bytes
.../magento_demo/images/bkg_pipe2.gif | Bin 51 -> 0 bytes
.../magento_demo/images/bkg_pipe3.gif | Bin 44 -> 0 bytes
.../magento_demo/images/bkg_product-view.gif | Bin 10761 -> 0 bytes
.../images/bkg_product_collateral.gif | Bin 63 -> 0 bytes
.../magento_demo/images/bkg_rating.gif | Bin 661 -> 0 bytes
.../magento_demo/images/bkg_sp-methods.gif | Bin 1144 -> 0 bytes
.../magento_demo/images/bkg_tfoot.gif | Bin 63 -> 0 bytes
.../frontend/magento_demo/images/bkg_th-v.gif | Bin 50 -> 0 bytes
.../frontend/magento_demo/images/bkg_th.gif | Bin 43 -> 0 bytes
.../magento_demo/images/bkg_toolbar.gif | Bin 149 -> 0 bytes
.../magento_demo/images/btn_checkout.gif | Bin 4842 -> 0 bytes
.../frontend/magento_demo/images/btn_edit.gif | Bin 88 -> 0 bytes
.../magento_demo/images/btn_gm-close.gif | Bin 122 -> 0 bytes
.../magento_demo/images/btn_place_order.gif | Bin 2929 -> 0 bytes
.../magento_demo/images/btn_previous.gif | Bin 1254 -> 0 bytes
.../images/btn_proceed_to_checkout.gif | Bin 3048 -> 0 bytes
.../images/btn_proceed_to_checkout_dis.gif | Bin 3084 -> 0 bytes
.../magento_demo/images/btn_remove2.gif | Bin 531 -> 0 bytes
.../magento_demo/images/btn_search.gif | Bin 926 -> 0 bytes
.../magento_demo/images/btn_trash.gif | Bin 643 -> 0 bytes
.../magento_demo/images/btn_window_close.gif | Bin 226 -> 0 bytes
.../frontend/magento_demo/images/calendar.gif | Bin 391 -> 0 bytes
.../magento_demo/images/fam_book_open.png | Bin 622 -> 0 bytes
.../images/free_shipping_callout.jpg | Bin 14639 -> 0 bytes
.../frontend/magento_demo/images/grid-cal.gif | Bin 391 -> 0 bytes
.../magento_demo/images/home_left_callout.jpg | Bin 11802 -> 0 bytes
.../magento_demo/images/home_main_callout.jpg | Bin 36053 -> 0 bytes
.../magento_demo/images/i_arrow-top.gif | Bin 131 -> 0 bytes
.../images/i_availability_only.gif | Bin 562 -> 0 bytes
.../images/i_availability_only_arrow.gif | Bin 113 -> 0 bytes
.../magento_demo/images/i_block-cart.gif | Bin 604 -> 0 bytes
.../magento_demo/images/i_block-currency.gif | Bin 1073 -> 0 bytes
.../magento_demo/images/i_block-list.gif | Bin 600 -> 0 bytes
.../magento_demo/images/i_block-poll.gif | Bin 1014 -> 0 bytes
.../magento_demo/images/i_block-related.gif | Bin 560 -> 0 bytes
.../magento_demo/images/i_block-subscribe.gif | Bin 606 -> 0 bytes
.../magento_demo/images/i_block-tags.gif | Bin 594 -> 0 bytes
.../magento_demo/images/i_block-viewed.gif | Bin 594 -> 0 bytes
.../magento_demo/images/i_block-wishlist.gif | Bin 1014 -> 0 bytes
.../magento_demo/images/i_discount.gif | Bin 1019 -> 0 bytes
.../magento_demo/images/i_folder-table.gif | Bin 1039 -> 0 bytes
.../magento_demo/images/i_ma-info.gif | Bin 604 -> 0 bytes
.../magento_demo/images/i_ma-reviews.gif | Bin 614 -> 0 bytes
.../magento_demo/images/i_ma-tags.gif | Bin 594 -> 0 bytes
.../magento_demo/images/i_msg-error.gif | Bin 1013 -> 0 bytes
.../magento_demo/images/i_msg-note.gif | Bin 1022 -> 0 bytes
.../magento_demo/images/i_msg-success.gif | Bin 1024 -> 0 bytes
.../frontend/magento_demo/images/i_notice.gif | Bin 802 -> 0 bytes
.../frontend/magento_demo/images/i_page1.gif | Bin 253 -> 0 bytes
.../frontend/magento_demo/images/i_page2.gif | Bin 379 -> 0 bytes
.../magento_demo/images/i_pager-next.gif | Bin 155 -> 0 bytes
.../magento_demo/images/i_pager-prev.gif | Bin 155 -> 0 bytes
.../frontend/magento_demo/images/i_print.gif | Bin 1035 -> 0 bytes
.../magento_demo/images/i_rss-big.png | Bin 791 -> 0 bytes
.../frontend/magento_demo/images/i_rss.gif | Bin 350 -> 0 bytes
.../magento_demo/images/i_search_criteria.gif | Bin 268 -> 0 bytes
.../magento_demo/images/i_shipping.gif | Bin 591 -> 0 bytes
.../magento_demo/images/i_tag_add.gif | Bin 621 -> 0 bytes
.../frontend/magento_demo/images/i_tier.gif | Bin 160 -> 0 bytes
.../magento_demo/images/i_type_grid.gif | Bin 105 -> 0 bytes
.../magento_demo/images/i_type_list.gif | Bin 99 -> 0 bytes
.../magento_demo/images/magnifier_handle.gif | Bin 209 -> 0 bytes
.../magento_demo/images/map_popup_arrow.gif | Bin 82 -> 0 bytes
.../images/media/404_callout1.jpg | Bin 17781 -> 0 bytes
.../images/media/404_callout2.jpg | Bin 23222 -> 0 bytes
.../images/media/best_selling_img01.jpg | Bin 1817 -> 0 bytes
.../images/media/best_selling_img02.jpg | Bin 3118 -> 0 bytes
.../images/media/best_selling_img03.jpg | Bin 2516 -> 0 bytes
.../images/media/best_selling_img04.jpg | Bin 2455 -> 0 bytes
.../images/media/best_selling_img05.jpg | Bin 2799 -> 0 bytes
.../images/media/best_selling_img06.jpg | Bin 4898 -> 0 bytes
.../media/cell_phone_landing_banner1.jpg | Bin 21259 -> 0 bytes
.../images/media/electronics_cellphones.jpg | Bin 42440 -> 0 bytes
.../media/electronics_digitalcameras.jpg | Bin 57481 -> 0 bytes
.../images/media/electronics_laptops.jpg | Bin 44643 -> 0 bytes
.../images/media/furniture_callout_spot.jpg | Bin 31312 -> 0 bytes
.../images/media/furnitures_bed_room.jpg | Bin 2193 -> 0 bytes
.../images/media/furnitures_living_room.jpg | Bin 2541 -> 0 bytes
.../media/head_electronics_cellphones.gif | Bin 1039 -> 0 bytes
.../media/head_electronics_digicamera.gif | Bin 1211 -> 0 bytes
.../images/media/head_electronics_laptops.gif | Bin 949 -> 0 bytes
.../images/media/laptop_callout_mid1.jpg | Bin 12145 -> 0 bytes
.../images/media/laptop_callout_mid2.jpg | Bin 10540 -> 0 bytes
.../images/media/laptop_callout_mid3.jpg | Bin 11699 -> 0 bytes
.../images/media/laptop_callout_spot.jpg | Bin 30482 -> 0 bytes
.../images/media/shirts_landing_banner1.jpg | Bin 27352 -> 0 bytes
.../magento_demo/images/np_cart_thumb.gif | Bin 1372 -> 0 bytes
.../magento_demo/images/np_more_img.gif | Bin 908 -> 0 bytes
.../magento_demo/images/np_product_main.gif | Bin 4683 -> 0 bytes
.../frontend/magento_demo/images/np_thumb.gif | Bin 1945 -> 0 bytes
.../magento_demo/images/np_thumb2.gif | Bin 1779 -> 0 bytes
.../images/ph_callout_left_rebel.jpg | Bin 14035 -> 0 bytes
.../images/ph_callout_left_top.gif | Bin 29101 -> 0 bytes
.../images/product_zoom_overlay_magnif.gif | Bin 706 -> 0 bytes
.../magento_demo/images/slider_bg.gif | Bin 68 -> 0 bytes
.../images/validation_advice_bg.gif | Bin 134 -> 0 bytes
.../magento_demo/media/preview_image.jpg | Bin 11420 -> 0 bytes
app/design/frontend/magento_demo/theme.xml | 34 -
.../catalog/product/view/title.phtml | 31 -
.../catalog/product/view/type/bundle.phtml | 59 -
.../view/type/bundle/option/checkbox.phtml | 53 -
.../view/type/bundle/option/multi.phtml | 50 -
.../view/type/bundle/option/radio.phtml | 70 -
.../view/type/bundle/option/select.phtml | 61 -
.../product/view/type/bundle/options.phtml | 55 -
.../magento_plushe/Magento_Bundle/js/slide.js | 99 -
.../base/catalog_product_view_type_bundle.xml | 101 -
.../override/base/checkout_cart_index.xml | 37 -
.../layout/override/base/default.xml | 44 -
.../order/creditmemo/items/renderer.phtml | 314 ---
.../sales/order/invoice/items/renderer.phtml | 330 ---
.../sales/order/items/renderer.phtml | 356 ----
.../sales/order/shipment/items/renderer.phtml | 109 -
.../Magento_Catalog/category/title.phtml | 42 -
.../Magento_Catalog/category/view.phtml | 63 -
.../category/widget/link/link_block.phtml | 26 -
.../category/widget/link/link_inline.phtml | 26 -
.../magento_plushe/Magento_Catalog/js/list.js | 74 -
.../Magento_Catalog/layer/filter.phtml | 46 -
.../Magento_Catalog/layer/state.phtml | 61 -
.../Magento_Catalog/layer/view.phtml | 57 -
.../layout/catalog_product_compare_index.xml | 33 -
.../layout/catalog_product_view.xml | 6 -
.../override/base/catalog_category_view.xml | 92 -
.../catalog_category_view_type_default.xml | 30 -
.../catalog_category_view_type_layered.xml | 30 -
.../base/catalog_product_compare_index.xml | 31 -
.../override/base/catalog_product_view.xml | 139 --
...catalog_product_view_type_configurable.xml | 39 -
.../catalog_product_view_type_grouped.xml | 31 -
.../base/catalog_product_view_type_simple.xml | 31 -
.../catalog_product_view_type_virtual.xml | 31 -
.../layout/override/base/default.xml | 48 -
.../Magento_Catalog/navigation/left.phtml | 59 -
.../product/compare/list.phtml | 150 --
.../product/compare/sidebar.phtml | 79 -
.../Magento_Catalog/product/image.phtml | 31 -
.../product/image_with_borders.phtml | 32 -
.../Magento_Catalog/product/list.phtml | 126 --
.../product/list/toolbar.phtml | 111 -
.../Magento_Catalog/product/view/addto.phtml | 48 -
.../product/view/addtocart.phtml | 93 -
.../product/view/attributes.phtml | 47 -
.../product/view/base-image.phtml | 153 --
.../product/view/description.phtml | 32 -
.../product/view/gallery.phtml | 77 -
.../product/view/options.phtml | 43 -
.../product/view/options/js.phtml | 88 -
.../product/view/options/type/date.phtml | 79 -
.../product/view/options/type/default.phtml | 29 -
.../product/view/options/type/file.phtml | 88 -
.../product/view/options/type/select.phtml | 44 -
.../product/view/options/type/text.phtml | 61 -
.../product/view/options/wrapper.phtml | 36 -
.../product/view/options/wrapper/bottom.phtml | 28 -
.../product/view/price_clone.phtml | 27 -
.../product/view/tierprices.phtml | 219 --
.../product/view/type/default.phtml | 39 -
.../product/view/type/grouped.phtml | 97 -
.../view/type/options/configurable.phtml | 54 -
.../product/widget/link/link_block.phtml | 26 -
.../product/widget/link/link_inline.phtml | 26 -
.../widget/new/column/new_default_list.phtml | 70 -
.../widget/new/column/new_images_list.phtml | 47 -
.../widget/new/column/new_names_list.phtml | 43 -
.../product/widget/new/content/new_grid.phtml | 120 --
.../product/widget/new/content/new_list.phtml | 121 --
.../Magento_CatalogSearch/advanced/form.phtml | 129 --
.../advanced/result.phtml | 61 -
.../Magento_CatalogSearch/form.mini.phtml | 88 -
.../layout/catalogsearch_advanced_index.xml | 28 -
.../layout/catalogsearch_advanced_result.xml | 33 -
.../layout/catalogsearch_result_index.xml | 35 -
.../layout/catalogsearch_term_popular.xml | 33 -
.../base/catalogsearch_result_index.xml | 46 -
.../Magento_CatalogSearch/result.phtml | 53 -
.../Magento_CatalogSearch/term.phtml | 35 -
.../catalog/product/links.phtml | 68 -
.../catalog/product/samples.phtml | 44 -
.../catalog/product/type.phtml | 41 -
.../checkout/cart/item/default.phtml | 305 ---
.../checkout/multishipping/item/default.phtml | 57 -
.../checkout/onepage/review/item.phtml | 247 ---
.../checkout/onepage/review/item_down.phtml | 246 ---
.../customer/products/list.phtml | 75 -
...catalog_product_view_type_downloadable.xml | 36 -
.../items/renderer/downloadable.phtml | 317 ---
.../invoice/items/renderer/downloadable.phtml | 307 ---
.../order/items/renderer/downloadable.phtml | 329 ---
.../layout/override/base/default.xml | 31 -
.../layout/override/base/print.xml | 26 -
.../Magento_Reports/product_compared.phtml | 44 -
.../Magento_Reports/product_viewed.phtml | 44 -
.../column/compared_default_list.phtml | 58 -
.../compared/content/compared_grid.phtml | 125 --
.../compared/content/compared_list.phtml | 125 --
.../viewed/column/viewed_default_list.phtml | 63 -
.../widget/viewed/content/viewed_grid.phtml | 129 --
.../widget/viewed/content/viewed_list.phtml | 128 --
.../override/base/sendfriend_product_send.xml | 36 -
.../Magento_Sendfriend/send.phtml | 118 --
.../frontend/magento_plushe/css/styles.css | 219 +-
.../less/responsive/responsive.less | 2 +-
.../frontend/magento_plushe/less/styles.less | 166 +-
.../Annotation/AdminConfigFixture.php | 139 ++
.../TestFramework/Bootstrap/DocBlock.php | 1 +
.../Magento/TestFramework/Cookie.php | 16 +
.../TestFramework/ObjectManagerFactory.php | 1 +
.../Annotation/AdminConfigFixtureTest.php | 99 +
.../Magento/Adminhtml/DashboardTest.php | 70 -
.../Block/Directpost/IframeTest.php | 2 +-
.../Block/Page/HeadTest.php | 6 +-
.../Block/Page/HeaderTest.php | 8 +-
.../Backend/Block/System/Store/EditTest.php | 64 +-
.../Controller/Adminhtml}/CacheTest.php | 16 +-
.../Controller/Adminhtml/DashboardTest.php | 39 +
.../Controller/Adminhtml/IndexTest.php | 28 +-
.../Backend/Model/Auth/SessionTest.php | 2 +-
.../Magento/Backend/Model/AuthTest.php | 2 +-
.../Backend/Model/Translate/InlineTest.php | 65 +
.../Magento/Backend/Model/UrlTest.php | 8 +-
.../_files/cache/all_types_disabled.php | 0
.../cache/all_types_disabled_rollback.php | 0
.../_files/cache/all_types_enabled.php | 0
.../cache/all_types_enabled_rollback.php | 0
.../_files/cache/all_types_invalidated.php | 0
.../cache/all_types_invalidated_rollback.php | 0
.../_files/cache/application_cache.php | 0
.../cache/application_cache_rollback.php | 0
.../_files/cache/empty_storage.php | 0
.../_files/cache/non_application_cache.php | 0
.../cache/non_application_cache_rollback.php | 0
.../Magento/Bundle/Model/ProductTest.php | 7 +-
.../Adminhtml/Captcha/DefaultCaptchaTest.php} | 35 +-
.../Captcha/Block/Captcha/DefaultTest.php | 20 -
.../Magento/Captcha/Model/ObserverTest.php | 26 +-
.../Magento/Captcha/_files/dummy_user.php | 2 +
.../Helper/Form/Gallery/ContentTest.php | 2 +-
.../Block/Product/ProductList/RelatedTest.php | 3 +-
.../Adminhtml/Product/AttributeTest.php | 10 +-
.../Attribute/Backend/TierpriceTest.php | 12 +-
.../Magento/Catalog/Model/ProductTest.php | 44 +-
.../Magento/Centinel/CreateOrderTest.php | 8 +-
.../Cms/Model/Wysiwyg/Images/StorageTest.php | 5 +-
.../testsuite/Magento/Core/Helper/UrlTest.php | 7 +-
.../testsuite/Magento/Core/Model/AppTest.php | 10 +-
.../Magento/Core/Model/DesignTest.php | 4 +-
.../Magento/Core/Model/LayoutTest.php | 1 +
.../Core/Model/Resource/Layout/UpdateTest.php | 4 +-
.../Model/Resource/Store/CollectionTest.php | 2 +-
.../Core/Model/Resource/TransactionTest.php | 5 +-
.../Magento/Core/Model/StoreTest.php | 20 +-
.../Core/Model/Translate/InlineParserTest.php | 2 +-
.../Core/Model/Translate/InlineTest.php | 2 +-
.../Magento/Core/Model/TranslateTest.php | 6 +-
.../testsuite/Magento/Core/Model/UrlTest.php | 2 -
.../Core/Model/Variable/ConfigTest.php | 3 +
.../Magento/Core/Model/View/DesignTest.php | 2 +-
.../Magento/Core/Model/WebsiteTest.php | 3 +-
.../layout_test_handle_sample.xml | 6 +-
.../Core/_files/db_translate_admin_store.php | 6 +-
.../Magento/Cron/Model/ObserverTest.php | 2 +
.../Magento/Customer/Service/CustomerTest.php | 18 +-
.../Model/Translate/InlineVdeTest.php | 2 +-
.../Downloadable/Model/Product/TypeTest.php | 3 +-
.../layout/email_template_test_handle.xml | 2 +-
.../Magento/Install/Model/ConfigTest.php | 10 +-
.../Magento/Install/Model/InstallerTest.php | 3 +-
.../Block/Adminhtml}/Queue/Edit/FormTest.php | 8 +-
.../Block/Adminhtml}/SubscriberTest.php | 6 +-
.../Adminhtml}/NewsletterQueueTest.php | 6 +-
.../Adminhtml}/NewsletterTemplateTest.php | 14 +-
.../Magento/Newsletter/Model/QueueTest.php | 4 +-
.../Magento/Newsletter/Model/TemplateTest.php | 5 +-
.../_files/newsletter_sample.php | 0
.../Magento/Object/Copy/Config/ReaderTest.php | 2 +-
.../Magento/Page/Block/Html/HeadTest.php | 8 +-
.../Magento/Payment/Block/InfoTest.php | 3 +-
.../Magento/Paypal/Controller/ExpressTest.php | 2 -
.../Block/Adminhtml}/Filter/FormTest.php | 8 +-
.../Adminhtml}/Sales/Bestsellers/GridTest.php | 6 +-
.../Adminhtml}/Sales/Coupons/GridTest.php | 6 +-
.../Adminhtml}/Sales/Invoiced/GridTest.php | 6 +-
.../Adminhtml}/Sales/Refunded/GridTest.php | 6 +-
.../Block/Adminhtml}/Sales/Sales/GridTest.php | 6 +-
.../Adminhtml}/Sales/Shipping/GridTest.php | 6 +-
.../Block/Adminhtml}/Sales/Tax/GridTest.php | 6 +-
.../Report/Product/Viewed/CollectionTest.php | 2 +-
.../Magento/Rss/Controller/CatalogTest.php | 1 +
.../Controller/Adminhtml/Order/CreateTest.php | 1 +
.../Report/Bestsellers/CollectionTest.php | 2 +-
.../Invoiced/Collection/InvoicedTest.php | 2 +-
.../Report/Invoiced/Collection/OrderTest.php | 2 +-
.../Resource/Report/Order/CollectionTest.php | 2 +-
.../Report/Refunded/Collection/OrderTest.php | 2 +-
.../Refunded/Collection/RefundedTest.php | 2 +-
.../Report/Shipping/Collection/OrderTest.php | 2 +-
.../Shipping/Collection/ShipmentTest.php | 2 +-
.../Model/Resource/Report/CollectionTest.php | 2 +-
.../Magento/Sitemap/Helper/DataTest.php | 29 +-
.../Model/Resource/Report/CollectionTest.php | 2 +-
.../Integrity/Magento/Payment/MethodsTest.php | 2 +-
.../Integrity/Modular/LayoutFilesTest.php | 13 +-
.../Test/Integrity/Theme/ViewFilesTest.php | 16 -
.../Magento/User/Helper/DataTest.php | 8 +-
.../Resource/Role/Grid/CollectionTest.php | 2 +-
.../testsuite/Magento/User/Model/UserTest.php | 10 +-
.../Magento/User/_files/dummy_user.php | 2 +
.../Magento/View/Block/AbstractBlockTest.php | 2 +-
.../css/wrong.css | 0
.../Magento/View/Layout/ElementTest.php | 2 +-
.../View/Layout/_files/_layout_update.xml | 6 +-
.../Magento/Widget/Model/Config/DataTest.php | 2 +-
.../Widget/Model/Config/ReaderTest.php | 2 +-
.../Widget/Model/Widget/ConfigTest.php | 7 +-
.../Widget/Model/Widget/InstanceTest.php | 2 +-
.../Magento/Widget/Model/WidgetTest.php | 6 +-
.../performance/benchmark_logs_merge.php | 88 +
.../Magento/TestFramework/Application.php | 2 +-
.../performance/testsuite/add_to_cart.jmx | 2 +-
.../performance/testsuite/advanced_search.jmx | 8 +-
dev/tests/performance/testsuite/backend.jmx | 6 +-
dev/tests/performance/testsuite/checkout.jmx | 6 +-
.../performance/testsuite/product_edit.jmx | 4 +-
.../performance/testsuite/quick_search.jmx | 3 +-
.../_files/blacklist/adminhtml_decoupling.php | 52 -
.../Test/Legacy/_files/obsolete_classes.php | 212 ++
.../Test/Legacy/_files/obsolete_constants.php | 9 +-
.../Test/Legacy/_files/obsolete_methods.php | 20 +-
.../Magento/Test/Legacy/_files/words_ce.xml | 11 +
.../Magento/Test/Php/LiveCodeTest.php | 1 -
.../Php/_files/phpcpd/blacklist/common.txt | 6 +
.../Php/_files/phpcs/blacklist/common.txt | 2 +-
.../Test/Php/_files/whitelist/common.txt | 9 +-
.../Authorizenet/Helper/BackendTest.php | 99 +
.../Backend/App/Action/Plugin/StoreTest.php | 39 -
.../App/Area/FrontNameResolverTest.php | 13 +-
.../Magento/Backend/App/ConfigTest.php | 135 ++
.../Page/System/Config/Robots/ResetTest.php | 10 +-
.../Block/UrlrewriteTest.php | 2 +-
.../Controller/Adminhtml}/CacheTest.php | 2 +-
.../Controller}/Adminhtml/DashboardTest.php | 2 +-
.../Magento/Backend/Model/CookieTest.php | 44 +
.../Translate/Inline/ConfigFactoryTest.php | 81 +
.../Model/Translate/Inline/ConfigTest.php | 40 +
.../Captcha/Helper/Adminhtml/DataTest.php | 74 +
.../Magento/Captcha/Helper/DataTest.php | 8 -
.../Magento/Captcha/Model/CronTest.php | 162 ++
.../Magento/Captcha/Model/ObserverTest.php | 12 +-
.../Resource/Product/Option/ValueTest.php | 4 +-
.../Model/Adminhtml/Stock/ItemTest.php | 85 +
.../Magento/Centinel/Model/ServiceTest.php | 52 +
.../Area/Request/PathInfoProcessorTest.php | 10 +-
.../Magento/Core/Model/Layout/MergeTest.php | 25 +-
.../Model/Layout/Update}/ValidatorTest.php | 16 +-
.../Model/Layout/_files/layout/file_wrong.xml | 4 +-
.../Core/Model/Theme/ThemeProviderTest.php | 2 +-
.../Translate/Inline/ConfigFactoryTest.php | 43 +
.../Model/Translate/Inline/ConfigTest.php | 44 +
.../testsuite/Magento/Core/Model/UrlTest.php | 49 +-
.../Customer/Model/Backend/CustomerTest.php | 84 +
.../Block/Adminhtml/Template/EditTest.php | 2 +-
.../Entity/Eav/Customer/AddressTest.php | 6 +-
.../Model/Export/Entity/Eav/CustomerTest.php | 6 +-
.../Entity/Eav/Customer/AddressTest.php | 2 +-
.../Model/Import/Entity/ProductTest.php | 237 +++
.../Adminhtml/Order/Create/Items/GridTest.php | 2 +-
.../Theme/Model/Config/CustomizationTest.php | 2 +-
.../Design/Theme/FlyweightFactoryTest.php | 4 +-
.../app/Magento/Downloader/Controller.php | 26 +-
.../Model/Config/AbstractConfig.php | 2 +-
.../app/Magento/Downloader/Model/Connect.php | 2 +-
downloader/lib/Magento/Backup/Snapshot.php | 2 +-
downloader/lib/Magento/Connect/Package.php | 2 +-
downloader/lib/Magento/System/Ftp.php | 2 +-
lib/Magento/App/Cache.php | 2 +-
lib/Magento/App/Dir.php | 2 +-
lib/Magento/App/Request/Http.php | 2 +-
lib/Magento/Backup/Factory.php | 34 +-
lib/Magento/Backup/Snapshot.php | 2 +-
lib/Magento/Config/Dom.php | 2 +-
lib/Magento/Connect/Package.php | 2 +-
lib/Magento/Connect/Rest.php | 18 +-
lib/Magento/Connect/Singleconfig.php | 14 +-
lib/Magento/Data/Collection.php | 6 +-
lib/Magento/Data/Collection/Db.php | 4 +-
.../Collection/EntityFactoryInterface.php | 23 +-
.../Data/Form/Element/CollectionFactory.php | 32 +-
lib/Magento/Filter/Object.php | 6 +-
.../Template/Tokenizer/AbstractTokenizer.php | 2 +-
lib/Magento/Gdata/Gshopping/Content.php | 2 +-
lib/Magento/HTTP/Adapter/Curl.php | 3 +
lib/Magento/Image/Adapter/Gd2.php | 4 +-
lib/Magento/Image/Adapter/ImageMagick.php | 4 +-
lib/Magento/Oauth/ConsumerInterface.php | 2 +-
lib/Magento/Phrase/Renderer/Translate.php | 6 +-
lib/Magento/UrlInterface.php | 7 +
.../Validator/Composite/VarienObject.php | 2 +-
lib/Magento/View/Block/Template.php | 1 -
lib/Magento/View/DesignInterface.php | 1 -
lib/PEAR/SOAP/WSDL.php | 2 +-
lib/Zend/Currency.php | 2 +-
lib/Zend/Db/Select.php | 2 +-
lib/Zend/Filter/Inflector.php | 2 +-
lib/Zend/Gdata/App.php | 4 +-
lib/Zend/Gdata/Calendar.php | 6 +-
lib/Zend/Gdata/Docs.php | 14 +-
lib/Zend/Gdata/Gapps.php | 52 +-
lib/Zend/Gdata/Gbase.php | 4 +-
lib/Zend/Gdata/Photos.php | 14 +-
lib/Zend/Mail/Protocol/Pop3.php | 2 +-
lib/Zend/OpenId/Consumer.php | 2 +-
lib/Zend/Pdf.php | 2 +-
lib/Zend/Pdf/ElementFactory.php | 2 +-
lib/Zend/Pdf/ElementFactory/Interface.php | 2 +-
lib/Zend/Pdf/ElementFactory/Proxy.php | 2 +-
lib/Zend/Pdf/Page.php | 2 +-
lib/Zend/Search/Lucene.php | 4 +-
lib/Zend/Search/Lucene/Index/SegmentInfo.php | 2 +-
.../Search/Lucene/Index/SegmentWriter.php | 6 +-
.../Lucene/Index/TermsStream/Interface.php | 2 +-
lib/Zend/Search/Lucene/Interface.php | 2 +-
lib/Zend/Search/Lucene/MultiSearcher.php | 4 +-
lib/Zend/Search/Lucene/Proxy.php | 4 +-
.../Lucene/TermStreamsPriorityQueue.php | 2 +-
lib/Zend/Service/Delicious/PostList.php | 2 +-
.../Project/Context/Filesystem/Abstract.php | 4 +-
.../Placeholder/Container/Standalone.php | 2 +-
lib/flex/varien/varien/upload/Uploader.as | 266 +--
lib/phpseclib/Net/SSH2.php | 30 +-
pub/lib/extjs/ext-all-debug.js | 2 +-
pub/lib/extjs/package/form/form-debug.js | 486 ++---
pub/lib/jquery/jquery-ui.js | 2 +-
pub/lib/lib/flex.js | 6 +-
pub/lib/mage/validation.js | 2 +-
pub/lib/prototype/tooltip_manager.js | 86 +-
pub/lib/tiny_mce/classes/Editor.js | 70 +-
pub/lib/tiny_mce/classes/Formatter.js | 26 +-
pub/lib/tiny_mce/classes/Popup.js | 8 +-
pub/lib/tiny_mce/classes/WindowManager.js | 32 +-
.../classes/adapter/jquery/adapter.js | 2 +-
pub/lib/tiny_mce/classes/ui/Container.js | 2 +-
pub/lib/tiny_mce/classes/util/Cookie.js | 6 +-
pub/lib/tiny_mce/classes/xml/Parser.js | 2 +-
pub/lib/tiny_mce/tiny_mce_jquery_src.js | 332 +--
1982 files changed, 13110 insertions(+), 47553 deletions(-)
delete mode 100644 app/code/Magento/Adminhtml/Model/Newsletter/Renderer/Text.php
delete mode 100644 app/code/Magento/Adminhtml/etc/adminhtml/events.xml
delete mode 100644 app/code/Magento/Adminhtml/etc/adminhtml/menu.xml
delete mode 100644 app/code/Magento/Adminhtml/etc/config.xml
delete mode 100644 app/code/Magento/Adminhtml/etc/di.xml
delete mode 100644 app/code/Magento/Adminhtml/etc/sales.xml
delete mode 100644 app/code/Magento/Adminhtml/view/adminhtml/layout/default.xml
create mode 100644 app/code/Magento/Authorizenet/Helper/Backend.php
rename app/code/Magento/{Adminhtml/Model/Observer.php => Authorizenet/Helper/HelperInterface.php} (68%)
create mode 100644 app/code/Magento/Backend/App/Config.php
create mode 100644 app/code/Magento/Backend/App/ConfigInterface.php
rename app/code/Magento/{Adminhtml => Backend}/Block/Admin/Formkey.php (91%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Cache.php (96%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Cache/Additional.php (80%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Denied.php (93%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Media/Uploader.php (93%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Page.php (93%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Page/Footer.php (88%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Page/Head.php (96%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Page/Header.php (93%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Page/Notices.php (90%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Page/System/Config/Robots/Reset.php (96%)
rename app/code/Magento/{Adminhtml => Backend}/Block/Text/ListText.php (91%)
rename app/code/Magento/{Adminhtml/Block/Template.php => Backend/Model/Cookie.php} (73%)
rename dev/tests/integration/testsuite/Magento/Adminhtml/Helper/DataTest.php => app/code/Magento/Backend/Model/Resource/Translate.php (70%)
create mode 100644 app/code/Magento/Backend/Model/Resource/Translate/String.php
rename app/code/Magento/{Adminhtml => Backend}/Model/Search/Catalog.php (91%)
rename app/code/Magento/{Adminhtml => Backend}/Model/Search/Customer.php (90%)
rename app/code/Magento/{Adminhtml => Backend}/Model/Search/Order.php (92%)
rename app/code/Magento/{Adminhtml/Block/Html/Select.php => Backend/Model/Translate/Inline.php} (70%)
create mode 100644 app/code/Magento/Backend/Model/Translate/Inline/Config.php
create mode 100644 app/code/Magento/Backend/Model/Translate/Inline/ConfigFactory.php
rename app/code/Magento/{Adminhtml => Backend}/etc/adminhtml/acl.xml (100%)
rename app/code/Magento/{Adminhtml => Backend}/etc/events.xml (78%)
rename app/{design/frontend/magento_backup/Magento_Paypal/layout/override/review_product_list.xml => code/Magento/Backend/etc/install/di.xml} (89%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/admin/access_denied.phtml (97%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/admin/formkey.phtml (100%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/admin/overlay_popup.phtml (100%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/admin/page.phtml (98%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/admin/popup.phtml (95%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/layout/adminhtml_denied.xml (90%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/layout/adminhtml_noroute.xml (100%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/layout/editor.xml (100%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/layout/empty.xml (100%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/layout/formkey.xml (88%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/layout/overlay_popup.xml (100%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/layout/popup.xml (100%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/media/uploader.phtml (98%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/page/footer.phtml (100%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/page/head.phtml (95%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/page/header.phtml (97%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/page/js/calendar.phtml (100%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/page/js/components.phtml (100%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/page/js/translate.phtml (100%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/page/notices.phtml (100%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/page/system/config/robots/reset.phtml (95%)
rename app/code/Magento/{Adminhtml => Backend}/view/adminhtml/store/switcher/enhanced.phtml (100%)
rename app/code/Magento/{Adminhtml/Block => Backup/Block/Adminhtml}/Backup.php (89%)
rename app/code/Magento/{Adminhtml/Block/Backup => Backup/Block/Adminhtml}/Dialogs.php (91%)
rename app/code/Magento/{Backend/Controller/Adminhtml/System/Backup.php => Backup/Controller/Adminhtml/Index.php} (95%)
rename app/{design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure_type_simple.xml => code/Magento/Backup/etc/adminhtml/routes.xml} (82%)
rename app/code/Magento/{Adminhtml => Backup}/view/adminhtml/backup/dialogs.phtml (96%)
rename app/code/Magento/{Adminhtml => Backup}/view/adminhtml/backup/left.phtml (100%)
rename app/code/Magento/{Adminhtml => Backup}/view/adminhtml/backup/list.phtml (100%)
rename app/code/Magento/{Backend/view/adminhtml/layout/adminhtml_system_backup_block.xml => Backup/view/adminhtml/layout/backup_index_block.xml} (100%)
rename app/code/Magento/{Backend/view/adminhtml/layout/adminhtml_system_backup_grid.xml => Backup/view/adminhtml/layout/backup_index_grid.xml} (95%)
rename app/code/Magento/{Backend/view/adminhtml/layout/adminhtml_system_backup_index.xml => Backup/view/adminhtml/layout/backup_index_index.xml} (88%)
rename app/{design/frontend/magento_plushe/Magento_Bundle => code/Magento/Bundle/view/frontend}/catalog/product/view/backbutton.phtml (86%)
rename app/{design/frontend/magento_plushe/Magento_Bundle => code/Magento/Bundle/view/frontend}/catalog/product/view/customize.phtml (84%)
rename app/{design/frontend/magento_plushe/Magento_Bundle => code/Magento/Bundle/view/frontend}/catalog/product/view/summary.phtml (83%)
create mode 100644 app/code/Magento/Captcha/Block/Adminhtml/Captcha/DefaultCaptcha.php
create mode 100644 app/code/Magento/Captcha/Helper/Adminhtml/Data.php
create mode 100644 app/code/Magento/Captcha/Model/Cron.php
rename app/code/Magento/{Catalog/view/frontend/layout/tag_product_list.xml => Captcha/etc/crontab/di.xml} (89%)
create mode 100644 app/code/Magento/Catalog/Model/Product/Type/Grouped/Backend.php
delete mode 100644 app/code/Magento/Catalog/view/frontend/images/i_asc_arrow.gif
delete mode 100644 app/code/Magento/Catalog/view/frontend/images/i_desc_arrow.gif
delete mode 100644 app/code/Magento/Catalog/view/frontend/images/i_widget-link.gif
delete mode 100644 app/code/Magento/Catalog/view/frontend/images/i_widget-new.gif
delete mode 100644 app/code/Magento/Catalog/view/frontend/images/media/col_left_callout.jpg
delete mode 100644 app/code/Magento/Catalog/view/frontend/images/media/col_right_callout.jpg
rename app/{design/frontend/magento_plushe/Magento_Catalog => code/Magento/Catalog/view/frontend}/product/compare/link.phtml (98%)
rename app/{design/frontend/magento_plushe/Magento_Catalog => code/Magento/Catalog/view/frontend}/product/list/items.phtml (93%)
delete mode 100644 app/code/Magento/Catalog/view/frontend/product/list/related.phtml
delete mode 100644 app/code/Magento/Catalog/view/frontend/product/list/upsell.phtml
rename app/{design/frontend/magento_plushe/Magento_Catalog => code/Magento/Catalog/view/frontend}/product/listing.phtml (97%)
delete mode 100644 app/code/Magento/Catalog/view/frontend/product/new.phtml
delete mode 100644 app/code/Magento/Catalog/view/frontend/product/view.phtml
rename app/{design/frontend/magento_plushe/Magento_Catalog => code/Magento/Catalog/view/frontend}/product/view/attribute.phtml (93%)
rename app/{design/frontend/magento_plushe/Magento_Catalog => code/Magento/Catalog/view/frontend}/product/view/details.phtml (100%)
rename app/{design/frontend/magento_plushe/Magento_Catalog => code/Magento/Catalog/view/frontend}/product/view/form.phtml (90%)
delete mode 100644 app/code/Magento/Catalog/view/frontend/product/view/gallery.phtml
rename app/{design/frontend/magento_plushe/Magento_Catalog => code/Magento/Catalog/view/frontend}/product/view/mailto.phtml (85%)
rename app/{design/frontend/magento_plushe/Magento_Catalog => code/Magento/Catalog/view/frontend}/product/view/price.phtml (100%)
rename app/{design/frontend/magento_plushe/Magento_Catalog => code/Magento/Catalog/view/frontend}/product/view/rating.phtml (97%)
create mode 100644 app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
rename app/{design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure_type_configurable.xml => code/Magento/CatalogInventory/etc/adminhtml/di.xml} (86%)
rename app/code/Magento/{Adminhtml/Model/LayoutUpdate => Core/Model/Layout/Update}/Validator.php (96%)
create mode 100644 app/code/Magento/Core/Model/Translate/Inline/Config.php
create mode 100644 app/code/Magento/Core/Model/Translate/Inline/ConfigFactory.php
rename app/code/Magento/{Adminhtml/Helper/Data.php => Core/Model/Translate/Inline/ConfigInterface.php} (75%)
rename app/code/Magento/{Adminhtml/Block/Html/Date.php => Customer/Model/Backend/Customer.php} (71%)
rename app/{design/frontend/magento_plushe/Magento_Downloadable/layout/override/base/checkout_cart_index.xml => code/Magento/Downloadable/view/frontend/layout/default.xml} (89%)
rename app/code/Magento/{Adminhtml/Model/Giftmessage => GiftMessage/Model}/Save.php (95%)
rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Problem.php (90%)
rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Problem/Grid/Filter/Checkbox.php (83%)
rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Problem/Grid/Renderer/Checkbox.php (83%)
rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Queue/Edit.php (93%)
rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Queue/Edit/Form.php (97%)
rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Queue/Grid/Renderer/Action.php (77%)
rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Queue/Preview.php (95%)
rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Queue/Preview/Form.php (90%)
rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Subscriber.php (89%)
rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Subscriber/Grid.php (92%)
rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Subscriber/Grid/Filter/Checkbox.php (83%)
rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Subscriber/Grid/Filter/Website.php (95%)
rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Subscriber/Grid/Renderer/Checkbox.php (85%)
rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Template.php (74%)
rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Template/Edit.php (93%)
rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Template/Edit/Form.php (94%)
rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Template/Grid.php (91%)
rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Template/Grid/Renderer/Action.php (80%)
rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Template/Grid/Renderer/Sender.php (88%)
rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Template/Preview.php (95%)
rename app/code/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Template/Preview/Form.php (90%)
rename app/code/Magento/{Adminhtml/Controller/Newsletter => Newsletter/Controller/Adminhtml}/Problem.php (95%)
rename app/code/Magento/{Adminhtml/Controller/Newsletter => Newsletter/Controller/Adminhtml}/Queue.php (92%)
rename app/code/Magento/{Adminhtml/Controller/Newsletter => Newsletter/Controller/Adminhtml}/Subscriber.php (95%)
rename app/code/Magento/{Adminhtml/Controller/Newsletter => Newsletter/Controller/Adminhtml}/Template.php (93%)
rename app/code/Magento/{Catalog/view/frontend/layout/tag_customer_view.xml => Newsletter/etc/adminhtml/routes.xml} (84%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_block.xml => Newsletter/view/adminhtml/layout/newsletter_problem_block.xml} (98%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_grid.xml => Newsletter/view/adminhtml/layout/newsletter_problem_grid.xml} (95%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_index.xml => Newsletter/view/adminhtml/layout/newsletter_problem_index.xml} (90%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_queue_edit.xml => Newsletter/view/adminhtml/layout/newsletter_queue_edit.xml} (94%)
rename app/code/Magento/Newsletter/view/adminhtml/layout/{adminhtml_newsletter_queue_grid.xml => newsletter_queue_grid.xml} (95%)
rename app/code/Magento/Newsletter/view/adminhtml/layout/{adminhtml_newsletter_queue_grid_block.xml => newsletter_queue_grid_block.xml} (99%)
rename app/code/Magento/Newsletter/view/adminhtml/layout/{adminhtml_newsletter_queue_index.xml => newsletter_queue_index.xml} (95%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_queue_preview.xml => Newsletter/view/adminhtml/layout/newsletter_queue_preview.xml} (82%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/newsletter_queue_preview.xml => Newsletter/view/adminhtml/layout/newsletter_queue_preview_popup.xml} (85%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_block.xml => Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml} (97%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_exportcsv.xml => Newsletter/view/adminhtml/layout/newsletter_subscriber_exportcsv.xml} (95%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_exportxml.xml => Newsletter/view/adminhtml/layout/newsletter_subscriber_exportxml.xml} (95%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_grid.xml => Newsletter/view/adminhtml/layout/newsletter_subscriber_grid.xml} (95%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_index.xml => Newsletter/view/adminhtml/layout/newsletter_subscriber_index.xml} (90%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_template_edit.xml => Newsletter/view/adminhtml/layout/newsletter_template_edit.xml} (95%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_newsletter_template_preview.xml => Newsletter/view/adminhtml/layout/newsletter_template_preview.xml} (83%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/newsletter_template_preview.xml => Newsletter/view/adminhtml/layout/newsletter_template_preview_popup.xml} (85%)
rename app/code/Magento/{Adminhtml => Newsletter}/view/adminhtml/layout/preview.xml (89%)
rename app/code/Magento/{Adminhtml/view/adminhtml/newsletter => Newsletter/view/adminhtml}/preview/iframeswitcher.phtml (98%)
rename app/code/Magento/{Adminhtml/view/adminhtml/newsletter => Newsletter/view/adminhtml}/preview/store.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/newsletter => Newsletter/view/adminhtml}/problem/list.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/newsletter => Newsletter/view/adminhtml}/queue/edit.phtml (98%)
rename app/code/Magento/{Adminhtml/view/adminhtml/newsletter => Newsletter/view/adminhtml}/queue/preview.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/newsletter => Newsletter/view/adminhtml}/subscriber/list.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/newsletter => Newsletter/view/adminhtml}/template/edit.phtml (99%)
rename app/code/Magento/{Adminhtml/view/adminhtml/newsletter => Newsletter/view/adminhtml}/template/list.phtml (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/newsletter => Newsletter/view/adminhtml}/template/preview.phtml (100%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Config/Form/Field/MtdStart.php (92%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Config/Form/Field/YtdStart.php (94%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Filter/Form.php (96%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Grid/AbstractGrid.php (97%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Grid/Column/Renderer/Blanknumber.php (92%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Grid/Column/Renderer/Currency.php (92%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Grid/Column/Renderer/Customer.php (92%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Grid/Column/Renderer/Product.php (92%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Grid/Shopcart.php (93%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Product.php (86%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Product/Downloads.php (86%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Product/Downloads/Grid.php (95%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Product/Downloads/Renderer/Purchases.php (91%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Product/Grid.php (97%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Product/Lowstock.php (86%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Product/Lowstock/Grid.php (96%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Product/Viewed.php (85%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Product/Viewed/Grid.php (90%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Review/Customer.php (85%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Review/Detail.php (87%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Review/Detail/Grid.php (96%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Review/Product.php (85%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Bestsellers.php (85%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Bestsellers/Grid.php (91%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Coupons.php (85%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Coupons/Grid.php (95%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Grid/Column/Renderer/Date.php (97%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Invoiced.php (85%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Invoiced/Grid.php (94%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Refunded.php (85%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Refunded/Grid.php (93%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Sales.php (85%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Sales/Grid.php (97%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Shipping.php (85%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Shipping/Grid.php (93%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Tax.php (85%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Tax/Grid.php (94%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Search.php (87%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Shopcart/Abandoned.php (86%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Shopcart/Abandoned/Grid.php (95%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Shopcart/Customer.php (85%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Shopcart/Customer/Grid.php (92%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Shopcart/Product.php (85%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Shopcart/Product/Grid.php (93%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Wishlist.php (92%)
rename app/code/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Wishlist/Grid.php (96%)
rename app/code/Magento/{Adminhtml/Controller/Report.php => Reports/Controller/Adminhtml/Index.php} (95%)
rename app/code/Magento/{Adminhtml/Controller => Reports/Controller/Adminhtml}/Report/AbstractReport.php (88%)
rename app/code/Magento/{Adminhtml/Controller => Reports/Controller/Adminhtml}/Report/Customer.php (98%)
rename app/code/Magento/{Adminhtml/Controller => Reports/Controller/Adminhtml}/Report/Product.php (92%)
rename app/code/Magento/{Adminhtml/Controller => Reports/Controller/Adminhtml}/Report/Review.php (95%)
rename app/code/Magento/{Adminhtml/Controller => Reports/Controller/Adminhtml}/Report/Sales.php (87%)
rename app/code/Magento/{Adminhtml/Controller => Reports/Controller/Adminhtml}/Report/Shopcart.php (90%)
rename app/code/Magento/{Adminhtml/Controller => Reports/Controller/Adminhtml}/Report/Statistics.php (95%)
rename app/code/Magento/{Adminhtml/Model/Report => Reports/Model}/Item.php (95%)
create mode 100644 app/code/Magento/Reports/etc/adminhtml/routes.xml
delete mode 100644 app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportaccountscsv.xml
delete mode 100644 app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportaccountsexcel.xml
delete mode 100644 app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportorderscsv.xml
delete mode 100644 app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportordersexcel.xml
delete mode 100644 app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_lowstock.xml
delete mode 100644 app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_customer.xml
delete mode 100644 app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportcustomercsv.xml
delete mode 100644 app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportcustomerexcel.xml
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_exportsearchcsv.xml => Reports/view/adminhtml/layout/reports_index_exportsearchcsv.xml} (95%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_exportsearchexcel.xml => Reports/view/adminhtml/layout/reports_index_exportsearchexcel.xml} (95%)
rename app/{design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_reorder.xml => code/Magento/Reports/view/adminhtml/layout/reports_index_search.xml} (87%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_search_block.xml => Reports/view/adminhtml/layout/reports_index_search_block.xml} (98%)
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_customer_accounts.xml => reports_report_customer_accounts.xml} (95%)
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_customer_accounts_grid.xml => reports_report_customer_accounts_grid.xml} (98%)
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_customer_exporttotalscsv.xml => reports_report_customer_exportaccountscsv.xml} (95%)
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_customer_exporttotalsexcel.xml => reports_report_customer_exportaccountsexcel.xml} (95%)
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_review_exportproductcsv.xml => reports_report_customer_exportorderscsv.xml} (95%)
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_review_exportproductexcel.xml => reports_report_customer_exportordersexcel.xml} (95%)
create mode 100644 app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalscsv.xml
create mode 100644 app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalsexcel.xml
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_customer_orders.xml => reports_report_customer_orders.xml} (95%)
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_customer_orders_grid.xml => reports_report_customer_orders_grid.xml} (99%)
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_customer_totals.xml => reports_report_customer_totals.xml} (95%)
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_customer_totals_grid.xml => reports_report_customer_totals_grid.xml} (97%)
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_grid.xml => reports_report_grid.xml} (100%)
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_product_exportlowstockcsv.xml => reports_report_product_exportlowstockcsv.xml} (94%)
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_product_exportlowstockexcel.xml => reports_report_product_exportlowstockexcel.xml} (94%)
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_product_exportsoldcsv.xml => reports_report_product_exportsoldcsv.xml} (95%)
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_product_exportsoldexcel.xml => reports_report_product_exportsoldexcel.xml} (95%)
create mode 100644 app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock.xml
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_product_lowstock_grid.xml => reports_report_product_lowstock_grid.xml} (97%)
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_product_sold.xml => reports_report_product_sold.xml} (95%)
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_product_sold_grid.xml => reports_report_product_sold_grid.xml} (98%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_product_viewed.xml => Reports/view/adminhtml/layout/reports_report_product_viewed.xml} (89%)
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_review_product.xml => reports_report_review_customer.xml} (86%)
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_review_customer_grid.xml => reports_report_review_customer_grid.xml} (98%)
create mode 100644 app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomercsv.xml
create mode 100644 app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomerexcel.xml
create mode 100644 app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductcsv.xml
create mode 100644 app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductexcel.xml
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_search.xml => Reports/view/adminhtml/layout/reports_report_review_product.xml} (86%)
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_review_product_grid.xml => reports_report_review_product_grid.xml} (99%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_sales_bestsellers.xml => Reports/view/adminhtml/layout/reports_report_sales_bestsellers.xml} (92%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_sales_coupons.xml => Reports/view/adminhtml/layout/reports_report_sales_coupons.xml} (93%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_sales_invoiced.xml => Reports/view/adminhtml/layout/reports_report_sales_invoiced.xml} (92%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_sales_refunded.xml => Reports/view/adminhtml/layout/reports_report_sales_refunded.xml} (92%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_sales_sales.xml => Reports/view/adminhtml/layout/reports_report_sales_sales.xml} (93%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_sales_shipping.xml => Reports/view/adminhtml/layout/reports_report_sales_shipping.xml} (92%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/adminhtml_report_sales_tax.xml => Reports/view/adminhtml/layout/reports_report_sales_tax.xml} (93%)
rename app/code/Magento/Reports/view/adminhtml/layout/{adminhtml_report_statistics_index.xml => reports_report_statistics_index.xml} (100%)
rename app/code/Magento/{Adminhtml/view/adminhtml/layout/report_sales.xml => Reports/view/adminhtml/layout/reports_sales.xml} (100%)
rename app/code/Magento/{Adminhtml => Reports}/view/adminhtml/report/grid/container.phtml (98%)
rename app/code/Magento/{Adminhtml => Reports}/view/adminhtml/report/refresh/statistics.phtml (97%)
rename app/code/Magento/{Adminhtml => Reports}/view/adminhtml/report/wishlist.phtml (98%)
delete mode 100644 app/code/Magento/Reports/view/frontend/home_product_compared.phtml
delete mode 100644 app/code/Magento/Reports/view/frontend/home_product_viewed.phtml
delete mode 100644 app/code/Magento/Reports/view/frontend/images/i_widget-list.gif
delete mode 100644 app/code/Magento/Reports/view/frontend/widgets.css
rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Add.php (96%)
rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Add/Form.php (93%)
rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Edit.php (97%)
rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Edit/Form.php (97%)
rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Grid.php (96%)
rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Grid/Filter/Type.php (90%)
rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Grid/Renderer/Type.php (84%)
rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Main.php (95%)
rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Product/Grid.php (97%)
rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Rating/Detailed.php (97%)
rename app/code/Magento/{Adminhtml/Block/Review => Review/Block/Adminhtml}/Rating/Summary.php (95%)
rename app/code/Magento/{Adminhtml/view/adminhtml/review => Review/view/adminhtml}/add.phtml (100%)
rename app/code/Magento/{Adminhtml/Block/Shipping => Shipping/Block/Adminhtml}/Carrier/Tablerate/Grid.php (94%)
create mode 100644 app/code/Magento/Shipping/Model/Shipping/Labels.php
rename app/{design/adminhtml/magento_basic/theme.xml => code/Magento/Shipping/etc/adminhtml/di.xml} (84%)
rename app/code/Magento/{Adminhtml/Block/Sitemap => Sitemap/Block/Adminhtml}/Edit.php (95%)
rename app/code/Magento/{Adminhtml/Block/Sitemap => Sitemap/Block/Adminhtml}/Edit/Form.php (98%)
rename app/code/Magento/{Adminhtml/Block/Sitemap => Sitemap/Block/Adminhtml}/Grid/Renderer/Action.php (96%)
rename app/code/Magento/{Adminhtml/Block/Sitemap => Sitemap/Block/Adminhtml}/Grid/Renderer/Link.php (97%)
rename app/code/Magento/{Adminhtml/Block/Sitemap => Sitemap/Block/Adminhtml}/Grid/Renderer/Time.php (96%)
rename app/code/Magento/{Adminhtml/Block => Sitemap/Block/Adminhtml}/Sitemap.php (90%)
rename app/design/adminhtml/{magento_basic => magento_backend}/i18n/en_US.csv (99%)
delete mode 100644 app/design/adminhtml/magento_basic/Magento_Adminhtml/layout/default.xml
delete mode 100644 app/design/adminhtml/magento_basic/below_ie7.css
delete mode 100644 app/design/adminhtml/magento_basic/boxes.css
delete mode 100644 app/design/adminhtml/magento_basic/custom.css
delete mode 100644 app/design/adminhtml/magento_basic/ie7.css
delete mode 100644 app/design/adminhtml/magento_basic/iestyles.css
delete mode 100644 app/design/adminhtml/magento_basic/images/accordion_close.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/accordion_close.png
delete mode 100644 app/design/adminhtml/magento_basic/images/accordion_open.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/accordion_open.png
delete mode 100644 app/design/adminhtml/magento_basic/images/add_btn_icon-disabled.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/add_btn_icon.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/address_list_li.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/address_list_on_arrow.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/address_list_over_arrow.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/address_list_over_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/ajax-loader-tr.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/ajax-loader.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/application_view_tile.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/arrow_sort_move.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/bg_collapse.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/bg_create_order_totals.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/bg_notifications.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/bg_window_mask.png
delete mode 100644 app/design/adminhtml/magento_basic/images/bkg_btn-close.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/bkg_btn-close2.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/bkg_search-magnifier.png
delete mode 100644 app/design/adminhtml/magento_basic/images/blank.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/box_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/breadcrumb_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/btn_add-image_icon.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/btn_add-variable_icon.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/btn_add-widget_icon.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/btn_add-widget_icon2.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/btn_back_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/btn_bare_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/btn_bg-disabled.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/btn_bg.png
delete mode 100644 app/design/adminhtml/magento_basic/images/btn_cancel_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/btn_delete_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/btn_go.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/btn_gr_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/btn_gr_on.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/btn_gr_over.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/btn_loading-icon.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/btn_login.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/btn_show-hide_icon.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/btn_task_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/button-close.png
delete mode 100644 app/design/adminhtml/magento_basic/images/cancel_btn_active_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/cancel_btn_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/cancel_btn_icon.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/cancel_btn_over_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/cancel_icon.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/config_tab_dt_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/dashboard-close.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/db-graph-bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/db-graph-bottom-bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/db-graph-line-bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/db-graph-line2-bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/db-graph-x-bg.png
delete mode 100644 app/design/adminhtml/magento_basic/images/db-header-bg.png
delete mode 100644 app/design/adminhtml/magento_basic/images/db-menu-bg-hov.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/db-menu-bg-up.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/db-menu-bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/db-menu-sep-last.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/db-menu-sep.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/db-menu-start.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/db-scroll-bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/db-scroll-but-bot-roll.png
delete mode 100644 app/design/adminhtml/magento_basic/images/db-scroll-but-bot.png
delete mode 100644 app/design/adminhtml/magento_basic/images/db-scroll-but-top-roll.png
delete mode 100644 app/design/adminhtml/magento_basic/images/db-scroll-but-top.png
delete mode 100644 app/design/adminhtml/magento_basic/images/db-scroll-roller.png
delete mode 100644 app/design/adminhtml/magento_basic/images/db-tab-bottom-left-bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/db-tab-bottom-mid-bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/db-tab-bottom-right-bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/db-tab-footer.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/db-tab-header-sep.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/db-tab-header.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/db-tab-left.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/db-tab-right.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/dotted_divider_dark.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/dotted_divider_light.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/edit_icon.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/entry_edit_head_arrow_down.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/entry_edit_head_arrow_down2.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/entry_edit_head_arrow_up.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/entry_edit_head_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/error-msg.png
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_account.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_application_form_delete.png
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_application_view_tile.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_asterisk_orange.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_bin.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_bullet_disk.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_calendar.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_cart.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_comment.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_creditcards.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_folder_database.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_folder_palette.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_folder_table.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_group.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_help.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_house.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_layout.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_leaf.png
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_link.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_lorry.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_money.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_money_add.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_monitor.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_newspaper.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_newspaper_delete.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_newspaper_error.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_newspaper_go.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_package.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_package_go.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_page_white.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_page_white_edit.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_rainbow.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_refresh.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_server_database.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_status_online.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_tag_orange.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_user.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_user_comment.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/fam_user_edit.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/filter_row_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/footer_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/gift-message-collapse.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/gift-message-expand.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/gift-message-grid-column-bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/grid-cal.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/grid_sort_asc.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/grid_sort_desc.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/grid_th_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/grid_th_onclick_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/grouped_to_order_icon.png
delete mode 100644 app/design/adminhtml/magento_basic/images/header_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/header_top_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/horiz_tabs_ul_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/i_notice.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/i_question-mark.png
delete mode 100644 app/design/adminhtml/magento_basic/images/ico_success.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/icon-tooltip.png
delete mode 100644 app/design/adminhtml/magento_basic/images/icon_btn_add.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/icon_btn_back.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/icon_btn_delete.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/icon_btn_save.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/icon_edit_address.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/icon_export.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/icon_export.png
delete mode 100644 app/design/adminhtml/magento_basic/images/icon_feed.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/icon_feed.png
delete mode 100644 app/design/adminhtml/magento_basic/images/icon_note_list.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/icon_remove_address.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/loader-small.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/login_box_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/login_box_bg.jpg
delete mode 100644 app/design/adminhtml/magento_basic/images/login_box_bg_auth.jpg
delete mode 100644 app/design/adminhtml/magento_basic/images/login_box_bottom.jpg
delete mode 100644 app/design/adminhtml/magento_basic/images/login_box_legal_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/login_logo.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/logo-large.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/logo.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/massaction_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/massaction_button_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/massaction_links_delimiter.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/middle_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/more_arrow.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/nav1_active.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/nav1_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/nav1_off.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/nav1_on.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/nav1_over.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/nav1_sep.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/nav2_last_li_bg.png
delete mode 100644 app/design/adminhtml/magento_basic/images/nav2_last_li_over_bg.png
delete mode 100644 app/design/adminhtml/magento_basic/images/nav2_li_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/nav2_li_bg.png
delete mode 100644 app/design/adminhtml/magento_basic/images/nav2_li_over_bg.png
delete mode 100644 app/design/adminhtml/magento_basic/images/nav2_link_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/nav2_parent_arrow.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/nav3_bg.png
delete mode 100644 app/design/adminhtml/magento_basic/images/nav_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/nav_list_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/nav_nest_link_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/nav_nest_link_over_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/nav_on_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/nav_parent_arrow.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/note_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/note_cell_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/notice-msg.png
delete mode 100644 app/design/adminhtml/magento_basic/images/pager_arrow_left.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/pager_arrow_left_off.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/pager_arrow_right.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/pager_arrow_right_off.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/process_spinner.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/product_rating_blank_star.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/product_rating_full_star.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/rule-ajax-loader.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/rule_chooser_trigger.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/rule_component_add.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/rule_component_apply.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/rule_component_remove.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/save_btn_icon.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/sec_nav_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/section_menu_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/section_menu_bottom.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/section_menu_link_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/section_menu_link_over_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/section_menu_over_span_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/section_menu_span_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/section_menu_ul_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/side_col_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/simple_container_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/sort-arrow-down.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/sort-arrow-down.png
delete mode 100644 app/design/adminhtml/magento_basic/images/sort-arrow-up.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/sort-arrow-up.png
delete mode 100644 app/design/adminhtml/magento_basic/images/sort_heading_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/sort_on_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/sort_row_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/spacer.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/sub_button_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/success-msg.png
delete mode 100644 app/design/adminhtml/magento_basic/images/tabs_link_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/tabs_link_over_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/tabs_span_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/tag_blue_edit.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/tn_cancel_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/tooltip_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/tooltip_corner.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/tooltip_top.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/tree_icons/join.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/tree_icons/joinbottom.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/tree_icons/line.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/tree_icons/minus.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/tree_icons/minusbottom.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/tree_icons/nolines_minus.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/tree_icons/nolines_plus.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/validation_advice_bg.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/varien_logo.gif
delete mode 100644 app/design/adminhtml/magento_basic/images/window_close.png
delete mode 100644 app/design/adminhtml/magento_basic/images/window_content.png
delete mode 100644 app/design/adminhtml/magento_basic/images/window_top.png
delete mode 100644 app/design/adminhtml/magento_basic/media/editor.swf
delete mode 100644 app/design/adminhtml/magento_basic/media/flex.swf
delete mode 100644 app/design/adminhtml/magento_basic/media/uploader.swf
delete mode 100644 app/design/adminhtml/magento_basic/media/uploaderSingle.swf
delete mode 100644 app/design/adminhtml/magento_basic/menu.css
delete mode 100644 app/design/adminhtml/magento_basic/print.css
delete mode 100644 app/design/adminhtml/magento_basic/reset.css
delete mode 100644 app/design/frontend/magento_backup/Magento_Captcha/captcha.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Captcha/default.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/checkout_onepage_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/contacts_index_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_create.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_forgotpassword.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_login.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Captcha/onepage.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Captcha/reload.png
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/cart.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/cart/coupon.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/cart/crosssell.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/cart/item/configure/updatecart.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/cart/item/default.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/cart/shipping.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/cart/sidebar.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/cart/sidebar/default.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/cart/totals.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/cvv.gif
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/accordion.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/components.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/discount-codes.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/multi-shipping.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/opcheckout.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/overview.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/payment-authentication.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/payment.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/region-updater.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/shopping-cart.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/js/sidebar.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editaddress.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editbilling.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editshipping.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_newbilling.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_newshipping.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_select.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_selectbilling.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_addresses.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_billing.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_customer_address.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_login.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_overview.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_register.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_shipping.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_success.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_additional.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_failure.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_paymentmethod.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_progress.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_review.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_shippingmethod.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_success.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/default.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/address/select.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/addresses.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/agreements.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/billing.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/billing/items.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/item/default.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/link.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/overview.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/overview/item.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/shipping.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/state.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/multishipping/success.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/accordion.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/agreements.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/billing.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/failure.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/link.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/login.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/payment.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/payment/methods.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/progress.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/review.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/review/button.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/review/info.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/review/item.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/review/totals.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method/additional.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method/available.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/success.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/total/default.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/total/nominal.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Checkout/total/tax.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Cms/content_heading.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Cms/images/i_widget-link.gif
delete mode 100644 app/design/frontend/magento_backup/Magento_Cms/layout/override/default.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Cms/layout/override/print.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Cms/widget/static_block/default.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Cms/widgets.css
delete mode 100644 app/design/frontend/magento_backup/Magento_Contacts/form.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Core/fam_book_open.png
delete mode 100644 app/design/frontend/magento_backup/Magento_Core/prototype/magento.css
delete mode 100644 app/design/frontend/magento_backup/Magento_Core/prototype/magento/btn_bg.gif
delete mode 100644 app/design/frontend/magento_backup/Magento_Core/prototype/magento/content_bg.gif
delete mode 100644 app/design/frontend/magento_backup/Magento_Core/prototype/magento/top_bg.gif
delete mode 100644 app/design/frontend/magento_backup/Magento_Core/prototype/magento/window_close.png
delete mode 100644 app/design/frontend/magento_backup/Magento_Core/translate_inline.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/account/dashboard.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/account/dashboard/address.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/account/dashboard/hello.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/account/dashboard/info.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/account/dashboard/newsletter.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/account/link/back.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/account/navigation.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/address.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/address.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/address/book.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/address/edit.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/balance.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/form/address.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/form/changepassword.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/form/confirmation.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/form/edit.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/form/forgotpassword.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/form/login.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/form/mini.login.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/form/newsletter.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/form/register.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/form/resetforgottenpassword.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/js/checkout-balance.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_confirmation.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_create.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_createpassword.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_edit.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_forgotpassword.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_login.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_logoutsuccess.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_address_form.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_address_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/layout/override/base/default.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/logout.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/set-password.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/widget/dob.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/widget/gender.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/widget/name.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Customer/widget/taxvat.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Directory/currency.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Directory/currency/switch.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Directory/js/optional_zip_countries.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Directory/layout/override/catalog_category_view.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_advanced_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_advanced_result.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_result_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_GiftMessage/gift-options.js
delete mode 100644 app/design/frontend/magento_backup/Magento_GiftMessage/inline.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_GoogleCheckout/layout/override/checkout_cart_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_GoogleCheckout/link.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/customer_account.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/default.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/newsletter_manage_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Newsletter/newsletter.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Newsletter/subscribe.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Page/1column.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Page/2columns-left.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Page/2columns-right.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Page/3columns.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Page/empty.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Page/html/breadcrumbs.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Page/html/head.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Page/html/header.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Page/html/notices.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Page/html/pager.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Page/html/topmenu.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Page/js/menu.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Page/js/popup-menu.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Page/js/row-builder.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Page/link/current.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Page/popup.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Page/print.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Page/switch/languages.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Page/switch/stores.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/catalog/product/view/profile/options.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/catalog/product/view/profile/schedule.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/cc-type.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/form/banktransfer.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/form/cashondelivery.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/form/cc.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/form/ccsave.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/form/checkmo.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/form/purchaseorder.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/info/checkmo.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/info/default.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/info/instructions.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/info/purchaseorder.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Payment/layout/override/catalog_product_view.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/express/review.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/express/review/address.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/express/review/details.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/express/review/shipping/method.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/express/shortcut.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/hss/form.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/hss/iframe.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/hss/info.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/hss/js.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/hss/redirect.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/hss/review/button.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/js/paypal-checkout.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/SHORTCUT_popup.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/catalog_category_view.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_cart_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_onepage_review.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_onepage_success.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/cms_index_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_express_review.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_express_review_details.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_hostedpro_cancel.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_cancelpayment.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_form.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_returnurl.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_cancelpayment.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_form.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_returnurl.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_standard_redirect.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/tag_customer_view.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/tag_product_list.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/layout/override/wishlist_index_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/order-review.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/partner/logo.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/form.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/iframe.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/info.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/redirect.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowlink/form.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowlink/iframe.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowlink/info.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payflowlink/redirect.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payment/mark.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Paypal/payment/redirect.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/express/review.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/SHORTCUT_uk_popup.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_category_view.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_product_compare_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_product_view.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalogsearch_advanced_result.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalogsearch_result_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_cart_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_onepage_failure.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_onepage_success.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/default.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypal_express_review_details.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypaluk_express_review.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/review_product_list.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/tag_customer_view.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/tag_product_list.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/wishlist_index_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/checkout/onepage/billing.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/checkout/onepage/login.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/customer/form/login.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/customer/form/register.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/layout/override/checkout_onepage_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/layout/override/customer_account_create.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/layout/override/customer_account_login.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/remember-me-popup.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/remember_me.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/remember_me_tooltip.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Persistent/splitbutton.js
delete mode 100644 app/design/frontend/magento_backup/Magento_ProductAlert/email/price.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_ProductAlert/email/stock.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_ProductAlert/layout/override/catalog_product_view.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_ProductAlert/product/view.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Rating/detailed.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Review/customer/list.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Review/customer/recent.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Review/customer/view.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Review/form.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Review/helper/summary.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Review/helper/summary_short.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Review/layout/override/review_product_view.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Review/product/view/list.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Review/view.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Rss/list.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/billing/agreement/view.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/billing/agreements.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/creditmemo/items.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/invoice/items.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/items.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/items/creditmemo/default.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/items/invoice/default.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/items/order/default.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/items/shipment/default.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/shipment/items.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/email/shipment/track.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/gift-message.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/guest/form.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/checkout_onepage_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/customer_account.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_billing_agreement_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_billing_agreement_view.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_creditmemo_items.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_invoice_items.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_items.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_shipment_items.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_creditmemo.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_form.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_invoice.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_print.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printcreditmemo.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printinvoice.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printshipment.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_reorder.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_shipment.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_view.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_creditmemo.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_guest_info_links.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_history.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_invoice.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printcreditmemo.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printinvoice.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printshipment.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_shipment.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_view.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_orders.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_view.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_view__tabs.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/comments.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/creditmemo.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items/renderer/default.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/history.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/info.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/info/buttons.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/invoice.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/invoice/items.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/invoice/items/renderer/default.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/items.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/items/renderer/default.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/print.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/print/creditmemo.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/print/invoice.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/print/shipment.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/recent.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/shipment.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/shipment/items.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/shipment/items/renderer/default.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/totals.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/trackinginfo.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/order/view.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/orders-returns.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/payment/form/billing/agreement.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/recurring/grid.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/recurring/profile/view.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/recurring/profile/view/info.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/recurring/profiles.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/reorder/sidebar.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Sales/widget/guest/form.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Shipping/layout/base/shipping_tracking_popup.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Shipping/tracking/popup.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Tax/checkout/discount.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Tax/checkout/grandtotal.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Tax/checkout/shipping.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Tax/checkout/subtotal.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Tax/checkout/tax.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Tax/order/tax.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Weee/layout/override/default.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Weee/tax-toggle.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Widget/layout/override/default.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Widget/layout/override/print.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Widget/widgets.css
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/button/share.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/button/tocart.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/button/update.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/email/items.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/email/rss.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/item/column/cart.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/item/column/image.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/item/column/info.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/item/column/remove.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/item/configure/addto.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/item/list.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/js/add-to-wishlist.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/js/search.js
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/customer_account.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/default.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_bundle.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_configurable.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_grouped.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_simple.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_share.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_shared_index.xml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/options_list.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/render/item/price.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/render/item/price_msrp_item.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/render/item/price_msrp_rss.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/shared.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/sharing.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/sidebar.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/view.phtml
delete mode 100644 app/design/frontend/magento_backup/Magento_Wishlist/wishlist.js
delete mode 100644 app/design/frontend/magento_backup/css/print.css
delete mode 100644 app/design/frontend/magento_backup/media/preview_image.jpg
delete mode 100644 app/design/frontend/magento_backup/theme.xml
delete mode 100644 app/design/frontend/magento_blank/Magento_Catalog/images/slider_btn_zoom_in.gif
delete mode 100644 app/design/frontend/magento_blank/Magento_Catalog/images/slider_btn_zoom_out.gif
create mode 100644 app/design/frontend/magento_blank/view.xml
delete mode 100644 app/design/frontend/magento_demo/Magento_Page/layout/default.xml
delete mode 100644 app/design/frontend/magento_demo/Magento_Page/layout/print.xml
delete mode 100644 app/design/frontend/magento_demo/css/print.css
delete mode 100644 app/design/frontend/magento_demo/css/styles-ie.css
delete mode 100644 app/design/frontend/magento_demo/css/styles.css
delete mode 100644 app/design/frontend/magento_demo/i18n/de_DE/Magento_Core/logo_email.gif
delete mode 100644 app/design/frontend/magento_demo/i18n/de_DE/images/logo.gif
delete mode 100644 app/design/frontend/magento_demo/i18n/de_DE/images/logo_print.gif
delete mode 100644 app/design/frontend/magento_demo/i18n/en_US.csv
delete mode 100644 app/design/frontend/magento_demo/i18n/fr_FR/Magento_Core/logo_email.gif
delete mode 100644 app/design/frontend/magento_demo/i18n/fr_FR/images/logo.gif
delete mode 100644 app/design/frontend/magento_demo/i18n/fr_FR/images/logo_print.gif
delete mode 100644 app/design/frontend/magento_demo/images/best_selling_tr_even_bg.gif
delete mode 100644 app/design/frontend/magento_demo/images/best_selling_tr_odd_bg.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_account_box.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_block-actions.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_block-currency.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_block-layered-dd.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_block-layered-dt.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_block-layered-label.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_block-layered-li.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_block-layered-title.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_block-layered1.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_block-title-account.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_block-title.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_body.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_buttons-set1.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_checkout.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_collapse-gm.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_collapse.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_divider1.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_form-search.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_grand-total.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_grid.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_header.jpg
delete mode 100644 app/design/frontend/magento_demo/images/bkg_login-box.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_main1.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_main2.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_nav0.jpg
delete mode 100644 app/design/frontend/magento_demo/images/bkg_nav1.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_nav2.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_opc-title-off.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_pipe1.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_pipe2.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_pipe3.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_product-view.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_product_collateral.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_rating.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_sp-methods.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_tfoot.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_th-v.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_th.gif
delete mode 100644 app/design/frontend/magento_demo/images/bkg_toolbar.gif
delete mode 100644 app/design/frontend/magento_demo/images/btn_checkout.gif
delete mode 100644 app/design/frontend/magento_demo/images/btn_edit.gif
delete mode 100644 app/design/frontend/magento_demo/images/btn_gm-close.gif
delete mode 100644 app/design/frontend/magento_demo/images/btn_place_order.gif
delete mode 100644 app/design/frontend/magento_demo/images/btn_previous.gif
delete mode 100644 app/design/frontend/magento_demo/images/btn_proceed_to_checkout.gif
delete mode 100644 app/design/frontend/magento_demo/images/btn_proceed_to_checkout_dis.gif
delete mode 100644 app/design/frontend/magento_demo/images/btn_remove2.gif
delete mode 100644 app/design/frontend/magento_demo/images/btn_search.gif
delete mode 100644 app/design/frontend/magento_demo/images/btn_trash.gif
delete mode 100644 app/design/frontend/magento_demo/images/btn_window_close.gif
delete mode 100644 app/design/frontend/magento_demo/images/calendar.gif
delete mode 100644 app/design/frontend/magento_demo/images/fam_book_open.png
delete mode 100644 app/design/frontend/magento_demo/images/free_shipping_callout.jpg
delete mode 100644 app/design/frontend/magento_demo/images/grid-cal.gif
delete mode 100644 app/design/frontend/magento_demo/images/home_left_callout.jpg
delete mode 100644 app/design/frontend/magento_demo/images/home_main_callout.jpg
delete mode 100644 app/design/frontend/magento_demo/images/i_arrow-top.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_availability_only.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_availability_only_arrow.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_block-cart.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_block-currency.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_block-list.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_block-poll.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_block-related.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_block-subscribe.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_block-tags.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_block-viewed.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_block-wishlist.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_discount.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_folder-table.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_ma-info.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_ma-reviews.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_ma-tags.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_msg-error.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_msg-note.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_msg-success.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_notice.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_page1.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_page2.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_pager-next.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_pager-prev.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_print.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_rss-big.png
delete mode 100644 app/design/frontend/magento_demo/images/i_rss.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_search_criteria.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_shipping.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_tag_add.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_tier.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_type_grid.gif
delete mode 100644 app/design/frontend/magento_demo/images/i_type_list.gif
delete mode 100644 app/design/frontend/magento_demo/images/magnifier_handle.gif
delete mode 100644 app/design/frontend/magento_demo/images/map_popup_arrow.gif
delete mode 100644 app/design/frontend/magento_demo/images/media/404_callout1.jpg
delete mode 100644 app/design/frontend/magento_demo/images/media/404_callout2.jpg
delete mode 100644 app/design/frontend/magento_demo/images/media/best_selling_img01.jpg
delete mode 100644 app/design/frontend/magento_demo/images/media/best_selling_img02.jpg
delete mode 100644 app/design/frontend/magento_demo/images/media/best_selling_img03.jpg
delete mode 100644 app/design/frontend/magento_demo/images/media/best_selling_img04.jpg
delete mode 100644 app/design/frontend/magento_demo/images/media/best_selling_img05.jpg
delete mode 100644 app/design/frontend/magento_demo/images/media/best_selling_img06.jpg
delete mode 100644 app/design/frontend/magento_demo/images/media/cell_phone_landing_banner1.jpg
delete mode 100644 app/design/frontend/magento_demo/images/media/electronics_cellphones.jpg
delete mode 100644 app/design/frontend/magento_demo/images/media/electronics_digitalcameras.jpg
delete mode 100644 app/design/frontend/magento_demo/images/media/electronics_laptops.jpg
delete mode 100644 app/design/frontend/magento_demo/images/media/furniture_callout_spot.jpg
delete mode 100644 app/design/frontend/magento_demo/images/media/furnitures_bed_room.jpg
delete mode 100644 app/design/frontend/magento_demo/images/media/furnitures_living_room.jpg
delete mode 100644 app/design/frontend/magento_demo/images/media/head_electronics_cellphones.gif
delete mode 100644 app/design/frontend/magento_demo/images/media/head_electronics_digicamera.gif
delete mode 100644 app/design/frontend/magento_demo/images/media/head_electronics_laptops.gif
delete mode 100644 app/design/frontend/magento_demo/images/media/laptop_callout_mid1.jpg
delete mode 100644 app/design/frontend/magento_demo/images/media/laptop_callout_mid2.jpg
delete mode 100644 app/design/frontend/magento_demo/images/media/laptop_callout_mid3.jpg
delete mode 100644 app/design/frontend/magento_demo/images/media/laptop_callout_spot.jpg
delete mode 100644 app/design/frontend/magento_demo/images/media/shirts_landing_banner1.jpg
delete mode 100644 app/design/frontend/magento_demo/images/np_cart_thumb.gif
delete mode 100644 app/design/frontend/magento_demo/images/np_more_img.gif
delete mode 100644 app/design/frontend/magento_demo/images/np_product_main.gif
delete mode 100644 app/design/frontend/magento_demo/images/np_thumb.gif
delete mode 100644 app/design/frontend/magento_demo/images/np_thumb2.gif
delete mode 100644 app/design/frontend/magento_demo/images/ph_callout_left_rebel.jpg
delete mode 100644 app/design/frontend/magento_demo/images/ph_callout_left_top.gif
delete mode 100644 app/design/frontend/magento_demo/images/product_zoom_overlay_magnif.gif
delete mode 100644 app/design/frontend/magento_demo/images/slider_bg.gif
delete mode 100644 app/design/frontend/magento_demo/images/validation_advice_bg.gif
delete mode 100644 app/design/frontend/magento_demo/media/preview_image.jpg
delete mode 100644 app/design/frontend/magento_demo/theme.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/title.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/checkbox.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/multi.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/radio.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/select.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/options.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/js/slide.js
delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/catalog_product_view_type_bundle.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/checkout_cart_index.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/default.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/sales/order/creditmemo/items/renderer.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/sales/order/invoice/items/renderer.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/sales/order/items/renderer.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Bundle/sales/order/shipment/items/renderer.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/category/title.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/category/view.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/category/widget/link/link_block.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/category/widget/link/link_inline.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/js/list.js
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layer/filter.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layer/state.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layer/view.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_compare_index.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view_type_default.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view_type_layered.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_compare_index.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_configurable.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_grouped.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_simple.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_virtual.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/default.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/navigation/left.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/compare/list.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/compare/sidebar.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/image.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/image_with_borders.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/list.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/list/toolbar.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/addto.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/addtocart.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/attributes.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/base-image.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/description.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/gallery.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/options.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/js.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/date.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/default.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/file.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/select.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/text.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/wrapper.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/wrapper/bottom.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/price_clone.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/tierprices.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/default.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/grouped.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/options/configurable.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/widget/link/link_block.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/widget/link/link_inline.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_default_list.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_images_list.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_names_list.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/content/new_grid.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/content/new_list.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_CatalogSearch/advanced/form.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_CatalogSearch/advanced/result.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_CatalogSearch/form.mini.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_advanced_index.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_advanced_result.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_result_index.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_term_popular.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/override/base/catalogsearch_result_index.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_CatalogSearch/result.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_CatalogSearch/term.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/links.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/samples.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/type.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/checkout/cart/item/default.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/checkout/multishipping/item/default.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/checkout/onepage/review/item.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/checkout/onepage/review/item_down.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/customer/products/list.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/base/catalog_product_view_type_downloadable.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/invoice/items/renderer/downloadable.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/items/renderer/downloadable.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Reports/layout/override/base/default.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Reports/layout/override/base/print.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Reports/product_compared.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Reports/product_viewed.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Reports/widget/compared/column/compared_default_list.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Reports/widget/compared/content/compared_grid.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Reports/widget/compared/content/compared_list.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/column/viewed_default_list.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/content/viewed_grid.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/content/viewed_list.phtml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Sendfriend/layout/override/base/sendfriend_product_send.xml
delete mode 100644 app/design/frontend/magento_plushe/Magento_Sendfriend/send.phtml
create mode 100644 dev/tests/integration/framework/Magento/TestFramework/Annotation/AdminConfigFixture.php
create mode 100644 dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/AdminConfigFixtureTest.php
delete mode 100644 dev/tests/integration/testsuite/Magento/Adminhtml/DashboardTest.php
rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/Block/Page/HeadTest.php (88%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/Block/Page/HeaderTest.php (88%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Controller => Backend/Controller/Adminhtml}/CacheTest.php (90%)
create mode 100644 dev/tests/integration/testsuite/Magento/Backend/Model/Translate/InlineTest.php
rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/all_types_disabled.php (100%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/all_types_disabled_rollback.php (100%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/all_types_enabled.php (100%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/all_types_enabled_rollback.php (100%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/all_types_invalidated.php (100%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/all_types_invalidated_rollback.php (100%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/application_cache.php (100%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/application_cache_rollback.php (100%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/empty_storage.php (100%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/non_application_cache.php (100%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml => Backend}/controllers/_files/cache/non_application_cache_rollback.php (100%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/TemplateTest.php => Captcha/Block/Adminhtml/Captcha/DefaultCaptchaTest.php} (56%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/Queue/Edit/FormTest.php (90%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Newsletter => Newsletter/Block/Adminhtml}/SubscriberTest.php (89%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Controller => Newsletter/Controller/Adminhtml}/NewsletterQueueTest.php (93%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Controller => Newsletter/Controller/Adminhtml}/NewsletterTemplateTest.php (91%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/controllers => Newsletter}/_files/newsletter_sample.php (100%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Filter/FormTest.php (87%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Bestsellers/GridTest.php (87%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Coupons/GridTest.php (91%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Invoiced/GridTest.php (91%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Refunded/GridTest.php (91%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Sales/GridTest.php (92%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Shipping/GridTest.php (91%)
rename dev/tests/integration/testsuite/Magento/{Adminhtml/Block/Report => Reports/Block/Adminhtml}/Sales/Tax/GridTest.php (92%)
rename dev/tests/integration/testsuite/Magento/View/Block/_files/frontend/{magento_demo => magento_plushe}/css/wrong.css (100%)
create mode 100644 dev/tests/performance/benchmark_logs_merge.php
create mode 100644 dev/tests/unit/testsuite/Magento/Authorizenet/Helper/BackendTest.php
delete mode 100644 dev/tests/unit/testsuite/Magento/Backend/App/Action/Plugin/StoreTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Backend/App/ConfigTest.php
rename dev/tests/unit/testsuite/Magento/{Adminhtml => Backend}/Block/Page/System/Config/Robots/ResetTest.php (88%)
rename dev/tests/unit/testsuite/Magento/{Adminhtml => Backend}/Block/UrlrewriteTest.php (98%)
rename dev/tests/unit/testsuite/Magento/{Adminhtml/Controller => Backend/Controller/Adminhtml}/CacheTest.php (98%)
rename dev/tests/unit/testsuite/Magento/{ => Backend/Controller}/Adminhtml/DashboardTest.php (99%)
create mode 100644 dev/tests/unit/testsuite/Magento/Backend/Model/CookieTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Backend/Model/Translate/Inline/ConfigFactoryTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Backend/Model/Translate/Inline/ConfigTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Captcha/Helper/Adminhtml/DataTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Captcha/Model/CronTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Adminhtml/Stock/ItemTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Centinel/Model/ServiceTest.php
rename dev/tests/unit/testsuite/Magento/{Adminhtml/Model/LayoutUpdate => Core/Model/Layout/Update}/ValidatorTest.php (89%)
rename app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_view_type_grouped.xml => dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/file_wrong.xml (92%)
create mode 100644 dev/tests/unit/testsuite/Magento/Core/Model/Translate/Inline/ConfigFactoryTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Core/Model/Translate/Inline/ConfigTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/Customer/Model/Backend/CustomerTest.php
create mode 100644 dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/ProductTest.php
rename app/code/Magento/Adminhtml/Block/Messages.php => lib/Magento/Data/Collection/EntityFactoryInterface.php (76%)
rename app/code/Magento/Backend/App/Action/Plugin/Store.php => lib/Magento/Data/Form/Element/CollectionFactory.php (59%)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 974e9df22c2..c440cb6de5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,43 @@
+2.0.0.0-dev54
+=============
+* Modularity improvements:
+ * Breakdown of the Adminhtml module:
+ * Moved Newsletter, Report logic to the respective modules
+ * Moved blocks, config, view, layout files of other components from Adminhtml folder to respective modules
+ * Removed application dependencies from the library
+* Move Magento\Core common blocks in the library
+* Application areas rework:
+ * Areas are independent from Store
+ * Removed deprecated annotation from the getArea methods
+* GitHub requests:
+ * [#245](https://github.com/magento/magento2/pull/245) -- Resolve design flaws in core URL helper
+ * [#247](https://github.com/magento/magento2/pull/247) -- Bug in Mage_Page_Block_Html_Header->getIsHomePage
+ * [#259](https://github.com/magento/magento2/pull/259) -- Turkish Lira (TRY) is supported for Turkish members.
+ * [#262](https://github.com/magento/magento2/pull/262) -- Update Rule.php
+ * [#373](https://github.com/magento/magento2/pull/373) -- [Magento/Sales] Fixed typos
+ * [#382](https://github.com/magento/magento2/pull/382) -- [Magento/Core] Fixed typos
+ * [#304](https://github.com/magento/magento2/pull/304) -- Removed Erroneous closing "
+ * [#323](https://github.com/magento/magento2/pull/323) -- InstanceController.php - made setBody protected
+ * [#349](https://github.com/magento/magento2/pull/349) -- Move Mage_Catalog menu declaration into Mage_Catalog module.
+ * [#265](https://github.com/magento/magento2/pull/265) -- Update Merge.php
+ * [#271](https://github.com/magento/magento2/pull/271) -- Check Data should validate gallery information
+ * [#305](https://github.com/magento/magento2/pull/305) -- Extra ", tidied up nested quotes
+ * [#352](https://github.com/magento/magento2/pull/352) -- Add Croatia Country as part of European Union since 1st July 2013 for default european local countries in configuration
+ * [#224](https://github.com/magento/magento2/pull/224) -- Tax formatting is locale aware and should not
+ * [#338](https://github.com/magento/magento2/pull/338) -- Correcting SQL for required_options column
+ * [#327](https://github.com/magento/magento2/pull/327) -- cart api bug fix & partial invoice credit memo divide by zero warning
+* Themes update:
+ * Old frontend (magento_demo) and backend (magento_basic) themes are removed
+ * Updated templates and layout updates in the Bundle, Catalog, CatalogInventory, CatalogSearch, Downloadable, ProductAlert, Reports, Sendfriend modules
+* Fixed bugs:
+ * Fixed the error when Magento cannot be reinstalled to the same database with table prefix
+ * Fixed report Products in Cart
+ * Fixed error on attempt to insert image to CMS pages under version control
+ * Fixed order status grid so that you can assign state, edit, and view custom order status
+ * Fixed Related Products Rule page so that category can be selected on conditions tab
+ * Fixed Magento_Paypal_Controller_ExpressTest integration test so it is re-enabled
+ * Fixed the bug with international DHL quotes
+
2.0.0.0-dev53
=============
* Moved general action-related functionality to \Magento\App\Action\Action in the library. Removed Magento\Core\Controller\Varien\Action and related logic from the Magento_Core module
@@ -10,9 +50,9 @@
* GitHub requests:
* [#238](https://github.com/magento/magento2/pull/238) -- Improve escaping HTML entities in URL
* [#199](https://github.com/magento/magento2/pull/199) -- Replaced function calls to array_push with adding the elements directly
- * [#182](https://github.com/magento/magento2/pull/182) -- By default use collection _idFieldName for toOption* methods.
+ * [#182](https://github.com/magento/magento2/pull/182) -- By default use collection _idFieldName for toOption* methods
* [#233](https://github.com/magento/magento2/pull/233) -- Google Rich Snippet Code
- * [#339](https://github.com/magento/magento2/pull/339) -- Correcting 'cahce' typo in documentation.
+ * [#339](https://github.com/magento/magento2/pull/339) -- Correcting 'cahce' typo in documentation
* [#232](https://github.com/magento/magento2/pull/232) -- Update app/code/core/Mage/Checkout/controllers/CartController.php (fix issue #27632)
* Fixed bugs:
* Fixed JavaScript error when printing orders from the frontend
@@ -29,11 +69,10 @@
* Moved Magento\Core\Model\Theme to the Magento\View component
* Moved Magento\Core\Model\Design to the Magento\View component
* Consistent declaration of page-types
- * The Framework part of the Cache functionality moved out from modules
* Themes update:
* Updated templates and layout updates in the Captcha, Customer, Newsletter, Persistent, ProductAlert, Wishlist modules; old files moved to the "magento-backup" theme
* Refactored and removed duplicate Persistent module templates
- * Plushe theme made responsive
+ * Plushe theme is responsive now
* Fixed bugs:
* Fixed inability to print order, invoice, or creditmemo in the frontend
* Fixed fatal error caused by the Mage_Backend_Block_System_Config_FormTest integration test
diff --git a/app/code/Magento/AdminNotification/Model/Feed.php b/app/code/Magento/AdminNotification/Model/Feed.php
index 4477bb68e9d..4eb3679fa78 100644
--- a/app/code/Magento/AdminNotification/Model/Feed.php
+++ b/app/code/Magento/AdminNotification/Model/Feed.php
@@ -49,9 +49,9 @@ class Feed extends \Magento\Core\Model\AbstractModel
protected $_feedUrl;
/**
- * @var \Magento\Core\Model\Store\Config
+ * @var \Magento\Backend\App\ConfigInterface
*/
- protected $_coreStoreConfig;
+ protected $_backendConfig;
/**
* @var \Magento\AdminNotification\Model\InboxFactory
@@ -61,7 +61,7 @@ class Feed extends \Magento\Core\Model\AbstractModel
/**
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
- * @param \Magento\Core\Model\Store\Config $coreStoreConfig
+ * @param \Magento\Backend\App\ConfigInterface $backendConfig
* @param \Magento\AdminNotification\Model\InboxFactory $inboxFactory
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
@@ -70,14 +70,14 @@ class Feed extends \Magento\Core\Model\AbstractModel
public function __construct(
\Magento\Core\Model\Context $context,
\Magento\Core\Model\Registry $registry,
- \Magento\Core\Model\Store\Config $coreStoreConfig,
+ \Magento\Backend\App\ConfigInterface $backendConfig,
\Magento\AdminNotification\Model\InboxFactory $inboxFactory,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
\Magento\Data\Collection\Db $resourceCollection = null,
array $data = array()
) {
parent::__construct($context, $registry, $resource, $resourceCollection, $data);
- $this->_coreStoreConfig = $coreStoreConfig;
+ $this->_backendConfig = $backendConfig;
$this->_inboxFactory = $inboxFactory;
}
@@ -97,9 +97,9 @@ class Feed extends \Magento\Core\Model\AbstractModel
*/
public function getFeedUrl()
{
- $httpPath = $this->_coreStoreConfig->getConfigFlag(self::XML_USE_HTTPS_PATH) ? 'https://' : 'http://';
+ $httpPath = $this->_backendConfig->getFlag(self::XML_USE_HTTPS_PATH) ? 'https://' : 'http://';
if (is_null($this->_feedUrl)) {
- $this->_feedUrl = $httpPath . $this->_coreStoreConfig->getConfig(self::XML_FEED_URL_PATH);
+ $this->_feedUrl = $httpPath . $this->_backendConfig->getValue(self::XML_FEED_URL_PATH);
}
return $this->_feedUrl;
}
@@ -158,7 +158,7 @@ class Feed extends \Magento\Core\Model\AbstractModel
*/
public function getFrequency()
{
- return $this->_coreStoreConfig->getConfig(self::XML_FREQUENCY_PATH) * 3600;
+ return $this->_backendConfig->getValue(self::XML_FREQUENCY_PATH) * 3600;
}
/**
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Security.php b/app/code/Magento/AdminNotification/Model/System/Message/Security.php
index ed4045d5c38..e24551a102a 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Security.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Security.php
@@ -50,9 +50,9 @@ class Security
protected $_cache;
/**
- * @var \Magento\Core\Model\Store\Config
+ * @var \Magento\Backend\App\ConfigInterface
*/
- protected $_storeConfig;
+ protected $_backendConfig;
/**
* @var \Magento\Core\Model\Config
@@ -66,18 +66,18 @@ class Security
/**
* @param \Magento\App\CacheInterface $cache
- * @param \Magento\Core\Model\Store\Config $storeConfig
+ * @param \Magento\Backend\App\ConfigInterface $backendConfig
* @param \Magento\Core\Model\Config $config
* @param \Magento\HTTP\Adapter\CurlFactory $curlFactory
*/
public function __construct(
\Magento\App\CacheInterface $cache,
- \Magento\Core\Model\Store\Config $storeConfig,
+ \Magento\Backend\App\ConfigInterface $backendConfig,
\Magento\Core\Model\Config $config,
\Magento\HTTP\Adapter\CurlFactory $curlFactory
) {
$this->_cache = $cache;
- $this->_storeConfig = $storeConfig;
+ $this->_backendConfig = $backendConfig;
$this->_config = $config;
$this->_curlFactory = $curlFactory;
}
@@ -97,7 +97,7 @@ class Security
return true;
}
- $adminSessionLifetime = (int) $this->_storeConfig->getConfig('admin/security/session_lifetime');
+ $adminSessionLifetime = (int) $this->_backendConfig->getValue('admin/security/session_lifetime');
$this->_cache->save(true, self::VERIFICATION_RESULT_CACHE_KEY, array(), $adminSessionLifetime);
return false;
}
diff --git a/app/code/Magento/Adminhtml/Model/Newsletter/Renderer/Text.php b/app/code/Magento/Adminhtml/Model/Newsletter/Renderer/Text.php
deleted file mode 100644
index d51fdb7698d..00000000000
--- a/app/code/Magento/Adminhtml/Model/Newsletter/Renderer/Text.php
+++ /dev/null
@@ -1,51 +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)
- */
-
-/**
- * Template text preview field renderer
- *
- * @category Magento
- * @package Magento_Adminhtml
- * @author Magento Core Team <core@magentocommerce.com>
- */
-namespace Magento\Adminhtml\Model\Newsletter\Renderer;
-
-class Text implements \Magento\Data\Form\Element\Renderer\RendererInterface
-{
-
- public function render(\Magento\Data\Form\Element\AbstractElement $element)
- {
- $html = '<tr><td class="label">'."\n";
- if ($element->getLabel()) {
- $html.= '<label for="'.$element->getHtmlId().'">'.$element->getLabel().'</label>'."\n";
- }
- $html.= '</td><td class="value">
-<iframe src="' . $element->getValue() . '" id="' . $element->getHtmlId() . '" frameborder="0" class="template-preview"> </iframe>';
- $html.= '</td><td></td></tr>'."\n";
-
- return $html;
- }
-}
diff --git a/app/code/Magento/Adminhtml/etc/adminhtml/events.xml b/app/code/Magento/Adminhtml/etc/adminhtml/events.xml
deleted file mode 100644
index e2cb639c2d6..00000000000
--- a/app/code/Magento/Adminhtml/etc/adminhtml/events.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)
- */
--->
-<config>
- <event name="admin_system_config_changed_section_admin">
- <observer name="bind_locale" instance="Magento\Backend\Model\Config\Backend\Admin\Observer" method="afterCustomUrlChanged" />
- </event>
-</config>
diff --git a/app/code/Magento/Adminhtml/etc/adminhtml/menu.xml b/app/code/Magento/Adminhtml/etc/adminhtml/menu.xml
deleted file mode 100644
index 27d92ec34c8..00000000000
--- a/app/code/Magento/Adminhtml/etc/adminhtml/menu.xml
+++ /dev/null
@@ -1,54 +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.
- *
- * @category Magento
- * @package Magento_Adminhtml
- * @copyright Copyright (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>
- <menu>
- <add id="Magento_Adminhtml::dashboard" title="Dashboard" module="Magento_Adminhtml" sortOrder="10" action="adminhtml/dashboard" resource="Magento_Adminhtml::dashboard"/>
- <add id="Magento_Adminhtml::system" title="System" module="Magento_Adminhtml" sortOrder="80" resource="Magento_Adminhtml::system"/>
- <add id="Magento_Adminhtml::system_tools" title="Tools" module="Magento_Adminhtml" sortOrder="50" parent="Magento_Adminhtml::system" resource="Magento_Adminhtml::tools"/>
- <add id="Magento_Adminhtml::system_design" title="Design" module="Magento_Adminhtml" sortOrder="20" parent="Magento_Adminhtml::content" resource="Magento_Adminhtml::design"/>
- <add id="Magento_Adminhtml::system_convert" title="Data Transfer" module="Magento_Adminhtml" sortOrder="10" parent="Magento_Adminhtml::system" resource="Magento_Adminhtml::convert"/>
- <add id="Magento_Adminhtml::system_cache" title="Cache Management" module="Magento_Adminhtml" sortOrder="10" parent="Magento_Adminhtml::system_tools" action="adminhtml/cache" resource="Magento_Adminhtml::cache"/>
-
- <add id="Magento_Catalog::inventory" title="Inventory" module="Magento_Catalog" sortOrder="10" parent="Magento_Catalog::catalog" dependsOnModule="Magento_Catalog" resource="Magento_Catalog::catalog"/>
-
- <add id="Magento_Adminhtml::marketing" title="Marketing" module="Magento_Adminhtml" sortOrder="40" resource="Magento_Adminhtml::marketing"/>
- <add id="Magento_Adminhtml::marketing_communications" title="Communications" module="Magento_Adminhtml" sortOrder="30" parent="Magento_Adminhtml::marketing" resource="Magento_Adminhtml::marketing_communications"/>
- <add id="Magento_Adminhtml::marketing_seo" title="SEO & Search" module="Magento_Adminhtml" sortOrder="40" parent="Magento_Adminhtml::marketing" resource="Magento_Adminhtml::marketing_seo"/>
- <add id="Magento_Adminhtml::marketing_user_content" title="User Content" module="Magento_Adminhtml" sortOrder="50" parent="Magento_Adminhtml::marketing" resource="Magento_Adminhtml::marketing_user_content"/>
-
- <add id="Magento_Adminhtml::content" title="Content" module="Magento_Adminhtml" sortOrder="50" resource="Magento_Adminhtml::content"/>
- <add id="Magento_Adminhtml::content_elements" title="Elements" module="Magento_Adminhtml" sortOrder="10" parent="Magento_Adminhtml::content" resource="Magento_Adminhtml::content_elements"/>
-
- <add id="Magento_Adminhtml::stores" title="Stores" module="Magento_Adminhtml" sortOrder="70" resource="Magento_Adminhtml::stores"/>
- <add id="Magento_Adminhtml::stores_settings" title="Settings" module="Magento_Adminhtml" sortOrder="10" parent="Magento_Adminhtml::stores" resource="Magento_Adminhtml::stores_settings"/>
- <add id="Magento_Adminhtml::stores_attributes" title="Attributes" module="Magento_Adminhtml" sortOrder="40" parent="Magento_Adminhtml::stores" resource="Magento_Adminhtml::stores_attributes"/>
- <add id="Magento_Adminhtml::other_settings" title="Other Settings" module="Magento_Adminhtml" sortOrder="50" parent="Magento_Adminhtml::stores" resource="Magento_Adminhtml::stores_other_settings"/>
-
- <add id="Magento_Adminhtml::system_other_settings" title="Other Settings" module="Magento_Adminhtml" sortOrder="80" parent="Magento_Adminhtml::system" resource="Magento_Adminhtml::system_other_settings"/>
- </menu>
-</config>
diff --git a/app/code/Magento/Adminhtml/etc/config.xml b/app/code/Magento/Adminhtml/etc/config.xml
deleted file mode 100644
index bcff89c470e..00000000000
--- a/app/code/Magento/Adminhtml/etc/config.xml
+++ /dev/null
@@ -1,78 +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.
- *
- * @category Magento
- * @package Magento_Adminhtml
- * @copyright Copyright (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>
- <default>
- <system>
- <dashboard>
- <enable_charts>1</enable_charts>
- </dashboard>
- </system>
- <general>
- <file>
- <sitemap_generate_valid_paths>
- <available>
- <any_path>/*/sitemap.xml</any_path>
- </available>
- </sitemap_generate_valid_paths>
- </file>
- <validator_data>
- <input_types>
- <price>price</price>
- <media_image>media_image</media_image>
- <gallery>gallery</gallery>
- </input_types>
- </validator_data>
- </general>
- </default>
- <stores>
- <admin>
- <design>
- <package>
- <name>default</name>
- </package>
- <theme>
- <default>default</default>
- </theme>
- </design>
- </admin>
- </stores>
- <websites>
- <admin>
- <web>
- <routers>
- <frontend>
- <disabled>true</disabled>
- </frontend>
- </routers>
- <default>
- <no_route>admin/noroute/index</no_route>
- </default>
- </web>
- </admin>
- </websites>
-</config>
diff --git a/app/code/Magento/Adminhtml/etc/di.xml b/app/code/Magento/Adminhtml/etc/di.xml
deleted file mode 100644
index d4a999e0e2e..00000000000
--- a/app/code/Magento/Adminhtml/etc/di.xml
+++ /dev/null
@@ -1,42 +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>
- <type name="Magento\Catalog\Controller\Adminhtml\Product\Attribute">
- <param name="attributeLabelCache">
- <instance type="Magento\App\Cache\Type\Translate" />
- </param>
- </type>
- <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\Rating\Block\Adminhtml\Edit\Tab\Form">
- <param name="session">
- <instance type="Magento\Adminhtml\Model\Session" />
- </param>
- </type>
-</config>
diff --git a/app/code/Magento/Adminhtml/etc/module.xml b/app/code/Magento/Adminhtml/etc/module.xml
index 4c589cb95b4..d6a5997479c 100755
--- a/app/code/Magento/Adminhtml/etc/module.xml
+++ b/app/code/Magento/Adminhtml/etc/module.xml
@@ -27,26 +27,7 @@
<module name="Magento_Adminhtml" version="0.7.1" active="true">
<depends>
<module name="Magento_Core"/>
- <module name="Magento_Reports"/>
- <module name="Magento_Customer"/>
- <module name="Magento_Newsletter"/>
- <module name="Magento_Sales"/>
- <module name="Magento_Sitemap"/>
<module name="Magento_Backend"/>
- <module name="Magento_Catalog"/>
- <module name="Magento_Cms"/>
- <module name="Magento_Review"/>
- <module name="Magento_Rating"/>
- <module name="Magento_Tax"/>
- <module name="Magento_Eav"/>
- <module name="Magento_CatalogSearch"/>
- <module name="Magento_SalesRule"/>
- <module name="Magento_Downloadable"/>
- <module name="Magento_Shipping"/>
- <module name="Magento_Backup"/>
- <module name="Magento_Checkout"/>
- <module name="Magento_Page"/>
- <module name="Magento_GiftMessage"/>
<module name="Magento_Weee"/>
</depends>
</module>
diff --git a/app/code/Magento/Adminhtml/etc/sales.xml b/app/code/Magento/Adminhtml/etc/sales.xml
deleted file mode 100644
index d18d4b5dfa0..00000000000
--- a/app/code/Magento/Adminhtml/etc/sales.xml
+++ /dev/null
@@ -1,33 +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>
- <order>
- <available_product_type name="simple"/>
- <available_product_type name="virtual"/>
- <available_product_type name="configurable"/>
- <available_product_type name="grouped"/>
- </order>
-</config>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/default.xml b/app/code/Magento/Adminhtml/view/adminhtml/layout/default.xml
deleted file mode 100644
index 8b77671e356..00000000000
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/default.xml
+++ /dev/null
@@ -1,301 +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\Page" name="root" output="1" template="admin/page.phtml">
- <block class="Magento\Adminhtml\Block\Page\Head" name="head" as="head" template="page/head.phtml">
- <action method="setTitle">
- <argument translate="true" name="title" xsi:type="string">Magento Admin</argument>
- </action>
- <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="magento-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="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="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="underscore-js">
- <arguments>
- <argument name="file" xsi:type="string">underscore.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-magento-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/mage.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="jquery-jquery-validate-js">
- <arguments>
- <argument name="file" xsi:type="string">jquery/jquery.validate.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="jquery-jquery-hoverintent-js">
- <arguments>
- <argument name="file" xsi:type="string">jquery/jquery.hoverIntent.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-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-backend-bootstrap-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/backend/bootstrap.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-backend-floating-header-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/backend/floating-header.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="prototype-prototype-js">
- <arguments>
- <argument name="file" xsi:type="string">prototype/prototype.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="prototype-window-js">
- <arguments>
- <argument name="file" xsi:type="string">prototype/window.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-builder-js">
- <arguments>
- <argument name="file" xsi:type="string">scriptaculous/builder.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-effects-js">
- <arguments>
- <argument name="file" xsi:type="string">scriptaculous/effects.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-dragdrop-js">
- <arguments>
- <argument name="file" xsi:type="string">scriptaculous/dragdrop.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-controls-js">
- <arguments>
- <argument name="file" xsi:type="string">scriptaculous/controls.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-slider-js">
- <arguments>
- <argument name="file" xsi:type="string">scriptaculous/slider.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="lib-ccard-js">
- <arguments>
- <argument name="file" xsi:type="string">lib/ccard.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="prototype-validation-js">
- <arguments>
- <argument name="file" xsi:type="string">prototype/validation.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="varien-js-js">
- <arguments>
- <argument name="file" xsi:type="string">varien/js.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-hash-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/adminhtml/hash.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-events-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/adminhtml/events.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-varienloader-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/adminhtml/varienLoader.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-grid-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/adminhtml/grid.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-backend-tabs-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/backend/tabs.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-form-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/adminhtml/form.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-accordion-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/adminhtml/accordion.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-tools-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/adminhtml/tools.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-catalog-product-js">
- <arguments>
- <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">
- <arguments>
- <argument name="file" xsi:type="string">lib/ds-sleight.js</argument>
- <argument name="properties" xsi:type="array">
- <item name="attributes" xsi:type="string">defer</item>
- <item name="ie_condition" xsi:type="string">lt IE 7</item>
- </argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Css" name="magento-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-ui-timepicker-addon-js">
- <arguments>
- <argument name="file" xsi:type="string">jquery/jquery-ui-timepicker-addon.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-calendar-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/calendar.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="extjs-ext-tree-js">
- <arguments>
- <argument name="file" xsi:type="string">extjs/ext-tree.js</argument>
- <argument name="properties" xsi:type="array">
- <item name="attributes" xsi:type="string"/>
- <item name="ie_condition" xsi:type="string"/>
- <item name="flag_name" xsi:type="string">can_load_ext_js</item>
- </argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="extjs-ext-tree-checkbox-js">
- <arguments>
- <argument name="file" xsi:type="string">extjs/ext-tree-checkbox.js</argument>
- <argument name="properties" xsi:type="array">
- <item name="attributes" xsi:type="string"/>
- <item name="ie_condition" xsi:type="string"/>
- <item name="flag_name" xsi:type="string">can_load_ext_js</item>
- </argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Css" name="extjs-resources-css-ext-all-css">
- <arguments>
- <argument name="file" xsi:type="string">extjs/resources/css/ext-all.css</argument>
- <argument name="properties" xsi:type="array">
- <item name="attributes" xsi:type="string"/>
- <item name="ie_condition" xsi:type="string"/>
- <item name="flag_name" xsi:type="string">can_load_ext_js</item>
- </argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Css" name="extjs-resources-css-ytheme-magento-css">
- <arguments>
- <argument name="file" xsi:type="string">extjs/resources/css/ytheme-magento.css</argument>
- <argument name="properties" xsi:type="array">
- <item name="attributes" xsi:type="string"/>
- <item name="ie_condition" xsi:type="string"/>
- <item name="flag_name" xsi:type="string">can_load_ext_js</item>
- </argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-promo-rules-js">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Rule::rules.js</argument>
- <argument name="properties" xsi:type="array">
- <item name="attributes" xsi:type="string"/>
- <item name="ie_condition" xsi:type="string"/>
- <item name="flag_name" xsi:type="string">can_load_rules_js</item>
- </argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-wysiwyg-tiny-mce-setup-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/adminhtml/wysiwyg/tiny_mce/setup.js</argument>
- <argument name="properties" xsi:type="array">
- <item name="attributes" xsi:type="string"/>
- <item name="ie_condition" xsi:type="string"/>
- <item name="flag_name" xsi:type="string">can_load_tiny_mce</item>
- </argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Js\Components" name="head.components" as="components" template="Magento_Adminhtml::page/js/components.phtml"/>
- <block class="Magento\View\Block\Html\Calendar" name="head.calendar" as="calendar" template="Magento_Adminhtml::page/js/calendar.phtml"/>
- </block>
- <block class="Magento\Adminhtml\Block\Page\Notices" name="global_notices" as="global_notices" template="page/notices.phtml"/>
- <block class="Magento\Adminhtml\Block\Page\Header" name="header" as="header">
- <block class="Magento\Backend\Block\GlobalSearch" as="search" acl="Magento_Adminhtml::global_search"/>
- </block>
- <block class="Magento\Adminhtml\Block\Widget\Breadcrumbs" name="breadcrumbs" as="breadcrumbs"/>
- <!--<update handle="formkey"/> this won't work, see the try/catch and a jammed exception in \Magento\Core\Model\Layout::createBlock() -->
- <block class="Magento\Adminhtml\Block\Admin\Formkey" name="formkey" as="formkey" template="Magento_Adminhtml::admin/formkey.phtml"/>
- <!-- deprecated since 1.7.0.0 see \Magento\Page\Block\Js\Translate -->
- <block class="Magento\Page\Block\Js\Translate" name="js_translate" as="js_translate" template="Magento_Adminhtml::page/js/translate.phtml"/>
- <container name="main-top" label="main-top" as="main-top">
- <block class="Magento\Page\Block\Html\Title" name="page-title" template="title.phtml"/>
- </container>
- <container name="left" as="left" label="Left Column"/>
- <container name="content" as="content" label="Content"/>
- <block class="Magento\View\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>
- </block>
- <container name="before_body_end" as="before_body_end" label="Before Body End"/>
- </block>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/urlrewrite/selector.phtml b/app/code/Magento/Adminhtml/view/adminhtml/urlrewrite/selector.phtml
index 99cb75e01ff..95e2cc91ba3 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('adminhtml/*/*')?>
+ <?php $url = $this->helper('Magento\Backend\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 97bc41b2154..668acee53e7 100644
--- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment.php
+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment.php
@@ -187,7 +187,7 @@ class Payment
&& isset($redirectParams['x_invoice_num'])
&& isset($redirectParams['controller_action_name'])
) {
- $params['redirect_parent'] = $this->_objectManager->get('Magento\Authorizenet\Helper\Data')
+ $params['redirect_parent'] = $this->_objectManager->get('Magento\Authorizenet\Helper\HelperInterface')
->getSuccessOrderUrl($redirectParams);
$this->_getDirectPostSession()->unsetData('quote_id');
//cancel old order
diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment.php
index fbf2630b3eb..41a4a06e452 100644
--- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment.php
+++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment.php
@@ -112,7 +112,7 @@ class Payment extends \Magento\App\Action\Action
}
$result['controller_action_name'] = $data['controller_action_name'];
$result['is_secure'] = isset($data['is_secure']) ? $data['is_secure'] : false;
- $params['redirect'] = $this->_objectManager->get('Magento\Authorizenet\Helper\Data')
+ $params['redirect'] = $this->_objectManager->get('Magento\Authorizenet\Helper\HelperInterface')
->getRedirectIframeUrl($result);
}
@@ -134,7 +134,7 @@ class Payment extends \Magento\App\Action\Action
&& isset($redirectParams['controller_action_name'])
) {
$this->_getDirectPostSession()->unsetData('quote_id');
- $params['redirect_parent'] = $this->_objectManager->get('Magento\Authorizenet\Helper\Data')
+ $params['redirect_parent'] = $this->_objectManager->get('Magento\Authorizenet\Helper\HelperInterface')
->getSuccessOrderUrl($redirectParams);
}
if (!empty($redirectParams['error_msg'])) {
diff --git a/app/code/Magento/Authorizenet/Helper/Backend.php b/app/code/Magento/Authorizenet/Helper/Backend.php
new file mode 100644
index 00000000000..45d87e23703
--- /dev/null
+++ b/app/code/Magento/Authorizenet/Helper/Backend.php
@@ -0,0 +1,102 @@
+<?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_Authorizenet
+ * @copyright Copyright (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\Authorizenet\Helper;
+
+/**
+ * Authorizenet Backend Data Helper
+ */
+class Backend extends Data
+{
+ /**
+ * @var \Magento\Backend\Model\Url
+ */
+ protected $_urlBuilder;
+
+ /**
+ * @param \Magento\App\Helper\Context $context
+ * @param \Magento\Core\Model\StoreManager $storeManager
+ * @param \Magento\Sales\Model\OrderFactory $orderFactory
+ * @param \Magento\Backend\Model\Url $urlBuilder
+ */
+ public function __construct(
+ \Magento\App\Helper\Context $context,
+ \Magento\Core\Model\StoreManager $storeManager,
+ \Magento\Sales\Model\OrderFactory $orderFactory,
+ \Magento\Backend\Model\Url $urlBuilder
+ ) {
+ parent::__construct($context, $storeManager, $orderFactory);
+ $this->_urlBuilder = $urlBuilder;
+ }
+
+ /**
+ * Return URL for admin area
+ *
+ * @param string $route
+ * @param array $params
+ * @return string
+ */
+ protected function _getUrl($route, $params = array())
+ {
+ return $this->_urlBuilder->getUrl($route, $params);
+ }
+
+ /**
+ * Retrieve place order url in admin
+ *
+ * @return string
+ */
+ public function getPlaceOrderAdminUrl()
+ {
+ return $this->_getUrl('*/authorizenet_directpost_payment/place', array());
+ }
+
+ /**
+ * Retrieve place order url
+ *
+ * @param array params
+ * @return string
+ */
+ public function getSuccessOrderUrl($params)
+ {
+ $param = array();
+ $route = 'sales/order/view';
+ $order = $this->_orderFactory->create()->loadByIncrementId($params['x_invoice_num']);
+ $param['order_id'] = $order->getId();
+ return $this->_getUrl($route, $param);
+ }
+
+ /**
+ * Retrieve redirect ifrmae url
+ *
+ * @param array params
+ * @return string
+ */
+ public function getRedirectIframeUrl($params)
+ {
+ return $this->_getUrl('adminhtml/authorizenet_directpost_payment/redirect', $params);
+ }
+}
diff --git a/app/code/Magento/Authorizenet/Helper/Data.php b/app/code/Magento/Authorizenet/Helper/Data.php
index 3e61e8c4f12..4413106ef18 100644
--- a/app/code/Magento/Authorizenet/Helper/Data.php
+++ b/app/code/Magento/Authorizenet/Helper/Data.php
@@ -24,16 +24,12 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Authorizenet\Helper;
+
/**
* Authorizenet Data Helper
- *
- * @category Magento
- * @package Magento_Authorizenet
- * @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Authorizenet\Helper;
-
-class Data extends \Magento\App\Helper\AbstractHelper
+class Data extends \Magento\App\Helper\AbstractHelper implements HelperInterface
{
/**
* @var \Magento\Core\Model\StoreManagerInterface
@@ -45,39 +41,19 @@ class Data extends \Magento\App\Helper\AbstractHelper
*/
protected $_orderFactory;
- /**
- * @var \Magento\Backend\Model\Url
- */
- protected $_urlBuilder;
-
/**
* @param \Magento\App\Helper\Context $context
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\Sales\Model\OrderFactory $orderFactory
- * @param \Magento\Backend\Model\Url $urlBuilder
*/
public function __construct(
\Magento\App\Helper\Context $context,
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Sales\Model\OrderFactory $orderFactory,
- \Magento\Backend\Model\Url $urlBuilder
+ \Magento\Sales\Model\OrderFactory $orderFactory
) {
parent::__construct($context);
$this->_storeManager = $storeManager;
$this->_orderFactory = $orderFactory;
- $this->_urlBuilder = $urlBuilder;
- }
-
- /**
- * Return URL for admin area
- *
- * @param string $route
- * @param array $params
- * @return string
- */
- public function getAdminUrl($route, $params)
- {
- return $this->_urlBuilder->getUrl($route, $params);
}
/**
@@ -141,11 +117,6 @@ class Data extends \Magento\App\Helper\AbstractHelper
$route = 'authorizenet/directpost_payment/redirect';
break;
- case 'sales_order_create':
- case 'sales_order_edit':
- $route = 'adminhtml/authorizenet_directpost_payment/redirect';
- return $this->getAdminUrl($route, $params);
-
default:
$route = 'authorizenet/directpost_payment/redirect';
break;
@@ -164,16 +135,6 @@ class Data extends \Magento\App\Helper\AbstractHelper
return $this->_getUrl('authorizenet/directpost_payment/place');
}
- /**
- * Retrieve place order url in admin
- *
- * @return string
- */
- public function getPlaceOrderAdminUrl()
- {
- return $this->getAdminUrl('*/authorizenet_directpost_payment/place', array());
- }
-
/**
* Retrieve place order url
*
@@ -188,13 +149,6 @@ class Data extends \Magento\App\Helper\AbstractHelper
$route = 'checkout/onepage/success';
break;
- case 'sales_order_create':
- case 'sales_order_edit':
- $route = 'sales/order/view';
- $order = $this->_orderFactory->create()->loadByIncrementId($params['x_invoice_num']);
- $param['order_id'] = $order->getId();
- return $this->getAdminUrl($route, $param);
-
default :
$route = 'checkout/onepage/success';
break;
diff --git a/app/code/Magento/Adminhtml/Model/Observer.php b/app/code/Magento/Authorizenet/Helper/HelperInterface.php
similarity index 68%
rename from app/code/Magento/Adminhtml/Model/Observer.php
rename to app/code/Magento/Authorizenet/Helper/HelperInterface.php
index 37ecd6d4c97..1ebe385d5a8 100644
--- a/app/code/Magento/Adminhtml/Model/Observer.php
+++ b/app/code/Magento/Authorizenet/Helper/HelperInterface.php
@@ -19,22 +19,31 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Authorizenet
* @copyright Copyright (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\Authorizenet\Helper;
/**
- * Backend event observer
- *
- * @category Magento
- * @package Magento_Adminhtml
- * @author Magento Core Team <core@magentocommerce.com>
- * @deprecated Moved to module Magento_Backend
+ * Authorizenet Data Helper
*/
-namespace Magento\Adminhtml\Model;
-
-class Observer extends \Magento\Backend\Model\Observer
+interface HelperInterface
{
+ /**
+ * Retrieve place order url
+ *
+ * @param array params
+ * @return string
+ */
+ public function getSuccessOrderUrl($params);
+
+ /**
+ * Retrieve redirect ifrmae url
+ *
+ * @param array params
+ * @return string
+ */
+ public function getRedirectIframeUrl($params);
}
diff --git a/app/code/Magento/Authorizenet/etc/adminhtml/di.xml b/app/code/Magento/Authorizenet/etc/adminhtml/di.xml
index 8d4a24b5cd8..dd7d4918ccc 100644
--- a/app/code/Magento/Authorizenet/etc/adminhtml/di.xml
+++ b/app/code/Magento/Authorizenet/etc/adminhtml/di.xml
@@ -24,6 +24,7 @@
*/
-->
<config>
+ <preference for="Magento\Authorizenet\Helper\HelperInterface" type="Magento\Authorizenet\Helper\Backend" />
<type name="Magento\Authorizenet\Model\Directpost\Session">
<param name="sessionName">
<value>adminhtml</value>
diff --git a/app/code/Magento/Authorizenet/etc/frontend/di.xml b/app/code/Magento/Authorizenet/etc/frontend/di.xml
index ad3e6576228..89220842b87 100644
--- a/app/code/Magento/Authorizenet/etc/frontend/di.xml
+++ b/app/code/Magento/Authorizenet/etc/frontend/di.xml
@@ -24,6 +24,7 @@
*/
-->
<config>
+ <preference for="Magento\Authorizenet\Helper\HelperInterface" type="Magento\Authorizenet\Helper\Data" />
<type name="Magento\Authorizenet\Model\Directpost\Session">
<param name="sessionName">
<value>frontend</value>
diff --git a/app/code/Magento/Authorizenet/view/adminhtml/directpost/iframe.phtml b/app/code/Magento/Authorizenet/view/adminhtml/directpost/iframe.phtml
index d069184e3ed..4da6e750acf 100644
--- a/app/code/Magento/Authorizenet/view/adminhtml/directpost/iframe.phtml
+++ b/app/code/Magento/Authorizenet/view/adminhtml/directpost/iframe.phtml
@@ -31,7 +31,7 @@
<?php
$_params = $this->getParams();
/* @var $_helper \Magento\Authorizenet\Helper\Data */
-$_helper = $this->helper('Magento\Authorizenet\Helper\Data');
+$_helper = $this->helper('Magento\Authorizenet\Helper\HelperInterface');
?>
<html>
<head>
diff --git a/app/code/Magento/Authorizenet/view/adminhtml/directpost/info.phtml b/app/code/Magento/Authorizenet/view/adminhtml/directpost/info.phtml
index 8d08867396b..907f1b70343 100644
--- a/app/code/Magento/Authorizenet/view/adminhtml/directpost/info.phtml
+++ b/app/code/Magento/Authorizenet/view/adminhtml/directpost/info.phtml
@@ -33,7 +33,7 @@ $_form = $this;
$_code = $_form->getMethodCode();
$_method = $_form->getMethod();
$_controller = $this->getRequest()->getControllerName();
-$_orderUrl = $this->helper('Magento\Authorizenet\Helper\Data')->getPlaceOrderAdminUrl();
+$_orderUrl = $this->helper('Magento\Authorizenet\Helper\Backend')->getPlaceOrderAdminUrl();
?>
<!-- IFRAME for request to our server -->
<iframe id="order-directpost-iframe" allowtransparency="true" frameborder="0" name="iframeSubmitOrder" style="display:none;width:100%;background-color:transparent" src="<?php echo $this->getViewFileUrl('blank.html') ?>"></iframe>
diff --git a/app/code/Magento/Authorizenet/view/frontend/directpost/iframe.phtml b/app/code/Magento/Authorizenet/view/frontend/directpost/iframe.phtml
index 1eb2dbe153f..0b406c2ff47 100644
--- a/app/code/Magento/Authorizenet/view/frontend/directpost/iframe.phtml
+++ b/app/code/Magento/Authorizenet/view/frontend/directpost/iframe.phtml
@@ -31,7 +31,7 @@
<?php
$_params = $this->getParams();
/* @var $_helper \Magento\Authorizenet\Helper\Data */
-$_helper = $this->helper('Magento\Authorizenet\Helper\Data');
+$_helper = $this->helper('Magento\Authorizenet\Helper\HelperInterface');
?>
<html>
<head>
diff --git a/app/code/Magento/Backend/App/Area/FrontNameResolver.php b/app/code/Magento/Backend/App/Area/FrontNameResolver.php
index 17271109824..5ad474a9b2a 100644
--- a/app/code/Magento/Backend/App/Area/FrontNameResolver.php
+++ b/app/code/Magento/Backend/App/Area/FrontNameResolver.php
@@ -43,15 +43,15 @@ class FrontNameResolver implements \Magento\App\Area\FrontNameResolverInterface
protected $_defaultFrontName;
/**
- * @var \Magento\Core\Model\ConfigInterface
+ * @var \Magento\Backend\App\ConfigInterface
*/
protected $_config;
/**
- * @param \Magento\Core\Model\ConfigInterface $config
+ * @param \Magento\Backend\App\Config $config
* @param string $defaultFrontName
*/
- public function __construct(\Magento\Core\Model\ConfigInterface $config, $defaultFrontName)
+ public function __construct(\Magento\Backend\App\Config $config, $defaultFrontName)
{
$this->_config = $config;
$this->_defaultFrontName = $defaultFrontName;
@@ -64,9 +64,9 @@ class FrontNameResolver implements \Magento\App\Area\FrontNameResolverInterface
*/
public function getFrontName()
{
- $isCustomPathUsed = (bool)(string)$this->_config->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_PATH, 'default');
+ $isCustomPathUsed = (bool)(string)$this->_config->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_PATH);
if ($isCustomPathUsed) {
- return (string)$this->_config->getValue(self::XML_PATH_CUSTOM_ADMIN_PATH, 'default');
+ return (string)$this->_config->getValue(self::XML_PATH_CUSTOM_ADMIN_PATH);
}
return $this->_defaultFrontName;
}
diff --git a/app/code/Magento/Backend/App/Config.php b/app/code/Magento/Backend/App/Config.php
new file mode 100644
index 00000000000..118525b6950
--- /dev/null
+++ b/app/code/Magento/Backend/App/Config.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Default application path for backend area
+ *
+ * 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\App;
+
+/**
+ * Backend config accessor
+ */
+class Config implements ConfigInterface
+{
+ /**
+ * @var \Magento\Core\Model\Config\SectionPool
+ */
+ protected $_sectionPool;
+
+ /**
+ * @param \Magento\Core\Model\Config\SectionPool $sectionPool
+ */
+ public function __construct(\Magento\Core\Model\Config\SectionPool $sectionPool)
+ {
+ $this->_sectionPool = $sectionPool;
+ }
+
+ /**
+ * Retrieve config value by path and scope
+ *
+ * @param string $path
+ * @return mixed
+ */
+ public function getValue($path)
+ {
+ return $this->_sectionPool->getSection('default', null)->getValue($path);
+ }
+
+ /**
+ * Set config value in the corresponding config scope
+ *
+ * @param string $path
+ * @param mixed $value
+ */
+ public function setValue($path, $value)
+ {
+ $this->_sectionPool->getSection('default', null)->setValue($path, $value);
+ }
+
+ /**
+ * Reinitialize configuration
+ *
+ * @return \Magento\Core\Model\Config
+ */
+ public function reinit()
+ {
+ $this->_sectionPool->clean();
+ }
+
+ /**
+ * Retrieve config flag
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function getFlag($path)
+ {
+ return !!$this->_sectionPool->getSection('default', null)->getValue($path);
+ }
+}
diff --git a/app/code/Magento/Backend/App/ConfigInterface.php b/app/code/Magento/Backend/App/ConfigInterface.php
new file mode 100644
index 00000000000..ee0c31db1ff
--- /dev/null
+++ b/app/code/Magento/Backend/App/ConfigInterface.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Default application path for backend area
+ *
+ * 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\App;
+
+/**
+ * Backend config accessor
+ */
+interface ConfigInterface
+{
+ /**
+ * Retrieve config value by path
+ *
+ * @param string $path
+ * @return mixed
+ */
+ public function getValue($path);
+
+ /**
+ * Set config value
+ *
+ * @param string $path
+ * @param mixed $value
+ */
+ public function setValue($path, $value);
+
+ /**
+ * Reinitialize config object
+ */
+ public function reinit();
+
+ /**
+ * Retrieve config flag
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function getFlag($path);
+}
diff --git a/app/code/Magento/Backend/App/DefaultPath.php b/app/code/Magento/Backend/App/DefaultPath.php
index b69472565a7..10bd2e58da9 100644
--- a/app/code/Magento/Backend/App/DefaultPath.php
+++ b/app/code/Magento/Backend/App/DefaultPath.php
@@ -33,11 +33,11 @@ class DefaultPath implements \Magento\App\DefaultPathInterface
protected $_parts;
/**
- * @param \Magento\Core\Model\Config $config
+ * @param \Magento\Backend\App\ConfigInterface $config
*/
- public function __construct(\Magento\Core\Model\Config $config)
+ public function __construct(\Magento\Backend\App\ConfigInterface $config)
{
- $pathParts = explode('/', $config->getValue('web/default/admin', 'default'));
+ $pathParts = explode('/', $config->getValue('web/default/admin'));
$this->_parts = array(
'area' => isset($pathParts[0]) ? $pathParts[0] : '',
@@ -57,4 +57,4 @@ class DefaultPath implements \Magento\App\DefaultPathInterface
{
return isset($this->_parts[$code]) ? $this->_parts[$code] : null;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/Magento/Backend/App/Router/DefaultRouter.php b/app/code/Magento/Backend/App/Router/DefaultRouter.php
index 8f377599555..57c1b9c5d02 100644
--- a/app/code/Magento/Backend/App/Router/DefaultRouter.php
+++ b/app/code/Magento/Backend/App/Router/DefaultRouter.php
@@ -28,6 +28,59 @@ namespace Magento\Backend\App\Router;
class DefaultRouter extends \Magento\Core\App\Router\Base
{
+ /**
+ * @var \Magento\Backend\App\ConfigInterface
+ */
+ protected $_backendConfig;
+
+ /**
+ * @var \Magento\Core\Model\Url|\Magento\UrlInterface $url
+ */
+ protected $_url;
+
+ /**
+ * @var \Magento\Core\Model\Config
+ */
+ protected $_coreConfig;
+
+ /**
+ * @param \Magento\Core\Model\Config $coreConfig
+ * @param \Magento\App\ActionFactory $actionFactory
+ * @param \Magento\App\DefaultPathInterface $defaultPath
+ * @param \Magento\App\ResponseFactory $responseFactory
+ * @param \Magento\App\Route\ConfigInterface $routeConfig
+ * @param \Magento\App\State $appState
+ * @param \Magento\Core\Model\Url|\Magento\UrlInterface $url
+ * @param \Magento\Core\Model\StoreManager|\Magento\Core\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Core\Model\Store\Config $storeConfig
+ * @param \Magento\Core\Model\Url\SecurityInfoInterface $urlSecurityInfo
+ * @param $routerId
+ * @param \Magento\Backend\App\ConfigInterface $backendConfig
+ * @throws \InvalidArgumentException
+ */
+ public function __construct(
+ \Magento\Core\Model\Config $coreConfig,
+ \Magento\App\ActionFactory $actionFactory,
+ \Magento\App\DefaultPathInterface $defaultPath,
+ \Magento\App\ResponseFactory $responseFactory,
+ \Magento\App\Route\ConfigInterface $routeConfig,
+ \Magento\App\State $appState,
+ \Magento\UrlInterface $url,
+ \Magento\Core\Model\StoreManagerInterface $storeManager,
+ \Magento\Core\Model\Store\Config $storeConfig,
+ \Magento\Core\Model\Url\SecurityInfoInterface $urlSecurityInfo,
+ $routerId,
+ \Magento\Backend\App\ConfigInterface $backendConfig
+ ) {
+ parent::__construct(
+ $actionFactory, $defaultPath, $responseFactory, $routeConfig, $appState, $url, $storeManager, $storeConfig,
+ $urlSecurityInfo, $routerId
+ );
+ $this->_coreConfig = $coreConfig;
+ $this->_backendConfig = $backendConfig;
+ $this->_url = $url;
+ }
+
/**
* List of required request parameters
* Order sensitive
@@ -46,7 +99,7 @@ class DefaultRouter extends \Magento\Core\App\Router\Base
*/
protected function _getDefaultPath()
{
- return (string)$this->_storeConfig->getConfig('web/default/admin', 'admin');
+ return (string)$this->_backendConfig->getValue('web/default/admin');
}
/**
@@ -69,11 +122,9 @@ class DefaultRouter extends \Magento\Core\App\Router\Base
*/
protected function _shouldBeSecure($path)
{
- return substr((string)$this->_storeConfig->getConfig('web/unsecure/base_url'), 0, 5) === 'https'
- || $this->_storeConfig->getConfigFlag(
- 'web/secure/use_in_adminhtml',
- \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
- ) && substr((string)$this->_storeConfig->getConfig('web/secure/base_url'), 0, 5) === 'https';
+ return substr((string)$this->_coreConfig->getValue('web/unsecure/base_url', 'default'), 0, 5) === 'https'
+ || $this->_backendConfig->getFlag('web/secure/use_in_adminhtml')
+ && substr((string)$this->_coreConfig->getValue('web/secure/base_url', 'default'), 0, 5) === 'https';
}
/**
@@ -84,8 +135,7 @@ class DefaultRouter extends \Magento\Core\App\Router\Base
*/
protected function _getCurrentSecureUrl($request)
{
- return $this->_storeManager->getStore(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
- ->getBaseUrl('link', true) . ltrim($request->getPathInfo(), '/');
+ return $this->_url->getBaseUrl('link', true) . ltrim($request->getPathInfo(), '/');
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Admin/Formkey.php b/app/code/Magento/Backend/Block/Admin/Formkey.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Admin/Formkey.php
rename to app/code/Magento/Backend/Block/Admin/Formkey.php
index 69ba7cc3675..0d5e6c6b706 100644
--- a/app/code/Magento/Adminhtml/Block/Admin/Formkey.php
+++ b/app/code/Magento/Backend/Block/Admin/Formkey.php
@@ -19,15 +19,15 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml form key content block
+ * Backend form key content block
*/
-namespace Magento\Adminhtml\Block\Admin;
+namespace Magento\Backend\Block\Admin;
class Formkey extends \Magento\Backend\Block\Template
{
diff --git a/app/code/Magento/Adminhtml/Block/Cache.php b/app/code/Magento/Backend/Block/Cache.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Cache.php
rename to app/code/Magento/Backend/Block/Cache.php
index 9540a3f1cfd..0e107904966 100644
--- a/app/code/Magento/Adminhtml/Block/Cache.php
+++ b/app/code/Magento/Backend/Block/Cache.php
@@ -19,12 +19,12 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @copyright Copyright (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;
+namespace Magento\Backend\Block;
class Cache extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
diff --git a/app/code/Magento/Adminhtml/Block/Cache/Additional.php b/app/code/Magento/Backend/Block/Cache/Additional.php
similarity index 80%
rename from app/code/Magento/Adminhtml/Block/Cache/Additional.php
rename to app/code/Magento/Backend/Block/Cache/Additional.php
index d4a43697b44..386dbacded6 100644
--- a/app/code/Magento/Adminhtml/Block/Cache/Additional.php
+++ b/app/code/Magento/Backend/Block/Cache/Additional.php
@@ -19,22 +19,22 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @copyright Copyright (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\Cache;
+namespace Magento\Backend\Block\Cache;
-class Additional extends \Magento\Adminhtml\Block\Template
+class Additional extends \Magento\Backend\Block\Template
{
public function getCleanImagesUrl()
{
- return $this->getUrl('adminhtml/*/cleanImages');
+ return $this->getUrl('*/*/cleanImages');
}
public function getCleanMediaUrl()
{
- return $this->getUrl('adminhtml/*/cleanMedia');
+ return $this->getUrl('*/*/cleanMedia');
}
}
diff --git a/app/code/Magento/Backend/Block/Dashboard.php b/app/code/Magento/Backend/Block/Dashboard.php
index 309a8c54b3e..0071f5fd3f5 100644
--- a/app/code/Magento/Backend/Block/Dashboard.php
+++ b/app/code/Magento/Backend/Block/Dashboard.php
@@ -26,7 +26,7 @@
namespace Magento\Backend\Block;
-class Dashboard extends \Magento\Adminhtml\Block\Template
+class Dashboard extends \Magento\Backend\Block\Template
{
protected $_locale;
@@ -52,7 +52,7 @@ class Dashboard extends \Magento\Adminhtml\Block\Template
if ($this->_storeConfig->getConfig(self::XML_PATH_ENABLE_CHARTS)) {
$block = $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Diagrams');
} else {
- $block = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Template')
+ $block = $this->getLayout()->createBlock('Magento\Backend\Block\Template')
->setTemplate('dashboard/graph/disabled.phtml')
->setConfigUrl($this->getUrl('adminhtml/system_config/edit', array('section'=>'admin')));
}
diff --git a/app/code/Magento/Backend/Block/Dashboard/Searches/Renderer/Searchquery.php b/app/code/Magento/Backend/Block/Dashboard/Searches/Renderer/Searchquery.php
index 43df3a75d24..2b9bf27b8a7 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Searches/Renderer/Searchquery.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Searches/Renderer/Searchquery.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @copyright Copyright (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/Backend/Block/Dashboard/Tab/Customers/Newest.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
index 72215de3b59..237218ec3db 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
@@ -115,7 +115,7 @@ class Newest extends \Magento\Backend\Block\Dashboard\Grid
'type' => 'currency',
'currency_code' => $baseCurrencyCode,
'index' => 'orders_avg_amount',
- 'renderer' =>'Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Currency'
+ 'renderer' =>'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency'
));
$this->addColumn('orders_sum_amount', array(
@@ -125,7 +125,7 @@ class Newest extends \Magento\Backend\Block\Dashboard\Grid
'type' => 'currency',
'currency_code' => $baseCurrencyCode,
'index' => 'orders_sum_amount',
- 'renderer' =>'Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Currency'
+ 'renderer' =>'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency'
));
$this->setFilterVisibility(false);
diff --git a/app/code/Magento/Adminhtml/Block/Denied.php b/app/code/Magento/Backend/Block/Denied.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Denied.php
rename to app/code/Magento/Backend/Block/Denied.php
index 96c0fa78b55..8de1d49d475 100644
--- a/app/code/Magento/Adminhtml/Block/Denied.php
+++ b/app/code/Magento/Backend/Block/Denied.php
@@ -19,14 +19,14 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @copyright Copyright (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;
+namespace Magento\Backend\Block;
-class Denied extends \Magento\Adminhtml\Block\Template
+class Denied extends \Magento\Backend\Block\Template
{
/**
* @var \Magento\Backend\Model\Auth\Session
diff --git a/app/code/Magento/Adminhtml/Block/Media/Uploader.php b/app/code/Magento/Backend/Block/Media/Uploader.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Media/Uploader.php
rename to app/code/Magento/Backend/Block/Media/Uploader.php
index 0cb0c9c6973..19418d994a0 100644
--- a/app/code/Magento/Adminhtml/Block/Media/Uploader.php
+++ b/app/code/Magento/Backend/Block/Media/Uploader.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @copyright Copyright (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 media library uploader
*/
-namespace Magento\Adminhtml\Block\Media;
+namespace Magento\Backend\Block\Media;
class Uploader extends \Magento\Adminhtml\Block\Widget
{
@@ -39,25 +39,25 @@ class Uploader extends \Magento\Adminhtml\Block\Widget
/**
* @var string
*/
- protected $_template = 'Magento_Adminhtml::media/uploader.phtml';
+ protected $_template = 'Magento_Backend::media/uploader.phtml';
/**
* @var \Magento\File\Size
*/
protected $_fileSizeService;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\File\Size $fileSize
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\File\Size $fileSize
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\File\Size $fileSize,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\File\Size $fileSize,
+ array $data = array()
+ ) {
$this->_fileSizeService = $fileSize;
parent::__construct($context, $coreData, $data);
}
@@ -101,7 +101,7 @@ class Uploader extends \Magento\Adminhtml\Block\Widget
/**
* Prepares layout and set element renderer
*
- * @return \Magento\Adminhtml\Block\Media\Uploader
+ * @return \Magento\Backend\Block\Media\Uploader
*/
protected function _prepareLayout()
{
@@ -119,7 +119,7 @@ class Uploader extends \Magento\Adminhtml\Block\Widget
}
/**
- * Retrive uploader js object name
+ * Retrieve uploader js object name
*
* @return string
*/
@@ -129,7 +129,7 @@ class Uploader extends \Magento\Adminhtml\Block\Widget
}
/**
- * Retrive config json
+ * Retrieve config json
*
* @return string
*/
@@ -139,7 +139,7 @@ class Uploader extends \Magento\Adminhtml\Block\Widget
}
/**
- * Retrive config object
+ * Retrieve config object
*
* @return \Magento\Object
*/
diff --git a/app/code/Magento/Adminhtml/Block/Page.php b/app/code/Magento/Backend/Block/Page.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Page.php
rename to app/code/Magento/Backend/Block/Page.php
index db5845b304f..451584c43cf 100644
--- a/app/code/Magento/Adminhtml/Block/Page.php
+++ b/app/code/Magento/Backend/Block/Page.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @copyright Copyright (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 page
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block;
+namespace Magento\Backend\Block;
class Page extends \Magento\Backend\Block\Template
{
@@ -65,7 +65,7 @@ class Page extends \Magento\Backend\Block\Template
* Add CSS class to page body tag
*
* @param string $className
- * @return \Magento\Adminhtml\Block\Page
+ * @return \Magento\Backend\Block\Page
*/
public function addBodyClass($className)
{
diff --git a/app/code/Magento/Adminhtml/Block/Page/Footer.php b/app/code/Magento/Backend/Block/Page/Footer.php
similarity index 88%
rename from app/code/Magento/Adminhtml/Block/Page/Footer.php
rename to app/code/Magento/Backend/Block/Page/Footer.php
index d5b876312f5..12c05179d8c 100644
--- a/app/code/Magento/Adminhtml/Block/Page/Footer.php
+++ b/app/code/Magento/Backend/Block/Page/Footer.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @copyright Copyright (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 footer block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Page;
+namespace Magento\Backend\Block\Page;
-class Footer extends \Magento\Adminhtml\Block\Template
+class Footer extends \Magento\Backend\Block\Template
{
protected $_template = 'page/footer.phtml';
diff --git a/app/code/Magento/Adminhtml/Block/Page/Head.php b/app/code/Magento/Backend/Block/Page/Head.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Page/Head.php
rename to app/code/Magento/Backend/Block/Page/Head.php
index f0c549d8ccb..db71c6f792b 100644
--- a/app/code/Magento/Adminhtml/Block/Page/Head.php
+++ b/app/code/Magento/Backend/Block/Page/Head.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @copyright Copyright (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 header block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Page;
+namespace Magento\Backend\Block\Page;
class Head extends \Magento\Page\Block\Html\Head
{
diff --git a/app/code/Magento/Adminhtml/Block/Page/Header.php b/app/code/Magento/Backend/Block/Page/Header.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Page/Header.php
rename to app/code/Magento/Backend/Block/Page/Header.php
index 88d99b1e169..953723bfeb2 100644
--- a/app/code/Magento/Adminhtml/Block/Page/Header.php
+++ b/app/code/Magento/Backend/Block/Page/Header.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @copyright Copyright (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 header block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Page;
+namespace Magento\Backend\Block\Page;
-class Header extends \Magento\Adminhtml\Block\Template
+class Header extends \Magento\Backend\Block\Template
{
protected $_template = 'page/header.phtml';
diff --git a/app/code/Magento/Adminhtml/Block/Page/Notices.php b/app/code/Magento/Backend/Block/Page/Notices.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Page/Notices.php
rename to app/code/Magento/Backend/Block/Page/Notices.php
index 8b31a6142c5..cf52008ba10 100644
--- a/app/code/Magento/Adminhtml/Block/Page/Notices.php
+++ b/app/code/Magento/Backend/Block/Page/Notices.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @copyright Copyright (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 header notices block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Page;
+namespace Magento\Backend\Block\Page;
-class Notices extends \Magento\Adminhtml\Block\Template
+class Notices extends \Magento\Backend\Block\Template
{
/**
diff --git a/app/code/Magento/Adminhtml/Block/Page/System/Config/Robots/Reset.php b/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Page/System/Config/Robots/Reset.php
rename to app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
index 481945d922f..9b039a89577 100644
--- a/app/code/Magento/Adminhtml/Block/Page/System/Config/Robots/Reset.php
+++ b/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @copyright Copyright (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 @@
* "Reset to Defaults" button renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Page\System\Config\Robots;
+namespace Magento\Backend\Block\Page\System\Config\Robots;
class Reset extends \Magento\Backend\Block\System\Config\Form\Field
{
diff --git a/app/code/Magento/Backend/Block/System/Design.php b/app/code/Magento/Backend/Block/System/Design.php
index 07cbdd28d74..f6b3a5e0f3a 100644
--- a/app/code/Magento/Backend/Block/System/Design.php
+++ b/app/code/Magento/Backend/Block/System/Design.php
@@ -27,7 +27,7 @@
namespace Magento\Backend\Block\System;
-class Design extends \Magento\Adminhtml\Block\Template
+class Design extends \Magento\Backend\Block\Template
{
protected function _prepareLayout()
{
diff --git a/app/code/Magento/Backend/Block/System/Store/Delete/Group.php b/app/code/Magento/Backend/Block/System/Store/Delete/Group.php
index 35f0a61524f..01542d7b095 100644
--- a/app/code/Magento/Backend/Block/System/Store/Delete/Group.php
+++ b/app/code/Magento/Backend/Block/System/Store/Delete/Group.php
@@ -34,7 +34,7 @@
namespace Magento\Backend\Block\System\Store\Delete;
-class Group extends \Magento\Adminhtml\Block\Template
+class Group extends \Magento\Backend\Block\Template
{
protected function _prepareLayout()
{
diff --git a/app/code/Magento/Backend/Block/System/Store/Delete/Website.php b/app/code/Magento/Backend/Block/System/Store/Delete/Website.php
index 6ece68ecb70..e72533c732e 100644
--- a/app/code/Magento/Backend/Block/System/Store/Delete/Website.php
+++ b/app/code/Magento/Backend/Block/System/Store/Delete/Website.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Backend\Block\System\Store\Delete;
-class Website extends \Magento\Adminhtml\Block\Template
+class Website extends \Magento\Backend\Block\Template
{
protected function _prepareLayout()
diff --git a/app/code/Magento/Backend/Block/System/Variable.php b/app/code/Magento/Backend/Block/System/Variable.php
index 3218f18310d..48e8aa1dc0c 100644
--- a/app/code/Magento/Backend/Block/System/Variable.php
+++ b/app/code/Magento/Backend/Block/System/Variable.php
@@ -25,7 +25,7 @@
*/
/**
- * Custom Varieble Block
+ * Custom Variable Block
*
* @category Magento
* @package Magento_Backend
diff --git a/app/code/Magento/Adminhtml/Block/Text/ListText.php b/app/code/Magento/Backend/Block/Text/ListText.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Text/ListText.php
rename to app/code/Magento/Backend/Block/Text/ListText.php
index 151cd4997b3..cff54dcb7ad 100644
--- a/app/code/Magento/Adminhtml/Block/Text/ListText.php
+++ b/app/code/Magento/Backend/Block/Text/ListText.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @copyright Copyright (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 text list block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Text;
+namespace Magento\Backend\Block\Text;
class ListText extends \Magento\View\Block\Text\ListText
{
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
index 277948d3139..c2a02a87822 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
@@ -540,7 +540,7 @@ class Extended
}
/**
- * Retrive massaction block name
+ * Retrieve massaction block name
*
* @return string
*/
@@ -562,7 +562,7 @@ class Extended
}
/**
- * Retrive massaction block
+ * Retrieve massaction block
*
* @return \Magento\Backend\Block\Widget\Grid\Massaction\Extended
*/
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item.php
index 742edfbfb54..e573b5a3ce2 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item.php
@@ -52,7 +52,7 @@ class Item extends \Magento\Backend\Block\Widget
}
/**
- * Retrive parent massaction block
+ * Retrieve parent massaction block
*
* @return \Magento\Backend\Block\Widget\Grid\Massaction\Extended
*/
@@ -97,7 +97,7 @@ class Item extends \Magento\Backend\Block\Widget
}
/**
- * Retrive additional action block for this item
+ * Retrieve additional action block for this item
*
* @return \Magento\View\Block\AbstractBlock
*/
@@ -107,7 +107,7 @@ class Item extends \Magento\Backend\Block\Widget
}
/**
- * Retrive additional action block HTML for this item
+ * Retrieve additional action block HTML for this item
*
* @return string
*/
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Config.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Config.php
index 0a3b13f40e2..d6e9312a325 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Config.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Config.php
@@ -121,9 +121,9 @@ class Config extends \Magento\Backend\Controller\Adminhtml\System\AbstractConfig
public function exportTableratesAction()
{
$fileName = 'tablerates.csv';
- /** @var $gridBlock \Magento\Adminhtml\Block\Shipping\Carrier\Tablerate\Grid */
+ /** @var $gridBlock \Magento\Shipping\Block\Adminhtml\Carrier\Tablerate\Grid */
$gridBlock = $this->_view->getLayout()
- ->createBlock('Magento\Adminhtml\Block\Shipping\Carrier\Tablerate\Grid');
+ ->createBlock('Magento\Shipping\Block\Adminhtml\Carrier\Tablerate\Grid');
$website = $this->_storeManager->getWebsite($this->getRequest()->getParam('website'));
if ($this->getRequest()->getParam('conditionName')) {
$conditionName = $this->getRequest()->getParam('conditionName');
diff --git a/app/code/Magento/Backend/Model/Auth/Session.php b/app/code/Magento/Backend/Model/Auth/Session.php
index 0965978eb67..d54df862667 100644
--- a/app/code/Magento/Backend/Model/Auth/Session.php
+++ b/app/code/Magento/Backend/Model/Auth/Session.php
@@ -56,18 +56,26 @@ class Session
*/
protected $_backendUrl;
+ /**
+ * @var \Magento\Backend\App\ConfigInterface
+ */
+ protected $_config;
+
/**
* @param \Magento\Core\Model\Session\Context $context
* @param \Magento\Acl\Builder $aclBuilder
* @param \Magento\Backend\Model\Url $backendUrl
+ * @param \Magento\Backend\App\ConfigInterface $config
* @param array $data
*/
public function __construct(
\Magento\Core\Model\Session\Context $context,
\Magento\Acl\Builder $aclBuilder,
\Magento\Backend\Model\Url $backendUrl,
+ \Magento\Backend\App\ConfigInterface $config,
array $data = array()
) {
+ $this->_config = $config;
$this->_aclBuilder = $aclBuilder;
$this->_backendUrl = $backendUrl;
parent::__construct($context, $data);
@@ -153,7 +161,7 @@ class Session
*/
public function isLoggedIn()
{
- $lifetime = $this->_coreStoreConfig->getConfig(self::XML_PATH_SESSION_LIFETIME);
+ $lifetime = $this->_config->getValue(self::XML_PATH_SESSION_LIFETIME);
$currentTime = time();
/* Validate admin session lifetime that should be more than 60 seconds */
@@ -225,4 +233,25 @@ class Session
$this->getCookie()->delete($this->getSessionName());
return $this;
}
+
+ /**
+ * Skip path validation in backend area
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function isValidForPath($path)
+ {
+ return true;
+ }
+
+ /**
+ * Always try to get session id from query in backend area
+ *
+ * @return bool
+ */
+ protected function _isSidUsedFromQueryParam()
+ {
+ return true;
+ }
}
diff --git a/app/code/Magento/Adminhtml/Block/Template.php b/app/code/Magento/Backend/Model/Cookie.php
similarity index 73%
rename from app/code/Magento/Adminhtml/Block/Template.php
rename to app/code/Magento/Backend/Model/Cookie.php
index 972f11b1ef8..13754662d08 100644
--- a/app/code/Magento/Adminhtml/Block/Template.php
+++ b/app/code/Magento/Backend/Model/Cookie.php
@@ -19,22 +19,26 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @copyright Copyright (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\Model;
+
/**
- * Adminhtml abstract block
- *
- * @category Magento
- * @package Magento_Adminhtml
- * @author Magento Core Team <core@magentocommerce.com>
- * @deprecated Moved to module Magento_Backend
+ * Backend cookie model
*/
-namespace Magento\Adminhtml\Block;
-
-class Template extends \Magento\Backend\Block\Template
+class Cookie extends \Magento\Core\Model\Cookie
{
-
+ /**
+ * Is https secure request
+ * Use secure on adminhtml only
+ *
+ * @return bool
+ */
+ public function isSecure()
+ {
+ return $this->_getRequest()->isSecure();
+ }
}
diff --git a/app/code/Magento/Backend/Model/Menu/Builder/AbstractCommand.php b/app/code/Magento/Backend/Model/Menu/Builder/AbstractCommand.php
index 7f4deb0556b..3bdb02b7f1a 100644
--- a/app/code/Magento/Backend/Model/Menu/Builder/AbstractCommand.php
+++ b/app/code/Magento/Backend/Model/Menu/Builder/AbstractCommand.php
@@ -67,7 +67,7 @@ abstract class AbstractCommand
}
/**
- * Retreive id of element to apply command to
+ * Retrieve id of element to apply command to
*
* @return int
*/
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Helper/DataTest.php b/app/code/Magento/Backend/Model/Resource/Translate.php
similarity index 70%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Helper/DataTest.php
rename to app/code/Magento/Backend/Model/Resource/Translate.php
index 53422aa954a..dc3de5f5bc9 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Helper/DataTest.php
+++ b/app/code/Magento/Backend/Model/Resource/Translate.php
@@ -19,22 +19,26 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
- * @subpackage integration_tests
+ * @package Magento_Backend
* @copyright Copyright (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\Backend\Model\Resource;
/**
- * @magentoAppArea adminhtml
+ * Backend translate resource model
*/
-class DataTest extends \PHPUnit_Framework_TestCase
+class Translate extends \Magento\Core\Model\Resource\Translate
{
- public function testConstructor()
+ /**
+ * Get current store id
+ * Use always default scope for store id
+ *
+ * @return int
+ */
+ protected function _getStoreId()
{
- $this->assertInstanceOf('Magento\Backend\Helper\Data',
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Adminhtml\Helper\Data'));
+ return \Magento\Core\Model\Store::DEFAULT_STORE_ID;
}
}
diff --git a/app/code/Magento/Backend/Model/Resource/Translate/String.php b/app/code/Magento/Backend/Model/Resource/Translate/String.php
new file mode 100644
index 00000000000..e05e5824b03
--- /dev/null
+++ b/app/code/Magento/Backend/Model/Resource/Translate/String.php
@@ -0,0 +1,44 @@
+<?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_Backend
+ * @copyright Copyright (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\Model\Resource\Translate;
+
+/**
+ * Backend string translate resource model
+ */
+class String extends \Magento\Core\Model\Resource\Translate\String
+{
+ /**
+ * Get current store id
+ * Use always default scope for store id
+ *
+ * @return int
+ */
+ protected function _getStoreId()
+ {
+ return \Magento\Core\Model\Store::DEFAULT_STORE_ID;
+ }
+}
diff --git a/app/code/Magento/Adminhtml/Model/Search/Catalog.php b/app/code/Magento/Backend/Model/Search/Catalog.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Model/Search/Catalog.php
rename to app/code/Magento/Backend/Model/Search/Catalog.php
index 39d6edb9bdd..f06746ee7ca 100644
--- a/app/code/Magento/Adminhtml/Model/Search/Catalog.php
+++ b/app/code/Magento/Backend/Model/Search/Catalog.php
@@ -19,12 +19,12 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @copyright Copyright (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\Search;
+namespace Magento\Backend\Model\Search;
/**
* Search Catalog Model
@@ -48,17 +48,17 @@ class Catalog extends \Magento\Object
/**
* Adminhtml data
*
- * @var \Magento\Adminhtml\Helper\Data
+ * @var \Magento\Backend\Helper\Data
*/
protected $_adminhtmlData = null;
/**
- * @param \Magento\Adminhtml\Helper\Data $adminhtmlData
+ * @param \Magento\Backend\Helper\Data $adminhtmlData
* @param \Magento\Stdlib\String $string
* @param \Magento\CatalogSearch\Helper\Data $catalogSearchData
*/
public function __construct(
- \Magento\Adminhtml\Helper\Data $adminhtmlData,
+ \Magento\Backend\Helper\Data $adminhtmlData,
\Magento\Stdlib\String $string,
\Magento\CatalogSearch\Helper\Data $catalogSearchData
) {
@@ -70,7 +70,7 @@ class Catalog extends \Magento\Object
/**
* Load search results
*
- * @return \Magento\Adminhtml\Model\Search\Catalog
+ * @return \Magento\Backend\Model\Search\Catalog
*/
public function load()
{
diff --git a/app/code/Magento/Adminhtml/Model/Search/Customer.php b/app/code/Magento/Backend/Model/Search/Customer.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Model/Search/Customer.php
rename to app/code/Magento/Backend/Model/Search/Customer.php
index fa11df0c69b..b800647325c 100644
--- a/app/code/Magento/Adminhtml/Model/Search/Customer.php
+++ b/app/code/Magento/Backend/Model/Search/Customer.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @copyright Copyright (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 @@
* Search Customer Model
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Model\Search;
+namespace Magento\Backend\Model\Search;
class Customer extends \Magento\Object
{
/**
* Adminhtml data
*
- * @var \Magento\Adminhtml\Helper\Data
+ * @var \Magento\Backend\Helper\Data
*/
protected $_adminhtmlData = null;
@@ -49,11 +49,11 @@ class Customer extends \Magento\Object
/**
* @param \Magento\Customer\Model\Resource\Customer\CollectionFactory $collectionFactory
- * @param \Magento\Adminhtml\Helper\Data $adminhtmlData
+ * @param \Magento\Backend\Helper\Data $adminhtmlData
*/
public function __construct(
\Magento\Customer\Model\Resource\Customer\CollectionFactory $collectionFactory,
- \Magento\Adminhtml\Helper\Data $adminhtmlData
+ \Magento\Backend\Helper\Data $adminhtmlData
) {
$this->_collectionFactory = $collectionFactory;
$this->_adminhtmlData = $adminhtmlData;
@@ -62,7 +62,7 @@ class Customer extends \Magento\Object
/**
* Load search results
*
- * @return \Magento\Adminhtml\Model\Search\Customer
+ * @return \Magento\Backend\Model\Search\Customer
*/
public function load()
{
diff --git a/app/code/Magento/Adminhtml/Model/Search/Order.php b/app/code/Magento/Backend/Model/Search/Order.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Model/Search/Order.php
rename to app/code/Magento/Backend/Model/Search/Order.php
index e247b9db0dc..28b66af4cef 100644
--- a/app/code/Magento/Adminhtml/Model/Search/Order.php
+++ b/app/code/Magento/Backend/Model/Search/Order.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @copyright Copyright (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 @@
* Search Order Model
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Model\Search;
+namespace Magento\Backend\Model\Search;
class Order extends \Magento\Object
{
/**
* Adminhtml data
*
- * @var \Magento\Adminhtml\Helper\Data
+ * @var \Magento\Backend\Helper\Data
*/
protected $_adminhtmlData = null;
@@ -49,11 +49,11 @@ class Order extends \Magento\Object
/**
* @param \Magento\Sales\Model\Resource\Order\CollectionFactory $collectionFactory
- * @param \Magento\Adminhtml\Helper\Data $adminhtmlData
+ * @param \Magento\Backend\Helper\Data $adminhtmlData
*/
public function __construct(
\Magento\Sales\Model\Resource\Order\CollectionFactory $collectionFactory,
- \Magento\Adminhtml\Helper\Data $adminhtmlData
+ \Magento\Backend\Helper\Data $adminhtmlData
) {
$this->_collectionFactory = $collectionFactory;
$this->_adminhtmlData = $adminhtmlData;
@@ -62,7 +62,7 @@ class Order extends \Magento\Object
/**
* Load search results
*
- * @return \Magento\Adminhtml\Model\Search\Order
+ * @return \Magento\Backend\Model\Search\Order
*/
public function load()
{
diff --git a/app/code/Magento/Backend/Model/Session.php b/app/code/Magento/Backend/Model/Session.php
index 7ad14728988..b5e2226d744 100644
--- a/app/code/Magento/Backend/Model/Session.php
+++ b/app/code/Magento/Backend/Model/Session.php
@@ -36,4 +36,25 @@ class Session extends \Magento\Core\Model\Session\AbstractSession
parent::__construct($context, $data);
$this->init('adminhtml');
}
+
+ /**
+ * Skip path validation in backend area
+ *
+ * @param string $path
+ * @return bool
+ */
+ public function isValidForPath($path)
+ {
+ return true;
+ }
+
+ /**
+ * Always try to get session id from query in backend area
+ *
+ * @return bool
+ */
+ protected function _isSidUsedFromQueryParam()
+ {
+ return true;
+ }
}
diff --git a/app/code/Magento/Adminhtml/Block/Html/Select.php b/app/code/Magento/Backend/Model/Translate/Inline.php
similarity index 70%
rename from app/code/Magento/Adminhtml/Block/Html/Select.php
rename to app/code/Magento/Backend/Model/Translate/Inline.php
index ace82771088..676b8854d14 100644
--- a/app/code/Magento/Adminhtml/Block/Html/Select.php
+++ b/app/code/Magento/Backend/Model/Translate/Inline.php
@@ -19,20 +19,25 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Backend
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml HTML select element block
- *
- * @category Magento
- * @package Magento_Core
- * @author Magento Core Team <core@magentocommerce.com>
+ * Inline Translations PHP part
*/
-namespace Magento\Adminhtml\Block\Html;
+namespace Magento\Backend\Model\Translate;
-class Select extends \Magento\View\Block\Html\Select
+class Inline extends \Magento\Core\Model\Translate\Inline
{
+ /**
+ * Return URL for ajax requests
+ *
+ * @return string
+ */
+ protected function _getAjaxUrl()
+ {
+ return $this->_url->getUrl(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE . '/ajax/translate');
+ }
}
diff --git a/app/code/Magento/Backend/Model/Translate/Inline/Config.php b/app/code/Magento/Backend/Model/Translate/Inline/Config.php
new file mode 100644
index 00000000000..5a0ce2acee0
--- /dev/null
+++ b/app/code/Magento/Backend/Model/Translate/Inline/Config.php
@@ -0,0 +1,57 @@
+<?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_Backend
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+/**
+ * Backend Inline Translation config
+ */
+namespace Magento\Backend\Model\Translate\Inline;
+
+class Config implements \Magento\Core\Model\Translate\Inline\ConfigInterface
+{
+ /**
+ * @var \Magento\Backend\App\ConfigInterface
+ */
+ protected $_config;
+
+ /**
+ * @param \Magento\Backend\App\ConfigInterface $config
+ */
+ public function __construct(\Magento\Backend\App\ConfigInterface $config)
+ {
+ $this->_config = $config;
+ }
+
+ /**
+ * Check whether inline translation is enabled
+ *
+ * @param int|null $store
+ * @return bool
+ */
+ public function isActive($store = null)
+ {
+ return $this->_config->getFlag('dev/translate_inline/active_admin');
+ }
+}
diff --git a/app/code/Magento/Backend/Model/Translate/Inline/ConfigFactory.php b/app/code/Magento/Backend/Model/Translate/Inline/ConfigFactory.php
new file mode 100644
index 00000000000..ac9b647c741
--- /dev/null
+++ b/app/code/Magento/Backend/Model/Translate/Inline/ConfigFactory.php
@@ -0,0 +1,66 @@
+<?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_Backend
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+/**
+ * Backend Inline Translation config factory
+ */
+namespace Magento\Backend\Model\Translate\Inline;
+
+class ConfigFactory extends \Magento\Core\Model\Translate\Inline\ConfigFactory
+{
+ /**
+ * @var \Magento\App\State
+ */
+ protected $_appState;
+
+ /**
+ * @param \Magento\ObjectManager $objectManager
+ * @param \Magento\App\State $appState
+ */
+ public function __construct(\Magento\ObjectManager $objectManager, \Magento\App\State $appState)
+ {
+ $this->_appState = $appState;
+ parent::__construct($objectManager);
+ }
+
+ /**
+ * Create instance of inline translate config
+ *
+ * @param string|null $area
+ * @return \Magento\Core\Model\Translate\Inline\ConfigInterface
+ */
+ public function create($area = null)
+ {
+ if (!isset($area)) {
+ $area = $this->_appState->getAreaCode();
+ }
+ if ($area == \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE) {
+ return $this->_objectManager->create('Magento\Backend\Model\Translate\Inline\Config');
+ }
+
+ return parent::create();
+ }
+}
diff --git a/app/code/Magento/Backend/Model/Url.php b/app/code/Magento/Backend/Model/Url.php
index 240914ab0d2..fbc1d4e4260 100644
--- a/app/code/Magento/Backend/Model/Url.php
+++ b/app/code/Magento/Backend/Model/Url.php
@@ -91,6 +91,21 @@ class Url extends \Magento\Core\Model\Url
*/
protected $_encryptor;
+ /**
+ * @var \Magento\Backend\App\ConfigInterface
+ */
+ protected $_config;
+
+ /**
+ * @var \Magento\Core\Model\StoreFactory
+ */
+ protected $_storeFactory;
+
+ /**
+ * @var \Magento\Core\Model\ConfigInterface
+ */
+ protected $_coreConfig;
+
/**
* @param \Magento\App\Route\ConfigInterface $routeConfig
* @param \Magento\App\RequestInterface $request
@@ -104,6 +119,9 @@ class Url extends \Magento\Core\Model\Url
* @param \Magento\App\CacheInterface $cache
* @param Auth\Session $authSession
* @param \Magento\Encryption\EncryptorInterface $encryptor
+ * @param \Magento\Backend\App\ConfigInterface $config
+ * @param \Magento\Core\Model\StoreFactory $storeFactory
+ * @param \Magento\Core\Model\ConfigInterface $coreConfig
* @param null $areaCode
* @param array $data
*/
@@ -120,6 +138,9 @@ class Url extends \Magento\Core\Model\Url
\Magento\App\CacheInterface $cache,
\Magento\Backend\Model\Auth\Session $authSession,
\Magento\Encryption\EncryptorInterface $encryptor,
+ \Magento\Backend\App\ConfigInterface $config,
+ \Magento\Core\Model\StoreFactory $storeFactory,
+ \Magento\Core\Model\ConfigInterface $coreConfig,
$areaCode = null,
array $data = array()
) {
@@ -128,12 +149,15 @@ class Url extends \Magento\Core\Model\Url
$routeConfig, $request, $urlSecurityInfo, $coreStoreConfig,
$app, $storeManager, $session, $areaCode, $data
);
+ $this->_config = $config;
$this->_startupMenuItemId = $coreStoreConfig->getConfig(self::XML_PATH_STARTUP_MENU_ITEM);
$this->_backendHelper = $backendHelper;
$this->_coreSession = $session;
$this->_menuConfig = $menuConfig;
$this->_cache = $cache;
$this->_session = $authSession;
+ $this->_storeFactory = $storeFactory;
+ $this->_coreConfig = $coreConfig;
}
/**
@@ -146,7 +170,7 @@ class Url extends \Magento\Core\Model\Url
if ($this->hasData('secure_is_forced')) {
return $this->getData('secure');
}
- return $this->_coreStoreConfig->getConfigFlag('web/secure/use_in_adminhtml');
+ return $this->_config->getFlag('web/secure/use_in_adminhtml');
}
/**
@@ -164,6 +188,7 @@ class Url extends \Magento\Core\Model\Url
} else {
$this->setNoSecret(false);
}
+ unset($data['_store_to_url']);
return parent::setRouteParams($data, $unsetOldParams);
}
@@ -250,7 +275,7 @@ class Url extends \Magento\Core\Model\Url
*/
public function useSecretKey()
{
- return $this->_coreStoreConfig->getConfigFlag('admin/security/use_form_key') && !$this->getNoSecret();
+ return $this->_config->getFlag('admin/security/use_form_key') && !$this->getNoSecret();
}
/**
@@ -386,4 +411,41 @@ class Url extends \Magento\Core\Model\Url
}
return $path;
}
+
+ /**
+ * Get fake store for the url instance
+ *
+ * @return \Magento\Core\Model\Store
+ */
+ public function getStore()
+ {
+ return $this->_storeFactory->create(array('url' => $this, 'data' => array(
+ 'code' => 'admin',
+ 'force_disable_rewrites' => true,
+ 'disable_store_in_url' => true
+ )));
+ }
+
+ /**
+ * Get cache id for config path
+ *
+ * @param string $path
+ * @return string
+ */
+ protected function _getConfigCacheId($path)
+ {
+ return 'admin/' . $path;
+ }
+
+ /**
+ * Get config data by path
+ * Use only global config values for backend
+ *
+ * @param string $path
+ * @return null|string
+ */
+ protected function _getConfig($path)
+ {
+ return $this->_coreConfig->getValue($path, 'default');
+ }
}
diff --git a/app/code/Magento/Adminhtml/etc/adminhtml/acl.xml b/app/code/Magento/Backend/etc/adminhtml/acl.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/etc/adminhtml/acl.xml
rename to app/code/Magento/Backend/etc/adminhtml/acl.xml
diff --git a/app/code/Magento/Backend/etc/adminhtml/di.xml b/app/code/Magento/Backend/etc/adminhtml/di.xml
index 57d29fca271..81f6c2eeb0b 100644
--- a/app/code/Magento/Backend/etc/adminhtml/di.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/di.xml
@@ -34,8 +34,19 @@
<preference for="Magento\Backend\Model\Config\Backend\File\RequestData\RequestDataInterface" type="Magento\Backend\Model\Config\Backend\File\RequestData" />
<preference for="Magento\Acl\Resource\ProviderInterface" type="Magento\Acl\Resource\Provider" />
<preference for="Magento\App\DefaultPathInterface" type="Magento\Backend\App\DefaultPath" />
+ <preference for="Magento\Backend\App\ConfigInterface" type="Magento\Backend\App\Config" />
+ <preference for="Magento\Core\Model\Translate\Inline\ConfigFactory" type="Magento\Backend\Model\Translate\Inline\ConfigFactory" />
+ <preference for="Magento\Core\Model\Translate\InlineInterface" type="Magento\Backend\Model\Translate\Inline" />
+ <preference for="Magento\Core\Model\Cookie" type="Magento\Backend\Model\Cookie" />
+ <preference for="Magento\Core\Model\Resource\Translate\String" type="Magento\Backend\Model\Resource\Translate\String" />
+ <preference for="Magento\Core\Model\Resource\Translate" type="Magento\Backend\Model\Resource\Translate" />
<preference for="Magento\App\Response\Http\FileFactory" type="Magento\Backend\App\Response\Http\FileFactory" />
<preference for="Magento\App\View" type="Magento\Backend\Model\View" />
+ <type name="Magento\Backend\Model\Translate\Inline">
+ <param name="url">
+ <instance type="Magento\Backend\Model\Url" />
+ </param>
+ </type>
<type name="Magento\Backend\App\Action\Context">
<param name="helper">
<instance type="Magento\Backend\Helper\Data" />
@@ -138,7 +149,6 @@
</type>
<type name="Magento\Backend\App\AbstractAction">
<plugin name="adminAuthentication" type="Magento\Backend\App\Action\Plugin\Authentication" sortOrder="100" />
- <plugin name="adminStore" type="Magento\Backend\App\Action\Plugin\Store" sortOrder="10" />
<plugin name="adminMassactionKey" type="Magento\Backend\App\Action\Plugin\MassactionKey" sortOrder="11" />
</type>
<type name="Magento\Core\App\Response\Redirect">
@@ -146,4 +156,7 @@
<value type="bool">false</value>
</param>
</type>
+ <type name="Magento\App\Action\Action">
+ <plugin name="storeCheck" disabled="true" />
+ </type>
</config>
diff --git a/app/code/Magento/Backend/etc/adminhtml/events.xml b/app/code/Magento/Backend/etc/adminhtml/events.xml
index 422fd261526..6a27a509bd0 100644
--- a/app/code/Magento/Backend/etc/adminhtml/events.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/events.xml
@@ -27,4 +27,7 @@
<event name="translate_initialization_before">
<observer name="initialize_translation" instance="Magento\Backend\Model\Observer" method="initializeTranslation" />
</event>
+ <event name="admin_system_config_changed_section_admin">
+ <observer name="bind_locale" instance="Magento\Backend\Model\Config\Backend\Admin\Observer" method="afterCustomUrlChanged" />
+ </event>
</config>
diff --git a/app/code/Magento/Backend/etc/adminhtml/menu.xml b/app/code/Magento/Backend/etc/adminhtml/menu.xml
index b054038fd6c..ab157e5e4ab 100644
--- a/app/code/Magento/Backend/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/menu.xml
@@ -32,5 +32,22 @@
<add id="Magento_Adminhtml::system_variable" title="Custom Variables" module="Magento_Adminhtml" sortOrder="20" parent="Magento_Adminhtml::system_other_settings" action="adminhtml/system_variable" resource="Magento_Adminhtml::variable"/>
<add id="Magento_Adminhtml::system_store" title="All Stores" module="Magento_Core" sortOrder="10" parent="Magento_Adminhtml::stores_settings" action="adminhtml/system_store/" resource="Magento_Adminhtml::store"/>
<add id="Magento_Adminhtml::system_config" title="Configuration" module="Magento_Adminhtml" sortOrder="20" parent="Magento_Adminhtml::stores_settings" action="adminhtml/system_config" resource="Magento_Adminhtml::config"/>
+ <add id="Magento_Adminhtml::dashboard" title="Dashboard" module="Magento_Adminhtml" sortOrder="10" action="adminhtml/dashboard" resource="Magento_Adminhtml::dashboard"/>
+ <add id="Magento_Adminhtml::system" title="System" module="Magento_Adminhtml" sortOrder="80" resource="Magento_Adminhtml::system"/>
+ <add id="Magento_Adminhtml::system_tools" title="Tools" module="Magento_Adminhtml" sortOrder="50" parent="Magento_Adminhtml::system" resource="Magento_Adminhtml::tools"/>
+ <add id="Magento_Adminhtml::system_design" title="Design" module="Magento_Adminhtml" sortOrder="20" parent="Magento_Adminhtml::content" resource="Magento_Adminhtml::design"/>
+ <add id="Magento_Adminhtml::system_convert" title="Data Transfer" module="Magento_Adminhtml" sortOrder="10" parent="Magento_Adminhtml::system" resource="Magento_Adminhtml::convert"/>
+ <add id="Magento_Adminhtml::system_cache" title="Cache Management" module="Magento_Adminhtml" sortOrder="10" parent="Magento_Adminhtml::system_tools" action="adminhtml/cache" resource="Magento_Adminhtml::cache"/>
+ <add id="Magento_Adminhtml::marketing" title="Marketing" module="Magento_Adminhtml" sortOrder="40" resource="Magento_Adminhtml::marketing"/>
+ <add id="Magento_Adminhtml::marketing_communications" title="Communications" module="Magento_Adminhtml" sortOrder="30" parent="Magento_Adminhtml::marketing" resource="Magento_Adminhtml::marketing_communications"/>
+ <add id="Magento_Adminhtml::marketing_seo" title="SEO & Search" module="Magento_Adminhtml" sortOrder="40" parent="Magento_Adminhtml::marketing" resource="Magento_Adminhtml::marketing_seo"/>
+ <add id="Magento_Adminhtml::marketing_user_content" title="User Content" module="Magento_Adminhtml" sortOrder="50" parent="Magento_Adminhtml::marketing" resource="Magento_Adminhtml::marketing_user_content"/>
+ <add id="Magento_Adminhtml::content" title="Content" module="Magento_Adminhtml" sortOrder="50" resource="Magento_Adminhtml::content"/>
+ <add id="Magento_Adminhtml::content_elements" title="Elements" module="Magento_Adminhtml" sortOrder="10" parent="Magento_Adminhtml::content" resource="Magento_Adminhtml::content_elements"/>
+ <add id="Magento_Adminhtml::stores" title="Stores" module="Magento_Adminhtml" sortOrder="70" resource="Magento_Adminhtml::stores"/>
+ <add id="Magento_Adminhtml::stores_settings" title="Settings" module="Magento_Adminhtml" sortOrder="10" parent="Magento_Adminhtml::stores" resource="Magento_Adminhtml::stores_settings"/>
+ <add id="Magento_Adminhtml::stores_attributes" title="Attributes" module="Magento_Adminhtml" sortOrder="40" parent="Magento_Adminhtml::stores" resource="Magento_Adminhtml::stores_attributes"/>
+ <add id="Magento_Adminhtml::other_settings" title="Other Settings" module="Magento_Adminhtml" sortOrder="50" parent="Magento_Adminhtml::stores" resource="Magento_Adminhtml::stores_other_settings"/>
+ <add id="Magento_Adminhtml::system_other_settings" title="Other Settings" module="Magento_Adminhtml" sortOrder="80" parent="Magento_Adminhtml::system" resource="Magento_Adminhtml::system_other_settings"/>
</menu>
</config>
diff --git a/app/code/Magento/Backend/etc/config.xml b/app/code/Magento/Backend/etc/config.xml
index 1d3d42f1288..9c6dca8ddf0 100644
--- a/app/code/Magento/Backend/etc/config.xml
+++ b/app/code/Magento/Backend/etc/config.xml
@@ -26,4 +26,62 @@
*/
-->
<config>
+ <default>
+ <system>
+ <media_storage_configuration>
+ <allowed_resources>
+ <email_folder>email</email_folder>
+ </allowed_resources>
+ </media_storage_configuration>
+ <emails>
+ <forgot_email_template>system_emails_forgot_email_template</forgot_email_template>
+ <forgot_email_identity>general</forgot_email_identity>
+ </emails>
+ <dashboard>
+ <enable_charts>1</enable_charts>
+ </dashboard>
+ </system>
+ <general>
+ <file>
+ <sitemap_generate_valid_paths>
+ <available>
+ <any_path>/*/sitemap.xml</any_path>
+ </available>
+ </sitemap_generate_valid_paths>
+ </file>
+ <validator_data>
+ <input_types>
+ <price>price</price>
+ <media_image>media_image</media_image>
+ <gallery>gallery</gallery>
+ </input_types>
+ </validator_data>
+ </general>
+ </default>
+ <stores>
+ <admin>
+ <design>
+ <package>
+ <name>default</name>
+ </package>
+ <theme>
+ <default>default</default>
+ </theme>
+ </design>
+ </admin>
+ </stores>
+ <websites>
+ <admin>
+ <web>
+ <routers>
+ <frontend>
+ <disabled>true</disabled>
+ </frontend>
+ </routers>
+ <default>
+ <no_route>admin/noroute/index</no_route>
+ </default>
+ </web>
+ </admin>
+ </websites>
</config>
diff --git a/app/code/Magento/Backend/etc/di.xml b/app/code/Magento/Backend/etc/di.xml
index 25a442ebb20..7c9e596e484 100644
--- a/app/code/Magento/Backend/etc/di.xml
+++ b/app/code/Magento/Backend/etc/di.xml
@@ -26,6 +26,11 @@
<config>
<preference for="Magento\Core\Model\Config\Storage\WriterInterface" type="Magento\Core\Model\Config\Storage\Writer\Db" />
<preference for="Magento\App\Request\PathInfoProcessorInterface" type="Magento\Backend\App\Request\PathInfoProcessor" />
+ <preference for="Magento\Backend\Model\Auth\StorageInterface" type="Magento\Backend\Model\Auth\Session" />
+ <preference for="Magento\Backend\Model\Config\Structure\SearchInterface" type="Magento\Backend\Model\Config\Structure" />
+ <preference for="Magento\Backend\Model\Config\Backend\File\RequestData\RequestDataInterface" type="Magento\Backend\Model\Config\Backend\File\RequestData" />
+ <preference for="Magento\Backend\Model\Auth\Credential\StorageInterface" type="Magento\User\Model\User" />
+ <preference for="Magento\Adminhtml\Helper\Data" type="Magento\Backend\Helper\Data" />
<type name="Magento\App\AreaList">
<param name="areas">
<value>
@@ -99,15 +104,15 @@
<param name="searchModules">
<value>
<products>
- <class>Magento\Adminhtml\Model\Search\Catalog</class>
+ <class>Magento\Backend\Model\Search\Catalog</class>
<acl>Magento_Catalog::catalog</acl>
</products>
<customers>
- <class>Magento\Adminhtml\Model\Search\Customer</class>
+ <class>Magento\Backend\Model\Search\Customer</class>
<acl>Magento_Customer::customer</acl>
</customers>
<sales>
- <class>Magento\Adminhtml\Model\Search\Order</class>
+ <class>Magento\Backend\Model\Search\Order</class>
<acl>Magento_Sales::sales</acl>
</sales>
</value>
diff --git a/app/code/Magento/Adminhtml/etc/events.xml b/app/code/Magento/Backend/etc/events.xml
similarity index 78%
rename from app/code/Magento/Adminhtml/etc/events.xml
rename to app/code/Magento/Backend/etc/events.xml
index 166dcf93fad..7801b1ac8f4 100644
--- a/app/code/Magento/Adminhtml/etc/events.xml
+++ b/app/code/Magento/Backend/etc/events.xml
@@ -24,7 +24,10 @@
*/
-->
<config>
+ <event name="adminhtml_controller_action_predispatch_start">
+ <observer name="massaction" instance="Magento\Backend\Model\Observer" method="massactionPrepareKey" />
+ </event>
<event name="admin_user_authenticate_after">
- <observer name="configuration_files_access_level_verification" instance="Magento\Adminhtml\Model\Observer" method="clearCacheConfigurationFilesAccessLevelVerification" />
+ <observer name="configuration_files_access_level_verification" instance="Magento\Backend\Model\Observer" method="clearCacheConfigurationFilesAccessLevelVerification" />
</event>
</config>
diff --git a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/review_product_list.xml b/app/code/Magento/Backend/etc/install/di.xml
similarity index 89%
rename from app/design/frontend/magento_backup/Magento_Paypal/layout/override/review_product_list.xml
rename to app/code/Magento/Backend/etc/install/di.xml
index aa84f501748..c538e5dbf4a 100644
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/review_product_list.xml
+++ b/app/code/Magento/Backend/etc/install/di.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">
- <update handle="SHORTCUT_popup"/>
-</layout>
+<config>
+ <preference for="Magento\Backend\App\ConfigInterface" type="Magento\Backend\App\Config" />
+</config>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/admin/access_denied.phtml b/app/code/Magento/Backend/view/adminhtml/admin/access_denied.phtml
similarity index 97%
rename from app/code/Magento/Adminhtml/view/adminhtml/admin/access_denied.phtml
rename to app/code/Magento/Backend/view/adminhtml/admin/access_denied.phtml
index fbe31b924ae..4e3fd4f1a28 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/admin/access_denied.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/admin/access_denied.phtml
@@ -26,7 +26,7 @@
?>
<?php
/**
- * @see \Magento\Adminhtml\Block\Denied
+ * @see \Magento\Backend\Block\Denied
*/
?>
<h1 class="page-heading"><?php echo __('Access denied') ?></h1>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/admin/formkey.phtml b/app/code/Magento/Backend/view/adminhtml/admin/formkey.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/admin/formkey.phtml
rename to app/code/Magento/Backend/view/adminhtml/admin/formkey.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/admin/overlay_popup.phtml b/app/code/Magento/Backend/view/adminhtml/admin/overlay_popup.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/admin/overlay_popup.phtml
rename to app/code/Magento/Backend/view/adminhtml/admin/overlay_popup.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/admin/page.phtml b/app/code/Magento/Backend/view/adminhtml/admin/page.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/admin/page.phtml
rename to app/code/Magento/Backend/view/adminhtml/admin/page.phtml
index 1bbac582143..a569ffcd121 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/admin/page.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/admin/page.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\Page */ ?>
+<?php /** @var $this \Magento\Backend\Block\Page */ ?>
<!doctype html>
<html lang="<?php echo $this->getLang() ?>" class="no-js">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/admin/popup.phtml b/app/code/Magento/Backend/view/adminhtml/admin/popup.phtml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/admin/popup.phtml
rename to app/code/Magento/Backend/view/adminhtml/admin/popup.phtml
index 81d21c9c0da..a56227e8af3 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/admin/popup.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/admin/popup.phtml
@@ -28,12 +28,12 @@
"label":"Root page layout",
"type":"Magento\View\Block\Template",
"children":{
- "header":{ "label":"Header", "type":"Magento\Adminhtml\Block\Page\Header" },
+ "header":{ "label":"Header", "type":"Magento\Backend\Block\Page\Header" },
"menu":{ "label":"Top navigation", "type":"Magento\Backend\Block\Menu" },
"breadcrumbs":{ "label":"Breadcrumbs", "type":"Magento\Adminhtml\Block\Widget\Breadcrumbs" },
"content":{ "label":"Content block", "type":"Magento\View\Block\Template" },
"left":{ "label":"Left navigation", "type":"Magento\View\Block\Template" },
- "footer":{ "label":"Footer", "type":"Magento\Adminhtml\Block\Page\Footer" }
+ "footer":{ "label":"Footer", "type":"Magento\Backend\Block\Page\Footer" }
},
"vars":{}
}*/ ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml
index eaa1fda5499..d95e6f7508a 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_index.xml
@@ -27,7 +27,7 @@
<update handle="formkey"/>
<update handle="adminhtml_cache_block"/>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Cache" name="adminhtml.cache.container"/>
- <block class="Magento\Adminhtml\Block\Cache\Additional" name="cache.additional" template="Magento_Backend::system/cache/additional.phtml"/>
+ <block class="Magento\Backend\Block\Cache" name="adminhtml.cache.container"/>
+ <block class="Magento\Backend\Block\Cache\Additional" name="cache.additional" template="Magento_Backend::system/cache/additional.phtml"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_denied.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_denied.xml
similarity index 90%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_denied.xml
rename to app/code/Magento/Backend/view/adminhtml/layout/adminhtml_denied.xml
index fe0193a833f..27ad2c91e21 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_denied.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_denied.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Denied" name="content.denied" template="admin/access_denied.phtml"/>
+ <block class="Magento\Backend\Block\Denied" name="content.denied" template="admin/access_denied.phtml"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_noroute.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_noroute.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_noroute.xml
rename to app/code/Magento/Backend/view/adminhtml/layout/adminhtml_noroute.xml
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
index 57203cd5106..8093941b8ac 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/default.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
@@ -24,7 +24,279 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="root">
+ <block class="Magento\Backend\Block\Page" name="root" output="1" template="admin/page.phtml">
+ <block class="Magento\Backend\Block\Page\Head" name="head" as="head" template="page/head.phtml">
+ <action method="setTitle">
+ <argument translate="true" name="title" xsi:type="string">Magento Admin</argument>
+ </action>
+ <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="magento-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="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="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="underscore-js">
+ <arguments>
+ <argument name="file" xsi:type="string">underscore.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-magento-js">
+ <arguments>
+ <argument name="file" xsi:type="string">mage/mage.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="jquery-jquery-validate-js">
+ <arguments>
+ <argument name="file" xsi:type="string">jquery/jquery.validate.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="jquery-jquery-hoverintent-js">
+ <arguments>
+ <argument name="file" xsi:type="string">jquery/jquery.hoverIntent.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-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-backend-bootstrap-js">
+ <arguments>
+ <argument name="file" xsi:type="string">mage/backend/bootstrap.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-backend-floating-header-js">
+ <arguments>
+ <argument name="file" xsi:type="string">mage/backend/floating-header.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="prototype-prototype-js">
+ <arguments>
+ <argument name="file" xsi:type="string">prototype/prototype.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="prototype-window-js">
+ <arguments>
+ <argument name="file" xsi:type="string">prototype/window.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-builder-js">
+ <arguments>
+ <argument name="file" xsi:type="string">scriptaculous/builder.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-effects-js">
+ <arguments>
+ <argument name="file" xsi:type="string">scriptaculous/effects.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-dragdrop-js">
+ <arguments>
+ <argument name="file" xsi:type="string">scriptaculous/dragdrop.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-controls-js">
+ <arguments>
+ <argument name="file" xsi:type="string">scriptaculous/controls.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-slider-js">
+ <arguments>
+ <argument name="file" xsi:type="string">scriptaculous/slider.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="lib-ccard-js">
+ <arguments>
+ <argument name="file" xsi:type="string">lib/ccard.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="prototype-validation-js">
+ <arguments>
+ <argument name="file" xsi:type="string">prototype/validation.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="varien-js-js">
+ <arguments>
+ <argument name="file" xsi:type="string">varien/js.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-hash-js">
+ <arguments>
+ <argument name="file" xsi:type="string">mage/adminhtml/hash.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-events-js">
+ <arguments>
+ <argument name="file" xsi:type="string">mage/adminhtml/events.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-varienloader-js">
+ <arguments>
+ <argument name="file" xsi:type="string">mage/adminhtml/varienLoader.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-grid-js">
+ <arguments>
+ <argument name="file" xsi:type="string">mage/adminhtml/grid.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-backend-tabs-js">
+ <arguments>
+ <argument name="file" xsi:type="string">mage/backend/tabs.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-form-js">
+ <arguments>
+ <argument name="file" xsi:type="string">mage/adminhtml/form.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-accordion-js">
+ <arguments>
+ <argument name="file" xsi:type="string">mage/adminhtml/accordion.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-tools-js">
+ <arguments>
+ <argument name="file" xsi:type="string">mage/adminhtml/tools.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-catalog-product-js">
+ <arguments>
+ <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">
+ <arguments>
+ <argument name="file" xsi:type="string">lib/ds-sleight.js</argument>
+ <argument name="properties" xsi:type="array">
+ <item name="attributes" xsi:type="string">defer</item>
+ <item name="ie_condition" xsi:type="string">lt IE 7</item>
+ </argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Css" name="magento-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-ui-timepicker-addon-js">
+ <arguments>
+ <argument name="file" xsi:type="string">jquery/jquery-ui-timepicker-addon.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-calendar-js">
+ <arguments>
+ <argument name="file" xsi:type="string">mage/calendar.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="extjs-ext-tree-js">
+ <arguments>
+ <argument name="file" xsi:type="string">extjs/ext-tree.js</argument>
+ <argument name="properties" xsi:type="array">
+ <item name="attributes" xsi:type="string"/>
+ <item name="ie_condition" xsi:type="string"/>
+ <item name="flag_name" xsi:type="string">can_load_ext_js</item>
+ </argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="extjs-ext-tree-checkbox-js">
+ <arguments>
+ <argument name="file" xsi:type="string">extjs/ext-tree-checkbox.js</argument>
+ <argument name="properties" xsi:type="array">
+ <item name="attributes" xsi:type="string"/>
+ <item name="ie_condition" xsi:type="string"/>
+ <item name="flag_name" xsi:type="string">can_load_ext_js</item>
+ </argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Css" name="extjs-resources-css-ext-all-css">
+ <arguments>
+ <argument name="file" xsi:type="string">extjs/resources/css/ext-all.css</argument>
+ <argument name="properties" xsi:type="array">
+ <item name="attributes" xsi:type="string"/>
+ <item name="ie_condition" xsi:type="string"/>
+ <item name="flag_name" xsi:type="string">can_load_ext_js</item>
+ </argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Css" name="extjs-resources-css-ytheme-magento-css">
+ <arguments>
+ <argument name="file" xsi:type="string">extjs/resources/css/ytheme-magento.css</argument>
+ <argument name="properties" xsi:type="array">
+ <item name="attributes" xsi:type="string"/>
+ <item name="ie_condition" xsi:type="string"/>
+ <item name="flag_name" xsi:type="string">can_load_ext_js</item>
+ </argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-promo-rules-js">
+ <arguments>
+ <argument name="file" xsi:type="string">Magento_Rule::rules.js</argument>
+ <argument name="properties" xsi:type="array">
+ <item name="attributes" xsi:type="string"/>
+ <item name="ie_condition" xsi:type="string"/>
+ <item name="flag_name" xsi:type="string">can_load_rules_js</item>
+ </argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-adminhtml-wysiwyg-tiny-mce-setup-js">
+ <arguments>
+ <argument name="file" xsi:type="string">mage/adminhtml/wysiwyg/tiny_mce/setup.js</argument>
+ <argument name="properties" xsi:type="array">
+ <item name="attributes" xsi:type="string"/>
+ <item name="ie_condition" xsi:type="string"/>
+ <item name="flag_name" xsi:type="string">can_load_tiny_mce</item>
+ </argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Js\Components" name="head.components" as="components" template="Magento_Backend::page/js/components.phtml"/>
+ <block class="Magento\View\Block\Html\Calendar" name="head.calendar" as="calendar" template="Magento_Backend::page/js/calendar.phtml"/>
+ </block>
<block class="Magento\Backend\Block\Menu" name="menu" as="menu" template="Magento_Backend::menu.phtml"/>
- </referenceBlock>
-</layout>
+ <block class="Magento\Backend\Block\Page\Notices" name="global_notices" as="global_notices" template="page/notices.phtml"/>
+ <block class="Magento\Backend\Block\Page\Header" name="header" as="header">
+ <block class="Magento\Backend\Block\GlobalSearch" as="search" acl="Magento_Adminhtml::global_search"/>
+ </block>
+ <block class="Magento\Adminhtml\Block\Widget\Breadcrumbs" name="breadcrumbs" as="breadcrumbs"/>
+ <!--<update handle="formkey"/> this won't work, see the try/catch and a jammed exception in \Magento\Core\Model\Layout::createBlock() -->
+ <block class="Magento\Backend\Block\Admin\Formkey" name="formkey" as="formkey" template="Magento_Backend::admin/formkey.phtml"/>
+ <!-- deprecated since 1.7.0.0 see \Magento\Page\Block\Js\Translate -->
+ <block class="Magento\Page\Block\Js\Translate" name="js_translate" as="js_translate" template="Magento_Backend::page/js/translate.phtml"/>
+ <container name="main-top" label="main-top" as="main-top">
+ <block class="Magento\Page\Block\Html\Title" name="page-title" template="title.phtml"/>
+ </container>
+ <container name="left" as="left" label="Left Column"/>
+ <container name="content" as="content" label="Content"/>
+ <block class="Magento\View\Block\Messages" name="messages" as="messages"/>
+ <container name="js" as="js" label="JavaScript"/>
+ <block class="Magento\Backend\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>
+ </block>
+ <container name="before_body_end" as="before_body_end" label="Before Body End"/>
+ </block>
+</layout>
\ No newline at end of file
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/editor.xml b/app/code/Magento/Backend/view/adminhtml/layout/editor.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/editor.xml
rename to app/code/Magento/Backend/view/adminhtml/layout/editor.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/empty.xml b/app/code/Magento/Backend/view/adminhtml/layout/empty.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/empty.xml
rename to app/code/Magento/Backend/view/adminhtml/layout/empty.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/formkey.xml b/app/code/Magento/Backend/view/adminhtml/layout/formkey.xml
similarity index 88%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/formkey.xml
rename to app/code/Magento/Backend/view/adminhtml/layout/formkey.xml
index 21f69e5b0b2..822e3cbc607 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/formkey.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/formkey.xml
@@ -24,5 +24,5 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <block class="Magento\Adminhtml\Block\Admin\Formkey" name="formkey" as="formkey" template="Magento_Adminhtml::admin/formkey.phtml"/>
+ <block class="Magento\Backend\Block\Admin\Formkey" name="formkey" as="formkey" template="Magento_Backend::admin/formkey.phtml"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/overlay_popup.xml b/app/code/Magento/Backend/view/adminhtml/layout/overlay_popup.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/overlay_popup.xml
rename to app/code/Magento/Backend/view/adminhtml/layout/overlay_popup.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/popup.xml b/app/code/Magento/Backend/view/adminhtml/layout/popup.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/popup.xml
rename to app/code/Magento/Backend/view/adminhtml/layout/popup.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/media/uploader.phtml b/app/code/Magento/Backend/view/adminhtml/media/uploader.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/media/uploader.phtml
rename to app/code/Magento/Backend/view/adminhtml/media/uploader.phtml
index 5c230a74e1c..96bb4092f48 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/media/uploader.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/media/uploader.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\Media\Uploader */
+/** @var $this \Magento\Backend\Block\Media\Uploader */
?>
<div id="<?php echo $this->getHtmlId() ?>" class="uploader">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/page/footer.phtml b/app/code/Magento/Backend/view/adminhtml/page/footer.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/page/footer.phtml
rename to app/code/Magento/Backend/view/adminhtml/page/footer.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/page/head.phtml b/app/code/Magento/Backend/view/adminhtml/page/head.phtml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/page/head.phtml
rename to app/code/Magento/Backend/view/adminhtml/page/head.phtml
index f630c4acbe0..ca3282a197b 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/page/head.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/page/head.phtml
@@ -54,7 +54,7 @@
<?php endif; ?>
<script type="text/javascript">
- Fieldset.addToPrefix(<?php echo $this->helper('Magento\Adminhtml\Helper\Data')->getCurrentUserId() ?>);
+ Fieldset.addToPrefix(<?php echo $this->helper('Magento\Backend\Helper\Data')->getCurrentUserId() ?>);
</script>
<?php echo $this->getChildHtml('components'); ?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/page/header.phtml b/app/code/Magento/Backend/view/adminhtml/page/header.phtml
similarity index 97%
rename from app/code/Magento/Adminhtml/view/adminhtml/page/header.phtml
rename to app/code/Magento/Backend/view/adminhtml/page/header.phtml
index 2f772dbc983..e741934e8f3 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/page/header.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/page/header.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\Page\Header */
+/** @var $this \Magento\Backend\Block\Page\Header */
?>
<header class="header">
<div class="header-inner">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/page/js/calendar.phtml b/app/code/Magento/Backend/view/adminhtml/page/js/calendar.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/page/js/calendar.phtml
rename to app/code/Magento/Backend/view/adminhtml/page/js/calendar.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/page/js/components.phtml b/app/code/Magento/Backend/view/adminhtml/page/js/components.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/page/js/components.phtml
rename to app/code/Magento/Backend/view/adminhtml/page/js/components.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/page/js/translate.phtml b/app/code/Magento/Backend/view/adminhtml/page/js/translate.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/page/js/translate.phtml
rename to app/code/Magento/Backend/view/adminhtml/page/js/translate.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/page/notices.phtml b/app/code/Magento/Backend/view/adminhtml/page/notices.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/page/notices.phtml
rename to app/code/Magento/Backend/view/adminhtml/page/notices.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/page/system/config/robots/reset.phtml b/app/code/Magento/Backend/view/adminhtml/page/system/config/robots/reset.phtml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/page/system/config/robots/reset.phtml
rename to app/code/Magento/Backend/view/adminhtml/page/system/config/robots/reset.phtml
index f036235566d..872829ebd46 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/page/system/config/robots/reset.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/page/system/config/robots/reset.phtml
@@ -25,7 +25,7 @@
*/
/**
- * @var $this \Magento\Adminhtml\Block\Page\System\Config\Robots\Reset
+ * @var $this \Magento\Backend\Block\Page\System\Config\Robots\Reset
* @var $coreHelper \Magento\Core\Helper\Data
*/
$coreHelper = $this->helper('Magento\Core\Helper\Data');
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/store/switcher/enhanced.phtml b/app/code/Magento/Backend/view/adminhtml/store/switcher/enhanced.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/store/switcher/enhanced.phtml
rename to app/code/Magento/Backend/view/adminhtml/store/switcher/enhanced.phtml
diff --git a/app/code/Magento/Backend/view/adminhtml/system/shipping/ups.phtml b/app/code/Magento/Backend/view/adminhtml/system/shipping/ups.phtml
index f1137d7749e..cd4902b3da9 100644
--- a/app/code/Magento/Backend/view/adminhtml/system/shipping/ups.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/system/shipping/ups.phtml
@@ -30,7 +30,7 @@ $upsModel = $this->getShippingModel();
$orShipArr = $upsModel->getCode('originShipment');
$defShipArr = $upsModel->getCode('method');
-/** @var $this \Magento\Adminhtml\Block\Template */
+/** @var $this \Magento\Backend\Block\Template */
$sectionCode = $this->getRequest()->getParam('section');
$websiteCode = $this->getRequest()->getParam('website');
$storeCode = $this->getRequest()->getParam('store');
diff --git a/app/code/Magento/Adminhtml/Block/Backup.php b/app/code/Magento/Backup/Block/Adminhtml/Backup.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Backup.php
rename to app/code/Magento/Backup/Block/Adminhtml/Backup.php
index 87cec4f4a32..3657272cab5 100644
--- a/app/code/Magento/Adminhtml/Block/Backup.php
+++ b/app/code/Magento/Backup/Block/Adminhtml/Backup.php
@@ -31,37 +31,37 @@
* @package Magento_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block;
+namespace Magento\Backup\Block\Adminhtml;
-class Backup extends \Magento\Adminhtml\Block\Template
+class Backup extends \Magento\Backend\Block\Template
{
/**
* Block's template
*
* @var string
*/
- protected $_template = 'backup/list.phtml';
+ protected $_template = 'Magento_Backup::backup/list.phtml';
protected function _prepareLayout()
{
parent::_prepareLayout();
$this->addChild('createButton', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Database Backup'),
- 'onclick' => "return backup.backup('" . \Magento\Backup\Helper\Data::TYPE_DB . "')",
+ 'onclick' => "return backup.backup('" . \Magento\Backup\Factory::TYPE_DB . "')",
'class' => 'task'
));
$this->addChild('createSnapshotButton', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('System Backup'),
- 'onclick' => "return backup.backup('" . \Magento\Backup\Helper\Data::TYPE_SYSTEM_SNAPSHOT . "')",
+ 'onclick' => "return backup.backup('" . \Magento\Backup\Factory::TYPE_SYSTEM_SNAPSHOT . "')",
'class' => ''
));
$this->addChild('createMediaBackupButton', 'Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Database and Media Backup'),
- 'onclick' => "return backup.backup('" . \Magento\Backup\Helper\Data::TYPE_MEDIA . "')",
+ 'onclick' => "return backup.backup('" . \Magento\Backup\Factory::TYPE_MEDIA . "')",
'class' => ''
));
- $this->addChild('dialogs', 'Magento\Adminhtml\Block\Backup\Dialogs');
+ $this->addChild('dialogs', 'Magento\Backup\Block\Adminhtml\Dialogs');
}
public function getCreateButtonHtml()
diff --git a/app/code/Magento/Adminhtml/Block/Backup/Dialogs.php b/app/code/Magento/Backup/Block/Adminhtml/Dialogs.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Backup/Dialogs.php
rename to app/code/Magento/Backup/Block/Adminhtml/Dialogs.php
index fc3499afd78..577ff48d604 100644
--- a/app/code/Magento/Adminhtml/Block/Backup/Dialogs.php
+++ b/app/code/Magento/Backup/Block/Adminhtml/Dialogs.php
@@ -31,16 +31,16 @@
* @package Magento_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Backup;
+namespace Magento\Backup\Block\Adminhtml;
-class Dialogs extends \Magento\Adminhtml\Block\Template
+class Dialogs extends \Magento\Backend\Block\Template
{
/**
* Block's template
*
* @var string
*/
- protected $_template = 'backup/dialogs.phtml';
+ protected $_template = 'Magento_Backup::backup/dialogs.phtml';
/**
* Include backup.js file in page before rendering
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 bbfd4254c29..48045f99d94 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
@@ -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('adminhtml/*/download',
+ return '<a href="' . $this->getUrl('*/*/download',
array('time' => $row->getData('time'), 'type' => $row->getData('type'))) . '">' . $row->getData('extension')
. '</a> <small>(' . $url7zip . ')</small>';
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Backup.php b/app/code/Magento/Backup/Controller/Adminhtml/Index.php
similarity index 95%
rename from app/code/Magento/Backend/Controller/Adminhtml/System/Backup.php
rename to app/code/Magento/Backup/Controller/Adminhtml/Index.php
index 0bea7de8156..d5bd2bfdce2 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Backup.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index.php
@@ -31,9 +31,9 @@
* @package Magento_Backend
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Backend\Controller\Adminhtml\System;
+namespace Magento\Backup\Controller\Adminhtml;
-class Backup extends \Magento\Backend\App\Action
+class Index extends \Magento\Backend\App\Action
{
/**
* Core registry
@@ -108,7 +108,7 @@ class Backup extends \Magento\Backend\App\Action
public function createAction()
{
if (!$this->getRequest()->isAjax()) {
- return $this->getUrl('adminhtml/*/index');
+ return $this->getUrl('*/*/index');
}
$response = new \Magento\Object();
@@ -121,10 +121,10 @@ class Backup extends \Magento\Backend\App\Action
try {
$type = $this->getRequest()->getParam('type');
- if ($type == \Magento\Backup\Helper\Data::TYPE_SYSTEM_SNAPSHOT
+ if ($type == \Magento\Backup\Factory::TYPE_SYSTEM_SNAPSHOT
&& $this->getRequest()->getParam('exclude_media')
) {
- $type = \Magento\Backup\Helper\Data::TYPE_SNAPSHOT_WITHOUT_MEDIA;
+ $type = \Magento\Backup\Factory::TYPE_SNAPSHOT_WITHOUT_MEDIA;
}
$backupManager = $this->_backupFactory->create($type)
@@ -150,7 +150,7 @@ class Backup extends \Magento\Backend\App\Action
}
}
- if ($type != \Magento\Backup\Helper\Data::TYPE_DB) {
+ if ($type != \Magento\Backup\Factory::TYPE_DB) {
$backupManager->setRootDir($this->_objectManager->get('Magento\App\Dir')->getDir())
->addIgnorePaths($helper->getBackupIgnorePaths());
}
@@ -161,7 +161,7 @@ class Backup extends \Magento\Backend\App\Action
$this->_getSession()->addSuccess($successMessage);
- $response->setRedirectUrl($this->getUrl('adminhtml/*/index'));
+ $response->setRedirectUrl($this->getUrl('*/*/index'));
} catch (\Magento\Backup\Exception\NotEnoughFreeSpace $e) {
$errorMessage = __('You need more free space to create a backup.');
} catch (\Magento\Backup\Exception\NotEnoughPermissions $e) {
@@ -224,7 +224,7 @@ class Backup extends \Magento\Backend\App\Action
}
if (!$this->getRequest()->isAjax()) {
- return $this->getUrl('adminhtml/*/index');
+ return $this->getUrl('*/*/index');
}
$helper = $this->_objectManager->get('Magento\Backup\Helper\Data');
@@ -280,7 +280,7 @@ class Backup extends \Magento\Backend\App\Action
}
}
- if ($type != \Magento\Backup\Helper\Data::TYPE_DB) {
+ if ($type != \Magento\Backup\Factory::TYPE_DB) {
$backupManager->setRootDir($this->_objectManager->get('Magento\App\Dir')->getDir())
->addIgnorePaths($helper->getRollbackIgnorePaths());
diff --git a/app/code/Magento/Backup/Helper/Data.php b/app/code/Magento/Backup/Helper/Data.php
index 88f8134bf35..3c66947ae84 100644
--- a/app/code/Magento/Backup/Helper/Data.php
+++ b/app/code/Magento/Backup/Helper/Data.php
@@ -29,31 +29,6 @@ namespace Magento\Backup\Helper;
class Data extends \Magento\App\Helper\AbstractHelper
{
- /**
- * Backup type constant for database backup
- */
- const TYPE_DB = 'db';
-
- /**
- * Backup type constant for filesystem backup
- */
- const TYPE_FILESYSTEM = 'filesystem';
-
- /**
- * Backup type constant for full system backup(database + filesystem)
- */
- const TYPE_SYSTEM_SNAPSHOT = 'snapshot';
-
- /**
- * Backup type constant for media and database backup
- */
- const TYPE_MEDIA = 'media';
-
- /**
- * Backup type constant for full system backup excluding media folder
- */
- const TYPE_SNAPSHOT_WITHOUT_MEDIA = 'nomedia';
-
/**
* @var \Magento\Filesystem
*/
@@ -116,10 +91,10 @@ class Data extends \Magento\App\Helper\AbstractHelper
public function getBackupTypes()
{
return array(
- self::TYPE_DB => __('Database'),
- self::TYPE_MEDIA => __('Database and Media'),
- self::TYPE_SYSTEM_SNAPSHOT => __('System'),
- self::TYPE_SNAPSHOT_WITHOUT_MEDIA => __('System (excluding Media)')
+ \Magento\Backup\Factory::TYPE_DB => __('Database'),
+ \Magento\Backup\Factory::TYPE_MEDIA => __('Database and Media'),
+ \Magento\Backup\Factory::TYPE_SYSTEM_SNAPSHOT => __('System'),
+ \Magento\Backup\Factory::TYPE_SNAPSHOT_WITHOUT_MEDIA => __('System (excluding Media)')
);
}
@@ -131,10 +106,10 @@ class Data extends \Magento\App\Helper\AbstractHelper
public function getBackupTypesList()
{
return array(
- self::TYPE_DB,
- self::TYPE_SYSTEM_SNAPSHOT,
- self::TYPE_SNAPSHOT_WITHOUT_MEDIA,
- self::TYPE_MEDIA
+ \Magento\Backup\Factory::TYPE_DB,
+ \Magento\Backup\Factory::TYPE_SYSTEM_SNAPSHOT,
+ \Magento\Backup\Factory::TYPE_SNAPSHOT_WITHOUT_MEDIA,
+ \Magento\Backup\Factory::TYPE_MEDIA
);
}
@@ -145,7 +120,7 @@ class Data extends \Magento\App\Helper\AbstractHelper
*/
public function getDefaultBackupType()
{
- return self::TYPE_DB;
+ return \Magento\Backup\Factory::TYPE_DB;
}
/**
@@ -178,10 +153,10 @@ class Data extends \Magento\App\Helper\AbstractHelper
public function getExtensions()
{
return array(
- self::TYPE_SYSTEM_SNAPSHOT => 'tgz',
- self::TYPE_SNAPSHOT_WITHOUT_MEDIA => 'tgz',
- self::TYPE_MEDIA => 'tgz',
- self::TYPE_DB => 'gz'
+ \Magento\Backup\Factory::TYPE_SYSTEM_SNAPSHOT => 'tgz',
+ \Magento\Backup\Factory::TYPE_SNAPSHOT_WITHOUT_MEDIA => 'tgz',
+ \Magento\Backup\Factory::TYPE_MEDIA => 'tgz',
+ \Magento\Backup\Factory::TYPE_DB => 'gz'
);
}
@@ -193,7 +168,7 @@ class Data extends \Magento\App\Helper\AbstractHelper
*/
public function generateBackupDownloadName(\Magento\Backup\Model\Backup $backup)
{
- $additionalExtension = $backup->getType() == self::TYPE_DB ? '.sql' : '';
+ $additionalExtension = $backup->getType() == \Magento\Backup\Factory::TYPE_DB ? '.sql' : '';
return $backup->getType() . '-' . date('YmdHis', $backup->getTime()) . $additionalExtension . '.'
. $this->getExtensionByType($backup->getType());
}
@@ -283,10 +258,10 @@ class Data extends \Magento\App\Helper\AbstractHelper
public function getCreateSuccessMessageByType($type)
{
$messagesMap = array(
- self::TYPE_SYSTEM_SNAPSHOT => __('The system backup has been created.'),
- self::TYPE_SNAPSHOT_WITHOUT_MEDIA => __('The system backup (excluding media) has been created.'),
- self::TYPE_MEDIA => __('The database and media backup has been created.'),
- self::TYPE_DB => __('The database backup has been created.')
+ \Magento\Backup\Factory::TYPE_SYSTEM_SNAPSHOT => __('The system backup has been created.'),
+ \Magento\Backup\Factory::TYPE_SNAPSHOT_WITHOUT_MEDIA => __('The system backup (excluding media) has been created.'),
+ \Magento\Backup\Factory::TYPE_MEDIA => __('The database and media backup has been created.'),
+ \Magento\Backup\Factory::TYPE_DB => __('The database backup has been created.')
);
if (!isset($messagesMap[$type])) {
diff --git a/app/code/Magento/Backup/Model/Observer.php b/app/code/Magento/Backup/Model/Observer.php
index 7f3fdd2ba17..d9685dd0b48 100644
--- a/app/code/Magento/Backup/Model/Observer.php
+++ b/app/code/Magento/Backup/Model/Observer.php
@@ -134,7 +134,7 @@ class Observer
$this->_coreRegistry->register('backup_manager', $backupManager);
- if ($type != \Magento\Backup\Helper\Data::TYPE_DB) {
+ if ($type != \Magento\Backup\Factory::TYPE_DB) {
$backupManager->setRootDir($this->_dir->getDir())
->addIgnorePaths($this->_backupData->getBackupIgnorePaths());
}
diff --git a/app/code/Magento/Backup/Model/Resource/Db.php b/app/code/Magento/Backup/Model/Resource/Db.php
index c00debc37dd..a2e59e853fd 100644
--- a/app/code/Magento/Backup/Model/Resource/Db.php
+++ b/app/code/Magento/Backup/Model/Resource/Db.php
@@ -158,7 +158,7 @@ class Db
}
/**
- * Retrive table partical data SQL insert
+ * Retrieve table partical data SQL insert
*
* @param string $tableName
* @param int $count
diff --git a/app/code/Magento/Backup/etc/adminhtml/menu.xml b/app/code/Magento/Backup/etc/adminhtml/menu.xml
index 17c54d4b17e..55bee83779e 100644
--- a/app/code/Magento/Backup/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Backup/etc/adminhtml/menu.xml
@@ -27,6 +27,6 @@
-->
<config>
<menu>
- <add id="Magento_Backup::system_tools_backup" title="Backups" module="Magento_Backup" sortOrder="30" parent="Magento_Adminhtml::system_tools" action="adminhtml/system_backup" resource="Magento_Backup::backup"/>
+ <add id="Magento_Backup::system_tools_backup" title="Backups" module="Magento_Backup" sortOrder="30" parent="Magento_Adminhtml::system_tools" action="backup/index" resource="Magento_Backup::backup"/>
</menu>
</config>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure_type_simple.xml b/app/code/Magento/Backup/etc/adminhtml/routes.xml
similarity index 82%
rename from app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure_type_simple.xml
rename to app/code/Magento/Backup/etc/adminhtml/routes.xml
index 7ff60b04ca0..54def962da5 100644
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure_type_simple.xml
+++ b/app/code/Magento/Backup/etc/adminhtml/routes.xml
@@ -23,6 +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">
- <update handle="catalog_product_view_type_simple"/>
-</layout>
+<config>
+ <router id="admin">
+ <route id="backup" frontName="backup">
+ <module name="Magento_Backup_Adminhtml" before="Magento_Adminhtml" />
+ </route>
+ </router>
+</config>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/backup/dialogs.phtml b/app/code/Magento/Backup/view/adminhtml/backup/dialogs.phtml
similarity index 96%
rename from app/code/Magento/Adminhtml/view/adminhtml/backup/dialogs.phtml
rename to app/code/Magento/Backup/view/adminhtml/backup/dialogs.phtml
index 9a06acd722c..65fa8544781 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/backup/dialogs.phtml
+++ b/app/code/Magento/Backup/view/adminhtml/backup/dialogs.phtml
@@ -149,17 +149,16 @@
</div>
<?php
- $helper = $this->helper('Magento\Backup\Helper\Data');
- $rollbackUrl = $this->getUrl('adminhtml/*/rollback');
- $backupUrl = $this->getUrl('adminhtml/*/create');
+ $rollbackUrl = $this->getUrl('*/*/rollback');
+ $backupUrl = $this->getUrl('*/*/create');
?>
<script type="text/javascript">
//<![CDATA[
document.observe('dom:loaded', function () {
backup = new AdminBackup();
- backup.rollbackUrl = '<?php echo $helper->escapeJsQuote($rollbackUrl);?>';
- backup.backupUrl = '<?php echo $helper->escapeJsQuote($backupUrl);?>';
+ backup.rollbackUrl = '<?php echo $this->escapeJsQuote($rollbackUrl);?>';
+ backup.backupUrl = '<?php echo $this->escapeJsQuote($backupUrl);?>';
});
//]]>
</script>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/backup/left.phtml b/app/code/Magento/Backup/view/adminhtml/backup/left.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/backup/left.phtml
rename to app/code/Magento/Backup/view/adminhtml/backup/left.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/backup/list.phtml b/app/code/Magento/Backup/view/adminhtml/backup/list.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/backup/list.phtml
rename to app/code/Magento/Backup/view/adminhtml/backup/list.phtml
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_backup_block.xml b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_block.xml
similarity index 100%
rename from app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_backup_block.xml
rename to app/code/Magento/Backup/view/adminhtml/layout/backup_index_block.xml
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_backup_grid.xml b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_grid.xml
similarity index 95%
rename from app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_backup_grid.xml
rename to app/code/Magento/Backup/view/adminhtml/layout/backup_index_grid.xml
index dfa34b7b5a0..c48c7470515 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_backup_grid.xml
+++ b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_grid.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<update handle="formkey"/>
- <update handle="adminhtml_system_backup_block"/>
+ <update handle="backup_index_block"/>
<block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.system.backup.container" template="Magento_Backend::widget/grid/container/empty.phtml" output="1"/>
</layout>
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_backup_index.xml b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_index.xml
similarity index 88%
rename from app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_backup_index.xml
rename to app/code/Magento/Backup/view/adminhtml/layout/backup_index_index.xml
index 50bed71f01d..f5bf9fb8bce 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_backup_index.xml
+++ b/app/code/Magento/Backup/view/adminhtml/layout/backup_index_index.xml
@@ -25,8 +25,8 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<update handle="formkey"/>
- <update handle="adminhtml_system_backup_block"/>
+ <update handle="backup_index_block"/>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Backup" name="adminhtml.system.backup.container"/>
+ <block class="Magento\Backup\Block\Adminhtml\Backup" name="adminhtml.system.backup.container"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
index d0637627f18..503a75586ab 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
@@ -260,7 +260,7 @@ class Option extends \Magento\Backend\Block\Widget
public function getTypeSelectHtml()
{
- $select = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Html\Select')
+ $select = $this->getLayout()->createBlock('Magento\View\Block\Html\Select')
->setData(array(
'id' => $this->getFieldId().'_{{index}}_type',
'class' => 'select select-product-option-type required-option-select',
@@ -274,7 +274,7 @@ class Option extends \Magento\Backend\Block\Widget
public function getRequireSelectHtml()
{
- $select = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Html\Select')
+ $select = $this->getLayout()->createBlock('Magento\View\Block\Html\Select')
->setData(array(
'id' => $this->getFieldId().'_{{index}}_required',
'class' => 'select'
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 e546a892100..f95d01747dd 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
@@ -62,24 +62,24 @@ class Selection
*/
protected $_yesno;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Backend\Model\Config\Source\Yesno $yesno
- * @param \Magento\Bundle\Model\Source\Option\Selection\Price\Type $priceType
- * @param \Magento\Catalog\Helper\Data $catalogData
- * @param \Magento\Core\Model\Registry $registry
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\Backend\Model\Config\Source\Yesno $yesno
+ * @param \Magento\Bundle\Model\Source\Option\Selection\Price\Type $priceType
+ * @param \Magento\Catalog\Helper\Data $catalogData
+ * @param \Magento\Core\Model\Registry $registry
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Backend\Model\Config\Source\Yesno $yesno,
- \Magento\Bundle\Model\Source\Option\Selection\Price\Type $priceType,
- \Magento\Catalog\Helper\Data $catalogData,
- \Magento\Core\Model\Registry $registry,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\Backend\Model\Config\Source\Yesno $yesno,
+ \Magento\Bundle\Model\Source\Option\Selection\Price\Type $priceType,
+ \Magento\Catalog\Helper\Data $catalogData,
+ \Magento\Core\Model\Registry $registry,
+ array $data = array()
+ ) {
$this->_catalogData = $catalogData;
$this->_coreRegistry = $registry;
$this->_priceType = $priceType;
@@ -149,7 +149,7 @@ class Selection
*/
public function getPriceTypeSelectHtml()
{
- $select = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Html\Select')
+ $select = $this->getLayout()->createBlock('Magento\View\Block\Html\Select')
->setData(array(
'id' => $this->getFieldId() . '_{{index}}_price_type',
'class' => 'select select-product-option-type required-option-select'
@@ -169,7 +169,7 @@ class Selection
*/
public function getQtyTypeSelectHtml()
{
- $select = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Html\Select')
+ $select = $this->getLayout()->createBlock('Magento\View\Block\Html\Select')
->setData(array(
'id' => $this->getFieldId().'_{{index}}_can_change_qty',
'class' => 'select'
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index f5a80005dd3..be86fd7c461 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -496,7 +496,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
}
/**
- * Retrive bundle selections collection based on used options
+ * Retrieve bundle selections collection based on used options
*
* @param array $optionIds
* @param \Magento\Catalog\Model\Product $product
diff --git a/app/code/Magento/Bundle/Model/Resource/Option/Collection.php b/app/code/Magento/Bundle/Model/Resource/Option/Collection.php
index e1d22af2e5b..25c689fe2ef 100644
--- a/app/code/Magento/Bundle/Model/Resource/Option/Collection.php
+++ b/app/code/Magento/Bundle/Model/Resource/Option/Collection.php
@@ -193,7 +193,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
}
/**
- * Retrive all ids for collection
+ * Retrieve all ids for collection
*
* @return array
*/
diff --git a/app/code/Magento/Bundle/view/frontend/bundle.js b/app/code/Magento/Bundle/view/frontend/bundle.js
index fecf8b2293c..8329814c947 100644
--- a/app/code/Magento/Bundle/view/frontend/bundle.js
+++ b/app/code/Magento/Bundle/view/frontend/bundle.js
@@ -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 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,7 +26,7 @@
"use strict";
$.widget('mage.bundleOption', {
options: {
- productBundleSelector: '.product-bundle-option',
+ productBundleSelector: '.product.bundle.option',
mapPopupPrice: '#map-popup-price',
prices: {},
priceTemplate: '<span class="price">${formattedPrice}</span>'
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/price.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/price.phtml
index 23c50f81e5d..69ede2e267a 100644
--- a/app/code/Magento/Bundle/view/frontend/catalog/product/price.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/price.phtml
@@ -18,8 +18,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 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)
*/
@@ -55,33 +53,83 @@ if ($_product->getPriceType() == 1) {
?>
<div class="price-box">
- <?php if ($_product->getPriceView()): ?>
- <p class="minimal-price">
- <span class="price-label"><?php echo __('As low as') ?>:</span>
- <?php if ($this->displayBothPrices()): ?>
- <span class="price-excluding-tax">
- <span class="label"><?php echo __('Excl. Tax:') ?></span>
- <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
- </span>
- <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
- <span class="weee">(<small>
- <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 4))): ?>
- <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
- <?php else: ?>
- <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
- <?php endif; ?>
+ <?php if ($_product->getPriceView()): ?>
+ <p class="minimal-price">
+ <span class="price-label"><?php echo __('As low as') ?>:</span>
+ <?php if ($this->displayBothPrices()): ?>
+ <span class="price-excluding-tax">
+ <span class="label"><?php echo __('Excl. Tax:') ?></span>
+ <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
+ </span>
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
+ <span class="weee">(<small>
+ <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 4))): ?>
+ <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
+ <?php else: ?>
+ <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
+ <?php endif; ?>
- <?php echo $_weeeSeparator; ?>
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($amount, true, true); ?>
- <?php $_weeeSeparator = ' + '; ?>
- <?php endforeach; ?>
- </small>)</span>
- <?php endif; ?>
- <span class="price-including-tax">
- <span class="label"><?php echo __('Incl. Tax:') ?></span>
- <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
- </span>
+ <?php echo $_weeeSeparator; ?>
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($amount, true, true); ?>
+ <?php $_weeeSeparator = ' + '; ?>
+ <?php endforeach; ?>
+ </small>)</span>
+ <?php endif; ?>
+ <span class="price-including-tax">
+ <span class="label"><?php echo __('Incl. Tax:') ?></span>
+ <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
+ </span>
+ <?php else: ?>
+ <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
+ <span class="weee">(<small>
+ <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 4))): ?>
+ <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
+ <?php else: ?>
+ <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
+ <?php endif; ?>
+
+ <?php echo $_weeeSeparator; ?>
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($amount, true, true); ?>
+ <?php $_weeeSeparator = ' + '; ?>
+ <?php endforeach; ?>
+ </small>)</span>
+ <?php endif; ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
+ <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
+ <?php endif; ?>
+ <?php endif; ?>
+ </p>
+ <?php else: ?>
+ <?php if ($_minimalPriceTax <> $_maximalPriceTax): ?>
+ <p class="price-from">
+ <span class="price-label"><?php echo __('From') ?>:</span>
+ <?php if ($this->displayBothPrices()): ?>
+ <span class="price-excluding-tax">
+ <span class="label"><?php echo __('Excl. Tax:') ?></span>
+ <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
+ </span>
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
+ <span class="weee">(<small>
+ <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 4))): ?>
+ <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
+ <?php else: ?>
+ <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
+ <?php endif; ?>
+
+ <?php echo $_weeeSeparator; ?>
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($amount, true, true); ?>
+ <?php $_weeeSeparator = ' + '; ?>
+ <?php endforeach; ?>
+ </small>)</span>
+ <?php endif; ?>
+ <span class="price-including-tax">
+ <span class="label"><?php echo __('Incl. Tax:') ?></span>
+ <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
+ </span>
<?php else: ?>
<?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
<?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
@@ -103,15 +151,24 @@ if ($_product->getPriceType() == 1) {
<?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
<?php endif; ?>
<?php endif; ?>
- </p>
- <?php else: ?>
- <?php if ($_minimalPriceTax <> $_maximalPriceTax): ?>
- <p class="price-from">
- <span class="price-label"><?php echo __('From') ?>:</span>
+ </p>
+ <?php
+ if ($_product->getPriceType() == 1) {
+ if ($_weeeTaxAmount && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(0, 1, 4))) {
+ $_maximalPriceTax += $_weeeTaxAmount;
+ $_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
+ }
+ if ($_weeeTaxAmount && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)) {
+ $_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
+ }
+ }
+ ?>
+ <p class="price-to">
+ <span class="price-label"><?php echo __('To') ?>:</span>
<?php if ($this->displayBothPrices()): ?>
<span class="price-excluding-tax">
<span class="label"><?php echo __('Excl. Tax:') ?></span>
- <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
+ <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_maximalPriceTax) ?>
</span>
<?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
<span class="weee">(<small>
@@ -129,11 +186,11 @@ if ($_product->getPriceType() == 1) {
</small>)</span>
<?php endif; ?>
<span class="price-including-tax">
- <span class="label"><?php echo __('Incl. Tax:') ?></span>
- <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
+ <span class="label"><?php echo __('Incl. Tax') ?></span>
+ <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_maximalPriceInclTax) ?>
</span>
<?php else: ?>
- <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
+ <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_maximalPriceTax) ?>
<?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
<span class="weee">(<small>
<?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
@@ -150,115 +207,56 @@ if ($_product->getPriceType() == 1) {
</small>)</span>
<?php endif; ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
- <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
+ <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_maximalPriceInclTax) ?>
<?php endif; ?>
<?php endif; ?>
</p>
- <?php
- if ($_product->getPriceType() == 1) {
- if ($_weeeTaxAmount && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(0, 1, 4))) {
- $_maximalPriceTax += $_weeeTaxAmount;
- $_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
- }
- if ($_weeeTaxAmount && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)) {
- $_maximalPriceInclTax += $_weeeTaxAmountInclTaxes;
- }
- }
- ?>
- <p class="price-to">
- <span class="price-label"><?php echo __('To') ?>:</span>
- <?php if ($this->displayBothPrices()): ?>
- <span class="price-excluding-tax">
- <span class="label"><?php echo __('Excl. Tax:') ?></span>
- <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_maximalPriceTax) ?>
- </span>
- <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
- <span class="weee">(<small>
- <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 4))): ?>
- <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
- <?php else: ?>
- <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
- <?php endif; ?>
-
- <?php echo $_weeeSeparator; ?>
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($amount, true, true); ?>
- <?php $_weeeSeparator = ' + '; ?>
- <?php endforeach; ?>
- </small>)</span>
- <?php endif; ?>
- <span class="price-including-tax">
- <span class="label"><?php echo __('Incl. Tax') ?></span>
- <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_maximalPriceInclTax) ?>
- </span>
- <?php else: ?>
- <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_maximalPriceTax) ?>
- <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
- <span class="weee">(<small>
- <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 4))): ?>
- <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
- <?php else: ?>
- <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
- <?php endif; ?>
+ <?php else: ?>
+ <?php if ($this->displayBothPrices()): ?>
+ <span class="price-excluding-tax">
+ <span class="label"><?php echo __('Excl. Tax:') ?></span>
+ <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
+ </span>
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
+ <span class="weee">(<small>
+ <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 4))): ?>
+ <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
+ <?php else: ?>
+ <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
+ <?php endif; ?>
- <?php echo $_weeeSeparator; ?>
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($amount, true, true); ?>
- <?php $_weeeSeparator = ' + '; ?>
- <?php endforeach; ?>
- </small>)</span>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
- <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_maximalPriceInclTax) ?>
- <?php endif; ?>
- <?php endif; ?>
- </p>
+ <?php echo $_weeeSeparator; ?>
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($amount, true, true); ?>
+ <?php $_weeeSeparator = ' + '; ?>
+ <?php endforeach; ?>
+ </small>)</span>
+ <?php endif; ?>
+ <span class="price-including-tax">
+ <span class="label"><?php echo __('Incl. Tax:') ?></span>
+ <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
+ </span>
<?php else: ?>
- <?php if ($this->displayBothPrices()): ?>
- <span class="price-excluding-tax">
- <span class="label"><?php echo __('Excl. Tax:') ?></span>
- <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
- </span>
- <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
- <span class="weee">(<small>
- <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 4))): ?>
- <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
- <?php else: ?>
- <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
- <?php endif; ?>
-
- <?php echo $_weeeSeparator; ?>
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($amount, true, true); ?>
- <?php $_weeeSeparator = ' + '; ?>
- <?php endforeach; ?>
- </small>)</span>
- <?php endif; ?>
- <span class="price-including-tax">
- <span class="label"><?php echo __('Incl. Tax:') ?></span>
- <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
- </span>
- <?php else: ?>
- <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
- <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
- <span class="weee">(<small>
- <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 4))): ?>
- <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
- <?php else: ?>
- <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
- <?php endif; ?>
+ <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceTax) ?>
+ <?php if ($_weeeTaxAmount && $_product->getPriceType() == 1 && $this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 1, 4))): ?>
+ <span class="weee">(<small>
+ <?php $_weeeSeparator = ''; foreach ($_weeeTaxAttributes as $_weeeTaxAttribute): ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(2, 4))): ?>
+ <?php $amount = $_weeeTaxAttribute->getAmount()+$_weeeTaxAttribute->getTaxAmount(); ?>
+ <?php else: ?>
+ <?php $amount = $_weeeTaxAttribute->getAmount(); ?>
+ <?php endif; ?>
- <?php echo $_weeeSeparator; ?>
- <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($amount, true, true); ?>
- <?php $_weeeSeparator = ' + '; ?>
- <?php endforeach; ?>
- </small>)</span>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
- <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
- <?php endif; ?>
+ <?php echo $_weeeSeparator; ?>
+ <?php echo $_weeeTaxAttribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($amount, true, true); ?>
+ <?php $_weeeSeparator = ' + '; ?>
+ <?php endforeach; ?>
+ </small>)</span>
+ <?php endif; ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2) && $_weeeTaxAmount): ?>
+ <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_minimalPriceInclTax) ?>
<?php endif; ?>
<?php endif; ?>
<?php endif; ?>
+ <?php endif; ?>
</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/backbutton.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/backbutton.phtml
similarity index 86%
rename from app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/backbutton.phtml
rename to app/code/Magento/Bundle/view/frontend/catalog/product/view/backbutton.phtml
index cb76e318b8c..d3029b7b922 100644
--- a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/backbutton.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/backbutton.phtml
@@ -18,9 +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 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)
*/
?>
-<button type="button" class="action back customization"><span><?php echo __('Go back to product details') ?></span></button>
+<button type="button"
+ class="action back customization">
+ <span><?php echo __('Go back to product details') ?></span>
+</button>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/customize.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/customize.phtml
similarity index 84%
rename from app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/customize.phtml
rename to app/code/Magento/Bundle/view/frontend/catalog/product/view/customize.phtml
index 4b08a51a035..adbe1fe4308 100644
--- a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/customize.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/customize.phtml
@@ -18,7 +18,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)
*/
@@ -27,6 +26,10 @@
<?php $_product = $this->getProduct() ?>
<?php if ($_product->isSaleable() && $this->hasOptions()):?>
<div class="actions bundle">
- <button id="bundle-slide" class="action primary customize" type="button"><span><?php echo __('Customize and Add to Cart'); ?></span></button>
+ <button id="bundle-slide"
+ class="action primary customize"
+ type="button">
+ <span><?php echo __('Customize and Add to Cart'); ?></span>
+ </button>
</div>
<?php endif;?>
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/view/options/notice.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/options/notice.phtml
index dcccb1c8668..ee2633f4f9e 100644
--- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/options/notice.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/options/notice.phtml
@@ -18,8 +18,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 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/Bundle/view/frontend/catalog/product/view/price.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/price.phtml
index dc0360b3534..6dda6945e42 100644
--- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/price.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/price.phtml
@@ -18,8 +18,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 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/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/summary.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/summary.phtml
similarity index 83%
rename from app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/summary.phtml
rename to app/code/Magento/Bundle/view/frontend/catalog/product/view/summary.phtml
index e2c3b5c3ad7..5be24e3afcf 100644
--- a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/summary.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/summary.phtml
@@ -18,7 +18,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)
*/
@@ -38,9 +37,13 @@
<div class="product details">
<strong class="product name"><?php echo $this->escapeHtml($_product->getName()) ?></strong>
<?php if($_product->getIsSalable()): ?>
- <p class="available stock" title="<?php echo __('Availability') ?>"><span><?php echo __('In stock') ?></span></p>
+ <p class="available stock" title="<?php echo __('Availability') ?>">
+ <span><?php echo __('In stock') ?></span>
+ </p>
<?php else: ?>
- <p class="unavailable stock" title="<?php echo __('Availability') ?>"><span><?php echo __('Out of stock') ?></span></p>
+ <p class="unavailable stock" title="<?php echo __('Availability') ?>">
+ <span><?php echo __('Out of stock') ?></span>
+ </p>
<?php endif; ?>
<?php echo $this->getChildHtml('', true);?>
</div>
@@ -63,29 +66,28 @@
</div>
</div>
<script>
+ //<![CDATA[
(function ($) {
head.js("<?php echo $this->getViewFileUrl('js/sticky.js') ?>",function() {
$('#bundleSummary').sticky({
container: '.product.add.form'
});
});
- })(jQuery);
-</script>
-<script type="text/javascript">
- (function($) {
+
head.js("<?php echo $this->getViewFileUrl('Magento_Bundle::js/slide.js')?>", function() {
$('.product.add.form').slide({
- slideSpeed: 1500,
- slideSelector: '#bundle-slide',
- slideBackSelector: '.action.customization.back',
- bundleProductSelector: '#bundleProduct',
- bundleOptionsContainer: '.product.add.form',
- <?php if ($this->isStartCustomization()): ?>
+ slideSpeed: 1500,
+ slideSelector: '#bundle-slide',
+ slideBackSelector: '.action.customization.back',
+ bundleProductSelector: '#bundleProduct',
+ bundleOptionsContainer: '.product.add.form',
+ <?php if ($this->isStartCustomization()): ?>
autostart: true
- <?php endif;?>
+ <?php endif;?>
}
);
});
})(jQuery);
+ //]]>
</script>
<?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/view/tierprices.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/tierprices.phtml
index 8e91973b3c3..67c980555b1 100644
--- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/tierprices.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/tierprices.phtml
@@ -18,8 +18,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 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,9 +31,9 @@ $_product = $this->getProduct();
$_tierPrices = $this->getTierPrices();
?>
<?php if (count($_tierPrices) > 0): ?>
- <ul class="tier-prices product-pricing">
+ <ul class="prices tier items">
<?php foreach($_tierPrices as $_price): ?>
- <li><?php echo __('Buy %1 with %2 discount each', $_price['price_qty'], '<strong class="benefit">'.($_price['price']*1).'%</strong>') ?></li>
+ <li class="item"><?php echo __('Buy %1 with %2 discount each', $_price['price_qty'], '<strong class="benefit">'.($_price['price']*1).'%</strong>') ?></li>
<?php endforeach ?>
</ul>
<?php endif;?>
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle.phtml
index cf1f401ee33..f354810ab94 100644
--- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle.phtml
@@ -18,42 +18,43 @@
* 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\Bundle\Block\Catalog\Product\View\Type\Bundle */
?>
<?php $_product = $this->getProduct() ?>
-
<?php if($_product->isSaleable()): ?>
-<script type="text/javascript">
- (function ($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_Bundle::bundle.js') ?>", function() {
- $('#product_addtocart_form').bundleOption({
- bundleConfig: <?php echo $this->getJsonConfig() ?>,
- bundleOptionQtyPrefix: "#bundle-option-",
- bundleOptionQtySuffix: "-qty-input",
- priceSelectors: {
- "product-price": "#product-price-<?php echo $_product->getId()?>",
- "bundle-price": "#bundle-price-<?php echo $_product->getId()?>",
- "price-including-tax": "#price-including-tax-<?php echo $_product->getId()?>",
- "price-excluding-tax": "#price-excluding-tax-<?php echo $_product->getId()?>"
- }
+ <script type="text/javascript">
+ //<![CDATA[
+ (function ($) {
+ head.js("<?php echo $this->getViewFileUrl('Magento_Bundle::/bundle.js') ?>", function() {
+ $('#product_addtocart_form').bundleOption({
+ bundleConfig: <?php echo $this->getJsonConfig() ?>,
+ bundleOptionQtyPrefix: "#bundle-option-",
+ bundleOptionQtySuffix: "-qty-input",
+ priceSelectors: {
+ "product-price": "#product-price-<?php echo $_product->getId()?>",
+ "bundle-price": "#bundle-price-<?php echo $_product->getId()?>",
+ "price-including-tax": "#price-including-tax-<?php echo $_product->getId()?>",
+ "price-excluding-tax": "#price-excluding-tax-<?php echo $_product->getId()?>"
+ }
+ });
});
- });
- })(jQuery);
-</script>
+ })(jQuery);
+ //]]>
+ </script>
<?php endif; ?>
<?php if ($this->displayProductStockStatus()): ?>
<?php if ($_product->isAvailable()): ?>
- <p class="availability in-stock"><?php echo __('Availability:') ?> <span><?php echo __('In stock') ?></span></p>
+ <p class="stock available" title="<?php echo __('Availability:') ?>">
+ <span><?php echo __('In stock') ?></span>
+ </p>
<?php else: ?>
- <p class="availability out-of-stock"><?php echo __('Availability:') ?> <span><?php echo __('Out of stock') ?></span></p>
+ <p class="stock unavailable" title="<?php echo __('Availability:') ?>">
+ <span><?php echo __('Out of stock') ?></span>
+ </p>
<?php endif; ?>
<?php endif; ?>
-<div class="price-box-bundle">
- <?php echo $this->getPriceHtml($_product) ?>
-</div>
<?php echo $this->getChildHtml('bundle_prices') ?>
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/checkbox.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/checkbox.phtml
index 2761f8f27cd..cd785c87d33 100644
--- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/checkbox.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/checkbox.phtml
@@ -18,32 +18,44 @@
* 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\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox */ ?>
<?php $_option = $this->getOption() ?>
<?php $_selections = $_option->getSelections() ?>
-<dt><label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->escapeHtml($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label></dt>
-<dd<?php if ($_option->getDecoratedIsLast()):?> class="last"<?php endif; ?>>
- <div class="input-box">
- <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
- <?php echo $this->getSelectionQtyTitlePrice($_selections[0]) ?>
- <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>"/>
- <?php else:?>
- <ul class="options-list">
- <?php foreach($_selections as $_selection): ?>
- <li><input class="change-container-classname checkbox bundle-option-<?php echo $_option->getId() ?> product-bundle-option" id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>" type="checkbox" <?php if ($_option->getRequired()) echo 'data-validate = {"validate-one-required-by-name":true}'?> name="bundle_option[<?php echo $_option->getId() ?>][]"<?php if ($this->isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?> value="<?php echo $_selection->getSelectionId() ?>"/>
- <span class="label"><label for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"><?php echo $this->getSelectionQtyTitlePrice($_selection) ?></label></span>
- </li>
- <?php endforeach; ?>
- </ul>
- <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
- <?php endif; ?>
+<div class="field option <?php echo ($_option->getRequired()) ? ' required': ''; ?>">
+ <label class="label">
+ <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
+ </label>
+ <div class="control">
+ <div class="nested options-list">
+ <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
+ <?php echo $this->getSelectionQtyTitlePrice($_selections[0]) ?>
+ <input type="hidden"
+ name="bundle_option[<?php echo $_option->getId() ?>]"
+ value="<?php echo $_selections[0]->getSelectionId() ?>"/>
+ <?php else:?>
+ <?php foreach($_selections as $_selection): ?>
+ <div class="field choice">
+ <input class="bundle-option-<?php echo $_option->getId() ?> checkbox product bundle option change-container-classname"
+ id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"
+ type="checkbox"
+ <?php if ($_option->getRequired()) echo 'data-validate="{\'validate-one-required-by-name\':true}"'?>
+ name="bundle_option[<?php echo $_option->getId() ?>][]"
+ <?php if ($this->isSelected($_selection)) echo ' checked="checked"' ?>
+ <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>
+ value="<?php echo $_selection->getSelectionId() ?>"/>
+ <label class="label"
+ for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>">
+ <span><?php echo $this->getSelectionQtyTitlePrice($_selection) ?></span>
+ </label>
+ </div>
+ <?php endforeach; ?>
+ <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
+ <?php endif; ?>
+ </div>
</div>
-</dd>
+</div>
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/multi.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/multi.phtml
index 405be460f2e..a24c0efedb6 100644
--- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/multi.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/multi.phtml
@@ -18,32 +18,42 @@
* 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\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi */ ?>
<?php $_option = $this->getOption() ?>
<?php $_selections = $_option->getSelections() ?>
-<dt><label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->escapeHtml($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label></dt>
-<dd<?php if ($_option->getDecoratedIsLast()):?> class="last"<?php endif; ?>>
- <div class="input-box">
- <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
- <?php echo $this->getSelectionQtyTitlePrice($_selections[0]) ?>
- <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>"/>
- <?php else: ?>
- <select multiple="multiple" size="5" id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>][]" class="bundle-option-<?php echo $_option->getId() ?> multiselect change-container-classname product-bundle-option" <?php if ($_option->getRequired()) echo 'data-validate={required:true}' ?>>
- <?php if(!$_option->getRequired()): ?>
- <option value=""><?php echo __('None') ?></option>
+<div class="field option <?php echo ($_option->getRequired()) ? ' required': ''; ?>">
+ <label class="label" for="bundle-option-<?php echo $_option->getId() ?>">
+ <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
+ </label>
+ <div class="control">
+ <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
+ <?php echo $this->getSelectionQtyTitlePrice($_selections[0]) ?>
+ <input type="hidden"
+ name="bundle_option[<?php echo $_option->getId() ?>]"
+ value="<?php echo $_selections[0]->getSelectionId() ?>"/>
+ <?php else: ?>
+ <select multiple="multiple"
+ size="5"
+ id="bundle-option-<?php echo $_option->getId() ?>"
+ name="bundle_option[<?php echo $_option->getId() ?>][]"
+ class="bundle-option-<?php echo $_option->getId() ?> multiselect product bundle option change-container-classname"
+ <?php if ($_option->getRequired()) echo 'data-validate={required:true}' ?>>
+ <?php if(!$_option->getRequired()): ?>
+ <option value=""><?php echo __('None') ?></option>
+ <?php endif; ?>
+ <?php foreach ($_selections as $_selection): ?>
+ <option value="<?php echo $_selection->getSelectionId() ?>"
+ <?php if ($this->isSelected($_selection)) echo ' selected="selected"' ?>
+ <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>>
+ <?php echo $this->getSelectionQtyTitlePrice($_selection, false) ?>
+ </option>
+ <?php endforeach; ?>
+ </select>
<?php endif; ?>
- <?php foreach ($_selections as $_selection): ?>
- <option value="<?php echo $_selection->getSelectionId() ?>"<?php if ($this->isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>><?php echo $this->getSelectionQtyTitlePrice($_selection, false) ?></option>
- <?php endforeach; ?>
- </select>
- <?php endif; ?>
</div>
-</dd>
+</div>
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/radio.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/radio.phtml
index 89aa9c26f17..c808e6c31c4 100644
--- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/radio.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/radio.phtml
@@ -18,45 +18,73 @@
* 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\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio */ ?>
<?php $_option = $this->getOption(); ?>
<?php $_selections = $_option->getSelections(); ?>
<?php $_default = $_option->getDefaultSelection(); ?>
<?php list($_defaultQty, $_canChangeQty) = $this->getDefaultValues(); ?>
-<dt>
- <label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->escapeHtml($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label>
-</dt>
-<dd<?php if ($_option->getDecoratedIsLast()):?> class="last"<?php endif; ?>>
- <div class="input-box">
- <?php if ($this->showSingle()): ?>
- <?php echo $this->getSelectionTitlePrice($_selections[0]) ?>
- <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>" />
- <?php else:?>
- <ul class="options-list">
- <?php if (!$_option->getRequired()): ?>
- <li><input type="radio" class="radio product-bundle-option" id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>]"<?php echo ($_default && $_default->isSalable())?'':' checked="checked" ' ?> value=""/>
- <span class="label"><label for="bundle-option-<?php echo $_option->getId() ?>"><?php echo __('None') ?></label></span>
- </li>
- <?php endif; ?>
- <?php foreach ($_selections as $_selection): ?>
- <li><input type="radio" class="radio change-container-classname product-bundle-option" id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>" <?php if ($_option->getRequired()) echo 'data-validate = {"validate-one-required-by-name":true}'?> name="bundle_option[<?php echo $_option->getId() ?>]"<?php if ($this->isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>value="<?php echo $_selection->getSelectionId() ?>"/>
- <span class="label"><label for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"><?php echo $this->getSelectionTitlePrice($_selection) ?></label></span>
- </li>
- <?php endforeach; ?>
- </ul>
- <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
- <?php endif; ?>
+<div class="field option <?php echo ($_option->getRequired()) ? ' required': ''; ?>">
+ <label class="label">
+ <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
+ </label>
+ <div class="control">
+ <div class="nested options-list">
+ <?php if ($this->showSingle()): ?>
+ <?php echo $this->getSelectionTitlePrice($_selections[0]) ?>
+ <input type="hidden"
+ name="bundle_option[<?php echo $_option->getId() ?>]"
+ value="<?php echo $_selections[0]->getSelectionId() ?>" />
+ <?php else:?>
+ <?php if (!$_option->getRequired()): ?>
+ <div class="field choice">
+ <input type="radio"
+ class="radio product bundle option"
+ id="bundle-option-<?php echo $_option->getId() ?>"
+ name="bundle_option[<?php echo $_option->getId() ?>]"
+ <?php echo ($_default && $_default->isSalable())?'':' checked="checked" ' ?>
+ value=""/>
+ <label class="label" for="bundle-option-<?php echo $_option->getId() ?>">
+ <span><?php echo __('None') ?></span>
+ </label>
+ </div>
+ <?php endif; ?>
+ <?php foreach ($_selections as $_selection): ?>
+ <div class="field choice">
+ <input type="radio"
+ class="radio product bundle option change-container-classname"
+ id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"
+ <?php if ($_option->getRequired()) echo 'data-validate="{\'validate-one-required-by-name\':true}"'?>
+ name="bundle_option[<?php echo $_option->getId() ?>]"
+ <?php if ($this->isSelected($_selection)) echo ' checked="checked"' ?>
+ <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>
+ value="<?php echo $_selection->getSelectionId() ?>"/>
+ <label class="label"
+ for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>">
+ <span><?php echo $this->getSelectionTitlePrice($_selection) ?></span>
+ </label>
+ </div>
+ <?php endforeach; ?>
+ <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
+ <?php endif; ?>
+ <div class="field qty qty-holder">
+ <label class="label" for="bundle-option-<?php echo $_option->getId() ?>-qty-input">
+ <span><?php echo __('Qty') ?></span>
+ </label>
+ <div class="control">
+ <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
+ id="bundle-option-<?php echo $_option->getId() ?>-qty-input"
+ class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>"
+ type="text"
+ name="bundle_option_qty[<?php echo $_option->getId() ?>]"
+ value="<?php echo $_defaultQty ?>"/>
+ </div>
+ </div>
+ </div>
</div>
- <span class="qty-holder">
- <label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo __('Qty:') ?> </label><input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>"/>
- </span>
-</dd>
+</div>
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/select.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/select.phtml
index b6fa2ac5edc..52801328c7f 100644
--- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/select.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/option/select.phtml
@@ -18,12 +18,9 @@
* 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\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select */ ?>
@@ -31,25 +28,45 @@
<?php $_selections = $_option->getSelections(); ?>
<?php $_default = $_option->getDefaultSelection(); ?>
<?php list($_defaultQty, $_canChangeQty) = $this->getDefaultValues(); ?>
-
-<dt>
- <label<?php if ($_option->getRequired()) echo ' class="required"' ?>><?php echo $this->escapeHtml($_option->getTitle()) ?><?php if ($_option->getRequired()) echo '<em>*</em>' ?></label>
-</dt>
-<dd<?php if ($_option->getDecoratedIsLast()):?> class="last"<?php endif; ?>>
- <div class="input-box">
- <?php if ($this->showSingle()): ?>
- <?php echo $this->getSelectionTitlePrice($_selections[0]) ?>
- <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>"/>
- <?php else:?>
- <select id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>]" class="bundle-option-<?php echo $_option->getId() ?> bundle-option-select product-bundle-option change-container-classname" <?php if ($_option->getRequired()) echo 'data-validate = {required:true}' ?>>
- <option value=""><?php echo __('Choose a selection...') ?></option>
- <?php foreach ($_selections as $_selection): ?>
- <option value="<?php echo $_selection->getSelectionId() ?>"<?php if ($this->isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>><?php echo $this->getSelectionTitlePrice($_selection, false) ?></option>
- <?php endforeach; ?>
- </select>
- <?php endif; ?>
+<div class="field option <?php echo ($_option->getRequired()) ? ' required': ''; ?>">
+ <label class="label" for="bundle-option-<?php echo $_option->getId() ?>">
+ <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
+ </label>
+ <div class="control">
+ <?php if ($this->showSingle()): ?>
+ <?php echo $this->getSelectionTitlePrice($_selections[0]) ?>
+ <input type="hidden"
+ name="bundle_option[<?php echo $_option->getId() ?>]"
+ value="<?php echo $_selections[0]->getSelectionId() ?>"/>
+ <?php else:?>
+ <select id="bundle-option-<?php echo $_option->getId() ?>"
+ name="bundle_option[<?php echo $_option->getId() ?>]"
+ class="bundle-option-<?php echo $_option->getId() ?> product bundle option bundle-option-select change-container-classname"
+ <?php if ($_option->getRequired()) echo 'data-validate = {required:true}' ?>>
+ <option value=""><?php echo __('Choose a selection...') ?></option>
+ <?php foreach ($_selections as $_selection): ?>
+ <option value="<?php echo $_selection->getSelectionId() ?>"
+ <?php if ($this->isSelected($_selection)) echo ' selected="selected"' ?>
+ <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>>
+ <?php echo $this->getSelectionTitlePrice($_selection, false) ?>
+ </option>
+ <?php endforeach; ?>
+ </select>
+ <?php endif; ?>
+ <div class="nested">
+ <div class="field qty qty-holder">
+ <label class="label" for="bundle-option-<?php echo $_option->getId() ?>-qty-input">
+ <span><?php echo __('Qty') ?></span>
+ </label>
+ <div class="control">
+ <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
+ id="bundle-option-<?php echo $_option->getId() ?>-qty-input"
+ class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>"
+ type="text"
+ name="bundle_option_qty[<?php echo $_option->getId() ?>]"
+ value="<?php echo $_defaultQty ?>"/>
+ </div>
+ </div>
+ </div>
</div>
- <span class="qty-holder">
- <label for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo __('Qty:') ?> </label><input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>"/>
- </span>
-</dd>
+</div>
diff --git a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/options.phtml b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/options.phtml
index 9fea3750b23..59b828af017 100644
--- a/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/options.phtml
+++ b/app/code/Magento/Bundle/view/frontend/catalog/product/view/type/bundle/options.phtml
@@ -18,33 +18,41 @@
* 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\Bundle\Block\Catalog\Product\View\Type\Bundle */ ?>
-<?php $_product = $this->getProduct(); ?>
+<?php
+$_product = $this->getProduct();
+$_helper = $this->helper('Magento\Catalog\Helper\Output');
+?>
<?php $_options = $this->decorateArray($this->getOptions()); ?>
<?php if ($_product->isSaleable()):?>
<?php if (count($_options)): ?>
- <script type="text/javascript">
- (function ($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_Bundle::bundle.js') ?>", function () {
- $('#product_addtocart_form').bundleOption({'optionConfig':<?php echo $this->getJsonConfig()?>}).trigger('changeSelection');
- });
- })(jQuery);
- </script>
- <dl>
- <?php foreach ($_options as $_option): ?>
- <?php if (!$_option->getSelections()): ?>
- <?php continue; ?>
- <?php endif; ?>
- <?php echo $this->getOptionHtml($_option) ?>
- <?php endforeach; ?>
- </dl>
+ <script type="text/javascript">
+ //<![CDATA[
+ (function ($) {
+ head.js("<?php echo $this->getViewFileUrl('Magento_Bundle::bundle.js') ?>", function () {
+ $('#product_addtocart_form')
+ .bundleOption({'optionConfig':<?php echo $this->getJsonConfig()?>})
+ .trigger('changeSelection');
+ });
+ })(jQuery);
+ //]]>
+ </script>
+ <fieldset class="fieldset bundle options">
+ <legend id="customizeTitle" class="legend">
+ <span><?php echo __('Customize %1', $_helper->productAttribute($_product, $_product->getName(), 'name')) ?></span>
+ </legend><br />
+ <?php foreach ($_options as $_option): ?>
+ <?php if (!$_option->getSelections()): ?>
+ <?php continue; ?>
+ <?php endif; ?>
+ <?php echo $this->getOptionHtml($_option) ?>
+ <?php endforeach; ?>
+ </fieldset>
<?php else: ?>
- <p><?php echo __('No options of this product are available.') ?></p>
+ <p class="empty"><?php echo __('No options of this product are available.') ?></p>
<?php endif; ?>
<?php endif;?>
diff --git a/app/code/Magento/Bundle/view/frontend/js/float.js b/app/code/Magento/Bundle/view/frontend/js/float.js
index 3e3d7c7888f..8abb7bc4558 100644
--- a/app/code/Magento/Bundle/view/frontend/js/float.js
+++ b/app/code/Magento/Bundle/view/frontend/js/float.js
@@ -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 frontend bundle product float
- * @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)
*/
diff --git a/app/code/Magento/Bundle/view/frontend/js/product-summary.js b/app/code/Magento/Bundle/view/frontend/js/product-summary.js
index a204c51b2c7..2218a61433c 100644
--- a/app/code/Magento/Bundle/view/frontend/js/product-summary.js
+++ b/app/code/Magento/Bundle/view/frontend/js/product-summary.js
@@ -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 frontend bundle product summary
- * @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)
*/
diff --git a/app/code/Magento/Bundle/view/frontend/js/slide.js b/app/code/Magento/Bundle/view/frontend/js/slide.js
index b451fce49cb..d0773847938 100644
--- a/app/code/Magento/Bundle/view/frontend/js/slide.js
+++ b/app/code/Magento/Bundle/view/frontend/js/slide.js
@@ -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 frontend bundle product slide
- * @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)
*/
@@ -31,14 +29,21 @@
slideBackSelector: '.bundle-slide-back',
bundleProductSelector: '#bundleProduct',
bundleOptionsContainer: '#options-container',
- productViewContainer: '#productView'
+ productViewContainer: '#productView',
+ slidedown: true
},
_create: function() {
- $(this.options.slideSelector).on('click', $.proxy(this._slide, this));
- $(this.options.slideBackSelector).on('click', $.proxy(this._slideBack, this));
- this.options.autostart && this._slide();
+ if(this.options.slidedown === true) {
+ $(this.options.slideSelector).on('click', $.proxy(this._show, this));
+ $(this.options.slideBackSelector).on('click', $.proxy(this._hide, this));
+ this.options.autostart && this._show();
+ } else {
+ $(this.options.slideSelector).on('click', $.proxy(this._slide, this));
+ $(this.options.slideBackSelector).on('click', $.proxy(this._slideBack, this));
+ this.options.autostart && this._slide();
+ }
},
/**
@@ -75,6 +80,18 @@
this.element.css('height','auto');
}, this)
);
+ },
+ _show: function() {
+ $(this.options.bundleOptionsContainer).slideDown(800);
+ $('html, body').animate({
+ scrollTop: $(this.options.bundleOptionsContainer).offset().top
+ }, 600);
+ },
+ _hide: function() {
+ $('html, body').animate({
+ scrollTop: 0
+ }, 600);
+ $(this.options.bundleOptionsContainer).slideUp(800);
}
});
}(jQuery));
\ No newline at end of file
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 83752c4c834..3e1666e39a9 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
@@ -36,21 +36,24 @@
</arguments>
</block>
</referenceBlock>
+ <referenceBlock name="root">
+ <action method="addBodyClass">
+ <argument name="value" xsi:type="string">type-bundle</argument>
+ </action>
+ </referenceBlock>
<referenceBlock name="product.info">
- <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle" as="product_type_data" template="catalog/product/view/type/bundle.phtml">
- <action method="addPriceBlockType">
- <argument name="type" xsi:type="string">bundle</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\Price</argument>
- <argument name="template" xsi:type="string">catalog/product/price.phtml</argument>
- </action>
+ <block class="Magento\Bundle\Block\Catalog\Product\View" name="bundle.summary" as="form_top" template="catalog/product/view/summary.phtml">
<block class="Magento\Bundle\Block\Catalog\Product\Price" name="bundle.prices" as="bundle_prices" template="catalog/product/view/price.phtml">
<action method="setMAPTemplate">
<argument name="tmpl" xsi:type="string">Magento_Catalog::product/price_msrp_item.phtml</argument>
</action>
</block>
+ <block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart.bundle" as="addtocart" template="product/view/addtocart.phtml"/>
+ <block class="Magento\Catalog\Block\Product\View" name="product.info.addto.bundle" as="addto" template="product/view/addto.phtml"/>
</block>
</referenceBlock>
<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="-">
<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"/>
@@ -62,7 +65,32 @@
<remove name="product.tierprices"/>
<block class="Magento\Bundle\Block\Catalog\Product\View" name="bundle.tierprices" as="tierprices" before="-" template="Magento_Bundle::catalog/product/view/tierprices.phtml"/>
<block class="Magento\CatalogInventory\Block\Qtyincrements" name="product.info.qtyincrements" before="-" template="qtyincrements.phtml"/>
+ <block class="Magento\Bundle\Block\Catalog\Product\View" name="bundle.back.button" as="backButton" after="-" template="catalog/product/view/backbutton.phtml"/>
+ <action method="unsetChild">
+ <argument name="block" xsi:type="string">product.info.addtocart</argument>
+ </action>
+ <action method="setHideRequiredNotice">
+ <argument name="flag" xsi:type="string">1</argument>
+ </action>
+ <action method="unsetChild">
+ <argument name="block" xsi:type="string">product.info.addto</argument>
+ </action>
</referenceBlock>
+ <referenceContainer name="content">
+ <container name="bundle.options.container" label="invisible" htmlTag="div" htmlClass="bundle options container" after="product.info.media"/>
+ <move element="product.info" destination="bundle.options.container" before="-"/>
+ </referenceContainer>
+ <referenceContainer name="product.info.type">
+ <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle" as="product_type_data" template="catalog/product/view/type/bundle.phtml">
+ <action method="addPriceBlockType">
+ <argument name="type" xsi:type="string">bundle</argument>
+ <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\Price</argument>
+ <argument name="template" xsi:type="string">catalog/product/view/price.phtml</argument>
+ </action>
+ </block>
+ <container name="product.info.bundle.extra" after="product.info.bundle" as="product_type_data_extra" label="Product Extra Info"/>
+ <block class="Magento\Bundle\Block\Catalog\Product\View" name="customize.button" as="customize_button" template="catalog/product/view/customize.phtml"/>
+ </referenceContainer>
<referenceBlock name="product.clone_prices">
<action method="addPriceBlockType">
<argument name="type" xsi:type="string">bundle</argument>
diff --git a/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_index.xml
index 547ba39c0ee..f56f9a2b65b 100644
--- a/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_index.xml
+++ b/app/code/Magento/Bundle/view/frontend/layout/checkout_cart_index.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="checkout.cart">
+ <referenceBlock name="checkout.cart.form">
<block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::cart/item/default.phtml"/>
</referenceBlock>
<referenceBlock name="checkout.cart.crosssell">
diff --git a/app/code/Magento/Bundle/view/frontend/layout/default.xml b/app/code/Magento/Bundle/view/frontend/layout/default.xml
index c21ff6f807e..30de3dbeb47 100644
--- a/app/code/Magento/Bundle/view/frontend/layout/default.xml
+++ b/app/code/Magento/Bundle/view/frontend/layout/default.xml
@@ -24,8 +24,12 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="cart_sidebar">
- <block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::cart/sidebar/default.phtml"/>
+ <referenceBlock name="wishlist_sidebar">
+ <action method="addPriceBlockType">
+ <argument name="type" xsi:type="string">bundle</argument>
+ <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\Price</argument>
+ <argument name="template" xsi:type="string">catalog/product/price.phtml</argument>
+ </action>
</referenceBlock>
<referenceBlock name="catalog_product_price_template">
<action method="addPriceBlockType">
@@ -34,4 +38,7 @@
<argument name="template" xsi:type="string">catalog/product/price.phtml</argument>
</action>
</referenceBlock>
+ <referenceBlock name="minicart">
+ <block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::cart/sidebar/default.phtml"/>
+ </referenceBlock>
</layout>
diff --git a/app/code/Magento/Bundle/view/frontend/rss/catalog/product/price.phtml b/app/code/Magento/Bundle/view/frontend/rss/catalog/product/price.phtml
index a847fff4d91..e8ab7745d80 100644
--- a/app/code/Magento/Bundle/view/frontend/rss/catalog/product/price.phtml
+++ b/app/code/Magento/Bundle/view/frontend/rss/catalog/product/price.phtml
@@ -18,8 +18,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 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,7 +27,7 @@
/**
* Template for displaying bundle product price in RSS feeds
*
- * @see \Magento\Bundle\Block\Catalog\Product\Price
+ * @var $this \Magento\Bundle\Block\Catalog\Product\Price
*/
?>
diff --git a/app/code/Magento/Bundle/view/frontend/sales/order/creditmemo/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/sales/order/creditmemo/items/renderer.phtml
index 81e3d4dd828..8058ab26283 100644
--- a/app/code/Magento/Bundle/view/frontend/sales/order/creditmemo/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/sales/order/creditmemo/items/renderer.phtml
@@ -18,8 +18,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 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)
*/
@@ -35,228 +33,223 @@
<?php foreach ($items as $_item): ?>
-<?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
- <?php $_showlastRow = true ?>
-<?php else: ?>
- <?php $_showlastRow = false ?>
-<?php endif; ?>
+ <?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
+ <?php $_showlastRow = true ?>
+ <?php else: ?>
+ <?php $_showlastRow = false ?>
+ <?php endif; ?>
-<?php if ($_item->getOrderItem()->getParentItem()): ?>
- <?php $attributes = $this->getSelectionAttributes($_item) ?>
- <?php if ($_prevOptionId != $attributes['option_id']): ?>
- <tr>
- <td><div class="option-label"><?php echo $attributes['option_label'] ?></div></td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- </tr>
- <?php $_prevOptionId = $attributes['option_id'] ?>
+ <?php if ($_item->getOrderItem()->getParentItem()): ?>
+ <?php $attributes = $this->getSelectionAttributes($_item) ?>
+ <?php if ($_prevOptionId != $attributes['option_id']): ?>
+ <tr>
+ <td class="col label" colspan="7"><div class="option label"><?php echo $attributes['option_label'] ?></div></td>
+ </tr>
+ <?php $_prevOptionId = $attributes['option_id'] ?>
+ <?php endif; ?>
<?php endif; ?>
-<?php endif; ?>
<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
<?php if (!$_item->getOrderItem()->getParentItem()): ?>
- <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4>
- </td>
+ <td class="col name">
+ <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
+ </td>
<?php else: ?>
- <td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
+ <td class="col option"><?php echo $this->getValueHtml($_item) ?></td>
<?php endif; ?>
- <td><?php echo $this->escapeHtml($_item->getSku()) ?></td>
- <td class="a-right">
+ <td class="col sku"><?php echo $this->escapeHtml($_item->getSku()) ?></td>
+ <td class="col price">
<?php if ($this->canShowPriceInfo($_item)): ?>
- <?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() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
+ <span class="price excl tax">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
<?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
+ <span class="cart price">
<?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+ <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
<?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
</span>
<?php endif; ?>
<?php endif; ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
<?php else: ?>
- <span class="cart-price">
- <?php endif; ?>
+ <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()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
- <?php else: ?>
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
- <?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()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
+ <?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;">
+ <span class="cart tax info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
+ <?php endforeach; ?>
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
+ <?php endforeach; ?>
</small>
<?php endif; ?>
</span>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
</span>
<?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">
+ </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">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart price">
<?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+ <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
<?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
</span>
<?php endif; ?>
<?php endif; ?>
<?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
<?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 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;">
+ <span class="cart tax info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
+ <?php endforeach; ?>
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
+ <?php endforeach; ?>
</small>
<?php endif; ?>
</span>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total Incl. Tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total Incl. Tax'); ?>:<br/> <?php echo $this->getOrder()->formatPrice($_incl + $this->getItem()->getWeeeTaxAppliedAmount()); ?>
</span>
<?php endif; ?>
<?php endif; ?>
- </span>
- <?php endif; ?>
+ </span>
+ <?php endif; ?>
<?php else: ?>
<?php endif; ?>
</td>
- <td class="a-center">
+ <td class="col qty">
<?php if ($this->canShowPriceInfo($_item)): ?>
<?php echo $_item->getQty()*1 ?>
<?php else: ?>
<?php endif; ?>
</td>
- <td class="a-right">
+ <td class="col subtotal">
<?php if ($this->canShowPriceInfo($_item)): ?>
- <?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()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
+ <?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()): ?>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart price">
+ <?php endif; ?>
+ <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ </span>
+ <?php endif; ?>
+ <?php endif; ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php else: ?>
+ <span class="cart price">
<?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?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: ?>
- <span class="cart-price">
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
<?php endif; ?>
+ </span>
- <?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())): ?>
+ <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
<?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
<small>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
+ </small>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
<?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
- </span>
+ </small>
<?php endif; ?>
+ </span>
+
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total'); ?>:<br/> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal() + $this->getItem()->getWeeeTaxAppliedRowAmount() + $this->getItem()->getWeeeTaxRowDisposition()); ?>
+ </span>
<?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">
+ <span class="price incl tax">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart price">
<?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+ <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
<?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
</span>
<?php endif; ?>
@@ -270,14 +263,14 @@
<?php endif; ?>
</td>
- <td class="a-right">
+ <td class="col discount">
<?php if ($this->canShowPriceInfo($_item)): ?>
<?php echo $this->getOrder()->formatPrice(-$_item->getDiscountAmount()) ?>
<?php else: ?>
<?php endif; ?>
- </td>
- <td class="last a-right">
+ </td>
+ <td class="col rowtotal">
<?php if ($this->canShowPriceInfo($_item)): ?>
<?php echo $this->getOrder()->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()) ?>
<?php else: ?>
@@ -288,41 +281,41 @@
<?php endforeach; ?>
<?php if ($_showlastRow): ?>
-<tr class="border">
- <td>
- <?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>
+ <tr>
+ <td class="col options" colspan="7">
+ <?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 endforeach; ?>
- </dl>
- <?php endif; ?>
- <?php echo $this->escapeHtml($_item->getDescription()) ?>
- <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
- <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>" data-item-id="<?php echo $parentItem->getId() ?>"><?php echo __('Gift Message') ?></a>
- <?php endif; ?>
- </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
-</tr>
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
+ <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
+ <a href="#"
+ id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>"
+ class="action show"
+ aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>"
+ data-item-id="<?php echo $parentItem->getId() ?>">
+ <?php echo __('Gift Message') ?>
+ </a>
+ <?php endif; ?>
+ </td>
+ </tr>
<?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/sales/order/invoice/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/sales/order/invoice/items/renderer.phtml
index dfdadda5c64..32f782df72e 100644
--- a/app/code/Magento/Bundle/view/frontend/sales/order/invoice/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/sales/order/invoice/items/renderer.phtml
@@ -18,8 +18,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 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,321 +30,312 @@
<?php $_index = 0 ?>
<?php $_prevOptionId = '' ?>
-
<?php foreach ($items as $_item): ?>
-<?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
- <?php $_showlastRow = true ?>
-<?php else: ?>
- <?php $_showlastRow = false ?>
-<?php endif; ?>
+ <?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
+ <?php $_showlastRow = true ?>
+ <?php else: ?>
+ <?php $_showlastRow = false ?>
+ <?php endif; ?>
-<?php if ($_item->getOrderItem()->getParentItem()): ?>
- <?php $attributes = $this->getSelectionAttributes($_item) ?>
- <?php if ($_prevOptionId != $attributes['option_id']): ?>
- <tr>
- <td><div class="option-label"><?php echo $attributes['option_label'] ?></div></td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- </tr>
- <?php $_prevOptionId = $attributes['option_id'] ?>
+ <?php if ($_item->getOrderItem()->getParentItem()): ?>
+ <?php $attributes = $this->getSelectionAttributes($_item) ?>
+ <?php if ($_prevOptionId != $attributes['option_id']): ?>
+ <tr>
+ <td class="col label" colspan="5"><div class="option label"><?php echo $attributes['option_label'] ?></div></td>
+ </tr>
+ <?php $_prevOptionId = $attributes['option_id'] ?>
+ <?php endif; ?>
<?php endif; ?>
-<?php endif; ?>
-<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
+ <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
<?php if (!$_item->getOrderItem()->getParentItem()): ?>
- <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4></td>
+ <td class="col name">
+ <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
+ </td>
<?php else: ?>
- <td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
+ <td class="col value"><?php echo $this->getValueHtml($_item) ?></td>
<?php endif; ?>
- <td><?php echo $this->escapeHtml($_item->getSku()) ?></td>
- <td class="a-right">
+ <td class="col sku"><?php echo $this->escapeHtml($_item->getSku()) ?></td>
+ <td class="col price">
<?php if ($this->canShowPriceInfo($_item)): ?>
- <?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() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
+ <span class="price excl tax">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
<?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
+ <span class="cart price">
<?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+ <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
<?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
</span>
<?php endif; ?>
<?php endif; ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?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()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
<?php else: ?>
- <span class="cart-price">
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
<?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()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
- <?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;">
+ <span class="cart tax info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
+ style="display:none;">
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
+ <?php endforeach; ?>
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
+ <?php endforeach; ?>
</small>
<?php endif; ?>
</span>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
</span>
<?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">
+ </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">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart price">
<?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+ <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
<?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
</span>
<?php endif; ?>
<?php endif; ?>
<?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
<?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 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;">
+ <span class="cart tax info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
+ <?php endforeach; ?>
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
+ <?php endforeach; ?>
</small>
<?php endif; ?>
</span>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
</span>
<?php endif; ?>
<?php endif; ?>
- </span>
- <?php endif; ?>
+ </span>
+ <?php endif; ?>
<?php else: ?>
<?php endif; ?>
</td>
- <td class="a-center">
+ <td class="col qty">
<?php if ($this->canShowPriceInfo($_item)): ?>
<?php echo $_item->getQty()*1 ?>
<?php else: ?>
<?php endif; ?>
</td>
- <td class="a-right">
+ <td class="col subtotal">
<?php if ($this->canShowPriceInfo($_item)): ?>
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
- <span class="price-excl-tax">
+ <span class="price excl tax">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
<?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
+ <span class="cart price">
<?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+ <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
<?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
</span>
<?php endif; ?>
<?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
<?php else: ?>
- <span class="cart-price">
+ <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; ?>
-
- <?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;">
+ <span class="cart tax info" id="esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
+ <?php endforeach; ?>
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small>
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
+ <?php endforeach; ?>
</small>
<?php endif; ?>
</span>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
</span>
<?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">
+ <?php endif; ?>
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
+ <span class="price incl tax">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart price">
<?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+ <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
<?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
</span>
<?php endif; ?>
<?php endif; ?>
<?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
<?php else: ?>
- <span class="cart-price">
+ <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()->getWeeeTaxAppliedRowAmount()); ?>
+ <?php else: ?>
+ <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
<?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()->getWeeeTaxAppliedRowAmount()); ?>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
<?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
<?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
+ </small>
+ <?php endif; ?>
+ </span>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
- </span>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
+ </span>
<?php endif; ?>
<?php endif; ?>
-
-
-
</span>
- <?php endif; ?>
- <?php else: ?>
-
- <?php endif; ?>
- </td>
-</tr>
+ <?php endif; ?>
+ <?php else: ?>
+
+ <?php endif; ?>
+ </td>
+ </tr>
<?php endforeach; ?>
<?php if ($_showlastRow): ?>
-<tr class="border">
- <td>
- <?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>
+ <tr>
+ <td class="col options" colspan="5">
+ <?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 endforeach; ?>
- </dl>
- <?php endif; ?>
- <?php echo $this->escapeHtml($_item->getDescription()) ?>
- <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
- <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>" data-item-id="<?php echo $parentItem->getId() ?>"><?php echo __('Gift Message') ?></a>
- <?php endif; ?>
- </td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
-</tr>
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
+ <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
+ <a href="#"
+ id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>"
+ class="action show"
+ aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>"
+ data-item-id="<?php echo $parentItem->getId() ?>">
+ <?php echo __('Gift Message') ?>
+ </a>
+ <?php endif; ?>
+ </td>
+ </tr>
<?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/sales/order/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/sales/order/items/renderer.phtml
index f474b7a616d..5b1e56d2135 100644
--- a/app/code/Magento/Bundle/view/frontend/sales/order/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/sales/order/items/renderer.phtml
@@ -18,8 +18,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 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)
*/
@@ -35,343 +33,330 @@
<?php foreach ($items as $_item): ?>
-<?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
- <?php $_showlastRow = true ?>
-<?php else: ?>
- <?php $_showlastRow = false ?>
-<?php endif; ?>
+ <?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
+ <?php $_showlastRow = true ?>
+ <?php else: ?>
+ <?php $_showlastRow = false ?>
+ <?php endif; ?>
-<?php if ($_item->getParentItem()): ?>
- <?php $attributes = $this->getSelectionAttributes($_item) ?>
- <?php if ($_prevOptionId != $attributes['option_id']): ?>
- <tr<?php if ($_item->getLastRow()) echo 'class="last"'; ?>>
- <td><div class="option-label"><?php echo $attributes['option_label'] ?></div></td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
- </tr>
- <?php $_prevOptionId = $attributes['option_id'] ?>
+ <?php if ($_item->getParentItem()): ?>
+ <?php $attributes = $this->getSelectionAttributes($_item) ?>
+ <?php if ($_prevOptionId != $attributes['option_id']): ?>
+ <tr<?php if ($_item->getLastRow()) echo 'class="last"'; ?>>
+ <td class="col label" colspan="5"><div class="option label"><?php echo $attributes['option_label'] ?></div></td>
+ </tr>
+ <?php $_prevOptionId = $attributes['option_id'] ?>
+ <?php endif; ?>
<?php endif; ?>
-<?php endif; ?>
<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
-
<?php if (!$_item->getParentItem()): ?>
- <td><h3 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h3></td>
+ <td class="col name">
+ <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
+ </td>
<?php else: ?>
- <td><div class="option-value"><?php echo $this->getValueHtml($_item)?></div></td>
+ <td class="col value"><?php echo $this->getValueHtml($_item)?></td>
<?php endif; ?>
- <td><?php echo $this->prepareSku($_item->getSku()) ?></td>
- <td class="a-right">
+ <td class="col sku"><?php echo $this->prepareSku($_item->getSku()) ?></td>
+ <td class="col price">
<?php if (!$_item->getParentItem()): ?>
- <?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() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
+ <span class="price excl tax">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
<?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
+ <span class="cart price">
<?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+ <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
<?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
</span>
<?php endif; ?>
<?php endif; ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
<?php else: ?>
- <span class="cart-price">
+ <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()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
+ <?php else: ?>
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
<?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()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
- <?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;">
+ <span class="cart tax info" id="eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
+ style="display:none;">
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
+ <?php endforeach; ?>
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
+ <?php endforeach; ?>
</small>
<?php endif; ?>
</span>
-
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
</span>
<?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">
+ </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">
<?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart price">
<?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+ <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
<?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
+ </span>
<?php endif; ?>
<?php endif; ?>
<?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?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: ?>
- <span class="cart-price">
+ <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxDisposition()) ?>
<?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
+ <span class="cart tax info" id="unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"
+ style="display:none;">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
<?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
<?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
+ </small>
+ <?php endif; ?>
</span>
-
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
</span>
<?php endif; ?>
<?php endif; ?>
- </span>
- <?php endif; ?>
+ </span>
+ <?php endif; ?>
<?php else: ?>
<?php endif; ?>
</td>
- <td class="a-right">
+ <td class="col qty">
<?php if (($_item->getParentItem() && $this->isChildCalculated()) ||
- (!$_item->getParentItem() && !$this->isChildCalculated())): ?>
- <span class="nobr">
+ (!$_item->getParentItem() && !$this->isChildCalculated())): ?>
<?php if ($_item->getQtyOrdered() > 0): ?>
<?php echo __('Ordered'); ?>: <strong><?php echo $_item->getQtyOrdered()*1 ?></strong><br />
<?php endif; ?>
- <?php if ($_item->getQtyShipped() > 0 && !$this->isShipmentSeparately()): ?>
- <?php echo __('Shipped'); ?>: <strong><?php echo $_item->getQtyShipped()*1 ?></strong><br />
- <?php endif; ?>
- <?php if ($_item->getQtyCanceled() > 0): ?>
- <?php echo __('Canceled'); ?>: <strong><?php echo $_item->getQtyCanceled()*1 ?></strong><br />
- <?php endif; ?>
- <?php if ($_item->getQtyRefunded() > 0): ?>
- <?php echo __('Refunded'); ?>: <strong><?php echo $_item->getQtyRefunded()*1 ?></strong>
- <?php endif; ?>
- </span>
+ <?php if ($_item->getQtyShipped() > 0 && !$this->isShipmentSeparately()): ?>
+ <?php echo __('Shipped'); ?>: <strong><?php echo $_item->getQtyShipped()*1 ?></strong><br />
+ <?php endif; ?>
+ <?php if ($_item->getQtyCanceled() > 0): ?>
+ <?php echo __('Canceled'); ?>: <strong><?php echo $_item->getQtyCanceled()*1 ?></strong><br />
+ <?php endif; ?>
+ <?php if ($_item->getQtyRefunded() > 0): ?>
+ <?php echo __('Refunded'); ?>: <strong><?php echo $_item->getQtyRefunded()*1 ?></strong>
+ <?php endif; ?>
<?php elseif ($_item->getQtyShipped() > 0 && $_item->getParentItem() && $this->isShipmentSeparately()): ?>
- <span class="nobr"><?php echo __('Shipped'); ?>: <strong><?php echo $_item->getQtyShipped()*1 ?></strong></span>
+ <?php echo __('Shipped'); ?>: <strong><?php echo $_item->getQtyShipped()*1 ?></strong>
<?php else: ?>
<?php endif; ?>
</td>
- <td class="a-right">
+ <td class="col subtotal">
<?php if (!$_item->getParentItem()): ?>
<?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()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
+ <span class="price excl tax">
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart price">
<?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
+ <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
</span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
- </span>
- <?php endif; ?>
+ <?php endif; ?>
+ <?php endif; ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?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;">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
+ <?php endforeach; ?>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
+ <?php endforeach; ?>
+ </small>
<?php endif; ?>
</span>
- <br />
+
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
+ </span>
+ <?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">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
+ <span class="price incl tax">
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart price">
<?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <?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()->getWeeeTaxAppliedRowAmount()); ?>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
+ <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
</span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total Incl. Tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
- </span>
- <?php endif; ?>
<?php endif; ?>
+ <?php endif; ?>
+ <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?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()->getWeeeTaxAppliedRowAmount()); ?>
+ <?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;">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
+ <?php endforeach; ?>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
+ <?php endforeach; ?>
+ </small>
+ <?php endif; ?>
</span>
+
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total Incl. Tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
+ </span>
+ <?php endif; ?>
+ <?php endif; ?>
+ </span>
<?php endif; ?>
<?php else: ?>
<?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>
<?php endforeach; ?>
-
<?php if ($_showlastRow): ?>
-<tr class="border">
- <td>
+<tr>
+ <td class="col options" colspan="5">
<?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>
+ <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; ?>
- </dd>
- <?php else: ?>
- <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
- <?php endif; ?>
- <?php endforeach; ?>
- </dl>
+ <?php endforeach; ?>
+ </dl>
<?php endif; ?>
<?php echo $this->escapeHtml($_item->getDescription()) ?>
<?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
- <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>" data-item-id="<?php echo $parentItem->getId()?>"><?php echo __('Gift Message') ?></a>
+ <a href="#"
+ id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>"
+ class="action show"
+ aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>"
+ data-item-id="<?php echo $parentItem->getId()?>">
+ <?php echo __('Gift Message') ?>
+ </a>
<?php endif; ?>
</td>
- <td> </td>
- <td> </td>
- <td> </td>
- <td> </td>
</tr>
<?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/sales/order/shipment/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/sales/order/shipment/items/renderer.phtml
index 11d3d9abee3..0abef02f060 100644
--- a/app/code/Magento/Bundle/view/frontend/sales/order/shipment/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/sales/order/shipment/items/renderer.phtml
@@ -18,8 +18,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 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)
*/
@@ -34,78 +32,82 @@
<?php foreach ($items as $_item): ?>
-<?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
- <?php $_showlastRow = true ?>
-<?php else: ?>
- <?php $_showlastRow = false ?>
-<?php endif; ?>
-
-<?php if ($_item->getParentItem()): ?>
- <?php $attributes = $this->getSelectionAttributes($_item) ?>
- <?php if ($_prevOptionId != $attributes['option_id']): ?>
- <tr>
- <td><div class="option-label"><?php echo $attributes['option_label'] ?></div></td>
- <td> </td>
- <td> </td>
- </tr>
- <?php $_prevOptionId = $attributes['option_id'] ?>
- <?php endif; ?>
-<?php endif; ?>
-<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
- <?php if (!$_item->getParentItem()): ?>
- <td><h4 class="product-name"><?php echo $this->escapeHtml($_item->getName()) ?></h4></td>
+ <?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
+ <?php $_showlastRow = true ?>
<?php else: ?>
- <td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
+ <?php $_showlastRow = false ?>
<?php endif; ?>
- <td><?php echo $this->escapeHtml($_item->getSku()) ?></td>
- <td class="a-center">
- <?php if (($this->isShipmentSeparately() && $_item->getParentItem()) || (!$this->isShipmentSeparately() && !$_item->getParentItem())): ?>
- <?php if (isset($shipItems[$_item->getId()])): ?>
- <?php echo $shipItems[$_item->getId()]->getQty()*1 ?>
- <?php elseif ($_item->getIsVirtual()): ?>
- <?php echo __('N/A') ?>
- <?php else: ?>
- 0
- <?php endif; ?>
+
+ <?php if ($_item->getParentItem()): ?>
+ <?php $attributes = $this->getSelectionAttributes($_item) ?>
+ <?php if ($_prevOptionId != $attributes['option_id']): ?>
+ <tr>
+ <td colspan="3" class="col label"><div class="option label"><?php echo $attributes['option_label'] ?></div></td>
+ </tr>
+ <?php $_prevOptionId = $attributes['option_id'] ?>
+ <?php endif; ?>
+ <?php endif; ?>
+ <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
+ <?php if (!$_item->getParentItem()): ?>
+ <td class="col name">
+ <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
+ </td>
<?php else: ?>
-
+ <td class="col value"><?php echo $this->getValueHtml($_item) ?></td>
<?php endif; ?>
- </td>
-</tr>
+ <td class="col sku"><?php echo $this->escapeHtml($_item->getSku()) ?></td>
+ <td class="col price">
+ <?php if (($this->isShipmentSeparately() && $_item->getParentItem()) || (!$this->isShipmentSeparately() && !$_item->getParentItem())): ?>
+ <?php if (isset($shipItems[$_item->getId()])): ?>
+ <?php echo $shipItems[$_item->getId()]->getQty()*1 ?>
+ <?php elseif ($_item->getIsVirtual()): ?>
+ <?php echo __('N/A') ?>
+ <?php else: ?>
+ 0
+ <?php endif; ?>
+ <?php else: ?>
+
+ <?php endif; ?>
+ </td>
+ </tr>
<?php endforeach; ?>
<?php if ($_showlastRow): ?>
-<tr class="border">
- <td>
- <?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>
+ <tr>
+ <td class="col options" colspan="3">
+ <?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 endforeach; ?>
- </dl>
- <?php endif; ?>
- <?php echo $this->escapeHtml($_item->getDescription()) ?>
- <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
- <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>" data-item-id="<?php echo $parentItem->getId() ?>"><?php echo __('Gift Message') ?></a>
- <?php endif; ?>
- </td>
- <td> </td>
- <td> </td>
-</tr>
+ <?php echo $this->escapeHtml($_item->getDescription()) ?>
+ <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
+ <a href="#"
+ id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>"
+ class="action show"
+ aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>"
+ data-item-id="<?php echo $parentItem->getId() ?>">
+ <?php echo __('Gift Message') ?>
+ </a>
+ <?php endif; ?>
+ </td>
+ </tr>
<?php endif; ?>
diff --git a/app/code/Magento/Captcha/Block/Adminhtml/Captcha/DefaultCaptcha.php b/app/code/Magento/Captcha/Block/Adminhtml/Captcha/DefaultCaptcha.php
new file mode 100644
index 00000000000..74b0d87dc93
--- /dev/null
+++ b/app/code/Magento/Captcha/Block/Adminhtml/Captcha/DefaultCaptcha.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.
+ *
+ * @category Magento
+ * @package Magento_Captcha
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+/**
+ * Captcha block for adminhtml area
+ *
+ * @category Core
+ * @package Magento_Captcha
+ * @author Magento Core Team <core@magentocommerce.com>
+ */
+namespace Magento\Captcha\Block\Adminhtml\Captcha;
+
+class DefaultCaptcha extends \Magento\Captcha\Block\Captcha\DefaultCaptcha
+{
+ /**
+ * @var \Magento\Backend\Model\Url
+ */
+ protected $_url;
+
+ /**
+ * @var \Magento\Backend\App\ConfigInterface
+ */
+ protected $_config;
+
+ /**
+ * @param \Magento\View\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\Captcha\Helper\Data $captchaData
+ * @param \Magento\Backend\Model\Url $url
+ * @param \Magento\Backend\App\ConfigInterface $config
+ * @param array $data
+ */
+ public function __construct(
+ \Magento\View\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\Captcha\Helper\Data $captchaData,
+ \Magento\Backend\Model\Url $url,
+ \Magento\Backend\App\ConfigInterface $config,
+ array $data = array()
+ ) {
+ parent::__construct($context, $coreData, $captchaData, $data);
+ $this->_url = $url;
+ $this->_config = $config;
+ }
+
+
+ /**
+ * Returns URL to controller action which returns new captcha image
+ *
+ * @return string
+ */
+ public function getRefreshUrl()
+ {
+ return $this->_url->getUrl('adminhtml/refresh/refresh', array(
+ '_secure' => $this->_config->getFlag('web/secure/use_in_adminhtml'),
+ '_nosecret' => true
+ ));
+ }
+}
diff --git a/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php b/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php
index d351063c5d9..824eded230e 100644
--- a/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php
+++ b/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php
@@ -80,15 +80,8 @@ class DefaultCaptcha extends \Magento\View\Block\Template
*/
public function getRefreshUrl()
{
- $urlPath = 'captcha/refresh';
- $params = array('_secure' => $this->_storeManager->getStore()->isCurrentlySecure());
-
- if ($this->_storeManager->getStore()->isAdmin()) {
- $urlPath = 'adminhtml/refresh/refresh';
- $params = array_merge($params, array('_nosecret' => true));
- }
-
- return $this->_storeManager->getStore()->getUrl($urlPath, $params);
+ $store = $this->_storeManager->getStore();
+ return $store->getUrl('captcha/refresh', array('_secure' => $store->isCurrentlySecure()));
}
/**
diff --git a/app/code/Magento/Captcha/Helper/Adminhtml/Data.php b/app/code/Magento/Captcha/Helper/Adminhtml/Data.php
new file mode 100644
index 00000000000..fa81278fd7c
--- /dev/null
+++ b/app/code/Magento/Captcha/Helper/Adminhtml/Data.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_Captcha
+ * @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ */
+
+/**
+ * Captcha helper for adminhtml area
+ *
+ * @category Magento
+ * @package Magento_Captcha
+ * @author Magento Core Team <core@magentocommerce.com>
+ */
+namespace Magento\Captcha\Helper\Adminhtml;
+
+class Data extends \Magento\Captcha\Helper\Data
+{
+ /**
+ * @var \Magento\Backend\App\ConfigInterface
+ */
+ protected $_backendConfig;
+
+ /**
+ * @param \Magento\App\Helper\Context $context
+ * @param \Magento\App\Dir $dirs
+ * @param \Magento\Core\Model\StoreManager $storeManager
+ * @param \Magento\Core\Model\Config $config
+ * @param \Magento\Filesystem $filesystem
+ * @param \Magento\Captcha\Model\CaptchaFactory $factory
+ * @param \Magento\Backend\App\ConfigInterface $backendConfig
+ */
+ public function __construct(
+ \Magento\App\Helper\Context $context,
+ \Magento\App\Dir $dirs,
+ \Magento\Core\Model\StoreManager $storeManager,
+ \Magento\Core\Model\Config $config,
+ \Magento\Filesystem $filesystem,
+ \Magento\Captcha\Model\CaptchaFactory $factory,
+ \Magento\Backend\App\ConfigInterface $backendConfig
+ ) {
+ $this->_backendConfig = $backendConfig;
+ parent::__construct($context, $dirs, $storeManager, $config, $filesystem, $factory);
+ }
+
+
+ /**
+ * Returns config value for admin captcha
+ *
+ * @param string $key The last part of XML_PATH_$area_CAPTCHA_ constant (case insensitive)
+ * @param \Magento\Core\Model\Store $store
+ * @return \Magento\Core\Model\Config\Element
+ */
+ public function getConfig($key, $store = null)
+ {
+ return $this->_backendConfig->getValue('admin/captcha/' . $key);
+ }
+
+ /**
+ * Get website code
+ *
+ * @param mixed $website
+ * @return string
+ */
+ protected function _getWebsiteCode($website = null)
+ {
+ return 'admin';
+ }
+}
diff --git a/app/code/Magento/Captcha/Helper/Data.php b/app/code/Magento/Captcha/Helper/Data.php
index 5c0e6ddaa00..21d0ccb1d70 100644
--- a/app/code/Magento/Captcha/Helper/Data.php
+++ b/app/code/Magento/Captcha/Helper/Data.php
@@ -24,15 +24,11 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Captcha\Helper;
+
/**
* Captcha image model
- *
- * @category Magento
- * @package Magento_Captcha
- * @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Captcha\Helper;
-
class Data extends \Magento\App\Helper\AbstractHelper
{
/**
@@ -146,9 +142,7 @@ class Data extends \Magento\App\Helper\AbstractHelper
*/
public function getConfig($key, $store = null)
{
- $store = $this->_storeManager->getStore($store);
- $areaCode = $store->isAdmin() ? 'admin' : 'customer';
- return $store->getConfig($areaCode . '/captcha/' . $key);
+ return $this->_storeManager->getStore($store)->getConfig('customer/captcha/' . $key);
}
/**
@@ -184,13 +178,24 @@ class Data extends \Magento\App\Helper\AbstractHelper
public function getImgDir($website = null)
{
$mediaDir = $this->_dirs->getDir(\Magento\App\Dir::MEDIA);
- $captchaDir = $mediaDir . '/captcha/' . $this->_storeManager->getWebsite($website)->getCode();
+ $captchaDir = $mediaDir . '/captcha/' . $this->_getWebsiteCode($website);
$this->_filesystem->setWorkingDirectory($mediaDir);
$this->_filesystem->setIsAllowCreateDirectories(true);
$this->_filesystem->ensureDirectoryExists($captchaDir, 0775);
return $captchaDir . '/';
}
+ /**
+ * Get website code
+ *
+ * @param mixed $website
+ * @return string
+ */
+ protected function _getWebsiteCode($website = null)
+ {
+ return $this->_storeManager->getWebsite($website)->getCode();
+ }
+
/**
* Get captcha image base URL
*
diff --git a/app/code/Magento/Captcha/Model/Cron.php b/app/code/Magento/Captcha/Model/Cron.php
new file mode 100644
index 00000000000..5efbe7caa5c
--- /dev/null
+++ b/app/code/Magento/Captcha/Model/Cron.php
@@ -0,0 +1,144 @@
+<?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_Captcha
+ * @copyright Copyright (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\Captcha\Model;
+
+/**
+ * Captcha cron actions
+ */
+class Cron
+{
+ /**
+ * CAPTCHA helper
+ *
+ * @var \Magento\Captcha\Helper\Data
+ */
+ protected $_helper;
+
+ /**
+ * CAPTCHA helper
+ *
+ * @var \Magento\Captcha\Helper\Adminhtml\Data
+ */
+ protected $_adminHelper;
+
+ /**
+ * @var \Magento\Filesystem
+ */
+ protected $_filesystem;
+
+ /**
+ * @var \Magento\Core\Model\StoreManager
+ */
+ protected $_storeManager;
+
+ /**
+ * @var \Magento\Captcha\Model\Resource\LogFactory
+ */
+ protected $_resLogFactory;
+
+ /**
+ * @param Resource\LogFactory $resLogFactory
+ * @param \Magento\Captcha\Helper\Data $helper
+ * @param \Magento\Captcha\Helper\Adminhtml\Data $adminHelper
+ * @param \Magento\Filesystem $filesystem
+ * @param \Magento\Core\Model\StoreManager $storeManager
+ */
+ public function __construct(
+ \Magento\Captcha\Model\Resource\LogFactory $resLogFactory,
+ \Magento\Captcha\Helper\Data $helper,
+ \Magento\Captcha\Helper\Adminhtml\Data $adminHelper,
+ \Magento\Filesystem $filesystem,
+ \Magento\Core\Model\StoreManager $storeManager
+ ) {
+ $this->_resLogFactory = $resLogFactory;
+ $this->_helper = $helper;
+ $this->_adminHelper = $adminHelper;
+ $this->_filesystem = $filesystem;
+ $this->_storeManager = $storeManager;
+ }
+
+ /**
+ * Delete Unnecessary logged attempts
+ *
+ * @return \Magento\Captcha\Model\Observer
+ */
+ public function deleteOldAttempts()
+ {
+ $this->_getResourceModel()->deleteOldAttempts();
+ return $this;
+ }
+
+ /**
+ * Delete Expired Captcha Images
+ *
+ * @return \Magento\Captcha\Model\Observer
+ */
+ public function deleteExpiredImages()
+ {
+ foreach ($this->_storeManager->getWebsites() as $website) {
+ $this->_deleteExpiredImagesForWebsite($this->_helper, $website, $website->getDefaultStore());
+ }
+ $this->_deleteExpiredImagesForWebsite($this->_adminHelper);
+ return $this;
+ }
+
+ /**
+ * Delete Expired Captcha Images for specific website
+ *
+ * @param \Magento\Captcha\Helper\Data $helper
+ * @param \Magento\Core\Model\Website|null $website
+ * @param \Magento\Core\Model\Store|null $store
+ * @return \Magento\Captcha\Model\Observer
+ */
+ protected function _deleteExpiredImagesForWebsite(
+ \Magento\Captcha\Helper\Data $helper,
+ \Magento\Core\Model\Website $website = null,
+ \Magento\Core\Model\Store $store = null
+ ) {
+ $expire = time() - $helper->getConfig('timeout', $store) * 60;
+ $imageDirectory = $helper->getImgDir($website);
+ foreach ($this->_filesystem->getNestedKeys($imageDirectory) as $filePath) {
+ if ($this->_filesystem->isFile($filePath)
+ && pathinfo($filePath, PATHINFO_EXTENSION) == 'png'
+ && $this->_filesystem->getMTime($filePath) < $expire) {
+ $this->_filesystem->delete($filePath);
+ }
+ }
+ }
+
+ /**
+ * Get resource model
+ *
+ * @return \Magento\Captcha\Model\Resource\Log
+ */
+ protected function _getResourceModel()
+ {
+ return $this->_resLogFactory->create();
+ }
+
+}
+
diff --git a/app/code/Magento/Captcha/Model/Observer.php b/app/code/Magento/Captcha/Model/Observer.php
index 28c0ece35a8..d08a7782c92 100644
--- a/app/code/Magento/Captcha/Model/Observer.php
+++ b/app/code/Magento/Captcha/Model/Observer.php
@@ -49,11 +49,6 @@ class Observer
*/
protected $_urlManager;
- /**
- * @var \Magento\Filesystem
- */
- protected $_filesystem;
-
/**
* Customer data
*
@@ -73,11 +68,6 @@ class Observer
*/
protected $_request;
- /**
- * @var \Magento\Core\Model\StoreManagerInterface
- */
- protected $_storeManager;
-
/**
* @var \Magento\Checkout\Model\Type\Onepage
*/
@@ -106,9 +96,7 @@ class Observer
* @param \Magento\Customer\Helper\Data $customerData
* @param \Magento\Captcha\Helper\Data $helper
* @param \Magento\Core\Model\Url $urlManager
- * @param \Magento\Filesystem $filesystem
* @param \Magento\App\RequestInterface $request
- * @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\App\ActionFlag $actionFlag
*/
public function __construct(
@@ -119,9 +107,7 @@ class Observer
\Magento\Customer\Helper\Data $customerData,
\Magento\Captcha\Helper\Data $helper,
\Magento\Core\Model\Url $urlManager,
- \Magento\Filesystem $filesystem,
\Magento\App\RequestInterface $request,
- \Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\App\ActionFlag $actionFlag
) {
$this->_resLogFactory = $resLogFactory;
@@ -131,9 +117,7 @@ class Observer
$this->_customerData = $customerData;
$this->_helper = $helper;
$this->_urlManager = $urlManager;
- $this->_filesystem = $filesystem;
$this->_request = $request;
- $this->_storeManager = $storeManager;
$this->_actionFlag = $actionFlag;
}
@@ -354,38 +338,6 @@ class Observer
);
}
- /**
- * Delete Unnecessary logged attempts
- *
- * @return \Magento\Captcha\Model\Observer
- */
- public function deleteOldAttempts()
- {
- $this->_getResourceModel()->deleteOldAttempts();
- return $this;
- }
-
- /**
- * Delete Expired Captcha Images
- *
- * @return \Magento\Captcha\Model\Observer
- */
- public function deleteExpiredImages()
- {
- foreach ($this->_storeManager->getWebsites(true) as $website) {
- $expire = time() - $this->_helper->getConfig('timeout', $website->getDefaultStore()) * 60;
- $imageDirectory = $this->_helper->getImgDir($website);
- foreach ($this->_filesystem->getNestedKeys($imageDirectory) as $filePath) {
- if ($this->_filesystem->isFile($filePath)
- && pathinfo($filePath, PATHINFO_EXTENSION) == 'png'
- && $this->_filesystem->getMTime($filePath) < $expire) {
- $this->_filesystem->delete($filePath);
- }
- }
- }
- return $this;
- }
-
/**
* Get Captcha String
*
diff --git a/app/code/Magento/Captcha/etc/adminhtml/di.xml b/app/code/Magento/Captcha/etc/adminhtml/di.xml
index 4194bf6a107..cccf21421cd 100644
--- a/app/code/Magento/Captcha/etc/adminhtml/di.xml
+++ b/app/code/Magento/Captcha/etc/adminhtml/di.xml
@@ -24,10 +24,14 @@
*/
-->
<config>
+ <preference for="Magento\Captcha\Block\Captcha\DefaultCaptcha" type="Magento\Captcha\Block\Adminhtml\Captcha\DefaultCaptcha" />
<type name="Magento\Captcha\Model\DefaultModel">
<param name="session">
<instance type="Magento\Backend\Model\Auth\Session" />
</param>
+ <param name="captchaData">
+ <instance type="Magento\Captcha\Helper\Adminhtml\Data" />
+ </param>
</type>
<type name="Magento\Captcha\Model\Observer">
<param name="session">
diff --git a/app/code/Magento/Captcha/etc/crontab.xml b/app/code/Magento/Captcha/etc/crontab.xml
index c12fd479f86..7f8ec305440 100644
--- a/app/code/Magento/Captcha/etc/crontab.xml
+++ b/app/code/Magento/Captcha/etc/crontab.xml
@@ -24,10 +24,10 @@
*/
-->
<config>
- <job name="captcha_delete_old_attempts" instance="Magento\Captcha\Model\Observer" method="deleteOldAttempts">
+ <job name="captcha_delete_old_attempts" instance="Magento\Captcha\Model\Cron" method="deleteOldAttempts">
<schedule>*/30 * * * *</schedule>
</job>
- <job name="captcha_delete_expired_images" instance="Magento\Captcha\Model\Observer" method="deleteExpiredImages">
+ <job name="captcha_delete_expired_images" instance="Magento\Captcha\Model\Cron" method="deleteExpiredImages">
<schedule>*/10 * * * *</schedule>
</job>
</config>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/tag_product_list.xml b/app/code/Magento/Captcha/etc/crontab/di.xml
similarity index 89%
rename from app/code/Magento/Catalog/view/frontend/layout/tag_product_list.xml
rename to app/code/Magento/Captcha/etc/crontab/di.xml
index 2c2e829daa8..c538e5dbf4a 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/tag_product_list.xml
+++ b/app/code/Magento/Captcha/etc/crontab/di.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">
- <update handle="MAP_popup"/>
-</layout>
+<config>
+ <preference for="Magento\Backend\App\ConfigInterface" type="Magento\Backend\App\Config" />
+</config>
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
index 8d50e246bb5..28883bd87f7 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -116,14 +116,14 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
$this->setChild('store_switcher',
$this->getLayout()->createBlock('Magento\Backend\Block\Store\Switcher')
->setSwitchUrl($this->getUrl('catalog/*/*', array('_current'=>true, '_query'=>false, 'store'=>null)))
- ->setTemplate('Magento_Adminhtml::store/switcher/enhanced.phtml')
+ ->setTemplate('Magento_Backend::store/switcher/enhanced.phtml')
);
return parent::_prepareLayout();
}
protected function _getDefaultStoreId()
{
- return \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID;
+ return \Magento\Core\Model\Store::DEFAULT_STORE_ID;
}
public function getCategoryCollection()
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
index 00c11072748..95d8fb7364d 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php
@@ -183,6 +183,6 @@ class Element
*/
protected function _getDefaultStoreId()
{
- return \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID;
+ return \Magento\Core\Model\Store::DEFAULT_STORE_ID;
}
}
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
index dc181e25774..d4c7b7c8b72 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
@@ -34,8 +34,7 @@
namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab;
-class Front
- extends \Magento\Backend\Block\Widget\Form\Generic
+class Front extends \Magento\Backend\Block\Widget\Form\Generic
{
/**
* @var \Magento\Backend\Model\Config\Source\Yesno
@@ -152,7 +151,7 @@ class Front
'values' => $yesnoSource,
));
- $htmlAllowed = $fieldset->addField('is_html_allowed_on_front', 'select', array(
+ $fieldset->addField('is_html_allowed_on_front', 'select', array(
'name' => 'is_html_allowed_on_front',
'label' => __('Allow HTML Tags on Frontend'),
'title' => __('Allow HTML Tags on Frontend'),
@@ -185,6 +184,11 @@ class Front
'values' => $yesnoSource,
));
+ $this->_eventManager->dispatch('adminhtml_catalog_product_attribute_edit_frontend_prepare_form', array(
+ 'form' => $form,
+ 'attribute' => $attributeObject
+ ));
+
// define field dependencies
$this->setChild(
'form_after',
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
index 8c3de01c977..15c121b7405 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Main.php
@@ -102,12 +102,6 @@ class Main extends \Magento\Eav\Block\Adminhtml\Attribute\Edit\Main\AbstractMain
$frontendInputValues = array_merge($frontendInputElm->getValues(), $additionalTypes);
$frontendInputElm->setValues($frontendInputValues);
-
- $this->_eventManager->dispatch('adminhtml_catalog_product_attribute_edit_prepare_form', array(
- 'form' => $form,
- 'attribute' => $attributeObject
- ));
-
return $this;
}
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php
index 9ecdea26602..29cf7ab0013 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Attribute.php
@@ -32,7 +32,7 @@
namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main\Tree;
-class Attribute extends \Magento\Adminhtml\Block\Template
+class Attribute extends \Magento\Backend\Block\Template
{
protected $_template = 'catalog/product/attribute/set/main/tree/attribute.phtml';
}
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php
index 44e900b8a8a..13dc46ea63c 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php
@@ -32,7 +32,7 @@
namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main\Tree;
-class Group extends \Magento\Adminhtml\Block\Template
+class Group extends \Magento\Backend\Block\Template
{
protected $_template = 'catalog/product/attribute/set/main/tree/group.phtml';
}
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
index 26b253143b7..9fb3987400d 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Toolbar;
-class Add extends \Magento\Adminhtml\Block\Template
+class Add extends \Magento\Backend\Block\Template
{
protected $_template = 'catalog/product/attribute/set/toolbar/add.phtml';
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
index 763b599c103..e51457eb6bd 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
@@ -63,7 +63,7 @@ class Configurable extends \Magento\Catalog\Block\Product\View\Type\Configurable
}
/**
- * Returns additional values for js config, con be overriden by descedants
+ * Returns additional values for js config, con be overridden by descendants
*
* @return array
*/
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
index bbf5f15c66d..3de2bf5166f 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
@@ -43,22 +43,22 @@ class Attributes
*/
protected $_productFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Registry $registry
- * @param \Magento\Data\FormFactory $formFactory
- * @param \Magento\Catalog\Model\ProductFactory $productFactory
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\Core\Model\Registry $registry
+ * @param \Magento\Data\FormFactory $formFactory
+ * @param \Magento\Catalog\Model\ProductFactory $productFactory
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Registry $registry,
- \Magento\Data\FormFactory $formFactory,
- \Magento\Catalog\Model\ProductFactory $productFactory,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\Core\Model\Registry $registry,
+ \Magento\Data\FormFactory $formFactory,
+ \Magento\Catalog\Model\ProductFactory $productFactory,
+ array $data = array()
+ ) {
$this->_productFactory = $productFactory;
parent::__construct($context, $coreData, $registry, $formFactory, $data);
}
@@ -102,7 +102,7 @@ class Attributes
}
/**
- * Retrive attributes for product massupdate
+ * Retrieve attributes for product mass update
*
* @return array
*/
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php
index f18d195891e..f3d3f7663de 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php
@@ -26,7 +26,7 @@
namespace Magento\Catalog\Block\Adminhtml\Product\Edit;
-class Js extends \Magento\Adminhtml\Block\Template
+class Js extends \Magento\Backend\Block\Template
{
/**
* Core registry
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
index 2e51f42b828..56c85c43983 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
@@ -35,7 +35,7 @@
namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
-class Alerts extends \Magento\Adminhtml\Block\Template
+class Alerts extends \Magento\Backend\Block\Template
{
protected $_template = 'catalog/product/tab/alert.phtml';
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Create.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Create.php
index 53e6149c75e..0a0dc3976f9 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Create.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Create.php
@@ -43,7 +43,7 @@ class Create extends \Magento\Backend\Block\Widget\Button
protected $_config = null;
/**
- * Retrive config of new attribute creation
+ * Retrieve config of new attribute creation
*
* @return \Magento\Object
*/
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
index 288e9b82163..a5cdc6b1e0e 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
@@ -66,26 +66,26 @@ class Option extends \Magento\Adminhtml\Block\Widget
*/
protected $_optionType;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Backend\Model\Config\Source\Yesno $configYesNo
- * @param \Magento\Catalog\Model\Config\Source\Product\Options\Type $optionType
- * @param \Magento\Catalog\Model\Product $product
- * @param \Magento\Core\Model\Registry $registry
- * @param \Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\Backend\Model\Config\Source\Yesno $configYesNo
+ * @param \Magento\Catalog\Model\Config\Source\Product\Options\Type $optionType
+ * @param \Magento\Catalog\Model\Product $product
+ * @param \Magento\Core\Model\Registry $registry
+ * @param \Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Backend\Model\Config\Source\Yesno $configYesNo,
- \Magento\Catalog\Model\Config\Source\Product\Options\Type $optionType,
- \Magento\Catalog\Model\Product $product,
- \Magento\Core\Model\Registry $registry,
- \Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\Backend\Model\Config\Source\Yesno $configYesNo,
+ \Magento\Catalog\Model\Config\Source\Product\Options\Type $optionType,
+ \Magento\Catalog\Model\Product $product,
+ \Magento\Core\Model\Registry $registry,
+ \Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig,
+ array $data = array()
+ ) {
$this->_optionType = $optionType;
$this->_configYesNo = $configYesNo;
$this->_product = $product;
@@ -190,7 +190,7 @@ class Option extends \Magento\Adminhtml\Block\Widget
public function getTypeSelectHtml()
{
- $select = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Html\Select')
+ $select = $this->getLayout()->createBlock('Magento\View\Block\Html\Select')
->setData(array(
'id' => $this->getFieldId() . '_${id}_type',
'class' => 'select select-product-option-type required-option-select',
@@ -203,7 +203,7 @@ class Option extends \Magento\Adminhtml\Block\Widget
public function getRequireSelectHtml()
{
- $select = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Html\Select')
+ $select = $this->getLayout()->createBlock('Magento\View\Block\Html\Select')
->setData(array(
'id' => $this->getFieldId() . '_${id}_is_require',
'class' => 'select'
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/AbstractType.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/AbstractType.php
index 7d0065a0ac2..2b8f3ffacfa 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/AbstractType.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/AbstractType.php
@@ -43,18 +43,18 @@ class AbstractType extends \Magento\Adminhtml\Block\Widget
*/
protected $_optionPrice;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Catalog\Model\Config\Source\Product\Options\Price $optionPrice
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\Catalog\Model\Config\Source\Product\Options\Price $optionPrice
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Catalog\Model\Config\Source\Product\Options\Price $optionPrice,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\Catalog\Model\Config\Source\Product\Options\Price $optionPrice,
+ array $data = array()
+ ) {
$this->_optionPrice = $optionPrice;
parent::__construct($context, $coreData, $data);
}
@@ -63,7 +63,7 @@ class AbstractType extends \Magento\Adminhtml\Block\Widget
{
$this->setChild('option_price_type',
$this->getLayout()
- ->addBlock('Magento\Adminhtml\Block\Html\Select',
+ ->addBlock('Magento\View\Block\Html\Select',
$this->getNameInLayout() . '.option_price_type',
$this->getNameInLayout())
->setData(array(
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Reviews.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Reviews.php
index e2e16feddf4..07148b2b7a8 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Reviews.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Reviews.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab;
-class Reviews extends \Magento\Adminhtml\Block\Review\Grid
+class Reviews extends \Magento\Review\Block\Adminhtml\Grid
{
/**
* Hide grid mass action elements
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
index 306e7bff497..9b1a54e2c4a 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Grid.php
@@ -145,7 +145,6 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
}
if ($store->getId()) {
//$collection->setStoreId($store->getId());
- $adminStore = \Magento\Core\Model\AppInterface::ADMIN_STORE_ID;
$collection->addStoreFilter($store);
$collection->joinAttribute(
'name',
@@ -153,7 +152,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
'entity_id',
null,
'inner',
- $adminStore
+ \Magento\Core\Model\Store::DEFAULT_STORE_ID
);
$collection->joinAttribute(
'custom_name',
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
index 98e85e6076e..fba2da65e8a 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
@@ -214,6 +214,6 @@ class Gallery extends \Magento\Data\Form\Element\AbstractElement
*/
protected function _getDefaultStoreId()
{
- return \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID;
+ return \Magento\Core\Model\Store::DEFAULT_STORE_ID;
}
}
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
index 51c2f9046c1..22a576cc5ab 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
@@ -45,25 +45,25 @@ class Content extends \Magento\Backend\Block\Widget
*/
protected $_mediaConfig;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Catalog\Model\Product\Media\Config $mediaConfig
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\Catalog\Model\Product\Media\Config $mediaConfig
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Catalog\Model\Product\Media\Config $mediaConfig,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\Catalog\Model\Product\Media\Config $mediaConfig,
+ array $data = array()
+ ) {
$this->_mediaConfig = $mediaConfig;
parent::__construct($context, $coreData, $data);
}
protected function _prepareLayout()
{
- $this->addChild('uploader', 'Magento\Adminhtml\Block\Media\Uploader');
+ $this->addChild('uploader', 'Magento\Backend\Block\Media\Uploader');
$this->getUploader()->getConfig()
->setUrl(
@@ -85,9 +85,9 @@ class Content extends \Magento\Backend\Block\Widget
/**
- * Retrive uploader block
+ * Retrieve uploader block
*
- * @return \Magento\Adminhtml\Block\Media\Uploader
+ * @return \Magento\Backend\Block\Media\Uploader
*/
public function getUploader()
{
@@ -95,7 +95,7 @@ class Content extends \Magento\Backend\Block\Widget
}
/**
- * Retrive uploader block html
+ * Retrieve uploader block html
*
* @return string
*/
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php
index 100c31670a9..3fad613ceb7 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser;
-class Container extends \Magento\Adminhtml\Block\Template
+class Container extends \Magento\Backend\Block\Template
{
protected $_template = 'catalog/product/widget/chooser/container.phtml';
}
diff --git a/app/code/Magento/Catalog/Block/Navigation.php b/app/code/Magento/Catalog/Block/Navigation.php
index 1554da667a3..498610ecbee 100644
--- a/app/code/Magento/Catalog/Block/Navigation.php
+++ b/app/code/Magento/Catalog/Block/Navigation.php
@@ -299,8 +299,7 @@ class Navigation extends \Magento\View\Block\Template
$html = array();
// get all children
- // If Flat Data enabled then use it but only on frontend
- if ($this->_catalogCategoryFlat->isAvailable() && !$this->_storeManager->getStore()->isAdmin()) {
+ if ($this->_catalogCategoryFlat->isAvailable()) {
$children = (array)$category->getChildrenNodes();
$childrenCount = count($children);
} else {
diff --git a/app/code/Magento/Catalog/Block/Product/Gallery.php b/app/code/Magento/Catalog/Block/Product/Gallery.php
index 077d15f1f87..9fe9ff3dfdb 100644
--- a/app/code/Magento/Catalog/Block/Product/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Product/Gallery.php
@@ -123,20 +123,20 @@ class Gallery extends \Magento\View\Block\Template
return false;
}
- public function getPreviusImage()
+ public function getPreviousImage()
{
$current = $this->getCurrentImage();
if (!$current) {
return false;
}
- $previus = false;
+ $previous = false;
foreach ($this->getGalleryCollection() as $image) {
if ($image->getValueId() == $current->getValueId()) {
- return $previus;
+ return $previous;
}
- $previus = $image;
+ $previous = $image;
}
- return $previus;
+ return $previous;
}
public function getNextImage()
@@ -159,9 +159,9 @@ class Gallery extends \Magento\View\Block\Template
return $next;
}
- public function getPreviusImageUrl()
+ public function getPreviousImageUrl()
{
- $image = $this->getPreviusImage();
+ $image = $this->getPreviousImage();
if ($image) {
return $this->getUrl('*/*/*', array('_current' => true, 'image' => $image->getValueId()));
}
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index b5c72df453a..fc4d9afec88 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -597,7 +597,7 @@ class Toolbar extends \Magento\View\Block\Template
}
/**
- * Retrive URL for view mode
+ * Retrieve URL for view mode
*
* @param string $mode
* @return string
diff --git a/app/code/Magento/Catalog/Block/Product/View/AbstractView.php b/app/code/Magento/Catalog/Block/Product/View/AbstractView.php
index 0d684a721a8..7488844c9e0 100644
--- a/app/code/Magento/Catalog/Block/Product/View/AbstractView.php
+++ b/app/code/Magento/Catalog/Block/Product/View/AbstractView.php
@@ -68,7 +68,7 @@ abstract class AbstractView extends \Magento\Catalog\Block\Product\AbstractProdu
/**
- * Retrive product
+ * Retrieve product
*
* @return \Magento\Catalog\Model\Product
*/
diff --git a/app/code/Magento/Catalog/Block/Product/View/Type/Configurable.php b/app/code/Magento/Catalog/Block/Product/View/Type/Configurable.php
index eaab4c369e2..592f722cd2a 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Type/Configurable.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Type/Configurable.php
@@ -160,7 +160,7 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
}
/**
- * Returns additional values for js config, con be overriden by descedants
+ * Returns additional values for js config, con be overridden by descendants
*
* @return array
*/
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product.php
index 4ac2ac62916..510b8883b4f 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product.php
@@ -193,7 +193,7 @@ class Product extends \Magento\Backend\App\Action
protected function _outputBlocks()
{
$blocks = func_get_args();
- $output = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Text\ListText');
+ $output = $this->_view->getLayout()->createBlock('Magento\Backend\Block\Text\ListText');
foreach ($blocks as $block) {
$output->insert($block, '', true);
}
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
index eb937b0f854..d33d51f6798 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
@@ -195,7 +195,7 @@ class Attribute extends \Magento\Backend\App\Action
}
/**
- * Validate selection of products for massupdate
+ * Validate selection of products for mass update
*
* @return boolean
*/
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php
index 3118f6faf97..fa36b4dc8e6 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php
@@ -247,7 +247,7 @@ class Attribute extends \Magento\Backend\App\Action
if (!empty($data['new_attribute_set_name'])) {
/** @var $attributeSet \Magento\Eav\Model\Entity\Attribute\Set */
$attributeSet = $this->_objectManager->create('Magento\Eav\Model\Entity\Attribute\Set');
- $name = $this->_objectManager->get('Magento\Adminhtml\Helper\Data')
+ $name = $this->_objectManager->get('Magento\Backend\Helper\Data')
->stripTags($data['new_attribute_set_name']);
$name = trim($name);
$attributeSet->setEntityTypeId($this->_entityTypeId)
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Review.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Review.php
index 805a9fc2340..f48ec1dbdf4 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Review.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Review.php
@@ -70,7 +70,7 @@ class Review extends \Magento\Backend\App\Action
$this->_view->loadLayout();
$this->_setActiveMenu('Magento_Review::catalog_reviews_ratings_reviews_all');
- $this->_addContent($this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Main'));
+ $this->_addContent($this->_view->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Main'));
$this->_view->renderLayout();
}
@@ -89,7 +89,7 @@ class Review extends \Magento\Backend\App\Action
$this->_view->loadLayout();
$this->_coreRegistry->register('usePendingFilter', true);
- $this->_addContent($this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Main'));
+ $this->_addContent($this->_view->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Main'));
$this->_view->renderLayout();
}
@@ -103,7 +103,7 @@ class Review extends \Magento\Backend\App\Action
$this->_view->loadLayout();
$this->_setActiveMenu('Magento_Review::catalog_reviews_ratings_reviews_all');
- $this->_addContent($this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Edit'));
+ $this->_addContent($this->_view->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Edit'));
$this->_view->renderLayout();
}
@@ -119,8 +119,8 @@ class Review extends \Magento\Backend\App\Action
$this->_view->getLayout()->getBlock('head')->setCanLoadExtJs(true);
- $this->_addContent($this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Add'));
- $this->_addContent($this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Product\Grid'));
+ $this->_addContent($this->_view->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Add'));
+ $this->_addContent($this->_view->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Product\Grid'));
$this->_view->renderLayout();
}
@@ -292,14 +292,14 @@ class Review extends \Magento\Backend\App\Action
public function productGridAction()
{
$this->getResponse()->setBody(
- $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Product\Grid')->toHtml()
+ $this->_view->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Product\Grid')->toHtml()
);
}
public function reviewGridAction()
{
$this->getResponse()->setBody(
- $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Grid')->toHtml()
+ $this->_view->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Grid')->toHtml()
);
}
@@ -380,7 +380,7 @@ class Review extends \Magento\Backend\App\Action
{
$this->getResponse()->setBody(
$this->_view->getLayout()
- ->createBlock('Magento\Adminhtml\Block\Review\Rating\Detailed')
+ ->createBlock('Magento\Review\Block\Adminhtml\Rating\Detailed')
->setIndependentMode()
->toHtml()
);
diff --git a/app/code/Magento/Catalog/Helper/Category/Flat.php b/app/code/Magento/Catalog/Helper/Category/Flat.php
index d73c9ec0d20..e9bf4762829 100644
--- a/app/code/Magento/Catalog/Helper/Category/Flat.php
+++ b/app/code/Magento/Catalog/Helper/Category/Flat.php
@@ -76,20 +76,22 @@ class Flat extends \Magento\Catalog\Helper\Flat\AbstractFlat
/**
* Construct
*
+ * @param \Magento\App\Helper\Context $context
* @param \Magento\Index\Model\ProcessFactory $processFactory
* @param \Magento\Catalog\Model\Resource\Category\Flat $catalogCategoryFlat
- * @param \Magento\App\Helper\Context $context
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
+ * @param bool $isAvailable
*/
public function __construct(
+ \Magento\App\Helper\Context $context,
\Magento\Index\Model\ProcessFactory $processFactory,
\Magento\Catalog\Model\Resource\Category\Flat $catalogCategoryFlat,
- \Magento\App\Helper\Context $context,
- \Magento\Core\Model\Store\Config $coreStoreConfig
+ \Magento\Core\Model\Store\Config $coreStoreConfig,
+ $isAvailable = true
) {
$this->_catalogCategoryFlat = $catalogCategoryFlat;
$this->_coreStoreConfig = $coreStoreConfig;
- parent::__construct($processFactory, $context);
+ parent::__construct($context, $processFactory, $isAvailable);
}
/**
diff --git a/app/code/Magento/Catalog/Helper/Flat/AbstractFlat.php b/app/code/Magento/Catalog/Helper/Flat/AbstractFlat.php
index a1256ab513c..336128512cc 100644
--- a/app/code/Magento/Catalog/Helper/Flat/AbstractFlat.php
+++ b/app/code/Magento/Catalog/Helper/Flat/AbstractFlat.php
@@ -72,17 +72,25 @@ abstract class AbstractFlat extends \Magento\App\Helper\AbstractHelper
*/
protected $_processFactory;
+ /**
+ * @var bool
+ */
+ protected $_isAvailable;
+
/**
* Construct
*
- * @param \Magento\Index\Model\ProcessFactory $processFactory
* @param \Magento\App\Helper\Context $context
+ * @param \Magento\Index\Model\ProcessFactory $processFactory
+ * @param bool $isAvailable
*/
public function __construct(
+ \Magento\App\Helper\Context $context,
\Magento\Index\Model\ProcessFactory $processFactory,
- \Magento\App\Helper\Context $context
+ $isAvailable = true
) {
$this->_processFactory = $processFactory;
+ $this->_isAvailable = $isAvailable;
parent::__construct($context);
}
@@ -93,7 +101,9 @@ abstract class AbstractFlat extends \Magento\App\Helper\AbstractHelper
*/
public function isAvailable()
{
- return $this->isEnabled() && !$this->getProcess()->isLocked()
+ return $this->_isAvailable
+ && $this->isEnabled()
+ && !$this->getProcess()->isLocked()
&& $this->getProcess()->getStatus() != \Magento\Index\Model\Process::STATUS_RUNNING;
}
diff --git a/app/code/Magento/Catalog/Helper/Product/Compare.php b/app/code/Magento/Catalog/Helper/Product/Compare.php
index a11835d619b..701e437e155 100644
--- a/app/code/Magento/Catalog/Helper/Product/Compare.php
+++ b/app/code/Magento/Catalog/Helper/Product/Compare.php
@@ -170,7 +170,7 @@ class Compare extends \Magento\Core\Helper\Url
}
/**
- * Retrive add to wishlist url
+ * Retrieve add to wishlist url
*
* @param \Magento\Catalog\Model\Product $product
* @return string
@@ -188,7 +188,7 @@ class Compare extends \Magento\Core\Helper\Url
}
/**
- * Retrive add to cart url
+ * Retrieve add to cart url
*
* @param \Magento\Catalog\Model\Product $product
* @return string
diff --git a/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php b/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
index c7f2c748d53..7d4be6f61a5 100644
--- a/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
+++ b/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
@@ -141,7 +141,7 @@ class Attribute extends \Magento\Backend\Helper\Data
*/
public function getSelectedStoreId()
{
- return (int)$this->_getRequest()->getParam('store', \Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+ return (int)$this->_getRequest()->getParam('store', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
}
/**
diff --git a/app/code/Magento/Catalog/Helper/Product/Flat.php b/app/code/Magento/Catalog/Helper/Product/Flat.php
index 41317bc6a32..8b0b89fd28d 100644
--- a/app/code/Magento/Catalog/Helper/Product/Flat.php
+++ b/app/code/Magento/Catalog/Helper/Product/Flat.php
@@ -95,23 +95,25 @@ class Flat extends \Magento\Catalog\Helper\Flat\AbstractFlat
/**
* Construct
*
- * @param \Magento\Index\Model\ProcessFactory $processFactory
* @param \Magento\App\Helper\Context $context
+ * @param \Magento\Index\Model\ProcessFactory $processFactory
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
* @param \Magento\Catalog\Model\Product\Flat\Flag $flatFlag
* @param $addFilterableAttrs
* @param $addChildData
+ * @param $isAvailable
*/
public function __construct(
- \Magento\Index\Model\ProcessFactory $processFactory,
\Magento\App\Helper\Context $context,
+ \Magento\Index\Model\ProcessFactory $processFactory,
\Magento\Core\Model\Store\Config $coreStoreConfig,
\Magento\Catalog\Model\Product\Flat\Flag $flatFlag,
$addFilterableAttrs,
- $addChildData
+ $addChildData,
+ $isAvailable = true
) {
$this->_coreStoreConfig = $coreStoreConfig;
- parent::__construct($processFactory, $context);
+ parent::__construct($context, $processFactory, $isAvailable);
$this->_flagObject = $flatFlag->loadSelf();
$this->_addFilterableAttrs = intval($addFilterableAttrs);
$this->_addChildData = intval($addChildData);
diff --git a/app/code/Magento/Catalog/Model/AbstractModel.php b/app/code/Magento/Catalog/Model/AbstractModel.php
index d44f04ff2c8..83ad9af6702 100644
--- a/app/code/Magento/Catalog/Model/AbstractModel.php
+++ b/app/code/Magento/Catalog/Model/AbstractModel.php
@@ -35,12 +35,6 @@ namespace Magento\Catalog\Model;
abstract class AbstractModel extends \Magento\Core\Model\AbstractModel
{
- /**
- * Identifier of default store
- * used for loading default data for entity
- */
- const DEFAULT_STORE_ID = 0;
-
/**
* Attribute default values
*
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
index d7c7a6c3111..23a5997ac92 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
@@ -44,18 +44,18 @@ class Customlayoutupdate extends \Magento\Eav\Model\Entity\Attribute\Backend\Abs
/**
* Layoutupdate validator factory
*
- * @var \Magento\Adminhtml\Model\LayoutUpdate\ValidatorFactory
+ * @var \Magento\Core\Model\Layout\Update\ValidatorFactory
*/
protected $_layoutUpdateValidatorFactory;
/**
* Construct
*
- * @param \Magento\Adminhtml\Model\LayoutUpdate\ValidatorFactory $layoutUpdateValidatorFactory
+ * @param \Magento\Core\Model\Layout\Update\ValidatorFactory $layoutUpdateValidatorFactory
* @param \Magento\Logger $logger
*/
public function __construct(
- \Magento\Adminhtml\Model\LayoutUpdate\ValidatorFactory $layoutUpdateValidatorFactory,
+ \Magento\Core\Model\Layout\Update\ValidatorFactory $layoutUpdateValidatorFactory,
\Magento\Logger $logger
) {
$this->_layoutUpdateValidatorFactory = $layoutUpdateValidatorFactory;
@@ -71,7 +71,7 @@ class Customlayoutupdate extends \Magento\Eav\Model\Entity\Attribute\Backend\Abs
return true;
}
- /** @var $validator \Magento\Adminhtml\Model\LayoutUpdate\Validator */
+ /** @var $validator \Magento\Core\Model\Layout\Update\Validator */
$validator = $this->_layoutUpdateValidatorFactory->create();
if (!$validator->isValid($xml)) {
$messages = $validator->getMessages();
diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php
index ee6c2ed0674..e32cf4c07ef 100644
--- a/app/code/Magento/Catalog/Model/Category.php
+++ b/app/code/Magento/Catalog/Model/Category.php
@@ -240,7 +240,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel
protected function _construct()
{
// If Flat Data enabled then use it but only on frontend
- if ($this->_catalogCategoryFlat->isAvailable() && !$this->_storeManager->getStore()->isAdmin()) {
+ if ($this->_catalogCategoryFlat->isAvailable()) {
$this->_init('Magento\Catalog\Model\Resource\Category\Flat');
$this->_useFlatResource = true;
} else {
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
index de01c1491b7..3627f6cb056 100644
--- a/app/code/Magento/Catalog/Model/Product.php
+++ b/app/code/Magento/Catalog/Model/Product.php
@@ -205,6 +205,11 @@ class Product extends \Magento\Catalog\Model\AbstractModel
*/
protected $_itemOptionFactory;
+ /**
+ * @var \Magento\App\State
+ */
+ protected $_appState;
+
/**
* Construct
*
@@ -273,6 +278,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel
$this->_collectionFactory = $collectionFactory;
$this->_urlModel = $url;
$this->_linkInstance = $productLink;
+ $this->_appState = $context->getAppState();
parent::__construct($storeManager, $context, $registry, $resource, $resourceCollection, $data);
}
@@ -1911,7 +1917,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel
*/
public function setOrigData($key=null, $data=null)
{
- if ($this->_storeManager->getStore()->isAdmin()) {
+ if ($this->_appState->getAreaCode() === \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE) {
return parent::setOrigData($key, $data);
}
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media.php
index cda164b93ee..2a3f327cfd7 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media.php
@@ -301,7 +301,7 @@ class Media extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
$storeId = $object->getStoreId();
$storeIds = $object->getStoreIds();
- $storeIds[] = \Magento\Core\Model\AppInterface::ADMIN_STORE_ID;
+ $storeIds[] = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
// remove current storeId
$storeIds = array_flip($storeIds);
@@ -541,7 +541,7 @@ class Media extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
}
/**
- * Retrive image from gallery
+ * Retrieve image from gallery
*
* @param \Magento\Catalog\Model\Product $product
* @param string $file
diff --git a/app/code/Magento/Catalog/Model/Product/Media/ConfigInterface.php b/app/code/Magento/Catalog/Model/Product/Media/ConfigInterface.php
index d75edbb6414..3f4582619e4 100644
--- a/app/code/Magento/Catalog/Model/Product/Media/ConfigInterface.php
+++ b/app/code/Magento/Catalog/Model/Product/Media/ConfigInterface.php
@@ -30,21 +30,21 @@ namespace Magento\Catalog\Model\Product\Media;
interface ConfigInterface
{
/**
- * Retrive base url for media files
+ * Retrieve base url for media files
*
* @return string
*/
function getBaseMediaUrl();
/**
- * Retrive base path for media files
+ * Retrieve base path for media files
*
* @return string
*/
function getBaseMediaPath();
/**
- * Retrive url for media file
+ * Retrieve url for media file
*
* @param string $file
* @return string
@@ -52,7 +52,7 @@ interface ConfigInterface
function getMediaUrl($file);
/**
- * Retrive file system path for media file
+ * Retrieve file system path for media file
*
* @param string $file
* @return string
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Configurable.php b/app/code/Magento/Catalog/Model/Product/Type/Configurable.php
index fc53f62519a..e680ecaac99 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Configurable.php
@@ -1105,7 +1105,7 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
\Magento\Catalog\Model\Product $parentProduct,
$postData
) {
- $product->setStoreId(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+ $product->setStoreId(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
->setTypeId($postData['weight']
? \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
: \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Grouped.php b/app/code/Magento/Catalog/Model/Product/Type/Grouped.php
index 6fc9353d9ba..2e1060925c1 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Grouped.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Grouped.php
@@ -93,6 +93,11 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
*/
protected $_catalogProductLink;
+ /**
+ * @var \Magento\App\State
+ */
+ protected $_appState;
+
/**
* Construct
*
@@ -109,6 +114,7 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
* @param \Magento\Filesystem $filesystem
* @param \Magento\Core\Model\Registry $coreRegistry
* @param \Magento\Logger $logger
+ * @param \Magento\App\State $appState
* @param array $data
*/
public function __construct(
@@ -125,11 +131,13 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
\Magento\Filesystem $filesystem,
\Magento\Core\Model\Registry $coreRegistry,
\Magento\Logger $logger,
+ \Magento\App\State $appState,
array $data = array()
) {
$this->_catalogProductLink = $catalogProductLink;
$this->_storeManager = $storeManager;
$this->_catalogProductStatus = $catalogProductStatus;
+ $this->_appState = $appState;
parent::__construct($productFactory, $catalogProductOption, $eavConfig, $catalogProductType,
$eventManager, $coreData, $fileStorageDb, $filesystem, $coreRegistry, $logger, $data);
}
@@ -190,9 +198,7 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
if (!$product->hasData($this->_keyAssociatedProducts)) {
$associatedProducts = array();
- if (!$this->_storeManager->getStore()->isAdmin()) {
- $this->setSaleableStatus($product);
- }
+ $this->setSaleableStatus($product);
$collection = $this->getAssociatedProductCollection($product)
->addAttributeToSelect('*')
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Grouped/Backend.php b/app/code/Magento/Catalog/Model/Product/Type/Grouped/Backend.php
new file mode 100644
index 00000000000..3b3acf254d6
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Type/Grouped/Backend.php
@@ -0,0 +1,44 @@
+<?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)
+ */
+
+namespace Magento\Catalog\Model\Product\Type\Grouped;
+
+/**
+ * Grouped product type implementation for backend
+ */
+class Backend extends \Magento\Catalog\Model\Product\Type\Grouped
+{
+ /**
+ * No filters required in backend
+ *
+ * @param \Magento\Catalog\Model\Product $product
+ * @return \Magento\Catalog\Model\Product\Type\Grouped
+ */
+ public function setSaleableStatus($product)
+ {
+ return $this;
+ }
+}
diff --git a/app/code/Magento/Catalog/Model/Resource/AbstractResource.php b/app/code/Magento/Catalog/Model/Resource/AbstractResource.php
index b6633459753..090bc5e35be 100644
--- a/app/code/Magento/Catalog/Model/Resource/AbstractResource.php
+++ b/app/code/Magento/Catalog/Model/Resource/AbstractResource.php
@@ -103,7 +103,7 @@ abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
*/
public function getDefaultStoreId()
{
- return \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID;
+ return \Magento\Core\Model\Store::DEFAULT_STORE_ID;
}
/**
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Collection.php b/app/code/Magento/Catalog/Model/Resource/Category/Collection.php
index d6267b829b2..1e71af74584 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Collection.php
@@ -175,7 +175,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
public function getProductStoreId()
{
if (is_null($this->_productStoreId)) {
- $this->_productStoreId = \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID;
+ $this->_productStoreId = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
}
return $this->_productStoreId;
}
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Flat.php b/app/code/Magento/Catalog/Model/Resource/Category/Flat.php
index 503094f1168..0b9f48aac79 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Flat.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Flat.php
@@ -236,7 +236,7 @@ class Flat extends \Magento\Index\Model\Resource\AbstractResource
* @param integer $storeId
* @return string
*/
- public function getMainStoreTable($storeId = \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID)
+ public function getMainStoreTable($storeId = \Magento\Core\Model\Store::DEFAULT_STORE_ID)
{
if (is_string($storeId)) {
$storeId = intval($storeId);
@@ -277,7 +277,7 @@ class Flat extends \Magento\Index\Model\Resource\AbstractResource
}
/**
- * Retreive inactive categories ids
+ * Retrieve inactive categories ids
*
* @return \Magento\Catalog\Model\Resource\Category\Flat
*/
@@ -289,7 +289,7 @@ class Flat extends \Magento\Index\Model\Resource\AbstractResource
}
/**
- * Retreive inactive categories ids
+ * Retrieve inactive categories ids
*
* @return array
*/
@@ -518,7 +518,7 @@ class Flat extends \Magento\Index\Model\Resource\AbstractResource
if ($this->_isBuilt === null) {
$defaultStoreView = $this->_storeManager->getDefaultStoreView();
if ($defaultStoreView === null) {
- $defaultStoreId = \Magento\Core\Model\AppInterface::ADMIN_STORE_ID;
+ $defaultStoreId = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
} else {
$defaultStoreId = $defaultStoreView->getId();
}
@@ -925,7 +925,7 @@ class Flat extends \Magento\Index\Model\Resource\AbstractResource
))
)
->where('def.entity_id IN (?)', $entityIds)
- ->where('def.store_id IN (?)', array(\Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID, $storeId));
+ ->where('def.store_id IN (?)', array(\Magento\Core\Model\Store::DEFAULT_STORE_ID, $storeId));
return $this->_getWriteAdapter()->fetchAll($select);
}
@@ -1001,7 +1001,7 @@ class Flat extends \Magento\Index\Model\Resource\AbstractResource
} else if ($category instanceof \Magento\Catalog\Model\Category) {
$categoryId = $category->getId();
foreach ($category->getStoreIds() as $storeId) {
- if ($storeId == \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID) {
+ if ($storeId == \Magento\Core\Model\Store::DEFAULT_STORE_ID) {
continue;
}
@@ -1484,7 +1484,7 @@ class Flat extends \Magento\Index\Model\Resource\AbstractResource
array('csg' => $this->getTable('core_store_group')),
'csg.group_id = cs.group_id',
array('root_category_id'))
- ->where('cs.store_id <> ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+ ->where('cs.store_id <> ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
$this->_storesRootCategories = $this->_getWriteAdapter()->fetchPairs($select);
}
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Indexer/Product.php b/app/code/Magento/Catalog/Model/Resource/Category/Indexer/Product.php
index cbf6bc92ffc..f150c0b8853 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Indexer/Product.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Indexer/Product.php
@@ -299,7 +299,7 @@ class Product extends \Magento\Index\Model\Resource\AbstractResource
$anchorInfo = $this->_getAnchorAttributeInfo();
$bind = array(
'attribute_id' => $anchorInfo['id'],
- 'store_id' => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID,
+ 'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID,
'e_value' => 1
);
$select = $this->_getReadAdapter()->select()
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Tree.php b/app/code/Magento/Catalog/Model/Resource/Category/Tree.php
index 399e73c59f3..de0032f55d4 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Tree.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Tree.php
@@ -632,7 +632,7 @@ class Tree extends \Magento\Data\Tree\Dbp
array($tableDefault => $attribute->getBackend()->getTable()),
sprintf('%1$s.entity_id=e.entity_id AND %1$s.attribute_id=%2$d'
. ' AND %1$s.entity_type_id=e.entity_type_id AND %1$s.store_id=%3$d',
- $tableDefault, $attribute->getId(), \Magento\Core\Model\AppInterface::ADMIN_STORE_ID),
+ $tableDefault, $attribute->getId(), \Magento\Core\Model\Store::DEFAULT_STORE_ID),
array($attributeCode => 'value'))
->joinLeft(
array($tableStore => $attribute->getBackend()->getTable()),
diff --git a/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php b/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php
index 4f6f16c47a7..dd44a43cf62 100644
--- a/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php
@@ -129,7 +129,7 @@ class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\AbstractCo
*/
public function getDefaultStoreId()
{
- return \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID;
+ return \Magento\Core\Model\Store::DEFAULT_STORE_ID;
}
/**
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Media.php b/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Media.php
index e7acb226ae0..d5d34415599 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Media.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Media.php
@@ -113,10 +113,10 @@ class Media extends \Magento\Core\Model\Resource\Db\AbstractDb
}
/**
- * Insert gallery value to db and retrive last id
+ * Insert gallery value to db and retrieve last id
*
* @param array $data
- * @return interger
+ * @return integer
*/
public function insertGallery($data)
{
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
index e36de785d71..1947eb04a8a 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
@@ -421,10 +421,6 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
*/
public function isEnabledFlat()
{
- // Flat Data can be used only on frontend
- if ($this->_storeManager->getStore()->isAdmin()) {
- return false;
- }
if (!isset($this->_flatEnabled[$this->getStoreId()])) {
$this->_flatEnabled[$this->getStoreId()] = $this->getFlatHelper()->isAvailable();
}
@@ -749,7 +745,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
}
$store = $this->_storeManager->getStore($store);
- if (!$store->isAdmin()) {
+ if ($store->getId() != \Magento\Core\Model\Store::DEFAULT_STORE_ID) {
$this->setStoreId($store);
$this->_productLimitationFilters['store_id'] = $store->getId();
$this->_applyProductLimitations();
@@ -801,7 +797,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
$this->_productLimitationFilters['category_is_anchor'] = 1;
}
- if ($this->getStoreId() == \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID) {
+ if ($this->getStoreId() == \Magento\Core\Model\Store::DEFAULT_STORE_ID) {
$this->_applyZeroStoreProductLimitations();
} else {
$this->_applyProductLimitations();
@@ -1046,7 +1042,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
}
/**
- * Retrive all ids for collection
+ * Retrieve all ids for collection
*
* @param int|string $limit
* @param int|string $offset
@@ -1063,7 +1059,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
}
/**
- * Retreive product count select for categories
+ * Retrieve product count select for categories
*
* @return \Magento\DB\Select
*/
@@ -1323,7 +1319,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
}
/**
- * Retreive all ids
+ * Retrieve all ids
*
* @param boolean $resetCache
* @return array
@@ -1507,7 +1503,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
*/
public function addFilterByRequiredOptions()
{
- $this->addAttributeToFilter('required_options', array(array('neq' => '1'), array('null' => true)), 'left');
+ $this->addAttributeToFilter('required_options', array(array('neq' => 1), array('null' => true)), 'left');
return $this;
}
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Flat/Indexer.php b/app/code/Magento/Catalog/Model/Resource/Product/Flat/Indexer.php
index 29a2dab2aec..ae3630b2f9a 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Flat/Indexer.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Flat/Indexer.php
@@ -914,7 +914,7 @@ class Indexer extends \Magento\Index\Model\Resource\AbstractResource
array())
->where('t1.entity_type_id = :entity_type_id')
->where('t1.attribute_id = :attribute_id')
- ->where('t1.store_id = ?', \Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+ ->where('t1.store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID)
->where("{$fieldExpr} = ?", \Magento\Catalog\Model\Product\Status::STATUS_ENABLED);
foreach ($this->getAttributes() as $attributeCode => $attribute) {
/** @var $attribute \Magento\Eav\Model\Entity\Attribute */
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Decimal.php b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Decimal.php
index 405ae3578a0..8bbca9757f6 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Decimal.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Decimal.php
@@ -82,8 +82,8 @@ class Decimal
'pds.entity_id = pdd.entity_id AND pds.attribute_id = pdd.attribute_id'
. ' AND pds.store_id=cs.store_id',
array('value' => $productValueExpression))
- ->where('pdd.store_id=?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID)
- ->where('cs.store_id!=?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID)
+ ->where('pdd.store_id=?', \Magento\Core\Model\Store::DEFAULT_STORE_ID)
+ ->where('cs.store_id!=?', \Magento\Core\Model\Store::DEFAULT_STORE_ID)
->where('pdd.attribute_id IN(?)', $attrIds)
->where("{$productValueExpression} IS NOT NULL");
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php
index 319e342ccf3..da17fb878b0 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php
@@ -238,8 +238,8 @@ class Source
'pvs.entity_id = pvd.entity_id AND pvs.attribute_id = pvd.attribute_id'
. ' AND pvs.store_id=cs.store_id',
array('value' => $productValueExpression))
- ->where('pvd.store_id=?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID)
- ->where('cs.store_id!=?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID)
+ ->where('pvd.store_id=?', \Magento\Core\Model\Store::DEFAULT_STORE_ID)
+ ->where('cs.store_id!=?', \Magento\Core\Model\Store::DEFAULT_STORE_ID)
->where('pvd.attribute_id IN(?)', $attrIds);
$statusCond = $adapter->quoteInto('=?', \Magento\Catalog\Model\Product\Status::STATUS_ENABLED);
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Option.php b/app/code/Magento/Catalog/Model/Resource/Product/Option.php
index b2aa803203e..4aaf0102a63 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Option.php
@@ -129,7 +129,7 @@ class Option extends \Magento\Core\Model\Resource\Db\AbstractDb
$statement = $readAdapter->select()
->from($priceTable, 'option_id')
->where('option_id = ?', $object->getId())
- ->where('store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+ ->where('store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
$optionId = $readAdapter->fetchOne($statement);
if ($optionId) {
@@ -148,7 +148,7 @@ class Option extends \Magento\Core\Model\Resource\Db\AbstractDb
$data,
array(
'option_id = ?' => $object->getId(),
- 'store_id = ?' => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID,
+ 'store_id = ?' => \Magento\Core\Model\Store::DEFAULT_STORE_ID,
)
);
}
@@ -157,7 +157,7 @@ class Option extends \Magento\Core\Model\Resource\Db\AbstractDb
new \Magento\Object(
array(
'option_id' => $object->getId(),
- 'store_id' => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID,
+ 'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID,
'price' => $object->getPrice(),
'price_type' => $object->getPriceType()
)
@@ -261,7 +261,7 @@ class Option extends \Magento\Core\Model\Resource\Db\AbstractDb
$statement = $readAdapter->select()
->from($titleTable)
->where('option_id = ?', $object->getId())
- ->where('store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+ ->where('store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
if ($readAdapter->fetchOne($statement)) {
if ($object->getStoreId() == '0') {
@@ -279,7 +279,7 @@ class Option extends \Magento\Core\Model\Resource\Db\AbstractDb
$data,
array(
'option_id = ?' => $object->getId(),
- 'store_id = ?' => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID
+ 'store_id = ?' => \Magento\Core\Model\Store::DEFAULT_STORE_ID
)
);
}
@@ -288,7 +288,7 @@ class Option extends \Magento\Core\Model\Resource\Db\AbstractDb
new \Magento\Object(
array(
'option_id' => $object->getId(),
- 'store_id' => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID,
+ 'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID,
'title' => $object->getTitle()
)
),
@@ -485,7 +485,7 @@ class Option extends \Magento\Core\Model\Resource\Db\AbstractDb
$defaultOptionJoin = implode(
' AND ',
array('option_title_default.option_id=product_option.option_id',
- $adapter->quoteInto('option_title_default.store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID))
+ $adapter->quoteInto('option_title_default.store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID))
);
$storeOptionJoin = implode(
@@ -518,7 +518,7 @@ class Option extends \Magento\Core\Model\Resource\Db\AbstractDb
$defaultOptionJoin = implode(
' AND ', array(
'option_title_default.option_type_id=option_type.option_type_id',
- $adapter->quoteInto('option_title_default.store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID))
+ $adapter->quoteInto('option_title_default.store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID))
);
$storeOptionJoin = implode(
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php
index e7a8650a8e2..b4db96dc203 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php
@@ -122,7 +122,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
'store_title' => 'title',
'title' => $titleExpr
))
- ->where('default_option_title.store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+ ->where('default_option_title.store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
return $this;
}
@@ -154,7 +154,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
'default_option_price.option_id = main_table.option_id AND '
. $adapter->quoteInto(
'default_option_price.store_id = ?',
- \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID
+ \Magento\Core\Model\Store::DEFAULT_STORE_ID
),
array(
'default_price' => 'price',
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php b/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php
index 7e2e8605b82..f5454df2182 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php
@@ -118,7 +118,7 @@ class Value extends \Magento\Core\Model\Resource\Db\AbstractDb
$select = $this->_getReadAdapter()->select()
->from($priceTable, 'option_type_id')
->where('option_type_id = ?', (int)$object->getId())
- ->where('store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+ ->where('store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
$optionTypeId = $this->_getReadAdapter()->fetchOne($select);
if ($optionTypeId) {
@@ -129,7 +129,7 @@ class Value extends \Magento\Core\Model\Resource\Db\AbstractDb
);
$where = array(
'option_type_id = ?' => $optionTypeId,
- 'store_id = ?' => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID
+ 'store_id = ?' => \Magento\Core\Model\Store::DEFAULT_STORE_ID
);
$this->_getWriteAdapter()->update($priceTable, $bind, $where);
@@ -137,7 +137,7 @@ class Value extends \Magento\Core\Model\Resource\Db\AbstractDb
} else {
$bind = array(
'option_type_id' => (int)$object->getId(),
- 'store_id' => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID,
+ 'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID,
'price' => $price,
'price_type' => $priceType
);
@@ -224,14 +224,14 @@ class Value extends \Magento\Core\Model\Resource\Db\AbstractDb
$select = $this->_getReadAdapter()->select()
->from($titleTable, array('option_type_id'))
->where('option_type_id = ?', (int)$object->getId())
- ->where('store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+ ->where('store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
$optionTypeId = $this->_getReadAdapter()->fetchOne($select);
if ($optionTypeId) {
if ($object->getStoreId() == '0') {
$where = array(
'option_type_id = ?' => (int)$optionTypeId,
- 'store_id = ?' => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID
+ 'store_id = ?' => \Magento\Core\Model\Store::DEFAULT_STORE_ID
);
$bind = array(
'title' => $object->getTitle()
@@ -241,7 +241,7 @@ class Value extends \Magento\Core\Model\Resource\Db\AbstractDb
} else {
$bind = array(
'option_type_id' => (int)$object->getId(),
- 'store_id' => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID,
+ 'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID,
'title' => $object->getTitle()
);
$this->_getWriteAdapter()->insert($titleTable, $bind);
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Option/Value/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Option/Value/Collection.php
index 997bc3ec27a..34e992aea4f 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Option/Value/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Option/Value/Collection.php
@@ -86,7 +86,7 @@ class Collection
'store_value_title.title'
);
$joinExprDefaultPrice = 'default_value_price.option_type_id = main_table.option_type_id AND '
- . $adapter->quoteInto('default_value_price.store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+ . $adapter->quoteInto('default_value_price.store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
$joinExprStorePrice = 'store_value_price.option_type_id = main_table.option_type_id AND '
. $adapter->quoteInto('store_value_price.store_id = ?', $storeId);
@@ -122,7 +122,7 @@ class Collection
'store_title' => 'title',
'title' => $titleExpr)
)
- ->where('default_value_title.store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+ ->where('default_value_title.store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
return $this;
}
@@ -155,7 +155,7 @@ class Collection
'title' => $titleExpr
)
)
- ->where('default_value_title.store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+ ->where('default_value_title.store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
return $this;
}
@@ -179,7 +179,7 @@ class Collection
);
$joinExprDefault = 'default_value_price.option_type_id = main_table.option_type_id AND '
- . $this->getConnection()->quoteInto('default_value_price.store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+ . $this->getConnection()->quoteInto('default_value_price.store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
$joinExprStore = 'store_value_price.option_type_id = main_table.option_type_id AND '
. $this->getConnection()->quoteInto('store_value_price.store_id = ?', $storeId);
$this->getSelect()
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Status.php b/app/code/Magento/Catalog/Model/Resource/Product/Status.php
index a99e7f75747..638fe331729 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Status.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Status.php
@@ -127,7 +127,7 @@ class Status extends \Magento\Core\Model\Resource\Db\AbstractDb
*/
public function refreshEnabledIndex($productId, $storeId)
{
- if ($storeId == \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID) {
+ if ($storeId == \Magento\Core\Model\Store::DEFAULT_STORE_ID) {
foreach ($this->_storeManager->getStores() as $store) {
$this->refreshEnabledIndex($productId, $store->getId());
}
@@ -212,12 +212,12 @@ class Status extends \Magento\Core\Model\Resource\Db\AbstractDb
$productIds = array($productIds);
}
- if ($storeId === null || $storeId == \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID) {
+ if ($storeId === null || $storeId == \Magento\Core\Model\Store::DEFAULT_STORE_ID) {
$select = $adapter->select()
->from($attributeTable, array('entity_id', 'value'))
->where('entity_id IN (?)', $productIds)
->where('attribute_id = ?', $attribute->getAttributeId())
- ->where('store_id = ?', \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+ ->where('store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
$rows = $adapter->fetchPairs($select);
} else {
@@ -233,7 +233,7 @@ class Status extends \Magento\Core\Model\Resource\Db\AbstractDb
. (int)$storeId,
array('t1.entity_id')
)
- ->where('t1.store_id = ?', \Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+ ->where('t1.store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID)
->where('t1.attribute_id = ?', $attribute->getAttributeId())
->where('t1.entity_id IN(?)', $productIds);
$rows = $adapter->fetchPairs($select);
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Type/Configurable.php b/app/code/Magento/Catalog/Model/Resource/Product/Type/Configurable.php
index 7ad006c29ac..889bc5c6f49 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Type/Configurable.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Type/Configurable.php
@@ -227,7 +227,7 @@ class Configurable extends \Magento\Core\Model\Resource\Db\AbstractDb
),
implode(' AND ', array(
'option_value.option_id = entity_value.value',
- 'option_value.store_id = ' . \Magento\Core\Model\AppInterface::ADMIN_STORE_ID,
+ 'option_value.store_id = ' . \Magento\Core\Model\Store::DEFAULT_STORE_ID,
)),
array()
)->joinLeft(
diff --git a/app/code/Magento/Catalog/etc/adminhtml/di.xml b/app/code/Magento/Catalog/etc/adminhtml/di.xml
index 9b2d2e4c1c2..7b2e542f5ab 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/di.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/di.xml
@@ -24,6 +24,7 @@
*/
-->
<config>
+ <preference for="Magento\Catalog\Model\Product\Type\Grouped" type="Magento\Catalog\Model\Product\Type\Grouped\Backend" />
<type name="Magento\Catalog\Controller\Adminhtml\Product\Attribute">
<param name="attributeLabelCache">
<instance type="Magento\App\Cache\Type\Translate" />
@@ -56,4 +57,9 @@
</value>
</param>
</type>
+ <type name="Magento\Catalog\Helper\Flat\AbstractFlat">
+ <param name="isAvailable">
+ <value type="bool">false</value>
+ </param>
+ </type>
</config>
diff --git a/app/code/Magento/Catalog/etc/adminhtml/menu.xml b/app/code/Magento/Catalog/etc/adminhtml/menu.xml
index e05b83a4b70..77c1023fed0 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/menu.xml
@@ -33,5 +33,7 @@
<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"/>
+
+ <add id="Magento_Catalog::inventory" title="Inventory" module="Magento_Catalog" sortOrder="10" parent="Magento_Catalog::catalog" dependsOnModule="Magento_Catalog" resource="Magento_Catalog::catalog"/>
</menu>
</config>
diff --git a/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/labels.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/labels.phtml
index 6fe277a3ce5..b878ba6dba8 100644
--- a/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/labels.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/labels.phtml
@@ -47,7 +47,7 @@
<?php $_labels = $this->getLabelValues() ?>
<?php foreach ($this->getStores() as $_store): ?>
<td class="col-store-view">
- <input class="input-text<?php if ($_store->getId() == \Magento\Core\Model\App::ADMIN_STORE_ID): ?> required-option<?php endif; ?>" type="text" name="frontend_label[<?php echo $_store->getId() ?>]" value="<?php echo $this->escapeHtml($_labels[$_store->getId()]) ?>"<?php if ($this->getReadOnly()):?> disabled="disabled"<?php endif;?>/>
+ <input class="input-text<?php if ($_store->getId() == \Magento\Core\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>" type="text" name="frontend_label[<?php echo $_store->getId() ?>]" value="<?php echo $this->escapeHtml($_labels[$_store->getId()]) ?>"<?php if ($this->getReadOnly()):?> disabled="disabled"<?php endif;?>/>
</td>
<?php endforeach; ?>
</tr>
diff --git a/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/options.phtml b/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/options.phtml
index 83fb7b2392f..95427458050 100644
--- a/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/options.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/catalog/product/attribute/options.phtml
@@ -70,7 +70,7 @@
<input class="input-radio" type="{{intype}}" name="default[]" value="{{id}}" {{checked}}<?php if ($this->getReadOnly()):?>disabled="disabled"<?php endif;?>/>
</td>
<?php foreach ($this->getStores() as $_store): ?>
- <td class="col-{{id}}"><input name="option[value][{{id}}][<?php echo $_store->getId() ?>]" value="{{store<?php echo $_store->getId() ?>}}" class="input-text<?php if ($_store->getId() == \Magento\Core\Model\App::ADMIN_STORE_ID): ?> required-option<?php endif; ?>" type="text" <?php if ($this->getReadOnly() || $this->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif;?>/></td>
+ <td class="col-{{id}}"><input name="option[value][{{id}}][<?php echo $_store->getId() ?>]" value="{{store<?php echo $_store->getId() ?>}}" class="input-text<?php if ($_store->getId() == \Magento\Core\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>" type="text" <?php if ($this->getReadOnly() || $this->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif;?>/></td>
<?php endforeach; ?>
<td id="delete_button_container_{{id}}" class="col-delete">
<input type="hidden" class="delete-flag" name="option[delete][{{id}}]" value="" />
diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit.xml
index c727fe8839b..ce0d24b444c 100644
--- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_attribute_edit.xml
@@ -39,6 +39,6 @@
<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="Magento_Catalog::catalog/product/attribute/js.phtml"/>
+ <block class="Magento\Backend\Block\Template" name="attribute_edit_js" template="Magento_Catalog::catalog/product/attribute/js.phtml"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Catalog/view/adminhtml/product/product.css b/app/code/Magento/Catalog/view/adminhtml/product/product.css
index f0c9fcaa03d..7b8fa7ac903 100644
--- a/app/code/Magento/Catalog/view/adminhtml/product/product.css
+++ b/app/code/Magento/Catalog/view/adminhtml/product/product.css
@@ -27,9 +27,9 @@
[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 {
+[class^=" newsletter-"] .page-actions .action-back,
+[class^=" newsletter-"] .page-actions .action-back:hover,
+[class^=" newsletter-"] .page-actions .action-back:active {
overflow: hidden;
padding: 5px 6px 3px;
margin-left: 12px;
@@ -37,17 +37,17 @@
}
[class^=" catalog-product-"] .page-actions .action-back:hover,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:hover {
+[class^=" newsletter-"] .page-actions .action-back:hover {
color: #000;
}
[class^=" catalog-product-"] .page-actions .action-back.mage-error,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back.mage-error {
+[class^=" newsletter-"] .page-actions .action-back.mage-error {
color: #b57c72;
}
[class^=" catalog-product-"] .page-actions .action-back:before,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:before {
+[class^=" newsletter-"] .page-actions .action-back:before {
display: inline-block;
font-family: 'MUI-Icons';
font-style: normal;
@@ -59,7 +59,7 @@
}
[class^=" catalog-product-"] .page-actions .action-back span,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back span {
+[class^=" newsletter-"] .page-actions .action-back span {
display: inline-block;
overflow: hidden;
text-indent: -999em;
diff --git a/app/code/Magento/Catalog/view/frontend/category/view.phtml b/app/code/Magento/Catalog/view/frontend/category/view.phtml
index d576070d0a4..4a3d1afe7aa 100644
--- a/app/code/Magento/Catalog/view/frontend/category/view.phtml
+++ b/app/code/Magento/Catalog/view/frontend/category/view.phtml
@@ -18,8 +18,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 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,7 +26,7 @@
/**
* Category view template
*
- * @see \Magento\Catalog\Block\Category\View
+ * @var $this \Magento\Catalog\Block\Category\View
*/
?>
<?php
@@ -36,33 +34,29 @@
$_category = $this->getCurrentCategory();
$_imgHtml = '';
if ($_imgUrl = $_category->getImageUrl()) {
- $_imgHtml = '<p class="category-image"><img src="'.$_imgUrl.'" alt="'.$this->escapeHtml($_category->getName()).'" title="'.$this->escapeHtml($_category->getName()).'" /></p>';
+ $_imgHtml = '<div class="category image"><img src="' . $_imgUrl . '" alt="' . $this->escapeHtml($_category->getName()) . '" title="' . $this->escapeHtml($_category->getName()) . '" /></div>';
$_imgHtml = $_helper->categoryAttribute($_category, $_imgHtml, 'image');
}
?>
-<div class="page-title category-title">
- <h1><?php echo $_helper->categoryAttribute($_category, $_category->getName(), 'name') ?></h1>
-</div>
-
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-
-<?php if($_imgUrl): ?>
- <?php echo $_imgHtml ?>
-<?php endif; ?>
+<div class="category view">
+ <?php if($_imgUrl): ?>
+ <?php echo $_imgHtml ?>
+ <?php endif; ?>
-<?php if($_description=$this->getCurrentCategory()->getDescription()): ?>
- <div class="category-description std">
- <?php echo $_helper->categoryAttribute($_category, $_description, 'description') ?>
- </div>
+ <?php if($_description=$this->getCurrentCategory()->getDescription()): ?>
+ <div class="category description">
+ <?php echo $_helper->categoryAttribute($_category, $_description, 'description') ?>
+ </div>
<?php endif; ?>
-<?php if($this->isContentMode()): ?>
- <?php echo $this->getCmsBlockHtml() ?>
+ <?php if($this->isContentMode()): ?>
+ <?php echo $this->getCmsBlockHtml() ?>
-<?php elseif($this->isMixedMode()): ?>
- <?php echo $this->getCmsBlockHtml() ?>
- <?php echo $this->getProductListHtml() ?>
+ <?php elseif($this->isMixedMode()): ?>
+ <?php echo $this->getCmsBlockHtml() ?>
+ <?php echo $this->getProductListHtml() ?>
-<?php else: ?>
- <?php echo $this->getProductListHtml() ?>
-<?php endif; ?>
+ <?php else: ?>
+ <?php echo $this->getProductListHtml() ?>
+ <?php endif; ?>
+</div>
diff --git a/app/code/Magento/Catalog/view/frontend/category/widget/link/link_block.phtml b/app/code/Magento/Catalog/view/frontend/category/widget/link/link_block.phtml
index b41858ab8b3..1f250d2453e 100644
--- a/app/code/Magento/Catalog/view/frontend/category/widget/link/link_block.phtml
+++ b/app/code/Magento/Catalog/view/frontend/category/widget/link/link_block.phtml
@@ -18,10 +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 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="widget widget-category-link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>
+<div class="widget category link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></div>
diff --git a/app/code/Magento/Catalog/view/frontend/category/widget/link/link_inline.phtml b/app/code/Magento/Catalog/view/frontend/category/widget/link/link_inline.phtml
index 8c9808693b5..cec450787e0 100644
--- a/app/code/Magento/Catalog/view/frontend/category/widget/link/link_inline.phtml
+++ b/app/code/Magento/Catalog/view/frontend/category/widget/link/link_inline.phtml
@@ -18,10 +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 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="widget widget-category-link-inline"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>
+<span class="widget category link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>
diff --git a/app/code/Magento/Catalog/view/frontend/images/i_asc_arrow.gif b/app/code/Magento/Catalog/view/frontend/images/i_asc_arrow.gif
deleted file mode 100644
index 3ff818b1b442dd7d99578316d7f0eb090c8e58b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 115
zcmV-(0F3`fNk%w1VFv&T0J9GO_|2{O%c|{sDEi&U_sFFC-^%^(<@wRG^|_4jl~MGs
zd+Tr%|NHs-;mzu21^@s5A^8LW000jFEC2ui00#gH000Ca@JYg?R4&!0mRlOI49+1a
VLGd_^fmp01#WD>y@`^tZ06W+)H&_4w
diff --git a/app/code/Magento/Catalog/view/frontend/images/i_desc_arrow.gif b/app/code/Magento/Catalog/view/frontend/images/i_desc_arrow.gif
deleted file mode 100644
index 3ac3de1ce5e01f145942aaae282835201e3e39ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 114
zcmV-&0FD1gNk%w1VFv&T0J9GO_|2{O%c|{sDEi&U_sFFC-^%^(<@wRG^|_4jl~MGs
zd+Tr%|NHs-;mzu21^@s5A^8LW000jFEC2ui00#gH000CZ@V(}wrB>p+Z<UCF6@elg
U&aePXvN($(wT^5tgcSh*JH#S4zyJUM
diff --git a/app/code/Magento/Catalog/view/frontend/images/i_widget-link.gif b/app/code/Magento/Catalog/view/frontend/images/i_widget-link.gif
deleted file mode 100644
index 16fc968deb5ea628fc160d01fd872fa44d36481b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 57
zcmZ?wbhEHb<YwSxXkcJCQ)vGG|9{1wEDRu^10p~&3`_zo{hSLW?p*U;?-%+w*I*SB
GgEauHoe!x1
diff --git a/app/code/Magento/Catalog/view/frontend/images/i_widget-new.gif b/app/code/Magento/Catalog/view/frontend/images/i_widget-new.gif
deleted file mode 100644
index fe0b27df8dce65a5e52da0b4e4271affcbdd17d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 545
zcmZ?wbhEHb<YVAtc*el+dB(#3|Nnpa{`<zG4?!)5-+%r&d++PorFWvcPTqU|>GqS4
z@%^V?fBZi8!jvi7pVuzDkTUsP@}zU0zWtuO{rQBg&oZW6Y*=}>Y1RGEwqrBSO_;Xp
z<;QQo;(Jd#diAAr;q{iobxW_#32Q&zv+;4?$@cu&SL#;Wjq5&IvG~TNhu^D~+>Gfu
z*1qmxT;J)e=@)x8J(+yE`_+f<Eo&aU{q&<_{i7Af-amW$ZOw^~{ac=v%)Q!qtZDL=
z`}6j{nX&8T+<mX7ZF^L+uk6E@U-J*Vz4!d{!pk$>ef~LX&+AV>2lO1f{q$qQ!K#q9
zBavMv7zQy={K*1#oeqcu#R&s@U4w?1qphoyu!x?qp%}ZJ3Dd+$lP9WMGbuRpO6n_H
z%6r-~sjx9IE?=>dN!NynVf}`UOagrC7#UXVSkA+3?zZs&1E;r=^p0KIS9nNhI~?4|
z>?O{6e5cTIW*OBh=hri9X}VlpeuCLu&d9)2)`^Sx{RcHG3sFHG4n>w<zxf*(tO4|g
B&yN5A
diff --git a/app/code/Magento/Catalog/view/frontend/images/media/col_left_callout.jpg b/app/code/Magento/Catalog/view/frontend/images/media/col_left_callout.jpg
deleted file mode 100644
index d6a26486bc9758e18f47719cb6dbf4b528bccc2b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 19102
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
diff --git a/app/code/Magento/Catalog/view/frontend/images/media/col_right_callout.jpg b/app/code/Magento/Catalog/view/frontend/images/media/col_right_callout.jpg
deleted file mode 100644
index 57dc1534051781fc02def8585a5a8ee586c3d118..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 14703
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
diff --git a/app/code/Magento/Catalog/view/frontend/js/configurable.js b/app/code/Magento/Catalog/view/frontend/js/configurable.js
index 9333c64b8d4..a4bf7504f63 100644
--- a/app/code/Magento/Catalog/view/frontend/js/configurable.js
+++ b/app/code/Magento/Catalog/view/frontend/js/configurable.js
@@ -61,7 +61,7 @@
$(this.options.spConfig.containerId).find(this.options.superSelector) :
$(this.options.superSelector);
this.options.values = this.options.spConfig.defaultValues || {};
- this.options.parentImage = $('[data-role=base-image]').attr('src');
+ this.options.parentImage = $('[data-role=base-image-container] img').attr('src');
},
/**
@@ -233,7 +233,7 @@
$.each(imagesArray || {}, function (k, v) {
result.push(v);
});
- var baseImage = this.element.find('[data-role=base-image]');
+ var baseImage = $('[data-role=base-image-container] img');
if (result.length === 1) {
baseImage.attr('src', result[0]).trigger('imageChanged', result[0]);
} else {
@@ -247,7 +247,7 @@
* @private
*/
_fitImageToContainer: function () {
- var image = this.element.find('[data-role=base-image]'),
+ var image = $('[data-role=base-image-container] img'),
imageContainer = image.closest('[data-role=base-image-container]'),
width = image.width(),
height = image.height(),
diff --git a/app/code/Magento/Catalog/view/frontend/js/list.js b/app/code/Magento/Catalog/view/frontend/js/list.js
index 6e7b80dd8b0..1ed2bc05207 100644
--- a/app/code/Magento/Catalog/view/frontend/js/list.js
+++ b/app/code/Magento/Catalog/view/frontend/js/list.js
@@ -26,40 +26,49 @@
(function ($, window) {
$.widget('mage.compareList', {
_create: function() {
- this.element.decorate('table');
- $(this.options.windowCloseSelector).on('click', function() {
- window.close();
- });
+ var elem = this.element,
+ products = $('thead td', elem);
+
+ if (products.length > this.options.productsInRow) {
+ var headings = $('<table/>')
+ .addClass('comparison headings data table')
+ .insertBefore(elem.closest('.container'));
+ elem.addClass('scroll');
+
+ $('th', elem).each(function(){
+ var th = $(this),
+ thCopy = th.clone();
+
+ th.animate({
+ top: '+=0'
+ }, 50, function(){
+ var height;
+ if ($.browser.mozilla && $.browser.version <= '11.0') {
+ height = th.outerHeight();
+ }
+ else {
+ height = th.height();
+ }
+ thCopy.css('height', height)
+ .appendTo(headings)
+ .wrap('<tr />');
+ });
+ });
+ }
$(this.options.windowPrintSelector).on('click', function(e) {
e.preventDefault();
window.print();
});
- var ajaxSpinner = $(this.options.ajaxSpinner);
- $(this.options.productRemoveSelector).on('click', function(e) {
- e.preventDefault();
- $.ajax({
- url: $(e.target).data('url'),
- type: 'POST',
- beforeSend: function() {
- ajaxSpinner.show();
- }
- }).done(function() {
- ajaxSpinner.hide();
- window.location.reload();
- window.opener.location.reload();
- });
- });
-
$.each(this.options.selectors, function(i, selector) {
$(selector).on('click', function(e) {
e.preventDefault();
- window.opener.focus();
- window.opener.location.href = $(this).data('url');
+ window.location.href = $(this).data('url');
});
});
+
}
});
-})(jQuery, window);
+})(jQuery, window);
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/view/frontend/layer/filter.phtml b/app/code/Magento/Catalog/view/frontend/layer/filter.phtml
index 60e8454a97c..c94aceb9799 100644
--- a/app/code/Magento/Catalog/view/frontend/layer/filter.phtml
+++ b/app/code/Magento/Catalog/view/frontend/layer/filter.phtml
@@ -18,8 +18,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 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,20 +26,20 @@
/**
* Template for filter items block
*
- * @see \Magento\Catalog\Block\Layer\Filter
+ * @var $this \Magento\Catalog\Block\Layer\Filter
*/
?>
-<ol>
-<?php foreach ($this->getItems() as $_item): ?>
- <li>
- <?php if ($_item->getCount() > 0): ?>
- <a href="<?php echo $this->escapeUrl($_item->getUrl()) ?>"><?php echo $_item->getLabel() ?></a>
- <?php else: echo $_item->getLabel() ?>
- <?php endif; ?>
- <?php if ($this->shouldDisplayProductCount()): ?>
- (<?php echo $_item->getCount() ?>)
- <?php endif; ?>
- </li>
-<?php endforeach ?>
+<ol class="items">
+ <?php foreach ($this->getItems() as $_item): ?>
+ <li class="item">
+ <?php if ($_item->getCount() > 0): ?>
+ <a href="<?php echo $this->escapeUrl($_item->getUrl()) ?>"><?php echo $_item->getLabel() ?></a>
+ <?php else: echo $_item->getLabel() ?>
+ <?php endif; ?>
+ <?php if ($this->shouldDisplayProductCount()): ?>
+ <span class="count"><?php echo $_item->getCount() ?></span>
+ <?php endif; ?>
+ </li>
+ <?php endforeach ?>
</ol>
diff --git a/app/code/Magento/Catalog/view/frontend/layer/state.phtml b/app/code/Magento/Catalog/view/frontend/layer/state.phtml
index fa2c8783093..17a44eeef01 100644
--- a/app/code/Magento/Catalog/view/frontend/layer/state.phtml
+++ b/app/code/Magento/Catalog/view/frontend/layer/state.phtml
@@ -18,8 +18,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 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,23 +31,34 @@
?>
<?php $_filters = $this->getActiveFilters() ?>
<?php if(!empty($_filters)): ?>
-<div class="currently">
- <p class="block-subtitle"><?php echo __('Currently Shopping by:') ?></p>
- <ol>
- <?php foreach ($_filters as $_filter): ?>
- <li>
- <span class="label"><?php echo __($_filter->getName()) ?>:</span> <span class="value"><?php echo $this->stripTags($_filter->getLabel()) ?></span>
- <?php
+<div class="filtered">
+ <strong class="subtitle"><?php echo __('Currently Shopping by:') ?></strong>
+ <ol class="items">
+ <?php foreach ($_filters as $_filter): ?>
+ <li class="item">
+ <span class="label"><?php echo __($_filter->getName()) ?>:</span>
+ <span class="value"><?php echo $this->stripTags($_filter->getLabel()) ?></span>
+ <?php
$clearLinkUrl = $_filter->getClearLinkUrl();
if ($clearLinkUrl):
- ?>
- <a class="btn-previous" href="<?php echo $_filter->getRemoveUrl() ?>" title="<?php echo __('Previous') ?>"><?php echo __('Previous') ?></a>
- <a class="btn-remove" title="<?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>" href="<?php echo $clearLinkUrl ?>"><?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></a>
- <?php else: ?>
- <a class="btn-remove" href="<?php echo $_filter->getRemoveUrl() ?>" title="<?php echo __('Remove This Item') ?>"><?php echo __('Remove This Item') ?></a>
- <?php endif; ?>
- </li>
- <?php endforeach; ?>
+ ?>
+ <a class="action previous" href="<?php echo $_filter->getRemoveUrl() ?>"
+ title="<?php echo __('Previous') ?>">
+ <span><?php echo __('Previous') ?></span>
+ </a>
+ <a class="action remove"
+ title="<?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>"
+ href="<?php echo $clearLinkUrl ?>">
+ <span><?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
+ </a>
+ <?php else: ?>
+ <a class="action remove" href="<?php echo $_filter->getRemoveUrl() ?>"
+ title="<?php echo __('Remove This Item') ?>">
+ <span><?php echo __('Remove This Item') ?></span>
+ </a>
+ <?php endif; ?>
+ </li>
+ <?php endforeach; ?>
</ol>
</div>
<?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/layer/view.phtml b/app/code/Magento/Catalog/view/frontend/layer/view.phtml
index 411c4564f40..838bf752f3f 100644
--- a/app/code/Magento/Catalog/view/frontend/layer/view.phtml
+++ b/app/code/Magento/Catalog/view/frontend/layer/view.phtml
@@ -18,42 +18,40 @@
* 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)
+ * @copyright Copyright (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
/**
* Category layered navigation
*
- * @see \Magento\Catalog\Block\Layer\View
+ * @var $this \Magento\Catalog\Block\Layer\View
*/
?>
+
<?php if($this->canShowBlock()): ?>
-<div class="block block-layered-nav">
- <div class="block-title">
- <strong><span><?php echo __('Shop By') ?></span></strong>
+<div class="block filter">
+ <div class="title">
+ <strong><?php echo __('Shop By') ?></strong>
</div>
- <div class="block-content">
+ <div class="content">
<?php echo $this->getStateHtml() ?>
<?php if ($this->getLayer()->getState()->getFilters()): ?>
- <div class="actions"><a href="<?php echo $this->getClearUrl() ?>"><?php echo __('Clear All') ?></a></div>
+ <div class="actions">
+ <a href="<?php echo $this->getClearUrl() ?>" class="action reset"><?php echo __('Clear All') ?></a>
+ </div>
<?php endif; ?>
- <?php if($this->canShowOptions()): ?>
- <p class="block-subtitle"><?php echo __('Shopping Options') ?></p>
- <dl id="narrow-by-list">
- <?php $_filters = $this->getFilters() ?>
- <?php foreach ($_filters as $_filter): ?>
+ <strong class="subtitle"><?php echo __('Shopping Options') ?></strong>
+ <dl class="options" id="narrow-by-list">
+ <?php $_filters = $this->getFilters() ?>
+ <?php foreach ($_filters as $_filter): ?>
<?php if($_filter->getItemsCount()): ?>
<dt><?php echo __($_filter->getName()) ?></dt>
<dd><?php echo $_filter->getHtml() ?></dd>
<?php endif; ?>
- <?php endforeach; ?>
- </dl>
- <script type="text/javascript">(function($) {$('#narrow-by-list').decorate('dataList')})(jQuery)</script>
- <?php endif; ?>
+ <?php endforeach; ?>
+ </dl>
</div>
</div>
<?php endif; ?>
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 0c0ab92140c..57788350edb 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
@@ -24,32 +24,60 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <update handle="page_two_columns_left"/>
<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">
<block class="Magento\Catalog\Block\Product\ProductList\Toolbar" name="product_list_toolbar" template="product/list/toolbar.phtml">
<block class="Magento\Page\Block\Html\Pager" name="product_list_toolbar_pager"/>
+ <!-- The following code shows how to set your own pager increments -->
+ <!--
+ <action method="setDefaultListPerPage">
+ <argument name="limit" xsi:type="string">4</argument>
+ </action>
+ <action method="setDefaultGridPerPage">
+ <argument name="limit" xsi:type="string">3</argument>
+ </action>
+ <action method="addPagerLimit">
+ <argument name="mode" xsi:type="string">list</argument>
+ <argument name="limit" xsi:type="string">2</argument>
+ </action>
+ <action method="addPagerLimit">
+ <argument name="mode" xsi:type="string">list</argument>
+ <argument name="limit" xsi:type="string">4</argument>
+ </action>
+ <action method="addPagerLimit">
+ <argument name="mode" xsi:type="string">list</argument>
+ <argument name="limit" xsi:type="string">6</argument>
+ </action>
+ <action method="addPagerLimit">
+ <argument name="mode" xsi:type="string">list</argument>
+ <argument name="limit" xsi:type="string">8</argument>
+ </action>
+ <action method="addPagerLimit" translate="label">
+ <argument name="mode" xsi:type="string">list</argument>
+ <argument name="limit" xsi:type="string">all</argument>
+ <argument name="label" xsi:type="string">All</argument>
+ </action>
+ <action method="addPagerLimit">
+ <argument name="mode" xsi:type="string">grid</argument>
+ <argument name="limit" xsi:type="string">3</argument>
+ </action>
+ <action method="addPagerLimit">
+ <argument name="mode" xsi:type="string">grid</argument>
+ <argument name="limit" xsi:type="string">6</argument>
+ </action>
+ <action method="addPagerLimit">
+ <argument name="mode" xsi:type="string">grid</argument>
+ <argument name="limit" xsi:type="string">9</argument>
+ </action>
+ <action method="addPagerLimit" translate="label">
+ <argument name="mode" xsi:type="string">grid</argument>
+ <argument name="limit" xsi:type="string">all</argument>
+ <argument name="label" xsi:type="string">All</argument>
+ </action>
+ -->
</block>
- <action method="addColumnCountLayoutDepend">
- <argument name="layout" xsi:type="string">empty</argument>
- <argument name="count" xsi:type="string">6</argument>
- </action>
- <action method="addColumnCountLayoutDepend">
- <argument name="layout" xsi:type="string">one_column</argument>
- <argument name="count" xsi:type="string">5</argument>
- </action>
- <action method="addColumnCountLayoutDepend">
- <argument name="layout" xsi:type="string">two_columns_left</argument>
- <argument name="count" xsi:type="string">4</argument>
- </action>
- <action method="addColumnCountLayoutDepend">
- <argument name="layout" xsi:type="string">two_columns_right</argument>
- <argument name="count" xsi:type="string">4</argument>
- </action>
- <action method="addColumnCountLayoutDepend">
- <argument name="layout" xsi:type="string">three_columns</argument>
- <argument name="count" xsi:type="string">3</argument>
- </action>
<action method="setToolbarBlockName">
<argument name="name" xsi:type="string">product_list_toolbar</argument>
</action>
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 b155ed90be5..dabf708b519 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
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="left">
- <block class="Magento\Catalog\Block\Navigation" name="catalog.leftnav" after="currency" template="navigation/left.phtml"/>
+ <block class="Magento\Catalog\Block\Navigation" name="catalog.leftnav" before="-" template="navigation/left.phtml"/>
</referenceContainer>
</layout>
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 c33e2e17ba9..5d2abe78c9c 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
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="left">
- <block class="Magento\Catalog\Block\Layer\View" name="catalog.leftnav" after="currency" template="layer/view.phtml"/>
+ <block class="Magento\Catalog\Block\Layer\View" name="catalog.leftnav" before="-" template="layer/view.phtml"/>
</referenceContainer>
</layout>
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 6bc83854653..e00562d5d77 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
@@ -24,18 +24,12 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="root">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">popup.phtml</argument>
+ <update handle="page_one_column"/>
+ <referenceBlock name="page.main.title">
+ <action method="setPageTitle">
+ <argument translate="true" name="page_title" xsi:type="string">Compare Products</argument>
</action>
</referenceBlock>
- <referenceBlock name="head">
- <block class="Magento\Page\Block\Html\Head\Script" name="scriptaculous-scriptaculous-js">
- <arguments>
- <argument name="file" xsi:type="string">scriptaculous/scriptaculous.js</argument>
- </arguments>
- </block>
- </referenceBlock>
<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/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml b/app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml
index c625607f9b2..59a46c1af00 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
@@ -24,69 +24,119 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <update handle="page_one_column"/>
+ <referenceBlock name="page.main.title">
+ <arguments>
+ <argument name="css_class" xsi:type="string">product</argument>
+ <argument name="add_base_attribute" xsi:type="string">itemprop="name"</argument>
+ </arguments>
+ </referenceBlock>
<referenceBlock name="root">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">2columns-right.phtml</argument>
- </action>
+ <arguments>
+ <argument name="add_attribute" xsi:type="string">itemscope itemtype="http://schema.org/Product"</argument>
+ </arguments>
</referenceBlock>
<referenceBlock name="head">
- <block class="Magento\Page\Block\Html\Head\Css" name="magento-catalog-zoom-css">
+ <block class="Magento\Page\Block\Html\Head\Script" name="mage-zoom-js">
+ <arguments>
+ <argument name="file" xsi:type="string">mage/zoom.js</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Page\Block\Html\Head\Css" name="mage-gallery-css">
<arguments>
- <argument name="file" xsi:type="string">Magento_Catalog::zoom.css</argument>
+ <argument name="file" xsi:type="string">mage/gallery.css</argument>
</arguments>
</block>
</referenceBlock>
<update handle="page_calendar"/>
+ <block class="Magento\Catalog\Block\Product\View" name="product.info" template="product/view/form.phtml">
+ <container name="product.info.form.content" label="invisible" as="product_info_form_content">
+ <block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart" as="addtocart" template="product/view/addtocart.phtml"/>
+ </container>
+ <block class="Magento\View\Block\Template" name="product.info.form.options" as="options_container">
+ <block class="Magento\Catalog\Block\Product\View" name="product.info.options.wrapper" as="product_options_wrapper" template="product/view/options/wrapper.phtml">
+ <block class="Magento\Catalog\Block\Product\View\Options" name="product.info.options" as="product_options" template="product/view/options.phtml">
+ <block class="Magento\Catalog\Block\Product\View\Options\Type\DefaultType" as="default" template="product/view/options/type/default.phtml"/>
+ <block class="Magento\Catalog\Block\Product\View\Options\Type\Text" as="text" template="product/view/options/type/text.phtml"/>
+ <block class="Magento\Catalog\Block\Product\View\Options\Type\File" as="file" template="product/view/options/type/file.phtml"/>
+ <block class="Magento\Catalog\Block\Product\View\Options\Type\Select" as="select" template="product/view/options/type/select.phtml"/>
+ <block class="Magento\Catalog\Block\Product\View\Options\Type\Date" as="date" template="product/view/options/type/date.phtml"/>
+ </block>
+ <block class="Magento\View\Block\Html\Calendar" name="html_calendar" as="html_calendar" template="Magento_Page::js/calendar.phtml"/>
+ </block>
+ <block class="Magento\Catalog\Block\Product\View" name="product.info.options.wrapper.bottom" as="product_options_wrapper_bottom" template="product/view/options/wrapper/bottom.phtml">
+ <block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart.additional" as="product.info.addtocart" template="product/view/addtocart.phtml"/>
+ <block class="Magento\Catalog\Block\Product\View" name="product.clone_prices" as="prices" template="product/view/price_clone.phtml"/>
+ </block>
+ </block>
+ </block>
<referenceContainer name="content">
- <block class="Magento\Catalog\Block\Product\View" name="product.info" template="product/view.phtml">
- <block class="Magento\Catalog\Block\Product\View\BaseImage" name="product-info-base-image" as="base-image" template="product/view/base-image.phtml"/>
- <block class="Magento\Catalog\Block\Product\View\Gallery" name="product-info-gallery" as="gallery" template="product/view/gallery.phtml"/>
+ <container name="product.info.main" label="invisible" htmlTag="div" htmlClass="product info main" before="-">
+ <block class="Magento\Catalog\Block\Product\View" name="product.price" template="product/view/price.phtml"/>
+ <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.sku" template="product/view/attribute.phtml">
+ <arguments>
+ <argument name="at_call" xsi:type="string">getSku</argument>
+ <argument name="at_code" xsi:type="string">sku</argument>
+ <argument name="css_class" xsi:type="string">sku</argument>
+ <argument name="at_label" xsi:type="string">default</argument>
+ <argument name="add_attribute" xsi:type="string">itemprop="sku"</argument>
+ </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" group="detailed_info">
+ <arguments>
+ <argument name="at_call" xsi:type="string">getShortDescription</argument>
+ <argument name="at_code" xsi:type="string">short_description</argument>
+ <argument name="css_class" xsi:type="string">overview</argument>
+ <argument name="at_label" translate="true" xsi:type="string">none</argument>
+ <argument name="title" translate="true" xsi:type="string">Overview</argument>
+ <argument name="add_attribute" xsi:type="string">itemprop="description"</argument>
+ </arguments>
+ </block>
<container name="alert.urls" as="alert_urls" label="Alert Urls"/>
- <block class="Magento\Catalog\Block\Product\ProductList\Upsell" name="product.info.upsell" as="upsell_products" template="product/list/upsell.phtml">
- <action method="setColumnCount">
- <argument name="columns" xsi:type="string">4</argument>
- </action>
- <action method="setItemLimit">
- <argument name="type" xsi:type="string">upsell</argument>
- <argument name="limit" xsi:type="string">4</argument>
- </action>
+ <container name="product.info.type" label="invisible"/>
+ <block class="Magento\Catalog\Block\Product\View" name="product.tierprices" as="tierprices" template="product/view/tierprices.phtml"/>
+ <container name="product.info.extrahint" as="extrahint" label="Product View Extra Hint"/>
+ <block class="Magento\Catalog\Block\Product\View" name="product.info.addto" as="addto" template="product/view/addto.phtml"/>
+ <container name="product.info.social" label="Product social links container" htmlTag="div" htmlClass="social links product">
+ <block class="Magento\Catalog\Block\Product\View" name="product.info.mailto" template="product/view/mailto.phtml"/>
+ </container>
+ </container>
+ <container name="product.info.media" label="invisible" htmlTag="div" htmlClass="product media" after="product.info.main">
+ <block class="Magento\Catalog\Block\Product\View\Gallery" name="product.info.media.image" template="product/view/base-image.phtml">
+ <block class="Magento\Catalog\Block\Product\Image" name="product.image.main"/>
+ <block class="Magento\Catalog\Block\Product\Image" name="product.image.thumbs"/>
</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" group="detailed_info">
- <action method="setTitle">
- <argument translate="true" name="value" xsi:type="string">Details</argument>
- </action>
+ </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" group="detailed_info">
+ <arguments>
+ <argument name="at_call" xsi:type="string">getDescription</argument>
+ <argument name="at_code" xsi:type="string">description</argument>
+ <argument name="css_class" xsi:type="string">description</argument>
+ <argument name="at_label" xsi:type="string">none</argument>
+ <argument name="title" translate="true" xsi:type="string">Details</argument>
+ </arguments>
</block>
<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>
- </block>
- <block class="Magento\Catalog\Block\Product\View" name="product.info.addto" as="addto" template="product/view/addto.phtml"/>
- <block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart" as="addtocart" template="product/view/addtocart.phtml"/>
- <container name="product.info.extrahint" as="extrahint" label="Product View Extra Hint"/>
- <block class="Magento\View\Block\Template" name="product.info.container" as="options_container">
- <block class="Magento\Catalog\Block\Product\View" name="product.info.options.wrapper" as="product_options_wrapper" template="product/view/options/wrapper.phtml">
- <block class="Magento\Catalog\Block\Product\View\Options" name="product.info.options" as="product_options" template="product/view/options.phtml">
- <block class="Magento\Catalog\Block\Product\View\Options\Type\DefaultType" as="default" template="product/view/options/type/default.phtml"/>
- <block class="Magento\Catalog\Block\Product\View\Options\Type\Text" as="text" template="product/view/options/type/text.phtml"/>
- <block class="Magento\Catalog\Block\Product\View\Options\Type\File" as="file" template="product/view/options/type/file.phtml"/>
- <block class="Magento\Catalog\Block\Product\View\Options\Type\Select" as="select" template="product/view/options/type/select.phtml"/>
- <block class="Magento\Catalog\Block\Product\View\Options\Type\Date" as="date" template="product/view/options/type/date.phtml"/>
- </block>
- <block class="Magento\View\Block\Html\Calendar" name="html_calendar" as="html_calendar" template="Magento_Page::js/calendar.phtml"/>
- </block>
- <block class="Magento\Catalog\Block\Product\View" name="product.info.options.wrapper.bottom" as="product_options_wrapper_bottom" template="product/view/options/wrapper/bottom.phtml">
- <block class="Magento\Catalog\Block\Product\View" name="product.tierprices.additional" as="product.tierprices" template="product/view/tierprices.phtml"/>
- <block class="Magento\Catalog\Block\Product\View" name="product.clone_prices" as="prices" template="product/view/price_clone.phtml"/>
- <block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart.additional" as="addtocart" template="product/view/addtocart.phtml"/>
- <block class="Magento\Catalog\Block\Product\View" name="product.info.addto.additional" as="addto" template="product/view/addto.phtml"/>
- </block>
+ <arguments>
+ <argument translate="true" name="title" xsi:type="string">Additional Information</argument>
+ </arguments>
</block>
</block>
</referenceContainer>
- <referenceContainer name="right">
- <block class="Magento\Catalog\Block\Product\ProductList\Related" name="catalog.product.related" before="-" template="product/list/related.phtml"/>
+ <referenceContainer name="content.aside">
+ <block class="Magento\Catalog\Block\Product\ProductList\Related" name="catalog.product.related" template="Magento_Catalog::product/list/items.phtml">
+ <arguments>
+ <argument name="type" xsi:type="string">related</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Catalog\Block\Product\ProductList\Upsell" name="product.info.upsell" template="Magento_Catalog::product/list/items.phtml">
+ <arguments>
+ <argument name="type" xsi:type="string">upsell</argument>
+ </arguments>
+ </block>
+ <block class="Magento\Catalog\Block\Product\View\Additional" name="product.info.additional" as="product_additional_data"/>
</referenceContainer>
<update handle="MAP_popup"/>
<update handle="MAP_price_msrp_item"/>
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 2bad362d01d..baf5f2d8391 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
@@ -24,11 +24,15 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <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"/>
- </block>
+ <referenceBlock name="root">
+ <action method="addBodyClass">
+ <argument name="value" xsi:type="string">type-configurable</argument>
+ </action>
</referenceBlock>
+ <referenceContainer name="product.info.type">
+ <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" after="product.info.configurable" as="product_type_data_extra" label="Product Extra Info"/>
+ </referenceContainer>
<referenceBlock name="product.info.options.wrapper">
<block class="Magento\Catalog\Block\Product\View\Type\Configurable" name="product.info.options.configurable" as="options_configurable" before="-" template="product/view/type/options/configurable.phtml"/>
</referenceBlock>
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 af3c5a23e15..e86dc99138f 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
@@ -24,9 +24,8 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <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"/>
- </block>
- </referenceBlock>
+ <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"/>
+ </referenceContainer>
</layout>
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 27a22feac4f..b39d1f7329a 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
@@ -24,9 +24,8 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <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"/>
- </block>
- </referenceBlock>
+ <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"/>
+ </referenceContainer>
</layout>
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 635b713c307..3f0089174f9 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
@@ -24,9 +24,8 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <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"/>
- </block>
- </referenceBlock>
+ <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"/>
+ </referenceContainer>
</layout>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/default.xml b/app/code/Magento/Catalog/view/frontend/layout/default.xml
index 61dce0450f1..c22c8528c0d 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/default.xml
+++ b/app/code/Magento/Catalog/view/frontend/layout/default.xml
@@ -24,36 +24,8 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="head">
- <block class="Magento\Page\Block\Html\Head\Css" name="magento-catalog-widgets-css">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Catalog::widgets.css</argument>
- </arguments>
- </block>
- </referenceBlock>
- <referenceContainer name="left">
- <block class="Magento\View\Block\Template" name="left.permanent.callout" template="Magento_Page::callouts/left_col.phtml">
- <action method="setImgSrc">
- <argument name="src" xsi:type="string">Magento_Catalog::images/media/col_left_callout.jpg</argument>
- </action>
- <action method="setImgAlt">
- <argument translate="true" name="alt" xsi:type="string">Our customer service is available 24/7.</argument>
- </action>
- <action method="setLinkUrl">
- <argument name="url" xsi:type="string">checkout/cart</argument>
- </action>
- </block>
- </referenceContainer>
<referenceContainer name="right">
- <block class="Magento\Catalog\Block\Product\Compare\Sidebar" before="cart_sidebar" name="catalog.compare.sidebar" template="product/compare/sidebar.phtml"/>
- <block class="Magento\View\Block\Template" name="right.permanent.callout" template="Magento_Page::callouts/right_col.phtml">
- <action method="setImgSrc">
- <argument name="src" xsi:type="string">Magento_Catalog::images/media/col_right_callout.jpg</argument>
- </action>
- <action method="setImgAlt">
- <argument translate="true" name="alt" xsi:type="string">Look for our special back-to-school items and save bunches!</argument>
- </action>
- </block>
+ <block class="Magento\Catalog\Block\Product\Compare\Sidebar" name="catalog.compare.sidebar" template="product/compare/sidebar.phtml"/>
</referenceContainer>
<block class="Magento\Catalog\Block\Product\Price\Template" name="catalog_product_price_template"/>
<referenceBlock name="catalog_product_price_template">
diff --git a/app/code/Magento/Catalog/view/frontend/msrp/popup.phtml b/app/code/Magento/Catalog/view/frontend/msrp/popup.phtml
index 06b07bc17cf..4b0273ddb94 100644
--- a/app/code/Magento/Catalog/view/frontend/msrp/popup.phtml
+++ b/app/code/Magento/Catalog/view/frontend/msrp/popup.phtml
@@ -18,8 +18,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 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,32 +29,33 @@
*/
?>
<?php if ($this->helper('Magento\Catalog\Helper\Data')->isMsrpEnabled()): ?>
-<div id="map-popup" class="map-popup" style="display:none;">
- <a href="#" class="map-popup-close" id="map-popup-close">x</a>
-
- <div class="map-popup-arrow"></div>
- <div class="map-popup-heading"><h2 id="map-popup-heading"></h2></div>
- <div class="map-popup-content" id="map-popup-content">
- <div class="map-popup-checkout">
- <form action="" method="POST" id="product_addtocart_form_from_popup">
- <input type="hidden" name="product" class="product_id" value="" id="map-popup-product-id"/>
-
- <div class="additional-addtocart-box">
- <?php echo $this->getChildHtml(); ?>
- </div>
- <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart"
- id="map-popup-button"><span><span><?php echo __('Add to Cart') ?></span></span></button>
- </form>
+<div id="map-popup" class="map popup">
+ <a href="#" class="action close" id="map-popup-close"><span><?php echo __('Close') ?></span></a>
+ <div class="title" id="map-popup-heading"></div>
+ <div class="content" id="map-popup-content">
+ <form action="" method="POST" id="product_addtocart_form_from_popup" class="form map checkout">
+ <input type="hidden" name="product" class="product_id" value="" id="map-popup-product-id"/>
+ <div class="additional-addtocart-box">
+ <?php echo $this->getChildHtml(); ?>
+ </div>
+ <button type="button" title="<?php echo __('Add to Cart') ?>" class="action tocart" id="map-popup-button">
+ <span><?php echo __('Add to Cart') ?></span>
+ </button>
+ </form>
+ <div class="map msrp" id="map-popup-msrp-box">
+ <span class="label"><?php echo __('Price'); ?></span>
+ <div class="old price" id="map-popup-msrp"></div>
</div>
- <div class="map-popup-msrp" id="map-popup-msrp-box"><strong><?php echo __('Price'); ?>:</strong> <span
- style="text-decoration:line-through;" id="map-popup-msrp"></span></div>
- <div class="map-popup-price" id="map-popup-price-box"><strong><?php echo __('Actual Price'); ?>:</strong>
- <span id="map-popup-price"></span></div>
-
+ <div class="map price" id="map-popup-price-box">
+ <span class="label"><?php echo __('Actual Price'); ?></span>
+ <div id="map-popup-price" class="actual price"></div>
+ </div>
+ </div>
+ <div class="content" id="map-popup-text">
+ <?php echo $this->helper('Magento\Catalog\Helper\Data')->getMsrpExplanationMessage(); ?>
+ </div>
+ <div class="content" id="map-popup-text-what-this">
+ <?php echo $this->helper('Magento\Catalog\Helper\Data')->getMsrpExplanationMessageWhatsThis(); ?>
</div>
- <div class="map-popup-text"
- id="map-popup-text"><?php echo $this->helper('Magento\Catalog\Helper\Data')->getMsrpExplanationMessage(); ?></div>
- <div class="map-popup-text"
- id="map-popup-text-what-this"><?php echo $this->helper('Magento\Catalog\Helper\Data')->getMsrpExplanationMessageWhatsThis(); ?></div>
</div>
<?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/navigation/left.phtml b/app/code/Magento/Catalog/view/frontend/navigation/left.phtml
index d91ec6b8d63..c8fd9446ef2 100644
--- a/app/code/Magento/Catalog/view/frontend/navigation/left.phtml
+++ b/app/code/Magento/Catalog/view/frontend/navigation/left.phtml
@@ -18,8 +18,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 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)
*/
@@ -34,26 +32,27 @@
<?php $_categories = $this->getCurrentChildCategories() ?>
<?php $_count = is_array($_categories)?count($_categories):$_categories->count(); ?>
<?php if($_count): ?>
-<div class="block block-layered-nav">
- <div class="block-title">
- <strong><span><?php echo __('Browse By') ?></span></strong>
+ <div class="block filter">
+ <div class="title">
+ <strong><?php echo __('Shop By') ?></strong>
+ </div>
+ <div class="content">
+ <strong class="subtitle"><?php echo __('Shopping Options') ?></strong>
+ <dl class="options" id="narrow-by-list2">
+ <dt><?php echo __('Category') ?></dt>
+ <dd>
+ <ol class="items">
+ <?php foreach ($_categories as $_category): ?>
+ <?php if($_category->getIsActive()): ?>
+ <li class="item">
+ <a href="<?php echo $this->getCategoryUrl($_category) ?>"<?php if ($this->isCategoryActive($_category)): ?> class="current"<?php endif; ?>><?php echo $this->escapeHtml($_category->getName()) ?></a>
+ <span class="count"><?php echo $_category->getProductCount() ?></span>
+ </li>
+ <?php endif; ?>
+ <?php endforeach ?>
+ </ol>
+ </dd>
+ </dl>
+ </div>
</div>
- <div class="block-content">
- <dl id="narrow-by-list2">
- <dt><?php echo __('Category') ?></dt>
- <dd>
- <ol>
- <?php foreach ($_categories as $_category): ?>
- <?php if($_category->getIsActive()): ?>
- <li>
- <a href="<?php echo $this->getCategoryUrl($_category) ?>"<?php if ($this->isCategoryActive($_category)): ?> class="current"<?php endif; ?>><?php echo $this->escapeHtml($_category->getName()) ?></a> (<?php echo $_category->getProductCount() ?>)
- </li>
- <?php endif; ?>
- <?php endforeach ?>
- </ol>
- </dd>
- </dl>
- <script type="text/javascript">(function($) {$('#narrow-by-list2').decorate('dataList')})(jQuery)</script>
- </div>
-</div>
<?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/navigation/top.phtml b/app/code/Magento/Catalog/view/frontend/navigation/top.phtml
index 5c948d34a69..2a5fc51cd74 100644
--- a/app/code/Magento/Catalog/view/frontend/navigation/top.phtml
+++ b/app/code/Magento/Catalog/view/frontend/navigation/top.phtml
@@ -18,8 +18,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 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,7 +26,7 @@
/**
* Top menu for store
*
- * @see \Magento\Catalog\Block\Navigation
+ * @var $this \Magento\Catalog\Block\Navigation
*/
?>
<?php
@@ -41,7 +39,7 @@
?>
<?php $_menu = $this->renderCategoriesMenuHtml(0,'level-top') ?>
<?php if($_menu): ?>
-<div class="nav-container">
+<div class="nav container">
<ul id="nav">
<?php echo $_menu ?>
</ul>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/compare/link.phtml b/app/code/Magento/Catalog/view/frontend/product/compare/link.phtml
similarity index 98%
rename from app/design/frontend/magento_plushe/Magento_Catalog/product/compare/link.phtml
rename to app/code/Magento/Catalog/view/frontend/product/compare/link.phtml
index 288e5ce1f9a..b7c2bed5231 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/compare/link.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/compare/link.phtml
@@ -18,7 +18,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/code/Magento/Catalog/view/frontend/product/compare/list.phtml b/app/code/Magento/Catalog/view/frontend/product/compare/list.phtml
index 89c012dd4b7..206691fd2ba 100644
--- a/app/code/Magento/Catalog/view/frontend/product/compare/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/compare/list.phtml
@@ -18,146 +18,135 @@
* 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\Catalog\Block\Product\Compare\ListCompare */
?>
-<div class="page-title title-buttons">
- <h1><?php echo __('Compare Products') ?></h1>
- <a href="#" class="link-print"><?php echo __('Print This Page') ?></a>
-</div>
<?php $_total=$this->getItems()->getSize() ?>
<?php if($_total): ?>
-<table class="data-table compare-table" id="product-comparison">
- <?php $_i=0 ?>
- <?php foreach($this->getItems() as $_item): ?>
- <?php if($_i++%10==0): ?>
- <col width="1" />
- <?php endif; ?>
- <col width="<?php echo floor(100/$_total); ?>%" />
- <?php endforeach; ?>
- <?php if ($_total>2): ?>
- <thead>
- <tr>
- <?php $_i=0 ?>
- <?php foreach($this->getItems() as $_item): ?>
- <?php if($_i++%10==0): ?>
- <th> </th>
- <?php endif; ?>
- <td class="a-right"><a href="#" data-url='<?php echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getRemoveUrl($_item) ?>' class="btn-remove" title="<?php echo __('Remove This Item') ?>"><?php echo __('Remove This Item') ?></a></td>
- <?php endforeach; ?>
- </tr>
- </thead>
- <?php endif ?>
- <tbody>
- <tr class="product-shop-row">
- <?php $_i=0 ?>
- <?php foreach($this->getItems() as $_item): ?>
- <?php if($_i++%10==0): ?>
- <th> </th>
- <?php endif; ?>
- <td>
- <a class="product-image" href="#" data-url="<?php echo $this->getProductUrl($_item) ?>" title="<?php echo $this->stripTags($_item->getName(), null, true) ?>"><img src="<?php echo $this->getSmallImageUrl($_item) ?>" width="<?php echo $this->getSmallImageSize()?>" height="<?php echo $this->getSmallImageSize()?>" alt="<?php echo $this->stripTags($_item->getName(), null, true) ?>" /></a>
- <h2 class="product-name"><a href="#" data-url="<?php echo $this->getProductUrl($_item) ?>" title="<?php echo $this->stripTags($_item->getName(), null, true) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName(), 'name') ?></a></h2>
- <?php echo $this->getReviewsSummaryHtml($_item, 'short') ?>
- <?php echo $this->getPriceHtml($_item, true, '-compare-list-top') ?>
- <?php if($_item->isSaleable()): ?>
- <p><button type="button" data-url="<?php echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToCartUrl($_item) ?>" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" ><span><span><?php echo __('Add to Cart') ?></span></span></button></p>
- <?php else: ?>
- <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
- <ul class="add-to-links" data-role="add-to-links">
- <li><a href="#" data-url="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="link-wishlist" data-action="add-to-wishlist" ><?php echo __('Add to Wishlist') ?></a></li>
- </ul>
- <?php endif; ?>
- </td>
- <?php endforeach; ?>
- </tr>
- </tbody>
- <tbody>
- <?php foreach ($this->getAttributes() as $_attribute): ?>
- <tr>
- <?php $_i=0 ?>
- <?php foreach($this->getItems() as $_item): ?>
- <?php if($_i++%10==0): ?>
- <th><span class="nobr"><?php echo $_attribute->getStoreLabel() ?></span></th>
- <?php endif; ?>
- <td>
- <?php switch ($_attribute->getAttributeCode()) {
- case "price": ?>
- <?php echo $this->getPriceHtml($_item, true, '-compare-list-' . $_attribute->getCode()) ?>
- <?php break;
- case "small_image": ?>
- <img src="<?php echo $this->getSmallImageUrl($_item); ?>" width="<?php echo $this->getSmallImageSize()?>" height="<?php echo $this->getSmallImageSize()?>" alt="<?php echo $this->escapeHtml($_item->getName()) ?>" title="<?php echo $this->escapeHtml($_item->getName()) ?>" />
- <?php break;
- case "date":
- echo substr($this->getProductAttributeValue($_item, $_attribute),0,10);
- break;
- default: ?>
- <div class="std">
- <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $this->getProductAttributeValue($_item, $_attribute), $_attribute->getAttributeCode()) ?>
- </div>
- <?php break;
- } ?>
- </td>
- <?php endforeach; ?>
- </tr>
- <?php endforeach; ?>
- </tbody>
- <tbody>
- <tr class="add-to-row">
- <?php $_i=0 ?>
- <?php foreach($this->getItems() as $_item): ?>
- <?php if($_i++%10==0): ?>
- <th> </th>
- <?php endif; ?>
- <td>
- <?php echo $this->getPriceHtml($_item, true, '-compare-list-bottom') ?>
- <?php if($_item->isSaleable()): ?>
- <p><button type="button" data-url="<?php echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToCartUrl($_item) ?>" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" ><span><span><?php echo __('Add to Cart') ?></span></span></button></p>
- <?php else: ?>
- <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
- <ul class="add-to-links" data-role="add-to-links">
- <li><a href="#" data-url="<?php echo $this->getAddToWishlistUrl($_item);?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a></li>
- </ul>
- <?php endif; ?>
- </td>
- <?php endforeach; ?>
- </tr>
- </tbody>
-</table>
-<div class="buttons-set">
- <button id="window-close" type="button" title="<?php echo __('Close Window') ?>" class="button"><span><span><?php echo __('Close Window') ?></span></span></button>
- <span class="please-wait" id="compare-list-please-wait" style="display:none;">
- <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo __('Please wait...') ?>" title="<?php echo __('Please wait...') ?>" class="v-middle" /> <?php echo __('Please wait...') ?>
- </span>
-</div>
+ <a href="#" class="action print" title="<?php echo __('Print This Page') ?>">
+ <span><?php echo __('Print This Page') ?></span>
+ </a>
+ <?php $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image'); ?>
+ <div class="comparison wrapper">
+ <div class="comparison container">
+ <table class="data-table data table comparison" id="product-comparison">
+ <thead>
+ <tr>
+ <?php $_i=0 ?>
+ <?php foreach($this->getItems() as $_item): ?>
+ <?php if($_i++==0): ?>
+ <th class="cell label remove"> </th>
+ <?php endif; ?>
+ <td class="cell remove product">
+ <a href="<?php echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getRemoveUrl($_item) ?>"
+ class="action delete" title="<?php echo __('Remove Product') ?>">
+ <span><?php echo __('Remove Product') ?></span>
+ </a>
+ </td>
+ <?php endforeach; ?>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <?php $_i = 0; ?>
+ <?php $_helper = $this->helper('Magento\Catalog\Helper\Output'); ?>
+ <?php foreach($this->getItems() as $_item): ?>
+ <?php if($_i++==0): ?>
+ <th class="cell label product"> </th>
+ <?php endif; ?>
+ <td class="cell product info">
+ <a class="product photo" href="<?php echo $this->getProductUrl($_item) ?>" title="<?php echo $this->stripTags($_item->getName(), null, true) ?>">
+ <?php /* product_comparison_list */ ?>
+ <?php echo $imageBlock->init($_item, 'product_comparison_list')->toHtml() ?>
+ </a>
+ <strong class="product name">
+ <a href="<?php echo $this->getProductUrl($_item) ?>" title="<?php echo $this->stripTags($_item->getName(), null, true) ?>">
+ <?php echo $_helper->productAttribute($_item, $_item->getName(), 'name') ?>
+ </a>
+ </strong>
+ <?php echo $this->getReviewsSummaryHtml($_item, 'short') ?>
+ <?php echo $this->getPriceHtml($_item, true, '-compare-list-top') ?>
+ <div class="product actions">
+ <div class="primary">
+ <?php if($_item->isSaleable()): ?>
+ <button type="button" class="action tocart"
+ data-url="<?php echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToCartUrl($_item) ?>">
+ <span><?php echo __('Add to Cart') ?></span>
+ </button>
+ <?php else: ?>
+ <?php if ($_item->getIsSalable()): ?>
+ <p class="stock available"><span><?php echo __('In stock') ?></span></p>
+ <?php else: ?>
+ <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
+ <?php endif; ?>
+ <?php endif; ?>
+ </div>
+ <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
+ <div class="secondary addto links">
+ <a href="<?php echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToWishlistUrl($_item) ?>" class="action towishlist" data-action="add-to-wishlist">
+ <span><?php echo __('Add to Wishlist') ?></span>
+ </a>
+ </div>
+ <?php endif; ?>
+ </div>
+ </td>
+ <?php endforeach; ?>
+ </tr>
+ </tbody>
+ <tbody>
+ <?php foreach ($this->getAttributes() as $_attribute): ?>
+ <tr>
+ <?php $_i = 0 ?>
+ <?php foreach($this->getItems() as $_item): ?>
+ <?php if($_i++==0): ?>
+ <th class="cell label">
+ <span class="attribute label">
+ <?php echo $_attribute->getStoreLabel() ? $_attribute->getStoreLabel() : __($_attribute->getFrontendLabel()) ?>
+ </span>
+ </th>
+ <?php endif; ?>
+ <td class="cell product attribute">
+ <div class="attibute value">
+ <?php switch ($_attribute->getAttributeCode()) {
+ case "price": ?>
+ <?php echo $this->getPriceHtml($_item, true, '-compare-list-' . $_attribute->getCode()) ?>
+ <?php break;
+ case "small_image": ?>
+ <img src="<?php echo $this->getSmallImageUrl($_item); ?>"
+ width="<?php echo $this->getSmallImageSize() ?>"
+ height="<?php echo $this->getSmallImageSize() ?>"
+ alt="<?php echo $this->stripTags($_item->getName(), null, true) ?>"/>
+ <?php break;
+ default: ?>
+ <?php echo $_helper->productAttribute($_item, $this->getProductAttributeValue($_item, $_attribute), $_attribute->getAttributeCode()) ?>
+ <?php break;
+ } ?>
+ </div>
+ </td>
+ <?php endforeach; ?>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ </div>
+ </div>
+<?php else: ?>
+ <p class="empty"><?php echo __('You have no items to compare.') ?></p>
<?php endif; ?>
<script type="text/javascript">
(function($, window) {
- <?php if ($_total): ?>
+ <?php if ($_total): ?>
head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/list.js')?>", function() {
$('#product-comparison').compareList({
- productRemoveSelector: 'a.btn-remove',
- ajaxSpinner: '#compare-list-please-wait',
- windowCloseSelector: '#window-close',
- windowPrintSelector: 'a.link-print',
+ windowPrintSelector: '.action.print',
+ productsInRow: 5,
selectors: {
- productSelector: 'h2.product-name > a',
- productImageSelector: 'a.product-image',
- productAddToCartSelector: 'button.btn-cart',
- productWishListSelector: 'a.link-wishlist'
+ productAddToCartSelector: 'button.action.tocart'
}
});
});
- <?php else: ?>
- window.close();
- <?php endif; ?>
+ <?php endif; ?>
})(jQuery, window);
</script>
diff --git a/app/code/Magento/Catalog/view/frontend/product/compare/sidebar.phtml b/app/code/Magento/Catalog/view/frontend/product/compare/sidebar.phtml
index 29bc0cfc3ce..bc372936753 100644
--- a/app/code/Magento/Catalog/view/frontend/product/compare/sidebar.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/compare/sidebar.phtml
@@ -18,8 +18,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 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,42 +27,54 @@
$_helper = $this->helper('Magento\Catalog\Helper\Product\Compare');
$_items = $_helper->getItemCount() > 0 ? $_helper->getItemCollection() : null;
?>
-<div class="block block-list block-compare">
- <div class="block-title">
- <strong><span><?php echo __('Compare Products') ?>
+<div class="block compare">
+ <div class="title">
+ <strong>
+ <span class="text"><?php echo __('Compare Products') ?></span>
<?php if($_helper->getItemCount() > 0): ?>
- <small><?php echo __('(%1)', $_helper->getItemCount()) ?></small>
- <?php endif; ?>
- </span></strong>
+ <span class="qty"><?php echo __('%1', $_helper->getItemCount()) ?></span>
+ <?php endif; ?>
+ </strong>
</div>
- <div class="block-content">
+ <div class="content">
<?php if($_helper->getItemCount() > 0): ?>
- <ol id="compare-items">
+ <ol id="compare-items" class="items compare">
<?php foreach($_items as $_index => $_item): ?>
<li class="item">
- <input type="hidden" class="compare-item-id" value="<?php echo $_item->getId() ?>" />
- <a href="<?php echo $_helper->getRemoveUrl($_item) ?>" title="<?php echo __('Remove This Item') ?>" class="btn-remove"><?php echo __('Remove This Item') ?></a>
- <p class="product-name"><a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName(), 'name') ?></a></p>
+ <input type="hidden" class="compare-item-id" value="<?php echo $_item->getId() ?>"/>
+ <strong class="product name">
+ <a href="<?php echo $this->getProductUrl($_item) ?>">
+ <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName(), 'name') ?>
+ </a>
+ </strong>
+ <a href="<?php echo $_helper->getRemoveUrl($_item) ?>" title="<?php echo __('Remove This Item') ?>"
+ class="action delete"><span><?php echo __('Remove This Item') ?></span></a>
</li>
- <?php endforeach; ?>
- </ol>
- <div class="actions">
- <a id='compare-clear-all' href="<?php echo $_helper->getClearListUrl() ?>" ><?php echo __('Clear All') ?></a>
- <button type="button" title="<?php echo __('Compare') ?>" class="button" data-mage-init="{popupWindow: {windowURL:'<?php echo $_helper->getListUrl() ?>',windowName:'compare',centerScreen:1,resizable:1,scrollbars:1,width:820,height:600}}"><span><span><?php echo __('Compare') ?></span></span></button>
+ <?php endforeach; ?>
+ </ol>
+ <div class="actions">
+ <div class="primary">
+ <a href="<?php echo $_helper->getListUrl() ?>" class="action compare"><span><?php echo __('Compare') ?></span></a>
</div>
- <script type="text/javascript">
- (function($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/compare.js') ?>", function() {
+ <div class="secondary">
+ <a id="compare-clear-all" href="<?php echo $_helper->getClearListUrl() ?>" class="action clear">
+ <span><?php echo __('Clear All') ?></span>
+ </a>
+ </div>
+ </div>
+ <script type="text/javascript">
+ (function($) {
+ head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/compare.js') ?>", function () {
$('#compare-items').compareItems({
- removeConfirmMessage: '<?php echo __('Are you sure you want to remove this item from the compared products?') ?>',
- removeSelector: '#compare-items a.btn-remove',
- clearAllConfirmMessage: '<?php echo __('Are you sure you want to remove all products from your comparison?') ?>',
+ removeConfirmMessage: '<?php echo __('Are you sure you would like to remove this item from the compare products?') ?>',
+ removeSelector: '#compare-items a.action.delete',
+ clearAllConfirmMessage: '<?php echo __('Are you sure you would like to remove all products from your comparison?') ?>',
clearAllSelector: '#compare-clear-all'
});
});
})(jQuery);
</script>
- <?php else: ?>
+ <?php else: ?>
<p class="empty"><?php echo __('You have no items to compare.') ?></p>
<?php endif; ?>
</div>
diff --git a/app/code/Magento/Catalog/view/frontend/product/gallery.phtml b/app/code/Magento/Catalog/view/frontend/product/gallery.phtml
index 6ca9aae6899..3ed9f34b370 100644
--- a/app/code/Magento/Catalog/view/frontend/product/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/gallery.phtml
@@ -27,9 +27,9 @@
<?php $_width = $this->getImageWidth(); ?>
<div class="product-image-popup" style="width:<?php echo $_width; ?>px;">
<div class="buttons-set"><a href="#" class="button" role="close-window"><span><?php echo __('Close Window') ?></span></a></div>
- <?php if($this->getPreviusImageUrl() || $this->getNextImageUrl()): ?>
+ <?php if($this->getPreviousImageUrl() || $this->getNextImageUrl()): ?>
<div class="nav">
- <?php if($_prevUrl = $this->getPreviusImageUrl()): ?>
+ <?php if($_prevUrl = $this->getPreviousImageUrl()): ?>
<a href="<?php echo $_prevUrl ?>" class="prev">« <?php echo __('Prev') ?></a>
<?php endif; ?>
<?php if($_nextUrl = $this->getNextImageUrl()): ?>
@@ -42,9 +42,9 @@
<?php endif; ?>
<img src="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($this->getProduct(), 'image', $this->getImageFile()); ?>"<?php if($_width): ?> width="<?php echo $_width ?>"<?php endif; ?> alt="<?php echo $this->escapeHtml($this->getCurrentImage()->getLabel()) ?>" title="<?php echo $this->escapeHtml($this->getCurrentImage()->getLabel()) ?>" id="product-gallery-image" class="image" />
<div class="buttons-set"><a href="#" class="button" role="close-window"><span><?php echo __('Close Window') ?></span></a></div>
- <?php if($this->getPreviusImageUrl() || $this->getNextImageUrl()): ?>
+ <?php if($this->getPreviousImageUrl() || $this->getNextImageUrl()): ?>
<div class="nav">
- <?php if($_prevUrl = $this->getPreviusImageUrl()): ?>
+ <?php if($_prevUrl = $this->getPreviousImageUrl()): ?>
<a href="<?php echo $_prevUrl ?>" class="prev">« <?php echo __('Prev') ?></a>
<?php endif; ?>
<?php if($_nextUrl = $this->getNextImageUrl()): ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/image.phtml b/app/code/Magento/Catalog/view/frontend/product/image.phtml
index e442b1f2a94..1d4af74a1c6 100644
--- a/app/code/Magento/Catalog/view/frontend/product/image.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/image.phtml
@@ -18,15 +18,15 @@
* 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\Catalog\Block\Product\Image */ ?>
-<img style=" width:<?php echo $this->getProductImageView()->getWidth()?>px;
+<img class="photo image"
+ style="width:<?php echo $this->getProductImageView()->getWidth()?>px;
height:<?php echo $this->getProductImageView()->getHeight()?>px;"
+ <?php echo $this->getAddAttribute(); ?>
src="<?php echo $this->getProductImageView()->getUrl() ?>"
- alt="<?php echo $this->stripTags($this->getProductImageView()->getLabel(), null, true) ?>"/>
+ alt="<?php echo $this->stripTags($this->getProductImageView()->getLabel(), null, true) ?>" />
diff --git a/app/code/Magento/Catalog/view/frontend/product/image_with_borders.phtml b/app/code/Magento/Catalog/view/frontend/product/image_with_borders.phtml
index 16c66e508c0..b481c0f3f5c 100644
--- a/app/code/Magento/Catalog/view/frontend/product/image_with_borders.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/image_with_borders.phtml
@@ -19,15 +19,25 @@
* 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\Catalog\Block\Product\Image */ ?>
-<span style="width:<?php echo $this->getProductImageView()->getWidth()?>px;
- height:<?php echo $this->getProductImageView()->getHeight()?>px; display: block; position: relative;
- overflow: hidden"><img style="display: block; position: absolute; top: 0; bottom: 0; left: 0; right: 0;
- margin: auto;" src="<?php echo $this->getProductImageView()->getUrl() ?>"
- alt="<?php echo $this->stripTags($this->getProductImageView()->getLabel(), null, true) ?>"/></span>
+<span class="img photo container"
+ style="width:<?php echo $this->getProductImageView()->getWidth()?>px;
+ height:<?php echo $this->getProductImageView()->getHeight()?>px;
+ display: block; position: relative;
+ overflow: hidden"><img class="photo image"
+ style="display: block;
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ margin: auto;"
+ <?php echo $this->getAddAttribute(); ?>
+ src="<?php echo $this->getProductImageView()->getUrl() ?>"
+ alt="<?php echo $this->stripTags($this->getProductImageView()->getLabel(), null, true) ?>"/>
+</span>
diff --git a/app/code/Magento/Catalog/view/frontend/product/list.phtml b/app/code/Magento/Catalog/view/frontend/product/list.phtml
index 5ed1776acd2..96baf368d9a 100644
--- a/app/code/Magento/Catalog/view/frontend/product/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/list.phtml
@@ -18,8 +18,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 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,136 +26,100 @@
/**
* Product list template
*
- * @see \Magento\Catalog\Block\Product\ProductList
+ * @var $this \Magento\Catalog\Block\Product\ListProduct
*/
?>
<?php
$_productCollection = $this->getLoadedProductCollection();
$_helper = $this->helper('Magento\Catalog\Helper\Output');
+$imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
?>
<?php if (!$_productCollection->count()): ?>
-<p class="note-msg"><?php echo __('There are no products matching the selection.') ?></p>
+ <div class="message notice"><span><?php echo __('There are no products matching the selection.') ?></span></div>
<?php else: ?>
-<div class="category-products">
<?php echo $this->getToolbarHtml() ?>
<?php echo $this->getAdditionalHtml() ?>
- <?php // List mode ?>
- <?php if ($this->getMode() != 'grid'): ?>
- <?php $_iterator = 0; ?>
- <ol class="products-list" id="products-list">
- <?php foreach ($_productCollection as $_product): ?>
- <li class="item<?php if (++$_iterator == sizeof($_productCollection)): ?> last<?php endif; ?>">
- <?php // Product Image
- $_label = $this->stripTags($this->getImageLabel($_product, 'small_image'), null, true);
- $_size = $this->getSmallImageSize();
- ?>
- <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_label ?>" class="product-image"><img
- src="<?php echo $this->getSmallImageUrl($_product); ?>" width="<?php echo $_size?>"
- height="<?php echo $_size?>" alt="<?php echo $_label ?>"/></a>
- <?php // Product description ?>
- <div class="product-shop">
- <div class="f-fix">
- <?php $_productNameStripped = $this->stripTags($_product->getName(), null, true); ?>
- <h2 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>"
- title="<?php echo $_productNameStripped; ?>"><?php echo $_helper->productAttribute($_product, $_product->getName(), 'name'); ?></a>
- </h2>
- <?php if ($_product->getRatingSummary()): ?>
- <?php echo $this->getReviewsSummaryHtml($_product) ?>
- <?php endif; ?>
- <?php echo $this->getPriceHtml($_product, true) ?>
-
- <?php if ($_product->isSaleable()): ?>
- <p>
- <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart"
- data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_product) ?>'}}">
- <span><span><?php echo __('Add to Cart') ?></span></span></button>
- </p>
- <?php else: ?>
- <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <div class="desc std">
- <?php echo $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
- <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_productNameStripped ?>"
- class="link-learn"><?php echo __('Learn More') ?></a>
- </div>
- <ul class="add-to-links" data-role="add-to-links">
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
- <li><a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getAddUrl($_product) ?>"
- class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a></li>
+ <?php if ($this->getMode() == 'grid') {
+ $viewMode ='grid';
+ $image = 'category_page_grid';
+ $showDescription = false;
+ $rating = 'short';
+ } else {
+ $viewMode ='list';
+ $image = 'category_page_list';
+ $showDescription = true;
+ $rating = 'full';
+ }
+ /**
+ * Position for actions regarding image size changing in vde if needed
+ */
+ $pos = $this->getPositioned();
+ $position = '';
+ if ($pos != null) {
+ $position = ' style="left:' . $this->getVar("{$image}:width") . 'px;'
+ .'top:' . $this->getVar("{$image}:height") . 'px;"';
+ }
+ ?>
+ <div class="products wrapper <?php echo $viewMode; ?>">
+ <?php $iterator = 1; ?>
+ <ol class="products list items">
+ <?php foreach ($_productCollection as $_product): ?>
+ <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+ <div class="product">
+ <?php // Product Image ?>
+ <a href="<?php echo $_product->getProductUrl() ?>" class="product photo">
+ <?php echo $imageBlock->init($_product, $image)->toHtml() ?>
+ </a>
+ <div class="product details">
+ <?php $_productNameStripped = $this->stripTags($_product->getName(), null, true); ?>
+ <strong class="product name">
+ <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_productNameStripped; ?>">
+ <?php echo $_helper->productAttribute($_product, $_product->getName(), 'name'); ?>
+ </a>
+ </strong>
+ <?php echo $this->getPriceHtml($_product, true) ?>
+ <?php if ($_product->getRatingSummary()): ?>
+ <?php echo $this->getReviewsSummaryHtml($_product,$rating) ?>
<?php endif; ?>
- <?php if ($_compareUrl = $this->getAddToCompareUrl($_product)): ?>
- <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>"
- class="link-compare"><?php echo __('Add to Compare') ?></a>
- </li>
+ <?php if ($showDescription):?>
+ <div class="product description">
+ <?php echo $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
+ <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_productNameStripped ?>"
+ class="action more"><?php echo __('Learn More') ?></a>
+ </div>
<?php endif; ?>
- </ul>
+ <div class="product actions"<?php echo strpos($pos, $viewMode . '-actions') ? $position : ''; ?>>
+ <div class="primary"<?php echo strpos($pos, $viewMode . '-primary') ? $position: ''; ?>>
+ <?php if ($_product->isSaleable()): ?>
+ <button type="button" title="<?php echo __('Add to Cart') ?>" class="action tocart"
+ data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_product) ?>'}}">
+ <span><?php echo __('Add to Cart') ?></span>
+ </button>
+ <?php else: ?>
+ <?php if ($_product->getIsSalable()): ?>
+ <p class="stock available"><span><?php echo __('In stock') ?></span></p>
+ <?php else: ?>
+ <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
+ <?php endif; ?>
+ <?php endif; ?>
+ </div>
+ <div class="secondary"<?php echo strpos($pos, $viewMode . '-secondary') ? $position : ''; ?>>
+ <a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getAddUrl($_product) ?>"
+ class="action towishlist" data-action="add-to-wishlist">
+ <span><?php echo __('Add to Wishlist') ?></span>
+ </a>
+ <a href="<?php echo $this->getAddToCompareUrl($_product) ?>" class="action tocompare">
+ <span><?php echo __('Add to Compare') ?></span>
+ </a>
+ </div>
+ </div>
+ </div>
</div>
- </div>
- </li>
- <?php endforeach; ?>
- </ol>
- <script type="text/javascript">
- jQuery('#products-list').decorate('list');
- </script>
- <?php else: ?>
-
- <?php // Grid Mode ?>
-
- <?php $_collectionSize = $_productCollection->count() ?>
- <?php $_columnCount = $this->getColumnCount(); ?>
- <?php $i = 0;
- foreach ($_productCollection as $_product): ?>
- <?php if ($i++ % $_columnCount == 0): ?>
- <ul class="products-grid">
- <?php endif ?>
- <li class="item<?php if (($i - 1) % $_columnCount == 0): ?> first<?php elseif ($i % $_columnCount == 0): ?> last<?php endif; ?>">
- <?php // Product Image
- $_label = $this->stripTags($this->getImageLabel($_product, 'small_image'), null, true);
- $_size = $this->getSmallImageSize();
- ?>
- <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_label ?>" class="product-image"><img
- src="<?php echo $this->getSmallImageUrl($_product); ?>" width="<?php echo $_size?>"
- height="<?php echo $_size?>" alt="<?php echo $_label ?>"/></a>
-
- <h2 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>"
- title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><?php echo $_helper->productAttribute($_product, $_product->getName(), 'name') ?></a>
- </h2>
- <?php if ($_product->getRatingSummary()): ?>
- <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
- <?php endif; ?>
- <?php echo $this->getPriceHtml($_product, true) ?>
- <div class="actions">
- <?php if ($_product->isSaleable()): ?>
- <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart"
- data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_product) ?>'}}">
- <span><span><?php echo __('Add to Cart') ?></span></span></button>
- <?php else: ?>
- <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <ul class="add-to-links" data-role="add-to-links">
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
- <li><a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getAddUrl($_product) ?>"
- class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a></li>
- <?php endif; ?>
- <?php if ($_compareUrl = $this->getAddToCompareUrl($_product)): ?>
- <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>"
- class="link-compare"><?php echo __('Add to Compare') ?></a>
- </li>
- <?php endif; ?>
- </ul>
- </div>
- </li>
- <?php if ($i % $_columnCount == 0 || $i == $_collectionSize): ?>
- </ul>
- <?php endif ?>
- <?php endforeach ?>
- <script type="text/javascript">
- jQuery('ul.products-grid > li').decorate('generic', ['odd', 'even', 'first', 'last']);
- </script>
- <?php endif; ?>
-
- <div class="toolbar-bottom">
+ <?php echo ($iterator==count($_productCollection)+1) ? '</li>' : '' ?>
+ <?php endforeach; ?>
+ </ol>
+ </div>
+ <div class="toolbar bottom">
<?php echo $this->getToolbarHtml() ?>
</div>
-</div>
<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/list/items.phtml b/app/code/Magento/Catalog/view/frontend/product/list/items.phtml
similarity index 93%
rename from app/design/frontend/magento_plushe/Magento_Catalog/product/list/items.phtml
rename to app/code/Magento/Catalog/view/frontend/product/list/items.phtml
index 5ff16b20042..07459d1598e 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/list/items.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/list/items.phtml
@@ -18,7 +18,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)
*/
@@ -158,6 +157,27 @@ switch($type=$this->getType()) {
}
break;
+ case 'new':
+ if ($exist = $this->getProductCollection()) {
+ $type = 'new';
+ $mode = 'grid';
+ $type = $type . ' ' . $mode;
+
+ $class = 'widget' . ' ' . $type;
+
+ $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+ $image = 'new_products_content_widget_grid';
+ $title = __('New Products');
+ $items = $exist;
+
+ $showWishlist = true;
+ $showCompare = true;
+ $showCart = true;
+ $rating = 'short';
+ $description = ($mode == 'list') ? true : false;
+ }
+ break;
+
case 'other':
break;
}
@@ -166,35 +186,26 @@ switch($type=$this->getType()) {
<?php if ($exist):?>
<div class="block <?php echo $class; ?>">
-
<div class="title">
<strong><?php echo $title; ?></strong>
</div>
-
<div class="content">
-
<?php if($type == 'related'): ?>
<div class="actions">
<?php echo __('Check items to add to the cart or') ?>
<button type="button" class="action select" role="select-all"><span><?php echo __('select all') ?></span></button>
</div>
<?php endif; ?>
-
-
<ol class="products list items <?php echo $type; ?>">
<?php $iterator = 1; ?>
<?php foreach($items as $_item): ?>
<?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
-
<div class="product">
-
<?php echo '<!-- ' . $image . '-->' ?>
<a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
<?php echo $imageBlock->init($_item, $image)->toHtml() ?>
</a>
-
<div class="product details">
-
<strong class="product name"><a title="<?php echo $this->escapeHtml($_item->getName()) ?>" href="<?php echo $this->getProductUrl($_item) ?>">
<?php echo $this->escapeHtml($_item->getName()) ?></a>
</strong>
@@ -216,11 +227,10 @@ switch($type=$this->getType()) {
<?php if($showWishlist || $showCompare || $showCart): ?>
<div class="product actions">
-
<?php if($showCart): ?>
<div class="primary">
<?php if($_item->isSaleable()): ?>
- <button class="action tocart" data-mage-redirect="{event: 'click', url: '<?php echo $this->getAddToCartUrl($_item) ?>'}" type="button" title="<?php echo __('Add to Cart') ?>">
+ <button class="action tocart" data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_item) ?>'}}" type="button" title="<?php echo __('Add to Cart') ?>">
<span><?php echo __('Add to Cart') ?></span>
</button>
<?php else: ?>
@@ -249,7 +259,6 @@ switch($type=$this->getType()) {
<?php endif; ?>
</div>
<?php endif; ?>
-
</div>
</div>
<?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
@@ -265,8 +274,5 @@ switch($type=$this->getType()) {
});
</script>
<?php endif; ?>
- <script type="text/javascript">
- head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/mage-attributes-processing.js') ?>");
- </script>
</div>
<?php endif;?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/list/related.phtml b/app/code/Magento/Catalog/view/frontend/product/list/related.phtml
deleted file mode 100644
index 217820ac1bc..00000000000
--- a/app/code/Magento/Catalog/view/frontend/product/list/related.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
- * @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->getItems()->getSize()): ?>
-<div class="block block-related">
- <div class="block-title">
- <strong><span><?php echo __('Related Products') ?></span></strong>
- </div>
- <div class="block-content">
- <p class="block-subtitle"><?php echo __('Check items to add to the cart or') ?> <a href="#" role="select-all"><?php echo __('select all') ?></a></p>
- <ol class="mini-products-list" id="block-related">
- <?php foreach($this->getItems() as $_item): ?>
- <li class="item">
- <?php if(!$_item->isComposite() && $_item->isSaleable()): ?>
- <?php if (!$_item->getRequiredOptions()): ?>
- <input type="checkbox" class="checkbox related-checkbox" id="related-checkbox<?php echo $_item->getId() ?>" name="related_products[]" value="<?php echo $_item->getId() ?>" />
- <?php endif; ?>
- <?php endif; ?>
- <div class="product">
- <a href="<?php echo $_item->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_item->getName()) ?>" class="product-image"><img src="<?php echo $this->getThumbnailSidebarUrl($_item) ?>" width="<?php echo $this->getThumbnailSidebarSize()?>" height="<?php echo $this->getThumbnailSidebarSize()?>" alt="<?php echo $this->escapeHtml($_item->getName()) ?>" /></a>
- <div class="product-details">
- <p class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></p>
- <?php echo $this->getPriceHtml($_item, true, '-related') ?>
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
- <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a>
- <?php endif; ?>
- </div>
- </div>
- </li>
- <?php endforeach ?>
- </ol>
- <script type="text/javascript">jQuery('#block-related').decorate('list', false);</script>
- </div>
- <script type="text/javascript">
- head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/related-products.js');?>", function() {
- jQuery(".block-related a[role='select-all']").relatedProducts();
- });
- </script>
-</div>
-<?php endif ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/list/toolbar.phtml b/app/code/Magento/Catalog/view/frontend/product/list/toolbar.phtml
index 0837c62388d..c3c6daedd59 100644
--- a/app/code/Magento/Catalog/view/frontend/product/list/toolbar.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/list/toolbar.phtml
@@ -18,8 +18,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 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,75 +31,74 @@
?>
<?php if ($this->getCollection()->getSize()): ?>
<div class="toolbar">
- <div class="pager">
- <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>
-
- <div class="limiter">
- <label><?php echo __('Show') ?></label>
- <select data-mage-init="{redirectUrl: {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> <?php echo __('per page') ?>
- </div>
-
- <?php echo $this->getPagerHtml() ?>
-
- </div>
-
<?php if ($this->isExpanded()): ?>
- <div class="sorter">
+ <div class="settings">
<?php if ($this->isEnabledViewSwitcher()): ?>
- <p class="view-mode">
+ <div class="modes">
<?php $_modes = $this->getModes(); ?>
<?php if ($_modes && count($_modes) > 1): ?>
- <label><?php echo __('View as') ?>:</label>
+ <strong class="label"><?php echo __('View as') ?></strong>
<?php foreach ($this->getModes() as $_code => $_label): ?>
<?php if ($this->isModeActive($_code)): ?>
<strong title="<?php echo $_label ?>"
- class="<?php echo strtolower($_code); ?>"><?php echo $_label ?></strong>
- <?php else: ?>
- <a href="<?php echo $this->getModeUrl($_code) ?>" title="<?php echo $_label ?>"
- class="<?php echo strtolower($_code); ?>"><?php echo $_label ?></a>
+ class="mode active <?php echo strtolower($_code); ?>"><span><?php echo $_label ?></span></strong>
+ <?php else: ?>
+ <a class="mode <?php echo strtolower($_code); ?>" title="<?php echo $_label ?>"
+ href="<?php echo $this->getModeUrl($_code) ?>">
+ <span><?php echo $_label ?></span>
+ </a>
<?php endif; ?>
<?php endforeach; ?>
<?php endif; ?>
- </p>
+ </div>
<?php endif; ?>
-
- <div class="sort-by">
- <label><?php echo __('Sort By') ?></label>
- <select data-mage-init="{redirectUrl: {event:'change'}}">
+ <div class="sorter">
+ <label class="label" for="sorter"><?php echo __('Sort By') ?></label>
+ <select id="sorter" data-mage-init="{redirectUrl: {event:'change'}}">
<?php foreach ($this->getAvailableOrders() as $_key => $_order): ?>
- <option
- value="<?php echo $this->getOrderUrl($_key, 'asc') ?>"<?php if ($this->isOrderCurrent($_key)): ?>
- selected="selected"<?php endif; ?>>
- <?php echo __($_order) ?>
- </option>
+ <option
+ value="<?php echo $this->getOrderUrl($_key, 'asc') ?>"<?php if ($this->isOrderCurrent($_key)): ?>
+ selected="selected"<?php endif; ?>>
+ <?php echo __($_order) ?>
+ </option>
<?php endforeach; ?>
</select>
<?php if ($this->getCurrentDirection() == 'desc'): ?>
- <a href="<?php echo $this->getOrderUrl(null, 'asc') ?>"
- title="<?php echo __('Set Ascending Direction') ?>"><img
- src="<?php echo $this->getViewFileUrl('Magento_Catalog::images/i_desc_arrow.gif') ?>"
- alt="<?php echo __('Set Ascending Direction') ?>" class="v-middle"/></a>
+ <a title="<?php echo __('Set Ascending Direction') ?>" href="<?php echo $this->getOrderUrl(null, 'asc') ?>" class="action sort desc">
+ <span><?php echo __('Set Ascending Direction') ?></span>
+ </a>
<?php else: ?>
- <a href="<?php echo $this->getOrderUrl(null, 'desc') ?>"
- title="<?php echo __('Set Descending Direction') ?>"><img
- src="<?php echo $this->getViewFileUrl('Magento_Catalog::images/i_asc_arrow.gif') ?>"
- alt="<?php echo __('Set Descending Direction') ?>" class="v-middle"/></a>
+ <a title="<?php echo __('Set Descending Direction') ?>" href="<?php echo $this->getOrderUrl(null, 'desc') ?>" class="action sort asc">
+ <span><?php echo __('Set Descending Direction') ?></span>
+ </a>
<?php endif; ?>
</div>
</div>
<?php endif; ?>
+
+ <div class="pager">
+ <p class="amount">
+ <?php if ($this->getLastPageNum() > 1): ?>
+ <?php echo __('Items %1-%2 of %3', $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>
+ <div class="limiter">
+ <strong class="label"><?php echo __('Show') ?></strong>
+ <select id="limiter" data-mage-init="{redirectUrl: {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 echo $this->getPagerHtml() ?>
+ </div>
</div>
<?php endif ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/list/upsell.phtml b/app/code/Magento/Catalog/view/frontend/product/list/upsell.phtml
deleted file mode 100644
index 4c31244eb4a..00000000000
--- a/app/code/Magento/Catalog/view/frontend/product/list/upsell.phtml
+++ /dev/null
@@ -1,52 +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 if(count($this->getItemCollection()->getItems())): ?>
-<div class="box-collateral box-up-sell">
- <h2><?php echo __('You may also be interested in the following product(s):') ?></h2>
- <table class="products-grid" id="upsell-product-table">
- <?php // $this->setColumnCount(5); // uncomment this line if you want to have another number of columns. also can be changed in layout ?>
- <?php $this->resetItemsIterator() ?>
- <?php for($_i=0;$_i<$this->getRowCount();$_i++): ?>
- <tr>
- <?php for($_j=0;$_j<$this->getColumnCount();$_j++): ?>
- <?php if($_link=$this->getIterableItem()): ?>
- <td>
- <a href="<?php echo $_link->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_link->getName()) ?>" class="product-image"><img src="<?php echo $this->getSmallImageUrl($_link) ?>" width="<?php echo $this->getSmallImageSize()?>" height="<?php echo $this->getSmallImageSize()?>" alt="<?php echo $this->escapeHtml($_link->getName()) ?>" /></a>
- <h3 class="product-name"><a href="<?php echo $_link->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_link->getName()) ?>"><?php echo $this->escapeHtml($_link->getName()) ?></a></h3>
- <?php echo $this->getPriceHtml($_link, true, '-upsell') ?>
- <?php echo $this->getReviewsSummaryHtml($_link) ?>
- </td>
- <?php else: ?>
- <td class="empty"> </td>
- <?php endif; ?>
- <?php endfor; ?>
- </tr>
- <?php endfor; ?>
- </table>
- <script type="text/javascript">(function($) {$('#upsell-product-table').decorate('table')})(jQuery)</script>
-</div>
-<?php endif ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/listing.phtml b/app/code/Magento/Catalog/view/frontend/product/listing.phtml
similarity index 97%
rename from app/design/frontend/magento_plushe/Magento_Catalog/product/listing.phtml
rename to app/code/Magento/Catalog/view/frontend/product/listing.phtml
index 4b85d9fb219..8138a5a1c86 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/listing.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/listing.phtml
@@ -112,9 +112,6 @@ $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Im
<?php echo ($iterator==count($_productCollection)+1) ? '</li>' : '' ?>
<?php endforeach; ?>
</ol>
- <script type="text/javascript">
- head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/mage-attributes-processing.js') ?>");
- </script>
</div>
<div class="toolbar-bottom">
<?php echo $this->getToolbarHtml() ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/new.phtml b/app/code/Magento/Catalog/view/frontend/product/new.phtml
deleted file mode 100644
index f5446b2f269..00000000000
--- a/app/code/Magento/Catalog/view/frontend/product/new.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
- * @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 (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
-<h2 class="subtitle"><?php echo __('New Products') ?></h2>
-<?php $_columnCount = $this->getColumnCount(); ?>
- <?php $i=0; foreach ($_products->getItems() as $_product): ?>
- <?php if ($i++%$_columnCount==0): ?>
- <ul class="products-grid">
- <?php endif ?>
- <li class="item<?php if(($i-1)%$_columnCount==0): ?> first<?php elseif($i%$_columnCount==0): ?> last<?php endif; ?>">
- <?php
- $_label = $this->escapeHtml($_product->getName());
- $_size = $this->getSmallImageSize();
- ?>
- <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_label ?>" class="product-image"><img src="<?php echo $this->getSmallImageUrl($_product) ?>" width="<?php echo $_size?>" height="<?php echo $_size?>" alt="<?php echo $_label ?>" /></a>
- <h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>"><?php echo $this->escapeHtml($_product->getName()) ?></a></h3>
- <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
- <?php echo $this->getPriceHtml($_product, true, '-new') ?>
- <div class="actions">
- <?php if($_product->isSaleable()): ?>
- <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo __('Add to Cart') ?></span></span></button>
- <?php else: ?>
- <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <ul class="add-to-links" data-role="add-to-links">
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
- <li><a href="<?php echo $this->getAddToWishlistUrl($_product) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a></li>
- <?php endif; ?>
- <?php if ($_compareUrl = $this->getAddToCompareUrl($_product)): ?>
- <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
- <?php endif; ?>
- </ul>
- </div>
- </li>
- <?php if ($i%$_columnCount==0 || $i==count($_products)): ?>
- </ul>
- <?php endif ?>
- <?php endforeach; ?>
-<?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/price_msrp.phtml b/app/code/Magento/Catalog/view/frontend/product/price_msrp.phtml
index c68ec30f67b..c27bb93222a 100644
--- a/app/code/Magento/Catalog/view/frontend/product/price_msrp.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/price_msrp.phtml
@@ -18,8 +18,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 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,11 +35,11 @@
$_product = $this->getProduct();
$_msrpPrice = "";
?>
- <div class="price-box map-info">
+ <div class="price-box map info">
<?php $_price = $this->helper('Magento\Tax\Helper\Data')->getPrice($_product, $_product->getMsrp()) ?>
<?php if ($_product->getMsrp()): ?>
<?php $_msrpPrice = $this->helper('Magento\Core\Helper\Data')->currency($_product->getMsrp(),true,true) ?>
- <span class="old-price" id="product-price-<?php echo $_product->getId() ?><?php echo $this->getIdSuffix() ?>"><?php echo $_msrpPrice ?></span>
+ <span class="old price" id="product-price-<?php echo $_product->getId() ?><?php echo $this->getIdSuffix() ?>"><?php echo $_msrpPrice ?></span>
<?php endif; ?>
<?php $popupId = 'msrp-click-' . $_product->getId() . $this->getRandomString(20); ?>
<a href="#" id="<?php echo($popupId);?>"><?php echo __('Click for price') ?></a>
@@ -72,5 +70,3 @@
})(jQuery);
//]]>
</script>
-
-
diff --git a/app/code/Magento/Catalog/view/frontend/product/price_msrp_item.phtml b/app/code/Magento/Catalog/view/frontend/product/price_msrp_item.phtml
index 003c3ecc19d..b75c68aea88 100644
--- a/app/code/Magento/Catalog/view/frontend/product/price_msrp_item.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/price_msrp_item.phtml
@@ -18,8 +18,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 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)
*/
@@ -44,7 +42,7 @@ $_id = $_product->getId();
$_msrpPrice = '';
$priceElementIdPrefix = $this->getPriceElementIdPrefix() ? $this->getPriceElementIdPrefix() : 'product-price-';
?>
-<div class="price-box map-info">
+<div class="price-box map info">
<?php $_price = $this->helper('Magento\Tax\Helper\Data')->getPrice($_product, $_product->getMsrp()) ?>
<?php if ($_product->getMsrp()): ?>
<?php $_msrpPrice = $_coreHelper->currency($_product->getMsrp(), true, true) ?>
@@ -58,13 +56,13 @@ $priceElementIdPrefix = $this->getPriceElementIdPrefix() ? $this->getPriceElemen
<a href="#" id="<?php echo($popupId);?>"><?php echo __('Click for price'); ?></a>
<?php else: ?>
- <span class="msrp-price-hide-message">
+ <span class="msrp price message">
<?php echo $_catalogHelper->getMsrpPriceMessage($_product) ?>
</span>
<?php endif; ?>
<?php $helpLinkId = 'msrp-help-' . $_id . $this->getRandomString(20); ?>
- <a href="#" id="<?php echo($helpLinkId);?>"><?php echo __("What's this?"); ?></a>
+ <a href="#" id="<?php echo($helpLinkId);?>" class="action show map"><span><?php echo __("What's this?"); ?></span></a>
</div>
<script type="text/javascript">
diff --git a/app/code/Magento/Catalog/view/frontend/product/view.phtml b/app/code/Magento/Catalog/view/frontend/product/view.phtml
deleted file mode 100644
index ffee792efe9..00000000000
--- a/app/code/Magento/Catalog/view/frontend/product/view.phtml
+++ /dev/null
@@ -1,132 +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)
- */
-
-/**
- * Product view template
- *
- * @see \Magento\Catalog\Block\Product\View
- * @see \Magento\Review\Block\Product\View
- */
-?>
-<?php $_helper = $this->helper('Magento\Catalog\Helper\Output'); ?>
-<?php $_product = $this->getProduct(); ?>
-<script type="text/javascript">
- (function ($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/price-option.js') ?>", function () {
- $('#product_addtocart_form').priceOption({"priceConfig":<?php echo $this->getJsonConfig() ?>});
- });
- })(jQuery);
-</script>
-<div id="messages_product_view"><?php echo $this->getMessagesBlock()->getGroupedHtml() ?></div>
-<div class="product-view" itemscope itemtype="http://schema.org/Product">
- <div class="product-essential">
- <form action="<?php echo $this->getSubmitUrl($_product) ?>" method="post"
- id="product_addtocart_form"<?php if ($_product->getOptions()): ?>
- enctype="multipart/form-data"<?php endif; ?>>
- <div class="no-display">
- <input type="hidden" name="product" value="<?php echo $_product->getId() ?>"/>
- <input type="hidden" name="related_product" id="related-products-field" value=""/>
- </div>
-
- <div class="product-shop">
- <div class="product-name">
- <h1 itemprop="name"><?php echo $_helper->productAttribute($_product, $_product->getName(), 'name') ?></h1>
- </div>
-
- <?php if ($this->canEmailToFriend()): ?>
- <p class="email-friend"><a
- href="<?php echo $this->helper('Magento\Catalog\Helper\Product')->getEmailToFriendUrl($_product) ?>"><?php echo __('Email to a Friend') ?></a>
- </p>
- <?php endif; ?>
-
- <?php echo $this->getReviewsSummaryHtml($_product, false, true)?>
- <?php echo $this->getChildHtml('alert_urls') ?>
- <?php echo $this->getChildHtml('product_type_data') ?>
- <?php echo $this->getTierPriceHtml() ?>
- <?php echo $this->getChildHtml('extrahint') ?>
-
- <?php if (!$this->hasOptions()): ?>
- <div class="add-to-box">
- <?php if ($_product->isSaleable()): ?>
- <?php echo $this->getChildHtml('addtocart') ?>
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() || $_compareUrl = $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddUrl($_product)): ?>
- <span class="or"><?php echo __('OR') ?></span>
- <?php endif; ?>
- <?php endif; ?>
- <?php echo $this->getChildHtml('addto') ?>
- </div>
- <?php echo $this->getChildHtml('extra_buttons') ?>
- <?php elseif (!$_product->isSaleable()): ?>
- <div class="add-to-box">
- <?php echo $this->getChildHtml('addto') ?>
- </div>
- <?php endif; ?>
-
- <?php if ($_product->getShortDescription()): ?>
- <div class="short-description">
- <h2><?php echo __('Quick Overview') ?></h2>
-
- <div class="std" itemprop="description"><?php echo $_helper->productAttribute($_product, nl2br($_product->getShortDescription()), 'short_description') ?></div>
- </div>
- <?php endif;?>
-
- <?php echo $this->getChildHtml('other');?>
-
- <?php if ($_product->isSaleable() && $this->hasOptions() && $this->getOptionsContainer() == 'container1'): ?>
- <?php echo $this->getChildChildHtml('options_container') ?>
- <?php endif;?>
-
- </div>
-
- <div class="product-img-box">
- <?php echo $this->getChildHtml('base-image') ?>
- <?php echo $this->getChildHtml('gallery') ?>
- </div>
-
- <div class="clearer"></div>
- <?php if ($_product->isSaleable() && $this->hasOptions() && $this->getOptionsContainer() == 'container2'): ?>
- <?php echo $this->getChildChildHtml('options_container') ?>
- <?php endif;?>
- </form>
- </div>
-
- <div class="product-collateral">
- <?php $layout = $this->getLayout(); ?>
- <?php foreach ($this->getGroupChildNames('detailed_info') as $name): ?>
- <?php $html = $layout->renderElement($name); ?>
- <?php if (!$html) continue; ?>
- <?php $alias = $layout->getElementAlias($name); ?>
- <div class="box-collateral <?php echo "box-{$alias}"?>">
- <?php if ($title = $this->getChildData($alias, 'title')): ?>
- <h2><?php echo $this->escapeHtml($title); ?></h2>
- <?php endif;?>
- <?php echo $html; ?>
- </div>
- <?php endforeach;?>
- <?php echo $this->getChildHtml('upsell_products') ?>
- <?php echo $this->getChildHtml('product_additional_data') ?>
- </div>
-</div>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/additional.phtml b/app/code/Magento/Catalog/view/frontend/product/view/additional.phtml
index 2a05fee5361..323738b782b 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/additional.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/additional.phtml
@@ -18,8 +18,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 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/Catalog/view/frontend/product/view/addto.phtml b/app/code/Magento/Catalog/view/frontend/product/view/addto.phtml
index b17cc666a9b..8cae832f2aa 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/addto.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/addto.phtml
@@ -18,8 +18,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 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 +26,22 @@
<?php $_product = $this->getProduct(); ?>
<?php $_wishlistSubmitUrl = $this->helper('Magento\Wishlist\Helper\Data')->getAddUrl($_product); ?>
-<ul class="add-to-links" data-role="add-to-links">
-<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
- <li><a href="<?php echo $_wishlistSubmitUrl ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a></li>
-<?php endif; ?>
-<?php $_compareUrl = $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddUrl($_product); ?>
-<?php if($_compareUrl) : ?>
- <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
-<?php endif; ?>
-</ul>
+<div class="product addto links" data-role="add-to-links">
+ <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
+ <a href="<?php echo $_wishlistSubmitUrl ?>"
+ class="action towishlist"
+ data-action="add-to-wishlist"><span><?php echo __('Add to Wishlist') ?></span></a>
+ <?php endif; ?>
+ <?php $_compareUrl = $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddUrl($_product); ?>
+ <?php if ($_compareUrl) : ?>
+ <a href="<?php echo $_compareUrl ?>"
+ class="action tocompare"><span><?php echo __('Add to Compare') ?></span></a>
+ <?php endif; ?>
+</div>
<script type="text/javascript">
-head.js("<?php echo $this->getViewFileUrl('Magento_Wishlist::js/add-to-wishlist.js') ?>", function () {
- jQuery('[data-role="add-to-links"]').addToWishlist(
- <?php echo $this->helper('Magento\Core\Helper\Data')->jsonEncode(array('productType' => $_product->getTypeId()))?>
- );
-});
+ head.js("<?php echo $this->getViewFileUrl('Magento_Wishlist::js/add-to-wishlist.js') ?>", function () {
+ jQuery('[data-role="add-to-links"]').addToWishlist(
+ <?php echo $this->helper('Magento\Core\Helper\Data')->jsonEncode(array('productType' => $_product->getTypeId()))?>
+ );
+ });
</script>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/addtocart.phtml b/app/code/Magento/Catalog/view/frontend/product/view/addtocart.phtml
index db2fb36af8e..8491717db94 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/addtocart.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/addtocart.phtml
@@ -18,8 +18,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 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,27 +25,80 @@
<?php $_product = $this->getProduct(); ?>
<?php $buttonTitle = __('Add to Cart'); ?>
<?php if ($_product->isSaleable()): ?>
-<div class="add-to-cart">
+<div class="box tocart">
<?php if (!$_product->isGrouped()): ?>
- <label for="qty"><?php echo __('Qty:') ?></label>
- <input type="text" name="qty" id="qty" maxlength="12" value="<?php echo $this->getProductDefaultQty() * 1 ?>"
- title="<?php echo __('Qty') ?>" class="input-text qty"
- <?php if ($_product->getStockItem() && $_product->getStockItem()->getIsQtyDecimal()) : ?>
- data-validate="{required:true, 'validate-greater-than-zero':true}"/>
- <?php else: ?>
- data-validate="{required:true, digits:true}"/>
- <?php endif; ?>
+ <div class="field qty">
+ <label class="label" for="qty"><span><?php echo __('Qty') ?></span></label>
+ <div class="control">
+ <input type="text"
+ name="qty"
+ id="qty"
+ maxlength="12"
+ value="<?php echo $this->getProductDefaultQty() * 1 ?>"
+ title="<?php echo __('Qty') ?>" class="input-text qty"
+ <?php if ($_product->getStockItem() && $_product->getStockItem()->getIsQtyDecimal()) : ?>
+ data-validate="{required:true, 'validate-greater-than-zero':true}"
+ <?php else: ?>
+ data-validate="{required:true, digits:true}"
+ <?php endif; ?> />
+ </div>
+ </div>
<?php endif; ?>
- <button type="submit" title="<?php echo $buttonTitle ?>" class="button btn-cart" id="product-addtocart-button">
- <span><span><?php echo $buttonTitle ?></span></span></button>
- <?php echo $this->getChildHtml('', true) ?>
+ <div class="actions">
+ <button type="submit"
+ title="<?php echo $buttonTitle ?>"
+ class="action primary tocart"
+ id="product-addtocart-button">
+ <span><?php echo $buttonTitle ?></span>
+ </button>
+ <?php echo $this->getChildHtml('', true) ?>
+ </div>
</div>
<?php endif; ?>
<script type="text/javascript">
(function ($) {
- $.mage.extend('validation', 'validation',
- '<?php echo $this->getViewFileUrl('Magento_Catalog::product/view/validation.js'); ?>');
- $('#product_addtocart_form').mage('validation');
+ 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 () {
+ $('#product_addtocart_form').validation({
+ errorPlacement: function (error, element) {
+ if (element.attr('data-validate') && element.attr('data-validate').indexOf('validate-one-checkbox-required-by-name') > 0) {
+ error.appendTo('#links-advice-container');
+ } else if (element.attr('data-validate')&& element.attr('data-validate').indexOf('validate-grouped-qty') > 0) {
+ $('#super-product-table').siblings(this.errorElement + '.' + this.errorClass).remove();
+ $('#super-product-table').after(error);
+ } else if (element.is(':radio, :checkbox')) {
+ element.closest('.nested').after(error);
+ } else {
+ element.after(error);
+ }
+ },
+ highlight: function (element, errorClass) {
+ if ($(element).attr('data-validate') && $(element).attr('data-validate').indexOf('validate-required-datetime') > 0) {
+ $(element).parent().find('.datetime-picker').each(function() {
+ $(this).removeClass(errorClass);
+ if ($(this).val().length === 0) {
+ $(this).addClass(errorClass);
+ }
+ });
+ } else if ($(element).is(':radio, :checkbox')) {
+ $(element).closest('.nested').addClass(errorClass+'-group');
+ } else {
+ $(element).addClass(errorClass);
+ }
+ },
+ unhighlight: function (element, errorClass) {
+ if ($(element).attr('data-validate') && $(element).attr('data-validate').indexOf('validate-required-datetime') > 0) {
+ $(element).parent().find('.datetime-picker').removeClass(errorClass);
+ } else if ($(element).is(':radio, :checkbox')) {
+ $(element).closest('.nested').removeClass(errorClass+'-group');
+ } else {
+ $(element).removeClass(errorClass);
+ }
+ }
+ });
+ });
})(jQuery);
</script>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/attribute.phtml b/app/code/Magento/Catalog/view/frontend/product/view/attribute.phtml
similarity index 93%
rename from app/design/frontend/magento_plushe/Magento_Catalog/product/view/attribute.phtml
rename to app/code/Magento/Catalog/view/frontend/product/view/attribute.phtml
index ffe146694c7..a9cc3eccce5 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/attribute.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/attribute.phtml
@@ -38,6 +38,7 @@ $_code = $this->getAtCode();
$_className = $this->getCssClass();
$_attributeLabel = $this->getAtLabel();
$_attributeType = $this->getAtType();
+$_attributeAddAttribute = $this->getAddAttribute();
if ( $_attributeLabel && $_attributeLabel == 'default' ) {
$_attributeLabel = $_product->getResource()->getAttribute($_code)->getFrontendLabel();
@@ -47,13 +48,12 @@ if ( $_attributeType && $_attributeType == 'text' ) {
} else {
$_attributeValue = $_helper->productAttribute($_product, $_product->$_call(), $_code);
}
-
?>
<?php if ($_attributeValue): ?>
<div class="product attibute <?php echo $_className?>">
<?php if ($_attributeLabel != 'none'): ?><strong class="type"><?php echo $_attributeLabel?></strong><?php endif; ?>
- <div class="value"><?php echo $_attributeValue; ?></div>
+ <div class="value" <?php echo $_attributeAddAttribute;?>><?php echo $_attributeValue; ?></div>
</div>
<?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/attributes.phtml b/app/code/Magento/Catalog/view/frontend/product/view/attributes.phtml
index 0e38831a4a8..3d7c93cb36f 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/attributes.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/attributes.phtml
@@ -18,8 +18,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 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,7 +25,7 @@
/**
* Product additional attributes template
*
- * @see \Magento\Catalog\Block\Product\View\Attributes
+ * @var $this \Magento\Catalog\Block\Product\View\Attributes
*/
?>
<?php
@@ -35,17 +33,14 @@
$_product = $this->getProduct()
?>
<?php if($_additional = $this->getAdditionalData()): ?>
- <table class="data-table" id="product-attribute-specs-table">
- <col width="25%" />
- <col />
+ <table class="data table additional attributes" id="product-attribute-specs-table">
<tbody>
<?php foreach ($_additional as $_data): ?>
<tr>
- <th class="label"><?php echo $this->escapeHtml(__($_data['label'])) ?></th>
- <td class="data"><?php echo $_helper->productAttribute($_product, $_data['value'], $_data['code']) ?></td>
+ <th class="col label"><?php echo $this->escapeHtml(__($_data['label'])) ?></th>
+ <td class="col data"><?php echo $_helper->productAttribute($_product, $_data['value'], $_data['code']) ?></td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
- <script type="text/javascript">(function($) {$('#product-attribute-specs-table').decorate('table')})(jQuery)</script>
<?php endif;?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/base-image.phtml b/app/code/Magento/Catalog/view/frontend/product/view/base-image.phtml
index fb701a64ef7..179b40ba0e3 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/base-image.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/base-image.phtml
@@ -18,8 +18,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 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,41 +25,116 @@
/**
* Product media data template
*
- * @see \Magento\Catalog\Block\Product\View\BaseImage
+ * @var $this \Magento\Catalog\Block\Product\View\BaseImage
*/
?>
<?php
- $_product = $this->getProduct();
- $_helper = $this->helper('Magento\Catalog\Helper\Output');
+$_product = $this->getProduct();
+$_helper = $this->helper('Magento\Catalog\Helper\Output');
+
+$image = 'product_page_main_image';
+
+$_resizedWidth = $this->getVar("{$image}:width");
+$_resizedHeight = $this->getVar("{$image}:height") ?: $_resizedWidth ;
+
+$_hasImage = ($_product->getImage() && $_product->getImage() != "no_selection") ? true : false;
+
+$_isOldDisplayMode = 0;
+$whiteBorders = $this->getVar("product_image_white_borders");
?>
-<?php if ($_product->getImage() != 'no_selection' && $_product->getImage()): ?>
-<p class="product-image product-image-zoom">
- <?php
- $_img = '<img data-role="base-image" id="image" itemprop="image" src="'.$this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image').'" alt="'.$this->escapeHtml($this->getImageLabel()).'" title="'.$this->escapeHtml($this->getImageLabel()).'" />';
- echo $_helper->productAttribute($_product, $_img, 'image');
- ?>
-</p>
-<p class="zoom-notice" id="track-hint"><?php echo __('Double click on above image to view full picture') ?></p>
-<div class="zoom">
- <img id="zoom-out" src="<?php echo $this->getViewFileUrl('Magento_Catalog::images/slider_btn_zoom_out.gif') ?>" alt="<?php echo __('Zoom Out') ?>" title="<?php echo __('Zoom Out') ?>" class="btn-zoom-out" />
- <div id="slider"></div>
- <img id="zoom-in" src="<?php echo $this->getViewFileUrl('Magento_Catalog::images/slider_btn_zoom_in.gif') ?>" alt="<?php echo __('Zoom In') ?>" title="<?php echo __('Zoom In') ?>" class="btn-zoom-in" />
-</div>
-<script type="text/javascript">
- head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/zoom.js')?>", function() {
- jQuery('#image').zoom({
- sliderSelector: '#slider',
- zoomNoticeSelector: '#track-hint',
- zoomInSelector: '#zoom-in',
- zoomOutSelector: '#zoom-out'
+<div class="product photo main" data-role="base-image-container">
+ <a class="product photo magento-zoom<?php echo (!$_hasImage) ? ' isPlaceholder' : ''; ?>"
+ id="base-image" data-role="base-image-zoom"
+ href="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image'); ?>">
+ <?php echo $this->getChildBlock('product.image.main')->setAddAttribute('itemprop="image"')->init($_product, $image)->toHtml() ?>
+ </a>
+ <script type="text/javascript">
+ jQuery('[data-role=base-image-zoom]').attr('rel', '<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image'); ?>');
+ </script>
+ <p class="notice"></p>
+ <script type="text/javascript">
+ jQuery(function(){
+ <?php if ($_isOldDisplayMode): ?>
+ jQuery('.magento-zoom').magentoZoom({
+ useGallery: false,
+ swapNotices: false,
+ isOldMode: <?php print $_isOldDisplayMode; ?>,
+ messages: {
+ noticeDefault: '<?php echo $this->escapeJsQuote(__("Click on image to zoom")) ?>',
+ loadingMessage: '<?php echo $this->escapeJsQuote(__("Loading...")) ?>'
+ }
+ });
+ <?php else: ?>
+ jQuery('.magento-zoom').magentoZoom({
+ useLens: true,
+ enlarged: {
+ adjustment: 20,
+ width: 500,
+ height: <?php echo $_resizedHeight ?>
+ },
+ useGallery: true,
+ swapNotices: true,
+ isOldMode: <?php print $_isOldDisplayMode; ?>,
+ messages: {
+ noticeDefault: '<?php echo $this->escapeJsQuote(__("Click on image to zoom")) ?>',
+ noticeLightBox: '<?php echo $this->escapeJsQuote(__("Click on image to view it full sized")) ?>', loadingMessage: '<?php echo $this->escapeJsQuote(__("Loading...")) ?>'
+ }
+ });
+ <?php endif; ?>
});
- });
-</script>
-<?php else: ?>
-<p class="product-image">
+ </script>
+ <?php ?>
+</div>
+<?php if (count($this->getGalleryImages()) > 0): ?>
<?php
- $_img = '<img data-role="base-image" itemprop="image" src="'.$this->getBaseImageUrl($_product).'" alt="'.$this->escapeHtml($this->getImageLabel()).'" title="'.$this->escapeHtml($this->getImageLabel()).'" />';
- echo $_helper->productAttribute($_product, $_img, 'image');
+ $thumbWidth = $this->getVar("product_page_more_views:width");
+ $thumbHeight = $this->getVar("product_page_more_views:height") ? : $thumbWidth;
?>
-</p>
+ <div class="product photo thumbs">
+ <strong class="title"><?php echo __('More Views') ?></strong>
+ <ul class="items thumbs">
+ <?php foreach ($this->getGalleryImages() as $_image): ?>
+ <?php if ($_isOldDisplayMode) {
+ $attributes = ' href="#" data-mage-init="{popupWindow: {windowURL:'
+ . $this->getGalleryUrl($_image)
+ . ',windowName:\'gallery\',width:300,height:300,status:1,scrollbars:1,resizable:1}"';
+ } else {
+ $attributes = ' href="'
+ . $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image', $_image->getFile())
+ . '" rel="';
+ if ($whiteBorders) {
+ $attributes .= $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image', $_image->getFile())->resize($_resizedWidth,$_resizedHeight) . '"';
+ } else {
+ $attributes .= $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image', $_image->getFile())->constrainOnly(TRUE)->keepAspectRatio(TRUE)->keepFrame(FALSE)->resize($_resizedWidth,$_resizedHeight) . '"';
+ }
+ };?>
+ <li class="item thumb">
+ <a<?php echo $attributes; ?> class="magento-zoom" title="<?php echo $this->escapeHtml($_image->getLabel()) ?>">
+ <?php if ($whiteBorders): ?>
+ <span class="img"
+ style="position:relative; z-index:1; display:block; width:<?php echo $thumbHeight; ?>px; height:<?php echo $thumbHeight; ?>px;">
+ <img itemprop="image"
+ src="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'thumbnail', $_image->getFile())->resize($thumbWidth, $thumbHeight); ?>"
+ alt="<?php echo $this->escapeHtml($_image->getLabel()) ?>"/>
+ </span>
+ <?php else: ?>
+ <span class="img"
+ style="position:relative; z-index:1; display:block; width:<?php echo $thumbHeight; ?>px; height:<?php echo $thumbHeight; ?>px;">
+ <img itemprop="image"
+ src="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'thumbnail', $_image->getFile())->constrainOnly(TRUE)->keepAspectRatio(TRUE)->keepFrame(FALSE)->resize($thumbWidth, $thumbHeight); ?>"
+ alt="<?php echo $this->escapeHtml($_image->getLabel()) ?>"/>
+ </span>
+ <?php endif; ?>
+ </a>
+ </li>
+ <?php endforeach; ?>
+ </ul>
+ </div>
+ <?php if ($_isOldDisplayMode): ?>
+ <script type="text/javascript">
+ (function($) {
+ head.js("<?php echo $this->getViewFileUrl('mage/popup-window.js')?>");
+ })(jQuery);
+ </script>
+ <?php endif; ?>
<?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/description.phtml b/app/code/Magento/Catalog/view/frontend/product/view/description.phtml
index ef21778cced..5233768ac05 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/description.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/description.phtml
@@ -18,8 +18,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 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,12 +25,7 @@
/**
* Product description template
*
- * @see \Magento\Catalog\Block\Product\View\Description
+ * @var $this \Magento\Catalog\Block\Product\View\Description
*/
?>
-<?php $_description = $this->getProduct()->getDescription(); ?>
-<?php if ($_description): ?>
- <div class="std">
- <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($this->getProduct(), $_description, 'description') ?>
- </div>
-<?php endif; ?>
+<?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($this->getProduct(), $this->getProduct()->getDescription(), 'description') ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/details.phtml b/app/code/Magento/Catalog/view/frontend/product/view/details.phtml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Catalog/product/view/details.phtml
rename to app/code/Magento/Catalog/view/frontend/product/view/details.phtml
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/form.phtml b/app/code/Magento/Catalog/view/frontend/product/view/form.phtml
similarity index 90%
rename from app/design/frontend/magento_plushe/Magento_Catalog/product/view/form.phtml
rename to app/code/Magento/Catalog/view/frontend/product/view/form.phtml
index ee446447da1..c7a95fc76aa 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/form.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/form.phtml
@@ -18,7 +18,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)
*/
@@ -26,8 +25,8 @@
/**
* Product view template
*
- * @see \Magento\Catalog\Block\Product\View
- * @see \Magento\Review\Block\Product\View
+ * @var $this \Magento\Catalog\Block\Product\View
+ * @var $this \Magento\Review\Block\Product\View
*/
?>
<?php $_helper = $this->helper('Magento\Catalog\Helper\Output'); ?>
@@ -41,8 +40,8 @@
})(jQuery);
</script>
<div class="product add form">
- <form action="<?php echo $this->getSubmitUrl($_product) ?>" method="post" id="product_addtocart_form"<?php if($_product->getOptions()): ?> enctype="multipart/form-data"<?php endif; ?>>
-
+ <form action="<?php echo $this->getSubmitUrl($_product) ?>" method="post"
+ id="product_addtocart_form"<?php if ($_product->getOptions()): ?> enctype="multipart/form-data"<?php endif; ?>>
<input type="hidden" name="product" value="<?php echo $_product->getId() ?>" />
<input type="hidden" name="related_product" id="related-products-field" value="" />
<?php echo $this->getChildHtml('form_top'); ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/product/view/gallery.phtml
deleted file mode 100644
index c1e5419169e..00000000000
--- a/app/code/Magento/Catalog/view/frontend/product/view/gallery.phtml
+++ /dev/null
@@ -1,41 +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\Catalog\Block\Product\View\Gallery
- */
-?>
-<div class="more-views">
- <h2><?php echo __('More Views') ?></h2>
- <ul>
- <?php $_size = $this->getBaseImageIconSize()?>
- <?php foreach ($this->getGalleryImages() as $_image): ?>
- <li>
- <a href="#" data-magento-init="{popupWindow: {windowURL:'<?php echo $this->getGalleryUrl($_image)?>',windowName:'gallery',width:300,height:300,status:1,scrollbars:1,resizable:1}}" title="<?php echo $this->escapeHtml($_image->getLabel()) ?>"><img src="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($this->getProduct(), 'image', $_image->getFile())->resize($_size); ?>" width="<?php echo $_size?>" height="<?php echo $_size?>" alt="<?php echo $this->escapeHtml($_image->getLabel()) ?>"/></a>
- </li>
- <?php endforeach; ?>
- </ul>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/mailto.phtml b/app/code/Magento/Catalog/view/frontend/product/view/mailto.phtml
similarity index 85%
rename from app/design/frontend/magento_plushe/Magento_Catalog/product/view/mailto.phtml
rename to app/code/Magento/Catalog/view/frontend/product/view/mailto.phtml
index 0c7658ab609..50b7afdbfc5 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/mailto.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/mailto.phtml
@@ -25,7 +25,9 @@
?>
<?php $_product = $this->getProduct() ?>
<?php if ($this->canEmailToFriend()): ?>
- <a title="<?php echo __('Email to a Friend') ?>" class="action mailto" href="<?php echo $this->helper('Magento\Catalog\Helper\Product')->getEmailToFriendUrl($_product) ?>">
+ <a title="<?php echo __('Email to a Friend') ?>"
+ class="action mailto"
+ href="<?php echo $this->helper('Magento\Catalog\Helper\Product')->getEmailToFriendUrl($_product) ?>">
<span><?php echo __('Email to a Friend') ?></span>
</a>
<?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/options.phtml b/app/code/Magento/Catalog/view/frontend/product/view/options.phtml
index 29c8cb0469d..dab050b3efc 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/options.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/options.phtml
@@ -18,8 +18,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 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,13 +29,14 @@
<script type="text/javascript">
(function ($) {
head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/price-option.js') ?>", function () {
- $('#product_addtocart_form').priceOption({'optionConfig':<?php echo $this->getJsonConfig()?>}).trigger('reloadPrice');
+ $('#product_addtocart_form').priceOption({
+ 'optionConfig':<?php echo $this->getJsonConfig()?>,
+ 'controlContainer': '.field'
+ }).trigger('reloadPrice');
});
})(jQuery);
</script>
- <dl>
<?php foreach($_options as $_option): ?>
<?php echo $this->getOptionHtml($_option) ?>
<?php endforeach; ?>
- </dl>
<?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/options/js.phtml b/app/code/Magento/Catalog/view/frontend/product/view/options/js.phtml
index 2babaf2baf9..8b3b9698ab9 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/options/js.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/options/js.phtml
@@ -18,72 +18,70 @@
* 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)
*/
?>
<script type="text/javascript">
-//<![CDATA[
-var DateOption = Class.create({
+ //<![CDATA[
+ var DateOption = Class.create({
- getDaysInMonth: function(month, year)
- {
- var curDate = new Date();
- if (!month) {
- month = curDate.getMonth();
- }
- if (2 == month && !year) { // leap year assumption for unknown year
- return 29;
- }
- if (!year) {
- year = curDate.getFullYear();
- }
- return 32 - new Date(year, month - 1, 32).getDate();
- },
+ getDaysInMonth: function(month, year)
+ {
+ var curDate = new Date();
+ if (!month) {
+ month = curDate.getMonth();
+ }
+ if (2 == month && !year) { // leap year assumption for unknown year
+ return 29;
+ }
+ if (!year) {
+ year = curDate.getFullYear();
+ }
+ return 32 - new Date(year, month - 1, 32).getDate();
+ },
- reloadMonth: function(event)
- {
- var selectEl = event.findElement();
- var idParts = selectEl.id.split("_");
- if (idParts.length != 3) {
- return false;
- }
- var optionIdPrefix = idParts[0] + "_" + idParts[1];
- var month = parseInt($(optionIdPrefix + "_month").value);
- var year = parseInt($(optionIdPrefix + "_year").value);
- var dayEl = $(optionIdPrefix + "_day");
+ reloadMonth: function(event)
+ {
+ var selectEl = event.findElement();
+ var idParts = selectEl.id.split("_");
+ if (idParts.length != 3) {
+ return false;
+ }
+ var optionIdPrefix = idParts[0] + "_" + idParts[1];
+ var month = parseInt($(optionIdPrefix + "_month").value);
+ var year = parseInt($(optionIdPrefix + "_year").value);
+ var dayEl = $(optionIdPrefix + "_day");
- var days = this.getDaysInMonth(month, year);
+ var days = this.getDaysInMonth(month, year);
- //remove days
- for (var i = dayEl.options.length - 1; i >= 0; i--) {
- if (dayEl.options[i].value > days) {
- dayEl.remove(dayEl.options[i].index);
+ //remove days
+ for (var i = dayEl.options.length - 1; i >= 0; i--) {
+ if (dayEl.options[i].value > days) {
+ dayEl.remove(dayEl.options[i].index);
+ }
}
- }
- // add days
- var lastDay = parseInt(dayEl.options[dayEl.options.length-1].value);
- for (i = lastDay + 1; i <= days; i++) {
- this.addOption(dayEl, i, i);
- }
- },
+ // add days
+ var lastDay = parseInt(dayEl.options[dayEl.options.length-1].value);
+ for (i = lastDay + 1; i <= days; i++) {
+ this.addOption(dayEl, i, i);
+ }
+ },
- addOption: function(select, text, value)
- {
- var option = document.createElement('OPTION');
- option.value = value;
- option.text = text;
+ addOption: function(select, text, value)
+ {
+ var option = document.createElement('OPTION');
+ option.value = value;
+ option.text = text;
- if (select.options.add) {
- select.options.add(option);
- } else {
- select.appendChild(option);
+ if (select.options.add) {
+ select.options.add(option);
+ } else {
+ select.appendChild(option);
+ }
}
- }
-});
-dateOption = new DateOption();
-//]]>
+ });
+ dateOption = new DateOption();
+ //]]>
</script>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/options/type/date.phtml b/app/code/Magento/Catalog/view/frontend/product/view/options/type/date.phtml
index 2f7fa93ca09..ff28832922f 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/options/type/date.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/options/type/date.phtml
@@ -18,60 +18,69 @@
* 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 $_option = $this->getOption() ?>
<?php $_optionId = $_option->getId() ?>
-<dt><label<?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo $this->escapeHtml($_option->getTitle()) ?></label>
- <?php echo $this->getFormatedPrice() ?></dt>
-<dd<?php if ($_option->getDecoratedIsLast()):?> class="last"<?php endif; ?>>
+<?php $class = ($_option->getIsRequire()) ? ' required' : ''; ?>
+<div class="field date<?php echo $class; ?>">
+ <label class="label">
+ <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
+ <?php echo $this->getFormatedPrice() ?>
+ </label>
+ <div class="control">
+ <?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE_TIME
+ || $_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE): ?>
-<?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE_TIME
- || $_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE): ?>
+ <?php echo $this->getDateHtml() ?>
- <?php echo $this->getDateHtml() ?>
+ <?php if (!$this->useCalendar()): ?>
+ <script type="text/javascript">
+ //<![CDATA[
+ (function($) {
+ head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/date-option.js') ?>", function() {
+ $.mage.dateOption({
+ datepickerFieldSelector: 'select.datetime-picker',
+ monthSelector: '#options_<?php echo $_optionId ?>_month',
+ yearSelector: '#options_<?php echo $_optionId ?>_year'
+ });
+ });
+ })(jQuery);
+ //]]>
+ </script>
+ <?php endif; ?>
+
+ <?php endif; ?>
+
+ <?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE_TIME
+ || $_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_TIME): ?>
+ <span class="time-picker"><?php echo $this->getTimeHtml() ?></span>
+ <?php endif; ?>
+
+ <?php if ($_option->getIsRequire()): ?>
+ <input type="hidden"
+ name="validate_datetime_<?php echo $_optionId ?>"
+ class="validate-datetime-<?php echo $_optionId ?>"
+ value=""
+ data-validate="{'validate-required-datetime':<?php echo $_optionId?>}"/>
+ <?php else: ?>
+ <input type="hidden"
+ name="validate_datetime_<?php echo $_optionId ?>"
+ class="validate-datetime-<?php echo $_optionId ?>"
+ value=""
+ data-validate="{'validate-optional-datetime':<?php echo $_optionId?>}"/>
+ <?php endif; ?>
- <?php if (!$this->useCalendar()): ?>
<script type="text/javascript">
- //<![CDATA[
+ //<![CDATA[
(function($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/date-option.js') ?>", function() {
- $.mage.dateOption({
- datepickerFieldSelector: 'select.datetime-picker',
- monthSelector: '#options_<?php echo $_optionId ?>_month',
- yearSelector: '#options_<?php echo $_optionId ?>_year'
- });
+ head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>", function() {
+ $.validator.setDefaults({ignore: ':hidden:not(input[name^="validate_datetime_"])'});
});
})(jQuery);
- //]]>
+ //]]>
</script>
- <?php endif; ?>
-
-<?php endif; ?>
-
-<?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE_TIME
- || $_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_TIME): ?>
- <span class="time-picker"><?php echo $this->getTimeHtml() ?></span>
-<?php endif; ?>
-
-<?php if ($_option->getIsRequire()): ?>
- <input type="hidden" name="validate_datetime_<?php echo $_optionId ?>" class="validate-datetime-<?php echo $_optionId ?>" value="" data-validate="{'validate-required-datetime':<?php echo $_optionId?>}"/>
-<?php else: ?>
- <input type="hidden" name="validate_datetime_<?php echo $_optionId ?>" class="validate-datetime-<?php echo $_optionId ?>" value="" data-validate="{'validate-optional-datetime':<?php echo $_optionId?>}"/>
-<?php endif; ?>
-
-<script type="text/javascript">
-//<![CDATA[
- (function($) {
- head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>", function() {
- $.validator.setDefaults({ignore: ':hidden:not(input[name^="validate_datetime_"])'});
- });
- })(jQuery);
-//]]>
-</script>
-
-</dd>
+ </div>
+</div>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/options/type/default.phtml b/app/code/Magento/Catalog/view/frontend/product/view/options/type/default.phtml
index b7bba10166c..01dc10b7090 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/options/type/default.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/options/type/default.phtml
@@ -18,13 +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 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 $_option = $this->getOption() ?>
-<dt>
- <label><?php echo $this->escapeHtml($_option->getTitle()) ?></label>
-</dt>
+<div class="field">
+ <label class="label"><span><?php echo $this->escapeHtml($_option->getTitle()) ?></span></label>
+</div>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/options/type/file.phtml b/app/code/Magento/Catalog/view/frontend/product/view/options/type/file.phtml
index a1e53759e9b..63e31c13f62 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/options/type/file.phtml
@@ -18,8 +18,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 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,9 +29,10 @@
<?php $_fieldNameAction = $_fileName . '_action'; ?>
<?php $_fieldValueAction = $_fileExists ? 'save_old' : 'save_new'; ?>
<?php $_fileNamed = $_fileName . '_name'; ?>
+<?php $class = ($_option->getIsRequire()) ? ' required' : ''; ?>
<script type="text/javascript">
-//<![CDATA[
+ //<![CDATA[
(function($) {
head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/file-option.js')?>", function() {
$('#input-box-<?php echo $_fileName ?>').fileOption({
@@ -45,33 +44,46 @@
});
});
})(jQuery);
-//]]>
+ //]]>
</script>
-<dt><label <?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo $this->escapeHtml($_option->getTitle()) ?></label>
- <?php echo $this->getFormatedPrice() ?></dt>
-<dd<?php if ($_option->getDecoratedIsLast()):?> class="last"<?php endif; ?>>
+<div class="field file<?php echo $class; ?>">
+ <label class="label">
+ <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
+ <?php echo $this->getFormatedPrice() ?>
+ </label>
<?php if ($_fileExists): ?>
+ <div class="control">
<span class="<?php echo $_fileNamed ?>"><?php echo $_fileInfo->getTitle(); ?></span>
<a href="javascript:void(0)" class="label" id="change-<?php echo $_fileName ?>" >
<?php echo __('Change') ?>
- </a>
- <?php if (! $_option->getIsRequire()): ?>
- <input type="checkbox" id="delete-<?php echo $_fileName ?>" />
- <span class="label"><?php echo __('Delete') ?></span>
+ </a>
+ <?php if (!$_option->getIsRequire()): ?>
+ <input type="checkbox" id="delete-<?php echo $_fileName ?>" />
+ <span class="label"><?php echo __('Delete') ?></span>
<?php endif; ?>
+ </div>
<?php endif; ?>
- <div id="input-box-<?php echo $_fileName ?>" <?php echo $_fileExists ? 'style="display:none"' : '' ?>>
- <input type="file" name="<?php echo $_fileName; ?>" class="product-custom-option<?php echo $_option->getIsRequire() ? ' required' : '' ?>" <?php echo $_fileExists ? 'disabled="disabled"' : '' ?> />
+ <div class="control" id="input-box-<?php echo $_fileName ?>" <?php echo $_fileExists ? 'style="display:none"' : '' ?>>
+ <input type="file"
+ name="<?php echo $_fileName; ?>"
+ class="product-custom-option<?php echo $_option->getIsRequire() ? ' required' : '' ?>"
+ <?php echo $_fileExists ? 'disabled="disabled"' : '' ?> />
<input type="hidden" name="<?php echo $_fieldNameAction; ?>" value="<?php echo $_fieldValueAction; ?>" />
<?php if ($_option->getFileExtension()): ?>
- <p class="no-margin"><?php echo __('Allowed file extensions to upload')?>: <strong><?php echo $_option->getFileExtension() ?></strong></p>
+ <p class="note">
+ <?php echo __('Allowed file extensions to upload')?>: <strong><?php echo $_option->getFileExtension() ?></strong>
+ </p>
<?php endif; ?>
<?php if ($_option->getImageSizeX() > 0): ?>
- <p class="no-margin"><?php echo __('Maximum image width')?>: <strong><?php echo $_option->getImageSizeX() ?> <?php echo __('px.')?></strong></p>
+ <p class="note">
+ <?php echo __('Maximum image width')?>: <strong><?php echo $_option->getImageSizeX() ?> <?php echo __('px.')?></strong>
+ </p>
<?php endif; ?>
<?php if ($_option->getImageSizeY() > 0): ?>
- <p class="no-margin"><?php echo __('Maximum image height')?>: <strong><?php echo $_option->getImageSizeY() ?> <?php echo __('px.')?></strong></p>
+ <p class="note">
+ <?php echo __('Maximum image height')?>: <strong><?php echo $_option->getImageSizeY() ?> <?php echo __('px.')?></strong>
+ </p>
<?php endif; ?>
</div>
-</dd>
+</div>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/options/type/select.phtml b/app/code/Magento/Catalog/view/frontend/product/view/options/type/select.phtml
index bb4706be37b..b646551510c 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/options/type/select.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/options/type/select.phtml
@@ -18,18 +18,21 @@
* 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)
+ * @copyright Copyright (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\Catalog\Block\Product\View\Options\Type\Select */ ?>
-<?php $_option = $this->getOption() ?>
-<dt><label<?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo $this->escapeHtml($_option->getTitle()) ?></label></dt>
-<dd<?php if ($_option->getDecoratedIsLast()):?> class="last"<?php endif; ?>>
- <div class="input-box">
+<?php
+$_option = $this->getOption();
+$class = ($_option->getIsRequire()) ? ' required' : '';
+?>
+<div class="field<?php echo $class; ?>">
+ <label class="label">
+ <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
+ </label>
+ <div class="control">
<?php echo $this->getValuesHtml() ?>
<?php if ($_option->getIsRequire()): ?>
<?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_RADIO || $_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_CHECKBOX): ?>
@@ -37,4 +40,4 @@
<?php endif; ?>
<?php endif;?>
</div>
-</dd>
+</div>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/options/type/text.phtml b/app/code/Magento/Catalog/view/frontend/product/view/options/type/text.phtml
index b710955d638..b3e2266d07c 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/options/type/text.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/options/type/text.phtml
@@ -18,40 +18,58 @@
* 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 $_option = $this->getOption(); ?>
-<dt><label<?php if ($_option->getIsRequire()) echo ' class="required"' ?>><?php if ($_option->getIsRequire()) echo '<em>*</em>' ?><?php echo $this->escapeHtml($_option->getTitle()) ?></label>
- <?php echo $this->getFormatedPrice() ?></dt>
-<dd<?php if ($_option->getDecoratedIsLast()):?> class="last"<?php endif; ?>>
- <div class="input-box">
+<?php
+$_option = $this->getOption();
+$class = ($_option->getIsRequire()) ? ' required' : '';
+?>
+
+<div class="field<?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_AREA) {
+ echo ' textarea';
+} ?><?php echo $class ?>">
+ <label class="label">
+ <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
+ <?php echo $this->getFormatedPrice() ?>
+ </label>
+
+ <div class="control">
<?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_FIELD): ?>
- <?php $_textValidate = null;
- if($_option->getIsRequire()){
- $_textValidate['required'] = true;
- }
- if($_option->getMaxCharacters()){
- $_textValidate['maxlength'] = $_option->getMaxCharacters();
- }
- ?>
- <input type="text" id="options_<?php echo $_option->getId() ?>_text" class="input-text product-custom-option" <?php if(!empty($_textValidate))echo 'data-validate='.json_encode($_textValidate) ; ?> name="options[<?php echo $_option->getId() ?>]" value="<?php echo $this->escapeHtml($this->getDefaultValue()) ?>" />
+ <?php $_textValidate = null;
+ if ($_option->getIsRequire()) {
+ $_textValidate['required'] = true;
+ }
+ if ($_option->getMaxCharacters()) {
+ $_textValidate['maxlength'] = $_option->getMaxCharacters();
+ }
+ ?>
+ <input type="text"
+ id="options_<?php echo $_option->getId() ?>_text"
+ class="input-text product-custom-option"
+ <?php if (!empty($_textValidate)) echo 'data-validate=' . json_encode($_textValidate); ?>
+ name="options[<?php echo $_option->getId() ?>]"
+ value="<?php echo $this->escapeHtml($this->getDefaultValue()) ?>"/>
<?php elseif ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_AREA): ?>
- <?php $_textAreaValidate = null;
- if($_option->getIsRequire()){
- $_textAreaValidate['required'] = true;
- }
- if($_option->getMaxCharacters()){
- $_textAreaValidate['maxlength'] = $_option->getMaxCharacters();
- }
- ?>
- <textarea id="options_<?php echo $_option->getId() ?>_text" class="product-custom-option" <?php if(!empty($_textAreaValidate))echo 'data-validate='.json_encode($_textAreaValidate) ; ?> name="options[<?php echo $_option->getId() ?>]" rows="5" cols="25"><?php echo $this->escapeHtml($this->getDefaultValue()) ?></textarea>
+ <?php $_textAreaValidate = null;
+ if ($_option->getIsRequire()) {
+ $_textAreaValidate['required'] = true;
+ }
+ if ($_option->getMaxCharacters()) {
+ $_textAreaValidate['maxlength'] = $_option->getMaxCharacters();
+ }
+ ?>
+ <textarea id="options_<?php echo $_option->getId() ?>_text"
+ class="product-custom-option"
+ <?php if (!empty($_textAreaValidate)) echo 'data-validate=' . json_encode($_textAreaValidate); ?>
+ name="options[<?php echo $_option->getId() ?>]"
+ rows="5"
+ cols="25"><?php echo $this->escapeHtml($this->getDefaultValue()) ?></textarea>
<?php endif; ?>
<?php if ($_option->getMaxCharacters()): ?>
- <p class="note"><?php echo __('Maximum number of characters:')?> <strong><?php echo $_option->getMaxCharacters() ?></strong></p>
+ <p class="note"><?php echo __('Maximum number of characters:') ?>
+ <strong><?php echo $_option->getMaxCharacters() ?></strong></p>
<?php endif; ?>
</div>
-</dd>
+</div>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/options/wrapper.phtml b/app/code/Magento/Catalog/view/frontend/product/view/options/wrapper.phtml
index 55d7c385c2c..2497ca0e80e 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/options/wrapper.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/options/wrapper.phtml
@@ -18,16 +18,18 @@
* 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="product-options" id="product-options-wrapper">
- <?php echo $this->getChildHtml('', true);?>
- <?php if ($this->hasRequiredOptions()):?>
- <p class="required"><?php echo __('* Required Fields') ?></p>
- <?php endif;?>
+<?php
+$required = '';
+if ($this->hasRequiredOptions()) {
+ $required = ' data-hasrequired="' . __('* Required Fields') . '"';
+}
+?>
+<div class="product options wrapper" id="product-options-wrapper"<?php echo $required; ?>>
+ <fieldset class="fieldset">
+ <?php echo $this->getChildHtml('', true);?>
+ </fieldset>
</div>
-<script type="text/javascript">(function($) {$('#product-options-wrapper dl').decorate('generic', ['last'])})(jQuery)</script>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/options/wrapper/bottom.phtml b/app/code/Magento/Catalog/view/frontend/product/view/options/wrapper/bottom.phtml
index faf0181512c..273ffaa9373 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/options/wrapper/bottom.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/options/wrapper/bottom.phtml
@@ -18,12 +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)
*/
?>
-<div class="product-options-bottom">
+<div class="product options bottom">
<?php echo $this->getChildHtml('', true);?>
</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/price.phtml b/app/code/Magento/Catalog/view/frontend/product/view/price.phtml
similarity index 100%
rename from app/design/frontend/magento_plushe/Magento_Catalog/product/view/price.phtml
rename to app/code/Magento/Catalog/view/frontend/product/view/price.phtml
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/price_clone.phtml b/app/code/Magento/Catalog/view/frontend/product/view/price_clone.phtml
index e542f129a38..17fb51b6078 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/price_clone.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/price_clone.phtml
@@ -18,8 +18,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 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/design/frontend/magento_plushe/Magento_Catalog/product/view/rating.phtml b/app/code/Magento/Catalog/view/frontend/product/view/rating.phtml
similarity index 97%
rename from app/design/frontend/magento_plushe/Magento_Catalog/product/view/rating.phtml
rename to app/code/Magento/Catalog/view/frontend/product/view/rating.phtml
index f23bf6963bb..e499749445d 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/rating.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/rating.phtml
@@ -18,7 +18,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/code/Magento/Catalog/view/frontend/product/view/tierprices.phtml b/app/code/Magento/Catalog/view/frontend/product/view/tierprices.phtml
index ef7dcb5db6d..8c40fa860c5 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/tierprices.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/tierprices.phtml
@@ -18,8 +18,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 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,7 +25,7 @@
<?php
/**
- * @var $this \Magento\Catalog\Block\Product\View
+ * @var $this \Magento\Catalog\Block\Product\View
*/
$_product = $this->getProduct();
$_tierPrices = $this->getTierPrices();
@@ -43,152 +41,152 @@ if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(1,
?>
<?php if (count($_tierPrices) > 0): ?>
- <ul class="<?php echo ($this->getInGrouped() ? 'tier-prices-grouped product-pricing-grouped' : 'tier-prices product-pricing'); ?>">
- <?php if ($this->getInGrouped()): ?>
- <?php $_tierPrices = $this->getTierPrices($_product); ?>
- <?php endif; ?>
- <?php $this->helper('Magento\Weee\Helper\Data')->processTierPrices($_product, $_tierPrices); ?>
- <?php foreach ($_tierPrices as $_index => $_price): ?>
- <li>
- <?php if ($_catalogHelper->canApplyMsrp($_product)): ?>
- <?php if ($this->getInGrouped()): ?>
- <?php echo __('Buy %1 for', $_price['price_qty']) ?>:
- <?php else: ?>
- <?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 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 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
- <?php if ($_weeeTaxAttributes): ?>
- (<small>
- <?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()); ?>
- <?php endforeach; ?>
- </small>)
- <?php endif; ?>
- <?php echo __('each') ?>
- <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 4)): ?>
- <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
- <?php if ($_weeeTaxAttributes): ?>
- (<small>
- <?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()); ?>
- <?php endforeach; ?>
- </small>)
- <?php endif; ?>
- <?php echo __('each') ?>
- <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)): ?>
- <?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', $_price['formated_price_incl_weee']); ?>
- </small>)
+ <ul class="<?php echo ($this->getInGrouped() ? 'tier prices grouped items' : 'prices tier items'); ?>">
+ <?php if ($this->getInGrouped()): ?>
+ <?php $_tierPrices = $this->getTierPrices($_product); ?>
+ <?php endif; ?>
+ <?php $this->helper('Magento\Weee\Helper\Data')->processTierPrices($_product, $_tierPrices); ?>
+ <?php foreach ($_tierPrices as $_index => $_price): ?>
+ <li class="item">
+ <?php if ($_catalogHelper->canApplyMsrp($_product)): ?>
+ <?php if ($this->getInGrouped()): ?>
+ <?php echo __('Buy %1 for', $_price['price_qty']) ?>:
+ <?php else: ?>
+ <?php echo __('Buy %1', $_price['price_qty']) ?>
<?php endif; ?>
- <?php echo __('each') ?>
- <?php else: ?>
- <?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 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 for %2', $_price['price_qty'], $_price['formated_price_incl_weee']); ?>
- <?php if ($_weeeTaxAttributes): ?>
- (<small>
- <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
- <?php echo $separator; ?>
- <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
- <?php $separator = ' + '; endforeach; ?>
- </small>)
- <?php endif; ?>
- <?php echo __('each') ?>
- <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 4)): ?>
- <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee']); ?>
- <?php if ($_weeeTaxAttributes): ?>
- (<small>
- <?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()); ?>
- <?php $separator = ' + '; endforeach; ?>
- </small>)
- <?php endif; ?>
- <?php echo __('each') ?>
- <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)): ?>
- <?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', $_price['formated_price_incl_weee']); ?>
- </small>)
- <?php endif; ?>
- <?php echo __('each') ?>
<?php else: ?>
- <?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 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 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
- <?php if ($_weeeTaxAttributes): ?>
- (<small>
- <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
- <?php echo $separator; ?>
- <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
- <?php $separator = ' + '; endforeach; ?>
- </small>)
- <?php endif; ?>
- <?php echo __('each') ?>
- <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 4)): ?>
- <?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): ?>
- <?php echo $separator; ?>
- <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()+$_attribute->getTaxAmount()); ?>
- <?php $separator = ' + '; endforeach; ?>
- </small>)
+
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displayBothPrices()): ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 0)): ?>
+ <?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 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
+ <?php if ($_weeeTaxAttributes): ?>
+ (<small>
+ <?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()); ?>
+ <?php endforeach; ?>
+ </small>)
+ <?php endif; ?>
+ <?php echo __('each') ?>
+ <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 4)): ?>
+ <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
+ <?php if ($_weeeTaxAttributes): ?>
+ (<small>
+ <?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()); ?>
+ <?php endforeach; ?>
+ </small>)
+ <?php endif; ?>
+ <?php echo __('each') ?>
+ <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)): ?>
+ <?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', $_price['formated_price_incl_weee']); ?>
+ </small>)
+ <?php endif; ?>
+ <?php echo __('each') ?>
+ <?php else: ?>
+ <?php echo __('Buy %1 for %2 (%3 incl. tax) each', $_price['price_qty'], $_price['formated_price'], $_price['formated_price_incl_tax']) ?>
<?php endif; ?>
- <?php echo __('each') ?>
- <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)): ?>
- <?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', $_price['formated_price_incl_weee_only']); ?>
- </small>)
+ <?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 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 for %2', $_price['price_qty'], $_price['formated_price_incl_weee']); ?>
+ <?php if ($_weeeTaxAttributes): ?>
+ (<small>
+ <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
+ <?php echo $separator; ?>
+ <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
+ <?php $separator = ' + '; endforeach; ?>
+ </small>)
+ <?php endif; ?>
+ <?php echo __('each') ?>
+ <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 4)): ?>
+ <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee']); ?>
+ <?php if ($_weeeTaxAttributes): ?>
+ (<small>
+ <?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()); ?>
+ <?php $separator = ' + '; endforeach; ?>
+ </small>)
+ <?php endif; ?>
+ <?php echo __('each') ?>
+ <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)): ?>
+ <?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', $_price['formated_price_incl_weee']); ?>
+ </small>)
+ <?php endif; ?>
+ <?php echo __('each') ?>
+ <?php else: ?>
+ <?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 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 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
+ <?php if ($_weeeTaxAttributes): ?>
+ (<small>
+ <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
+ <?php echo $separator; ?>
+ <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
+ <?php $separator = ' + '; endforeach; ?>
+ </small>)
+ <?php endif; ?>
+ <?php echo __('each') ?>
+ <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 4)): ?>
+ <?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): ?>
+ <?php echo $separator; ?>
+ <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()+$_attribute->getTaxAmount()); ?>
+ <?php $separator = ' + '; endforeach; ?>
+ </small>)
+ <?php endif; ?>
+ <?php echo __('each') ?>
+ <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)): ?>
+ <?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', $_price['formated_price_incl_weee_only']); ?>
+ </small>)
+ <?php endif; ?>
+ <?php echo __('each') ?>
+ <?php else: ?>
+ <?php echo __('Buy %1 for %2 each', $_price['price_qty'], $_price['formated_price']) ?>
+ <?php endif; ?>
<?php endif; ?>
- <?php echo __('each') ?>
- <?php else: ?>
- <?php echo __('Buy %1 for %2 each', $_price['price_qty'], $_price['formated_price']) ?>
- <?php endif; ?>
- <?php endif; ?>
- <?php endif; ?>
+ <?php endif; ?>
- <?php endif; // Can apply MSRP ?>
+ <?php endif; // Can apply MSRP ?>
- <?php if (!$this->getInGrouped()): ?>
- <?php if(($_product->getPrice() == $_product->getFinalPrice() && $_product->getPrice() > $_price['price'])
- || ($_product->getPrice() != $_product->getFinalPrice() && $_product->getFinalPrice() > $_price['price'])): ?>
- <?php echo __('and') ?> <strong class="benefit"><?php echo __('save')?> <span class="percent tier-<?php echo $_index;?>"><?php echo $_price['savePercent']?></span>%
- <?php endif ?></strong>
- <?php endif; ?>
+ <?php if (!$this->getInGrouped()): ?>
+ <?php if(($_product->getPrice() == $_product->getFinalPrice() && $_product->getPrice() > $_price['price'])
+ || ($_product->getPrice() != $_product->getFinalPrice() && $_product->getFinalPrice() > $_price['price'])): ?>
+ <?php echo __('and') ?> <strong class="benefit"><?php echo __('save')?> <span class="percent tier-<?php echo $_index;?>"><?php echo $_price['savePercent']?></span>%
+ <?php endif ?></strong>
+ <?php endif; ?>
<?php if ($_catalogHelper->isShowPriceOnGesture($_product)):?>
<?php $popupId = 'msrp-popup-' . $_product->getId() . $this->getRandomString(20); ?>
@@ -202,9 +200,9 @@ if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(1,
<span class="msrp-price-hide-message">
<?php echo $_catalogHelper->getMsrpPriceMessage($_product) ?>
</span>
- <?php endif; ?>
- </li>
- <?php endforeach ?>
+ <?php endif; ?>
+ </li>
+ <?php endforeach ?>
</ul>
<?php if ($_catalogHelper->isShowPriceOnGesture($_product)):?>
<script type="text/javascript">
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/type/default.phtml b/app/code/Magento/Catalog/view/frontend/product/view/type/default.phtml
index d895c793b88..ae518e37324 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/type/default.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/type/default.phtml
@@ -18,8 +18,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 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,10 +27,12 @@
<?php if ($this->displayProductStockStatus()): ?>
<?php if ($_product->isAvailable()): ?>
- <p class="availability in-stock"><?php echo __('Availability:') ?> <span><?php echo __('In stock') ?></span></p>
+ <p class="stock available" title="<?php echo __('Availability') ?>">
+ <span><?php echo __('In stock') ?></span>
+ </p>
<?php else: ?>
- <p class="availability out-of-stock"><?php echo __('Availability:') ?> <span><?php echo __('Out of stock') ?></span></p>
+ <p class="stock unavailable" title="<?php echo __('Availability') ?>">
+ <span><?php echo __('Out of stock') ?></span>
+ </p>
<?php endif; ?>
<?php endif; ?>
-<?php echo $this->getChildHtml('product_type_data_extra') ?>
-<?php echo $this->getPriceHtml($_product) ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/type/grouped.phtml b/app/code/Magento/Catalog/view/frontend/product/view/type/grouped.phtml
index 5ce0026339a..c8eb7a5bef2 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/type/grouped.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/type/grouped.phtml
@@ -18,8 +18,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 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,8 +25,8 @@
/**
* Grouped product data template
*
- * @see \Magento\Catalog\Block\Product\View\BaseImage
- * @see \Magento\Catalog\Block\Product\View\Type\Grouped
+ * @var $this \Magento\Catalog\Block\Product\View\BaseImage
+ * @var $this \Magento\Catalog\Block\Product\View\Type\Grouped
*/
?>
<?php $this->setPreconfiguredValue(); ?>
@@ -37,35 +35,36 @@
<?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
<?php if ($this->displayProductStockStatus()): ?>
<?php if ($_product->isAvailable() && $_hasAssociatedProducts): ?>
- <p class="availability in-stock"><?php echo __('Availability:') ?> <span><?php echo __('In stock') ?></span></p>
+ <p class="stock available" title="<?php echo __('Availability') ?>">
+ <span><?php echo __('In stock') ?></span>
+ </p>
<?php else: ?>
- <p class="availability out-of-stock"><?php echo __('Availability:') ?> <span><?php echo __('Out of stock') ?></span></p>
+ <p class="stock unavailable" title="<?php echo __('Availability') ?>">
+ <span><?php echo __('Out of stock') ?></span>
+ </p>
<?php endif; ?>
<?php endif; ?>
-<?php echo $this->getChildHtml('product_type_data_extra') ?>
-<table class="data-table grouped-items-table" id="super-product-table">
- <col />
- <col />
- <col width="1" />
+
+<table class="table data grouped" id="super-product-table">
<thead>
- <tr>
- <th><?php echo __('Product Name') ?></th>
- <?php if ($this->getCanShowProductPrice($_product)): ?>
- <th class="a-right"><?php echo __('Price') ?></th>
- <?php endif; ?>
- <?php if ($_product->isSaleable()): ?>
- <th class="a-center"><?php echo __('Qty') ?></th>
- <?php endif; ?>
- </tr>
+ <tr>
+ <th class="col item"><?php echo __('Product Name') ?></th>
+ <?php if ($this->getCanShowProductPrice($_product)): ?>
+ <th class="col price"><?php echo __('Price') ?></th>
+ <?php endif; ?>
+ <?php if ($_product->isSaleable()): ?>
+ <th class="col qty"><?php echo __('Qty') ?></th>
+ <?php endif; ?>
+ </tr>
</thead>
<tbody>
<?php if ($_hasAssociatedProducts): ?>
<?php foreach ($_associatedProducts as $_item): ?>
<?php $_finalPriceInclTax = $this->helper('Magento\Tax\Helper\Data')->getPrice($_item, $_item->getFinalPrice(), true) ?>
<tr>
- <td><?php echo $this->escapeHtml($_item->getName()) ?></td>
+ <td class="col item"><strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong></td>
<?php if ($this->getCanShowProductPrice($_product)): ?>
- <td class="a-right">
+ <td class="col price">
<?php if ($this->getCanShowProductPrice($_item)): ?>
<?php echo $this->getPriceHtml($_item, true) ?>
<?php echo $this->getTierPriceHtml($_item) ?>
@@ -73,21 +72,32 @@
</td>
<?php endif; ?>
<?php if ($_product->isSaleable()): ?>
- <td class="a-center">
+ <td class="col qty">
<?php if ($_item->isSaleable()) : ?>
- <input type="text" name="super_group[<?php echo $_item->getId() ?>]" maxlength="12" value="<?php echo $_item->getQty()*1 ?>" title="<?php echo __('Qty') ?>" class="input-text qty" data-validate="{'validate-grouped-qty':'#super-product-table'}"/>
+ <div class="control qty">
+ <input type="text" name="super_group[<?php echo $_item->getId() ?>]"
+ maxlength="12"
+ value="<?php echo $_item->getQty() * 1 ?>"
+ title="<?php echo __('Qty') ?>"
+ class="input-text qty"
+ data-validate="{'validate-grouped-qty':'#super-product-table'}"/>
+ </div>
<?php else: ?>
- <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
+ <p class="stock unavailable" title="<?php echo __('Availability') ?>">
+ <span><?php echo __('Out of stock') ?></span>
+ </p>
<?php endif; ?>
</td>
<?php endif; ?>
</tr>
<?php endforeach; ?>
<?php else: ?>
- <tr>
- <td colspan="<?php if ($_product->isSaleable()): ?>4<?php else : ?>3<?php endif; ?>"><?php echo __('No options of this product are available.') ?></td>
- </tr>
+ <tr>
+ <td class="unavailable"
+ colspan="<?php if ($_product->isSaleable()): ?>4<?php else : ?>3<?php endif; ?>">
+ <?php echo __('No options of this product are available.') ?>
+ </td>
+ </tr>
<?php endif; ?>
</tbody>
</table>
-<script type="text/javascript">(function($) {$('#super-product-table').decorate('table')})(jQuery)</script>
diff --git a/app/code/Magento/Catalog/view/frontend/product/view/type/options/configurable.phtml b/app/code/Magento/Catalog/view/frontend/product/view/type/options/configurable.phtml
index ee424b617e0..419fd11e1ab 100644
--- a/app/code/Magento/Catalog/view/frontend/product/view/type/options/configurable.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/view/type/options/configurable.phtml
@@ -18,8 +18,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 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,24 +29,29 @@ $_product = $this->getProduct();
$_attributes = $this->decorateArray($this->getAllowAttributes());
?>
<?php if ($_product->isSaleable() && count($_attributes)):?>
- <dl>
+ <div class="product options configure">
<?php foreach($_attributes as $_attribute): ?>
- <dt><label class="required"><em>*</em><?php echo $this->escapeHtml($_attribute->getProductAttribute()->getStoreLabel()) ?></label></dt>
- <dd<?php if ($_attribute->getDecoratedIsLast()):?> class="last"<?php endif; ?>>
- <div class="input-box">
- <select name="super_attribute[<?php echo $_attribute->getAttributeId() ?>]" data-validate="{required:true}" id="attribute<?php echo $_attribute->getAttributeId() ?>" class="super-attribute-select">
+ <div class="field required">
+ <label class="label" for="attribute<?php echo $_attribute->getAttributeId() ?>">
+ <span><?php echo $this->escapeHtml($_attribute->getProductAttribute()->getStoreLabel()) ?></span>
+ </label>
+ <div class="control">
+ <select name="super_attribute[<?php echo $_attribute->getAttributeId() ?>]"
+ data-validate="{required:true}"
+ id="attribute<?php echo $_attribute->getAttributeId() ?>"
+ class="super-attribute-select">
<option><?php echo __('Choose an Option...') ?></option>
- </select>
- </div>
- </dd>
+ </select>
+ </div>
+ </div>
<?php endforeach; ?>
- </dl>
+ </div>
<script type="text/javascript">
(function ($) {
head.js("<?php echo $this->getViewFileUrl('jquery/jquery.parsequery.js') ?>",
"<?php echo $this->getViewFileUrl('Magento_Catalog::js/configurable.js') ?>", function () {
- $('#product_addtocart_form').configurable({"spConfig":<?php echo $this->getJsonConfig() ?>});
- })
+ $('#product_addtocart_form').configurable({"spConfig":<?php echo $this->getJsonConfig() ?>});
+ })
})(jQuery);
</script>
<?php endif;?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/widget/link/link_block.phtml b/app/code/Magento/Catalog/view/frontend/product/widget/link/link_block.phtml
index d945ba82cdc..d7e235f05b8 100644
--- a/app/code/Magento/Catalog/view/frontend/product/widget/link/link_block.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/widget/link/link_block.phtml
@@ -18,10 +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)
*/
?>
-<span class="widget widget-product-link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>
+<div class="widget product link">
+ <a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a>
+</div>
diff --git a/app/code/Magento/Catalog/view/frontend/product/widget/link/link_inline.phtml b/app/code/Magento/Catalog/view/frontend/product/widget/link/link_inline.phtml
index b061345fa6d..7a8dd8e1124 100644
--- a/app/code/Magento/Catalog/view/frontend/product/widget/link/link_inline.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/widget/link/link_inline.phtml
@@ -18,10 +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)
+ * @copyright Copyright (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="widget widget-product-link-inline"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>
+<span class="widget product link">
+ <a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a>
+</span>
diff --git a/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_default_list.phtml b/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_default_list.phtml
index 63b944d8211..261226fc376 100644
--- a/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_default_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_default_list.phtml
@@ -18,39 +18,60 @@
* 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 (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
-<div class="widget widget-new-products">
- <div class="block block-products">
- <div class="block-title">
- <strong><span><?php echo __('New Products') ?></span></strong>
+<?php if (($items$_products = $this->getProductCollection()) && $_products->getSize()): ?>
+ <?php $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');?>
+ <div class="block widget new minilist">
+ <div class="title">
+ <strong><?php echo __('New Products') ?></strong>
</div>
- <div class="block-content">
+ <div class="content">
<?php echo $this->getPagerHtml() ?>
<?php $suffix = $this->getNameInLayout(); ?>
- <ol class="mini-products-list" id="widget-new-products-<?php echo $suffix; ?>">
- <?php foreach ($_products->getItems() as $_product): ?>
- <li class="item">
- <a class="product-image" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><img src="<?php echo $this->getThumbnailSidebarUrl($_product) ?>" width="<?php echo $this->getThumbnailSidebarSize() ?>" height="<?php echo $this->getThumbnailSidebarSize() ?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
- <div class="product-details">
- <p class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></p>
- <?php echo $this->getPriceHtml($_product, true, '-widget-new-'.$suffix) ?>
- <?php if ($_product->getIsSalable()): ?>
- <a href="<?php echo $this->getAddToCartUrl($_product) ?>" class="link-cart"><?php echo __('Add to Cart') ?></a>
- <?php else: ?>
- <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
+ <?php $iterator = 1; ?>
+ <ol class="items minilist products" id="widget-new-products-<?php echo $suffix; ?>">
+ <?php foreach ($_products->getItems() as $_product): ?>
+ <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+ <div class="product">
+ <a class="product photo" href="<?php echo $_product->getProductUrl() ?>"
+ title="<?php echo $this->stripTags($_product->getName(), null, true) ?>">
+ <?php echo $imageBlock->init($_product, 'side_column_widget_product_thumbnail')->toHtml() ?>
+ </a>
+ <div class="product details">
+ <strong class="product name">
+ <a href="<?php echo $_product->getProductUrl() ?>"
+ title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)">
+ <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+ </a>
+ </strong>
+ <?php echo $this->getPriceHtml($_product, true, '-widget-new-'.$suffix) ?>
+ <div class="product actions">
+ <div class="primary">
+ <?php if($_product->isSaleable()): ?>
+ <a href="<?php echo $this->getAddToCartUrl($_product) ?>" class="action tocart">
+ <span><?php echo __('Add to Cart') ?></span>
+ </a>
+ <?php else: ?>
+ <?php if ($_product->getIsSalable()): ?>
+ <p class="stock available" title="<?php echo __('Availability') ?>">
+ <span><?php echo __('In stock') ?></span>
+ </p>
+ <?php else: ?>
+ <p class="stock unavailable" title="<?php echo __('Availability') ?>">
+ <span><?php echo __('Out of stock') ?></span>
+ </p>
+ <?php endif; ?>
+ <?php endif; ?>
+ </div>
+ </div>
+ </div>
</div>
- </li>
- <?php endforeach; ?>
+ <?php echo ($iterator==count($_products->getItems())+1) ? '</li>' : '' ?>
+ <?php endforeach; ?>
</ol>
- <script type="text/javascript">(function($) {$('#widget-new-products-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
</div>
</div>
-</div>
<?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_images_list.phtml b/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_images_list.phtml
index b5c37159abc..5b8c54356af 100644
--- a/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_images_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_images_list.phtml
@@ -18,30 +18,30 @@
* 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 (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
-<div class="widget widget-new-products">
- <div class="block block-list">
- <div class="block-title">
- <strong><span><?php echo __('New Products') ?></span></strong>
+ <?php $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image'); ?>
+ <div class="widget block new photos">
+ <div class="title">
+ <strong><?php echo __('New Products') ?></strong>
</div>
- <div class="block-content">
+ <div class="content">
<?php echo $this->getPagerHtml() ?>
<?php $suffix = $this->getNameInLayout(); ?>
- <ol class="mini-products-images-list" id="widget-new-products-<?php echo $suffix; ?>">
- <?php foreach ($_products->getItems() as $_product): ?>
- <li class="item">
- <a class="product-image" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><img src="<?php echo $this->getThumbnailUrl($_product) ?>" width="<?php echo $this->getThumbnailSize() ?>" height="<?php echo $this->getThumbnailSize() ?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
- </li>
- <?php endforeach; ?>
+ <ol class="items" id="widget-new-products-<?php echo $suffix; ?>">
+ <?php foreach ($_products->getItems() as $_product): ?>
+ <li class="item">
+ <a class="product photo" href="<?php echo $_product->getProductUrl() ?>"
+ title="<?php echo $this->stripTags($_product->getName(), null, true) ?>">
+ <?php /* new_products_images_only_widget */ ?>
+ <?php echo $imageBlock->init($_product, 'new_products_images_only_widget')->toHtml() ?>
+ </a>
+ </li>
+ <?php endforeach; ?>
</ol>
- <script type="text/javascript">(function($) {$('#widget-new-products-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
</div>
</div>
-</div>
<?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_names_list.phtml b/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_names_list.phtml
index 88f4256b614..eb378db3666 100644
--- a/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_names_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/widget/new/column/new_names_list.phtml
@@ -18,30 +18,30 @@
* 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 (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
-<div class="widget widget-new-products">
- <div class="block block-list">
- <div class="block-title">
- <strong><span><?php echo __('New Products') ?></span></strong>
+ <div class="widget block new names">
+ <div class="title">
+ <strong><?php echo __('New Products') ?></strong>
</div>
- <div class="block-content">
+ <div class="content">
<?php echo $this->getPagerHtml() ?>
<?php $suffix = $this->getNameInLayout(); ?>
- <ol id="widget-new-products-<?php echo $suffix; ?>">
- <?php foreach ($_products->getItems() as $_product): ?>
- <li class="item">
- <p class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></p>
- </li>
- <?php endforeach; ?>
+ <ol class="items" id="widget-new-products-<?php echo $suffix; ?>">
+ <?php foreach ($_products->getItems() as $_product): ?>
+ <li class="item">
+ <strong class="product name">
+ <a href="<?php echo $_product->getProductUrl() ?>"
+ title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)">
+ <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?>
+ </a>
+ </strong>
+ </li>
+ <?php endforeach; ?>
</ol>
- <script type="text/javascript">(function($) {$('#widget-new-products-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
</div>
</div>
-</div>
<?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/widget/new/content/new_grid.phtml b/app/code/Magento/Catalog/view/frontend/product/widget/new/content/new_grid.phtml
index bb0def3b601..c2dc1163d7e 100644
--- a/app/code/Magento/Catalog/view/frontend/product/widget/new/content/new_grid.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/widget/new/content/new_grid.phtml
@@ -18,49 +18,101 @@
* 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 (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
-<div class="widget widget-new-products">
- <div class="widget-title">
- <h2><?php echo __('New Products') ?></h2>
- </div>
- <div class="widget-products">
- <?php echo $this->getPagerHtml() ?>
- <?php $_columnCount = $this->getColumnCount(); ?>
- <?php $i=0; foreach ($_products->getItems() as $_product): ?>
- <?php if ($i++%$_columnCount==0): ?>
- <ul class="products-grid">
- <?php endif ?>
- <li class="item<?php if(($i-1)%$_columnCount==0): ?> first<?php elseif($i%$_columnCount==0): ?> last<?php endif; ?>">
- <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>" class="product-image"><img src="<?php echo $this->getSmallImageSidebarUrl($_product) ?>" width="<?php echo $this->getSmallImageSidebarSize() ?>" height="<?php echo $this->getSmallImageSidebarSize() ?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
- <h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></h3>
- <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
- <?php echo $this->getPriceHtml($_product, true, '-widget-new-grid') ?>
- <div class="actions">
- <?php if ($_product->isSaleable()): ?>
- <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo __('Add to Cart') ?></span></span></button>
- <?php else: ?>
- <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <ul class="add-to-links" data-role="add-to-links">
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
- <li><a href="<?php echo $this->getAddToWishlistUrl($_product) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a></li>
- <?php endif; ?>
- <?php if($_compareUrl=$this->getAddToCompareUrl($_product)): ?>
- <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
- <?php endif; ?>
- </ul>
- </div>
- </li>
- <?php if ($i%$_columnCount==0 || $i==count($_products)): ?>
- </ul>
- <?php endif ?>
- <?php endforeach; ?>
+<?php
+if ($exist = ($this->getProductCollection() && $this->getProductCollection()->getSize())) {
+ $type = 'widget-new-grid';
+
+ $class = 'widget new grid';
+
+ $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+ $image ='new_products_content_widget_grid';
+ $title = __('New Products');
+ $items = $this->getProductCollection()->getItems();
+
+ $showWishlist = true;
+ $showCompare = true;
+ $showCart = true;
+ $rating = true;
+ $description = false;
+}
+?>
+
+<?php if ($exist):?>
+ <div class="block <?php echo $class; ?>">
+ <div class="title">
+ <strong><?php echo $title; ?></strong>
+ </div>
+ <div class="content">
+ <?php echo $this->getPagerHtml() ?>
+ <?php echo '<!-- ' . $image . '-->' ?>
+ <ol class="products list items <?php echo $type; ?>">
+ <?php $iterator = 1; ?>
+ <?php foreach($items as $_item): ?>
+ <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+ <div class="product">
+ <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
+ <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
+ </a>
+ <div class="product details">
+ <strong class="product name">
+ <a title="<?php echo $this->escapeHtml($_item->getName()) ?>"
+ href="<?php echo $this->getProductUrl($_item) ?>">
+ <?php echo $this->escapeHtml($_item->getName()) ?>
+ </a>
+ </strong>
+ <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
+
+ <?php if ($_item->getRatingSummary() && $rating): ?>
+ <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
+ <?php endif; ?>
+
+ <?php if($showWishlist || $showCompare || $showCart): ?>
+ <div class="product actions">
+ <?php if($showCart): ?>
+ <div class="primary">
+ <?php if($_item->isSaleable()): ?>
+ <button class="action tocart"
+ data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_item) ?>'}}"
+ type="button" title="<?php echo __('Add to Cart') ?>">
+ <span><?php echo __('Add to Cart') ?></span>
+ </button>
+ <?php else: ?>
+ <?php if ($_item->getIsSalable()): ?>
+ <p class="stock available"><span><?php echo __('In stock') ?></span></p>
+ <?php else: ?>
+ <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
+ <?php endif; ?>
+ <?php endif; ?>
+ </div>
+ <?php endif; ?>
+ <?php if($showWishlist || $showCompare): ?>
+ <div class="secondary addto links">
+ <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+ <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>"
+ class="action towishlist" data-action="add-to-wishlist"
+ title="<?php echo __('Add to Wishlist') ?>">
+ <span><?php echo __('Add to Wishlist') ?></span>
+ </a>
+ <?php endif; ?>
+ <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
+ <a href="<?php echo $this->getAddToCompareUrl($_item) ?>"
+ class="action tocompare" title="<?php echo __('Add to Compare') ?>">
+ <span><?php echo __('Add to Compare') ?></span>
+ </a>
+ <?php endif; ?>
+ </div>
+ <?php endif; ?>
+ </div>
+ <?php endif; ?>
+ </div>
+ </div>
+ <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
+ <?php endforeach ?>
+ </ol>
+ </div>
</div>
-</div>
-<?php endif; ?>
+<?php endif;?>
diff --git a/app/code/Magento/Catalog/view/frontend/product/widget/new/content/new_list.phtml b/app/code/Magento/Catalog/view/frontend/product/widget/new/content/new_list.phtml
index 4b21c4133a5..b674bcb5c15 100644
--- a/app/code/Magento/Catalog/view/frontend/product/widget/new/content/new_list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/product/widget/new/content/new_list.phtml
@@ -18,46 +18,101 @@
* 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 (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
-<div class="widget widget-new-products">
- <div class="widget-title">
- <h2><?php echo __('New Products') ?></h2>
- </div>
- <div class="widget-products">
- <?php echo $this->getPagerHtml() ?>
- <ol class="products-list">
- <?php $i=0; foreach ($_products->getItems() as $_product): ?>
- <li class="item<?php echo (++$i == count($_products))?' last':''; ?>">
- <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>" class="product-image"><img src="<?php echo $this->getSmallImageSidebarUrl($_product) ?>" width="<?php echo $this->getSmallImageSidebarSize() ?>" height="<?php echo $this->getSmallImageSidebarSize() ?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
- <div class="product-shop">
- <div class="f-fix">
- <h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></h3>
- <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
- <?php echo $this->getPriceHtml($_product, true, '-widget-new-list') ?>
- <?php if ($_product->isSaleable()): ?>
- <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo __('Add to Cart') ?></span></span></button>
- <?php else: ?>
- <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <ul class="add-to-links" data-role="add-to-links">
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
- <li><a href="<?php echo $this->getAddToWishlistUrl($_product) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a></li>
+<?php
+if ($exist = ($this->getProductCollection() && $this->getProductCollection()->getSize())) {
+ $type = 'widget-new-list';
+
+ $class = 'widget new list';
+
+ $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+ $image ='new_products_content_widget_list';
+ $title = __('New Products');
+ $items = $this->getProductCollection()->getItems();
+
+ $showWishlist = true;
+ $showCompare = true;
+ $showCart = true;
+ $rating = true;
+ $description = true;
+}
+?>
+
+<?php if ($exist):?>
+ <div class="block <?php echo $class; ?>">
+ <div class="title">
+ <strong><?php echo $title; ?></strong>
+ </div>
+ <div class="content">
+ <?php echo $this->getPagerHtml() ?>
+ <?php echo '<!-- ' . $image . '-->' ?>
+ <ol class="products list items <?php echo $type; ?>">
+ <?php $iterator = 1; ?>
+ <?php foreach($items as $_item): ?>
+ <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+ <div class="product">
+ <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
+ <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
+ </a>
+ <div class="product details">
+ <strong class="product name">
+ <a title="<?php echo $this->escapeHtml($_item->getName()) ?>"
+ href="<?php echo $this->getProductUrl($_item) ?>">
+ <?php echo $this->escapeHtml($_item->getName()) ?>
+ </a>
+ </strong>
+ <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
+
+ <?php if ($_item->getRatingSummary() && $rating): ?>
+ <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
<?php endif; ?>
- <?php if($_compareUrl=$this->getAddToCompareUrl($_product)): ?>
- <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
+
+ <?php if($showWishlist || $showCompare || $showCart): ?>
+ <div class="product actions">
+ <?php if($showCart): ?>
+ <div class="primary">
+ <?php if($_item->isSaleable()): ?>
+ <button class="action tocart"
+ data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_item) ?>'}}"
+ type="button" title="<?php echo __('Add to Cart') ?>">
+ <span><?php echo __('Add to Cart') ?></span>
+ </button>
+ <?php else: ?>
+ <?php if ($_item->getIsSalable()): ?>
+ <p class="stock available"><span><?php echo __('In stock') ?></span></p>
+ <?php else: ?>
+ <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
+ <?php endif; ?>
+ <?php endif; ?>
+ </div>
+ <?php endif; ?>
+ <?php if($showWishlist || $showCompare): ?>
+ <div class="secondary addto links">
+ <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+ <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>"
+ class="action towishlist" data-action="add-to-wishlist"
+ title="<?php echo __('Add to Wishlist') ?>">
+ <span><?php echo __('Add to Wishlist') ?></span>
+ </a>
+ <?php endif; ?>
+ <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
+ <a href="<?php echo $this->getAddToCompareUrl($_item) ?>"
+ class="action tocompare" title="<?php echo __('Add to Compare') ?>">
+ <span><?php echo __('Add to Compare') ?></span>
+ </a>
+ <?php endif; ?>
+ </div>
+ <?php endif; ?>
+ </div>
<?php endif; ?>
- </ul>
+ </div>
</div>
- </div>
- </li>
- <?php endforeach; ?>
- </ol>
+ <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
+ <?php endforeach ?>
+ </ol>
+ </div>
</div>
-</div>
-<?php endif; ?>
+<?php endif;?>
diff --git a/app/code/Magento/Catalog/view/frontend/rss/product/price.phtml b/app/code/Magento/Catalog/view/frontend/rss/product/price.phtml
index f82bac064a9..9bec2cf9605 100644
--- a/app/code/Magento/Catalog/view/frontend/rss/product/price.phtml
+++ b/app/code/Magento/Catalog/view/frontend/rss/product/price.phtml
@@ -18,8 +18,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 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,7 +27,7 @@
/**
* Template for displaying product price in RSS feeds
*
- * @see \Magento\Catalog\Block\Product\Price
+ * @var $this \Magento\Catalog\Block\Product\Price
*/
?>
diff --git a/app/code/Magento/Catalog/view/frontend/widgets.css b/app/code/Magento/Catalog/view/frontend/widgets.css
index 40c76d0561b..cd054d6416f 100644
--- a/app/code/Magento/Catalog/view/frontend/widgets.css
+++ b/app/code/Magento/Catalog/view/frontend/widgets.css
@@ -22,33 +22,3 @@
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
-
-.widget .mini-products-images-list .product-image { display:block; width:76px; height:76px; border:1px solid #a9a9a9; margin:0 auto; }
-.widget .mini-products-images-list li.item { float:left; width:77px; height:77px; }
-
-/* Widget: Catalog New Proructs List */
-.widget-new-products { display:block; }
-.col-main .widget-new-products { margin:7px 0; }
-.widget-new-products .products-grid .product-image,
-.widget-new-products .products-list .product-image { width:85px; height:85px; }
-.widget-new-products .products-list .product-shop { margin-left:100px; }
-.sidebar .widget-new-products .block { font-size:11px; line-height:1.25; }
-.sidebar .widget-new-products .block-title strong { background:url(images/i_widget-new.gif) 0 1px no-repeat; padding-left:21px; color:#dc5033; }
-
-/* Widget: Catalog Product Link */
-.widget-product-link-inline { display:inline; }
-
-.col-main .widget-product-link { display:block; text-align:right; margin:7px 0; }
-.col-main .widget-product-link a { background:url(images/i_widget-link.gif) 100% 4px no-repeat; padding-right:15px; }
-
-.sidebar .widget-product-link { display:block; margin:0 0 15px; padding:0 10px; }
-.sidebar .widget-product-link a { background:url(images/i_widget-link.gif) 100% 4px no-repeat; padding:0 15px 0 0; }
-
-/* Widget: Catalog Category Link */
-.widget-category-link-inline { display:inline; }
-
-.col-main .widget-category-link { display:block; text-align:right; margin:7px 0; }
-.col-main .widget-category-link a { background:url(images/i_widget-link.gif) 100% 4px no-repeat; padding-right:15px; }
-
-.sidebar .widget-category-link { display:block; margin:0 0 15px; padding:0 10px; }
-.sidebar .widget-category-link a { background:url(images/i_widget-link.gif) 100% 4px no-repeat; padding:0 15px 0 0; }
diff --git a/app/code/Magento/Catalog/view/frontend/zoom.css b/app/code/Magento/Catalog/view/frontend/zoom.css
index 3946ee7708e..a89fd54fa0b 100644
--- a/app/code/Magento/Catalog/view/frontend/zoom.css
+++ b/app/code/Magento/Catalog/view/frontend/zoom.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 frontend image zoom
- * @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)
*/
diff --git a/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
new file mode 100644
index 00000000000..e6685fdc1f0
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
@@ -0,0 +1,64 @@
+<?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\CatalogInventory\Model\Adminhtml\Stock;
+
+/**
+ * Catalog Inventory Stock Model for adminhtml area
+ */
+class Item extends \Magento\CatalogInventory\Model\Stock\Item
+{
+ /**
+ * Getter for customer group id, return default group if not set
+ *
+ * @return int
+ */
+ public function getCustomerGroupId()
+ {
+ if ($this->_customerGroupId === null) {
+ return \Magento\Customer\Model\Group::CUST_GROUP_ALL;
+ }
+ return parent::getCustomerGroupId();
+ }
+
+ /**
+ * Check if qty check can be skipped. Skip checking in adminhtml area
+ *
+ * @return bool
+ */
+ protected function _isQtyCheckApplicable()
+ {
+ return false;
+ }
+
+ /**
+ * Check if notification message should be added despite of backorders notification flag
+ *
+ * @return bool
+ */
+ protected function _hasDefaultNotificationMessage()
+ {
+ return true;
+ }
+}
diff --git a/app/code/Magento/CatalogInventory/Model/Stock.php b/app/code/Magento/CatalogInventory/Model/Stock.php
index f81aa7e3570..8a8eb65a16c 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock.php
@@ -235,7 +235,7 @@ class Stock extends \Magento\Core\Model\AbstractModel
if ($item->getStoreId()) {
$stockItem->setStoreId($item->getStoreId());
}
- if ($stockItem->checkQty($item->getQtyOrdered()) || $this->_storeManager->getStore()->isAdmin()) {
+ if ($stockItem->checkQty($item->getQtyOrdered())) {
$stockItem->subtractQty($item->getQtyOrdered());
$stockItem->save();
}
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
index b3bb34fe97b..145e04d6ed7 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
@@ -126,7 +126,7 @@ class Item extends \Magento\Core\Model\AbstractModel
*
* @var int|null
*/
- protected $_customerGroupId;
+ protected $_customerGroupId = null;
/**
* Whether index events should be processed immediately
@@ -377,12 +377,15 @@ class Item extends \Magento\Core\Model\AbstractModel
}
/**
- * Getter for customer group id
+ * Getter for customer group id, return current customer group if not set
*
* @return int
*/
public function getCustomerGroupId()
{
+ if ($this->_customerGroupId === null) {
+ return $this->_customerSession->getCustomerGroupId();
+ }
return $this->_customerGroupId;
}
@@ -406,12 +409,6 @@ class Item extends \Magento\Core\Model\AbstractModel
public function getMinSaleQty()
{
$customerGroupId = $this->getCustomerGroupId();
- if (!$customerGroupId) {
- $customerGroupId = $this->_storeManager->getStore()->isAdmin()
- ? \Magento\Customer\Model\Group::CUST_GROUP_ALL
- : $this->_customerSession->getCustomerGroupId();
- }
-
if (!isset($this->_minSaleQtyCache[$customerGroupId])) {
$minSaleQty = $this->getUseConfigMinSaleQty()
? $this->_catalogInventoryMinsaleqty->getConfigValue($customerGroupId)
@@ -540,7 +537,7 @@ class Item extends \Magento\Core\Model\AbstractModel
*/
public function checkQty($qty)
{
- if (!$this->getManageStock() || $this->_storeManager->getStore()->isAdmin()) {
+ if (!$this->_isQtyCheckApplicable()) {
return true;
}
@@ -714,7 +711,7 @@ class Item extends \Magento\Core\Model\AbstractModel
__('We don\'t have "%1" in the requested quantity, so we\'ll back order the remaining %2.', $this->getProductName(), ($backorderQty * 1))
);
}
- } elseif ($this->_storeManager->getStore()->isAdmin()) {
+ } elseif ($this->_hasDefaultNotificationMessage()) {
$result->setMessage(
__('We don\'t have as many "%1" as you requested.', $this->getProductName())
);
@@ -997,4 +994,24 @@ class Item extends \Magento\Core\Model\AbstractModel
$this->_processIndexEvents = $process;
return $this;
}
+
+ /**
+ * Check if qty check can be skipped
+ *
+ * @return bool
+ */
+ protected function _isQtyCheckApplicable()
+ {
+ return (bool)$this->getManageStock();
+ }
+
+ /**
+ * Check if notification message should be added despite of backorders notification flag
+ *
+ * @return bool
+ */
+ protected function _hasDefaultNotificationMessage()
+ {
+ return false;
+ }
}
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure_type_configurable.xml b/app/code/Magento/CatalogInventory/etc/adminhtml/di.xml
similarity index 86%
rename from app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure_type_configurable.xml
rename to app/code/Magento/CatalogInventory/etc/adminhtml/di.xml
index 2f306b55b6e..537d35c6854 100644
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure_type_configurable.xml
+++ b/app/code/Magento/CatalogInventory/etc/adminhtml/di.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">
- <update handle="catalog_product_view_type_configurable"/>
-</layout>
+<config>
+ <preference for="Magento\CatalogInventory\Model\Stock\Item" type="Magento\CatalogInventory\Model\Adminhtml\Stock\Item" />
+</config>
diff --git a/app/code/Magento/CatalogInventory/view/frontend/qtyincrements.phtml b/app/code/Magento/CatalogInventory/view/frontend/qtyincrements.phtml
index 65c9e063dc0..60835877108 100644
--- a/app/code/Magento/CatalogInventory/view/frontend/qtyincrements.phtml
+++ b/app/code/Magento/CatalogInventory/view/frontend/qtyincrements.phtml
@@ -19,17 +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)
*/
/**
- * @see \Magento\CatalogInventory\Block\Qtyincrements
+ * @var $this \Magento\CatalogInventory\Block\Qtyincrements
*/
?>
<?php if ($this->getProductQtyIncrements()) : ?>
- <div class="product-pricing">
+ <div class="product pricing">
<?php echo __('%1 is available for purchase in increments of %2', $this->getProductName(), $this->getProductQtyIncrements()) ?>
</div>
<?php endif ?>
diff --git a/app/code/Magento/CatalogInventory/view/frontend/stockqty/composite.phtml b/app/code/Magento/CatalogInventory/view/frontend/stockqty/composite.phtml
index c9cd37644dc..21530c5adf2 100644
--- a/app/code/Magento/CatalogInventory/view/frontend/stockqty/composite.phtml
+++ b/app/code/Magento/CatalogInventory/view/frontend/stockqty/composite.phtml
@@ -19,42 +19,43 @@
* 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\CatalogInventory\Block\Stockqty\Composite
+ * @var $this \Magento\CatalogInventory\Block\Stockqty\Composite
*/
?>
<?php if($this->isMsgVisible()): ?>
- <p class="availability-only">
- <a href="#" data-mage-init='{toggleAdvanced: {selectorsToggleClass: "no-display", baseToggleClass: "expanded", toggleContainers: "#<?php echo $this->getDetailsPlaceholderId() ?>"}}'
- id="<?php echo $this->getPlaceholderId() ?>" title="<?php echo __('Only %1 left', ($this->getStockQty())) ?>"><?php echo __('Only %1 left', "<strong>{$this->getStockQty()}</strong>") ?></a>
- </p>
- <table id="<?php echo $this->getDetailsPlaceholderId() ?>" class="availability-only-details no-display">
- <col />
- <col width="1" />
- <thead>
- <tr>
- <th><?php echo __('Product Name') ?></th>
- <th class="a-center"><?php echo __('Qty') ?></th>
- </tr>
- </thead>
- <tbody>
- <?php foreach ($this->getChildProducts() as $childProduct) : ?>
- <?php $childProductStockQty = $this->getProductStockQty($childProduct); ?>
- <?php if ($childProductStockQty > 0) : ?>
+ <div class="availability only">
+ <a href="#"
+ data-mage-init='{toggleAdvanced: {selectorsToggleClass: "active", baseToggleClass: "expanded", toggleContainers: "#<?php echo $this->getDetailsPlaceholderId() ?>"}}'
+ id="<?php echo $this->getPlaceholderId() ?>"
+ title="<?php echo __('Only %1 left', ($this->getStockQty())) ?>"
+ class="action show">
+ <?php echo __('Only %1 left', "<strong>{$this->getStockQty()}</strong>") ?>
+ </a>
+ </div>
+ <div class="availability only detailed" id="<?php echo $this->getDetailsPlaceholderId() ?>">
+ <table class="data table">
+ <thead>
<tr>
- <td><?php echo $childProduct->getName() ?></td>
- <td class="a-center"><?php echo $childProductStockQty ?></td>
+ <th class="col item"><?php echo __('Product Name') ?></th>
+ <th class="col qty"><?php echo __('Qty') ?></th>
</tr>
- <?php endif ?>
- <?php endforeach ?>
- </tbody>
- </table>
- <script type="text/javascript">
- jQuery('#<?php echo $this->getDetailsPlaceholderId() ?>').decorate('table');
- </script>
+ </thead>
+ <tbody>
+ <?php foreach ($this->getChildProducts() as $childProduct) : ?>
+ <?php $childProductStockQty = $this->getProductStockQty($childProduct); ?>
+ <?php if ($childProductStockQty > 0) : ?>
+ <tr>
+ <td class="col item"><?php echo $childProduct->getName() ?></td>
+ <td class="col qty"><?php echo $childProductStockQty ?></td>
+ </tr>
+ <?php endif ?>
+ <?php endforeach ?>
+ </tbody>
+ </table>
+ </div>
<?php endif ?>
diff --git a/app/code/Magento/CatalogInventory/view/frontend/stockqty/default.phtml b/app/code/Magento/CatalogInventory/view/frontend/stockqty/default.phtml
index 5bf7d535622..e8b2fa71807 100644
--- a/app/code/Magento/CatalogInventory/view/frontend/stockqty/default.phtml
+++ b/app/code/Magento/CatalogInventory/view/frontend/stockqty/default.phtml
@@ -19,17 +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)
*/
/**
- * @see \Magento\CatalogInventory\Block\Stockqty\DefaultStockqty
+ * @var $this \Magento\CatalogInventory\Block\Stockqty\DefaultStockqty
*/
?>
<?php if($this->isMsgVisible()): ?>
- <p class="availability-only">
- <span title="<?php echo __('Only %1 left', ($this->getStockQty())) ?>"><?php echo __('Only %1 left', "<strong>{$this->getStockQty()}</strong>") ?></span>
- </p>
+ <div class="availability only" title="<?php echo __('Only %1 left', ($this->getStockQty())) ?>">
+ <?php echo __('Only %1 left', "<strong>{$this->getStockQty()}</strong>") ?>
+ </div>
<?php endif ?>
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Js.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Js.php
index 0354db80ea3..2f81946a4db 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Js.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Js.php
@@ -33,6 +33,6 @@
*/
namespace Magento\CatalogRule\Block\Adminhtml\Promo\Catalog\Edit;
-class Js extends \Magento\Adminhtml\Block\Template
+class Js extends \Magento\Backend\Block\Template
{
}
diff --git a/app/code/Magento/CatalogRule/Model/Resource/Rule.php b/app/code/Magento/CatalogRule/Model/Resource/Rule.php
index 9f37961ec2e..aaeaff41f80 100644
--- a/app/code/Magento/CatalogRule/Model/Resource/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/Resource/Rule.php
@@ -41,6 +41,11 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
*/
const SECONDS_IN_DAY = 86400;
+ /**
+ * @var \Magento\Logger
+ */
+ protected $_logger;
+
/**
* Store associated with rule entities information map
*
@@ -106,6 +111,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\Event\ManagerInterface $eventManager
* @param \Magento\CatalogRule\Helper\Data $catalogRuleData
+ * @param \Magento\Logger $logger
* @param \Magento\Stdlib\DateTime $dateTime
*/
public function __construct(
@@ -116,6 +122,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
\Magento\Eav\Model\Config $eavConfig,
\Magento\Event\ManagerInterface $eventManager,
\Magento\CatalogRule\Helper\Data $catalogRuleData,
+ \Magento\Logger $logger,
\Magento\Stdlib\DateTime $dateTime
) {
$this->_storeManager = $storeManager;
@@ -124,6 +131,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
$this->_eavConfig = $eavConfig;
$this->_eventManager = $eventManager;
$this->_catalogRuleData = $catalogRuleData;
+ $this->_logger = $logger;
$this->dateTime = $dateTime;
parent::__construct($resource);
}
@@ -396,7 +404,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
$select->join(
array('pp_default'=>$priceTable),
- sprintf($joinCondition, 'pp_default', \Magento\Core\Model\AppInterface::ADMIN_STORE_ID),
+ sprintf($joinCondition, 'pp_default', \Magento\Core\Model\Store::DEFAULT_STORE_ID),
array('default_price'=>'pp_default.value')
);
@@ -406,7 +414,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
if ($defaultGroup instanceof \Magento\Core\Model\Store\Group) {
$storeId = $defaultGroup->getDefaultStoreId();
} else {
- $storeId = \Magento\Core\Model\AppInterface::ADMIN_STORE_ID;
+ $storeId = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
}
$select->joinInner(
@@ -431,7 +439,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
if ($defaultGroup instanceof \Magento\Core\Model\Store\Group) {
$storeId = $defaultGroup->getDefaultStoreId();
} else {
- $storeId = \Magento\Core\Model\AppInterface::ADMIN_STORE_ID;
+ $storeId = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
}
$tableAlias = 'pp' . $websiteId;
@@ -594,6 +602,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
$write->commit();
} catch (\Exception $e) {
+ $this->_logger->logException($e);
$write->rollback();
throw $e;
}
diff --git a/app/code/Magento/CatalogSearch/view/frontend/advanced/form.phtml b/app/code/Magento/CatalogSearch/view/frontend/advanced/form.phtml
index fe58df5de93..d3303c56286 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/advanced/form.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/advanced/form.phtml
@@ -18,8 +18,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 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,68 +26,126 @@
/**
* Catalog advanced search form
*
- * @see \Magento\CatalogSearch\Block\Advanced\Form
+ * @var $this \Magento\CatalogSearch\Block\Advanced\Form
*/
?>
<?php $maxQueryLength= $this->helper('Magento\CatalogSearch\Helper\Data')->getMaxQueryLength();?>
-<div class="page-title">
- <h1><?php echo __('Catalog Advanced Search') ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<form action="<?php echo $this->getSearchPostUrl() ?>" method="get" id="form-validate">
- <div class="fieldset advanced-search">
- <h2 class="legend"><?php echo __('Search Settings') ?></h2>
- <ul class="form-list" id="advanced-search-list">
- <?php foreach ($this->getSearchableAttributes() as $_attribute): ?>
- <?php $_code = $_attribute->getAttributeCode() ?>
- <li>
- <label for="<?php echo $_code ?>"><?php echo $this->getAttributeLabel($_attribute) ?></label>
- <?php switch($this->getAttributeInputType($_attribute)):
- case 'number': ?>
- <div class="input-range">
- <input type="text" name="<?php echo $_code ?>[from]" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'from')) ?>" id="<?php echo $_code ?>" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>" class="input-text" maxlength="<?php echo $maxQueryLength;?>" data-validate="{number:true, 'less-than-equals-to':'#<?php echo $_code ?>_to'}" />
- <span class="separator">-</span>
- <input type="text" name="<?php echo $_code ?>[to]" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'to')) ?>" id="<?php echo $_code ?>_to" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>" class="input-text" maxlength="<?php echo $maxQueryLength;?>" data-validate="{number:true, 'greater-than-equals-to':'#<?php echo $_code ?>'}" />
+<form class="form search advanced" action="<?php echo $this->getSearchPostUrl() ?>" method="get" id="form-validate">
+<fieldset class="fieldset">
+ <legend class="legend"><span><?php echo __('Search Settings') ?></span></legend><br />
+ <?php foreach ($this->getSearchableAttributes() as $_attribute): ?>
+ <?php $_code = $_attribute->getAttributeCode() ?>
+ <div class="field <?php echo $_code ?>">
+ <label class="label" for="<?php echo $_code ?>">
+ <span><?php echo $this->getAttributeLabel($_attribute) ?></span>
+ </label>
+ <div class="control">
+ <?php switch($this->getAttributeInputType($_attribute)):
+ case 'number': ?>
+ <div class="range fields group group-2">
+ <div class="field no-label">
+ <div class="control">
+ <input type="text"
+ name="<?php echo $_code ?>[from]"
+ value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'from')) ?>"
+ id="<?php echo $_code ?>"
+ title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>"
+ class="input-text"
+ maxlength="<?php echo $maxQueryLength;?>"
+ data-validate="{number:true, 'less-than-equals-to':'#<?php echo $_code ?>_to'}" />
+ </div>
</div>
- <?php break;
- case 'price': ?>
- <div class="input-range">
- <input name="<?php echo $_code ?>[from]" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'from')) ?>" id="<?php echo $_code ?>" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>" class="input-text" type="text" maxlength="<?php echo $maxQueryLength;?>" data-validate="{number:true, 'less-than-equals-to':'#<?php echo $_code ?>_to'}" />
- <span class="separator">-</span>
- <input name="<?php echo $_code ?>[to]" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'to')) ?>" id="<?php echo $_code ?>_to" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>" class="input-text" type="text" maxlength="<?php echo $maxQueryLength;?>" data-validate="{number:true, 'greater-than-equals-to':'#<?php echo $_code ?>'}" />
- <small>(<?php echo $this->getCurrency($_attribute); ?>)</small>
+ <div class="field no-label">
+ <div class="control">
+ <input type="text"
+ name="<?php echo $_code ?>[to]"
+ value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'to')) ?>"
+ id="<?php echo $_code ?>_to"
+ title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>"
+ class="input-text"
+ maxlength="<?php echo $maxQueryLength;?>"
+ data-validate="{number:true, 'greater-than-equals-to':'#<?php echo $_code ?>'}" />
+ </div>
</div>
- <?php break;
- case 'select': ?>
- <div class="input-box">
- <?php echo $this->getAttributeSelectElement($_attribute) ?>
+ </div>
+ <?php break;
+ case 'price': ?>
+ <div class="range price fields group group-2">
+ <div class="field no-label">
+ <div class="control">
+ <input name="<?php echo $_code ?>[from]"
+ value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'from')) ?>"
+ id="<?php echo $_code ?>"
+ title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>"
+ class="input-text"
+ type="text"
+ maxlength="<?php echo $maxQueryLength;?>"
+ data-validate="{number:true, 'less-than-equals-to':'#<?php echo $_code ?>_to'}" />
</div>
- <?php break;
- case 'yesno': ?>
- <?php echo $this->getAttributeYesNoElement($_attribute) ?>
- <?php break;
- case 'date': ?>
- <div class="input-range">
- <?php echo $this->getDateInput($_attribute, 'from') ?>
- <span class="separator">-</span>
- <?php echo $this->getDateInput($_attribute, 'to') ?>
</div>
- <?php break;
- default: ?>
- <div class="input-box">
- <input type="text" name="<?php echo $_code ?>" id="<?php echo $_code ?>" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute)) ?>" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>" class="input-text <?php echo $this->getAttributeValidationClass($_attribute) ?>" maxlength="<?php echo $maxQueryLength;?>" />
+ <div class="field with-addon no-label">
+ <div class="control">
+ <div class="addon">
+ <input name="<?php echo $_code ?>[to]"
+ value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'to')) ?>"
+ id="<?php echo $_code ?>_to"
+ title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>"
+ class="input-text"
+ type="text"
+ maxlength="<?php echo $maxQueryLength;?>"
+ data-validate="{number:true, 'greater-than-equals-to':'#<?php echo $_code ?>'}" />
+ <label class="addafter"
+ for="<?php echo $_code ?>_to">
+ <?php echo $this->getCurrency($_attribute); ?>
+ </label>
+ </div>
+ </div>
</div>
- <?php endswitch; ?>
- </li>
- <?php endforeach; ?>
- </ul>
- <script type="text/javascript">(function($) {$('#advanced-search-list').decorate('list')})(jQuery)</script>
- </div>
- <div class="buttons-set">
- <button type="submit" title="<?php echo __('Search') ?>" class="button"><span><span><?php echo __('Search') ?></span></span></button>
- </div>
+ </div>
+ <?php break;
+ case 'select': ?>
+ <?php echo $this->getAttributeSelectElement($_attribute) ?>
+ <?php break;
+ case 'yesno': ?>
+ <?php echo $this->getAttributeYesNoElement($_attribute) ?>
+ <?php break;
+ case 'date': ?>
+ <div class="range dates fields group group-2">
+ <div class="field date no-label">
+ <div class="control">
+ <?php echo $this->getDateInput($_attribute, 'from') ?>
+ </div>
+ </div>
+ <div class="field date no-label">
+ <div class="control">
+ <?php echo $this->getDateInput($_attribute, 'to') ?>
+ </div>
+ </div>
+ </div>
+ <?php break;
+ default: ?>
+ <input type="text"
+ name="<?php echo $_code ?>"
+ id="<?php echo $_code ?>"
+ value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute)) ?>"
+ title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>"
+ class="input-text <?php echo $this->getAttributeValidationClass($_attribute) ?>"
+ maxlength="<?php echo $maxQueryLength;?>" />
+ <?php endswitch; ?>
+ </div>
+ </div>
+ <?php endforeach; ?>
+</fieldset>
+<div class="actions">
+ <button type="submit"
+ class="action search"
+ title="<?php echo __('Search') ?>">
+ <span><?php echo __('Search') ?></span>
+ </button>
+</div>
</form>
<script type="text/javascript">
+ //<![CDATA[
(function($) {
head.js(
"<?php echo $this->getViewFileUrl('jquery/jquery.validate.js') ?>",
@@ -100,7 +156,7 @@
$('#form-validate').validation({
errorPlacement: function (error, element) {
var parent = element.parent();
- if (parent.hasClass('input-range')) {
+ if (parent.hasClass('range')) {
parent.find(this.errorElement + '.' + this.errorClass).remove().end().append(error);
} else {
error.insertAfter(element);
@@ -113,4 +169,5 @@
});
});
})(jQuery);
+ //]]>
</script>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/advanced/result.phtml b/app/code/Magento/CatalogSearch/view/frontend/advanced/result.phtml
index 432ef79ca58..3938edb1e6d 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/advanced/result.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/advanced/result.phtml
@@ -18,43 +18,43 @@
* 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 __('Catalog Advanced Search') ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
<?php if($this->getResultCount()): ?>
- <p class="advanced-search-amount">
- <?php echo __('<strong>%1 item(s)</strong> were found using the following search criteria.', $this->getResultCount()); ?>
- </p>
+ <div class="search found">
+ <?php echo __('<strong>%1 item(s)</strong> were found using the following search criteria', $this->getResultCount()); ?>
+ </div>
<?php else: ?>
- <p class="error-msg"><?php echo __('We didn\'t find any items using this search criteria.');?> <a href="<?php echo $this->getFormUrl(); ?>"><?php echo __('Modify your search'); ?></a></p>
+ <div class="message error">
+ <div>
+ <?php echo __('No items were found using the following search criteria.');?> <a href="<?php echo $this->getFormUrl(); ?>"><?php echo __('Modify your search'); ?></a>
+ </div>
+ </div>
<?php endif; ?>
-<div class="advanced-search-summary">
- <?php $searchCriterias=$this->getSearchCriterias(); ?>
- <?php foreach (array('left', 'right') as $side): ?>
- <?php if(@$searchCriterias[$side]): ?>
- <ul>
- <?php foreach($searchCriterias[$side] as $criteria): ?>
- <li><strong><?php echo $this->escapeHtml(__($criteria['name'])); ?>:</strong> <?php echo $this->escapeHtml($criteria['value']); ?></li>
- <?php endforeach; ?>
- </ul>
- <?php endif; ?>
- <?php endforeach; ?>
- <?php if($this->getResultCount()): ?>
- <p>
+<?php $searchCriterias=$this->getSearchCriterias(); ?>
+<div class="search summary">
+ <?php foreach (array('left', 'right') as $side): ?>
+ <?php if(@$searchCriterias[$side]): ?>
+ <ul class="items">
+ <?php foreach($searchCriterias[$side] as $criteria): ?>
+ <li class="item"><strong><?php echo $this->escapeHtml(__($criteria['name'])); ?>:</strong> <?php echo $this->escapeHtml($criteria['value']); ?></li>
+ <?php endforeach; ?>
+ </ul>
+ <?php endif; ?>
+ <?php endforeach; ?>
+</div>
+<?php if($this->getResultCount()): ?>
+ <div class="message notice">
+ <div>
<?php echo __("Don't see what you're looking for?"); ?>
<a href="<?php echo $this->getFormUrl(); ?>"><?php echo __('Modify your search'); ?></a>
- </p>
- <?php endif; ?>
-</div>
+ </div>
+ </div>
+<?php endif; ?>
<?php if($this->getResultCount()): ?>
- <?php echo $this->getProductListHtml() ?>
+ <div class="search results"><?php echo $this->getProductListHtml() ?></div>
<?php endif; ?>
<?php $this->getSearchCriterias(); ?>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/form-mini.js b/app/code/Magento/CatalogSearch/view/frontend/form-mini.js
index 33d501634ae..423c0ca6835 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/form-mini.js
+++ b/app/code/Magento/CatalogSearch/view/frontend/form-mini.js
@@ -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 catalogsearch search
- * @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)
*/
diff --git a/app/code/Magento/CatalogSearch/view/frontend/form.mini.phtml b/app/code/Magento/CatalogSearch/view/frontend/form.mini.phtml
index 34325028b58..3510ed3f34e 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/form.mini.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/form.mini.phtml
@@ -18,8 +18,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 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,25 +27,46 @@
/** @var $helper \Magento\CatalogSearch\Helper\Data */
$helper = $this->helper('Magento\CatalogSearch\Helper\Data');
?>
-<form id="search_mini_form" action="<?php echo $helper->getResultUrl() ?>" method="get">
- <div class="form-search">
- <label for="search"><?php echo __('Search:') ?></label>
- <input id="search" type="text" name="<?php echo $helper->getQueryParamName() ?>" value="<?php echo $helper->getEscapedQueryText() ?>" class="input-text" />
- <button type="submit" title="<?php echo __('Search') ?>" class="button"><span><span><?php echo __('Search') ?></span></span></button>
- <div id="search_autocomplete" class="search-autocomplete"></div>
- <script type="text/javascript">
- //<![CDATA[
- (function($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_CatalogSearch::form-mini.js')?>", function() {
- $('#search').catalogSearch({
- formSelector: '#search_mini_form',
- placeholder: '<?php echo __('Search entire store here...') ?>',
- url: '<?php echo $helper->getSuggestUrl() ?>',
- destinationSelector: '#search_autocomplete'
+<div class="block search">
+ <div class="title"><strong><?php echo __('Search'); ?></strong></div>
+ <div class="content search">
+ <form class="form minisearch" id="search_mini_form" action="<?php echo $helper->getResultUrl() ?>" method="get">
+ <div class="field search">
+ <label class="label" for="search"><?php echo __('Search'); ?></label>
+ <div class="control">
+ <input id="search"
+ type="text"
+ name="<?php echo $helper->getQueryParamName() ?>"
+ value="<?php echo $helper->getEscapedQueryText() ?>"
+ placeholder="<?php echo __('Search entire store here...'); ?>"
+ class="input-text"
+ autocomplete="off"/>
+ <div id="search_autocomplete" class="search autocomplete"></div>
+ <a class="action advanced" href="<?php echo $helper->getAdvancedSearchUrl(); ?>">
+ <?php echo __('Advanced Search'); ?>
+ </a>
+ </div>
+ </div>
+ <div class="actions">
+ <button type="submit"
+ title="<?php echo __('Search'); ?>"
+ class="action search">
+ <span><?php echo __('Search'); ?></span>
+ </button>
+ </div>
+ <script type="text/javascript">
+ //<![CDATA[
+ (function($) {
+ head.js("<?php echo $this->getViewFileUrl('Magento_CatalogSearch::form-mini.js')?>", function() {
+ $('#search').catalogSearch({
+ formSelector: '#search_mini_form',
+ url: '<?php echo $helper->getSuggestUrl() ?>',
+ destinationSelector: '#search_autocomplete'
+ });
});
- });
- })(jQuery);
- //]]>
- </script>
+ })(jQuery);
+ //]]>
+ </script>
+ </form>
</div>
-</form>
+</div>
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 5dc716342e9..5c6ebc268d9 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
@@ -24,11 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="root">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">2columns-right.phtml</argument>
- </action>
- </referenceBlock>
+ <update handle="page_one_column"/>
<referenceBlock name="head">
<action method="setTitle">
<argument translate="true" name="title" xsi:type="string">Advanced Search</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 39879244cb2..f9f661d884d 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
@@ -24,33 +24,18 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="page_two_columns_right"/>
+ <update handle="page_two_columns_left"/>
+ <referenceBlock name="page.main.title">
+ <action method="setPageTitle">
+ <argument translate="true" name="title" xsi:type="string">Catalog Advanced Search</argument>
+ </action>
+ </referenceBlock>
<referenceContainer name="content">
<block class="Magento\CatalogSearch\Block\Advanced\Result" name="catalogsearch_advanced_result" template="advanced/result.phtml">
<block class="Magento\Catalog\Block\Product\ListProduct" name="search_result_list" template="product/list.phtml">
<block class="Magento\Catalog\Block\Product\ProductList\Toolbar" name="product_list_toolbar" template="product/list/toolbar.phtml">
<block class="Magento\Page\Block\Html\Pager" name="product_list_toolbar_pager"/>
</block>
- <action method="addColumnCountLayoutDepend">
- <argument name="layout" xsi:type="string">empty</argument>
- <argument name="count" xsi:type="string">6</argument>
- </action>
- <action method="addColumnCountLayoutDepend">
- <argument name="layout" xsi:type="string">one_column</argument>
- <argument name="count" xsi:type="string">5</argument>
- </action>
- <action method="addColumnCountLayoutDepend">
- <argument name="layout" xsi:type="string">two_columns_left</argument>
- <argument name="count" xsi:type="string">4</argument>
- </action>
- <action method="addColumnCountLayoutDepend">
- <argument name="layout" xsi:type="string">two_columns_right</argument>
- <argument name="count" xsi:type="string">4</argument>
- </action>
- <action method="addColumnCountLayoutDepend">
- <argument name="layout" xsi:type="string">three_columns</argument>
- <argument name="count" xsi:type="string">3</argument>
- </action>
<action method="setToolbarBlockName">
<argument name="name" xsi:type="string">product_list_toolbar</argument>
</action>
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 4f59da57d67..81182cf4c0e 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
@@ -24,46 +24,25 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="root">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">3columns.phtml</argument>
- </action>
- </referenceBlock>
+ <update handle="page_two_columns_left"/>
<referenceContainer name="left">
- <block class="Magento\CatalogSearch\Block\Layer" name="catalogsearch.leftnav" after="currency" template="Magento_Catalog::layer/view.phtml"/>
+ <block class="Magento\CatalogSearch\Block\Layer" name="catalogsearch.leftnav" before="-" template="Magento_Catalog::layer/view.phtml"/>
</referenceContainer>
<referenceContainer name="content">
<block class="Magento\CatalogSearch\Block\Result" name="search.result" template="result.phtml">
<block class="Magento\Catalog\Block\Product\ListProduct" name="search_result_list" template="product/list.phtml">
+ <arguments>
+ <!-- If position of argument is depend on image size changable in VDE:
+ positions:list-secondary,grid-secondary,list-actions,grid-actions,list-primary,grid-primary
+ -->
+ <argument name="positioned" xsi:type="string">positions:list-secondary</argument>
+ </arguments>
<block class="Magento\Catalog\Block\Product\ProductList\Toolbar" name="product_list_toolbar" template="product/list/toolbar.phtml">
<block class="Magento\Page\Block\Html\Pager" name="product_list_toolbar_pager"/>
</block>
- <action method="addColumnCountLayoutDepend">
- <argument name="layout" xsi:type="string">empty</argument>
- <argument name="count" xsi:type="string">6</argument>
- </action>
- <action method="addColumnCountLayoutDepend">
- <argument name="layout" xsi:type="string">one_column</argument>
- <argument name="count" xsi:type="string">5</argument>
- </action>
- <action method="addColumnCountLayoutDepend">
- <argument name="layout" xsi:type="string">two_columns_left</argument>
- <argument name="count" xsi:type="string">4</argument>
- </action>
- <action method="addColumnCountLayoutDepend">
- <argument name="layout" xsi:type="string">two_columns_right</argument>
- <argument name="count" xsi:type="string">4</argument>
- </action>
- <action method="addColumnCountLayoutDepend">
- <argument name="layout" xsi:type="string">three_columns</argument>
- <argument name="count" xsi:type="string">3</argument>
- </action>
<action method="setToolbarBlockName">
<argument name="name" xsi:type="string">product_list_toolbar</argument>
</action>
- <action method="setPageLayout">
- <argument name="layout" xsi:type="string">three_columns</argument>
- </action>
</block>
<action method="setListOrders"/>
<action method="setListModes"/>
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 4eb92eddb8b..eb25e84c00e 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
@@ -24,14 +24,10 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <update handle="page_one_column"/>
<referenceBlock name="head">
<action method="setTitle">
- <argument translate="true" name="title" xsi:type="string">Search Terms</argument>
- </action>
- </referenceBlock>
- <referenceBlock name="root">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">1column.phtml</argument>
+ <argument translate="true" name="title" xsi:type="string">Popular Search Terms</argument>
</action>
</referenceBlock>
<referenceContainer name="content">
diff --git a/app/code/Magento/CatalogSearch/view/frontend/result.phtml b/app/code/Magento/CatalogSearch/view/frontend/result.phtml
index 3c21f96f269..8cc3982ee83 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/result.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/result.phtml
@@ -18,37 +18,35 @@
* 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->getResultCount()): ?>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<div class="page-title">
- <?php echo $this->getChildHtml('tagged_product_list_rss_link'); ?>
- <h1><?php echo ($this->getHeaderText() || $this->getHeaderText() === false) ? $this->getHeaderText() : __("Search results for '%1'", $this->helper('Magento\CatalogSearch\Helper\Data')->getEscapedQueryText()) ?></h1>
-</div>
+<?php echo $this->getChildHtml('tagged_product_list_rss_link'); ?>
+<div class="search results">
<?php if ($messages = $this->getNoteMessages()):?>
- <p class="note-msg">
- <?php foreach ($messages as $message):?>
- <?php echo $message?><br />
- <?php endforeach;?>
- </p>
+ <div class="message notice">
+ <div>
+ <?php foreach ($messages as $message):?>
+ <?php echo $message?><br />
+ <?php endforeach;?>
+ </div>
+ </div>
<?php endif; ?>
<?php echo $this->getProductListHtml() ?>
+</div>
<?php else: ?>
-<div class="page-title">
- <h1><?php echo ($this->getHeaderText() || $this->getHeaderText() === false) ? $this->getHeaderText() : __("Search results for '%1'", $this->helper('Magento\CatalogSearch\Helper\Data')->getEscapedQueryText()) ?></h1>
+
+<div class="message notice">
+ <div>
+ <?php echo ($this->getNoResultText()) ? $this->getNoResultText() : __('Your search returns no results.') ?>
+ <?php echo $this->getAdditionalHtml() ?>
+ <?php if ($messages = $this->getNoteMessages()):?>
+ <?php foreach ($messages as $message):?>
+ <br /><?php echo $message?>
+ <?php endforeach;?>
+ <?php endif; ?>
+ </div>
</div>
-<p class="note-msg">
- <?php echo ($this->getNoResultText()) ? $this->getNoResultText() : __('Your search returns no results.') ?>
- <?php echo $this->getAdditionalHtml() ?>
- <?php if ($messages = $this->getNoteMessages()):?>
- <?php foreach ($messages as $message):?>
- <br /><?php echo $message?>
- <?php endforeach;?>
- <?php endif; ?>
-</p>
<?php endif; ?>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/term.phtml b/app/code/Magento/CatalogSearch/view/frontend/term.phtml
index 7043064f3bb..97b4f45c05f 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/term.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/term.phtml
@@ -18,21 +18,23 @@
* 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 __('Popular Search Terms') ?></h1>
-</div>
<?php if( sizeof($this->getTerms()) > 0 ): ?>
- <ul class="tags-list">
+ <ul class="search terms">
<?php foreach ($this->getTerms() as $_term): ?>
- <li><a href="<?php echo $this->getSearchUrl($_term) ?>" style="font-size:<?php echo $_term->getRatio()*70+75 ?>%;"><?php echo $this->escapeHtml($_term->getName()) ?></a></li>
+ <li class="item">
+ <a href="<?php echo $this->getSearchUrl($_term) ?>"
+ style="font-size:<?php echo $_term->getRatio()*70+75 ?>%;">
+ <?php echo $this->escapeHtml($_term->getName()) ?>
+ </a>
+ </li>
<?php endforeach; ?>
</ul>
<?php else: ?>
- <p class="note-msg"><?php echo __('There are no search terms available.'); ?></p>
+ <div class="message notice">
+ <div><?php echo __('There are no search terms available.'); ?></div>
+ </div>
<?php endif; ?>
diff --git a/app/code/Magento/Centinel/Model/Service.php b/app/code/Magento/Centinel/Model/Service.php
index 6a934033724..d21950e74fd 100644
--- a/app/code/Magento/Centinel/Model/Service.php
+++ b/app/code/Magento/Centinel/Model/Service.php
@@ -80,14 +80,7 @@ class Service extends \Magento\Object
*
* @var \Magento\UrlInterface
*/
- protected $_backendUrl;
-
- /**
- * Frontend url
- *
- * @var \Magento\UrlInterface
- */
- protected $_frontendUrl;
+ protected $_url;
/**
* Centinel session
@@ -103,13 +96,6 @@ class Service extends \Magento\Object
*/
protected $_session;
- /**
- * Store manager
- *
- * @var \Magento\Core\Model\StoreManagerInterface
- */
- protected $_storeManager;
-
/**
* State factory
*
@@ -124,36 +110,38 @@ class Service extends \Magento\Object
*/
protected $_validationState;
+ /**
+ * @var string
+ */
+ protected $_urlPrefix;
+
/**
* @param \Magento\Centinel\Model\Config $config
* @param \Magento\Centinel\Model\Api $api
- * @param \Magento\UrlInterface $backendUrl
- * @param \Magento\UrlInterface $frontendUrl
+ * @param \Magento\UrlInterface $url
* @param \Magento\Core\Model\Session\AbstractSession $centinelSession
* @param \Magento\Core\Model\Session $session
- * @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\Centinel\Model\StateFactory $stateFactory
+ * @param string $urlPrefix
* @param array $data
*/
public function __construct(
\Magento\Centinel\Model\Config $config,
\Magento\Centinel\Model\Api $api,
- \Magento\UrlInterface $backendUrl,
- \Magento\UrlInterface $frontendUrl,
+ \Magento\UrlInterface $url,
\Magento\Core\Model\Session\AbstractSession $centinelSession,
\Magento\Core\Model\Session $session,
- \Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\Centinel\Model\StateFactory $stateFactory,
+ $urlPrefix = 'centinel/index/',
array $data = array()
) {
$this->_config = $config;
$this->_api = $api;
- $this->_backendUrl = $backendUrl;
- $this->_frontendUrl = $frontendUrl;
+ $this->_url = $url;
$this->_centinelSession = $centinelSession;
$this->_session = $session;
- $this->_storeManager = $storeManager;
$this->_stateFactory = $stateFactory;
+ $this->_urlPrefix = $urlPrefix;
parent::__construct($data);
}
@@ -170,11 +158,12 @@ class Service extends \Magento\Object
/**
* Generate checksum from all passed parameters
*
+ * @param string $paymentMethodCode
* @param string $cardType
* @param string $cardNumber
* @param string $cardExpMonth
* @param string $cardExpYear
- * @param double $amount
+ * @param float $amount
* @param string $currencyCode
* @return string
*/
@@ -190,7 +179,7 @@ class Service extends \Magento\Object
* @param bool $current
* @return string
*/
- private function _getUrl($suffix, $current = false)
+ protected function _getUrl($suffix, $current = false)
{
$params = array(
'_secure' => true,
@@ -198,11 +187,7 @@ class Service extends \Magento\Object
'form_key' => $this->_session->getFormKey(),
'isIframe' => true
);
- if ($this->_storeManager->getStore()->isAdmin()) {
- return $this->_backendUrl->getUrl('adminhtml/centinel_index/' . $suffix, $params);
- } else {
- return $this->_frontendUrl->getUrl('centinel/index/' . $suffix, $params);
- }
+ return $this->_url->getUrl($this->_urlPrefix . $suffix, $params);
}
/**
@@ -444,12 +429,12 @@ class Service extends \Magento\Object
return $validationState && $validationState->isAuthenticateSuccessful();
}
- /**
+ /**
* Export cmpi lookups and authentication information stored in session into array
*
* @param mixed $to
* @param array $map
- * @return mixed $to
+ * @return mixed
*/
public function exportCmpiData($to, $map = false)
{
diff --git a/app/code/Magento/Centinel/etc/adminhtml/di.xml b/app/code/Magento/Centinel/etc/adminhtml/di.xml
index 0d65b30b450..0d312b21fca 100644
--- a/app/code/Magento/Centinel/etc/adminhtml/di.xml
+++ b/app/code/Magento/Centinel/etc/adminhtml/di.xml
@@ -33,14 +33,14 @@
</param>
</virtualType>
<type name="Magento\Centinel\Model\Service">
- <param name="backendUrl">
+ <param name="url">
<instance type="Magento\Backend\Model\Url" />
</param>
- <param name="frontendUrl">
- <instance type="Magento\Core\Model\Url" />
- </param>
<param name="centinelSession">
<instance type="Magento\Core\Model\Session" />
</param>
+ <param name="urlPrefix">
+ <value>adminhtml/centinel_index/</value>
+ </param>
</type>
-</config>
\ No newline at end of file
+</config>
diff --git a/app/code/Magento/Checkout/Controller/Multishipping.php b/app/code/Magento/Checkout/Controller/Multishipping.php
index 740efd0d365..e85468dec2e 100644
--- a/app/code/Magento/Checkout/Controller/Multishipping.php
+++ b/app/code/Magento/Checkout/Controller/Multishipping.php
@@ -76,6 +76,26 @@ class Multishipping extends \Magento\Checkout\Controller\Action
return $this->_objectManager->get('Magento\Checkout\Model\Session');
}
+ /**
+ * @var \Magento\Core\Model\Url
+ */
+ protected $_urlBuilder;
+
+
+ /**
+ * @param \Magento\App\Action\Context $context
+ * @param \Magento\Customer\Model\Session $customerSession
+ * @param \Magento\Core\Model\Url $urlBuilder
+ */
+ public function __construct(
+ \Magento\App\Action\Context $context,
+ \Magento\Customer\Model\Session $customerSession,
+ \Magento\Core\Model\Url $urlBuilder
+ ) {
+ parent::__construct($context, $customerSession);
+ $this->_urlBuilder = $urlBuilder;
+ }
+
/**
* Dispatch request
*
@@ -196,7 +216,7 @@ class Multishipping extends \Magento\Checkout\Controller\Action
$registerForm->setShowAddressFields(true)
->setBackUrl($this->_getHelper()->getMSLoginUrl())
->setSuccessUrl($this->_getHelper()->getMSShippingAddressSavedUrl())
- ->setErrorUrl($this->_getHelper()->getCurrentUrl());
+ ->setErrorUrl($this->_urlBuilder->getCurrentUrl());
}
$this->_view->renderLayout();
diff --git a/app/code/Magento/Checkout/Helper/Cart.php b/app/code/Magento/Checkout/Helper/Cart.php
index eef0d2f0c94..b6182e3bff1 100644
--- a/app/code/Magento/Checkout/Helper/Cart.php
+++ b/app/code/Magento/Checkout/Helper/Cart.php
@@ -106,7 +106,7 @@ class Cart extends \Magento\Core\Helper\Url
*/
public function getAddUrl($product, $additional = array())
{
- $continueUrl = $this->_coreData->urlEncode($this->getCurrentUrl());
+ $continueUrl = $this->_coreData->urlEncode($this->_urlBuilder->getCurrentUrl());
$urlParamName = \Magento\App\Action\Action::PARAM_NAME_URL_ENCODED;
$routeParams = array(
@@ -134,7 +134,7 @@ class Cart extends \Magento\Core\Helper\Url
/**
* Retrieve url for remove product from cart
*
- * @param \Magento\Sales\Quote\Item $item
+ * @param \Magento\Sales\Model\Quote\Item $item
* @return string
*/
public function getRemoveUrl($item)
diff --git a/app/code/Magento/Checkout/Model/Type/Multishipping.php b/app/code/Magento/Checkout/Model/Type/Multishipping.php
index c7b60d8f68a..511a9ef8b88 100644
--- a/app/code/Magento/Checkout/Model/Type/Multishipping.php
+++ b/app/code/Magento/Checkout/Model/Type/Multishipping.php
@@ -234,7 +234,7 @@ class Multishipping extends \Magento\Checkout\Model\Type\AbstractType
}
/**
- * Require shiping rate recollect
+ * Require shipping rate recollect
*/
$address->setCollectShippingRates((boolean) $this->getCollectRatesFlag());
@@ -385,7 +385,7 @@ class Multishipping extends \Magento\Checkout\Model\Type\AbstractType
$quoteAddress->addItem($quoteItem, $qty);
}
/**
- * Require shiping rate recollect
+ * Require shipping rate recollect
*/
$quoteAddress->setCollectShippingRates((boolean) $this->getCollectRatesFlag());
}
diff --git a/app/code/Magento/Checkout/view/frontend/onepage/login.phtml b/app/code/Magento/Checkout/view/frontend/onepage/login.phtml
index a66ba381e91..084ebdadb56 100644
--- a/app/code/Magento/Checkout/view/frontend/onepage/login.phtml
+++ b/app/code/Magento/Checkout/view/frontend/onepage/login.phtml
@@ -54,7 +54,7 @@
<div class="actions">
<input name="context" type="hidden" value="checkout" />
<div class="primary">
- <button type="submit" class="action login"><span><?php echo __('Login') ?></span></button>
+ <button type="submit" class="action login" data-action="checkout-method-login"><span><?php echo __('Login') ?></span></button>
</div>
<div class="secondary">
<a class="action remind" href="<?php echo $this->helper('Magento\Customer\Helper\Data')->getForgotPasswordUrl()?>">
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Files.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Files.php
index 08c145f3c92..0e7ec3871ce 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Files.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Files.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content;
-class Files extends \Magento\Adminhtml\Block\Template
+class Files extends \Magento\Backend\Block\Template
{
/**
* Files collection object
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Newfolder.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Newfolder.php
index 2240478bf1c..1967872438c 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Newfolder.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Newfolder.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content;
-class Newfolder extends \Magento\Adminhtml\Block\Template
+class Newfolder extends \Magento\Backend\Block\Template
{
}
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php
index f6718737640..9cde9c297cc 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content/Uploader.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content;
-class Uploader extends \Magento\Adminhtml\Block\Media\Uploader
+class Uploader extends \Magento\Backend\Block\Media\Uploader
{
/**
* @var \Magento\Cms\Model\Wysiwyg\Images\Storage
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
index d828961cc21..f3b98b928f9 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Cms\Block\Adminhtml\Wysiwyg\Images;
-class Tree extends \Magento\Adminhtml\Block\Template
+class Tree extends \Magento\Backend\Block\Template
{
/**
* Core registry
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page.php b/app/code/Magento/Cms/Controller/Adminhtml/Page.php
index f3f9040ec45..12cdfe8a41f 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page.php
@@ -282,8 +282,8 @@ class Page extends \Magento\Backend\App\Action
{
$errorNo = true;
if (!empty($data['layout_update_xml']) || !empty($data['custom_layout_update_xml'])) {
- /** @var $validatorCustomLayout \Magento\Adminhtml\Model\LayoutUpdate\Validator */
- $validatorCustomLayout = $this->_objectManager->create('Magento\Adminhtml\Model\LayoutUpdate\Validator');
+ /** @var $validatorCustomLayout \Magento\Core\Model\Layout\Update\Validator */
+ $validatorCustomLayout = $this->_objectManager->create('Magento\Core\Model\Layout\Update\Validator');
if (!empty($data['layout_update_xml']) && !$validatorCustomLayout->isValid($data['layout_update_xml'])) {
$errorNo = false;
}
diff --git a/app/code/Magento/Cms/Model/Resource/Block.php b/app/code/Magento/Cms/Model/Resource/Block.php
index d15eb9f7910..654e972b2e8 100644
--- a/app/code/Magento/Cms/Model/Resource/Block.php
+++ b/app/code/Magento/Cms/Model/Resource/Block.php
@@ -202,7 +202,7 @@ class Block extends \Magento\Core\Model\Resource\Db\AbstractDb
if ($object->getStoreId()) {
$stores = array(
(int) $object->getStoreId(),
- \Magento\Core\Model\AppInterface::ADMIN_STORE_ID,
+ \Magento\Core\Model\Store::DEFAULT_STORE_ID,
);
$select->join(
@@ -227,7 +227,7 @@ class Block extends \Magento\Core\Model\Resource\Db\AbstractDb
public function getIsUniqueBlockToStores(\Magento\Core\Model\AbstractModel $object)
{
if ($this->_storeManager->hasSingleStore()) {
- $stores = array(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+ $stores = array(\Magento\Core\Model\Store::DEFAULT_STORE_ID);
} else {
$stores = (array)$object->getData('stores');
}
diff --git a/app/code/Magento/Cms/Model/Resource/Block/Collection.php b/app/code/Magento/Cms/Model/Resource/Block/Collection.php
index fd400139937..3fa548f1047 100644
--- a/app/code/Magento/Cms/Model/Resource/Block/Collection.php
+++ b/app/code/Magento/Cms/Model/Resource/Block/Collection.php
@@ -74,7 +74,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
}
if ($withAdmin) {
- $store[] = \Magento\Core\Model\AppInterface::ADMIN_STORE_ID;
+ $store[] = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
}
$this->addFilter('store', array('in' => $store), 'public');
diff --git a/app/code/Magento/Cms/Model/Resource/Page.php b/app/code/Magento/Cms/Model/Resource/Page.php
index 7226b38da31..0f3ebf954f4 100644
--- a/app/code/Magento/Cms/Model/Resource/Page.php
+++ b/app/code/Magento/Cms/Model/Resource/Page.php
@@ -238,7 +238,7 @@ class Page extends \Magento\Core\Model\Resource\Db\AbstractDb
$select = parent::_getLoadSelect($field, $value, $object);
if ($object->getStoreId()) {
- $storeIds = array(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID, (int)$object->getStoreId());
+ $storeIds = array(\Magento\Core\Model\Store::DEFAULT_STORE_ID, (int)$object->getStoreId());
$select->join(
array('cms_page_store' => $this->getTable('cms_page_store')),
$this->getMainTable() . '.page_id = cms_page_store.page_id',
@@ -287,7 +287,7 @@ class Page extends \Magento\Core\Model\Resource\Db\AbstractDb
public function getIsUniquePageToStores(\Magento\Core\Model\AbstractModel $object)
{
if ($this->_storeManager->hasSingleStore() || !$object->hasStores()) {
- $stores = array(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+ $stores = array(\Magento\Core\Model\Store::DEFAULT_STORE_ID);
} else {
$stores = (array)$object->getData('stores');
}
@@ -341,7 +341,7 @@ class Page extends \Magento\Core\Model\Resource\Db\AbstractDb
*/
public function checkIdentifier($identifier, $storeId)
{
- $stores = array(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID, $storeId);
+ $stores = array(\Magento\Core\Model\Store::DEFAULT_STORE_ID, $storeId);
$select = $this->_getLoadByIdentifierSelect($identifier, $stores, 1);
$select->reset(\Zend_Db_Select::COLUMNS)
->columns('cp.page_id')
@@ -359,7 +359,7 @@ class Page extends \Magento\Core\Model\Resource\Db\AbstractDb
*/
public function getCmsPageTitleByIdentifier($identifier)
{
- $stores = array(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+ $stores = array(\Magento\Core\Model\Store::DEFAULT_STORE_ID);
if ($this->_store) {
$stores[] = (int)$this->getStore()->getId();
}
diff --git a/app/code/Magento/Cms/Model/Resource/Page/Collection.php b/app/code/Magento/Cms/Model/Resource/Page/Collection.php
index e0b164fadc5..497c0fe1701 100644
--- a/app/code/Magento/Cms/Model/Resource/Page/Collection.php
+++ b/app/code/Magento/Cms/Model/Resource/Page/Collection.php
@@ -181,7 +181,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
}
if ($withAdmin) {
- $store[] = \Magento\Core\Model\AppInterface::ADMIN_STORE_ID;
+ $store[] = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
}
$this->addFilter('store', array('in' => $store), 'public');
diff --git a/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Load.php b/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Load.php
index 2b6f5a0095c..b08b467ba48 100644
--- a/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Load.php
+++ b/app/code/Magento/Connect/Block/Adminhtml/Extension/Custom/Edit/Tab/Load.php
@@ -34,7 +34,7 @@
namespace Magento\Connect\Block\Adminhtml\Extension\Custom\Edit\Tab;
class Load
- extends \Magento\Adminhtml\Block\Template
+ extends \Magento\Backend\Block\Template
{
/**
* Retrieve Grid Block HTML
diff --git a/app/code/Magento/Core/App/Request/PathInfoProcessor.php b/app/code/Magento/Core/App/Request/PathInfoProcessor.php
index 2c802b8bea5..6882236203d 100644
--- a/app/code/Magento/Core/App/Request/PathInfoProcessor.php
+++ b/app/code/Magento/Core/App/Request/PathInfoProcessor.php
@@ -50,7 +50,7 @@ class PathInfoProcessor implements \Magento\App\Request\PathInfoProcessorInterfa
$pathParts = explode('/', ltrim($pathInfo, '/'), 2);
$storeCode = $pathParts[0];
- $stores = $this->_storeManager->getStores(true, true);
+ $stores = $this->_storeManager->getStores(false, true);
if (isset($stores[$storeCode]) && $stores[$storeCode]->isUseStoreInUrl()) {
if (!$request->isDirectAccessFrontendName($storeCode)) {
$this->_storeManager->setCurrentStore($storeCode);
@@ -64,4 +64,4 @@ class PathInfoProcessor implements \Magento\App\Request\PathInfoProcessorInterfa
}
return $pathInfo;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/Magento/Core/Helper/Url.php b/app/code/Magento/Core/Helper/Url.php
index 14b93e86b45..b0f07d5f1b8 100644
--- a/app/code/Magento/Core/Helper/Url.php
+++ b/app/code/Magento/Core/Helper/Url.php
@@ -52,27 +52,6 @@ class Url extends \Magento\App\Helper\AbstractHelper
$this->_storeManager = $storeManager;
}
-
- /**
- * Retrieve current url
- *
- * @return string
- */
- public function getCurrentUrl()
- {
- $request = $this->_getRequest();
- $port = $this->_getRequest()->getServer('SERVER_PORT');
- if ($port) {
- $defaultPorts = array(
- \Magento\App\Request\Http::DEFAULT_HTTP_PORT,
- \Magento\App\Request\Http::DEFAULT_HTTPS_PORT
- );
- $port = (in_array($port, $defaultPorts)) ? '' : ':' . $port;
- }
- $url = $request->getScheme() . '://' . $request->getHttpHost() . $port . $request->getServer('REQUEST_URI');
- return $url;
- }
-
/**
* Retrieve current url in base64 encoding
*
@@ -80,13 +59,13 @@ class Url extends \Magento\App\Helper\AbstractHelper
*/
public function getCurrentBase64Url()
{
- return $this->urlEncode($this->getCurrentUrl());
+ return $this->urlEncode($this->_urlBuilder->getCurrentUrl());
}
public function getEncodedUrl($url = null)
{
if (!$url) {
- $url = $this->getCurrentUrl();
+ $url = $this->_urlBuilder->getCurrentUrl();
}
return $this->urlEncode($url);
}
@@ -151,8 +130,8 @@ class Url extends \Magento\App\Helper\AbstractHelper
public function removeRequestParam($url, $paramKey, $caseSensitive = false)
{
$regExpression = '/\\?[^#]*?(' . preg_quote($paramKey, '/') . '\\=[^#&]*&?)/' . ($caseSensitive ? '' : 'i');
- while (preg_match($regExpression, $url, $mathes) != 0) {
- $paramString = $mathes[1];
+ while (preg_match($regExpression, $url, $matches) != 0) {
+ $paramString = $matches[1];
if (preg_match('/&$/', $paramString) == 0) {
$url = preg_replace('/(&|\\?)?' . preg_quote($paramString, '/') . '/', '', $url);
} else {
diff --git a/app/code/Magento/Core/Model/AbstractModel.php b/app/code/Magento/Core/Model/AbstractModel.php
index 87b274e927a..92892941e13 100644
--- a/app/code/Magento/Core/Model/AbstractModel.php
+++ b/app/code/Magento/Core/Model/AbstractModel.php
@@ -193,7 +193,7 @@ abstract class AbstractModel extends \Magento\Object
public function __sleep()
{
$properties = array_keys(get_object_vars($this));
- $properties = array_diff($properties, array('_eventManager', '_cacheManager', '_coreRegistry'));
+ $properties = array_diff($properties, array('_eventManager', '_cacheManager', '_coreRegistry', '_appState'));
return $properties;
}
@@ -206,6 +206,10 @@ abstract class AbstractModel extends \Magento\Object
$this->_eventManager = $objectManager->get('Magento\Event\ManagerInterface');
$this->_cacheManager = $objectManager->get('Magento\App\CacheInterface');
$this->_coreRegistry = $objectManager->get('Magento\Core\Model\Registry');
+ $context = $objectManager->get('Magento\Core\Model\Context');
+ if ($context instanceof \Magento\Core\Model\Context) {
+ $this->_appState = $context->getAppState();
+ }
}
/**
@@ -353,7 +357,7 @@ abstract class AbstractModel extends \Magento\Object
/**
* Check whether model has changed data.
* Can be overloaded in child classes to perform advanced check whether model needs to be saved
- * e.g. usign resouceModel->hasDataChanged() or any other technique
+ * e.g. using resourceModel->hasDataChanged() or any other technique
*
* @return boolean
*/
@@ -637,10 +641,7 @@ abstract class AbstractModel extends \Magento\Object
if ($this->_coreRegistry->registry('isSecureArea')) {
return;
}
- /* Store manager does not work well in this place when injected via context */
- if (!\Magento\App\ObjectManager::getInstance()
- ->get('Magento\Core\Model\StoreManager')->getStore()->isAdmin()
- ) {
+ if ($this->_appState->getAreaCode() !== \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE) {
throw new \Magento\Core\Exception(__('Cannot complete this operation from non-admin area.'));
}
}
@@ -680,7 +681,7 @@ abstract class AbstractModel extends \Magento\Object
}
/**
- * Retreive entity id
+ * Retrieve entity id
*
* @return mixed
*/
diff --git a/app/code/Magento/Core/Model/App.php b/app/code/Magento/Core/Model/App.php
index 19ea96827e3..2249f819179 100644
--- a/app/code/Magento/Core/Model/App.php
+++ b/app/code/Magento/Core/Model/App.php
@@ -53,7 +53,7 @@ class App implements \Magento\Core\Model\AppInterface
/**
* Magento version
*/
- const VERSION = '2.0.0.0-dev53';
+ const VERSION = '2.0.0.0-dev54';
/**
@@ -801,7 +801,7 @@ class App implements \Magento\Core\Model\AppInterface
'revision' => '0',
'patch' => '0',
'stability' => 'dev',
- 'number' => '53',
+ 'number' => '54',
);
}
}
diff --git a/app/code/Magento/Core/Model/App/Emulation.php b/app/code/Magento/Core/Model/App/Emulation.php
index c623c2e632b..32fda75c306 100644
--- a/app/code/Magento/Core/Model/App/Emulation.php
+++ b/app/code/Magento/Core/Model/App/Emulation.php
@@ -72,6 +72,11 @@ class Emulation extends \Magento\Object
*/
protected $_design;
+ /**
+ * @var \Magento\Core\Model\Translate\Inline\ConfigFactory
+ */
+ protected $_configFactory;
+
/**
* @param \Magento\Core\Model\App $app
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
@@ -80,6 +85,7 @@ class Emulation extends \Magento\Object
* @param \Magento\Core\Model\Translate $translate
* @param \Magento\Core\Helper\Translate $helperTranslate
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
+ * @param \Magento\Core\Model\Translate\Inline\ConfigFactory $configFactory
* @param \Magento\Core\Model\LocaleInterface $locale
* @param array $data
*/
@@ -91,6 +97,7 @@ class Emulation extends \Magento\Object
\Magento\Core\Model\Translate $translate,
\Magento\Core\Helper\Translate $helperTranslate,
\Magento\Core\Model\Store\Config $coreStoreConfig,
+ \Magento\Core\Model\Translate\Inline\ConfigFactory $configFactory,
\Magento\Core\Model\LocaleInterface $locale,
array $data = array()
) {
@@ -103,6 +110,7 @@ class Emulation extends \Magento\Object
$this->_translate = $translate;
$this->_helperTranslate = $helperTranslate;
$this->_coreStoreConfig = $coreStoreConfig;
+ $this->_configFactory = $configFactory;
}
/**
@@ -139,7 +147,7 @@ class Emulation extends \Magento\Object
}
/**
- * Stop enviromment emulation
+ * Stop environment emulation
*
* Function restores initial store environment
*
@@ -173,11 +181,7 @@ class Emulation extends \Magento\Object
if (is_null($storeId)) {
$newTranslateInline = false;
} else {
- if ($area == \Magento\Core\Model\App\Area::AREA_ADMIN) {
- $newTranslateInline = $this->_coreStoreConfig->getConfigFlag('dev/translate_inline/active_admin', $storeId);
- } else {
- $newTranslateInline = $this->_coreStoreConfig->getConfigFlag('dev/translate_inline/active', $storeId);
- }
+ $newTranslateInline = $this->_configFactory->create($area)->isActive($storeId);
}
$translateInline = $this->_translate->getTranslateInline();
$this->_translate->setTranslateInline($newTranslateInline);
diff --git a/app/code/Magento/Core/Model/AppInterface.php b/app/code/Magento/Core/Model/AppInterface.php
index 7b57c3fffaa..f786cdadd97 100644
--- a/app/code/Magento/Core/Model/AppInterface.php
+++ b/app/code/Magento/Core/Model/AppInterface.php
@@ -44,12 +44,6 @@ interface AppInterface extends \Magento\Core\Model\StoreManagerInterface
*/
const DISTRO_STORE_CODE = \Magento\Core\Model\Store::DEFAULT_CODE;
- /**
- * Admin store Id
- *
- */
- const ADMIN_STORE_ID = 0;
-
/**
* Dependency injection configuration node name
*/
diff --git a/app/code/Magento/Core/Model/Context.php b/app/code/Magento/Core/Model/Context.php
index e33bca05e77..a35ecc64acc 100644
--- a/app/code/Magento/Core/Model/Context.php
+++ b/app/code/Magento/Core/Model/Context.php
@@ -43,7 +43,6 @@ class Context implements \Magento\ObjectManager\ContextInterface
protected $_logger;
/**
- * @param \Magento\Logger $logger
* @var \Magento\App\State
*/
protected $_appState;
diff --git a/app/code/Magento/Core/Model/Cookie.php b/app/code/Magento/Core/Model/Cookie.php
index aab242c8313..ed1271fbaba 100644
--- a/app/code/Magento/Core/Model/Cookie.php
+++ b/app/code/Magento/Core/Model/Cookie.php
@@ -219,15 +219,11 @@ class Cookie
/**
* Is https secure request
- * Use secure on adminhtml only
*
* @return bool
*/
public function isSecure()
{
- if ($this->getStore()->isAdmin()) {
- return $this->_getRequest()->isSecure();
- }
return false;
}
@@ -307,7 +303,7 @@ class Cookie
/**
* Retrieve cookie or false if not exists
*
- * @param string $neme The cookie name
+ * @param string $name The cookie name
* @return mixed
*/
public function get($name = null)
diff --git a/app/code/Magento/Core/Model/EntityFactory.php b/app/code/Magento/Core/Model/EntityFactory.php
index 0a2d1c3542c..0b73590c276 100644
--- a/app/code/Magento/Core/Model/EntityFactory.php
+++ b/app/code/Magento/Core/Model/EntityFactory.php
@@ -24,7 +24,7 @@
namespace Magento\Core\Model;
-class EntityFactory
+class EntityFactory implements \Magento\Data\Collection\EntityFactoryInterface
{
/**
* Object Manager instance
diff --git a/app/code/Magento/Core/Model/File/Storage.php b/app/code/Magento/Core/Model/File/Storage.php
index 3ae1327c444..a7ce7e97cb0 100644
--- a/app/code/Magento/Core/Model/File/Storage.php
+++ b/app/code/Magento/Core/Model/File/Storage.php
@@ -38,7 +38,7 @@ class Storage extends \Magento\Core\Model\AbstractModel
const STORAGE_MEDIA_DATABASE = 1;
/**
- * Config pathes for storing storage configuration
+ * Config paths for storing storage configuration
*/
const XML_PATH_STORAGE_MEDIA = 'system/media_storage_configuration/media_storage';
const XML_PATH_STORAGE_MEDIA_DATABASE = 'system/media_storage_configuration/media_database';
diff --git a/app/code/Magento/Core/Model/Layout.php b/app/code/Magento/Core/Model/Layout.php
index c5eddc4c0a2..9afb7c7a3b3 100644
--- a/app/code/Magento/Core/Model/Layout.php
+++ b/app/code/Magento/Core/Model/Layout.php
@@ -361,7 +361,6 @@ class Layout extends \Magento\Simplexml\Config implements \Magento\View\LayoutIn
/**
* Retrieve layout area
*
- * @deparecated
* @return string
*/
public function getArea()
diff --git a/app/code/Magento/Core/Model/Layout/Argument/AbstractHandler.php b/app/code/Magento/Core/Model/Layout/Argument/AbstractHandler.php
index 4c404907103..2c72abf591a 100644
--- a/app/code/Magento/Core/Model/Layout/Argument/AbstractHandler.php
+++ b/app/code/Magento/Core/Model/Layout/Argument/AbstractHandler.php
@@ -61,7 +61,7 @@ abstract class AbstractHandler
}
/**
- * Check whether updater used and value not overwriten
+ * Check whether updater used and value not overwritten
*
* @param \Magento\View\Layout\Element $argument
* @return string
diff --git a/app/code/Magento/Core/Model/Layout/Argument/Handler/ArrayHandler.php b/app/code/Magento/Core/Model/Layout/Argument/Handler/ArrayHandler.php
index 89d68ef43cd..3927a804aed 100644
--- a/app/code/Magento/Core/Model/Layout/Argument/Handler/ArrayHandler.php
+++ b/app/code/Magento/Core/Model/Layout/Argument/Handler/ArrayHandler.php
@@ -91,7 +91,7 @@ class ArrayHandler extends \Magento\Core\Model\Layout\Argument\AbstractHandler
}
/**
- * Retrive value from Array argument
+ * Retrieve value from Array argument
*
* @param \Magento\View\Layout\Element $argument
* @return array|null
diff --git a/app/code/Magento/Core/Model/Layout/Merge.php b/app/code/Magento/Core/Model/Layout/Merge.php
index 9ee6813d4b5..3975d5a91f9 100644
--- a/app/code/Magento/Core/Model/Layout/Merge.php
+++ b/app/code/Magento/Core/Model/Layout/Merge.php
@@ -114,7 +114,7 @@ class Merge implements \Magento\View\Layout\ProcessorInterface
protected $_cache;
/**
- * @var \Magento\Adminhtml\Model\LayoutUpdate\Validator
+ * @var \Magento\Core\Model\Layout\Update\Validator
*/
protected $_layoutValidator;
@@ -132,7 +132,7 @@ class Merge implements \Magento\View\Layout\ProcessorInterface
* @param \Magento\Core\Model\Resource\Layout\Update $resource
* @param \Magento\App\State $appState
* @param \Magento\Cache\FrontendInterface $cache
- * @param \Magento\Adminhtml\Model\LayoutUpdate\Validator $validator
+ * @param \Magento\Core\Model\Layout\Update\Validator $validator
* @param \Magento\Logger $logger
* @param \Magento\View\Design\ThemeInterface $theme Non-injectable theme instance
*/
@@ -143,7 +143,7 @@ class Merge implements \Magento\View\Layout\ProcessorInterface
\Magento\Core\Model\Resource\Layout\Update $resource,
\Magento\App\State $appState,
\Magento\Cache\FrontendInterface $cache,
- \Magento\Adminhtml\Model\LayoutUpdate\Validator $validator,
+ \Magento\Core\Model\Layout\Update\Validator $validator,
\Magento\Logger $logger,
\Magento\View\Design\ThemeInterface $theme = null
) {
@@ -373,7 +373,7 @@ class Merge implements \Magento\View\Layout\ProcessorInterface
if ($this->_appState->getMode() === \Magento\App\State::MODE_DEVELOPER) {
if (!$this->_layoutValidator->isValid(
$layout,
- \Magento\Adminhtml\Model\LayoutUpdate\Validator::LAYOUT_SCHEMA_MERGED,
+ \Magento\Core\Model\Layout\Update\Validator::LAYOUT_SCHEMA_MERGED,
false
)) {
$messages = $this->_layoutValidator->getMessages();
@@ -592,11 +592,17 @@ class Merge implements \Magento\View\Layout\ProcessorInterface
$layoutStr = '';
$theme = $this->_getPhysicalTheme($this->_theme);
$updateFiles = $this->_fileSource->getFiles($theme);
+ $useErrors = libxml_use_internal_errors(true);
foreach ($updateFiles as $file) {
- $fileStr = file_get_contents($file->getFilename());
+ $fileStr = (string)file_get_contents($file->getFilename());
$fileStr = $this->_substitutePlaceholders($fileStr);
/** @var $fileXml \Magento\View\Layout\Element */
$fileXml = $this->_loadXmlString($fileStr);
+ if (!$fileXml instanceof \Magento\View\Layout\Element) {
+ $this->_logXmlErrors($file->getFilename(), libxml_get_errors());
+ libxml_clear_errors();
+ continue;
+ }
if (!$file->isBase() && $fileXml->xpath(self::XPATH_HANDLE_DECLARATION)) {
throw new \Magento\Exception(sprintf(
"Theme layout update file '%s' must not declare page types.",
@@ -608,11 +614,34 @@ class Merge implements \Magento\View\Layout\ProcessorInterface
$handleStr = '<handle ' . $handleAttributes . '>' . $fileXml->innerXml() . '</handle>';
$layoutStr .= $handleStr;
}
+ libxml_use_internal_errors($useErrors);
$layoutStr = '<layouts xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">' . $layoutStr . '</layouts>';
$layoutXml = $this->_loadXmlString($layoutStr);
return $layoutXml;
}
+ /**
+ * Log xml errors to system log
+ *
+ * @param string $fileName
+ * @param array $libXmlErrors
+ */
+ protected function _logXmlErrors($fileName, $libXmlErrors)
+ {
+ $errors = array();
+ if (count($libXmlErrors)) {
+ foreach ($libXmlErrors as $error) {
+ $errors[] = "{$error->message} Line: {$error->line}";
+ }
+
+ $this->_logger->log(sprintf(
+ "Theme layout update file '%s' is not valid.\n%s",
+ $fileName,
+ implode("\n", $errors)
+ ), \Zend_Log::ERR);
+ }
+ }
+
/**
* Find the closest physical theme among ancestors and a theme itself
*
diff --git a/app/code/Magento/Adminhtml/Model/LayoutUpdate/Validator.php b/app/code/Magento/Core/Model/Layout/Update/Validator.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Model/LayoutUpdate/Validator.php
rename to app/code/Magento/Core/Model/Layout/Update/Validator.php
index f0225f5f5b1..cbef69f550a 100644
--- a/app/code/Magento/Adminhtml/Model/LayoutUpdate/Validator.php
+++ b/app/code/Magento/Core/Model/Layout/Update/Validator.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @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)
*/
@@ -31,10 +31,10 @@
* Validator checked XML validation and protected expressions
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Core
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Model\LayoutUpdate;
+namespace Magento\Core\Model\Layout\Update;
class Validator extends \Zend_Validate_Abstract
{
@@ -103,7 +103,7 @@ class Validator extends \Zend_Validate_Abstract
/**
* Initialize messages templates with translating
*
- * @return \Magento\Adminhtml\Model\LayoutUpdate\Validator
+ * @return \Magento\Core\Model\Layout\Update\Validator
*/
protected function _initMessageTemplates()
{
diff --git a/app/code/Magento/Core/Model/Locale.php b/app/code/Magento/Core/Model/Locale.php
index a27a76729a4..081cb07ce79 100644
--- a/app/code/Magento/Core/Model/Locale.php
+++ b/app/code/Magento/Core/Model/Locale.php
@@ -172,7 +172,7 @@ class Locale implements \Magento\Core\Model\LocaleInterface
}
/**
- * REtrieve default locale code
+ * Retrieve default locale code
*
* @return string
*/
@@ -670,7 +670,7 @@ class Locale implements \Magento\Core\Model\LocaleInterface
/**
* Get store timestamp
- * Timstamp will be builded with store timezone settings
+ * Timestamp will be built with store timezone settings
*
* @param mixed $store
* @return int
diff --git a/app/code/Magento/Core/Model/LocaleInterface.php b/app/code/Magento/Core/Model/LocaleInterface.php
index d1e262aa627..01fc274c6e9 100644
--- a/app/code/Magento/Core/Model/LocaleInterface.php
+++ b/app/code/Magento/Core/Model/LocaleInterface.php
@@ -64,7 +64,7 @@ interface LocaleInterface
public function setDefaultLocale($locale);
/**
- * REtrieve default locale code
+ * Retrieve default locale code
*
* @return string
*/
@@ -115,7 +115,7 @@ interface LocaleInterface
public function setLocaleCode($code);
/**
- * Get options array for locale dropdown in currunt locale
+ * Get options array for locale dropdown in current locale
*
* @return array
*/
@@ -244,7 +244,7 @@ interface LocaleInterface
/**
* Get store timestamp
- * Timstamp will be builded with store timezone settings
+ * Timestamp will be built with store timezone settings
*
* @param mixed $store
* @return int
diff --git a/app/code/Magento/Core/Model/Resource/Config/Data.php b/app/code/Magento/Core/Model/Resource/Config/Data.php
index 5c6be5693e6..709c365c9d4 100644
--- a/app/code/Magento/Core/Model/Resource/Config/Data.php
+++ b/app/code/Magento/Core/Model/Resource/Config/Data.php
@@ -105,7 +105,7 @@ class Data extends \Magento\Core\Model\Resource\Db\AbstractDb
}
/**
- * Cleare store data
+ * Clear store data
*
* @param array $storeIds
*/
diff --git a/app/code/Magento/Core/Model/Resource/Db/AbstractDb.php b/app/code/Magento/Core/Model/Resource/Db/AbstractDb.php
index 3d69a68fb81..e262c461314 100644
--- a/app/code/Magento/Core/Model/Resource/Db/AbstractDb.php
+++ b/app/code/Magento/Core/Model/Resource/Db/AbstractDb.php
@@ -86,7 +86,7 @@ abstract class AbstractDb extends \Magento\Core\Model\Resource\AbstractResource
protected $_idFieldName;
/**
- * Primery key auto increment flag
+ * Primary key auto increment flag
*
* @var bool
*/
diff --git a/app/code/Magento/Core/Model/Resource/Setup.php b/app/code/Magento/Core/Model/Resource/Setup.php
index b9d8d40a136..5fb3a2d6ad1 100644
--- a/app/code/Magento/Core/Model/Resource/Setup.php
+++ b/app/code/Magento/Core/Model/Resource/Setup.php
@@ -791,7 +791,7 @@ class Setup implements \Magento\Module\Updater\SetupInterface
/**
* Run each time after applying of all updates,
- * if setup model setted $_callAfterApplyAllUpdates flag to true
+ * if setup model setted $_callAfterApplyAllUpdates flag to true
*
* @return \Magento\Core\Model\Resource\Setup
*/
diff --git a/app/code/Magento/Core/Model/Resource/Store.php b/app/code/Magento/Core/Model/Resource/Store.php
index e310ab00a45..ab98631f3dc 100644
--- a/app/code/Magento/Core/Model/Resource/Store.php
+++ b/app/code/Magento/Core/Model/Resource/Store.php
@@ -154,7 +154,7 @@ class Store extends \Magento\Core\Model\Resource\Db\AbstractDb
$storeId = $adapter->fetchOne($select, 'default_store_id');
if ($storeId == $model->getId()) {
- $bind = array('default_store_id' => \Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+ $bind = array('default_store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID);
$where = array('group_id = ?' => $model->getOriginalGroupId());
$this->_getWriteAdapter()->update($this->getTable('core_store_group'), $bind, $where);
}
diff --git a/app/code/Magento/Core/Model/Resource/Transaction.php b/app/code/Magento/Core/Model/Resource/Transaction.php
index 6a17c7e2448..a9f15899763 100644
--- a/app/code/Magento/Core/Model/Resource/Transaction.php
+++ b/app/code/Magento/Core/Model/Resource/Transaction.php
@@ -28,7 +28,7 @@
/**
* Resource transaction model
*
- * @todo need collect conection by name
+ * @todo need collect connection by name
* @category Magento
* @package Magento_Core
* @author Magento Core Team <core@magentocommerce.com>
diff --git a/app/code/Magento/Core/Model/Resource/Translate.php b/app/code/Magento/Core/Model/Resource/Translate.php
index df19b8e4053..65f7986a5e4 100644
--- a/app/code/Magento/Core/Model/Resource/Translate.php
+++ b/app/code/Magento/Core/Model/Resource/Translate.php
@@ -85,7 +85,7 @@ class Translate extends \Magento\Core\Model\Resource\Db\AbstractDb
}
if (is_null($storeId)) {
- $storeId = $this->_storeManager->getStore()->getId();
+ $storeId = $this->_getStoreId();
}
$adapter = $this->_getReadAdapter();
@@ -105,7 +105,6 @@ class Translate extends \Magento\Core\Model\Resource\Db\AbstractDb
);
return $adapter->fetchPairs($select, $bind);
-
}
/**
@@ -122,7 +121,7 @@ class Translate extends \Magento\Core\Model\Resource\Db\AbstractDb
}
if (is_null($storeId)) {
- $storeId = $this->_storeManager->getStore()->getId();
+ $this->_getStoreId();
}
$adapter = $this->_getReadAdapter();
@@ -154,4 +153,14 @@ class Translate extends \Magento\Core\Model\Resource\Db\AbstractDb
{
return $this->getChecksum($this->getMainTable());
}
+
+ /**
+ * Get store id for translations
+ *
+ * @return int
+ */
+ protected function _getStoreId()
+ {
+ return $this->_storeManager->getStore()->getId();
+ }
}
diff --git a/app/code/Magento/Core/Model/Resource/Translate/String.php b/app/code/Magento/Core/Model/Resource/Translate/String.php
index e9a949301c0..50174eccfc8 100644
--- a/app/code/Magento/Core/Model/Resource/Translate/String.php
+++ b/app/code/Magento/Core/Model/Resource/Translate/String.php
@@ -104,7 +104,7 @@ class String extends \Magento\Core\Model\Resource\Db\AbstractDb
protected function _getLoadSelect($field, $value, $object)
{
$select = parent::_getLoadSelect($field, $value, $object);
- $select->where('store_id = ?', \Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+ $select->where('store_id = ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
return $select;
}
@@ -141,7 +141,7 @@ class String extends \Magento\Core\Model\Resource\Db\AbstractDb
$bind = array(
'string' => $object->getString(),
- 'store_id' => \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
+ 'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID
);
$object->setId($adapter->fetchOne($select, $bind));
@@ -213,7 +213,7 @@ class String extends \Magento\Core\Model\Resource\Db\AbstractDb
);
if ($storeId === false) {
- $where['store_id > ?'] = \Magento\Core\Model\AppInterface::ADMIN_STORE_ID;
+ $where['store_id > ?'] = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
} elseif ($storeId !== null) {
$where['store_id = ?'] = $storeId;
}
@@ -242,7 +242,7 @@ class String extends \Magento\Core\Model\Resource\Db\AbstractDb
}
if (is_null($storeId)) {
- $storeId = $this->_storeManager->getStore()->getId();
+ $storeId = $this->_getStoreId();
}
$select = $write->select()
@@ -280,4 +280,14 @@ class String extends \Magento\Core\Model\Resource\Db\AbstractDb
return $this;
}
+
+ /**
+ * Get current store id
+ *
+ * @return int
+ */
+ protected function _getStoreId()
+ {
+ return $this->_storeManager->getStore()->getId();
+ }
}
diff --git a/app/code/Magento/Core/Model/Resource/Url/Rewrite.php b/app/code/Magento/Core/Model/Resource/Url/Rewrite.php
index 4b313bc6f97..7a1d7f5aaaf 100644
--- a/app/code/Magento/Core/Model/Resource/Url/Rewrite.php
+++ b/app/code/Magento/Core/Model/Resource/Url/Rewrite.php
@@ -79,7 +79,7 @@ class Rewrite extends \Magento\Core\Model\Resource\Db\AbstractDb
$select = parent::_getLoadSelect($field, $value, $object);
if (!is_null($object->getStoreId())) {
- $select->where('store_id IN(?)', array(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID, $object->getStoreId()));
+ $select->where('store_id IN(?)', array(\Magento\Core\Model\Store::DEFAULT_STORE_ID, $object->getStoreId()));
$select->order('store_id ' . \Magento\DB\Select::SQL_DESC);
$select->limit(1);
}
@@ -140,7 +140,7 @@ class Rewrite extends \Magento\Core\Model\Resource\Db\AbstractDb
$select = $adapter->select()
->from($this->getMainTable())
->where('request_path IN (:' . implode(', :', array_flip($pathBind)) . ')')
- ->where('store_id IN(?)', array(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID, (int)$object->getStoreId()));
+ ->where('store_id IN(?)', array(\Magento\Core\Model\Store::DEFAULT_STORE_ID, (int)$object->getStoreId()));
$items = $adapter->fetchAll($select, $pathBind);
diff --git a/app/code/Magento/Core/Model/Resource/Variable.php b/app/code/Magento/Core/Model/Resource/Variable.php
index f531298210a..9abf84faa24 100644
--- a/app/code/Magento/Core/Model/Resource/Variable.php
+++ b/app/code/Magento/Core/Model/Resource/Variable.php
@@ -136,8 +136,10 @@ class Variable extends \Magento\Core\Model\Resource\Db\AbstractDb
* @param integer $storeId
* @return \Magento\Core\Model\Resource\Variable
*/
- protected function _addValueToSelect(\Zend_Db_Select $select, $storeId = \Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
- {
+ protected function _addValueToSelect(
+ \Zend_Db_Select $select,
+ $storeId = \Magento\Core\Model\Store::DEFAULT_STORE_ID
+ ) {
$adapter = $this->_getReadAdapter();
$ifNullPlainValue = $adapter->getCheckSql('store.plain_value IS NULL', 'def.plain_value', 'store.plain_value');
$ifNullHtmlValue = $adapter->getCheckSql('store.html_value IS NULL', 'def.html_value', 'store.html_value');
diff --git a/app/code/Magento/Core/Model/Resource/Variable/Collection.php b/app/code/Magento/Core/Model/Resource/Variable/Collection.php
index 4881f81d19c..540dc3bd5d8 100644
--- a/app/code/Magento/Core/Model/Resource/Variable/Collection.php
+++ b/app/code/Magento/Core/Model/Resource/Variable/Collection.php
@@ -26,7 +26,7 @@
/**
- * Custom variabel collection
+ * Custom variable collection
*
* @category Magento
* @package Magento_Core
diff --git a/app/code/Magento/Core/Model/Session/AbstractSession.php b/app/code/Magento/Core/Model/Session/AbstractSession.php
index 05afd75a8d8..574e7b1f540 100644
--- a/app/code/Magento/Core/Model/Session/AbstractSession.php
+++ b/app/code/Magento/Core/Model/Session/AbstractSession.php
@@ -264,7 +264,6 @@ class AbstractSession extends \Magento\Object
if ($this->_cacheLimiter) {
session_cache_limiter($this->_cacheLimiter);
}
-
session_start();
\Magento\Profiler::stop('session_start');
@@ -581,18 +580,12 @@ class AbstractSession extends \Magento\Object
*/
public function setSessionId($id = null)
{
-
- if (null === $id
- && ($this->_storeManager->getStore()->isAdmin()
- || $this->_coreStoreConfig->getConfig(self::XML_PATH_USE_FRONTEND_SID)
- )
- ) {
+ if (null === $id && $this->_isSidUsedFromQueryParam()) {
$_queryParam = $this->getSessionIdQueryParam();
if (isset($_GET[$_queryParam]) && $this->_url->isOwnOriginUrl()) {
$id = $_GET[$_queryParam];
}
}
-
$this->_addHost();
if (!is_null($id) && preg_match('#^[0-9a-zA-Z,-]+$#', $id)) {
session_id($id);
@@ -681,9 +674,7 @@ class AbstractSession extends \Magento\Object
self::$_urlHostCache[$urlHost] = $sessionId;
}
- return $this->_storeManager->getStore()->isAdmin() || $this->isValidForPath($urlPath)
- ? self::$_urlHostCache[$urlHost]
- : $this->getEncryptedSessionId();
+ return $this->isValidForPath($urlPath) ? self::$_urlHostCache[$urlHost] : $this->getEncryptedSessionId();
}
/**
@@ -755,6 +746,16 @@ class AbstractSession extends \Magento\Object
return $this;
}
+ /**
+ * Whether to take session id from GET
+ *
+ * @return bool
+ */
+ protected function _isSidUsedFromQueryParam()
+ {
+ return $this->_coreStoreConfig->getConfig(self::XML_PATH_USE_FRONTEND_SID);
+ }
+
/**
* Retrieve session save method
*
diff --git a/app/code/Magento/Core/Model/Store.php b/app/code/Magento/Core/Model/Store.php
index 18e4bf89fe7..7689e317703 100644
--- a/app/code/Magento/Core/Model/Store.php
+++ b/app/code/Magento/Core/Model/Store.php
@@ -128,6 +128,12 @@ class Store extends \Magento\Core\Model\AbstractModel
*/
const BASE_URL_PLACEHOLDER = '{{base_url}}';
+ /**
+ * Identifier of default store
+ * used for loading data of default scope
+ */
+ const DEFAULT_STORE_ID = 0;
+
/**
* @var \Magento\App\Cache\Type\Config
*/
@@ -336,10 +342,8 @@ class Store extends \Magento\Core\Model\AbstractModel
$properties = parent::__sleep();
$properties = array_diff($properties, array(
'_coreFileStorageDatabase',
- '_eventDispatcher',
- '_cacheManager',
'_coreStoreConfig',
- '_coreConfig'
+ '_config'
));
return $properties;
}
@@ -350,16 +354,12 @@ class Store extends \Magento\Core\Model\AbstractModel
public function __wakeup()
{
parent::__wakeup();
- $this->_eventManager = \Magento\App\ObjectManager::getInstance()
- ->get('Magento\Event\ManagerInterface');
- $this->_cacheManager = \Magento\App\ObjectManager::getInstance()
- ->get('Magento\App\CacheInterface');
+ $this->_coreFileStorageDatabase = \Magento\App\ObjectManager::getInstance()
+ ->get('Magento\Core\Helper\File\Storage\Database');
$this->_coreStoreConfig = \Magento\App\ObjectManager::getInstance()
->get('Magento\Core\Model\Store\Config');
$this->_config = \Magento\App\ObjectManager::getInstance()
->get('Magento\Core\Model\Config');
- $this->_coreFileStorageDatabase = \Magento\App\ObjectManager::getInstance()
- ->get('Magento\Core\Helper\File\Storage\Database');
}
/**
@@ -595,14 +595,14 @@ class Store extends \Magento\Core\Model\AbstractModel
}
/**
- * Remove script file name from url in case when server rewrites are enabled
+ * Append script file name to url in case when server rewrites are disabled
*
* @param string $url
* @return string
*/
protected function _updatePathUseRewrites($url)
{
- if ($this->isAdmin()
+ if ($this->getForceDisableRewrites()
|| !$this->getConfig(self::XML_PATH_USE_REWRITES)
|| !$this->_appState->isInstalled()
) {
@@ -668,9 +668,9 @@ class Store extends \Magento\Core\Model\AbstractModel
*/
public function isUseStoreInUrl()
{
- return $this->_appState->isInstalled()
- && $this->getConfig(self::XML_PATH_STORE_IN_URL)
- && !$this->isAdmin();
+ return !($this->hasDisableStoreInUrl() && $this->getDisableStoreInUrl())
+ && $this->_appState->isInstalled()
+ && $this->getConfig(self::XML_PATH_STORE_IN_URL);
}
/**
@@ -684,42 +684,27 @@ class Store extends \Magento\Core\Model\AbstractModel
}
/**
- * Check if store is admin store
- *
- * @return boolean
- */
- public function isAdmin()
- {
- return $this->getId() == \Magento\Core\Model\AppInterface::ADMIN_STORE_ID;
- }
-
-
- /**
- * Check if backend URLs should be secure
+ * Check if frontend URLs should be secure
*
* @return boolean
*/
- public function isAdminUrlSecure()
+ public function isFrontUrlSecure()
{
- if ($this->_isAdminSecure === null) {
- $this->_isAdminSecure = (boolean) (int) (string) $this->_config
- ->getValue(\Magento\Core\Model\Url::XML_PATH_SECURE_IN_ADMIN, 'default');
+ if ($this->_isFrontSecure === null) {
+ $this->_isFrontSecure = $this->_coreStoreConfig->getConfigFlag(
+ \Magento\Core\Model\Url::XML_PATH_SECURE_IN_FRONT,
+ $this->getId()
+ );
}
- return $this->_isAdminSecure;
+ return $this->_isFrontSecure;
}
/**
- * Check if frontend URLs should be secure
- *
- * @return boolean
+ * @return bool
*/
- public function isFrontUrlSecure()
+ public function isUrlSecure()
{
- if ($this->_isFrontSecure === null) {
- $this->_isFrontSecure = $this->_coreStoreConfig->getConfigFlag(\Magento\Core\Model\Url::XML_PATH_SECURE_IN_FRONT,
- $this->getId());
- }
- return $this->_isFrontSecure;
+ return $this->isFrontUrlSecure();
}
/**
diff --git a/app/code/Magento/Core/Model/Store/Group.php b/app/code/Magento/Core/Model/Store/Group.php
index 103ecae8dfb..ccb452f1899 100644
--- a/app/code/Magento/Core/Model/Store/Group.php
+++ b/app/code/Magento/Core/Model/Store/Group.php
@@ -198,7 +198,7 @@ class Group extends \Magento\Core\Model\AbstractModel
}
/**
- * Retrieve wersite store objects
+ * Retrieve website store objects
*
* @return array
*/
diff --git a/app/code/Magento/Core/Model/Store/Storage/DefaultStorage.php b/app/code/Magento/Core/Model/Store/Storage/DefaultStorage.php
index 0f122ccf307..be2840430f4 100644
--- a/app/code/Magento/Core/Model/Store/Storage/DefaultStorage.php
+++ b/app/code/Magento/Core/Model/Store/Storage/DefaultStorage.php
@@ -67,7 +67,7 @@ class DefaultStorage implements \Magento\Core\Model\Store\StorageInterface
}
/**
- * Initialize current applicaition store
+ * Initialize current application store
*/
public function initCurrentStore()
{
diff --git a/app/code/Magento/Core/Model/Template.php b/app/code/Magento/Core/Model/Template.php
index 8e460fe7e10..b788b4282f9 100644
--- a/app/code/Magento/Core/Model/Template.php
+++ b/app/code/Magento/Core/Model/Template.php
@@ -48,7 +48,7 @@ abstract class Template extends \Magento\Core\Model\AbstractModel
const DEFAULT_DESIGN_AREA = 'frontend';
/**
- * Configuration of desing package for template
+ * Configuration of design package for template
*
* @var \Magento\Object
*/
@@ -56,7 +56,7 @@ abstract class Template extends \Magento\Core\Model\AbstractModel
/**
- * Configuration of emulated desing package.
+ * Configuration of emulated design package.
*
* @var \Magento\Object|boolean
*/
diff --git a/app/code/Magento/Core/Model/Theme.php b/app/code/Magento/Core/Model/Theme.php
index aebdc4a5e6c..708f584b851 100644
--- a/app/code/Magento/Core/Model/Theme.php
+++ b/app/code/Magento/Core/Model/Theme.php
@@ -277,7 +277,6 @@ class Theme extends \Magento\Core\Model\AbstractModel implements \Magento\View\D
/**
* {@inheritdoc}
- * @deprecated
*/
public function getArea()
{
diff --git a/app/code/Magento/Core/Model/Translate.php b/app/code/Magento/Core/Model/Translate.php
index dde1871f420..3efb28bbc3c 100644
--- a/app/code/Magento/Core/Model/Translate.php
+++ b/app/code/Magento/Core/Model/Translate.php
@@ -27,6 +27,7 @@
namespace Magento\Core\Model;
use Magento\TranslateInterface;
+
/**
* Translate model
*
diff --git a/app/code/Magento/Core/Model/Translate/Inline.php b/app/code/Magento/Core/Model/Translate/Inline.php
index bf41766b772..c18bd207236 100644
--- a/app/code/Magento/Core/Model/Translate/Inline.php
+++ b/app/code/Magento/Core/Model/Translate/Inline.php
@@ -62,11 +62,6 @@ class Inline implements \Magento\Core\Model\Translate\InlineInterface
*/
protected $_isScriptInserted = false;
- /**
- * @var \Magento\Backend\Model\Url
- */
- protected $_backendUrl;
-
/**
* @var \Magento\Core\Model\Url
*/
@@ -78,41 +73,36 @@ class Inline implements \Magento\Core\Model\Translate\InlineInterface
protected $_layout;
/**
- * Core store config
- *
- * @var \Magento\Core\Model\Store\Config
+ * @var \Magento\App\State
*/
- protected $_coreStoreConfig;
+ protected $_appState;
/**
- * @var \Magento\App\State
+ * @var \Magento\Core\Model\Translate\Inline\ConfigFactory
*/
- protected $_appState;
+ protected $_configFactory;
/**
* Initialize inline translation model
*
* @param InlineParser $parser
* @param \Magento\Core\Model\Translate $translate
- * @param \Magento\Backend\Model\Url $backendUrl
* @param \Magento\Core\Model\Url $url
* @param \Magento\View\LayoutInterface $layout
- * @param \Magento\Core\Model\Store\Config $coreStoreConfig
+ * @param \Magento\Core\Model\Translate\Inline\ConfigFactory $configFactory
* @param \Magento\App\State $appState
*/
public function __construct(
\Magento\Core\Model\Translate\InlineParser $parser,
\Magento\Core\Model\Translate $translate,
- \Magento\Backend\Model\Url $backendUrl,
\Magento\Core\Model\Url $url,
\Magento\View\LayoutInterface $layout,
- \Magento\Core\Model\Store\Config $coreStoreConfig,
+ \Magento\Core\Model\Translate\Inline\ConfigFactory $configFactory,
\Magento\App\State $appState
) {
- $this->_coreStoreConfig = $coreStoreConfig;
+ $this->_configFactory = $configFactory;
$this->_parser = $parser;
$this->_translator = $translate;
- $this->_backendUrl = $backendUrl;
$this->_url = $url;
$this->_layout = $layout;
$this->_appState = $appState;
@@ -134,11 +124,7 @@ class Inline implements \Magento\Core\Model\Translate\InlineInterface
$store = $this->_parser->getStoreManager()->getStore($store);
}
- if ($this->_parser->getDesignPackage()->getArea() == 'adminhtml') {
- $active = $this->_coreStoreConfig->getConfigFlag('dev/translate_inline/active_admin', $store);
- } else {
- $active = $this->_coreStoreConfig->getConfigFlag('dev/translate_inline/active', $store);
- }
+ $active = $this->_configFactory->create()->isActive($store);
$this->_isAllowed = $active && $this->_parser->getHelper()->isDevAllowed($store);
}
return $this->_translator->getTranslateInline() && $this->_isAllowed;
@@ -194,21 +180,10 @@ class Inline implements \Magento\Core\Model\Translate\InlineInterface
return;
}
- $store = $this->_parser->getStoreManager()->getStore();
- if ($store->isAdmin()) {
- $urlPrefix = \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE;
- $urlModel = $this->_backendUrl;
- } else {
- $urlPrefix = 'core';
- $urlModel = $this->_url;
- }
- $ajaxUrl = $urlModel->getUrl($urlPrefix . '/ajax/translate',
- array('_secure' => $store->isCurrentlySecure()));
-
/** @var $block \Magento\View\Block\Template */
$block = $this->_layout->createBlock('Magento\View\Block\Template');
- $block->setAjaxUrl($ajaxUrl);
+ $block->setAjaxUrl($this->_getAjaxUrl());
$block->setTemplate('Magento_Core::translate_inline.phtml');
@@ -219,6 +194,17 @@ class Inline implements \Magento\Core\Model\Translate\InlineInterface
$this->_isScriptInserted = true;
}
+ /**
+ * Return URL for ajax requests
+ *
+ * @return string
+ */
+ protected function _getAjaxUrl()
+ {
+ $store = $this->_parser->getStoreManager()->getStore();
+ return $this->_url->getUrl('core/ajax/translate', array('_secure' => $store->isCurrentlySecure()));
+ }
+
/**
* Strip inline translations from text
*
diff --git a/app/code/Magento/Core/Model/Translate/Inline/Config.php b/app/code/Magento/Core/Model/Translate/Inline/Config.php
new file mode 100644
index 00000000000..6d313715714
--- /dev/null
+++ b/app/code/Magento/Core/Model/Translate/Inline/Config.php
@@ -0,0 +1,60 @@
+<?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)
+ */
+
+
+/**
+ * Inline Translation config
+ */
+namespace Magento\Core\Model\Translate\Inline;
+
+class Config implements ConfigInterface
+{
+ /**
+ * Core store config
+ *
+ * @var \Magento\Core\Model\Store\Config
+ */
+ protected $_coreStoreConfig;
+
+ /**
+ * @param \Magento\Core\Model\Store\Config $coreStoreConfig
+ */
+ public function __construct(\Magento\Core\Model\Store\Config $coreStoreConfig)
+ {
+ $this->_coreStoreConfig = $coreStoreConfig;
+ }
+
+ /**
+ * Check whether inline translation is enabled
+ *
+ * @param int|null $store
+ * @return bool
+ */
+ public function isActive($store = null)
+ {
+ return $this->_coreStoreConfig->getConfigFlag('dev/translate_inline/active', $store);
+ }
+}
diff --git a/app/code/Magento/Core/Model/Translate/Inline/ConfigFactory.php b/app/code/Magento/Core/Model/Translate/Inline/ConfigFactory.php
new file mode 100644
index 00000000000..317f06cf572
--- /dev/null
+++ b/app/code/Magento/Core/Model/Translate/Inline/ConfigFactory.php
@@ -0,0 +1,58 @@
+<?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)
+ */
+
+
+/**
+ * Inline Translation config factory
+ */
+namespace Magento\Core\Model\Translate\Inline;
+
+class ConfigFactory
+{
+ /**
+ * @var \Magento\ObjectManager
+ */
+ protected $_objectManager;
+
+ /**
+ * @param \Magento\ObjectManager $objectManager
+ */
+ public function __construct(\Magento\ObjectManager $objectManager)
+ {
+ $this->_objectManager = $objectManager;
+ }
+
+ /**
+ * Create instance of inline translate config
+ *
+ * @param string|null $area
+ * @return \Magento\Core\Model\Translate\Inline\ConfigInterface
+ */
+ public function create($area = null)
+ {
+ return $this->_objectManager->create('Magento\Core\Model\Translate\Inline\Config');
+ }
+}
diff --git a/app/code/Magento/Adminhtml/Helper/Data.php b/app/code/Magento/Core/Model/Translate/Inline/ConfigInterface.php
similarity index 75%
rename from app/code/Magento/Adminhtml/Helper/Data.php
rename to app/code/Magento/Core/Model/Translate/Inline/ConfigInterface.php
index a51abb6fc5c..a35362750b1 100644
--- a/app/code/Magento/Adminhtml/Helper/Data.php
+++ b/app/code/Magento/Core/Model/Translate/Inline/ConfigInterface.php
@@ -19,22 +19,24 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @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)
*/
+
/**
- * Adminhtml base helper
- *
- * @category Magento
- * @package Magento_Adminhtml
- * @author Magento Core Team <core@magentocommerce.com>
- * @deprecated Moved to module Magento_Backend
+ * Inline Translation config interface
*/
-namespace Magento\Adminhtml\Helper;
+namespace Magento\Core\Model\Translate\Inline;
-class Data extends \Magento\Backend\Helper\Data
+interface ConfigInterface
{
-
+ /**
+ * Check whether inline translation is enabled
+ *
+ * @param int|null $store
+ * @return bool
+ */
+ public function isActive($store = null);
}
diff --git a/app/code/Magento/Core/Model/Url.php b/app/code/Magento/Core/Model/Url.php
index 076b20b9c56..975f9322271 100644
--- a/app/code/Magento/Core/Model/Url.php
+++ b/app/code/Magento/Core/Model/Url.php
@@ -324,15 +324,37 @@ class Url extends \Magento\Object implements \Magento\UrlInterface
}
$path = $prefix . $key;
- $cacheId = $this->getStore()->getCode() . '/' . $path;
+ $cacheId = $this->_getConfigCacheId($path);
if (!isset(self::$_configDataCache[$cacheId])) {
- $data = $this->getStore()->getConfig($path);
+ $data = $this->_getConfig($path);
self::$_configDataCache[$cacheId] = $data;
}
return self::$_configDataCache[$cacheId];
}
+ /**
+ * Get cache id for config path
+ *
+ * @param string $path
+ * @return string
+ */
+ protected function _getConfigCacheId($path)
+ {
+ return $this->getStore()->getCode() . '/' . $path;
+ }
+
+ /**
+ * Get config data by path
+ *
+ * @param string $path
+ * @return null|string
+ */
+ protected function _getConfig($path)
+ {
+ return $this->getStore()->getConfig($path);
+ }
+
/**
* Set request
*
@@ -379,23 +401,19 @@ class Url extends \Magento\Object implements \Magento\UrlInterface
return (bool)$this->getData('secure');
}
- $store = $this->getStore();
-
- if ($store->isAdmin() && !$store->isAdminUrlSecure()) {
- return false;
- }
- if (!$store->isAdmin() && !$store->isFrontUrlSecure()) {
+ if (!$this->getStore()->isUrlSecure()) {
return false;
}
if (!$this->hasData('secure')) {
- if ($this->getType() == \Magento\Core\Model\Store::URL_TYPE_LINK && !$store->isAdmin()) {
+ if ($this->getType() == \Magento\Core\Model\Store::URL_TYPE_LINK) {
$pathSecure = $this->_urlSecurityInfo->isSecure('/' . $this->getActionPath());
$this->setData('secure', $pathSecure);
} else {
$this->setData('secure', true);
}
}
+
return $this->getData('secure');
}
@@ -1271,4 +1289,25 @@ class Url extends \Magento\Object implements \Magento\UrlInterface
return $url;
}
+
+ /**
+ * Retrieve current url
+ *
+ * @return string
+ */
+ public function getCurrentUrl()
+ {
+ $port = $this->_request->getServer('SERVER_PORT');
+ if ($port) {
+ $defaultPorts = array(
+ \Magento\App\Request\Http::DEFAULT_HTTP_PORT,
+ \Magento\App\Request\Http::DEFAULT_HTTPS_PORT
+ );
+ $port = (in_array($port, $defaultPorts)) ? '' : ':' . $port;
+ }
+ $requestUri = $this->_request->getServer('REQUEST_URI');
+ $url = $this->_request->getScheme() . '://' . $this->_request->getHttpHost()
+ . $port . $requestUri;
+ return $url;
+ }
}
diff --git a/app/code/Magento/Core/Model/Variable/Config.php b/app/code/Magento/Core/Model/Variable/Config.php
index e4d202dd495..810d02d2ede 100644
--- a/app/code/Magento/Core/Model/Variable/Config.php
+++ b/app/code/Magento/Core/Model/Variable/Config.php
@@ -100,6 +100,6 @@ class Config
*/
public function getVariablesWysiwygActionUrl()
{
- return $this->_url->getUrl('*/system_variable/wysiwygPlugin');
+ return $this->_url->getUrl('adminhtml/system_variable/wysiwygPlugin');
}
}
diff --git a/app/code/Magento/Core/Model/View/Design.php b/app/code/Magento/Core/Model/View/Design.php
index fd682ebdb28..b35fc64bacf 100644
--- a/app/code/Magento/Core/Model/View/Design.php
+++ b/app/code/Magento/Core/Model/View/Design.php
@@ -156,7 +156,6 @@ class Design implements \Magento\View\DesignInterface
/**
* Retrieve package area
*
- * @deprecated
* @return string
*/
public function getArea()
diff --git a/app/code/Magento/Core/Model/Website.php b/app/code/Magento/Core/Model/Website.php
index 673024dd10f..0461b18e6ef 100644
--- a/app/code/Magento/Core/Model/Website.php
+++ b/app/code/Magento/Core/Model/Website.php
@@ -422,7 +422,7 @@ class Website extends \Magento\Core\Model\AbstractModel
}
/**
- * Retrieve wersite store objects
+ * Retrieve website store objects
*
* @return array
*/
diff --git a/app/code/Magento/Core/etc/config.xml b/app/code/Magento/Core/etc/config.xml
index 584bb881bef..ebf0803954d 100644
--- a/app/code/Magento/Core/etc/config.xml
+++ b/app/code/Magento/Core/etc/config.xml
@@ -241,7 +241,7 @@
</admin>
<general>
<country>
- <eu_countries>AT,BE,BG,CY,CZ,DK,EE,FI,FR,DE,GR,HU,IE,IT,LV,LT,LU,MT,NL,PL,PT,RO,SK,SI,ES,SE,GB</eu_countries>
+ <eu_countries>AT,BE,BG,CY,CZ,DK,EE,FI,FR,DE,GR,HR,HU,IE,IT,LV,LT,LU,MT,NL,PL,PT,RO,SK,SI,ES,SE,GB</eu_countries>
</country>
<locale>
<firstday>0</firstday>
diff --git a/app/code/Magento/Core/etc/di.xml b/app/code/Magento/Core/etc/di.xml
index b6cf71c7d81..1283d811a86 100644
--- a/app/code/Magento/Core/etc/di.xml
+++ b/app/code/Magento/Core/etc/di.xml
@@ -54,6 +54,7 @@
<preference for="Magento\App\ViewInterface" type="Magento\App\View" />
<preference for="Magento\TranslateInterface" type="Magento\Core\Model\Translate" />
<preference for="Magento\App\Response\RedirectInterface" type="Magento\Core\App\Response\Redirect" />
+ <preference for="Magento\Data\Collection\EntityFactoryInterface" type="Magento\Core\Model\EntityFactory" />
<type name="Magento\App\DefaultPath\DefaultPath">
<param name="parts">
<value>
@@ -451,14 +452,23 @@
<instance type="Magento\App\FrontController\Proxy" />
</param>
</type>
+ <type name="Magento\Core\Model\App\Area">
+ <param name="translator">
+ <instance type="Magento\Core\Model\Translate\Proxy" />
+ </param>
+ <param name="design">
+ <instance type="Magento\Core\Model\Design\Proxy" />
+ </param>
+ </type>
<type name="Magento\App\FrontController">
<plugin name="dispatchExceptionHandler" type="Magento\Core\App\FrontController\Plugin\DispatchExceptionHandler" sortOrder="30"/>
<plugin name="clickjacking" type="Magento\App\FrontController\Plugin\Clickjacking" sortOrder="0"/>
</type>
<type name="Magento\App\Action\Action">
<plugin name="installInitializer" type="Magento\Core\App\Action\Plugin\Install" sortOrder="5"/>
- <plugin name="sessionInitializer" type="Magento\Core\App\Action\Plugin\Session" sortOrder="10"/>
- <plugin name="designLoader" type="Magento\Core\App\Action\Plugin\Design" sortOrder="20"/>
+ <plugin name="storeCheck" type="Magento\Core\App\Action\Plugin\StoreCheck" sortOrder="10"/>
+ <plugin name="sessionInitializer" type="Magento\Core\App\Action\Plugin\Session" sortOrder="20"/>
+ <plugin name="designLoader" type="Magento\Core\App\Action\Plugin\Design" sortOrder="30"/>
</type>
<type name="Magento\Core\Model\Locale">
<param name="dateModel">
diff --git a/app/code/Magento/Core/i18n/fr_FR.csv b/app/code/Magento/Core/i18n/fr_FR.csv
index 2672553f605..c838b5da378 100644
--- a/app/code/Magento/Core/i18n/fr_FR.csv
+++ b/app/code/Magento/Core/i18n/fr_FR.csv
@@ -13,7 +13,7 @@
"Advanced","Avancé(e)"
"After selecting a new media storage location, press the Synchronize button
to transfer all media to that location. Media will not be available in the new
- location until the synchronization process is complete.","Après avoir sélectionn un nouveau lieu de stockage des médias, appuyez sur le bouton Synchroniser pour transférer tous les médias vers cet emplacement. Les médias ne seront disponibles dans le nouvel emplacement que lorsque la processus sera terminé."
+ location until the synchronization process is complete.","Après avoir sélectionné un nouveau lieu de stockage des médias, appuyez sur le bouton Synchroniser pour transférer tous les médias vers cet emplacement. Les médias ne seront disponibles dans le nouvel emplacement que lorsque la processus sera terminé."
"Allow Countries","Permettre pays"
"Allow Symlinks","Autoriser les Symlinks"
"Allowed IPs (comma separated)","IPs permis (séparés par virgule)"
@@ -24,7 +24,7 @@
"An error occurred while saving. Please review the error log.","Une erreur est survenue durant sauvegarde. Veuillez consulter le journal de bord des erreurs."
"Anchor Text for Next","Ancrer texte pour suivant"
"Anchor Text for Previous","Ancrer texte pour précédent"
-"Anchor symbol (#) is not supported in request path","Le symbolr d'ancrage (#) n'est pas pris en charge dans la demande de chemin d'accès"
+"Anchor symbol (#) is not supported in request path","Le symbole d'ancrage (#) n'est pas pris en charge dans la demande de chemin d'accès"
"Anchor symbol (#) is not supported in url rewrite suffix","Le symbole d'ancrage (#) n'est pas pris en charge dans le suffixe de réécriture de l'url"
"Are you sure?","Etes-vous sûr ?"
"Auto-redirect to Base URL","Redirige automatiquement vers base URL"
diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php
index 1c8912517d8..0b69229b086 100644
--- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php
+++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php
@@ -46,18 +46,18 @@ class Services extends \Magento\Backend\Block\Template
*/
protected $_srcCurrencyFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Directory\Model\Currency\Import\Source\ServiceFactory $srcCurrencyFactory
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\Directory\Model\Currency\Import\Source\ServiceFactory $srcCurrencyFactory
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Directory\Model\Currency\Import\Source\ServiceFactory $srcCurrencyFactory,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\Directory\Model\Currency\Import\Source\ServiceFactory $srcCurrencyFactory,
+ array $data = array()
+ ) {
$this->_srcCurrencyFactory = $srcCurrencyFactory;
parent::__construct($context, $coreData, $data);
}
@@ -71,7 +71,7 @@ class Services extends \Magento\Backend\Block\Template
{
$this->setChild(
'import_services',
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Html\Select')
+ $this->getLayout()->createBlock('Magento\View\Block\Html\Select')
->setOptions($this->_srcCurrencyFactory->create()->toOptionArray())
->setId('rate_services')
->setName('rate_services')
diff --git a/app/code/Magento/Customer/Block/Account/Dashboard.php b/app/code/Magento/Customer/Block/Account/Dashboard.php
index 6289ee10d50..cd2fde10f78 100644
--- a/app/code/Magento/Customer/Block/Account/Dashboard.php
+++ b/app/code/Magento/Customer/Block/Account/Dashboard.php
@@ -115,7 +115,7 @@ class Dashboard extends \Magento\View\Block\Template
public function getManageNewsletterUrl()
{
- return $this->getUrl('*/newsletter/manage');
+ return $this->getUrl('newsletter/manage');
}
public function getSubscriptionText()
diff --git a/app/code/Magento/Customer/Block/Address/Renderer/RendererInterface.php b/app/code/Magento/Customer/Block/Address/Renderer/RendererInterface.php
index a157877af36..7ce43d8b6e5 100644
--- a/app/code/Magento/Customer/Block/Address/Renderer/RendererInterface.php
+++ b/app/code/Magento/Customer/Block/Address/Renderer/RendererInterface.php
@@ -44,7 +44,7 @@ interface RendererInterface
function setType(\Magento\Object $type);
/**
- * Retrive format type object
+ * Retrieve format type object
*
* @return \Magento\Object
*/
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Action.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Action.php
index 07d33b4df09..475c1d330b9 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Action.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/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('adminhtml/newsletter_template/preview',
+ 'href' => $this->getUrl('newsletter/template/preview',
array(
'id' => $row->getTemplateId(),
'subscriber'=> $this->_coreRegistry->registry('subscriber')->getId()
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Reviews.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Reviews.php
index 4408372a057..0548277ebee 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Reviews.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Reviews.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Customer\Block\Adminhtml\Edit\Tab;
-class Reviews extends \Magento\Adminhtml\Block\Review\Grid
+class Reviews extends \Magento\Review\Block\Adminhtml\Grid
{
/**
* Hide grid mass action elements
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View.php
index b09949e9a88..dccfcde274a 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View.php
@@ -30,7 +30,7 @@ namespace Magento\Customer\Block\Adminhtml\Edit\Tab;
* Customer account form block
*/
class View
- extends \Magento\Adminhtml\Block\Template
+ extends \Magento\Backend\Block\Template
implements \Magento\Adminhtml\Block\Widget\Tab\TabInterface
{
/**
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Online.php b/app/code/Magento/Customer/Block/Adminhtml/Online.php
index 14387d81d18..545b28f0447 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Online.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Online.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Customer\Block\Adminhtml;
-class Online extends \Magento\Adminhtml\Block\Template
+class Online extends \Magento\Backend\Block\Template
{
protected $_template = 'online.phtml';
diff --git a/app/code/Magento/Customer/Controller/Address.php b/app/code/Magento/Customer/Controller/Address.php
index 9345c7b8c62..042c7f0fc15 100644
--- a/app/code/Magento/Customer/Controller/Address.php
+++ b/app/code/Magento/Customer/Controller/Address.php
@@ -53,6 +53,13 @@ class Address extends \Magento\App\Action\Action
*/
protected $_addressFormFactory;
+ /**
+ * Customer data
+ *
+ * @var \Magento\Customer\Helper\Data
+ */
+ protected $_customerData;
+
/**
* @var \Magento\Core\App\Action\FormKeyValidator
*/
@@ -63,6 +70,7 @@ class Address extends \Magento\App\Action\Action
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Customer\Model\AddressFactory $addressFactory
* @param \Magento\Customer\Model\Address\FormFactory $addressFormFactory
+ * @param \Magento\Customer\Helper\Data $customerData
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
*/
public function __construct(
@@ -70,11 +78,13 @@ class Address extends \Magento\App\Action\Action
\Magento\Customer\Model\Session $customerSession,
\Magento\Customer\Model\AddressFactory $addressFactory,
\Magento\Customer\Model\Address\FormFactory $addressFormFactory,
+ \Magento\Customer\Helper\Data $customerData,
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator
) {
$this->_customerSession = $customerSession;
$this->_addressFactory = $addressFactory;
$this->_addressFormFactory = $addressFormFactory;
+ $this->_customerData = $customerData;
$this->_formKeyValidator = $formKeyValidator;
parent::__construct($context);
}
@@ -164,6 +174,19 @@ class Address extends \Magento\App\Action\Action
$address = $this->_extractAddress();
$this->_validateAddress($address);
$address->save();
+
+ // set in VAT observer
+ if ($address->getVatValidationResult()) {
+ $validationMessage = $this->_customerData->getVatValidationUserMessage(
+ $address,
+ $this->_getSession()->getCustomer()->getDisableAutoGroupChange(),
+ $address->getVatValidationResult()
+ );
+ $validationMessage->getIsError()
+ ? $this->_getSession()->addError($validationMessage->getMessage())
+ : $this->_getSession()->addSuccess($validationMessage->getMessage());
+ }
+
$this->_getSession()->addSuccess(__('The address has been saved.'));
$url = $this->_buildUrl('*/*/index', array('_secure'=>true));
$this->getResponse()->setRedirect($this->_redirect->success($url));
diff --git a/app/code/Magento/Adminhtml/Block/Html/Date.php b/app/code/Magento/Customer/Model/Backend/Customer.php
similarity index 71%
rename from app/code/Magento/Adminhtml/Block/Html/Date.php
rename to app/code/Magento/Customer/Model/Backend/Customer.php
index b66f44d120c..ec13ab65f8a 100644
--- a/app/code/Magento/Adminhtml/Block/Html/Date.php
+++ b/app/code/Magento/Customer/Model/Backend/Customer.php
@@ -19,20 +19,25 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Customer
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-/**
- * Adminhtml HTML select element block
- *
- * @category Magento
- * @package Magento_Core
- * @author Magento Core Team <core@magentocommerce.com>
- */
-namespace Magento\Adminhtml\Block\Html;
+namespace Magento\Customer\Model\Backend;
-class Date extends \Magento\View\Block\Html\Date
+class Customer extends \Magento\Customer\Model\Customer
{
+ /**
+ * Get store id
+ *
+ * @return int
+ */
+ public function getStoreId()
+ {
+ if(($this->getWebsiteId() * 1)) {
+ return $this->_getWebsiteStoreId();
+ }
+ return parent::getStoreId();
+ }
}
diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
index 911e2036108..28705a39c68 100644
--- a/app/code/Magento/Customer/Model/Customer.php
+++ b/app/code/Magento/Customer/Model/Customer.php
@@ -37,7 +37,7 @@ namespace Magento\Customer\Model;
class Customer extends \Magento\Core\Model\AbstractModel
{
/**
- * Configuration pathes for email templates and identities
+ * Configuration paths for email templates and identities
*/
const XML_PATH_REGISTER_EMAIL_TEMPLATE = 'customer/create_account/email_template';
const XML_PATH_REGISTER_EMAIL_IDENTITY = 'customer/create_account/email_identity';
@@ -735,13 +735,8 @@ class Customer extends \Magento\Core\Model\AbstractModel
*/
public function sendPasswordReminderEmail()
{
- $storeId = $this->getStoreId();
- if (\Magento\Core\Model\AppInterface::ADMIN_STORE_ID == $storeId && ($this->getWebsiteId() * 1)) {
- $storeId = $this->_getWebsiteStoreId();
- }
-
$this->_sendEmailTemplate(self::XML_PATH_REMIND_EMAIL_TEMPLATE, self::XML_PATH_FORGOT_EMAIL_IDENTITY,
- array('customer' => $this), $storeId);
+ array('customer' => $this), $this->getStoreId());
return $this;
}
@@ -894,7 +889,7 @@ class Customer extends \Magento\Core\Model\AbstractModel
}
/**
- * Retrive shared website ids
+ * Retrieve shared website ids
*
* @return array
*/
@@ -1007,7 +1002,7 @@ class Customer extends \Magento\Core\Model\AbstractModel
}
/**
- * Retreive errors
+ * Retrieve errors
*
* @return array
*/
diff --git a/app/code/Magento/Customer/Model/Observer.php b/app/code/Magento/Customer/Model/Observer.php
index 1247b1706d9..82b0e892853 100644
--- a/app/code/Magento/Customer/Model/Observer.php
+++ b/app/code/Magento/Customer/Model/Observer.php
@@ -62,35 +62,19 @@ class Observer
*/
protected $_customerData;
- /**
- * @var \Magento\Core\Model\StoreManagerInterface
- */
- protected $_storeManager;
-
- /**
- * @var \Magento\Customer\Model\Session
- */
- protected $_customerSession;
-
/**
* @param \Magento\Customer\Helper\Data $customerData
* @param \Magento\Customer\Helper\Address $customerAddress
* @param \Magento\Core\Model\Registry $coreRegistry
- * @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Customer\Model\Session $customerSession
*/
public function __construct(
\Magento\Customer\Helper\Data $customerData,
\Magento\Customer\Helper\Address $customerAddress,
- \Magento\Core\Model\Registry $coreRegistry,
- \Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Customer\Model\Session $customerSession
+ \Magento\Core\Model\Registry $coreRegistry
) {
$this->_customerData = $customerData;
$this->_customerAddress = $customerAddress;
$this->_coreRegistry = $coreRegistry;
- $this->_storeManager = $storeManager;
- $this->_customerSession = $customerSession;
}
/**
@@ -217,16 +201,7 @@ class Observer
$customer->save();
}
- if (!$this->_storeManager->getStore()->isAdmin()) {
- $validationMessage = $this->_customerData->getVatValidationUserMessage($customerAddress,
- $customer->getDisableAutoGroupChange(), $result);
-
- if (!$validationMessage->getIsError()) {
- $this->_customerSession->addSuccess($validationMessage->getMessage());
- } else {
- $this->_customerSession->addError($validationMessage->getMessage());
- }
- }
+ $customerAddress->setVatValidationResult($result);
}
} catch (\Exception $e) {
$this->_coreRegistry->register(self::VIV_PROCESSED_FLAG, false, true);
diff --git a/app/code/Magento/Customer/Model/Resource/Address/Attribute/Source/Country.php b/app/code/Magento/Customer/Model/Resource/Address/Attribute/Source/Country.php
index 073b4abb1c8..629cc593141 100644
--- a/app/code/Magento/Customer/Model/Resource/Address/Attribute/Source/Country.php
+++ b/app/code/Magento/Customer/Model/Resource/Address/Attribute/Source/Country.php
@@ -58,7 +58,7 @@ class Country extends \Magento\Eav\Model\Entity\Attribute\Source\Table
}
/**
- * Retreive all options
+ * Retrieve all options
*
* @return array
*/
diff --git a/app/code/Magento/Customer/Model/Resource/Address/Attribute/Source/Region.php b/app/code/Magento/Customer/Model/Resource/Address/Attribute/Source/Region.php
index b1058355480..a9e3b867b52 100644
--- a/app/code/Magento/Customer/Model/Resource/Address/Attribute/Source/Region.php
+++ b/app/code/Magento/Customer/Model/Resource/Address/Attribute/Source/Region.php
@@ -58,7 +58,7 @@ class Region extends \Magento\Eav\Model\Entity\Attribute\Source\Table
}
/**
- * Retreive all region options
+ * Retrieve all region options
*
* @return array
*/
diff --git a/app/code/Magento/Customer/Model/Resource/Customer/Collection.php b/app/code/Magento/Customer/Model/Resource/Customer/Collection.php
index f578d61c893..c361746935a 100644
--- a/app/code/Magento/Customer/Model/Resource/Customer/Collection.php
+++ b/app/code/Magento/Customer/Model/Resource/Customer/Collection.php
@@ -36,11 +36,21 @@ namespace Magento\Customer\Model\Resource\Customer;
class Collection extends \Magento\Eav\Model\Entity\Collection\AbstractCollection
{
+ /**
+ * Name of collection model
+ */
+ const CUSTOMER_MODEL_NAME = 'Magento\Customer\Model\Customer';
+
/**
* @var \Magento\Object\Copy\Config
*/
protected $_fieldsetConfig;
+ /**
+ * @var string
+ */
+ protected $_modelName;
+
/**
* @param \Magento\Event\ManagerInterface $eventManager
* @param \Magento\Logger $logger
@@ -52,6 +62,7 @@ class Collection extends \Magento\Eav\Model\Entity\Collection\AbstractCollection
* @param \Magento\Eav\Model\Resource\Helper $resourceHelper
* @param \Magento\Validator\UniversalFactory $universalFactory
* @param \Magento\Object\Copy\Config $fieldsetConfig
+ * @param string $modelName
*/
public function __construct(
\Magento\Event\ManagerInterface $eventManager,
@@ -63,9 +74,11 @@ class Collection extends \Magento\Eav\Model\Entity\Collection\AbstractCollection
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Eav\Model\Resource\Helper $resourceHelper,
\Magento\Validator\UniversalFactory $universalFactory,
- \Magento\Object\Copy\Config $fieldsetConfig
+ \Magento\Object\Copy\Config $fieldsetConfig,
+ $modelName = self::CUSTOMER_MODEL_NAME
) {
$this->_fieldsetConfig = $fieldsetConfig;
+ $this->_modelName = $modelName;
parent::__construct(
$eventManager,
$logger,
@@ -84,7 +97,7 @@ class Collection extends \Magento\Eav\Model\Entity\Collection\AbstractCollection
*/
protected function _construct()
{
- $this->_init('Magento\Customer\Model\Customer', 'Magento\Customer\Model\Resource\Customer');
+ $this->_init($this->_modelName, 'Magento\Customer\Model\Resource\Customer');
}
/**
diff --git a/app/code/Magento/Customer/Model/Resource/Group/Collection.php b/app/code/Magento/Customer/Model/Resource/Group/Collection.php
index 334e515dc87..20d3ed35530 100644
--- a/app/code/Magento/Customer/Model/Resource/Group/Collection.php
+++ b/app/code/Magento/Customer/Model/Resource/Group/Collection.php
@@ -82,7 +82,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
}
/**
- * Retreive option array
+ * Retrieve option array
*
* @return array
*/
@@ -92,7 +92,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
}
/**
- * Retreive option hash
+ * Retrieve option hash
*
* @return array
*/
diff --git a/app/code/Magento/Customer/Model/Resource/Setup.php b/app/code/Magento/Customer/Model/Resource/Setup.php
index b8025a63bc8..dfbbdd4d661 100644
--- a/app/code/Magento/Customer/Model/Resource/Setup.php
+++ b/app/code/Magento/Customer/Model/Resource/Setup.php
@@ -161,7 +161,7 @@ class Setup extends \Magento\Eav\Model\Entity\Setup
}
/**
- * Retreive default entities: customer, customer_address
+ * Retrieve default entities: customer, customer_address
*
* @return array
*/
diff --git a/app/code/Magento/Customer/etc/adminhtml/di.xml b/app/code/Magento/Customer/etc/adminhtml/di.xml
index fe1f5d11436..0c16ddd66c5 100644
--- a/app/code/Magento/Customer/etc/adminhtml/di.xml
+++ b/app/code/Magento/Customer/etc/adminhtml/di.xml
@@ -24,9 +24,15 @@
*/
-->
<config>
+ <preference for="Magento\Customer\Model\Customer" type="Magento\Customer\Model\Backend\Customer" />
<type name="Magento\Customer\Model\Session">
<param name="sessionName">
<value>adminhtml</value>
</param>
</type>
+ <type name="Magento\Customer\Model\Resource\Customer\Collection">
+ <param name="modelName">
+ <value>Magento\Customer\Model\Backend\Customer</value>
+ </param>
+ </type>
</config>
diff --git a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_edit.xml b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_edit.xml
index befdce1ccfd..40327482b2c 100644
--- a/app/code/Magento/Customer/view/adminhtml/layout/customer_index_edit.xml
+++ b/app/code/Magento/Customer/view/adminhtml/layout/customer_index_edit.xml
@@ -28,7 +28,7 @@
<block class="Magento\Customer\Block\Adminhtml\Edit" name="customer_edit"/>
</referenceContainer>
<referenceBlock name="head">
- <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\Backend\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_Catalog::catalog/product/composite/configure.js</argument>
@@ -58,7 +58,7 @@
</block>
</referenceContainer>
<referenceContainer name="js">
- <block class="Magento\Adminhtml\Block\Template" template="Magento_Customer::edit/js.phtml" name="customer.edit.js" as="customer_edit_js"/>
+ <block class="Magento\Backend\Block\Template" template="Magento_Customer::edit/js.phtml" name="customer.edit.js" as="customer_edit_js"/>
</referenceContainer>
<referenceBlock name="customer_edit_tabs">
<action method="addTab">
diff --git a/app/code/Magento/Customer/view/email/account_new.html b/app/code/Magento/Customer/view/email/account_new.html
index fafe6fd5b61..1b9a1b49635 100644
--- a/app/code/Magento/Customer/view/email/account_new.html
+++ b/app/code/Magento/Customer/view/email/account_new.html
@@ -21,18 +21,18 @@ body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif;
<table bgcolor="FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
<tr>
<td valign="top">
- <a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
+ <a href="{{store url=''}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
</tr>
<!-- [ middle starts here] -->
<tr>
<td valign="top">
- <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Dear {{escapehtml var=$customer.name}},</h1>
- <p style="font-size:12px; line-height:16px; margin:0 0 16px 0;">Welcome to {{var store.getFrontendName()}}. To log in when visiting our site just click <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">Login</a> or <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">My Account</a> at the top of every page, and then enter your e-mail address and password.</p>
+ <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Dear {{escapehtml var=$customer.name}},</h1>
+ <p style="font-size:12px; line-height:16px; margin:0 0 16px 0;">Welcome to {{var store.getFrontendName()}}. To log in when visiting our site just click <a href="{{store url='customer/account/'}}" style="color:#1E7EC8;">Login</a> or <a href="{{store url='customer/account/'}}" style="color:#1E7EC8;">My Account</a> at the top of every page, and then enter your e-mail address and password.</p>
<p style="border:1px solid #E0E0E0; font-size:12px; line-height:16px; margin:0; padding:13px 18px; background:#f9f9f9;">
Use the following values when prompted to log in:<br/>
<strong>E-mail</strong>: {{var customer.email}}<br/>
<strong>Password</strong>: Only you know that! (Hint: It’s the password you created at {{var store.getFrontendName()}})<br/>
- Forgot your Account password? No problems. Click <a href="{{store url="customer/account/createpassword/" _query_id=$customer.id _query_token=$customer.rp_token}}">here</a> to reset it.</p>
+ Forgot your Account password? No problems. Click <a href="{{store url='customer/account/createpassword/' _query_id=$customer.id _query_token=$customer.rp_token}}">here</a> to reset it.</p>
</p>
<p style="font-size:12px; line-height:16px; margin:0 0 8px 0;">When you log in to your account, you will be able to do the following:</p>
<ul style="font-size:12px; line-height:16px; margin:0 0 16px 0; padding:0;">
diff --git a/app/code/Magento/Customer/view/email/account_new_confirmed.html b/app/code/Magento/Customer/view/email/account_new_confirmed.html
index 1d9a5930011..62a7095eb0d 100644
--- a/app/code/Magento/Customer/view/email/account_new_confirmed.html
+++ b/app/code/Magento/Customer/view/email/account_new_confirmed.html
@@ -26,7 +26,7 @@ body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif;
<!-- [ middle starts here] -->
<tr>
<td valign="top">
- <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Dear {{escapehtml var=$customer.name}},</h1>
+ <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Dear {{escapehtml var=$customer.name}},</h1>
<p style="font-size:12px; line-height:16px; margin:0 0 16px 0;">Welcome to {{var store.getFrontendName()}}. To log in when visiting our site just click <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">Login</a> or <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">My Account</a> at the top of every page, and then enter your e-mail address and password.</p>
<p style="font-size:12px; line-height:16px; margin:0 0 8px 0;">When you log in to your account, you will be able to do the following:</p>
<ul style="font-size:12px; line-height:16px; margin:0 0 16px 0; padding:0;">
diff --git a/app/code/Magento/Customer/view/frontend/account/dashboard/address.phtml b/app/code/Magento/Customer/view/frontend/account/dashboard/address.phtml
index b0c420fc344..0346fd1d628 100644
--- a/app/code/Magento/Customer/view/frontend/account/dashboard/address.phtml
+++ b/app/code/Magento/Customer/view/frontend/account/dashboard/address.phtml
@@ -32,7 +32,7 @@
<div class="box address billing">
<strong class="subtitle">
<span><?php echo __('Default Billing Address') ?></span>
- <a class="action edit" href="<?php echo $this->getPrimaryBillingAddressEditUrl() ?>"><span><?php echo __('Edit Address') ?></span></a>
+ <a class="action edit" href="<?php echo $this->getPrimaryBillingAddressEditUrl() ?>" data-ui-id="default-billing-edit-link"><span><?php echo __('Edit Address') ?></span></a>
</strong>
<address>
<?php echo $this->getPrimaryBillingAddressHtml() ?>
@@ -41,7 +41,7 @@
<div class="box address shipping">
<strong class="subtitle">
<span><?php echo __('Default Shipping Address') ?></span>
- <a class="action edit" href="<?php echo $this->getPrimaryShippingAddressEditUrl() ?>"><span><?php echo __('Edit Address') ?></span></a>
+ <a class="action edit" href="<?php echo $this->getPrimaryShippingAddressEditUrl() ?>" data-ui-id="default-shipping-edit-link"><span><?php echo __('Edit Address') ?></span></a>
</strong>
<address>
<?php echo $this->getPrimaryShippingAddressHtml() ?>
diff --git a/app/code/Magento/Customer/view/frontend/account/navigation.phtml b/app/code/Magento/Customer/view/frontend/account/navigation.phtml
index 4c32d516857..cab46eb40b9 100644
--- a/app/code/Magento/Customer/view/frontend/account/navigation.phtml
+++ b/app/code/Magento/Customer/view/frontend/account/navigation.phtml
@@ -30,10 +30,10 @@
<strong><?php echo __('My Account'); ?></strong>
</div>
<div class="content">
- <navigation class="account nav">
+ <nav class="account nav">
<ul class="nav items">
<?php echo $this->getChildHtml();?>
</ul>
- </navigation>
+ </nav>
</div>
</div>
diff --git a/app/code/Magento/Directory/Helper/Url.php b/app/code/Magento/Directory/Helper/Url.php
index 4715813156b..e4479a1fb26 100644
--- a/app/code/Magento/Directory/Helper/Url.php
+++ b/app/code/Magento/Directory/Helper/Url.php
@@ -66,7 +66,7 @@ class Url extends \Magento\Core\Helper\Url
$url = $this->_storeManager->getStore()->getBaseUrl()
. $this->_getRequest()->getAlias('rewrite_request_path');
} else {
- $url = $this->getCurrentUrl();
+ $url = $this->_urlBuilder->getCurrentUrl();
}
$params[\Magento\App\Action\Action::PARAM_NAME_URL_ENCODED] = $this->_coreData->urlEncode($url);
return $this->_getUrl('directory/currency/switch', $params);
diff --git a/app/code/Magento/Directory/view/adminhtml/js/optional_zip_countries.phtml b/app/code/Magento/Directory/view/adminhtml/js/optional_zip_countries.phtml
index f57c2bcc72c..8ea42528566 100644
--- a/app/code/Magento/Directory/view/adminhtml/js/optional_zip_countries.phtml
+++ b/app/code/Magento/Directory/view/adminhtml/js/optional_zip_countries.phtml
@@ -29,7 +29,7 @@
/**
* JS block for including Countries with Optional Zip
*
- * @see \Magento\Adminhtml\Block\Template
+ * @see \Magento\Backend\Block\Template
*/
?>
<script type="text/javascript">
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 78dff1cca1e..890f781ec37 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
@@ -93,30 +93,30 @@ class Links
*/
protected $_urlFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase
- * @param \Magento\Downloadable\Helper\File $downloadableFile
- * @param \Magento\Core\Model\Registry $coreRegistry
- * @param \Magento\Backend\Model\Config\Source\Yesno $sourceModel
- * @param \Magento\Downloadable\Model\Link $link
- * @param \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory
- * @param \Magento\Backend\Model\UrlFactory $urlFactory
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase
+ * @param \Magento\Downloadable\Helper\File $downloadableFile
+ * @param \Magento\Core\Model\Registry $coreRegistry
+ * @param \Magento\Backend\Model\Config\Source\Yesno $sourceModel
+ * @param \Magento\Downloadable\Model\Link $link
+ * @param \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory
+ * @param \Magento\Backend\Model\UrlFactory $urlFactory
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase,
- \Magento\Downloadable\Helper\File $downloadableFile,
- \Magento\Core\Model\Registry $coreRegistry,
- \Magento\Backend\Model\Config\Source\Yesno $sourceModel,
- \Magento\Downloadable\Model\Link $link,
- \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory,
- \Magento\Backend\Model\UrlFactory $urlFactory,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase,
+ \Magento\Downloadable\Helper\File $downloadableFile,
+ \Magento\Core\Model\Registry $coreRegistry,
+ \Magento\Backend\Model\Config\Source\Yesno $sourceModel,
+ \Magento\Downloadable\Model\Link $link,
+ \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory,
+ \Magento\Backend\Model\UrlFactory $urlFactory,
+ array $data = array()
+ ) {
$this->_coreRegistry = $coreRegistry;
$this->_coreFileStorageDb = $coreFileStorageDatabase;
$this->_downloadableFile = $downloadableFile;
@@ -173,7 +173,7 @@ class Links
*/
public function getPurchasedSeparatelySelect()
{
- $select = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Html\Select')
+ $select = $this->getLayout()->createBlock('Magento\View\Block\Html\Select')
->setName('product[links_purchased_separately]')
->setId('downloadable_link_purchase_type')
->setOptions($this->_sourceModel->toOptionArray())
diff --git a/app/code/Magento/Downloadable/etc/adminhtml/menu.xml b/app/code/Magento/Downloadable/etc/adminhtml/menu.xml
index 3189e594778..b4652a6aa24 100644
--- a/app/code/Magento/Downloadable/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Downloadable/etc/adminhtml/menu.xml
@@ -27,6 +27,6 @@
-->
<config>
<menu>
- <add id="Magento_Downloadable::report_products_downloads" title="Downloads" module="Magento_Reports" sortOrder="50" parent="Magento_Reports::report_products" action="adminhtml/report_product/downloads" resource="Magento_Reports::downloads"/>
+ <add id="Magento_Downloadable::report_products_downloads" title="Downloads" module="Magento_Reports" sortOrder="50" parent="Magento_Reports::report_products" action="reports/report_product/downloads" resource="Magento_Reports::downloads"/>
</menu>
</config>
diff --git a/app/code/Magento/Downloadable/view/frontend/catalog/product/links.phtml b/app/code/Magento/Downloadable/view/frontend/catalog/product/links.phtml
index 8a7140a47e9..3d84f8141c8 100644
--- a/app/code/Magento/Downloadable/view/frontend/catalog/product/links.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/catalog/product/links.phtml
@@ -18,8 +18,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 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,40 +25,41 @@
<?php /* @var $this \Magento\Downloadable\Block\Catalog\Product\Links */ ?>
<?php $_linksPurchasedSeparately = $this->getLinksPurchasedSeparately(); ?>
<?php if ($this->getProduct()->isSaleable() && $this->hasLinks()):?>
- <dl>
- <?php $_links = $this->getLinks(); ?>
- <?php $_isRequired = $this->getLinkSelectionRequired(); ?>
- <dt><label<?php if ($_isRequired) echo ' class="required"' ?>><?php if ($_isRequired) echo '<em>*</em>' ?><?php echo $this->getLinksTitle() ?></label></dt>
- <dd>
- <ul id="downloadable-links-list" class="options-list">
+ <?php $_links = $this->getLinks(); ?>
+ <?php $_isRequired = $this->getLinkSelectionRequired(); ?>
+ <div class="field downloads<?php if ($_isRequired) echo ' required' ?>">
+ <label class="label"><span><?php echo $this->getLinksTitle() ?></span></label>
+ <div class="control" id="downloadable-links-list">
<?php foreach ($_links as $_link): ?>
- <li>
- <?php if ($_linksPurchasedSeparately): ?>
- <input type="checkbox" <?php if ($_isRequired): ?>data-validate="{'validate-one-checkbox-required-by-name':'downloadable-links-list'}" <?php endif; ?>
- class="checkbox" name="links[]" id="links_<?php echo $_link->getId() ?>"
- value="<?php echo $_link->getId(); ?>" <?php echo $this->getLinkCheckedValue($_link); ?> />
- <?php endif; ?>
- <span class="label">
- <label for="links_<?php echo $_link->getId() ?>">
- <?php echo $this->escapeHtml($_link->getTitle()); ?>
- </label>
- <?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
- (<a href="<?php echo $this->getLinkSamlpeUrl($_link) ?>" <?php echo $this->getIsOpenInNewWindow() ? 'target="_blank"' : ''; ?>><?php echo __('sample') ?></a>)
- <?php endif; ?>
+ <div class="field choice">
<?php if ($_linksPurchasedSeparately): ?>
- <?php echo $this->getFormattedLinkPrice($_link); ?>
+ <input type="checkbox"
+ <?php if ($_isRequired): ?>data-validate="{'validate-one-checkbox-required-by-name':'downloadable-links-list'}" <?php endif; ?>
+ name="links[]"
+ id="links_<?php echo $_link->getId() ?>"
+ value="<?php echo $_link->getId(); ?>" <?php echo $this->getLinkCheckedValue($_link); ?> />
<?php endif; ?>
- </span>
- </li>
+ <label class="label" for="links_<?php echo $_link->getId() ?>">
+ <span><?php echo $this->escapeHtml($_link->getTitle()); ?></span>
+ <?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
+ <a class="sample"
+ href="<?php echo $this->getLinkSamlpeUrl($_link) ?>" <?php echo $this->getIsOpenInNewWindow() ? 'target="_blank"' : ''; ?>>
+ <?php echo __('sample') ?>
+ </a>
+ <?php endif; ?>
+ <?php if ($_linksPurchasedSeparately): ?>
+ <?php echo $this->getFormattedLinkPrice($_link); ?>
+ <?php endif; ?>
+ </label>
+ </div>
<?php endforeach; ?>
- </ul>
-
- <?php if ($_isRequired): ?>
- <span id="links-advice-container"></span>
- <?php endif;?>
- </dd>
- </dl>
+ </div>
+ <?php if ($_isRequired): ?>
+ <span id="links-advice-container"></span>
+ <?php endif;?>
+ </div>
<script type="text/javascript">
+ //<![CDATA[
(function ($) {
head.js("<?php echo $this->getViewFileUrl('Magento_Downloadable::downloadable.js') ?>", function () {
$('#downloadable-links-list').downloadable({
@@ -68,6 +67,7 @@
config: <?php echo $this->getJsonConfig() ?>
});
});
- })(jQuery);
-</script>
+ })(jQuery);
+ //]]>
+ </script>
<?php endif; ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/catalog/product/samples.phtml b/app/code/Magento/Downloadable/view/frontend/catalog/product/samples.phtml
index 64c947f7f8c..0e3559a5e68 100644
--- a/app/code/Magento/Downloadable/view/frontend/catalog/product/samples.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/catalog/product/samples.phtml
@@ -18,27 +18,27 @@
* 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)
*/
-
/**
* Downloadable product links
*
- * @see \Magento\Downloadable\Block\Catalog\Product\Samples
+ * @var $this \Magento\Downloadable\Block\Catalog\Product\Samples
*/
?>
<?php if ($this->hasSamples()): ?>
- <dl class="item-options">
+ <dl class="downloadable samples">
<dt><?php echo $this->getSamplesTitle() ?></dt>
<?php $_samples = $this->getSamples() ?>
<?php foreach ($_samples as $_sample): ?>
<dd>
- <a href="<?php echo $this->getSampleUrl($_sample) ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo $this->escapeHtml($_sample->getTitle()) ?></a>
+ <a href="<?php echo $this->getSampleUrl($_sample) ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>
+ class="sample">
+ <?php echo $this->escapeHtml($_sample->getTitle()) ?>
+ </a>
</dd>
<?php endforeach; ?>
</dl>
diff --git a/app/code/Magento/Downloadable/view/frontend/catalog/product/type.phtml b/app/code/Magento/Downloadable/view/frontend/catalog/product/type.phtml
index a99cd2a1270..95aaf3aa3d6 100644
--- a/app/code/Magento/Downloadable/view/frontend/catalog/product/type.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/catalog/product/type.phtml
@@ -18,8 +18,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 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,16 +25,19 @@
/**
* Downloadable product type
*
- * @see \Magento\Downloadable\Block\Catalog\Product\View\Type
+ * @var $this \Magento\Downloadable\Block\Catalog\Product\View\Type
*/
?>
<?php $_product = $this->getProduct() ?>
-<?php if($_product->isSaleable()): ?>
- <p class="availability in-stock"><?php echo __('Availability:') ?> <span><?php echo __('In stock') ?></span></p>
+<?php if($_product->getIsSalable()): ?>
+ <p class="stock available" title="<?php echo __('Availability') ?>">
+ <span><?php echo __('In stock') ?></span>
+ </p>
<?php else: ?>
- <p class="availability out-of-stock"><?php echo __('Availability:') ?> <span><?php echo __('Out of stock') ?></span></p>
+ <p class="stock unavailable" title="<?php echo __('Availability') ?>">
+ <span><?php echo __('Out of stock') ?></span>
+ </p>
<?php endif; ?>
<?php echo $this->getChildHtml('product_type_data_extra') ?>
-<?php echo $this->getPriceHtml($_product) ?>
<?php echo $this->getChildHtml('samples') ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/checkout/cart/item/default.phtml b/app/code/Magento/Downloadable/view/frontend/checkout/cart/item/default.phtml
index ebcebc2f017..cd08fb99f34 100644
--- a/app/code/Magento/Downloadable/view/frontend/checkout/cart/item/default.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/checkout/cart/item/default.phtml
@@ -18,272 +18,290 @@
* 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();
- $canApplyMsrp = $this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($_item->getProduct(), \Magento\Catalog\Model\Product\Attribute\Source\Msrp\Type::TYPE_BEFORE_ORDER_CONFIRM);
+$_item = $this->getItem();
+$isVisibleProduct = $_item->getProduct()->isVisibleInSiteVisibility();
+$canApplyMsrp = $this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($_item->getProduct(), \Magento\Catalog\Model\Product\Attribute\Source\Msrp\Type::TYPE_BEFORE_ORDER_CONFIRM);
?>
-<tr>
- <td><a href="<?php echo $this->getProductUrl() ?>" class="product-image" title="<?php echo $this->escapeHtml($this->getProductName()) ?>"><img src="<?php echo $this->getProductThumbnailUrl() ?>" width="<?php echo $this->getThumbnailSize()?>" height="<?php echo $this->getThumbnailSize()?>" alt="<?php echo $this->escapeHtml($this->getProductName()) ?>" /></a></td>
- <td>
- <h2 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></h2>
- <?php if ($_options = $this->getOptionList()):?>
- <dl class="item-options">
- <?php foreach ($_options as $_option) : ?>
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
- <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>
+<?php echo $this->getChildHtml('item_extra') ?>
+<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 echo $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image')->init($_item->getProduct(), 'cart_page_product_thumbnail')->toHtml(); ?>
+ <?php if ($this->hasProductUrl()):?></a><?php endif;?>
+ <div class="product details">
+ <strong class="product name">
+ <?php if ($this->hasProductUrl()):?>
+ <a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a>
+ <?php else: ?>
+ <?php echo $this->escapeHtml($this->getProductName()) ?>
+ <?php endif; ?>
+ </strong>
+ <?php if ($_options = $this->getOptionList()):?>
+ <dl class="cart item options">
+ <?php foreach ($_options as $_option) : ?>
+ <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+ <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 endforeach; ?>
+ </dl>
+ <?php endif;?>
+ <?php /* downloadable */ ?>
+ <?php if ($links = $this->getLinks()): ?>
+ <dl class="cart item options">
+ <dt><?php echo $this->getLinksTitle() ?></dt>
+ <?php foreach ($links as $link): ?>
+ <dd><?php echo $this->escapeHtml($link->getTitle()) ?></dd>
+ <?php endforeach; ?>
</dl>
- </div>
<?php endif; ?>
- </dd>
- <?php endforeach; ?>
- </dl>
- <?php endif;?>
- <!-- downloadable -->
- <?php if ($links = $this->getLinks()): ?>
- <dl class="item-options">
- <dt><?php echo $this->getLinksTitle() ?></dt>
- <?php foreach ($links as $link): ?>
- <dd><?php echo $this->escapeHtml($link->getTitle()) ?></dd>
- <?php endforeach; ?>
- </dl>
- <?php endif; ?>
- <!-- EOF downloadable -->
-
- <?php if ($messages = $this->getMessages()): ?>
- <?php foreach ($messages as $message): ?>
- <div class="shopping-cart-item-message <?php echo $message['type'] ?>">
- * <?php echo $this->escapeHtml($message['text']) ?>
- </div>
- <?php endforeach; ?>
- <?php endif; ?>
- </td>
- <td class="a-center">
- <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo __('Edit item parameters') ?>"><?php echo __('Edit') ?></a>
- </td>
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllowInCart()) : ?>
- <td class="a-center">
- <a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getMoveFromCartUrl($_item->getId()); ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Move'); ?></a>
- </td>
- <?php endif ?>
-<?php if ($canApplyMsrp): ?>
- <td class="a-right"<?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?> colspan="2"<?php endif; ?>>
- <span class="cart-price">
- <span class="cart-msrp-unit"><?php echo __('See price before order confirmation.'); ?></span>
- <?php $helpLinkId = 'cart-msrp-help-' . $_item->getId(); ?>
- <a id="<?php echo $helpLinkId ?>" href="#" class="map-help-link"><?php echo __("What's this?"); ?></a>
- <?php $_product = $_item->getProduct(); ?>
- <script type="text/javascript">
- (function ($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/msrp.js') ?>", function () {
- $('#<?php echo $helpLinkId ?>').addToCart({
- popupId: "#<?php echo $helpLinkId ?>",
- productName: '<?php echo $_product->getName() ?>',
- realPrice: '<?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>',
- msrpPrice: '<?php echo $this->helper('Magento\Core\Helper\Data')->currency($_product->getMsrp(),true,true) ?>',
- closeButtonId: '#map-popup-close',
- showAddToCart: false
- });
- });
- })(jQuery);
- </script>
- </span>
- </td>
-<?php else: ?>
-
-
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td class="a-right">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <div class="cart-price">
- <?php endif; ?>
-
+ <?php echo $this->getChildHtml('item_extra'); ?>
+ <?php /* EOF downloadable */ ?>
+ <?php if ($messages = $this->getMessages()): ?>
+ <?php foreach ($messages as $message): ?>
+ <p class="cart item message <?php echo $message['type'] ?>">* <?php echo $this->escapeHtml($message['text']) ?></p>
+ <?php endforeach; ?>
+ <?php endif; ?>
+ <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
+ <?php if ($addInfoBlock): ?>
+ <?php echo $addInfoBlock->setItem($_item)->toHtml() ?>
+ <?php endif;?>
+ </div>
+ <?php $cols = 1; ?>
+ </td>
+ <?php if ($canApplyMsrp): ?>
+ <td class="col msrp"<?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?> colspan="2"<?php endif; ?>>
+ <span class="cart price">
+ <span class="msrp notice"><?php echo __('See price before order confirmation.'); ?></span>
+ <?php $helpLinkId = 'cart-msrp-help-' . $_item->getId(); ?>
+ <a id="<?php echo $helpLinkId ?>" href="#" class="action help map"><?php echo __("What's this?"); ?></a>
+ <script type="text/javascript">
+ Catalog.Map.addHelpLink($('<?php echo $helpLinkId ?>'), "<?php echo __("What's this?") ?>");
+ </script>
+ </span>
+ <?php $cols++; ?>
+ </td>
+ <?php else: ?>
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
+ <td class="col price excl tax">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
+ <?php else: ?>
+ <span class="cart price">
+ <?php endif; ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
<?php else: ?>
<?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
<?php endif; ?>
-
- </div>
-
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="weee"><?php echo __('Total'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
+ </span>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+ <div class="cart tax info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
+ <?php endforeach; ?>
+ <?php endif; ?>
</div>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <div class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
+ <span class="weee"><?php echo __('Total'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
+ </div>
+ <?php endif; ?>
<?php endif; ?>
+ <?php $cols++; ?>
+ </td>
<?php endif; ?>
- </td>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <div class="cart-price">
- <?php endif; ?>
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
+ <td class="col price incl tax">
+ <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
+ <?php else: ?>
+ <span class="cart price">
+ <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
- <?php endif; ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
+ <?php else: ?>
+ <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
+ <?php endif; ?>
+ </span>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
- </div>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+ <div class="cart tax info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
+ <?php endforeach; ?>
+ <?php endif; ?>
+ </div>
- <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <div class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
+ <span class="weee"><?php echo __('Total incl. tax'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
+ </div>
+ <?php endif; ?>
<?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="weee"><?php echo __('Total incl. tax'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
- </div>
- <?php endif; ?>
+ <?php $cols++; ?>
+ </td>
<?php endif; ?>
- </td>
<?php endif; ?>
-<?php endif; ?>
- <td class="a-center">
- <input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>" size="4" title="<?php echo __('Qty') ?>" class="input-text qty" maxlength="12" />
- </td>
+ <td class="col qty">
+ <div class="control qty">
+ <input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>" type="text" size="4" title="<?php echo __('Qty') ?>" class="input-text qty" maxlength="12" data-validate="{required:true,'validate-greater-than-zero':true}"/>
+ </div>
+ <?php $cols++; ?>
+ </td>
<?php if (($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
- <td class="a-right">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <div class="cart-price">
- <?php endif; ?>
+ <td class="col subtotal excl tax">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
+ <?php else: ?>
+ <span class="cart price">
+ <?php endif; ?>
- <?php if ($canApplyMsrp): ?>
- <span class="cart-msrp-subtotal">--</span>
- <?php else: ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
+ <?php if ($canApplyMsrp): ?>
+ <span class="cart msrp subtotal">--</span>
<?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
+ <?php else: ?>
+ <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
+ <?php endif; ?>
<?php endif; ?>
- <?php endif; ?>
- </div>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+ </span>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
- <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php endif; ?>
- </div>
+ <div class="cart tax info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
+ <?php endforeach; ?>
+ <?php endif; ?>
+ </div>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="weee"><?php echo __('Total'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
- </div>
+ <div class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
+ <span class="weee"><?php echo __('Total'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
+ </div>
+ <?php endif; ?>
<?php endif; ?>
- <?php endif; ?>
- </td>
+ <?php $cols++; ?>
+ </td>
<?php endif; ?>
<?php if (($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
- <td>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <div class="cart-price">
- <?php endif; ?>
-
- <?php if ($canApplyMsrp): ?>
- <span class="cart-msrp-subtotal">--</span>
- <?php else: ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
+ <td class="col subtotal incl tax">
+ <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
<?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
+ <span class="cart price">
<?php endif; ?>
- <?php endif; ?>
-
- </div>
-
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
+ <?php if ($canApplyMsrp): ?>
+ <span class="cart msrp subtotal">--</span>
+ <?php else: ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
+ <?php else: ?>
+ <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
+ <?php endif; ?>
<?php endif; ?>
- </div>
+ </span>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="weee"><?php echo __('Total incl. tax'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
+ <div class="cart tax info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
+ <?php endforeach; ?>
+ <?php endif; ?>
</div>
+
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <div class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
+ <span class="weee"><?php echo __('Total incl. tax'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
+ </div>
+ <?php endif; ?>
<?php endif; ?>
- <?php endif; ?>
- </td>
+ <?php $cols++; ?>
+ </td>
<?php endif; ?>
- <td class="a-center"><a href="<?php echo $this->getDeleteUrl() ?>" title="<?php echo __('Remove Item')?>" class="btn-remove btn-remove2"><?php echo __('Remove Item') ?></a></td>
-</tr>
+ </tr>
+ <tr class="item actions">
+ <td colspan="<?php echo $cols;?>">
+ <div class="actions">
+ <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllowInCart()) : ?>
+ <?php if ($isVisibleProduct): ?>
+ <a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getMoveFromCartUrl($_item->getId()); ?>" class="use-ajax action towishlist">
+ <span><?php echo __('Move to Wishlist'); ?></span>
+ </a>
+ <?php endif ?>
+ <?php endif ?>
+ <?php if ($isVisibleProduct): ?>
+ <a class="action edit" href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo __('Edit item parameters') ?>"><span><?php echo __('Edit') ?></span></a>
+ <?php endif ?>
+ <a href="<?php echo $this->getDeleteUrl()?>" title="<?php echo __('Remove item')?>" class="action delete"><span><?php echo __('Remove item')?></span></a>
+ </div>
+ </td>
+ </tr>
+</tbody>
diff --git a/app/code/Magento/Downloadable/view/frontend/checkout/multishipping/item/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/checkout/multishipping/item/downloadable.phtml
index 374f81e2c63..b73e8678748 100644
--- a/app/code/Magento/Downloadable/view/frontend/checkout/multishipping/item/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/checkout/multishipping/item/downloadable.phtml
@@ -18,40 +18,39 @@
* 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)
*/
?>
-<h3 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></h3>
-<!-- item custom options -->
-<?php if ($_options = $this->getOptionList()):?>
-<dl class="item-options">
- <?php foreach ($_options as $_option) : ?>
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
- <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">
+<div class="product details">
+ <strong class="product name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></strong>
+ <?php if ($_options = $this->getOptionList()): ?>
+ <dl class="item options">
+ <?php foreach ($_options as $_option) : ?>
+ <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
<dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
- <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
- </dl>
- </div>
- <?php endif; ?>
- </dd>
- <?php endforeach; ?>
-</dl>
-<?php endif;?>
-<!-- / -->
- <!-- downloadable -->
+ <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'])): ?>
+ <dl class="item options">
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+ <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
+ </dl>
+ <?php endif; ?>
+ </dd>
+ <?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 as $link): ?>
- <dd><?php echo $this->escapeHtml($link->getTitle()); ?></dd>
- <?php endforeach; ?>
- </dl>
+ <dl class="item options">
+ <dt><?php echo $this->getLinksTitle() ?></dt>
+ <?php foreach ($links as $link): ?>
+ <dd><?php echo $this->escapeHtml($link->getTitle()); ?></dd>
+ <?php endforeach; ?>
+ </dl>
+ <?php endif; ?>
+ <?php /* EOF downloadable */ ?>
+ <?php if ($addtInfoBlock = $this->getProductAdditionalInformationBlock()): ?>
+ <?php echo $addtInfoBlock->setItem($this->getItem())->toHtml() ?>
<?php endif; ?>
- <!-- EOF downloadable -->
+</div>
diff --git a/app/code/Magento/Downloadable/view/frontend/checkout/onepage/review/item.phtml b/app/code/Magento/Downloadable/view/frontend/checkout/onepage/review/item.phtml
index cdbdcffdae0..c9889e3e48b 100644
--- a/app/code/Magento/Downloadable/view/frontend/checkout/onepage/review/item.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/checkout/onepage/review/item.phtml
@@ -18,229 +18,226 @@
* 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><h3 class="product-name"><?php echo $this->escapeHtml($this->getProductName()) ?></h3>
- <!-- item custom options -->
+ <td class="col item"><strong class="product name"><?php echo $this->escapeHtml($this->getProductName()) ?></strong>
<?php if ($_options = $this->getOptionList()):?>
- <dl class="item-options">
- <?php foreach ($_options as $_option) : ?>
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
- <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 endforeach; ?>
- </dl>
+ <dl class="review item options">
+ <?php foreach ($_options as $_option) : ?>
+ <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
+ <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
+ <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 endforeach; ?>
+ </dl>
<?php endif;?>
<?php if ($links = $this->getLinks()): ?>
- <dl class="item-options">
- <dt><?php echo $this->getLinksTitle() ?></dt>
- <?php foreach ($links as $link): ?>
- <dd><?php echo $this->escapeHtml($link->getTitle()) ?></dd>
- <?php endforeach; ?>
- </dl>
+ <dl class="review item options">
+ <dt><?php echo $this->getLinksTitle() ?></dt>
+ <?php foreach ($links as $link): ?>
+ <dd><?php echo $this->escapeHtml($link->getTitle()) ?></dd>
+ <?php endforeach; ?>
+ </dl>
<?php endif; ?>
- <!-- EOF downloadable -->
+ <?php /* EOF downloadable */ ?>
+ <?php if ($addtInfoBlock = $this->getProductAdditionalInformationBlock()):?>
+ <?php echo $addtInfoBlock->setItem($_item)->toHtml() ?>
+ <?php endif;?>
</td>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td class="a-right">
+<?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
+ <td class="col price excl tax">
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
<?php else: ?>
- <div class="cart-price">
+ <span class="cart price">
<?php endif; ?>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
- <?php endif; ?>
-
- </div>
-
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
+ <?php else: ?>
+ <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
+ <?php endif; ?>
+ </span>
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
+ <div class="cart tax info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?><br />
+ <?php endforeach; ?>
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
+ <small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small><br />
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?><br />
+ <?php endforeach; ?>
</small>
<?php endif; ?>
</div>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
+ <div class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
+ <?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
</div>
<?php endif; ?>
<?php endif; ?>
</td>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td>
+<?php endif; ?>
+<?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
+ <td class="col price incl tax">
<?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
<?php else: ?>
- <div class="cart-price">
+ <span class="cart price">
<?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
- <?php endif; ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
+ <?php else: ?>
+ <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
+ <?php endif; ?>
- </div>
+ </span>
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
+ <div class="cart tax info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?><br />
+ <?php endforeach; ?>
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
+ <small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small><br />
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?><br />
+ <?php endforeach; ?>
</small>
<?php endif; ?>
</div>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
+ <div class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
+ <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
</div>
<?php endif; ?>
<?php endif; ?>
</td>
- <?php endif; ?>
- <td class="a-center"><?php echo $_item->getQty() ?></td>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td class="a-right">
+<?php endif; ?>
+ <td class="col qty"><span class="qty"><?php echo $_item->getQty() ?></span></td>
+<?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
+ <td class="col subtotal excl tax">
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
<?php else: ?>
- <div class="cart-price">
+ <span class="cart price">
<?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
- <?php endif; ?>
-
- </div>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
+ <?php else: ?>
+ <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
+ <?php endif; ?>
+ </span>
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
+ <div class="cart tax info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span><br />
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?><br />
+ <?php endforeach; ?>
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
+ <small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small><br />
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?><br />
+ <?php endforeach; ?>
</small>
<?php endif; ?>
</div>
-
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
+ <div class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
+ <?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
</div>
<?php endif; ?>
<?php endif; ?>
</td>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td>
+<?php endif; ?>
+<?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
+ <td class="col subtotal incl tax">
<?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
<?php else: ?>
- <div class="cart-price">
+ <span class="cart price">
<?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
- <?php endif; ?>
-
- </div>
-
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
+ <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
+ <?php else: ?>
+ <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
+ <?php endif; ?>
+ </span>
<?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
+ <div class="cart tax info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span><br />
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?><br />
+ <?php endforeach; ?>
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
+ <small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small><br />
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?><br />
+ <?php endforeach; ?>
</small>
<?php endif; ?>
</div>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
+ <div class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
+ <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
</div>
<?php endif; ?>
<?php endif; ?>
</td>
- <?php endif; ?>
+<?php endif; ?>
</tr>
diff --git a/app/code/Magento/Downloadable/view/frontend/checkout/success.phtml b/app/code/Magento/Downloadable/view/frontend/checkout/success.phtml
index ab901cfed25..6c6367c6a8f 100644
--- a/app/code/Magento/Downloadable/view/frontend/checkout/success.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/checkout/success.phtml
@@ -18,8 +18,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 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/Downloadable/view/frontend/customer/products/list.phtml b/app/code/Magento/Downloadable/view/frontend/customer/products/list.phtml
index 737fb159424..4e6157bf2eb 100644
--- a/app/code/Magento/Downloadable/view/frontend/customer/products/list.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/customer/products/list.phtml
@@ -18,57 +18,59 @@
* 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\Downloadable\Block\Customer\Products\ListProducts
+ * @var $this \Magento\Downloadable\Block\Customer\Products\ListProducts
*/
?>
<?php $_items = $this->getItems(); ?>
-<div class="page-title">
- <h1><?php echo __('My Downloadable Products') ?></h1>
+<div class="downloadable products toolbar">
+ <?php echo $this->getChildHtml('pager'); ?>
</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<?php echo $this->getChildHtml('pager'); ?>
<?php if(count($_items)): ?>
- <table class="data-table" id="my-downloadable-products-table">
- <col width="1" />
- <col width="1" />
- <col />
- <col width="1" />
- <col width="1" />
+ <table id="my-downloadable-products-table" class="data table downloadable products">
<thead>
<tr>
- <th><?php echo __('Order #') ?></th>
- <th><?php echo __('Date') ?></th>
- <th><?php echo __('Title') ?></th>
- <th><?php echo __('Status') ?></th>
- <th><span class="nobr"><?php echo __('Remaining Downloads') ?></span></th>
+ <th class="col id"><?php echo __('Order #') ?></th>
+ <th class="col date"><?php echo __('Date') ?></th>
+ <th class="col title"><?php echo __('Title') ?></th>
+ <th class="col status"><?php echo __('Status') ?></th>
+ <th class="col remaining"><?php echo __('Remaining Downloads') ?></th>
</tr>
</thead>
<tbody>
- <?php $_odd = ''; ?>
- <?php foreach ($_items as $_item): ?>
- <tr>
- <td><a href="<?php echo $this->getOrderViewUrl($_item->getPurchased()->getOrderId()) ?>" title="<?php echo __('View Order') ?>"><?php echo $_item->getPurchased()->getOrderIncrementId() ?></a></td>
- <td><span class="nobr"><?php echo $this->formatDate($_item->getPurchased()->getCreatedAt()) ?></span></td>
- <td><?php echo $this->escapeHtml($_item->getPurchased()->getProductName()) ?> - <a href="<?php echo $this->getDownloadUrl($_item) ?>" title="<?php echo __('Start Download') ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo $this->escapeHtml($_item->getLinkTitle()) ?></a></td>
- <td><em><?php echo __(ucfirst($_item->getStatus())) ?></em></td>
- <td><?php echo $this->getRemainingDownloads($_item) ?></td>
- </tr>
- <?php endforeach; ?>
+ <?php foreach ($_items as $_item): ?>
+ <tr>
+ <td class="col id">
+ <a href="<?php echo $this->getOrderViewUrl($_item->getPurchased()->getOrderId()) ?>" title="<?php echo __('View Order') ?>">
+ <?php echo $_item->getPurchased()->getOrderIncrementId() ?>
+ </a>
+ </td>
+ <td class="col date"><?php echo $this->formatDate($_item->getPurchased()->getCreatedAt()) ?></td>
+ <td class="col title">
+ <?php echo $this->escapeHtml($_item->getPurchased()->getProductName()) ?> - <a href="<?php echo $this->getDownloadUrl($_item) ?>" title="<?php echo __('Start Download') ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo $this->escapeHtml($_item->getLinkTitle()) ?></a>
+ </td>
+ <td class="col status"><?php echo __(ucfirst($_item->getStatus())) ?></td>
+ <td class="col remaining"><?php echo $this->getRemainingDownloads($_item) ?></td>
+ </tr>
+ <?php endforeach; ?>
</tbody>
</table>
- <script type="text/javascript">(function($) {$('#my-downloadable-products-table').decorate('table')})(jQuery)</script>
<?php else: ?>
- <p><?php echo __('You have not purchased any downloadable products.'); ?></p>
+ <p class="empty"><?php echo __('You have not purchased any downloadable products yet.'); ?></p>
<?php endif; ?>
-<?php echo $this->getChildHtml('pager'); ?>
-<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="downloadable products toolbar">
+ <?php echo $this->getChildHtml('pager'); ?>
</div>
+
+<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>
\ No newline at end of file
diff --git a/app/code/Magento/Downloadable/view/frontend/downloadable.js b/app/code/Magento/Downloadable/view/frontend/downloadable.js
index 9d125c4e479..9373fe88260 100644
--- a/app/code/Magento/Downloadable/view/frontend/downloadable.js
+++ b/app/code/Magento/Downloadable/view/frontend/downloadable.js
@@ -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 mage downloadable view
- * @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)
*/
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 1c26d3d58ae..a476967ac50 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
@@ -24,12 +24,12 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="product.info">
+ <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"/>
<block class="Magento\CatalogInventory\Block\Stockqty\DefaultStockqty" name="product.info.downloadable.extra" as="product_type_data_extra" template="stockqty/default.phtml"/>
</block>
- </referenceBlock>
+ </referenceContainer>
<referenceBlock name="product.info.options.wrapper">
<block class="Magento\Downloadable\Block\Catalog\Product\Links" name="product.info.downloadable.options" as="type_downloadable_options" before="-" template="catalog/product/links.phtml"/>
</referenceBlock>
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_index.xml
index 87ee2ecd428..b8f5e192134 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_index.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/checkout_cart_index.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="checkout.cart">
+ <referenceBlock name="checkout.cart.form">
<block class="Magento\Downloadable\Block\Checkout\Cart\Item\Renderer" as="downloadable" template="checkout/cart/item/default.phtml"/>
</referenceBlock>
</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/base/checkout_cart_index.xml b/app/code/Magento/Downloadable/view/frontend/layout/default.xml
similarity index 89%
rename from app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/base/checkout_cart_index.xml
rename to app/code/Magento/Downloadable/view/frontend/layout/default.xml
index b8f5e192134..54612da7f82 100644
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/base/checkout_cart_index.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/default.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="checkout.cart.form">
- <block class="Magento\Downloadable\Block\Checkout\Cart\Item\Renderer" as="downloadable" template="checkout/cart/item/default.phtml"/>
+ <referenceBlock name="minicart">
+ <block class="Magento\Downloadable\Block\Checkout\Cart\Item\Renderer" as="downloadable" template="Magento_Checkout::cart/sidebar/default.phtml"/>
</referenceBlock>
</layout>
diff --git a/app/code/Magento/Downloadable/view/frontend/sales/order/creditmemo/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/sales/order/creditmemo/items/renderer/downloadable.phtml
index 738e4d15f49..def0cc43975 100644
--- a/app/code/Magento/Downloadable/view/frontend/sales/order/creditmemo/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/sales/order/creditmemo/items/renderer/downloadable.phtml
@@ -18,8 +18,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 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,227 +27,228 @@
<?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>
+ <td class="col name">
+ <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
<?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>
+ <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; ?>
- </dd>
- <?php else: ?>
- <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
- <?php endif; ?>
- <?php endforeach; ?>
- </dl>
+ <?php endforeach; ?>
+ </dl>
<?php endif; ?>
-
- <!-- downloadable -->
+ <?php /* downloadable */?>
<?php if ($links = $this->getLinks()): ?>
- <dl class="item-options">
+ <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 /* 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()): ?>
- <br/><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->prepareSku($this->getSku()) ?></td>
- <td class="a-right nowrap">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax()): ?>
- <span class="price-excl-tax">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
+ <td class="col sku"><?php echo $this->prepareSku($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()): ?>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart price">
<?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?php else: ?>
- <span class="cart-price">
+ <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ </span>
<?php endif; ?>
+ <?php endif; ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?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()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
+ <?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()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
+ <?php else: ?>
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
+ <?php endif; ?>
+ </span>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
- </span>
- <?php endif; ?>
+ <?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;">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
+ <?php endforeach; ?>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
+ <?php endforeach; ?>
+ </small>
<?php endif; ?>
</span>
- <br />
+
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
+ </span>
+ <?php endif; ?>
<?php endif; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax()): ?>
- <span class="price-incl-tax">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?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">
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart price">
<?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?php else: ?>
- <span class="cart-price">
+ <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ </span>
<?php endif; ?>
+ <?php endif; ?>
+ <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?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')->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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
+ <?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;">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
<?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
<?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
- </span>
+ </small>
<?php endif; ?>
+ </span>
+
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
+ </span>
<?php endif; ?>
+ <?php endif; ?>
</span>
<?php endif; ?>
</td>
- <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
- <td class="a-right nowrap">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax()): ?>
- <span class="price-excl-tax">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
+ <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()): ?>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart price">
<?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <?php else: ?>
- <span class="cart-price">
+ <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ </span>
<?php endif; ?>
+ <?php endif; ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?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')->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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <?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;">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
<?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
<?php endforeach; ?>
- </small>
- <?php endif; ?>
+ </small>
+ <?php endif; ?>
</span>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
- </span>
- <?php endif; ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
+ </span>
<?php endif; ?>
+ <?php endif; ?>
</span>
<br />
- <?php endif; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax()): ?>
- <span class="price-incl-tax">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
+ <?php endif; ?>
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
+ <span class="price incl tax">
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart price">
<?php endif; ?>
<span class="label"><?php echo __('Incl. Tax'); ?>:</span>
<?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
@@ -258,52 +257,50 @@
<?php endif; ?>
<?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
<?php else: ?>
- <span class="cart-price">
+ <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()->getWeeeTaxAppliedRowAmount()); ?>
- <?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())): ?>
+ <?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()->getWeeeTaxAppliedRowAmount()); ?>
+ <?php else: ?>
+ <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
+ <?php endif; ?>
+ </span>
- <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
+ <?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;">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
<?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
<?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
- </span>
+ </small>
<?php endif; ?>
+ </span>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
+ </span>
<?php endif; ?>
-
- </span>
+ <?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/Downloadable/view/frontend/sales/order/invoice/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/sales/order/invoice/items/renderer/downloadable.phtml
index 9da5814e059..e7e668b6632 100644
--- a/app/code/Magento/Downloadable/view/frontend/sales/order/invoice/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/sales/order/invoice/items/renderer/downloadable.phtml
@@ -18,8 +18,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 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,282 +26,283 @@
?>
<?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">
- <?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>
+ <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; ?>
- </dd>
- <?php else: ?>
- <dd><?php echo $this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) ) ?></dd>
- <?php endif; ?>
- <?php endforeach; ?>
- </dl>
+ <?php endforeach; ?>
+ </dl>
<?php endif; ?>
-
- <!-- downloadable -->
+ <?php /* downloadable */ ?>
<?php if ($links = $this->getLinks()): ?>
- <dl class="item-options">
+ <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 /* 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()): ?>
- <br/><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->prepareSku($this->getSku()) ?></td>
- <td class="a-right nowrap">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax()): ?>
- <span class="price-excl-tax">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
+ <td class="col sku"><?php echo $this->prepareSku($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()): ?>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart price">
<?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?php else: ?>
- <span class="cart-price">
+ <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ </span>
<?php endif; ?>
+ <?php endif; ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?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()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
+ <?php else: ?>
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
+ <?php endif; ?>
+ </span>
- <?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()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
+ <?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;">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
<?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
<?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
- </span>
+ </small>
<?php endif; ?>
+ </span>
+
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
+ </span>
<?php endif; ?>
+ <?php endif; ?>
</span>
<br />
<?php endif; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax()): ?>
- <span class="price-incl-tax">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
+ <span class="price incl tax">
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart price">
<?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?php else: ?>
- <span class="cart-price">
+ <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ </span>
<?php endif; ?>
+ <?php endif; ?>
+ <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
+ <?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')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
- </span>
- <?php endif; ?>
+ <?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;">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
+ <?php endforeach; ?>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
+ <?php endforeach; ?>
+ </small>
<?php endif; ?>
</span>
+
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
+ </span>
+ <?php endif; ?>
+ <?php endif; ?>
+ </span>
<?php endif; ?>
</td>
- <td class="a-center"><?php echo $_item->getQty()*1 ?> </td>
- <td class="a-right nowrap">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax()): ?>
- <span class="price-excl-tax">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
+ <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()): ?>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart price">
+ <?php endif; ?>
+ <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ </span>
<?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php endif; ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?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: ?>
- <span class="cart-price">
+ <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?>
<?php endif; ?>
+ </span>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
+ <?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;">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
<?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
<?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
- </span>
+ </small>
<?php endif; ?>
+ </span>
+
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
+ </span>
<?php endif; ?>
+ <?php endif; ?>
</span>
<br />
<?php endif; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax()): ?>
- <span class="price-incl-tax">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
+ <span class="price incl tax">
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart price">
<?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ </span>
+ <?php endif; ?>
+ <?php endif; ?>
+ <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
<?php else: ?>
- <span class="cart-price">
+ <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()->getWeeeTaxAppliedRowAmount()); ?>
- <?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())): ?>
+ <?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()->getWeeeTaxAppliedRowAmount()); ?>
+ <?php else: ?>
+ <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
+ <?php endif; ?>
+ </span>
- <span class="cart-tax-info" id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <?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;">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
<?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
<?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
- </span>
+ </small>
<?php endif; ?>
- <?php endif; ?>
-
-
+ </span>
- </span>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
+ </span>
+ <?php endif; ?>
+ <?php endif; ?>
+ </span>
<?php endif; ?>
</td>
</tr>
diff --git a/app/code/Magento/Downloadable/view/frontend/sales/order/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/sales/order/items/renderer/downloadable.phtml
index 81aa14f43a9..150b23ea600 100644
--- a/app/code/Magento/Downloadable/view/frontend/sales/order/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/sales/order/items/renderer/downloadable.phtml
@@ -18,8 +18,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 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,305 +25,311 @@
/** @var $this \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
?>
<?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">
- <?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>
+ <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 nl2br($this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) )) ?>
+ </dd>
<?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 endforeach; ?>
+ </dl>
<?php endif; ?>
-
- <!-- downloadable -->
+ <?php /* downloadable */ ?>
<?php if ($links = $this->getLinks()): ?>
- <dl class="item-options">
+ <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 /* EOF downloadable */ ?>
+ <?php $addtInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
+ <?php if ($addtInfoBlock) :?>
+ <?php echo $addtInfoBlock->setItem($_item)->toHtml(); ?>
+ <?php endif; ?>
<?php echo $this->escapeHtml($_item->getDescription()) ?>
<?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
- <br/><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->prepareSku($this->getSku()) ?></td>
- <td class="a-right nowrap">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax()): ?>
- <span class="price-excl-tax">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
+ <td class="col sku"><?php echo $this->prepareSku($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()): ?>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart price">
<?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?php else: ?>
- <span class="cart-price">
+ <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ </span>
<?php endif; ?>
+ <?php endif; ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?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()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
- <?php else: ?>
- <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()) ?>
- <?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()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
+ <?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;">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
+ <?php endforeach; ?>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
+ <?php endforeach; ?>
+ </small>
+ <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
</span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
- </span>
- <?php endif; ?>
<?php endif; ?>
+ <?php endif; ?>
</span>
<br />
<?php endif; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax()): ?>
- <span class="price-incl-tax">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
+ <span class="price incl tax">
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart price">
<?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?php else: ?>
- <span class="cart-price">
+ <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ </span>
<?php endif; ?>
+ <?php endif; ?>
+ <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?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')->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; ?>
+ <?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;">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?>
+ <?php endforeach; ?>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?>
+ <?php endforeach; ?>
+ </small>
+ <?php endif; ?>
+ </span>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?>
</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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
- </span>
- <?php endif; ?>
- <?php endif; ?>
+ <?php endif; ?>
+ <?php endif; ?>
</span>
<?php endif; ?>
</td>
- <td class="a-right nowrap">
- <span class="nobr">
- <?php if ($this->getItem()->getQtyOrdered() > 0): ?>
- <?php echo __('Ordered'); ?>: <strong><?php echo $this->getItem()->getQtyOrdered()*1 ?></strong><br />
- <?php endif; ?>
- <?php if ($this->getItem()->getQtyShipped() > 0): ?>
- <?php echo __('Shipped'); ?>: <strong><?php echo $this->getItem()->getQtyShipped()*1 ?></strong><br />
- <?php endif; ?>
- <?php if ($this->getItem()->getQtyCanceled() > 0): ?>
- <?php echo __('Canceled'); ?>: <strong><?php echo $this->getItem()->getQtyCanceled()*1 ?></strong><br />
- <?php endif; ?>
- <?php if ($this->getItem()->getQtyRefunded() > 0): ?>
- <?php echo __('Refunded'); ?>: <strong><?php echo $this->getItem()->getQtyRefunded()*1 ?></strong><br />
- <?php endif; ?>
+ <td class="col qty">
+ <span class="qty summary">
+ <?php if ($this->getItem()->getQtyOrdered() > 0): ?>
+ <?php echo __('Ordered'); ?>: <strong><?php echo $this->getItem()->getQtyOrdered()*1 ?></strong><br />
+ <?php endif; ?>
+ <?php if ($this->getItem()->getQtyShipped() > 0): ?>
+ <?php echo __('Shipped'); ?>: <strong><?php echo $this->getItem()->getQtyShipped()*1 ?></strong><br />
+ <?php endif; ?>
+ <?php if ($this->getItem()->getQtyCanceled() > 0): ?>
+ <?php echo __('Canceled'); ?>: <strong><?php echo $this->getItem()->getQtyCanceled()*1 ?></strong><br />
+ <?php endif; ?>
+ <?php if ($this->getItem()->getQtyRefunded() > 0): ?>
+ <?php echo __('Refunded'); ?>: <strong><?php echo $this->getItem()->getQtyRefunded()*1 ?></strong><br />
+ <?php endif; ?>
</span>
</td>
- <td class="a-right nowrap">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax()): ?>
- <span class="price-excl-tax">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
+ <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()): ?>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart price">
<?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <?php else: ?>
- <span class="cart-price">
+ <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ </span>
<?php endif; ?>
-
+ <?php endif; ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <?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;">
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
<?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
+ </small>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small>
+ <?php endforeach; ?>
+ <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <small>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
<?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
- </span>
+ </small>
<?php endif; ?>
+ </span>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?>
+ </span>
<?php endif; ?>
- </span>
- <br />
+ <?php endif; ?>
+ </span>
+ <br />
<?php endif; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax()): ?>
- <span class="price-incl-tax">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
+ <span class="price incl tax">
+ <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
+ <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart price">
<?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+ <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
<?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
</span>
<?php endif; ?>
<?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
+ <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
<?php else: ?>
- <span class="cart-price">
+ <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()->getWeeeTaxAppliedRowAmount()); ?>
+ <?php else: ?>
+ <?php echo $this->getOrder()->formatPrice($_incl-$this->getItem()->getWeeeTaxRowDisposition()) ?>
<?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()->getWeeeTaxAppliedRowAmount()); ?>
- <?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;">
+ <span class="cart tax info"
+ id="subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"
+ style="display:none;">
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?>
+ <?php endforeach; ?>
</small>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
+ <small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small>
<?php endforeach; ?>
<?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
<small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
+ <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
+ <?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?>
+ <?php endforeach; ?>
</small>
<?php endif; ?>
</span>
<?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
+ <span class="cart tax total"
+ data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
+ <?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?>
</span>
<?php endif; ?>
<?php endif; ?>
-
-
-
</span>
<?php endif; ?>
</td>
- <!--
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax()): ?>
- <th class="nowrap a-right"><?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()) ?></th>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax()): ?>
- <th class="nowrap a-right"><?php echo $this->getOrder()->formatPrice($this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem())); ?></th>
- <?php endif; ?>
- -->
+ <?php /*
+ <?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; ?>
+ */ ?>
</tr>
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
index 3321db97b45..c9fb0a1332b 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Eav\Block\Adminhtml\Attribute\Edit;
-class Js extends \Magento\Adminhtml\Block\Template
+class Js extends \Magento\Backend\Block\Template
{
protected $_template = 'attribute/edit/js.phtml';
}
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 501864983b6..8aab043bd8b 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
@@ -203,7 +203,7 @@ class Options extends \Magento\Backend\Block\Template
foreach ($this->getStores() as $store) {
$storeId = $store->getId();
- $value['store' . $storeId] = $storeId == \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
+ $value['store' . $storeId] = $storeId == \Magento\Core\Model\Store::DEFAULT_STORE_ID
? $valuePrefix . $this->escapeHtml($option['label'])
: '';
}
diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
index 4602cbe313a..3c9156d0d3f 100644
--- a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
+++ b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -320,7 +320,7 @@ abstract class AbstractEntity extends \Magento\Core\Model\Resource\AbstractResou
}
/**
- * Retreive table name
+ * Retrieve table name
*
* @param string $alias
* @return string
@@ -549,7 +549,7 @@ abstract class AbstractEntity extends \Magento\Core\Model\Resource\AbstractResou
}
/**
- * Retreive partial load flag
+ * Retrieve partial load flag
*
* @param boolean $flag
* @return boolean
@@ -564,7 +564,7 @@ abstract class AbstractEntity extends \Magento\Core\Model\Resource\AbstractResou
}
/**
- * Retreive partial save flag
+ * Retrieve partial save flag
*
* @param boolean $flag
* @return boolean
@@ -1000,7 +1000,7 @@ abstract class AbstractEntity extends \Magento\Core\Model\Resource\AbstractResou
}
/**
- * Retreive default source model
+ * Retrieve default source model
*
* @return string
*/
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php
index 913425b1f82..90fcd088d75 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute.php
@@ -395,14 +395,12 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
return $this->getData('store_label');
}
$store = $this->_storeManager->getStore($storeId);
- $label = false;
- if (!$store->isAdmin()) {
- $labels = $this->getStoreLabels();
- if (isset($labels[$store->getId()])) {
- return $labels[$store->getId()];
- }
+ $labels = $this->getStoreLabels();
+ if (isset($labels[$store->getId()])) {
+ return $labels[$store->getId()];
+ } else {
+ return $this->getFrontendLabel();
}
- return $this->getFrontendLabel();
}
/**
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
index e33c05a0844..e08de73638a 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
@@ -88,7 +88,7 @@ abstract class AbstractFrontend
}
/**
- * Retreive lable
+ * Retrieve lable
*
* @return string
*/
@@ -103,7 +103,7 @@ abstract class AbstractFrontend
}
/**
- * Retreive attribute value
+ * Retrieve attribute value
*
* @param $object
* @return mixed
@@ -226,7 +226,7 @@ abstract class AbstractFrontend
}
/**
- * Retreive option by option id
+ * Retrieve option by option id
*
* @param int $optionId
* @return mixed|boolean
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php
index 20fea14ef0b..642fd87e6f7 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/Datetime.php
@@ -47,7 +47,7 @@ class Datetime extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFron
}
/**
- * Retreive attribute value
+ * Retrieve attribute value
*
* @param $object
* @return mixed
diff --git a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
index 12ef2eb3f7b..5fcd87e6ff2 100644
--- a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
+++ b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
@@ -955,7 +955,7 @@ abstract class AbstractCollection extends \Magento\Data\Collection\Db
}
/**
- * Retrive all ids for collection
+ * Retrieve all ids for collection
*
* @param null|int|string $limit
* @param null|int|string $offset
@@ -1051,7 +1051,7 @@ abstract class AbstractCollection extends \Magento\Data\Collection\Db
}
/**
- * Retreive row id field name
+ * Retrieve row id field name
*
* @return string
*/
@@ -1257,7 +1257,7 @@ abstract class AbstractCollection extends \Magento\Data\Collection\Db
}
/**
- * Retreive attribute field name by attribute code
+ * Retrieve attribute field name by attribute code
*
* @param string $attributeCode
* @return string
diff --git a/app/code/Magento/Eav/Model/Entity/Type.php b/app/code/Magento/Eav/Model/Entity/Type.php
index 5e2b6b72e7f..7623c79d310 100644
--- a/app/code/Magento/Eav/Model/Entity/Type.php
+++ b/app/code/Magento/Eav/Model/Entity/Type.php
@@ -180,7 +180,7 @@ class Type extends \Magento\Core\Model\AbstractModel
}
/**
- * Init and retreive attribute collection
+ * Init and retrieve attribute collection
*
* @return \Magento\Eav\Model\Resource\Entity\Attribute\Collection
*/
@@ -210,7 +210,7 @@ class Type extends \Magento\Core\Model\AbstractModel
}
/**
- * Retreive new incrementId
+ * Retrieve new incrementId
*
* @param int $storeId
* @return string
@@ -265,7 +265,7 @@ class Type extends \Magento\Core\Model\AbstractModel
}
/**
- * Retreive entity id field
+ * Retrieve entity id field
*
* @return string|null
*/
@@ -275,7 +275,7 @@ class Type extends \Magento\Core\Model\AbstractModel
}
/**
- * Retreive entity table name
+ * Retrieve entity table name
*
* @return string|null
*/
@@ -326,7 +326,7 @@ class Type extends \Magento\Core\Model\AbstractModel
}
/**
- * Retreive entity type id
+ * Retrieve entity type id
*
* @return string|null
*/
@@ -336,7 +336,7 @@ class Type extends \Magento\Core\Model\AbstractModel
}
/**
- * Retreive entity type code
+ * Retrieve entity type code
*
* @return string|null
*/
@@ -346,7 +346,7 @@ class Type extends \Magento\Core\Model\AbstractModel
}
/**
- * Retreive attribute codes
+ * Retrieve attribute codes
*
* @return array|null
*/
@@ -370,7 +370,7 @@ class Type extends \Magento\Core\Model\AbstractModel
}
/**
- * Retreive resource entity object
+ * Retrieve resource entity object
*
* @return \Magento\Core\Model\Resource\AbstractResource
*/
diff --git a/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php b/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php
index 4271128a247..21f76a03408 100644
--- a/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php
@@ -566,7 +566,7 @@ class Attribute extends \Magento\Core\Model\Resource\Db\AbstractDb
." AND %s.store_id = %d";
$joinCondition = sprintf($joinConditionTemplate,
'e', 't1', 't1', 't1', 't1',
- \Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+ \Magento\Core\Model\Store::DEFAULT_STORE_ID);
if ($attribute->getFlatAddChildData()) {
$joinCondition .= ' AND e.child_id = t1.entity_id';
}
diff --git a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Group.php b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Group.php
index 87185c01076..b8c8605b363 100644
--- a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Group.php
+++ b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Group.php
@@ -103,7 +103,7 @@ class Group extends \Magento\Core\Model\Resource\Db\AbstractDb
}
/**
- * Retreive max sort order
+ * Retrieve max sort order
*
* @param \Magento\Core\Model\AbstractModel $object
* @return int
diff --git a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option.php b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option.php
index c5845df695b..54c7cc8e11c 100644
--- a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option.php
+++ b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option.php
@@ -100,7 +100,7 @@ class Option extends \Magento\Core\Model\Resource\Db\AbstractDb
. " AND %s.attribute_id = " . $attribute->getId()
. " AND %s.store_id = %d";
$joinCondition = sprintf($joinConditionTemplate, 'e', 't1', 't1', 't1', 't1',
- \Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+ \Magento\Core\Model\Store::DEFAULT_STORE_ID);
if ($attribute->getFlatAddChildData()) {
$joinCondition .= ' AND e.child_id = t1.entity_id';
}
diff --git a/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php b/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php
index a30afd562b9..5282d3053f9 100644
--- a/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php
+++ b/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php
@@ -278,18 +278,14 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
// add store attribute label
- if ($store->isAdmin()) {
- $select->columns(array('store_label' => 'ea.frontend_label'));
- } else {
- $storeLabelExpr = $connection->getCheckSql('al.value IS NULL', 'ea.frontend_label', 'al.value');
- $joinExpression = $connection
- ->quoteInto('al.attribute_id = main_table.attribute_id AND al.store_id = ?', (int)$store->getId());
- $select->joinLeft(
- array('al' => $this->getTable('eav_attribute_label')),
- $joinExpression,
- array('store_label' => $storeLabelExpr)
- );
- }
+ $storeLabelExpr = $connection->getCheckSql('al.value IS NULL', 'ea.frontend_label', 'al.value');
+ $joinExpression = $connection
+ ->quoteInto('al.attribute_id = main_table.attribute_id AND al.store_id = ?', (int)$store->getId());
+ $select->joinLeft(
+ array('al' => $this->getTable('eav_attribute_label')),
+ $joinExpression,
+ array('store_label' => $storeLabelExpr)
+ );
// add entity type filter
$select->where('ea.entity_type_id = ?', (int)$entityType->getId());
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template.php b/app/code/Magento/Email/Block/Adminhtml/Template.php
index 4ecc292e8b7..aee0059cacf 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template.php
@@ -34,7 +34,7 @@
namespace Magento\Email\Block\Adminhtml;
-class Template extends \Magento\Adminhtml\Block\Template
+class Template extends \Magento\Backend\Block\Template
{
protected $_template = 'template/list.phtml';
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
index b9d05532fe5..82deb06e4d2 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
@@ -336,7 +336,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
}
/**
- * Retrive email template model
+ * Retrieve email template model
*
* @return \Magento\Email\Model\Template
*/
@@ -392,7 +392,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
}
/**
- * Convert xml config pathes to decorated names
+ * Convert xml config paths to decorated names
*
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @param array $paths
diff --git a/app/code/Magento/Email/Model/Resource/Template.php b/app/code/Magento/Email/Model/Resource/Template.php
index b7f07521946..382c6a8c5a7 100644
--- a/app/code/Magento/Email/Model/Resource/Template.php
+++ b/app/code/Magento/Email/Model/Resource/Template.php
@@ -127,7 +127,7 @@ class Template extends \Magento\Core\Model\Resource\Db\AbstractDb
}
/**
- * Retrieve config scope and scope id of specified email template by email pathes
+ * Retrieve config scope and scope id of specified email template by email paths
*
* @param array $paths
* @param int|string $templateId
@@ -136,13 +136,13 @@ class Template extends \Magento\Core\Model\Resource\Db\AbstractDb
public function getSystemConfigByPathsAndTemplateId($paths, $templateId)
{
$orWhere = array();
- $pathesCounter = 1;
+ $pathsCounter = 1;
$bind = array();
foreach ($paths as $path) {
- $pathAlias = 'path_' . $pathesCounter;
+ $pathAlias = 'path_' . $pathsCounter;
$orWhere[] = 'path = :' . $pathAlias;
$bind[$pathAlias] = $path;
- $pathesCounter++;
+ $pathsCounter++;
}
$bind['template_id'] = $templateId;
$select = $this->_getReadAdapter()->select()
diff --git a/app/code/Magento/Email/Model/Template/Mailer.php b/app/code/Magento/Email/Model/Template/Mailer.php
index 843a93a564e..1a612e20514 100644
--- a/app/code/Magento/Email/Model/Template/Mailer.php
+++ b/app/code/Magento/Email/Model/Template/Mailer.php
@@ -87,7 +87,7 @@ class Mailer extends \Magento\Object
// Send all emails from corresponding list
while (!empty($this->_emailInfos)) {
$emailInfo = array_pop($this->_emailInfos);
- // Handle "Bcc" recepients of the current email
+ // Handle "Bcc" recipients of the current email
$emailTemplate->addBcc($emailInfo->getBccEmails());
// Set required design parameters and delegate email sending to \Magento\Email\Model\Template
$designConfig = array(
@@ -172,7 +172,7 @@ class Mailer extends \Magento\Object
}
/**
- * Set tempate parameters
+ * Set template parameters
*
* @param array $templateParams
* @return \Magento\Email\Model\Template\Mailer
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php
index 2c765dedfc4..65cf2850d36 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Form.php
@@ -33,7 +33,7 @@
*/
namespace Magento\GiftMessage\Block\Adminhtml\Sales\Order\Create;
-class Form extends \Magento\Adminhtml\Block\Template
+class Form extends \Magento\Backend\Block\Template
{
/**
* @var \Magento\Adminhtml\Model\Session\Quote
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php
index 499f0706fa3..43655d3002a 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/Create/Giftoptions.php
@@ -33,7 +33,7 @@
*/
namespace Magento\GiftMessage\Block\Adminhtml\Sales\Order\Create;
-class Giftoptions extends \Magento\Adminhtml\Block\Template
+class Giftoptions extends \Magento\Backend\Block\Template
{
/**
* Get order item object from parent block
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 d89bab46301..798d57319e6 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
@@ -33,7 +33,7 @@
*/
namespace Magento\GiftMessage\Block\Adminhtml\Sales\Order\Create;
-class Items extends \Magento\Adminhtml\Block\Template
+class Items extends \Magento\Backend\Block\Template
{
/**
* Get order item
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php
index 7e1f7d1d92a..56816d7e187 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Giftoptions.php
@@ -33,7 +33,7 @@
*/
namespace Magento\GiftMessage\Block\Adminhtml\Sales\Order\View;
-class Giftoptions extends \Magento\Adminhtml\Block\Template
+class Giftoptions extends \Magento\Backend\Block\Template
{
/**
* Get order item object from parent block
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 7131415fe4a..8a521ce46f1 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
@@ -33,7 +33,7 @@
*/
namespace Magento\GiftMessage\Block\Adminhtml\Sales\Order\View;
-class Items extends \Magento\Adminhtml\Block\Template
+class Items extends \Magento\Backend\Block\Template
{
/**
* Gift message array
@@ -53,7 +53,7 @@ class Items extends \Magento\Adminhtml\Block\Template
}
/**
- * Retrive default value for giftmessage sender
+ * Retrieve default value for giftmessage sender
*
* @return string
*/
@@ -71,7 +71,7 @@ class Items extends \Magento\Adminhtml\Block\Template
}
/**
- * Retrive default value for giftmessage recipient
+ * Retrieve default value for giftmessage recipient
*
* @return string
*/
@@ -99,7 +99,7 @@ class Items extends \Magento\Adminhtml\Block\Template
}
/**
- * Retrive real name for field
+ * Retrieve real name for field
*
* @param string $name
* @return string
@@ -110,7 +110,7 @@ class Items extends \Magento\Adminhtml\Block\Template
}
/**
- * Retrive real html id for field
+ * Retrieve real html id for field
*
* @param string $name
* @return string
@@ -121,7 +121,7 @@ class Items extends \Magento\Adminhtml\Block\Template
}
/**
- * Retrive field html id prefix
+ * Retrieve field html id prefix
*
* @return string
*/
@@ -152,7 +152,7 @@ class Items extends \Magento\Adminhtml\Block\Template
}
/**
- * Retrive gift message for entity
+ * Retrieve gift message for entity
*
* @return \Magento\GiftMessage\Model\Message
*/
@@ -180,7 +180,7 @@ class Items extends \Magento\Adminhtml\Block\Template
}
/**
- * Retrive block html id
+ * Retrieve block html id
*
* @return string
*/
diff --git a/app/code/Magento/GiftMessage/Helper/Message.php b/app/code/Magento/GiftMessage/Helper/Message.php
index 3ae7a15250c..cf5cd08fab3 100644
--- a/app/code/Magento/GiftMessage/Helper/Message.php
+++ b/app/code/Magento/GiftMessage/Helper/Message.php
@@ -111,7 +111,7 @@ class Message extends \Magento\Core\Helper\Data
}
/**
- * Retrive inline giftmessage edit form for specified entity
+ * Retrieve inline giftmessage edit form for specified entity
*
* @param string $type
* @param \Magento\Object $entity
@@ -222,7 +222,7 @@ class Message extends \Magento\Core\Helper\Data
}
/**
- * Retrive escaped and preformated gift message text for specified entity
+ * Retrieve escaped and preformated gift message text for specified entity
*
* @param \Magento\Object $entity
* @return unknown
@@ -237,7 +237,7 @@ class Message extends \Magento\Core\Helper\Data
}
/**
- * Retrive gift message for entity. If message not exists return null
+ * Retrieve gift message for entity. If message not exists return null
*
* @param \Magento\Object $entity
* @return \Magento\GiftMessage\Model\Message
@@ -252,7 +252,7 @@ class Message extends \Magento\Core\Helper\Data
}
/**
- * Retrive internal cached data with specified key.
+ * Retrieve internal cached data with specified key.
*
* If cached data not found return null.
*
@@ -309,7 +309,7 @@ class Message extends \Magento\Core\Helper\Data
}
/**
- * Check availability for multishiping checkout items
+ * Check availability for multishipping checkout items
*
* @param array $items
* @param \Magento\Core\Model\Store|integer $store
@@ -326,7 +326,7 @@ class Message extends \Magento\Core\Helper\Data
}
/**
- * Retrive gift message with specified id
+ * Retrieve gift message with specified id
*
* @param integer $messageId
* @return \Magento\GiftMessage\Model\Message
diff --git a/app/code/Magento/GiftMessage/Helper/Url.php b/app/code/Magento/GiftMessage/Helper/Url.php
index cba75c44a40..4863f56b991 100644
--- a/app/code/Magento/GiftMessage/Helper/Url.php
+++ b/app/code/Magento/GiftMessage/Helper/Url.php
@@ -37,7 +37,7 @@ namespace Magento\GiftMessage\Helper;
class Url extends \Magento\Core\Helper\Url
{
/**
- * Retrive gift message save url
+ * Retrieve gift message save url
*
* @param \Magento\Object $item
* @param string $type
@@ -56,7 +56,7 @@ class Url extends \Magento\Core\Helper\Url
}
/**
- * Retrive gift message button block url
+ * Retrieve gift message button block url
*
* @param integer $itemId
* @param string $type
@@ -70,7 +70,7 @@ class Url extends \Magento\Core\Helper\Url
}
/**
- * Retrive gift message remove url
+ * Retrieve gift message remove url
*
* @param integer $itemId
* @param string $type
@@ -84,7 +84,7 @@ class Url extends \Magento\Core\Helper\Url
}
/**
- * Retrive gift message save url
+ * Retrieve gift message save url
*
* @param integer $itemId
* @param string $type
diff --git a/app/code/Magento/GiftMessage/Model/Observer.php b/app/code/Magento/GiftMessage/Model/Observer.php
index f1e2d302a58..9c73a279534 100644
--- a/app/code/Magento/GiftMessage/Model/Observer.php
+++ b/app/code/Magento/GiftMessage/Model/Observer.php
@@ -91,7 +91,7 @@ class Observer extends \Magento\Object
/**
* Operate with gift messages on checkout proccess
*
- * @param Varieb_Object $observer
+ * @param Varien_Object $observer
* @return \Magento\GiftMessage\Model\Observer
*/
public function checkoutEventCreateGiftMessage($observer)
diff --git a/app/code/Magento/Adminhtml/Model/Giftmessage/Save.php b/app/code/Magento/GiftMessage/Model/Save.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Model/Giftmessage/Save.php
rename to app/code/Magento/GiftMessage/Model/Save.php
index 22a9bfe8aa9..099d7bb01cd 100644
--- a/app/code/Magento/Adminhtml/Model/Giftmessage/Save.php
+++ b/app/code/Magento/GiftMessage/Model/Save.php
@@ -32,7 +32,7 @@
* @package Magento_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Model\Giftmessage;
+namespace Magento\GiftMessage\Model;
class Save extends \Magento\Object
{
@@ -81,7 +81,7 @@ class Save extends \Magento\Object
/**
* Save all seted giftmessages
*
- * @return \Magento\Adminhtml\Model\Giftmessage\Save
+ * @return \Magento\GiftMessage\Model\Save
*/
public function saveAllInQuote()
{
@@ -123,7 +123,7 @@ class Save extends \Magento\Object
*
* @param integer $entityId
* @param array $giftmessage
- * @return \Magento\Adminhtml\Model\Giftmessage\Save
+ * @return \Magento\GiftMessage\Model\Save
*/
protected function _saveOne($entityId, $giftmessage)
{
@@ -177,7 +177,7 @@ class Save extends \Magento\Object
*
* @param \Magento\GiftMessage\Model\Message|null $giftmessageModel
* @param \Magento\Object $entityModel
- * @return \Magento\Adminhtml\Model\Giftmessage\Save
+ * @return \Magento\GiftMessage\Model\Save
*/
protected function _deleteOne($entityModel, $giftmessageModel=null)
{
@@ -195,7 +195,7 @@ class Save extends \Magento\Object
* Set allowed quote items for gift messages
*
* @param array $items
- * @return \Magento\Adminhtml\Model\Giftmessage\Save
+ * @return \Magento\GiftMessage\Model\Save
*/
public function setAllowQuoteItems($items)
{
@@ -207,7 +207,7 @@ class Save extends \Magento\Object
* Add allowed quote item for gift messages
*
* @param int $item
- * @return \Magento\Adminhtml\Model\Giftmessage\Save
+ * @return \Magento\GiftMessage\Model\Save
*/
public function addAllowQuoteItem($item)
{
@@ -221,7 +221,7 @@ class Save extends \Magento\Object
}
/**
- * Retrive allowed quote items for gift messages
+ * Retrieve allowed quote items for gift messages
*
* @return array
*/
@@ -235,7 +235,7 @@ class Save extends \Magento\Object
}
/**
- * Retrive allowed quote items products for gift messages
+ * Retrieve allowed quote items products for gift messages
*
* @return array
*/
@@ -348,7 +348,7 @@ class Save extends \Magento\Object
}
/**
- * Retrive mapped type for entity
+ * Retrieve mapped type for entity
*
* @param string $type
* @return string
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_index.xml b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_index.xml
index 41b3d45f763..6d03e0138f1 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_index.xml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_index.xml
@@ -30,7 +30,7 @@
</block>
</referenceBlock>
<referenceBlock name="items_grid">
- <block class="Magento\Adminhtml\Block\Template" name="popup_window" template="Magento_GiftMessage::popup.phtml">
+ <block class="Magento\Backend\Block\Template" name="popup_window" template="Magento_GiftMessage::popup.phtml">
<block class="Magento\GiftMessage\Block\Adminhtml\Sales\Order\Create\Form" name="gift_options_form" template="giftoptionsform.phtml"/>
</block>
</referenceBlock>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_data.xml b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_data.xml
index 41b3d45f763..6d03e0138f1 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_data.xml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_data.xml
@@ -30,7 +30,7 @@
</block>
</referenceBlock>
<referenceBlock name="items_grid">
- <block class="Magento\Adminhtml\Block\Template" name="popup_window" template="Magento_GiftMessage::popup.phtml">
+ <block class="Magento\Backend\Block\Template" name="popup_window" template="Magento_GiftMessage::popup.phtml">
<block class="Magento\GiftMessage\Block\Adminhtml\Sales\Order\Create\Form" name="gift_options_form" template="giftoptionsform.phtml"/>
</block>
</referenceBlock>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_items.xml b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_items.xml
index 41b3d45f763..6d03e0138f1 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_items.xml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_create_load_block_items.xml
@@ -30,7 +30,7 @@
</block>
</referenceBlock>
<referenceBlock name="items_grid">
- <block class="Magento\Adminhtml\Block\Template" name="popup_window" template="Magento_GiftMessage::popup.phtml">
+ <block class="Magento\Backend\Block\Template" name="popup_window" template="Magento_GiftMessage::popup.phtml">
<block class="Magento\GiftMessage\Block\Adminhtml\Sales\Order\Create\Form" name="gift_options_form" template="giftoptionsform.phtml"/>
</block>
</referenceBlock>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml
index dc4e678ea9b..8e55cc917a5 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml
@@ -37,7 +37,7 @@
</block>
</referenceBlock>
<referenceBlock name="order_tab_info">
- <block class="Magento\Adminhtml\Block\Template" name="popup_window" template="Magento_GiftMessage::popup.phtml">
+ <block class="Magento\Backend\Block\Template" name="popup_window" template="Magento_GiftMessage::popup.phtml">
<block class="Magento\GiftMessage\Block\Adminhtml\Sales\Order\View\Form" name="gift_options_form" template="giftoptionsform.phtml"/>
</block>
</referenceBlock>
diff --git a/app/code/Magento/GoogleShopping/Block/Adminhtml/Captcha.php b/app/code/Magento/GoogleShopping/Block/Adminhtml/Captcha.php
index eb1d9ad3683..feb6bdeef69 100644
--- a/app/code/Magento/GoogleShopping/Block/Adminhtml/Captcha.php
+++ b/app/code/Magento/GoogleShopping/Block/Adminhtml/Captcha.php
@@ -34,7 +34,7 @@
*/
namespace Magento\GoogleShopping\Block\Adminhtml;
-class Captcha extends \Magento\Adminhtml\Block\Template
+class Captcha extends \Magento\Backend\Block\Template
{
protected $_template = 'captcha.phtml';
diff --git a/app/code/Magento/GoogleShopping/Block/Adminhtml/Store/Switcher.php b/app/code/Magento/GoogleShopping/Block/Adminhtml/Store/Switcher.php
index d8099511b1b..7ca86bc0a71 100644
--- a/app/code/Magento/GoogleShopping/Block/Adminhtml/Store/Switcher.php
+++ b/app/code/Magento/GoogleShopping/Block/Adminhtml/Store/Switcher.php
@@ -43,7 +43,7 @@ class Switcher extends \Magento\Backend\Block\Store\Switcher
protected $_hasDefaultOption = false;
/**
- * Set overriden params
+ * Set overridden params
*/
protected function _construct()
{
diff --git a/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Attributes.php b/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Attributes.php
index 3f9731d8953..6af7a6169a2 100644
--- a/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Attributes.php
+++ b/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Attributes.php
@@ -53,20 +53,20 @@ class Attributes
*/
protected $_attributeFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\GoogleShopping\Model\Config $config
- * @param \Magento\GoogleShopping\Model\AttributeFactory $attributeFactory
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\GoogleShopping\Model\Config $config
+ * @param \Magento\GoogleShopping\Model\AttributeFactory $attributeFactory
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\GoogleShopping\Model\Config $config,
- \Magento\GoogleShopping\Model\AttributeFactory $attributeFactory,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\GoogleShopping\Model\Config $config,
+ \Magento\GoogleShopping\Model\AttributeFactory $attributeFactory,
+ array $data = array()
+ ) {
$this->_config = $config;
$this->_attributeFactory = $attributeFactory;
parent::__construct($context, $coreData, $data);
@@ -159,7 +159,7 @@ class Attributes
*/
public function getAttributesSelectHtml($escapeJsQuotes = false)
{
- $select = $this->getLayout()->createBlock('Magento\Adminhtml\Block\Html\Select')
+ $select = $this->getLayout()->createBlock('Magento\View\Block\Html\Select')
->setId($this->getFieldId().'_{{index}}_attribute')
->setName($this->getFieldName().'[{{index}}][attribute_id]')
->setOptions($this->_getAttributes($this->getAttributeSetId(), $escapeJsQuotes));
diff --git a/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Select.php b/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Select.php
index e7d63931a8e..5c707cabd97 100644
--- a/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Select.php
+++ b/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit/Select.php
@@ -33,7 +33,7 @@
*/
namespace Magento\GoogleShopping\Block\Adminhtml\Types\Edit;
-class Select extends \Magento\Adminhtml\Block\Template
+class Select extends \Magento\Backend\Block\Template
{
protected $_template = 'types/edit/select.phtml';
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 9d24b460241..5152d148228 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php
@@ -33,7 +33,7 @@
*/
namespace Magento\ImportExport\Block\Adminhtml\Import\Frame;
-class Result extends \Magento\Adminhtml\Block\Template
+class Result extends \Magento\Backend\Block\Template
{
/**
* JavaScript actions for response.
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
index d3245b8c867..da3a2c1b926 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
@@ -254,7 +254,7 @@ abstract class AbstractEav
$index = in_array($attribute->getAttributeCode(), $this->_indexValueAttributes) ? 'value' : 'label';
// only default (admin) store values used
- $attribute->setStoreId(\Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+ $attribute->setStoreId(\Magento\Core\Model\Store::DEFAULT_STORE_ID);
try {
foreach ($attribute->getSource()->getAllOptions(false) as $option) {
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
index cf8db424bd6..0f6ca15ecf3 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
@@ -397,7 +397,7 @@ abstract class AbstractEntity
$index = in_array($attribute->getAttributeCode(), $this->_indexValueAttributes) ? 'value' : 'label';
// only default (admin) store values used
- $attribute->setStoreId(\Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+ $attribute->setStoreId(\Magento\Core\Model\Store::DEFAULT_STORE_ID);
try {
foreach ($attribute->getSource()->getAllOptions(false) as $option) {
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/Eav/Customer.php b/app/code/Magento/ImportExport/Model/Export/Entity/Eav/Customer.php
index ca57b64cf38..ecb949983b4 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/Eav/Customer.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/Eav/Customer.php
@@ -62,7 +62,7 @@ class Customer
/**#@-*/
/**
- * Overriden attributes parameters.
+ * Overridden attributes parameters.
*
* @var array
*/
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/Product.php b/app/code/Magento/ImportExport/Model/Export/Entity/Product.php
index 6fa192e70b7..7e4d1096c59 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/Product.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/Product.php
@@ -734,7 +734,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
try {
$collection = $this->_getEntityCollection();
$validAttrCodes = $this->_getExportAttrCodes();
- $defaultStoreId = \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID;
+ $defaultStoreId = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
$dataRows = array();
$rowCategories = array();
$rowWebsites = array();
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/AbstractType.php b/app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/AbstractType.php
index 4f18c9587af..52db223c075 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/AbstractType.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/AbstractType.php
@@ -36,7 +36,7 @@ namespace Magento\ImportExport\Model\Export\Entity\Product\Type;
abstract class AbstractType
{
/**
- * Overriden attributes parameters.
+ * Overridden attributes parameters.
*
* @var array
*/
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/Simple.php b/app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/Simple.php
index 2ffeeb33938..7b72225b3bf 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/Simple.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/Product/Type/Simple.php
@@ -37,7 +37,7 @@ class Simple
extends \Magento\ImportExport\Model\Export\Entity\Product\Type\AbstractType
{
/**
- * Overriden attributes parameters.
+ * Overridden attributes parameters.
*
* @var array
*/
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
index c64a85c42aa..260b0a6d564 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
@@ -238,7 +238,7 @@ abstract class AbstractEav
$index = in_array($attribute->getAttributeCode(), $indexAttributes) ? 'value' : 'label';
// only default (admin) store values used
- $attribute->setStoreId(\Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+ $attribute->setStoreId(\Magento\Core\Model\Store::DEFAULT_STORE_ID);
try {
foreach ($attribute->getSource()->getAllOptions(false) as $option) {
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
index 12d8f3a5960..d4e00f3583b 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
@@ -408,7 +408,7 @@ abstract class AbstractEntity
$index = in_array($attribute->getAttributeCode(), $indexValAttrs) ? 'value' : 'label';
// only default (admin) store values used
- $attribute->setStoreId(\Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID);
+ $attribute->setStoreId(\Magento\Core\Model\Store::DEFAULT_STORE_ID);
try {
foreach ($attribute->getSource()->getAllOptions(false) as $option) {
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/Product.php b/app/code/Magento/ImportExport/Model/Import/Entity/Product.php
index bef3264b420..bbd505dcc83 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/Product.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/Product.php
@@ -92,6 +92,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
const ERROR_GROUP_PRICE_DATA_INCOMPLETE = 'groupPriceDataIsIncomplete';
const ERROR_SKU_NOT_FOUND_FOR_DELETE = 'skuNotFoundToDelete';
const ERROR_SUPER_PRODUCTS_SKU_NOT_FOUND = 'superProductsSkuNotFound';
+ const ERROR_MEDIA_DATA_INCOMPLETE = 'mediaDataIsIncomplete';
/**
* Pairs of attribute set ID-to-name.
@@ -180,7 +181,8 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
self::ERROR_INVALID_TIER_PRICE_GROUP => 'Tier Price customer group ID is invalid',
self::ERROR_TIER_DATA_INCOMPLETE => 'Tier Price data is incomplete',
self::ERROR_SKU_NOT_FOUND_FOR_DELETE => 'Product with specified SKU not found',
- self::ERROR_SUPER_PRODUCTS_SKU_NOT_FOUND => 'Product with specified super products SKU not found'
+ self::ERROR_SUPER_PRODUCTS_SKU_NOT_FOUND => 'Product with specified super products SKU not found',
+ self::ERROR_MEDIA_DATA_INCOMPLETE => 'Media data is incomplete'
);
/**
@@ -788,23 +790,25 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
protected function _isTierPriceValid(array $rowData, $rowNum)
{
if ((isset($rowData['_tier_price_website']) && strlen($rowData['_tier_price_website']))
- || (isset($rowData['_tier_price_customer_group']) && strlen($rowData['_tier_price_customer_group']))
- || (isset($rowData['_tier_price_qty']) && strlen($rowData['_tier_price_qty']))
- || (isset($rowData['_tier_price_price']) && strlen($rowData['_tier_price_price']))
+ || (isset($rowData['_tier_price_customer_group']) && strlen($rowData['_tier_price_customer_group']))
+ || (isset($rowData['_tier_price_qty']) && strlen($rowData['_tier_price_qty']))
+ || (isset($rowData['_tier_price_price']) && strlen($rowData['_tier_price_price']))
) {
if (!isset($rowData['_tier_price_website']) || !isset($rowData['_tier_price_customer_group'])
- || !isset($rowData['_tier_price_qty']) || !isset($rowData['_tier_price_price'])
- || !strlen($rowData['_tier_price_website']) || !strlen($rowData['_tier_price_customer_group'])
- || !strlen($rowData['_tier_price_qty']) || !strlen($rowData['_tier_price_price'])
+ || !isset($rowData['_tier_price_qty']) || !isset($rowData['_tier_price_price'])
+ || !strlen($rowData['_tier_price_website']) || !strlen($rowData['_tier_price_customer_group'])
+ || !strlen($rowData['_tier_price_qty']) || !strlen($rowData['_tier_price_price'])
) {
$this->addRowError(self::ERROR_TIER_DATA_INCOMPLETE, $rowNum);
return false;
} elseif ($rowData['_tier_price_website'] != self::VALUE_ALL
- && !isset($this->_websiteCodeToId[$rowData['_tier_price_website']])) {
+ && !isset($this->_websiteCodeToId[$rowData['_tier_price_website']])
+ ) {
$this->addRowError(self::ERROR_INVALID_TIER_PRICE_SITE, $rowNum);
return false;
} elseif ($rowData['_tier_price_customer_group'] != self::VALUE_ALL
- && !isset($this->_customerGroups[$rowData['_tier_price_customer_group']])) {
+ && !isset($this->_customerGroups[$rowData['_tier_price_customer_group']])
+ ) {
$this->addRowError(self::ERROR_INVALID_TIER_PRICE_GROUP, $rowNum);
return false;
} elseif ($rowData['_tier_price_qty'] <= 0 || $rowData['_tier_price_price'] <= 0) {
@@ -849,6 +853,22 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
return true;
}
+ /**
+ * Check media information
+ *
+ * @param array $rowData
+ * @param int $rowNum
+ * @return bool
+ */
+ protected function _isMediaValid($rowData, $rowNum)
+ {
+ if (!empty($rowData['_media_image']) && empty($rowData['_media_attribute_id'])) {
+ $this->addRowError(self::ERROR_MEDIA_DATA_INCOMPLETE, $rowNum);
+ return false;
+ }
+ return true;
+ }
+
/**
* Check super products SKU
*
@@ -1466,7 +1486,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
$valueArr = array(
'value_id' => $insertValue['value_id'],
- 'store_id' => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID,
+ 'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID,
'label' => $insertValue['label'],
'position' => $insertValue['position'],
'disabled' => $insertValue['disabled']
@@ -1740,6 +1760,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
$this->_isTierPriceValid($rowData, $rowNum);
$this->_isGroupPriceValid($rowData, $rowNum);
$this->_isSuperProductsSkuValid($rowData, $rowNum);
+ $this->_isMediaValid($rowData, $rowNum);
if (self::SCOPE_DEFAULT == $rowScope) { // SKU is specified, row is SCOPE_DEFAULT, new product block begins
$this->_processedEntitiesCount ++;
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/Product/Option.php b/app/code/Magento/ImportExport/Model/Import/Entity/Product/Option.php
index 51313f6938a..571ddd38fba 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/Product/Option.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/Product/Option.php
@@ -784,7 +784,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
$storeCode = $rowData[self::COLUMN_STORE];
$storeId = $this->_storeCodeToId[$storeCode];
} else {
- $storeId = \Magento\Core\Model\AppInterface::ADMIN_STORE_ID;
+ $storeId = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
}
if (isset($this->_productsSkuToId[$this->_rowProductSku])) {
// save in existing data array
@@ -1129,20 +1129,20 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
$typeValues[$prevOptionId][] = $specificTypeData['value'];
// ensure default title is set
- if (!isset($typeTitles[$nextValueId][\Magento\Core\Model\AppInterface::ADMIN_STORE_ID])) {
- $typeTitles[$nextValueId][\Magento\Core\Model\AppInterface::ADMIN_STORE_ID]
+ if (!isset($typeTitles[$nextValueId][\Magento\Core\Model\Store::DEFAULT_STORE_ID])) {
+ $typeTitles[$nextValueId][\Magento\Core\Model\Store::DEFAULT_STORE_ID]
= $specificTypeData['title'];
}
$typeTitles[$nextValueId][$this->_rowStoreId] = $specificTypeData['title'];;
if ($specificTypeData['price']) {
if ($this->_isPriceGlobal) {
- $typePrices[$nextValueId][\Magento\Core\Model\AppInterface::ADMIN_STORE_ID]
+ $typePrices[$nextValueId][\Magento\Core\Model\Store::DEFAULT_STORE_ID]
= $specificTypeData['price'];
} else {
// ensure default price is set
- if (!isset($typePrices[$nextValueId][\Magento\Core\Model\AppInterface::ADMIN_STORE_ID])) {
- $typePrices[$nextValueId][\Magento\Core\Model\AppInterface::ADMIN_STORE_ID]
+ if (!isset($typePrices[$nextValueId][\Magento\Core\Model\Store::DEFAULT_STORE_ID])) {
+ $typePrices[$nextValueId][\Magento\Core\Model\Store::DEFAULT_STORE_ID]
= $specificTypeData['price'];
}
$typePrices[$nextValueId][$this->_rowStoreId] = $specificTypeData['price'];
@@ -1163,10 +1163,11 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
*/
protected function _collectOptionTitle(array $rowData, $prevOptionId, array &$titles)
{
+ $defaultStoreId = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
if (!empty($rowData[self::COLUMN_TITLE])) {
- if (!isset($titles[$prevOptionId][\Magento\Core\Model\AppInterface::ADMIN_STORE_ID])) {
+ if (!isset($titles[$prevOptionId][$defaultStoreId])) {
// ensure default title is set
- $titles[$prevOptionId][\Magento\Core\Model\AppInterface::ADMIN_STORE_ID] = $rowData[self::COLUMN_TITLE];
+ $titles[$prevOptionId][$defaultStoreId] = $rowData[self::COLUMN_TITLE];
}
$titles[$prevOptionId][$this->_rowStoreId] = $rowData[self::COLUMN_TITLE];
}
@@ -1224,7 +1225,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
}
$this->_rowStoreId = $this->_storeCodeToId[$rowData[self::COLUMN_STORE]];
} else {
- $this->_rowStoreId = \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID;
+ $this->_rowStoreId = \Magento\Core\Model\Store::DEFAULT_STORE_ID;
}
// Init option type and set param which tell that row is main
if (!empty($rowData[self::COLUMN_TYPE])) { // get custom option type if its specified
@@ -1339,7 +1340,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
&& strlen($rowData[self::COLUMN_PREFIX . 'price']) > 0) {
$priceData = array(
'option_id' => $optionId,
- 'store_id' => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID,
+ 'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID,
'price_type' => 'fixed'
);
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/Product/Type/Grouped.php b/app/code/Magento/ImportExport/Model/Import/Entity/Product/Type/Grouped.php
index 9aa8c2eaa06..abe164fd975 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/Product/Type/Grouped.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/Product/Type/Grouped.php
@@ -91,7 +91,7 @@ class Grouped
}
/**
- * Retrive model behavior
+ * Retrieve model behavior
*
* @return string
*/
diff --git a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_getfilter.xml b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_getfilter.xml
index 7c9f5f02f68..0124a1f82ad 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_getfilter.xml
+++ b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_getfilter.xml
@@ -26,6 +26,6 @@
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<container name="root" label="Root" output="1">
<block class="Magento\ImportExport\Block\Adminhtml\Export\Filter" name="export.filter"/>
- <block class="Magento\Adminhtml\Block\Template" template="Magento_ImportExport::export/form/filter/after.phtml" name="export.form.after" as="form_after"/>
+ <block class="Magento\Backend\Block\Template" template="Magento_ImportExport::export/form/filter/after.phtml" name="export.form.after" as="form_after"/>
</container>
</layout>
diff --git a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_index.xml b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_index.xml
index 421ca1bf78d..301a97dd277 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_index.xml
+++ b/app/code/Magento/ImportExport/view/adminhtml/layout/adminhtml_export_index.xml
@@ -25,7 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Template" template="Magento_ImportExport::export/form/before.phtml" name="export.form.before" as="form_before"/>
+ <block class="Magento\Backend\Block\Template" template="Magento_ImportExport::export/form/before.phtml" name="export.form.before" as="form_before"/>
<block class="Magento\ImportExport\Block\Adminhtml\Export\Edit" name="export.form.container"/>
<block class="Magento\ImportExport\Block\Adminhtml\Form\After" template="Magento_ImportExport::export/form/after.phtml" name="export.form.after" as="form_after"/>
</referenceContainer>
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Problem.php b/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Problem.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
index 7a9af30931a..15256a4debb 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Problem.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Problem.php
@@ -19,24 +19,24 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml newsletter problem block template.
+ * Newsletter problem block template.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Newsletter;
+namespace Magento\Newsletter\Block\Adminhtml;
-class Problem extends \Magento\Adminhtml\Block\Template
+class Problem extends \Magento\Backend\Block\Template
{
- protected $_template = 'newsletter/problem/list.phtml';
+ protected $_template = 'problem/list.phtml';
/**
* @var \Magento\Newsletter\Model\Resource\Problem\Collection
@@ -105,4 +105,4 @@ class Problem extends \Magento\Adminhtml\Block\Template
{
return $this->_problemCollection->getSize() > 0;
}
-}// Class \Magento\Adminhtml\Block\Newsletter\Problem END
+}
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php b/app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Filter/Checkbox.php
similarity index 83%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Filter/Checkbox.php
index 4f5e7cb9937..b4e108e8386 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Problem/Grid/Filter/Checkbox.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Filter/Checkbox.php
@@ -19,20 +19,20 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml newsletter subscribers grid filter checkbox
+ * Newsletter subscribers grid filter checkbox
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Newsletter\Problem\Grid\Filter;
+namespace Magento\Newsletter\Block\Adminhtml\Problem\Grid\Filter;
class Checkbox extends \Magento\Adminhtml\Block\Widget\Grid\Column\Filter\AbstractFilter
{
@@ -45,4 +45,4 @@ class Checkbox extends \Magento\Adminhtml\Block\Widget\Grid\Column\Filter\Abstra
{
return '<input type="checkbox" onclick="problemController.checkCheckboxes(this)"/>';
}
-}// Class \Magento\Adminhtml\Block\Newsletter\Subscriber\Grid\Filter\Checkbox END
+}
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php b/app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Renderer/Checkbox.php
similarity index 83%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Renderer/Checkbox.php
index d91543403f1..258a0fb9391 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Problem/Grid/Renderer/Checkbox.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Renderer/Checkbox.php
@@ -19,20 +19,20 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml newsletter subscribers grid checkbox item renderer
+ * Newsletter subscribers grid checkbox item renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Newsletter\Problem\Grid\Renderer;
+namespace Magento\Newsletter\Block\Adminhtml\Problem\Grid\Renderer;
class Checkbox extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer
{
@@ -46,4 +46,4 @@ class Checkbox extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Abst
{
return '<input type="checkbox" name="problem[]" value="' . $row->getId() . '" class="problemCheckbox"/>';
}
-}// Class \Magento\Adminhtml\Block\Newsletter\Subscriber\Grid\Renderer\Checkbox END
+}
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Queue/Edit.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
index 7dac9990abc..acdd2df811a 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Edit.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit.php
@@ -19,19 +19,19 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml newsletter queue edit block
+ * Newsletter queue edit block
*/
-namespace Magento\Adminhtml\Block\Newsletter\Queue;
+namespace Magento\Newsletter\Block\Adminhtml\Queue;
-class Edit extends \Magento\Adminhtml\Block\Template
+class Edit extends \Magento\Backend\Block\Template
{
- protected $_template = 'newsletter/queue/edit.phtml';
+ protected $_template = 'queue/edit.phtml';
/**
* Core registry
@@ -86,7 +86,7 @@ class Edit extends \Magento\Adminhtml\Block\Template
protected function _beforeToHtml()
{
$this->setChild('form',
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Newsletter\Queue\Edit\Form','form')
+ $this->getLayout()->createBlock('Magento\Newsletter\Block\Adminhtml\Queue\Edit\Form','form')
);
return parent::_beforeToHtml();
}
@@ -98,7 +98,7 @@ class Edit extends \Magento\Adminhtml\Block\Template
} else {
$params = array('id' => $this->getRequest()->getParam('id'));
}
- return $this->getUrl('adminhtml/*/save', $params);
+ return $this->getUrl('*/*/save', $params);
}
protected function _prepareLayout()
@@ -150,7 +150,7 @@ class Edit extends \Magento\Adminhtml\Block\Template
$this->addChild('back_button','Magento\Adminhtml\Block\Widget\Button', array(
'label' => __('Back'),
'onclick' => "window.location.href = '" . $this->getUrl((
- $this->getTemplateId() ? '*/newsletter_template/' : '*/*')) . "'",
+ $this->getTemplateId() ? '*/template' : '*/*')) . "'",
'class' => 'action-back'
));
@@ -164,7 +164,7 @@ class Edit extends \Magento\Adminhtml\Block\Template
*/
public function getPreviewUrl()
{
- return $this->getUrl('adminhtml/*/preview');
+ return $this->getUrl('*/*/preview');
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Edit/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Queue/Edit/Form.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php
index 58a32c93408..34935345434 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Edit/Form.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php
@@ -19,20 +19,20 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml newsletter queue edit form
+ * Newsletter queue edit form
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Newsletter\Queue\Edit;
+namespace Magento\Newsletter\Block\Adminhtml\Queue\Edit;
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
@@ -83,7 +83,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
* or from newsletter queue grid by edit option.
*
* @param void
- * @return \Magento\Adminhtml\Block\Newsletter\Queue\Edit\Form
+ * @return \Magento\Newsletter\Block\Adminhtml\Queue\Edit\Form
*/
protected function _prepareForm()
{
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Grid/Renderer/Action.php
similarity index 77%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Queue/Grid/Renderer/Action.php
index b7e0c66d064..7a9f46b2b8b 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Grid/Renderer/Action.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Grid/Renderer/Action.php
@@ -19,20 +19,20 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml newsletter queue grid block action item renderer
+ * Newsletter queue grid block action item renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Newsletter\Queue\Grid\Renderer;
+namespace Magento\Newsletter\Block\Adminhtml\Queue\Grid\Renderer;
class Action extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Action
{
@@ -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('adminhtml/*/start', array('id'=>$row->getId())),
+ 'url' => $this->getUrl('*/*/start', array('id'=>$row->getId())),
'caption' => __('Start')
);
}
} else if ($row->getQueueStatus()==\Magento\Newsletter\Model\Queue::STATUS_SENDING) {
$actions[] = array(
- 'url' => $this->getUrl('adminhtml/*/pause', array('id'=>$row->getId())),
+ 'url' => $this->getUrl('*/*/pause', array('id'=>$row->getId())),
'caption' => __('Pause')
);
$actions[] = array(
- 'url' => $this->getUrl('adminhtml/*/cancel', array('id'=>$row->getId())),
+ 'url' => $this->getUrl('*/*/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('adminhtml/*/resume', array('id'=>$row->getId())),
+ 'url' => $this->getUrl('*/*/resume', array('id'=>$row->getId())),
'caption' => __('Resume')
);
}
$actions[] = array(
- 'url' => $this->getUrl('adminhtml/newsletter_queue/preview',array('id'=>$row->getId())),
+ 'url' => $this->getUrl('*/*/preview',array('id'=>$row->getId())),
'caption' => __('Preview'),
'popup' => true
);
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Preview.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Queue/Preview.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php
index e42e83e22f2..58d240b9887 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Preview.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php
@@ -19,19 +19,19 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml newsletter template preview block
+ * Newsletter template preview block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Newsletter\Queue;
+namespace Magento\Newsletter\Block\Adminhtml\Queue;
class Preview extends \Magento\Adminhtml\Block\Widget
{
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Preview/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview/Form.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Queue/Preview/Form.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview/Form.php
index 5f7d41b5943..3933ff50c68 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Queue/Preview/Form.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (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 @@
* Admin form widget
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Newsletter\Queue\Preview;
+namespace Magento\Newsletter\Block\Adminhtml\Queue\Preview;
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
@@ -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('adminhtml/*/drop', array('_current' => true)),
+ 'action' => $this->getUrl('*/*/drop', array('_current' => true)),
'method' => 'post',
))
);
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php
similarity index 89%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Subscriber.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php
index 77983dbce8d..6ec289fd7c6 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber.php
@@ -19,22 +19,22 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml newsletter subscriber grid block
+ * Newsletter subscriber grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Newsletter;
+namespace Magento\Newsletter\Block\Adminhtml;
-class Subscriber extends \Magento\Adminhtml\Block\Template
+class Subscriber extends \Magento\Backend\Block\Template
{
/**
* Queue collection
@@ -43,7 +43,7 @@ class Subscriber extends \Magento\Adminhtml\Block\Template
*/
protected $_queueCollection = null;
- protected $_template = 'newsletter/subscriber/list.phtml';
+ protected $_template = 'subscriber/list.phtml';
/**
* @var \Magento\Newsletter\Model\Resource\Queue\CollectionFactory
@@ -69,7 +69,7 @@ class Subscriber extends \Magento\Adminhtml\Block\Template
/**
* Prepares block to render
*
- * @return \Magento\Adminhtml\Block\Newsletter\Subscriber
+ * @return \Magento\Newsletter\Block\Adminhtml\Subscriber
*/
protected function _beforeToHtml()
{
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid.php
index 58d5307b946..db184b5912e 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid.php
@@ -19,19 +19,19 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml newsletter subscribers grid block
+ * Newsletter subscribers grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Newsletter\Subscriber;
+namespace Magento\Newsletter\Block\Adminhtml\Subscriber;
class Grid extends \Magento\Backend\Block\Widget\Grid
{
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Checkbox.php
similarity index 83%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Checkbox.php
index 34144d5d710..a2f94fa1850 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Checkbox.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Checkbox.php
@@ -19,20 +19,20 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml newsletter subscribers grid filter checkbox
+ * Newsletter subscribers grid filter checkbox
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Newsletter\Subscriber\Grid\Filter;
+namespace Magento\Newsletter\Block\Adminhtml\Subscriber\Grid\Filter;
class Checkbox extends \Magento\Adminhtml\Block\Widget\Grid\Column\Filter\AbstractFilter
{
@@ -45,4 +45,4 @@ class Checkbox extends \Magento\Adminhtml\Block\Widget\Grid\Column\Filter\Abstra
{
return '<input type="checkbox" onclick="subscriberController.checkCheckboxes(this)"/>';
}
-}// Class \Magento\Adminhtml\Block\Newsletter\Subscriber\Grid\Filter\Checkbox END
+}
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php
index 69b889266f1..ee139ca5be6 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php
@@ -19,15 +19,15 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml newsletter subscribers grid website filter
+ * Newsletter subscribers grid website filter
*/
-namespace Magento\Adminhtml\Block\Newsletter\Subscriber\Grid\Filter;
+namespace Magento\Newsletter\Block\Adminhtml\Subscriber\Grid\Filter;
class Website
extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Renderer/Checkbox.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Renderer/Checkbox.php
index b611525e224..bbdfa60cf8c 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Checkbox.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Renderer/Checkbox.php
@@ -19,20 +19,20 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml newsletter subscribers grid checkbox item renderer
+ * Newsletter subscribers grid checkbox item renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Newsletter\Subscriber\Grid\Renderer;
+namespace Magento\Newsletter\Block\Adminhtml\Subscriber\Grid\Renderer;
class Checkbox extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer
{
@@ -51,4 +51,4 @@ class Checkbox extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Abst
}
}
-}// Class \Magento\Adminhtml\Block\Newsletter\Subscriber\Grid\Renderer\Checkbox END
+}
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
similarity index 74%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Template.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Template.php
index 87842f7a1bf..be67aae6cbc 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
@@ -19,37 +19,37 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml newsletter templates page content block
+ * Newsletter templates page content block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Newsletter;
+namespace Magento\Newsletter\Block\Adminhtml;
-class Template extends \Magento\Adminhtml\Block\Template
+class Template extends \Magento\Backend\Block\Template
{
- protected $_template = 'newsletter/template/list.phtml';
+ protected $_template = 'template/list.phtml';
protected function _prepareLayout()
{
$this->setChild(
'grid',
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Newsletter\Template\Grid', 'newsletter.template.grid')
+ $this->getLayout()->createBlock('Magento\Newsletter\Block\Adminhtml\Template\Grid', 'newsletter.template.grid')
);
return parent::_prepareLayout();
}
public function getCreateUrl()
{
- return $this->getUrl('adminhtml/*/new');
+ return $this->getUrl('*/*/new');
}
public function getHeaderText()
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
index e5e39f20440..713c2d132cf 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
@@ -19,19 +19,19 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml Newsletter Template Edit Block
+ * Newsletter Template Edit Block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Newsletter\Template;
+namespace Magento\Newsletter\Block\Adminhtml\Template;
class Edit extends \Magento\Adminhtml\Block\Widget
{
@@ -86,7 +86,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
/**
* Preparing block layout
*
- * @return \Magento\Adminhtml\Block\Newsletter\Template\Edit
+ * @return \Magento\Newsletter\Block\Adminhtml\Template\Edit
*/
protected function _prepareLayout()
{
@@ -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('adminhtml/*') . "'",
+ 'onclick' => "window.location.href = '" . $this->getUrl('*/*') . "'",
'class' => 'action-back'
));
@@ -234,7 +234,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
* Set edit flag for block
*
* @param boolean $value
- * @return \Magento\Adminhtml\Block\Newsletter\Template\Edit
+ * @return \Magento\Newsletter\Block\Adminhtml\Template\Edit
*/
public function setEditMode($value = true)
{
@@ -274,7 +274,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
public function getForm()
{
return $this->getLayout()
- ->createBlock('Magento\Adminhtml\Block\Newsletter\Template\Edit\Form')
+ ->createBlock('Magento\Newsletter\Block\Adminhtml\Template\Edit\Form')
->toHtml();
}
@@ -295,7 +295,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
*/
public function getSaveUrl()
{
- return $this->getUrl('adminhtml/*/save');
+ return $this->getUrl('*/*/save');
}
/**
@@ -305,7 +305,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
*/
public function getPreviewUrl()
{
- return $this->getUrl('adminhtml/*/preview');
+ return $this->getUrl('*/*/preview');
}
/**
@@ -325,7 +325,7 @@ class Edit extends \Magento\Adminhtml\Block\Widget
*/
public function getDeleteUrl()
{
- return $this->getUrl('adminhtml/*/delete', array('id' => $this->getRequest()->getParam('id')));
+ return $this->getUrl('*/*/delete', array('id' => $this->getRequest()->getParam('id')));
}
/**
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit/Form.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php
index aca73a4d278..f0a77f8b77d 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Edit/Form.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php
@@ -19,20 +19,20 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml Newsletter Template Edit Form Block
+ * Newsletter Template Edit Form Block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Newsletter\Template\Edit;
+namespace Magento\Newsletter\Block\Adminhtml\Template\Edit;
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
@@ -74,7 +74,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
/**
* Prepare form before rendering HTML
*
- * @return \Magento\Adminhtml\Block\Newsletter\Template\Edit\Form
+ * @return \Magento\Newsletter\Block\Adminhtml\Template\Edit\Form
*/
protected function _prepareForm()
{
@@ -169,7 +169,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
));
}
- $form->setAction($this->getUrl('adminhtml/*/save'));
+ $form->setAction($this->getUrl('*/*/save'));
$form->setUseContainer(true);
$this->setForm($form);
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid.php
index e065b186a58..a9d911787ce 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid.php
@@ -19,19 +19,19 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml newsletter templates grid block
+ * Newsletter templates grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Newsletter\Template;
+namespace Magento\Newsletter\Block\Adminhtml\Template;
class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
{
@@ -115,7 +115,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
array(
'header' => __('Sender'),
'index' => 'template_sender_email',
- 'renderer' => 'Magento\Adminhtml\Block\Newsletter\Template\Grid\Renderer\Sender',
+ 'renderer' => 'Magento\Newsletter\Block\Adminhtml\Template\Grid\Renderer\Sender',
'header_css_class' => 'col-sender',
'column_css_class' => 'col-sender'
));
@@ -140,7 +140,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
'sortable' => false,
'filter' => false,
'no_link' => true,
- 'renderer' => 'Magento\Adminhtml\Block\Newsletter\Template\Grid\Renderer\Action',
+ 'renderer' => 'Magento\Newsletter\Block\Adminhtml\Template\Grid\Renderer\Action',
'header_css_class' => 'col-actions',
'column_css_class' => 'col-actions'
));
@@ -150,7 +150,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
public function getRowUrl($row)
{
- return $this->getUrl('adminhtml/*/edit', array('id'=>$row->getId()));
+ return $this->getUrl('*/*/edit', array('id'=>$row->getId()));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Action.php
similarity index 80%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Action.php
index e30fbd8a666..90d062c18e7 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Action.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Action.php
@@ -19,20 +19,20 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml newsletter templates grid block action item renderer
+ * Newsletter templates grid block action item renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Newsletter\Template\Grid\Renderer;
+namespace Magento\Newsletter\Block\Adminhtml\Template\Grid\Renderer;
class Action extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Action
{
@@ -46,13 +46,13 @@ class Action extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Action
{
if($row->isValidForSend()) {
$actions[] = array(
- 'url' => $this->getUrl('adminhtml/newsletter_queue/edit', array('template_id' => $row->getId())),
+ 'url' => $this->getUrl('*/queue/edit', array('template_id' => $row->getId())),
'caption' => __('Queue Newsletter...')
);
}
$actions[] = array(
- 'url' => $this->getUrl('adminhtml/*/preview', array('id'=>$row->getId())),
+ 'url' => $this->getUrl('*/*/preview', array('id'=>$row->getId())),
'popup' => true,
'caption' => __('Preview')
);
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php
similarity index 88%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php
index 87f22efadd7..3c9adbac05f 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Grid/Renderer/Sender.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer/Sender.php
@@ -19,20 +19,20 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml newsletter templates grid block sender item renderer
+ * Newsletter templates grid block sender item renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Newsletter\Template\Grid\Renderer;
+namespace Magento\Newsletter\Block\Adminhtml\Template\Grid\Renderer;
class Sender extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer
{
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
index f60823e8bcd..745ae4d6a86 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
@@ -19,19 +19,19 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml newsletter template preview block
+ * Newsletter template preview block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Newsletter\Template;
+namespace Magento\Newsletter\Block\Adminhtml\Template;
class Preview extends \Magento\Adminhtml\Block\Widget
{
diff --git a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview/Form.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview/Form.php
rename to app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview/Form.php
index 77b03cd1cca..77d8a9abe37 100644
--- a/app/code/Magento/Adminhtml/Block/Newsletter/Template/Preview/Form.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (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 @@
* Admin form widget
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Newsletter\Template\Preview;
+namespace Magento\Newsletter\Block\Adminhtml\Template\Preview;
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
@@ -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('adminhtml/*/drop', array('_current' => true)),
+ 'action' => $this->getUrl('*/*/drop', array('_current' => true)),
'method' => 'post',
))
);
diff --git a/app/code/Magento/Adminhtml/Controller/Newsletter/Problem.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Controller/Newsletter/Problem.php
rename to app/code/Magento/Newsletter/Controller/Adminhtml/Problem.php
index e8a92104210..b6b32228ad0 100644
--- a/app/code/Magento/Adminhtml/Controller/Newsletter/Problem.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Problem.php
@@ -19,19 +19,19 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml newsletter subscribers controller
+ * Newsletter subscribers controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Newsletter;
+namespace Magento\Newsletter\Controller\Adminhtml;
class Problem extends \Magento\Backend\App\Action
{
diff --git a/app/code/Magento/Adminhtml/Controller/Newsletter/Queue.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Controller/Newsletter/Queue.php
rename to app/code/Magento/Newsletter/Controller/Adminhtml/Queue.php
index 440e022e2ca..c4071fb7fc9 100644
--- a/app/code/Magento/Adminhtml/Controller/Newsletter/Queue.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue.php
@@ -19,19 +19,19 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml newsletter queue controller
+ * Newsletter queue controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Newsletter;
+namespace Magento\Newsletter\Controller\Adminhtml;
class Queue extends \Magento\Backend\App\Action
{
@@ -81,7 +81,7 @@ class Queue extends \Magento\Backend\App\Action
*/
public function dropAction()
{
- $this->_view->loadLayout('newsletter_queue_preview');
+ $this->_view->loadLayout('newsletter_queue_preview_popup');
$this->_view->renderLayout();
}
@@ -122,7 +122,7 @@ class Queue extends \Magento\Backend\App\Action
if (!in_array($queue->getQueueStatus(),
array(\Magento\Newsletter\Model\Queue::STATUS_NEVER,
\Magento\Newsletter\Model\Queue::STATUS_PAUSE))) {
- $this->_redirect('adminhtml/*');
+ $this->_redirect('*/*');
return;
}
@@ -131,7 +131,7 @@ class Queue extends \Magento\Backend\App\Action
->save();
}
- $this->_redirect('adminhtml/*');
+ $this->_redirect('*/*');
}
public function pauseAction()
@@ -141,14 +141,14 @@ class Queue extends \Magento\Backend\App\Action
if (!in_array($queue->getQueueStatus(),
array(\Magento\Newsletter\Model\Queue::STATUS_SENDING))) {
- $this->_redirect('adminhtml/*');
+ $this->_redirect('*/*');
return;
}
$queue->setQueueStatus(\Magento\Newsletter\Model\Queue::STATUS_PAUSE);
$queue->save();
- $this->_redirect('adminhtml/*');
+ $this->_redirect('*/*');
}
public function resumeAction()
@@ -158,14 +158,14 @@ class Queue extends \Magento\Backend\App\Action
if (!in_array($queue->getQueueStatus(),
array(\Magento\Newsletter\Model\Queue::STATUS_PAUSE))) {
- $this->_redirect('adminhtml/*');
+ $this->_redirect('*/*');
return;
}
$queue->setQueueStatus(\Magento\Newsletter\Model\Queue::STATUS_SENDING);
$queue->save();
- $this->_redirect('adminhtml/*');
+ $this->_redirect('*/*');
}
public function cancelAction()
@@ -175,14 +175,14 @@ class Queue extends \Magento\Backend\App\Action
if (!in_array($queue->getQueueStatus(),
array(\Magento\Newsletter\Model\Queue::STATUS_SENDING))) {
- $this->_redirect('adminhtml/*');
+ $this->_redirect('*/*');
return;
}
$queue->setQueueStatus(\Magento\Newsletter\Model\Queue::STATUS_CANCEL);
$queue->save();
- $this->_redirect('adminhtml/*');
+ $this->_redirect('*/*');
}
public function sendingAction()
@@ -225,7 +225,7 @@ class Queue extends \Magento\Backend\App\Action
$this->_addBreadcrumb(
__('Newsletter Queue'),
__('Newsletter Queue'),
- $this->getUrl('adminhtml/newsletter_queue')
+ $this->getUrl('*/*')
);
$this->_addBreadcrumb(__('Edit Queue'), __('Edit Queue'));
@@ -257,7 +257,7 @@ class Queue extends \Magento\Backend\App\Action
array(\Magento\Newsletter\Model\Queue::STATUS_NEVER,
\Magento\Newsletter\Model\Queue::STATUS_PAUSE))
) {
- $this->_redirect('adminhtml/*');
+ $this->_redirect('*/*');
return;
}
@@ -282,12 +282,12 @@ class Queue extends \Magento\Backend\App\Action
$this->_getSession()->addSuccess(__('The newsletter queue has been saved.'));
$this->_getSession()->setFormData(false);
- $this->_redirect('adminhtml/*');
+ $this->_redirect('*/*');
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
$id = $this->getRequest()->getParam('id');
if ($id) {
- $this->_redirect('adminhtml/*/edit', array('id' => $id));
+ $this->_redirect('*/*/edit', array('id' => $id));
} else {
$this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
}
diff --git a/app/code/Magento/Adminhtml/Controller/Newsletter/Subscriber.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Controller/Newsletter/Subscriber.php
rename to app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber.php
index a91f652f126..3e834133b71 100644
--- a/app/code/Magento/Adminhtml/Controller/Newsletter/Subscriber.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber.php
@@ -19,19 +19,19 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/**
- * Adminhtml newsletter subscribers controller
+ * Newsletter subscribers controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Newsletter;
+namespace Magento\Newsletter\Controller\Adminhtml;
class Subscriber extends \Magento\Backend\App\Action
{
@@ -120,7 +120,7 @@ class Subscriber extends \Magento\Backend\App\Action
}
}
- $this->_redirect('adminhtml/*/index');
+ $this->_redirect('*/*/index');
}
public function massDeleteAction()
@@ -143,7 +143,7 @@ class Subscriber extends \Magento\Backend\App\Action
}
}
- $this->_redirect('adminhtml/*/index');
+ $this->_redirect('*/*/index');
}
protected function _isAllowed()
diff --git a/app/code/Magento/Adminhtml/Controller/Newsletter/Template.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Controller/Newsletter/Template.php
rename to app/code/Magento/Newsletter/Controller/Adminhtml/Template.php
index 53537fe7b08..1b73f0767d3 100644
--- a/app/code/Magento/Adminhtml/Controller/Newsletter/Template.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @copyright Copyright (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,10 +27,10 @@
* Manage Newsletter Template Controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Newsletter
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Newsletter;
+namespace Magento\Newsletter\Controller\Adminhtml;
class Template extends \Magento\Backend\App\Action
{
@@ -66,7 +66,7 @@ class Template extends \Magento\Backend\App\Action
/**
* Set title of page
*
- * @return \Magento\Adminhtml\Controller\Newsletter\Template
+ * @return \Magento\Newsletter\Controller\Adminhtml\Template
*/
protected function _setTitle()
{
@@ -88,7 +88,7 @@ class Template extends \Magento\Backend\App\Action
$this->_view->loadLayout();
$this->_setActiveMenu('Magento_Newsletter::newsletter_template');
$this->_addBreadcrumb(__('Newsletter Templates'), __('Newsletter Templates'));
- $this->_addContent($this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Newsletter\Template', 'template'));
+ $this->_addContent($this->_view->getLayout()->createBlock('Magento\Newsletter\Block\Adminhtml\Template', 'template'));
$this->_view->renderLayout();
}
@@ -99,7 +99,7 @@ class Template extends \Magento\Backend\App\Action
public function gridAction()
{
$this->_view->loadLayout();
- $grid = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Newsletter\Template\Grid')
+ $grid = $this->_view->getLayout()->createBlock('Magento\Newsletter\Block\Adminhtml\Template\Grid')
->toHtml();
$this->getResponse()->setBody($grid);
}
@@ -164,7 +164,7 @@ class Template extends \Magento\Backend\App\Action
*/
public function dropAction()
{
- $this->_view->loadLayout('newsletter_template_preview');
+ $this->_view->loadLayout('newsletter_template_preview_popup');
$this->_view->renderLayout();
}
@@ -176,7 +176,7 @@ class Template extends \Magento\Backend\App\Action
{
$request = $this->getRequest();
if (!$request->isPost()) {
- $this->getResponse()->setRedirect($this->getUrl('adminhtml/newsletter_template'));
+ $this->getResponse()->setRedirect($this->getUrl('*/template'));
}
$template = $this->_objectManager->create('Magento\Newsletter\Model\Template');
@@ -211,7 +211,7 @@ class Template extends \Magento\Backend\App\Action
$this->_getSession()->addSuccess(__('The newsletter template has been saved.'));
$this->_getSession()->setFormData(false);
- $this->_redirect('adminhtml/*');
+ $this->_redirect('*/template');
return;
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError(nl2br($e->getMessage()));
@@ -248,7 +248,7 @@ class Template extends \Magento\Backend\App\Action
);
}
}
- $this->_redirect('adminhtml/*');
+ $this->_redirect('*/template');
}
/**
diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
index e984546d008..bf741f12592 100644
--- a/app/code/Magento/Newsletter/Model/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -372,7 +372,7 @@ class Subscriber extends \Magento\Core\Model\AbstractModel
}
/**
- * Returns sting of random chars
+ * Returns string of random chars
*
* @param int $length
* @return string
diff --git a/app/code/Magento/Newsletter/etc/adminhtml/menu.xml b/app/code/Magento/Newsletter/etc/adminhtml/menu.xml
index b9780f26430..81dead1b53a 100644
--- a/app/code/Magento/Newsletter/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Newsletter/etc/adminhtml/menu.xml
@@ -27,9 +27,9 @@
-->
<config>
<menu>
- <add id="Magento_Newsletter::newsletter_template" title="Newsletter Template" module="Magento_Newsletter" parent="Magento_Adminhtml::marketing_communications" sortOrder="30" action="adminhtml/newsletter_template/" resource="Magento_Newsletter::template"/>
- <add id="Magento_Newsletter::newsletter_queue" title="Newsletter Queue" module="Magento_Newsletter" sortOrder="40" parent="Magento_Adminhtml::marketing_communications" action="adminhtml/newsletter_queue/" resource="Magento_Newsletter::queue"/>
- <add id="Magento_Newsletter::newsletter_subscriber" title="Newsletter Subscribers" module="Magento_Newsletter" sortOrder="50" parent="Magento_Adminhtml::marketing_communications" action="adminhtml/newsletter_subscriber/" resource="Magento_Newsletter::subscriber"/>
- <add id="Magento_Newsletter::newsletter_problem" title="Newsletter Problem Reports" module="Magento_Newsletter" sortOrder="50" parent="Magento_Reports::report_marketing" action="adminhtml/newsletter_problem/" resource="Magento_Newsletter::problem"/>
+ <add id="Magento_Newsletter::newsletter_template" title="Newsletter Template" module="Magento_Newsletter" parent="Magento_Adminhtml::marketing_communications" sortOrder="30" action="newsletter/template/" resource="Magento_Newsletter::template"/>
+ <add id="Magento_Newsletter::newsletter_queue" title="Newsletter Queue" module="Magento_Newsletter" sortOrder="40" parent="Magento_Adminhtml::marketing_communications" action="newsletter/queue/" resource="Magento_Newsletter::queue"/>
+ <add id="Magento_Newsletter::newsletter_subscriber" title="Newsletter Subscribers" module="Magento_Newsletter" sortOrder="50" parent="Magento_Adminhtml::marketing_communications" action="newsletter/subscriber/" resource="Magento_Newsletter::subscriber"/>
+ <add id="Magento_Newsletter::newsletter_problem" title="Newsletter Problem Reports" module="Magento_Newsletter" sortOrder="50" parent="Magento_Reports::report_marketing" action="newsletter/problem/" resource="Magento_Newsletter::problem"/>
</menu>
</config>
diff --git a/app/code/Magento/Catalog/view/frontend/layout/tag_customer_view.xml b/app/code/Magento/Newsletter/etc/adminhtml/routes.xml
similarity index 84%
rename from app/code/Magento/Catalog/view/frontend/layout/tag_customer_view.xml
rename to app/code/Magento/Newsletter/etc/adminhtml/routes.xml
index 2c2e829daa8..59ea1753f4a 100644
--- a/app/code/Magento/Catalog/view/frontend/layout/tag_customer_view.xml
+++ b/app/code/Magento/Newsletter/etc/adminhtml/routes.xml
@@ -23,6 +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">
- <update handle="MAP_popup"/>
-</layout>
+<config>
+ <router id="admin">
+ <route id="newsletter" frontName="newsletter">
+ <module name="Magento_Newsletter" />
+ </route>
+ </router>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_block.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_block.xml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_block.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_block.xml
index b07f47bd869..bd38e5695c1 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_block.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_block.xml
@@ -41,8 +41,8 @@
<block class="Magento\Backend\Block\Widget\Grid\Column" as="checkbox">
<arguments>
<argument name="sortable" xsi:type="string">0</argument>
- <argument name="filter" xsi:type="string">Magento\Adminhtml\Block\Newsletter\Problem\Grid\Filter\Checkbox</argument>
- <argument name="renderer" xsi:type="string">Magento\Adminhtml\Block\Newsletter\Problem\Grid\Renderer\Checkbox</argument>
+ <argument name="filter" xsi:type="string">Magento\Newsletter\Block\Adminhtml\Problem\Grid\Filter\Checkbox</argument>
+ <argument name="renderer" xsi:type="string">Magento\Newsletter\Block\Adminhtml\Problem\Grid\Renderer\Checkbox</argument>
<argument name="header_css_class" xsi:type="string">col-select</argument>
<argument name="column_css_class" xsi:type="string">col-select</argument>
</arguments>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_grid.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_grid.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_grid.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_grid.xml
index 4da677d0233..c96e57a0fa5 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_grid.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_grid.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<update handle="formkey"/>
- <update handle="adminhtml_newsletter_problem_block"/>
+ <update handle="newsletter_problem_block"/>
<block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.newsletter.problem.container" template="Magento_Backend::widget/grid/container/empty.phtml" output="1"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_index.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_index.xml
similarity index 90%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_index.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_index.xml
index 1042c4f79af..74b303f2008 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_problem_index.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_problem_index.xml
@@ -25,8 +25,8 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<update handle="formkey"/>
- <update handle="adminhtml_newsletter_problem_block"/>
+ <update handle="newsletter_problem_block"/>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Newsletter\Problem" name="adminhtml.newsletter.problem.container"/>
+ <block class="Magento\Newsletter\Block\Adminhtml\Problem" name="adminhtml.newsletter.problem.container"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_queue_edit.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_edit.xml
similarity index 94%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_queue_edit.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_edit.xml
index fdf7afc7ddc..516baf9cc90 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_queue_edit.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_edit.xml
@@ -48,6 +48,6 @@
</block>
</referenceBlock>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Newsletter\Queue\Edit" name="queue_edit" template="newsletter/queue/edit.phtml"/>
+ <block class="Magento\Newsletter\Block\Adminhtml\Queue\Edit" name="queue_edit" template="queue/edit.phtml"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/adminhtml_newsletter_queue_grid.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid.xml
similarity index 95%
rename from app/code/Magento/Newsletter/view/adminhtml/layout/adminhtml_newsletter_queue_grid.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid.xml
index c70bb225c0b..81031f3537d 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/layout/adminhtml_newsletter_queue_grid.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<update handle="formkey"/>
- <update handle="adminhtml_newsletter_queue_grid_block"/>
+ <update handle="newsletter_queue_grid_block"/>
<block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.newsletter.queue.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml" output="1"/>
</layout>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/adminhtml_newsletter_queue_grid_block.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid_block.xml
similarity index 99%
rename from app/code/Magento/Newsletter/view/adminhtml/layout/adminhtml_newsletter_queue_grid_block.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid_block.xml
index d4d8b71fdd2..7fce7dea727 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/layout/adminhtml_newsletter_queue_grid_block.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_grid_block.xml
@@ -115,7 +115,7 @@
<argument name="filter" xsi:type="string">0</argument>
<argument name="sortable" xsi:type="string">0</argument>
<argument name="no_link" xsi:type="string">1</argument>
- <argument name="renderer" xsi:type="string">Magento\Adminhtml\Block\Newsletter\Queue\Grid\Renderer\Action</argument>
+ <argument name="renderer" xsi:type="string">Magento\Newsletter\Block\Adminhtml\Queue\Grid\Renderer\Action</argument>
<argument name="header_css_class" xsi:type="string">col-actions</argument>
<argument name="column_css_class" xsi:type="string">col-actions</argument>
</arguments>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/layout/adminhtml_newsletter_queue_index.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_index.xml
similarity index 95%
rename from app/code/Magento/Newsletter/view/adminhtml/layout/adminhtml_newsletter_queue_index.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_index.xml
index 7646cd1fc34..91cf0357521 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/layout/adminhtml_newsletter_queue_index.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_index.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_newsletter_queue_grid_block"/>
+ <update handle="newsletter_queue_grid_block"/>
<referenceContainer name="content">
<block class="Magento\Backend\Block\Template" template="Magento_Newsletter::queue/list.phtml" name="adminhtml.newsletter.queue.grid.container"/>
</referenceContainer>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_queue_preview.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview.xml
similarity index 82%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_queue_preview.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview.xml
index e68af194f99..ae22fc6d5c7 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_queue_preview.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview.xml
@@ -26,9 +26,9 @@
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="root">
<action method="setTemplate">
- <argument name="template" xsi:type="string">newsletter/preview/iframeswitcher.phtml</argument>
+ <argument name="template" xsi:type="string">Magento_Newsletter::preview/iframeswitcher.phtml</argument>
</action>
- <block class="Magento\Adminhtml\Block\Newsletter\Queue\Preview\Form" name="preview_form"/>
- <block class="Magento\Backend\Block\Store\Switcher" name="store_switcher" template="Magento_Adminhtml::newsletter/preview/store.phtml"/>
+ <block class="Magento\Newsletter\Block\Adminhtml\Queue\Preview\Form" name="preview_form"/>
+ <block class="Magento\Backend\Block\Store\Switcher" name="store_switcher" template="Magento_Newsletter::preview/store.phtml"/>
</referenceBlock>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/newsletter_queue_preview.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview_popup.xml
similarity index 85%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/newsletter_queue_preview.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview_popup.xml
index 596315b0f0c..ceac2a72187 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/newsletter_queue_preview.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_queue_preview_popup.xml
@@ -24,8 +24,8 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <block class="Magento\View\Block\Template" name="root" output="1" template="Magento_Adminhtml::newsletter/queue/preview.phtml">
- <block class="Magento\Adminhtml\Block\Newsletter\Queue\Preview" name="content" as="content"/>
+ <block class="Magento\View\Block\Template" name="root" output="1" template="Magento_Newsletter::queue/preview.phtml">
+ <block class="Magento\Newsletter\Block\Adminhtml\Queue\Preview" name="content" as="content"/>
</block>
- <block class="Magento\Adminhtml\Block\Newsletter\Queue\Preview" name="preview_template"/>
+ <block class="Magento\Newsletter\Block\Adminhtml\Queue\Preview" name="preview_template"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_block.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml
similarity index 97%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_block.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml
index 2dbf6c7b132..0ab01650f7f 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_block.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_block.xml
@@ -25,7 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="adminhtml.newsletter.subscriber.container">
- <block class="Magento\Adminhtml\Block\Newsletter\Subscriber\Grid" name="adminhtml.newslettrer.subscriber.grid" as="grid">
+ <block class="Magento\Newsletter\Block\Adminhtml\Subscriber\Grid" name="adminhtml.newslettrer.subscriber.grid" as="grid">
<arguments>
<argument name="id" xsi:type="string">subscriberGrid</argument>
<argument name="dataSource" xsi:type="object">Magento\Newsletter\Model\Resource\Subscriber\Grid\Collection</argument>
@@ -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">adminhtml/*/massUnsubscribe</item>
+ <item name="url" xsi:type="string">*/*/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">adminhtml/*/massDelete</item>
+ <item name="url" xsi:type="string">*/*/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">adminhtml/*/exportCsv</item>
+ <item name="urlPath" xsi:type="string">*/*/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">adminhtml/*/exportXml</item>
+ <item name="urlPath" xsi:type="string">*/*/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_newsletter_subscriber_exportcsv.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_exportcsv.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_exportcsv.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_exportcsv.xml
index 43d631c3b09..e869d6edb46 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_exportcsv.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_exportcsv.xml
@@ -24,6 +24,6 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_newsletter_subscriber_block"/>
+ <update handle="newsletter_subscriber_block"/>
<block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.newsletter.subscriber.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_exportxml.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_exportxml.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_exportxml.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_exportxml.xml
index 43d631c3b09..e869d6edb46 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_exportxml.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_exportxml.xml
@@ -24,6 +24,6 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_newsletter_subscriber_block"/>
+ <update handle="newsletter_subscriber_block"/>
<block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.newsletter.subscriber.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_grid.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_grid.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_grid.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_grid.xml
index c44ea191403..2809a33e1f3 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_grid.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_grid.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<update handle="formkey"/>
- <update handle="adminhtml_newsletter_subscriber_block"/>
+ <update handle="newsletter_subscriber_block"/>
<block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.newsletter.subscriber.container" template="Magento_Backend::widget/grid/container/empty.phtml" output="1"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_index.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_index.xml
similarity index 90%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_index.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_index.xml
index 14e2fbf661c..2797a8bbe9c 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_subscriber_index.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_subscriber_index.xml
@@ -25,8 +25,8 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<update handle="formkey"/>
- <update handle="adminhtml_newsletter_subscriber_block"/>
+ <update handle="newsletter_subscriber_block"/>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Newsletter\Subscriber" name="adminhtml.newsletter.subscriber.container"/>
+ <block class="Magento\Newsletter\Block\Adminhtml\Subscriber" name="adminhtml.newsletter.subscriber.container"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_template_edit.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_edit.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_template_edit.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_edit.xml
index f3d508d79c8..2b67f4ce7e5 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_template_edit.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_edit.xml
@@ -58,6 +58,6 @@
</block>
</referenceBlock>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Newsletter\Template\Edit" name="template_edit" template="newsletter/template/edit.phtml"/>
+ <block class="Magento\Newsletter\Block\Adminhtml\Template\Edit" name="template_edit" template="template/edit.phtml"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_template_preview.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview.xml
similarity index 83%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_template_preview.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview.xml
index 263293d5f07..e7fd0912ad8 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_newsletter_template_preview.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview.xml
@@ -26,9 +26,9 @@
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="root">
<action method="setTemplate">
- <argument name="template" xsi:type="string">newsletter/preview/iframeswitcher.phtml</argument>
+ <argument name="template" xsi:type="string">Magento_Newsletter::preview/iframeswitcher.phtml</argument>
</action>
- <block class="Magento\Adminhtml\Block\Newsletter\Template\Preview\Form" name="preview_form"/>
- <block class="Magento\Backend\Block\Store\Switcher" name="store_switcher" template="Magento_Adminhtml::newsletter/preview/store.phtml"/>
+ <block class="Magento\Newsletter\Block\Adminhtml\Template\Preview\Form" name="preview_form"/>
+ <block class="Magento\Backend\Block\Store\Switcher" name="store_switcher" template="Magento_Newsletter::preview/store.phtml"/>
</referenceBlock>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/newsletter_template_preview.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview_popup.xml
similarity index 85%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/newsletter_template_preview.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview_popup.xml
index 5fbce706060..e7c0615d8e3 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/newsletter_template_preview.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/newsletter_template_preview_popup.xml
@@ -24,8 +24,8 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <block class="Magento\View\Block\Template" name="root" output="1" template="Magento_Adminhtml::newsletter/template/preview.phtml">
- <block class="Magento\Adminhtml\Block\Newsletter\Template\Preview" name="content" as="content"/>
+ <block class="Magento\View\Block\Template" name="root" output="1" template="Magento_Newsletter::template/preview.phtml">
+ <block class="Magento\Newsletter\Block\Adminhtml\Template\Preview" name="content" as="content"/>
</block>
- <block class="Magento\Adminhtml\Block\Newsletter\Template\Preview" name="preview_template"/>
+ <block class="Magento\Newsletter\Block\Adminhtml\Template\Preview" name="preview_template"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/preview.xml b/app/code/Magento/Newsletter/view/adminhtml/layout/preview.xml
similarity index 89%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/preview.xml
rename to app/code/Magento/Newsletter/view/adminhtml/layout/preview.xml
index f92336d5d09..48ec7d0baa0 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/preview.xml
+++ b/app/code/Magento/Newsletter/view/adminhtml/layout/preview.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <block class="Magento\View\Block\Template" name="root" output="1" template="Magento_Adminhtml::newsletter/template/preview.phtml">
- <block class="Magento\Adminhtml\Block\Newsletter\Template\Preview" name="content" as="content"/>
+ <block class="Magento\View\Block\Template" name="root" output="1" template="Magento_Newsletter::template/preview.phtml">
+ <block class="Magento\Newsletter\Block\Adminhtml\Template\Preview" name="content" as="content"/>
</block>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/preview/iframeswitcher.phtml b/app/code/Magento/Newsletter/view/adminhtml/preview/iframeswitcher.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/newsletter/preview/iframeswitcher.phtml
rename to app/code/Magento/Newsletter/view/adminhtml/preview/iframeswitcher.phtml
index 8c58f4ededb..945708a62ee 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/preview/iframeswitcher.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/preview/iframeswitcher.phtml
@@ -25,7 +25,7 @@
*/
?>
<?php
-/* @var $this \Magento\Adminhtml\Block\Page */
+/* @var $this \Magento\Backend\Block\Page */
?>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->getLang() ?>" lang="<?php echo $this->getLang() ?>">
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/preview/store.phtml b/app/code/Magento/Newsletter/view/adminhtml/preview/store.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/newsletter/preview/store.phtml
rename to app/code/Magento/Newsletter/view/adminhtml/preview/store.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/problem/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/problem/list.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/newsletter/problem/list.phtml
rename to app/code/Magento/Newsletter/view/adminhtml/problem/list.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/queue/edit.phtml b/app/code/Magento/Newsletter/view/adminhtml/queue/edit.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/newsletter/queue/edit.phtml
rename to app/code/Magento/Newsletter/view/adminhtml/queue/edit.phtml
index e8aa2497ac3..ebe4b0de3ef 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/queue/edit.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/queue/edit.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\Newsletter\Queue\Edit */
+/* @var $this \Magento\Newsletter\Block\Adminhtml\Queue\Edit */
?>
<div class="page-actions">
<?php echo $this->getBackButtonHtml() ?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/queue/preview.phtml b/app/code/Magento/Newsletter/view/adminhtml/queue/preview.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/newsletter/queue/preview.phtml
rename to app/code/Magento/Newsletter/view/adminhtml/queue/preview.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/subscriber/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/subscriber/list.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/newsletter/subscriber/list.phtml
rename to app/code/Magento/Newsletter/view/adminhtml/subscriber/list.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/template/edit.phtml b/app/code/Magento/Newsletter/view/adminhtml/template/edit.phtml
similarity index 99%
rename from app/code/Magento/Adminhtml/view/adminhtml/newsletter/template/edit.phtml
rename to app/code/Magento/Newsletter/view/adminhtml/template/edit.phtml
index e8f34e3019b..8b964cd7e11 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/template/edit.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/template/edit.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\Newsletter\Template\Edit */
+/* @var $this \Magento\Newsletter\Block\Adminhtml\Template\Edit */
?>
<div class="page-actions">
<?php echo $this->getBackButtonHtml(); ?>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/template/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/template/list.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/newsletter/template/list.phtml
rename to app/code/Magento/Newsletter/view/adminhtml/template/list.phtml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/newsletter/template/preview.phtml b/app/code/Magento/Newsletter/view/adminhtml/template/preview.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/newsletter/template/preview.phtml
rename to app/code/Magento/Newsletter/view/adminhtml/template/preview.phtml
diff --git a/app/code/Magento/Newsletter/view/frontend/newsletter.js b/app/code/Magento/Newsletter/view/frontend/newsletter.js
index 010a1e46a98..da13f42afba 100644
--- a/app/code/Magento/Newsletter/view/frontend/newsletter.js
+++ b/app/code/Magento/Newsletter/view/frontend/newsletter.js
@@ -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 frontend newsletter
- * @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)
*/
diff --git a/app/code/Magento/Newsletter/view/frontend/subscribe.phtml b/app/code/Magento/Newsletter/view/frontend/subscribe.phtml
index c3e45339281..c33c07b7907 100644
--- a/app/code/Magento/Newsletter/view/frontend/subscribe.phtml
+++ b/app/code/Magento/Newsletter/view/frontend/subscribe.phtml
@@ -18,7 +18,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)
*/
@@ -27,19 +26,21 @@
<div class="title"><strong>Newsletter</strong></div>
<div class="content">
<form action="<?php echo $this->getFormActionUrl() ?>" method="post" id="newsletter-validate-detail">
- <div class="field newsletter">
- <label class="label" for="newsletter"><?php echo __('Sign Up for Our Newsletter:') ?></label>
- <div class="control">
- <input name="email" type="text" id="newsletter"
- placeholder="<?php echo __('Enter your email address') ?>"
- data-validate="{required:true, 'validate-email':true}"/>
+ <fieldset class="fieldset">
+ <div class="field newsletter">
+ <label class="label" for="newsletter"><span><?php echo __('Sign Up for Our Newsletter:') ?></span></label>
+ <div class="control">
+ <input name="email" type="text" id="newsletter"
+ placeholder="<?php echo __('Enter your email address') ?>"
+ data-validate="{required:true, 'validate-email':true}"/>
+ </div>
+ <div class="actions">
+ <button class="action subscribe" title="<?php echo __('Subscribe') ?>" type="submit">
+ <span><?php echo __('Subscribe') ?></span>
+ </button>
+ </div>
</div>
- <div class="actions">
- <button class="action subscribe" title="<?php echo __('Subscribe') ?>" type="submit">
- <span><?php echo __('Subscribe') ?></span>
- </button>
- </div>
- </div>
+ </fieldset>
</form>
</div>
</div>
diff --git a/app/code/Magento/Page/Block/Html/Header.php b/app/code/Magento/Page/Block/Html/Header.php
index 46e24c337fa..8a55b5178bf 100644
--- a/app/code/Magento/Page/Block/Html/Header.php
+++ b/app/code/Magento/Page/Block/Html/Header.php
@@ -64,11 +64,14 @@ class Header extends \Magento\View\Block\Template
/**
* Check if current url is url for home page
*
- * @return true
+ * @return bool
*/
public function getIsHomePage()
{
- return $this->getUrl('') == $this->getUrl('*/*/*', array('_current'=>true, '_use_rewrite'=>true));
+ return $this->getUrl('', array('_current' => true)) == $this->getUrl(
+ '*/*/*',
+ array('_current' => true, '_use_rewrite' => true)
+ );
}
public function setLogo($logo_src, $logo_alt)
diff --git a/app/code/Magento/Page/etc/adminhtml/system.xml b/app/code/Magento/Page/etc/adminhtml/system.xml
index 769974e04d4..2f45806cae3 100644
--- a/app/code/Magento/Page/etc/adminhtml/system.xml
+++ b/app/code/Magento/Page/etc/adminhtml/system.xml
@@ -73,7 +73,7 @@
</field>
<field id="reset_to_defaults" translate="label comment" type="button" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Reset to Defaults</label>
- <frontend_model>Magento\Adminhtml\Block\Page\System\Config\Robots\Reset</frontend_model>
+ <frontend_model>Magento\Backend\Block\Page\System\Config\Robots\Reset</frontend_model>
<comment>This action will delete your custom instructions and reset robots.txt file to system's default settings.</comment>
</field>
</group>
diff --git a/app/code/Magento/Page/view/frontend/1column.phtml b/app/code/Magento/Page/view/frontend/1column.phtml
index d51c07bf583..da0e81c630b 100644
--- a/app/code/Magento/Page/view/frontend/1column.phtml
+++ b/app/code/Magento/Page/view/frontend/1column.phtml
@@ -32,12 +32,15 @@ $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, initial-scale=1">
+ <meta charset="utf-8"/>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1"/>
<?php echo $this->getChildHtml('head') ?>
</head>
-<body class="col1-layout<?php echo $bodyCss ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+<body class="col1-layout<?php echo $bodyCss ?>"
+ data-container="body"
+ <?php echo $this->getAddAttribute() ?>
+ 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/2columns-left.phtml b/app/code/Magento/Page/view/frontend/2columns-left.phtml
index 89f05398636..6af17516b68 100644
--- a/app/code/Magento/Page/view/frontend/2columns-left.phtml
+++ b/app/code/Magento/Page/view/frontend/2columns-left.phtml
@@ -32,12 +32,15 @@ $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, initial-scale=1">
+ <meta charset="utf-8"/>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1"/>
<?php echo $this->getChildHtml('head') ?>
</head>
-<body class="col2-left-layout<?php echo $bodyCss ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+<body class="col2-left-layout<?php echo $bodyCss ?>"
+ data-container="body"
+ <?php echo $this->getAddAttribute(); ?>
+ 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/2columns-right.phtml b/app/code/Magento/Page/view/frontend/2columns-right.phtml
index 50a3a649672..7b5aae3b2b8 100644
--- a/app/code/Magento/Page/view/frontend/2columns-right.phtml
+++ b/app/code/Magento/Page/view/frontend/2columns-right.phtml
@@ -32,12 +32,15 @@ $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, initial-scale=1">
+ <meta charset="utf-8"/>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1"/>
<?php echo $this->getChildHtml('head') ?>
</head>
-<body class="col2-right-layout<?php echo $bodyCss ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+<body class="col2-right-layout<?php echo $bodyCss ?>"
+ data-container="body"
+ <?php echo $this->getAddAttribute() ?>
+ 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/3columns.phtml b/app/code/Magento/Page/view/frontend/3columns.phtml
index c5e2fa8df9a..565563d3fa9 100644
--- a/app/code/Magento/Page/view/frontend/3columns.phtml
+++ b/app/code/Magento/Page/view/frontend/3columns.phtml
@@ -32,12 +32,15 @@ $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, initial-scale=1">
+ <meta charset="utf-8"/>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1"/>
<?php echo $this->getChildHtml('head') ?>
</head>
-<body class="col3-layout<?php echo $bodyCss ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+<body class="col3-layout<?php echo $bodyCss ?>"
+ data-container="body"
+ <?php echo $this->getAddAttribute() ?>
+ 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/empty.phtml b/app/code/Magento/Page/view/frontend/empty.phtml
index 6d44c2cacfb..ccdcbfcd6b0 100644
--- a/app/code/Magento/Page/view/frontend/empty.phtml
+++ b/app/code/Magento/Page/view/frontend/empty.phtml
@@ -32,12 +32,15 @@ $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, initial-scale=1">
+ <meta charset="utf-8"/>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1"/>
<?php echo $this->getChildHtml('head') ?>
</head>
-<body class="page-empty<?php echo $bodyCss ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+<body class="page-empty<?php echo $bodyCss ?>"
+ data-container="body"
+ <?php echo $this->getAddAttribute() ?>
+ 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/html/title.phtml b/app/code/Magento/Page/view/frontend/html/title.phtml
index 103a2c8d32f..f0bb0228b0a 100644
--- a/app/code/Magento/Page/view/frontend/html/title.phtml
+++ b/app/code/Magento/Page/view/frontend/html/title.phtml
@@ -31,7 +31,7 @@ $prefix = $this->getPrefix() ? '<span class="prefix">' . $this->getPrefix() . '<
$suffix = $this->getSuffix() ? '<span class="suffix">' . $this->getSuffix() . '</span>' : '';
$title = '';
if (trim($this->getPageTitle())) {
- $title = $prefix . '<span class="base">' . $this->getPageTitle() . '</span>' . $suffix;
+ $title = $prefix . '<span class="base" data-ui-id="page-title" ' . $this->getAddBaseAttribute() . '>' . $this->getPageTitle() . '</span>' . $suffix;
}
?>
<?php if ($title): ?>
@@ -39,4 +39,4 @@ if (trim($this->getPageTitle())) {
<h1 class="title"><?php echo $title ?></h1>
<?php echo $this->getChildHtml(); ?>
</div>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/app/code/Magento/Page/view/frontend/page.phtml b/app/code/Magento/Page/view/frontend/page.phtml
index 09cf7c39640..bea91f0711d 100644
--- a/app/code/Magento/Page/view/frontend/page.phtml
+++ b/app/code/Magento/Page/view/frontend/page.phtml
@@ -32,12 +32,15 @@ $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, initial-scale=1">
+ <meta charset="utf-8"/>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1"/>
<?php echo $this->getChildHtml('head') ?>
</head>
-<body class="<?php echo $bodyCss ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+<body class="<?php echo $bodyCss ?>"
+ data-container="body"
+ <?php echo $this->getAddAttribute() ?>
+ 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 6d012f7bf14..fcf6f9c669a 100644
--- a/app/code/Magento/Page/view/frontend/popup.phtml
+++ b/app/code/Magento/Page/view/frontend/popup.phtml
@@ -32,12 +32,15 @@ $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, initial-scale=1">
+ <meta charset="utf-8"/>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1"/>
<?php echo $this->getChildHtml('head') ?>
</head>
-<body class="page popup<?php echo $bodyCss ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+<body class="page popup<?php echo $bodyCss ?>"
+ data-container="body"
+ <?php echo $this->getAddAttribute() ?>
+ data-mage-init="{loaderAjax: {}, loader: {}}">
<?php echo $this->getChildHtml('after_body_start') ?>
<div class="page wrapper">
<?php echo $this->getChildHtml('main') ?>
diff --git a/app/code/Magento/Page/view/frontend/print.phtml b/app/code/Magento/Page/view/frontend/print.phtml
index d16f0a93241..157e58e456e 100644
--- a/app/code/Magento/Page/view/frontend/print.phtml
+++ b/app/code/Magento/Page/view/frontend/print.phtml
@@ -34,7 +34,10 @@
<head>
<?php echo $this->getChildHtml('head') ?>
</head>
-<body class="page print<?php echo $this->getBodyClass()?$this->getBodyClass():'' ?>" data-container="body" data-mage-init="{loaderAjax: {}, loader: {}}">
+<body class="page print<?php echo $this->getBodyClass()?$this->getBodyClass():'' ?>"
+ data-container="body"
+ <?php echo $this->getAddAttribute() ?>
+ data-mage-init="{loaderAjax: {}, loader: {}}">
<?php echo $this->getChildHtml('after_body_start') ?>
<div class="page print wrapper">
<header class="header print">
diff --git a/app/code/Magento/Paygate/Block/Authorizenet/Form/Cc.php b/app/code/Magento/Paygate/Block/Authorizenet/Form/Cc.php
index 7182ff076c3..4af8a927688 100644
--- a/app/code/Magento/Paygate/Block/Authorizenet/Form/Cc.php
+++ b/app/code/Magento/Paygate/Block/Authorizenet/Form/Cc.php
@@ -31,7 +31,7 @@ class Cc extends \Magento\Payment\Block\Form
protected $_template = 'Magento_Paygate::form/cc.phtml';
/**
- * Retreive payment method form html
+ * Retrieve payment method form html
*
* @return string
*/
diff --git a/app/code/Magento/Payment/Block/Form/Cc.php b/app/code/Magento/Payment/Block/Form/Cc.php
index 91f7e34dc60..48245e15900 100644
--- a/app/code/Magento/Payment/Block/Form/Cc.php
+++ b/app/code/Magento/Payment/Block/Form/Cc.php
@@ -109,7 +109,7 @@ class Cc extends \Magento\Payment\Block\Form
}
/**
- * Retrive has verification configuration
+ * Retrieve has verification configuration
*
* @return boolean
*/
diff --git a/app/code/Magento/Payment/Block/Info.php b/app/code/Magento/Payment/Block/Info.php
index 0a6bf748651..7baed204b2b 100644
--- a/app/code/Magento/Payment/Block/Info.php
+++ b/app/code/Magento/Payment/Block/Info.php
@@ -144,7 +144,9 @@ class Info extends \Magento\View\Block\Template
if (!$method = $payment->getMethodInstance()) {
return true;
}
- return !$this->_storeManager->getStore($method->getStore())->isAdmin();
+
+ $methodStore = $this->_storeManager->getStore($method->getStore());
+ return $methodStore->getId() != \Magento\Core\Model\Store::DEFAULT_STORE_ID;
}
/**
diff --git a/app/code/Magento/Payment/Model/Billing/AbstractAgreement.php b/app/code/Magento/Payment/Model/Billing/AbstractAgreement.php
index b61468f5f86..c74ffc2bd13 100644
--- a/app/code/Magento/Payment/Model/Billing/AbstractAgreement.php
+++ b/app/code/Magento/Payment/Model/Billing/AbstractAgreement.php
@@ -99,7 +99,7 @@ abstract class AbstractAgreement extends \Magento\Core\Model\AbstractModel
}
/**
- * Retreive payment method instance
+ * Retrieve payment method instance
*
* @return \Magento\Payment\Model\Method\AbstractMethod
*/
@@ -132,7 +132,7 @@ abstract class AbstractAgreement extends \Magento\Core\Model\AbstractModel
}
/**
- * Before save, it's overriden just to make data validation on before save event
+ * Before save, it's overridden just to make data validation on before save event
*
* @throws \Magento\Core\Exception
* @return \Magento\Core\Model\AbstractModel
diff --git a/app/code/Magento/Paypal/Model/Api/Nvp.php b/app/code/Magento/Paypal/Model/Api/Nvp.php
index 2c4091f348a..686a166772b 100644
--- a/app/code/Magento/Paypal/Model/Api/Nvp.php
+++ b/app/code/Magento/Paypal/Model/Api/Nvp.php
@@ -1024,7 +1024,7 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
try {
$http = new \Magento\HTTP\Adapter\Curl();
$config = array(
- 'timeout' => 30,
+ 'timeout' => 60,
'verifypeer' => $this->_config->verifyPeer
);
if ($this->getUseProxy()) {
diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index 9d04246d87f..ae315b84704 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -1117,6 +1117,9 @@ class Config
if ($this->getMerchantCountry() == 'MY' && $code == 'MYR') {
return true;
}
+ if ($this->getMerchantCountry() == 'TR' && $code == 'TRY') {
+ return true;
+ }
return false;
}
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
index abb958687d2..2d183969499 100644
--- a/app/code/Magento/Paypal/Model/Express/Checkout.php
+++ b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -43,7 +43,7 @@ class Checkout
* Uses additional_information as storage
*/
const PAYMENT_INFO_TRANSPORT_TOKEN = 'paypal_express_checkout_token';
- const PAYMENT_INFO_TRANSPORT_SHIPPING_OVERRIDEN = 'paypal_express_checkout_shipping_overriden';
+ const PAYMENT_INFO_TRANSPORT_SHIPPING_OVERRIDDEN = 'paypal_express_checkout_shipping_overridden';
const PAYMENT_INFO_TRANSPORT_SHIPPING_METHOD = 'paypal_express_checkout_shipping_method';
const PAYMENT_INFO_TRANSPORT_PAYER_ID = 'paypal_express_checkout_payer_id';
const PAYMENT_INFO_TRANSPORT_REDIRECT = 'paypal_express_checkout_redirect_required';
@@ -439,13 +439,13 @@ class Checkout
$this->_api->setSuppressShipping(true);
} else {
$address = $this->_quote->getShippingAddress();
- $isOverriden = 0;
+ $isOverridden = 0;
if (true === $address->validate()) {
- $isOverriden = 1;
+ $isOverridden = 1;
$this->_api->setAddress($address);
}
$this->_quote->getPayment()->setAdditionalInformation(
- self::PAYMENT_INFO_TRANSPORT_SHIPPING_OVERRIDEN, $isOverriden
+ self::PAYMENT_INFO_TRANSPORT_SHIPPING_OVERRIDDEN, $isOverridden
);
$this->_quote->getPayment()->save();
}
@@ -572,7 +572,7 @@ class Checkout
throw new \Magento\Core\Exception(__('Payer is not identified.'));
}
$this->_quote->setMayEditShippingAddress(
- 1 != $this->_quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_SHIPPING_OVERRIDEN)
+ 1 != $this->_quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_SHIPPING_OVERRIDDEN)
);
$this->_quote->setMayEditShippingMethod(
'' == $this->_quote->getPayment()->getAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_SHIPPING_METHOD)
diff --git a/app/code/Magento/ProductAlert/Block/Email/Price.php b/app/code/Magento/ProductAlert/Block/Email/Price.php
index 2907aa10f06..0741e4dbc5a 100644
--- a/app/code/Magento/ProductAlert/Block/Email/Price.php
+++ b/app/code/Magento/ProductAlert/Block/Email/Price.php
@@ -39,7 +39,7 @@ class Price extends \Magento\ProductAlert\Block\Email\AbstractEmail
protected $_template = 'email/price.phtml';
/**
- * Retrive unsubscribe url for product
+ * Retrieve unsubscribe url for product
*
* @param int $productId
* @return string
diff --git a/app/code/Magento/ProductAlert/Block/Email/Stock.php b/app/code/Magento/ProductAlert/Block/Email/Stock.php
index e1c74632577..4661f346bcf 100644
--- a/app/code/Magento/ProductAlert/Block/Email/Stock.php
+++ b/app/code/Magento/ProductAlert/Block/Email/Stock.php
@@ -62,7 +62,7 @@ class Stock extends \Magento\ProductAlert\Block\Email\AbstractEmail
}
/**
- * Retrive unsubscribe url for product
+ * Retrieve unsubscribe url for product
*
* @param int $productId
* @return string
diff --git a/app/code/Magento/ProductAlert/view/frontend/product/view.phtml b/app/code/Magento/ProductAlert/view/frontend/product/view.phtml
index 202c7b2d1c7..997f9e67590 100644
--- a/app/code/Magento/ProductAlert/view/frontend/product/view.phtml
+++ b/app/code/Magento/ProductAlert/view/frontend/product/view.phtml
@@ -18,14 +18,14 @@
* 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\ProductAlert\Block\Product\View */?>
<div class="product alert <?php echo $this->getHtmlClass() ?>">
- <a href="<?php echo $this->escapeHtml($this->getSignupUrl()) ?>" title="<?php echo $this->escapeHtml(__($this->getSignupLabel())); ?>" class="action alert">
+ <a href="<?php echo $this->escapeHtml($this->getSignupUrl()) ?>"
+ title="<?php echo $this->escapeHtml(__($this->getSignupLabel())); ?>" class="action alert">
<?php echo $this->escapeHtml(__($this->getSignupLabel())); ?>
</a>
</div>
diff --git a/app/code/Magento/Rating/Block/Adminhtml/Edit.php b/app/code/Magento/Rating/Block/Adminhtml/Edit.php
index 3a233582b5e..028e7078255 100644
--- a/app/code/Magento/Rating/Block/Adminhtml/Edit.php
+++ b/app/code/Magento/Rating/Block/Adminhtml/Edit.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Rating
* @copyright Copyright (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/Rating/Block/Adminhtml/Edit/Form.php b/app/code/Magento/Rating/Block/Adminhtml/Edit/Form.php
index a77bf8dbb5d..c2fc0118132 100644
--- a/app/code/Magento/Rating/Block/Adminhtml/Edit/Form.php
+++ b/app/code/Magento/Rating/Block/Adminhtml/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_Rating
* @copyright Copyright (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/Rating/Block/Adminhtml/Edit/Tab/Form.php b/app/code/Magento/Rating/Block/Adminhtml/Edit/Tab/Form.php
index 03ed3e41e37..93dd0c2fcdd 100644
--- a/app/code/Magento/Rating/Block/Adminhtml/Edit/Tab/Form.php
+++ b/app/code/Magento/Rating/Block/Adminhtml/Edit/Tab/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Rating
* @copyright Copyright (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/Rating/Block/Adminhtml/Edit/Tab/Options.php b/app/code/Magento/Rating/Block/Adminhtml/Edit/Tab/Options.php
index 32cd245a748..5684753ad5e 100644
--- a/app/code/Magento/Rating/Block/Adminhtml/Edit/Tab/Options.php
+++ b/app/code/Magento/Rating/Block/Adminhtml/Edit/Tab/Options.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Rating
* @copyright Copyright (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/Rating/Block/Adminhtml/Edit/Tabs.php b/app/code/Magento/Rating/Block/Adminhtml/Edit/Tabs.php
index f4b8e81db56..dc05869d08b 100644
--- a/app/code/Magento/Rating/Block/Adminhtml/Edit/Tabs.php
+++ b/app/code/Magento/Rating/Block/Adminhtml/Edit/Tabs.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Rating
* @copyright Copyright (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/Rating/Block/Adminhtml/Rating.php b/app/code/Magento/Rating/Block/Adminhtml/Rating.php
index 37664b5f8da..9ad6934ea8c 100644
--- a/app/code/Magento/Rating/Block/Adminhtml/Rating.php
+++ b/app/code/Magento/Rating/Block/Adminhtml/Rating.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Rating
* @copyright Copyright (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/Rating/Controller/Adminhtml/Index.php b/app/code/Magento/Rating/Controller/Adminhtml/Index.php
index 835f2ace53f..9b15b7dfeb0 100644
--- a/app/code/Magento/Rating/Controller/Adminhtml/Index.php
+++ b/app/code/Magento/Rating/Controller/Adminhtml/Index.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Rating
* @copyright Copyright (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/Adminhtml/Block/Report/Config/Form/Field/MtdStart.php b/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/MtdStart.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Report/Config/Form/Field/MtdStart.php
rename to app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/MtdStart.php
index bac7e8db8b2..e7720c02316 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Config/Form/Field/MtdStart.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/MtdStart.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 @@
* Dashboard Month-To-Date Day starts Field Renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Config\Form\Field;
+namespace Magento\Reports\Block\Adminhtml\Config\Form\Field;
class MtdStart extends \Magento\Backend\Block\System\Config\Form\Field
{
diff --git a/app/code/Magento/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php b/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStart.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php
rename to app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStart.php
index d5fdeb3b6d2..cea3c719a98 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Config/Form/Field/YtdStart.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStart.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 @@
* Dashboard Year-To-Date Month and Day starts Field Renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Config\Form\Field;
+namespace Magento\Reports\Block\Adminhtml\Config\Form\Field;
class YtdStart extends \Magento\Backend\Block\System\Config\Form\Field
{
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Customer/Accounts.php b/app/code/Magento/Reports/Block/Adminhtml/Customer/Accounts.php
index 5875cc08a12..63c96077718 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Customer/Accounts.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Customer/Accounts.php
@@ -40,7 +40,8 @@ class Accounts extends \Magento\Backend\Block\Widget\Grid\Container
protected function _construct()
{
- $this->_controller = 'report_customer_accounts';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_customer_accounts';
$this->_headerText = __('New Accounts');
parent::_construct();
$this->_removeButton('add');
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Customer/Orders.php b/app/code/Magento/Reports/Block/Adminhtml/Customer/Orders.php
index a0a63eb9c2d..049683e2041 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Customer/Orders.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Customer/Orders.php
@@ -45,7 +45,8 @@ class Orders extends \Magento\Backend\Block\Widget\Grid\Container
protected function _construct()
{
- $this->_controller = 'report_customer_orders';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_customer_orders';
$this->_headerText = __('Customers by number of orders');
parent::_construct();
$this->_removeButton('add');
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Customer/Totals.php b/app/code/Magento/Reports/Block/Adminhtml/Customer/Totals.php
index ee66625a473..a8233a66de2 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Customer/Totals.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Customer/Totals.php
@@ -40,7 +40,8 @@ class Totals extends \Magento\Backend\Block\Widget\Grid\Container
protected function _construct()
{
- $this->_controller = 'report_customer_totals';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_customer_totals';
$this->_headerText = __('Customers by Orders Total');
parent::_construct();
$this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Report/Filter/Form.php b/app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Report/Filter/Form.php
rename to app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php
index cd74153c9ab..5ac73eae5a1 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Filter/Form.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 report filter form
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Filter;
+namespace Magento\Reports\Block\Adminhtml\Filter;
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
@@ -103,7 +103,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
*
* @param string $key
* @param string $value
- * @return \Magento\Adminhtml\Block\Report\Filter\Form
+ * @return \Magento\Reports\Block\Adminhtml\Filter\Form
*/
public function addReportTypeOption($key, $value)
{
@@ -114,11 +114,11 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
/**
* Add fieldset with general report fields
*
- * @return \Magento\Adminhtml\Block\Report\Filter\Form
+ * @return \Magento\Reports\Block\Adminhtml\Filter\Form
*/
protected function _prepareForm()
{
- $actionUrl = $this->getUrl('adminhtml/*/sales');
+ $actionUrl = $this->getUrl('*/*/sales');
/** @var \Magento\Data\Form $form */
$form = $this->_formFactory->create(array(
diff --git a/app/code/Magento/Adminhtml/Block/Report/Grid/AbstractGrid.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Report/Grid/AbstractGrid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
index 2d729bcff57..3d1e86ac381 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Grid/AbstractGrid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/AbstractGrid.php
@@ -19,13 +19,13 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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\Report\Grid;
+namespace Magento\Reports\Block\Adminhtml\Grid;
class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
{
@@ -55,24 +55,24 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
*/
protected $_resourceFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Url $urlModel
- * @param \Magento\Reports\Model\Resource\Report\Collection\Factory $resourceFactory
- * @param \Magento\Reports\Model\Grouped\CollectionFactory $collectionFactory
- * @param \Magento\Reports\Helper\Data $reportsData
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\Core\Model\Url $urlModel
+ * @param \Magento\Reports\Model\Resource\Report\Collection\Factory $resourceFactory
+ * @param \Magento\Reports\Model\Grouped\CollectionFactory $collectionFactory
+ * @param \Magento\Reports\Helper\Data $reportsData
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Url $urlModel,
- \Magento\Reports\Model\Resource\Report\Collection\Factory $resourceFactory,
- \Magento\Reports\Model\Grouped\CollectionFactory $collectionFactory,
- \Magento\Reports\Helper\Data $reportsData,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\Core\Model\Url $urlModel,
+ \Magento\Reports\Model\Resource\Report\Collection\Factory $resourceFactory,
+ \Magento\Reports\Model\Grouped\CollectionFactory $collectionFactory,
+ \Magento\Reports\Helper\Data $reportsData,
+ array $data = array()
+ ) {
$this->_resourceFactory = $resourceFactory;
$this->_collectionFactory = $collectionFactory;
$this->_reportsData = $reportsData;
@@ -121,13 +121,13 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* Add column to grid
- * Overriden to add support for visibility_filter column option
+ * Overridden to add support for visibility_filter column option
* It stands for conditional visibility of the column depending on filter field values
* Value of visibility_filter supports (filter_field_name => filter_field_value) pairs
*
* @param string $columnId
* @param array $column
- * @return \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+ * @return \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
*/
public function addColumn($columnId, $column)
{
@@ -326,7 +326,7 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
*
* @param \Magento\Reports\Model\Resource\Report\Collection\AbstractCollection $collection
* @param \Magento\Object $filterData
- * @return \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+ * @return \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
*/
protected function _addOrderStatusFilter($collection, $filterData)
{
@@ -340,7 +340,7 @@ class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
*
* @param \Magento\Reports\Model\Resource\Report\Collection\AbstractCollection $collection
* @param \Magento\Object $filterData
- * @return \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+ * @return \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
*/
protected function _addCustomFilter($collection, $filterData)
{
diff --git a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Blanknumber.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php
rename to app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Blanknumber.php
index 75993519809..57130d86ab6 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Blanknumber.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Blanknumber.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 or blank line
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Grid\Column\Renderer;
+namespace Magento\Reports\Block\Adminhtml\Grid\Column\Renderer;
class Blanknumber extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Number
{
diff --git a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php
rename to app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
index bffdb7f8132..de73deb962e 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Currency.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 currency
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Grid\Column\Renderer;
+namespace Magento\Reports\Block\Adminhtml\Grid\Column\Renderer;
class Currency
extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Currency
diff --git a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Customer.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php
rename to app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Customer.php
index 89662e998c8..48a589bc47b 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Customer.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Customer.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 Report Customers Reviews renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Grid\Column\Renderer;
+namespace Magento\Reports\Block\Adminhtml\Grid\Column\Renderer;
class Customer
extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer
diff --git a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Product.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php
rename to app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Product.php
index 7e2f7e3381b..b598d5e3453 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Grid/Column/Renderer/Product.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/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_Reports
* @copyright Copyright (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 Report Products Reviews renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Grid\Column\Renderer;
+namespace Magento\Reports\Block\Adminhtml\Grid\Column\Renderer;
class Product
extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer
diff --git a/app/code/Magento/Adminhtml/Block/Report/Grid/Shopcart.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Shopcart.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Report/Grid/Shopcart.php
rename to app/code/Magento/Reports/Block/Adminhtml/Grid/Shopcart.php
index 51b4fbd42d4..df193b18293 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Grid/Shopcart.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Shopcart.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 shopping carts report grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Grid;
+namespace Magento\Reports\Block\Adminhtml\Grid;
class Shopcart extends \Magento\Backend\Block\Widget\Grid\Extended
{
@@ -49,7 +49,7 @@ class Shopcart extends \Magento\Backend\Block\Widget\Grid\Extended
* storeIds setter
*
* @param array $storeIds
- * @return \Magento\Adminhtml\Block\Report\Grid\Shopcart
+ * @return \Magento\Reports\Block\Adminhtml\Grid\Shopcart
*/
public function setStoreIds($storeIds)
{
diff --git a/app/code/Magento/Adminhtml/Block/Report/Product.php b/app/code/Magento/Reports/Block/Adminhtml/Product.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Report/Product.php
rename to app/code/Magento/Reports/Block/Adminhtml/Product.php
index de2056200a2..35355169e3e 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Product.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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,18 @@
* Adminhtml products report page content block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report;
+namespace Magento\Reports\Block\Adminhtml;
class Product extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
protected function _construct()
{
- $this->_controller = 'report_product';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_product';
$this->_headerText = __('Products Report');
parent::_construct();
$this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Downloads.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Report/Product/Downloads.php
rename to app/code/Magento/Reports/Block/Adminhtml/Product/Downloads.php
index 469f8fa7bb7..86695e021cf 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Product/Downloads.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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,18 @@
* Adminhtml product downloads report
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Product;
+namespace Magento\Reports\Block\Adminhtml\Product;
class Downloads extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
protected function _construct()
{
- $this->_controller = 'report_product_downloads';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_product_downloads';
$this->_headerText = __('Downloads');
parent::_construct();
$this->_removeButton('add');
@@ -49,7 +50,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('adminhtml/*/*', array('store'=>null)))
+ ->setSwitchUrl($this->getUrl('*/*/*', array('store'=>null)))
->setTemplate('Magento_Reports::store/switcher.phtml')
);
return parent::_prepareLayout();
diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Downloads/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Grid.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Report/Product/Downloads/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Grid.php
index 92839062b40..81b117d39eb 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Product/Downloads/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 product downloads report grid
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Product\Downloads;
+namespace Magento\Reports\Block\Adminhtml\Product\Downloads;
class Grid extends \Magento\Adminhtml\Block\Widget\Grid
{
@@ -123,7 +123,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
'filter' => false,
'index' => 'purchases',
'type' => 'number',
- 'renderer' => 'Magento\Adminhtml\Block\Report\Product\Downloads\Renderer\Purchases',
+ 'renderer' => 'Magento\Reports\Block\Adminhtml\Product\Downloads\Renderer\Purchases',
'header_css_class' => 'col-purchases',
'column_css_class' => 'col-purchases'
));
diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Renderer/Purchases.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php
rename to app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Renderer/Purchases.php
index d1748cd8059..7fd67755895 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Product/Downloads/Renderer/Purchases.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Renderer/Purchases.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 Product Downloads Purchases Renderer
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Product\Downloads\Renderer;
+namespace Magento\Reports\Block\Adminhtml\Product\Downloads\Renderer;
class Purchases
extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer
diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Grid.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Report/Product/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Product/Grid.php
index e5b71fae7b3..7fc96321abc 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Product/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 products report grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Product;
+namespace Magento\Reports\Block\Adminhtml\Product;
class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
{
diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Lowstock.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Report/Product/Lowstock.php
rename to app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock.php
index 83c2f2736d9..3492e84a222 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Product/Lowstock.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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,18 @@
* Adminhtml low stock products report content block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Product;
+namespace Magento\Reports\Block\Adminhtml\Product;
class Lowstock extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
protected function _construct()
{
- $this->_controller = 'report_product_lowstock';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_product_lowstock';
$this->_headerText = __('Low stock');
parent::_construct();
$this->_removeButton('add');
@@ -49,7 +50,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('adminhtml/*/*', array('store'=>null)))
+ ->setSwitchUrl($this->getUrl('*/*/*', array('store'=>null)))
->setTemplate('Magento_Reports::store/switcher.phtml')
);
diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Lowstock/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock/Grid.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Report/Product/Lowstock/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock/Grid.php
index 5f415544878..aada0221fe9 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Product/Lowstock/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Lowstock/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 low stock products report grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Product\Lowstock;
+namespace Magento\Reports\Block\Adminhtml\Product\Lowstock;
class Grid extends \Magento\Backend\Block\Widget\Grid
{
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Product/Sold.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Sold.php
index 166de41fbb5..11a46b6b0ce 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Product/Sold.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Sold.php
@@ -44,7 +44,8 @@ class Sold extends \Magento\Backend\Block\Widget\Grid\Container
*/
protected function _construct()
{
- $this->_controller = 'report_product_sold';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_product_sold';
$this->_headerText = __('Products Ordered');
parent::_construct();
$this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Viewed.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Product/Viewed.php
rename to app/code/Magento/Reports/Block/Adminhtml/Product/Viewed.php
index 5e4d81c4b90..2d8fc1e213e 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Product/Viewed.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 most viewed products report content block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Product;
+namespace Magento\Reports\Block\Adminhtml\Product;
class Viewed extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
@@ -40,7 +40,8 @@ class Viewed extends \Magento\Adminhtml\Block\Widget\Grid\Container
protected function _construct()
{
- $this->_controller = 'report_product_viewed';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_product_viewed';
$this->_headerText = __('Most Viewed');
parent::_construct();
@@ -60,6 +61,6 @@ class Viewed extends \Magento\Adminhtml\Block\Widget\Grid\Container
public function getFilterUrl()
{
$this->getRequest()->setParam('filter', null);
- return $this->getUrl('adminhtml/*/viewed', array('_current' => true));
+ return $this->getUrl('*/*/viewed', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Report/Product/Viewed/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed/Grid.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Report/Product/Viewed/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Product/Viewed/Grid.php
index d23166185dd..6c2b19145c0 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Product/Viewed/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Viewed/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 most viewed products report grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Product\Viewed;
+namespace Magento\Reports\Block\Adminhtml\Product\Viewed;
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
{
/**
* Column for grid to be grouped by
@@ -71,7 +71,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
'width' => 100,
'sortable' => false,
'period_type' => $this->getPeriodType(),
- 'renderer' => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date',
+ 'renderer' => 'Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer\Date',
'totals_label' => __('Total'),
'html_decorators' => array('nobr'),
'header_css_class' => 'col-period',
@@ -125,7 +125,8 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
*
* @param \Magento\Reports\Model\Resource\Report\Collection\AbstractCollection $collection
* @param \Magento\Object $filterData
- * @return \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+ * @return \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _addOrderStatusFilter($collection, $filterData)
{
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Refresh/Statistics.php b/app/code/Magento/Reports/Block/Adminhtml/Refresh/Statistics.php
index e86b04cd4cb..c0be8410e09 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Refresh/Statistics.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Refresh/Statistics.php
@@ -40,7 +40,8 @@ class Statistics extends \Magento\Backend\Block\Widget\Grid\Container
*/
protected function _construct()
{
- $this->_controller = 'report_refresh_statistics';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_refresh_statistics';
$this->_headerText = __('Refresh Statistics');
parent::_construct();
$this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Report/Review/Customer.php b/app/code/Magento/Reports/Block/Adminhtml/Review/Customer.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Review/Customer.php
rename to app/code/Magento/Reports/Block/Adminhtml/Review/Customer.php
index c23a87c1873..f6c8043617d 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Review/Customer.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Review/Customer.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 cms blocks content block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Review;
+namespace Magento\Reports\Block\Adminhtml\Review;
class Customer extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
protected function _construct()
{
- $this->_controller = 'report_review_customer';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_review_customer';
$this->_headerText = __('Customers Reviews');
parent::_construct();
$this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Report/Review/Detail.php b/app/code/Magento/Reports/Block/Adminhtml/Review/Detail.php
similarity index 87%
rename from app/code/Magento/Adminhtml/Block/Report/Review/Detail.php
rename to app/code/Magento/Reports/Block/Adminhtml/Review/Detail.php
index 49fa91e3e29..f8fb2d79dc0 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Review/Detail.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Review/Detail.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 report review product blocks content block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Review;
+namespace Magento\Reports\Block\Adminhtml\Review;
class Detail extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
@@ -59,14 +59,15 @@ class Detail extends \Magento\Adminhtml\Block\Widget\Grid\Container
protected function _construct()
{
- $this->_controller = 'report_review_detail';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_review_detail';
$product = $this->_productFactory->create()->load($this->getRequest()->getParam('id'));
$this->_headerText = __('Reviews for %1', $product->getName());
parent::_construct();
$this->_removeButton('add');
- $this->setBackUrl($this->getUrl('adminhtml/report_review/product/'));
+ $this->setBackUrl($this->getUrl('reports/report_review/product/'));
$this->_addBackButton();
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Report/Review/Detail/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Review/Detail/Grid.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Report/Review/Detail/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Review/Detail/Grid.php
index c8032a5ff01..ed52b112651 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Review/Detail/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Review/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_Reports
* @copyright Copyright (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 report reviews product grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Review\Detail;
+namespace Magento\Reports\Block\Adminhtml\Review\Detail;
class Grid extends \Magento\Adminhtml\Block\Widget\Grid
{
diff --git a/app/code/Magento/Adminhtml/Block/Report/Review/Product.php b/app/code/Magento/Reports/Block/Adminhtml/Review/Product.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Review/Product.php
rename to app/code/Magento/Reports/Block/Adminhtml/Review/Product.php
index 942cb137f5d..ec4befe0c00 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Review/Product.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Review/Product.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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,18 @@
* Adminhtml report review product blocks content block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Review;
+namespace Magento\Reports\Block\Adminhtml\Review;
class Product extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
protected function _construct()
{
- $this->_controller = 'report_review_product';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_review_product';
$this->_headerText = __('Products Reviews');
parent::_construct();
$this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Bestsellers.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Bestsellers.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers.php
index 6bf1712a65c..7228b5e0c11 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Bestsellers.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 report page content block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Sales;
+namespace Magento\Reports\Block\Adminhtml\Sales;
class Bestsellers extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
@@ -40,7 +40,8 @@ class Bestsellers extends \Magento\Adminhtml\Block\Widget\Grid\Container
protected function _construct()
{
- $this->_controller = 'report_sales_bestsellers';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_sales_bestsellers';
$this->_headerText = __('Products Bestsellers Report');
parent::_construct();
@@ -55,6 +56,6 @@ class Bestsellers extends \Magento\Adminhtml\Block\Widget\Grid\Container
public function getFilterUrl()
{
$this->getRequest()->setParam('filter', null);
- return $this->getUrl('adminhtml/*/bestsellers', array('_current' => true));
+ return $this->getUrl('*/*/bestsellers', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers/Grid.php
similarity index 91%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers/Grid.php
index a8e2d084aa7..41b672c432c 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Bestsellers/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 bestsellers report grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Sales\Bestsellers;
+namespace Magento\Reports\Block\Adminhtml\Sales\Bestsellers;
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
{
protected $_columnGroupBy = 'period';
@@ -55,7 +55,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
'index' => 'period',
'sortable' => false,
'period_type' => $this->getPeriodType(),
- 'renderer' => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date',
+ 'renderer' => 'Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer\Date',
'totals_label' => __('Total'),
'html_decorators' => array('nobr'),
'header_css_class' => 'col-period',
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Coupons.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Coupons.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons.php
index e02617e9355..622b77b1d5a 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Coupons.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 coupons report page content block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Sales;
+namespace Magento\Reports\Block\Adminhtml\Sales;
class Coupons extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
@@ -40,7 +40,8 @@ class Coupons extends \Magento\Adminhtml\Block\Widget\Grid\Container
protected function _construct()
{
- $this->_controller = 'report_sales_coupons';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_sales_coupons';
$this->_headerText = __('Coupons Usage Report');
parent::_construct();
@@ -55,6 +56,6 @@ class Coupons extends \Magento\Adminhtml\Block\Widget\Grid\Container
public function getFilterUrl()
{
$this->getRequest()->setParam('filter', null);
- return $this->getUrl('adminhtml/*/coupons', array('_current' => true));
+ return $this->getUrl('*/*/coupons', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Coupons/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons/Grid.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Coupons/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons/Grid.php
index d3b003c3b7a..b3b6fc61bb5 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Coupons/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Coupons/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 coupons report grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Sales\Coupons;
+namespace Magento\Reports\Block\Adminhtml\Sales\Coupons;
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
{
protected $_columnGroupBy = 'period';
@@ -60,7 +60,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
'index' => 'period',
'sortable' => false,
'period_type' => $this->getPeriodType(),
- 'renderer' => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date',
+ 'renderer' => 'Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer\Date',
'totals_label' => __('Total'),
'subtotals_label' => __('Subtotal'),
'html_decorators' => array('nobr'),
@@ -183,7 +183,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
*
* @param \Magento\Reports\Model\Resource\Report\Collection\AbstractCollection $collection
* @param \Magento\Object $filterData
- * @return \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+ * @return \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
*/
protected function _addCustomFilter($collection, $filterData)
{
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Grid/Column/Renderer/Date.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Grid/Column/Renderer/Date.php
index a2099f27cd5..d58f5112545 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Grid/Column/Renderer/Date.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Grid/Column/Renderer/Date.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 grid item renderer date
*/
-namespace Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer;
+namespace Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer;
class Date
extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Date
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Invoiced.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Invoiced.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced.php
index e3a3d2c588c..6b19c1592d0 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Invoiced.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 invoiced report page content block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Sales;
+namespace Magento\Reports\Block\Adminhtml\Sales;
class Invoiced extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
@@ -40,7 +40,8 @@ class Invoiced extends \Magento\Adminhtml\Block\Widget\Grid\Container
protected function _construct()
{
- $this->_controller = 'report_sales_invoiced';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_sales_invoiced';
$this->_headerText = __('Total Invoiced vs. Paid Report');
parent::_construct();
@@ -55,6 +56,6 @@ class Invoiced extends \Magento\Adminhtml\Block\Widget\Grid\Container
public function getFilterUrl()
{
$this->getRequest()->setParam('filter', null);
- return $this->getUrl('adminhtml/*/invoiced', array('_current' => true));
+ return $this->getUrl('*/*/invoiced', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Invoiced/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Invoiced/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php
index e57fd51c994..e3d9c3b2a90 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Invoiced/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Invoiced/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 invoiced report grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Sales\Invoiced;
+namespace Magento\Reports\Block\Adminhtml\Sales\Invoiced;
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
{
protected $_columnGroupBy = 'period';
@@ -57,7 +57,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
'index' => 'period',
'sortable' => false,
'period_type' => $this->getPeriodType(),
- 'renderer' => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date',
+ 'renderer' => 'Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer\Date',
'totals_label' => __('Total'),
'html_decorators' => array('nobr'),
'header_css_class' => 'col-period',
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Refunded.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Refunded.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php
index 79a81c0ecb5..1216cd954a5 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Refunded.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 refunded report page content block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Sales;
+namespace Magento\Reports\Block\Adminhtml\Sales;
class Refunded extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
@@ -40,7 +40,8 @@ class Refunded extends \Magento\Adminhtml\Block\Widget\Grid\Container
protected function _construct()
{
- $this->_controller = 'report_sales_refunded';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_sales_refunded';
$this->_headerText = __('Total Refunded Report');
parent::_construct();
@@ -55,6 +56,6 @@ class Refunded extends \Magento\Adminhtml\Block\Widget\Grid\Container
public function getFilterUrl()
{
$this->getRequest()->setParam('filter', null);
- return $this->getUrl('adminhtml/*/refunded', array('_current' => true));
+ return $this->getUrl('*/*/refunded', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Refunded/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Refunded/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php
index 8e7d1d36bdc..f9eedbe590e 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Refunded/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 refunded report grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Sales\Refunded;
+namespace Magento\Reports\Block\Adminhtml\Sales\Refunded;
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
{
protected $_columnGroupBy = 'period';
@@ -57,7 +57,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
'index' => 'period',
'sortable' => false,
'period_type' => $this->getPeriodType(),
- 'renderer' => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date',
+ 'renderer' => 'Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer\Date',
'totals_label' => __('Total'),
'html_decorators' => array('nobr'),
'header_css_class' => 'col-period',
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Sales.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Sales.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php
index 28b260bc3c1..bf5360ca8c4 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Sales.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 report page content block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Sales;
+namespace Magento\Reports\Block\Adminhtml\Sales;
class Sales extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
@@ -40,7 +40,8 @@ class Sales extends \Magento\Adminhtml\Block\Widget\Grid\Container
protected function _construct()
{
- $this->_controller = 'report_sales_sales';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_sales_sales';
$this->_headerText = __('Total Ordered Report');
parent::_construct();
@@ -55,6 +56,6 @@ class Sales extends \Magento\Adminhtml\Block\Widget\Grid\Container
public function getFilterUrl()
{
$this->getRequest()->setParam('filter', null);
- return $this->getUrl('adminhtml/*/sales', array('_current' => true));
+ return $this->getUrl('*/*/sales', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Sales/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Sales/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
index 2c4828a09a4..38fe5585d8b 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Sales/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Sales/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 report grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Sales\Sales;
+namespace Magento\Reports\Block\Adminhtml\Sales\Sales;
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
{
protected $_columnGroupBy = 'period';
@@ -57,7 +57,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
'index' => 'period',
'sortable' => false,
'period_type' => $this->getPeriodType(),
- 'renderer' => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date',
+ 'renderer' => 'Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer\Date',
'totals_label' => __('Total'),
'html_decorators' => array('nobr'),
'header_css_class' => 'col-period',
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Shipping.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Shipping.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php
index 670b0e14299..1d382b0d0fa 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Shipping.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 shipping report page content block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Sales;
+namespace Magento\Reports\Block\Adminhtml\Sales;
class Shipping extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
@@ -41,7 +41,8 @@ class Shipping extends \Magento\Adminhtml\Block\Widget\Grid\Container
protected function _construct()
{
- $this->_controller = 'report_sales_shipping';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_sales_shipping';
$this->_headerText = __('Total Shipped Report');
parent::_construct();
@@ -56,6 +57,6 @@ class Shipping extends \Magento\Adminhtml\Block\Widget\Grid\Container
public function getFilterUrl()
{
$this->getRequest()->setParam('filter', null);
- return $this->getUrl('adminhtml/*/shipping', array('_current' => true));
+ return $this->getUrl('*/*/shipping', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Shipping/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Shipping/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php
index 973449259f0..08e48bff4bc 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Shipping/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 shipping report grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Sales\Shipping;
+namespace Magento\Reports\Block\Adminhtml\Sales\Shipping;
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
{
protected $_columnGroupBy = 'period';
@@ -58,7 +58,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
'index' => 'period',
'sortable' => false,
'period_type' => $this->getPeriodType(),
- 'renderer' => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date',
+ 'renderer' => 'Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer\Date',
'totals_label' => __('Total'),
'subtotals_label' => __('Subtotal'),
'html_decorators' => array('nobr'),
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Tax.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Tax.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php
index b34b879ca8b..358d4ab48f0 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Tax.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 tax report page content block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Sales;
+namespace Magento\Reports\Block\Adminhtml\Sales;
class Tax extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
@@ -41,7 +41,8 @@ class Tax extends \Magento\Adminhtml\Block\Widget\Grid\Container
protected function _construct()
{
- $this->_controller = 'report_sales_tax';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_sales_tax';
$this->_headerText = __('Order Taxes Report Grouped by Tax Rate');
parent::_construct();
@@ -56,7 +57,7 @@ class Tax extends \Magento\Adminhtml\Block\Widget\Grid\Container
public function getFilterUrl()
{
$this->getRequest()->setParam('filter', null);
- return $this->getUrl('adminhtml/*/tax', array('_current' => true));
+ return $this->getUrl('*/*/tax', array('_current' => true));
}
}
diff --git a/app/code/Magento/Adminhtml/Block/Report/Sales/Tax/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Report/Sales/Tax/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
index cb23cc1d3b2..965b745578c 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Sales/Tax/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 tax report grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Sales\Tax;
+namespace Magento\Reports\Block\Adminhtml\Sales\Tax;
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid
{
protected $_columnGroupBy = 'period';
@@ -87,7 +87,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
'index' => 'period',
'sortable' => false,
'period_type' => $this->getPeriodType(),
- 'renderer' => 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date',
+ 'renderer' => 'Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer\Date',
'totals_label' => __('Total'),
'subtotals_label' => __('Subtotal'),
'html_decorators' => array('nobr'),
@@ -150,7 +150,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\AbstractGrid
* Preparing collection
* Filter canceled statuses for orders in taxes
*
- * @return \Magento\Adminhtml\Block\Report\Sales\Tax\Grid
+ * @return \Magento\Reports\Block\Adminhtml\Sales\Tax\Grid
*/
protected function _prepareCollection()
{
diff --git a/app/code/Magento/Adminhtml/Block/Report/Search.php b/app/code/Magento/Reports/Block/Adminhtml/Search.php
similarity index 87%
rename from app/code/Magento/Adminhtml/Block/Report/Search.php
rename to app/code/Magento/Reports/Block/Adminhtml/Search.php
index c085741fb84..f806c85ac56 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Search.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Search.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 search report page content block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report;
+namespace Magento\Reports\Block\Adminhtml;
class Search extends \Magento\Backend\Block\Widget\Grid\Container
{
@@ -42,7 +42,8 @@ class Search extends \Magento\Backend\Block\Widget\Grid\Container
*/
protected function _construct()
{
- $this->_controller = 'report_search';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_search';
$this->_headerText = __('Search Terms');
parent::_construct();
$this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned.php
similarity index 86%
rename from app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned.php
rename to app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned.php
index 355beef2364..a4bd90b7b92 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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,18 @@
* Adminhtml abandoned shopping cart report page content block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Shopcart;
+namespace Magento\Reports\Block\Adminhtml\Shopcart;
class Abandoned extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
protected function _construct()
{
- $this->_controller = 'report_shopcart_abandoned';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_shopcart_abandoned';
$this->_headerText = __('Abandoned carts');
parent::_construct();
$this->_removeButton('add');
@@ -49,7 +50,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('adminhtml/*/*', array('store'=>null)))
+ ->setSwitchUrl($this->getUrl('*/*/*', 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/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
index cc77533f1d4..c2f84aaec91 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 abandoned shopping carts report grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Shopcart\Abandoned;
+namespace Magento\Reports\Block\Adminhtml\Shopcart\Abandoned;
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\Shopcart
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
{
/**
* @var \Magento\Reports\Model\Resource\Quote\CollectionFactory
@@ -152,7 +152,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\Shopcart
'currency_code' => $currencyCode,
'index' => 'subtotal',
'sortable' => false,
- 'renderer' => 'Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Currency',
+ 'renderer' => 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency',
'rate' => $this->getRate($currencyCode),
'header_css_class' => 'col-subtotal',
'column_css_class' => 'col-subtotal'
diff --git a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Customer.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Shopcart/Customer.php
rename to app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer.php
index 6693c7db4b2..69fa0e4f01c 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Customer.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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,18 @@
* Adminhtml Shopping cart customers report page content block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Shopcart;
+namespace Magento\Reports\Block\Adminhtml\Shopcart;
class Customer extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
protected function _construct()
{
- $this->_controller = 'report_shopcart_customer';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_shopcart_customer';
$this->_headerText = __('Customers');
parent::_construct();
$this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Customer/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Report/Shopcart/Customer/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php
index d167a0e66d9..8f3fb5280eb 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Customer/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 items in carts report grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Shopcart\Customer;
+namespace Magento\Reports\Block\Adminhtml\Shopcart\Customer;
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\Shopcart
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
{
/**
* @var \Magento\Reports\Model\Resource\Customer\CollectionFactory
@@ -117,7 +117,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\Shopcart
'align' =>'right',
'currency_code' => $currencyCode,
'index' =>'total',
- 'renderer' =>'Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Currency',
+ 'renderer' =>'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency',
'rate' => $this->getRate($currencyCode),
));
diff --git a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Product.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product.php
similarity index 85%
rename from app/code/Magento/Adminhtml/Block/Report/Shopcart/Product.php
rename to app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product.php
index a753f5f8d5f..3b60e367aba 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Product.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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,18 @@
* Adminhtml Shopping cart products report page content block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Shopcart;
+namespace Magento\Reports\Block\Adminhtml\Shopcart;
class Product extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
protected function _construct()
{
- $this->_controller = 'report_shopcart_product';
+ $this->_blockGroup = 'Magento_Reports';
+ $this->_controller = 'adminhtml_shopcart_product';
$this->_headerText = __('Products in carts');
parent::_construct();
$this->_removeButton('add');
diff --git a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Product/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Report/Shopcart/Product/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php
index fb98870a7e1..1c55591d983 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Shopcart/Product/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 products in carts report grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Shopcart\Product;
+namespace Magento\Reports\Block\Adminhtml\Shopcart\Product;
-class Grid extends \Magento\Adminhtml\Block\Report\Grid\Shopcart
+class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart
{
/**
* @var \Magento\Reports\Model\Resource\Quote\CollectionFactory
@@ -98,7 +98,7 @@ class Grid extends \Magento\Adminhtml\Block\Report\Grid\Shopcart
'type' =>'currency',
'currency_code' => $currencyCode,
'index' =>'price',
- 'renderer' =>'Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Currency',
+ 'renderer' =>'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency',
'rate' => $this->getRate($currencyCode),
'header_css_class' => 'col-price',
'column_css_class' => 'col-price'
diff --git a/app/code/Magento/Adminhtml/Block/Report/Wishlist.php b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Block/Report/Wishlist.php
rename to app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
index bb013103362..2665fc7d457 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Wishlist.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 wishlist report page content block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report;
+namespace Magento\Reports\Block\Adminhtml;
class Wishlist extends \Magento\Backend\Block\Template
{
@@ -72,7 +72,7 @@ class Wishlist extends \Magento\Backend\Block\Template
{
$this->setChild(
'grid',
- $this->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Wishlist\Grid', 'report.grid')
+ $this->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Wishlist\Grid', 'report.grid')
);
$collection = $this->_wishlistFactory->create();
diff --git a/app/code/Magento/Adminhtml/Block/Report/Wishlist/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Report/Wishlist/Grid.php
rename to app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php
index d0a7e08aaa5..5862a8a0394 100644
--- a/app/code/Magento/Adminhtml/Block/Report/Wishlist/Grid.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Wishlist/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 wishlist report grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Report\Wishlist;
+namespace Magento\Reports\Block\Adminhtml\Wishlist;
class Grid extends \Magento\Adminhtml\Block\Widget\Grid
{
diff --git a/app/code/Magento/Adminhtml/Controller/Report.php b/app/code/Magento/Reports/Controller/Adminhtml/Index.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Controller/Report.php
rename to app/code/Magento/Reports/Controller/Adminhtml/Index.php
index 45ed4c367ed..debc187addd 100644
--- a/app/code/Magento/Adminhtml/Controller/Report.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Index.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 @@
* sales admin controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller;
+namespace Magento\Reports\Controller\Adminhtml;
-class Report extends \Magento\Backend\App\Action
+class Index extends \Magento\Backend\App\Action
{
/**
* @var \Magento\App\Response\Http\FileFactory
diff --git a/app/code/Magento/Adminhtml/Controller/Report/AbstractReport.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
similarity index 88%
rename from app/code/Magento/Adminhtml/Controller/Report/AbstractReport.php
rename to app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
index 21c7d398f83..54f5276bb45 100644
--- a/app/code/Magento/Adminhtml/Controller/Report/AbstractReport.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/AbstractReport.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 @@
* Admin abstract reports controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Report;
+namespace Magento\Reports\Controller\Adminhtml\Report;
abstract class AbstractReport extends \Magento\Backend\App\Action
{
@@ -84,7 +84,7 @@ abstract class AbstractReport extends \Magento\Backend\App\Action
/**
* Add report breadcrumbs
*
- * @return \Magento\Adminhtml\Controller\Report\AbstractReport
+ * @return \Magento\Reports\Controller\Adminhtml\Report\AbstractReport
*/
public function _initAction()
{
@@ -97,7 +97,7 @@ abstract class AbstractReport extends \Magento\Backend\App\Action
* Report action init operations
*
* @param array|\Magento\Object $blocks
- * @return \Magento\Adminhtml\Controller\Report\AbstractReport
+ * @return \Magento\Reports\Controller\Adminhtml\Report\AbstractReport
*/
public function _initReportAction($blocks)
{
@@ -105,7 +105,7 @@ abstract class AbstractReport extends \Magento\Backend\App\Action
$blocks = array($blocks);
}
- $requestData = $this->_objectManager->get('Magento\Adminhtml\Helper\Data')
+ $requestData = $this->_objectManager->get('Magento\Backend\Helper\Data')
->prepareFilterString($this->getRequest()->getParam('filter'));
$inputFilter = new \Zend_Filter_Input(array('from' => $this->_dateFilter, 'to' => $this->_dateFilter),
array(), $requestData);
@@ -134,7 +134,7 @@ abstract class AbstractReport extends \Magento\Backend\App\Action
*
* @param string $flagCode
* @param string $refreshCode
- * @return \Magento\Adminhtml\Controller\Report\AbstractReport
+ * @return \Magento\Reports\Controller\Adminhtml\Report\AbstractReport
*/
protected function _showLastExecutionTime($flagCode, $refreshCode)
{
@@ -145,8 +145,8 @@ abstract class AbstractReport extends \Magento\Backend\App\Action
)
: 'undefined';
- $refreshStatsLink = $this->getUrl('adminhtml/report_statistics');
- $directRefreshLink = $this->getUrl('adminhtml/report_statistics/refreshRecent', array('code' => $refreshCode));
+ $refreshStatsLink = $this->getUrl('reports/report_statistics');
+ $directRefreshLink = $this->getUrl('reports/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/Reports/Controller/Adminhtml/Report/Customer.php
similarity index 98%
rename from app/code/Magento/Adminhtml/Controller/Report/Customer.php
rename to app/code/Magento/Reports/Controller/Adminhtml/Report/Customer.php
index da40a61d283..153b311c531 100644
--- a/app/code/Magento/Adminhtml/Controller/Report/Customer.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 @@
* Customer reports admin controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Report;
+namespace Magento\Reports\Controller\Adminhtml\Report;
class Customer extends \Magento\Backend\App\Action
{
diff --git a/app/code/Magento/Adminhtml/Controller/Report/Product.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product.php
similarity index 92%
rename from app/code/Magento/Adminhtml/Controller/Report/Product.php
rename to app/code/Magento/Reports/Controller/Adminhtml/Report/Product.php
index 5365f1e4a9f..c5ef5ba4f8d 100644
--- a/app/code/Magento/Adminhtml/Controller/Report/Product.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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,17 +29,17 @@
* Product reports admin controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Report;
+namespace Magento\Reports\Controller\Adminhtml\Report;
-class Product extends \Magento\Adminhtml\Controller\Report\AbstractReport
+class Product extends \Magento\Reports\Controller\Adminhtml\Report\AbstractReport
{
/**
* Add report/products breadcrumbs
*
- * @return \Magento\Adminhtml\Controller\Report\Product
+ * @return \Magento\Reports\Controller\Adminhtml\Report\Product
*/
public function _initAction()
{
@@ -110,7 +110,7 @@ class Product extends \Magento\Adminhtml\Controller\Report\AbstractReport
__('Products Most Viewed Report')
);
- $gridBlock = $this->_view->getLayout()->getBlock('report_product_viewed.grid');
+ $gridBlock = $this->_view->getLayout()->getBlock('adminhtml_product_viewed.grid');
$filterFormBlock = $this->_view->getLayout()->getBlock('grid.filter.form');
$this->_initReportAction(array(
@@ -128,7 +128,7 @@ class Product extends \Magento\Adminhtml\Controller\Report\AbstractReport
public function exportViewedCsvAction()
{
$fileName = 'products_mostviewed.csv';
- $grid = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Product\Viewed\Grid');
+ $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Product\Viewed\Grid');
$this->_initReportAction($grid);
return $this->_fileFactory->create($fileName, $grid->getCsvFile());
}
@@ -140,7 +140,7 @@ class Product extends \Magento\Adminhtml\Controller\Report\AbstractReport
public function exportViewedExcelAction()
{
$fileName = 'products_mostviewed.xml';
- $grid = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Product\Viewed\Grid');
+ $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Product\Viewed\Grid');
$this->_initReportAction($grid);
return $this->_fileFactory->create($fileName, $grid->getExcelFile($fileName));
}
@@ -203,7 +203,7 @@ class Product extends \Magento\Adminhtml\Controller\Report\AbstractReport
__('Downloads')
)
->_addContent(
- $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Product\Downloads')
+ $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Product\Downloads')
);
$this->_view->renderLayout();
}
@@ -215,7 +215,7 @@ class Product extends \Magento\Adminhtml\Controller\Report\AbstractReport
public function exportDownloadsCsvAction()
{
$fileName = 'products_downloads.csv';
- $content = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Product\Downloads\Grid')
+ $content = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Product\Downloads\Grid')
->setSaveParametersInSession(true)
->getCsv();
@@ -229,7 +229,7 @@ class Product extends \Magento\Adminhtml\Controller\Report\AbstractReport
public function exportDownloadsExcelAction()
{
$fileName = 'products_downloads.xml';
- $content = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Product\Downloads\Grid')
+ $content = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Product\Downloads\Grid')
->setSaveParametersInSession(true)
->getExcel($fileName);
diff --git a/app/code/Magento/Adminhtml/Controller/Report/Review.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Controller/Report/Review.php
rename to app/code/Magento/Reports/Controller/Adminhtml/Report/Review.php
index 8e4fe66345a..37db4b71125 100644
--- a/app/code/Magento/Adminhtml/Controller/Report/Review.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 @@
* Review reports admin controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Report;
+namespace Magento\Reports\Controller\Adminhtml\Report;
class Review extends \Magento\Backend\App\Action
{
@@ -146,7 +146,7 @@ class Review extends \Magento\Backend\App\Action
->_addBreadcrumb(__('Products Report'), __('Products Report'))
->_addBreadcrumb(__('Product Reviews'), __('Product Reviews'))
->_addContent(
- $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Review\Detail')
+ $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Review\Detail')
);
$this->_view->renderLayout();
}
@@ -157,7 +157,7 @@ class Review extends \Magento\Backend\App\Action
public function exportProductDetailCsvAction()
{
$fileName = 'review_product_detail.csv';
- $content = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Review\Detail\Grid')
+ $content = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Review\Detail\Grid')
->getCsv();
return $this->_fileFactory->create($fileName, $content);
@@ -169,7 +169,7 @@ class Review extends \Magento\Backend\App\Action
public function exportProductDetailExcelAction()
{
$fileName = 'review_product_detail.xml';
- $content = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Review\Detail\Grid')
+ $content = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Review\Detail\Grid')
->getExcel($fileName);
return $this->_fileFactory->create($fileName, $content);
diff --git a/app/code/Magento/Adminhtml/Controller/Report/Sales.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php
similarity index 87%
rename from app/code/Magento/Adminhtml/Controller/Report/Sales.php
rename to app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php
index 4a02b2853ea..ae4f1338e75 100644
--- a/app/code/Magento/Adminhtml/Controller/Report/Sales.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 @@
* Sales report admin controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Report;
+namespace Magento\Reports\Controller\Adminhtml\Report;
-class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
+class Sales extends \Magento\Reports\Controller\Adminhtml\Report\AbstractReport
{
/**
* Add report/sales breadcrumbs
*
- * @return \Magento\Adminhtml\Controller\Report\Sales
+ * @return \Magento\Reports\Controller\Adminhtml\Report\Sales
*/
public function _initAction()
{
@@ -57,7 +57,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
->_setActiveMenu('Magento_Reports::report_salesroot_sales')
->_addBreadcrumb(__('Sales Report'), __('Sales Report'));
- $gridBlock = $this->_view->getLayout()->getBlock('report_sales_sales.grid');
+ $gridBlock = $this->_view->getLayout()->getBlock('adminhtml_sales_sales.grid');
$filterFormBlock = $this->_view->getLayout()->getBlock('grid.filter.form');
$this->_initReportAction(array(
@@ -78,7 +78,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
->_setActiveMenu('Magento_Reports::report_products_bestsellers')
->_addBreadcrumb(__('Products Bestsellers Report'), __('Products Bestsellers Report'));
- $gridBlock = $this->_view->getLayout()->getBlock('report_sales_bestsellers.grid');
+ $gridBlock = $this->_view->getLayout()->getBlock('adminhtml_sales_bestsellers.grid');
$filterFormBlock = $this->_view->getLayout()->getBlock('grid.filter.form');
$this->_initReportAction(array(
@@ -95,7 +95,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
public function exportBestsellersCsvAction()
{
$fileName = 'bestsellers.csv';
- $grid = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Bestsellers\Grid');
+ $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Bestsellers\Grid');
$this->_initReportAction($grid);
return $this->_fileFactory->create($fileName, $grid->getCsvFile());
}
@@ -106,7 +106,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
public function exportBestsellersExcelAction()
{
$fileName = 'bestsellers.xml';
- $grid = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Bestsellers\Grid');
+ $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Bestsellers\Grid');
$this->_initReportAction($grid);
return $this->_fileFactory->create($fileName, $grid->getExcelFile($fileName));
}
@@ -114,7 +114,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
/**
* Refresh statistics for last 25 hours
*
- * @return \Magento\Adminhtml\Controller\Report\Sales
+ * @return \Magento\Reports\Controller\Adminhtml\Report\Sales
*/
public function refreshRecentAction()
{
@@ -124,7 +124,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
/**
* Refresh statistics for all period
*
- * @return \Magento\Adminhtml\Controller\Report\Sales
+ * @return \Magento\Reports\Controller\Adminhtml\Report\Sales
*/
public function refreshLifetimeAction()
{
@@ -137,7 +137,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
public function exportSalesCsvAction()
{
$fileName = 'sales.csv';
- $grid = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Sales\Grid');
+ $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Sales\Grid');
$this->_initReportAction($grid);
return $this->_fileFactory->create($fileName, $grid->getCsvFile());
}
@@ -148,7 +148,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
public function exportSalesExcelAction()
{
$fileName = 'sales.xml';
- $grid = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Sales\Grid');
+ $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Sales\Grid');
$this->_initReportAction($grid);
return $this->_fileFactory->create($fileName, $grid->getExcelFile($fileName));
}
@@ -163,7 +163,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
->_setActiveMenu('Magento_Reports::report_salesroot_tax')
->_addBreadcrumb(__('Tax'), __('Tax'));
- $gridBlock = $this->_view->getLayout()->getBlock('report_sales_tax.grid');
+ $gridBlock = $this->_view->getLayout()->getBlock('adminhtml_sales_tax.grid');
$filterFormBlock = $this->_view->getLayout()->getBlock('grid.filter.form');
$this->_initReportAction(array(
@@ -180,7 +180,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
public function exportTaxCsvAction()
{
$fileName = 'tax.csv';
- $grid = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Tax\Grid');
+ $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Tax\Grid');
$this->_initReportAction($grid);
return $this->_fileFactory->create($fileName, $grid->getCsvFile());
}
@@ -191,7 +191,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
public function exportTaxExcelAction()
{
$fileName = 'tax.xml';
- $grid = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Tax\Grid');
+ $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Tax\Grid');
$this->_initReportAction($grid);
return $this->_fileFactory->create($fileName, $grid->getExcelFile($fileName));
}
@@ -206,7 +206,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
->_setActiveMenu('Magento_Reports::report_salesroot_shipping')
->_addBreadcrumb(__('Shipping'), __('Shipping'));
- $gridBlock = $this->_view->getLayout()->getBlock('report_sales_shipping.grid');
+ $gridBlock = $this->_view->getLayout()->getBlock('adminhtml_sales_shipping.grid');
$filterFormBlock = $this->_view->getLayout()->getBlock('grid.filter.form');
$this->_initReportAction(array(
@@ -223,7 +223,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
public function exportShippingCsvAction()
{
$fileName = 'shipping.csv';
- $grid = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Shipping\Grid');
+ $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Shipping\Grid');
$this->_initReportAction($grid);
return $this->_fileFactory->create($fileName, $grid->getCsvFile());
}
@@ -234,7 +234,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
public function exportShippingExcelAction()
{
$fileName = 'shipping.xml';
- $grid = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Shipping\Grid');
+ $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Shipping\Grid');
$this->_initReportAction($grid);
return $this->_fileFactory->create($fileName, $grid->getExcelFile($fileName));
}
@@ -249,7 +249,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
->_setActiveMenu('Magento_Reports::report_salesroot_invoiced')
->_addBreadcrumb(__('Total Invoiced'), __('Total Invoiced'));
- $gridBlock = $this->_view->getLayout()->getBlock('report_sales_invoiced.grid');
+ $gridBlock = $this->_view->getLayout()->getBlock('adminhtml_sales_invoiced.grid');
$filterFormBlock = $this->_view->getLayout()->getBlock('grid.filter.form');
$this->_initReportAction(array(
@@ -266,7 +266,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
public function exportInvoicedCsvAction()
{
$fileName = 'invoiced.csv';
- $grid = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Invoiced\Grid');
+ $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Invoiced\Grid');
$this->_initReportAction($grid);
return $this->_fileFactory->create($fileName, $grid->getCsvFile());
}
@@ -277,7 +277,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
public function exportInvoicedExcelAction()
{
$fileName = 'invoiced.xml';
- $grid = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Invoiced\Grid');
+ $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Invoiced\Grid');
$this->_initReportAction($grid);
return $this->_fileFactory->create($fileName, $grid->getExcelFile($fileName));
}
@@ -292,7 +292,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
->_setActiveMenu('Magento_Reports::report_salesroot_refunded')
->_addBreadcrumb(__('Total Refunded'), __('Total Refunded'));
- $gridBlock = $this->_view->getLayout()->getBlock('report_sales_refunded.grid');
+ $gridBlock = $this->_view->getLayout()->getBlock('adminhtml_sales_refunded.grid');
$filterFormBlock = $this->_view->getLayout()->getBlock('grid.filter.form');
$this->_initReportAction(array(
@@ -309,7 +309,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
public function exportRefundedCsvAction()
{
$fileName = 'refunded.csv';
- $grid = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Refunded\Grid');
+ $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Refunded\Grid');
$this->_initReportAction($grid);
return $this->_fileFactory->create($fileName, $grid->getCsvFile());
}
@@ -320,7 +320,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
public function exportRefundedExcelAction()
{
$fileName = 'refunded.xml';
- $grid = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Refunded\Grid');
+ $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Refunded\Grid');
$this->_initReportAction($grid);
return $this->_fileFactory->create($fileName, $grid->getExcelFile($fileName));
}
@@ -335,7 +335,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
->_setActiveMenu('Magento_Reports::report_salesroot_coupons')
->_addBreadcrumb(__('Coupons'), __('Coupons'));
- $gridBlock = $this->_view->getLayout()->getBlock('report_sales_coupons.grid');
+ $gridBlock = $this->_view->getLayout()->getBlock('adminhtml_sales_coupons.grid');
$filterFormBlock = $this->_view->getLayout()->getBlock('grid.filter.form');
$this->_initReportAction(array(
@@ -352,7 +352,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
public function exportCouponsCsvAction()
{
$fileName = 'coupons.csv';
- $grid = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Coupons\Grid');
+ $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Coupons\Grid');
$this->_initReportAction($grid);
return $this->_fileFactory->create($fileName, $grid->getCsvFile());
}
@@ -363,7 +363,7 @@ class Sales extends \Magento\Adminhtml\Controller\Report\AbstractReport
public function exportCouponsExcelAction()
{
$fileName = 'coupons.xml';
- $grid = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Sales\Coupons\Grid');
+ $grid = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Sales\Coupons\Grid');
$this->_initReportAction($grid);
return $this->_fileFactory->create($fileName, $grid->getExcelFile($fileName));
}
diff --git a/app/code/Magento/Adminhtml/Controller/Report/Shopcart.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Controller/Report/Shopcart.php
rename to app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart.php
index 965d125ad61..0f058e48635 100644
--- a/app/code/Magento/Adminhtml/Controller/Report/Shopcart.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 @@
* Shopping Cart reports admin controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Report;
+namespace Magento\Reports\Controller\Adminhtml\Report;
class Shopcart extends \Magento\Backend\App\Action
{
@@ -70,7 +70,7 @@ class Shopcart extends \Magento\Backend\App\Action
->_addContent(
$this->_view
->getLayout()
- ->createBlock('Magento\Adminhtml\Block\Report\Shopcart\Customer')
+ ->createBlock('Magento\Reports\Block\Adminhtml\Shopcart\Customer')
);
$this->_view->renderLayout();
}
@@ -81,7 +81,7 @@ class Shopcart extends \Magento\Backend\App\Action
public function exportCustomerCsvAction()
{
$fileName = 'shopcart_customer.csv';
- $content = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Shopcart\Customer\Grid')
+ $content = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Shopcart\Customer\Grid')
->getCsvFile();
return $this->_fileFactory->create($fileName, $content);
@@ -93,7 +93,7 @@ class Shopcart extends \Magento\Backend\App\Action
public function exportCustomerExcelAction()
{
$fileName = 'shopcart_customer.xml';
- $content = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Shopcart\Customer\Grid')
+ $content = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Shopcart\Customer\Grid')
->getExcelFile($fileName);
return $this->_fileFactory->create($fileName, $content);
@@ -107,7 +107,7 @@ class Shopcart extends \Magento\Backend\App\Action
->_setActiveMenu('Magento_Reports::report_shopcart_product')
->_addBreadcrumb(__('Products Report'), __('Products Report'))
->_addContent(
- $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Shopcart\Product')
+ $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Shopcart\Product')
);
$this->_view->renderLayout();
}
@@ -118,7 +118,7 @@ class Shopcart extends \Magento\Backend\App\Action
public function exportProductCsvAction()
{
$fileName = 'shopcart_product.csv';
- $content = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Shopcart\Product\Grid')
+ $content = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Shopcart\Product\Grid')
->getCsvFile();
return $this->_fileFactory->create($fileName, $content);
@@ -130,7 +130,7 @@ class Shopcart extends \Magento\Backend\App\Action
public function exportProductExcelAction()
{
$fileName = 'shopcart_product.xml';
- $content = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Shopcart\Product\Grid')
+ $content = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Shopcart\Product\Grid')
->getExcelFile($fileName);
return $this->_fileFactory->create($fileName, $content);
@@ -144,7 +144,7 @@ class Shopcart extends \Magento\Backend\App\Action
->_setActiveMenu('Magento_Reports::report_shopcart_abandoned')
->_addBreadcrumb(__('Abandoned Carts'), __('Abandoned Carts'))
->_addContent(
- $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Shopcart\Abandoned')
+ $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Shopcart\Abandoned')
);
$this->_view->renderLayout();
}
@@ -155,7 +155,7 @@ class Shopcart extends \Magento\Backend\App\Action
public function exportAbandonedCsvAction()
{
$fileName = 'shopcart_abandoned.csv';
- $content = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Shopcart\Abandoned\Grid')
+ $content = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Shopcart\Abandoned\Grid')
->getCsvFile();
return $this->_fileFactory->create($fileName, $content);
@@ -167,7 +167,7 @@ class Shopcart extends \Magento\Backend\App\Action
public function exportAbandonedExcelAction()
{
$fileName = 'shopcart_abandoned.xml';
- $content = $this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Report\Shopcart\Abandoned\Grid')
+ $content = $this->_view->getLayout()->createBlock('Magento\Reports\Block\Adminhtml\Shopcart\Abandoned\Grid')
->getExcelFile($fileName);
return $this->_fileFactory->create($fileName, $content);
diff --git a/app/code/Magento/Adminhtml/Controller/Report/Statistics.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Controller/Report/Statistics.php
rename to app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
index 50877faea21..ec274160123 100644
--- a/app/code/Magento/Adminhtml/Controller/Report/Statistics.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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 @@
* Report statistics admin controller
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Controller\Report;
+namespace Magento\Reports\Controller\Adminhtml\Report;
class Statistics extends \Magento\Backend\App\Action
{
@@ -71,7 +71,7 @@ class Statistics extends \Magento\Backend\App\Action
$blocks = array($blocks);
}
- $requestData = $this->_objectManager->get('Magento\Adminhtml\Helper\Data')
+ $requestData = $this->_objectManager->get('Magento\Backend\Helper\Data')
->prepareFilterString($this->getRequest()->getParam('filter'));
$inputFilter = new \Zend_Filter_Input(array('from' => $this->_dateFilter, 'to' => $this->_dateFilter),
array(), $requestData);
@@ -133,7 +133,7 @@ class Statistics extends \Magento\Backend\App\Action
/**
* Refresh statistics for last 25 hours
*
- * @return \Magento\Adminhtml\Controller\Report\Sales
+ * @return \Magento\Reports\Controller\Adminhtml\Report\Sales
*/
public function refreshRecentAction()
{
@@ -166,7 +166,7 @@ class Statistics extends \Magento\Backend\App\Action
/**
* Refresh statistics for all period
*
- * @return \Magento\Adminhtml\Controller\Report\Sales
+ * @return \Magento\Reports\Controller\Adminhtml\Report\Sales
*/
public function refreshLifetimeAction()
{
diff --git a/app/code/Magento/Reports/Helper/Data.php b/app/code/Magento/Reports/Helper/Data.php
index 63405206a12..fc73d2cc2e6 100644
--- a/app/code/Magento/Reports/Helper/Data.php
+++ b/app/code/Magento/Reports/Helper/Data.php
@@ -36,17 +36,17 @@ class Data extends \Magento\App\Helper\AbstractHelper
const REPORT_PERIOD_TYPE_YEAR = 'year';
/**
- * @var \Magento\Adminhtml\Model\Report\ItemFactory
+ * @var \Magento\Reports\Model\ItemFactory
*/
protected $_itemFactory;
/**
* @param \Magento\App\Helper\Context $context
- * @param \Magento\Adminhtml\Model\Report\ItemFactory $itemFactory
+ * @param \Magento\Reports\Model\ItemFactory $itemFactory
*/
public function __construct(
\Magento\App\Helper\Context $context,
- \Magento\Adminhtml\Model\Report\ItemFactory $itemFactory
+ \Magento\Reports\Model\ItemFactory $itemFactory
) {
parent::__construct($context);
$this->_itemFactory = $itemFactory;
diff --git a/app/code/Magento/Adminhtml/Model/Report/Item.php b/app/code/Magento/Reports/Model/Item.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Model/Report/Item.php
rename to app/code/Magento/Reports/Model/Item.php
index f1ec3887a33..9dd07b3c4f5 100644
--- a/app/code/Magento/Adminhtml/Model/Report/Item.php
+++ b/app/code/Magento/Reports/Model/Item.php
@@ -19,11 +19,11 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Reports
* @copyright Copyright (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\Report;
+namespace Magento\Reports\Model;
class Item extends \Magento\Object
{
diff --git a/app/code/Magento/Reports/Model/Resource/Customer/Collection.php b/app/code/Magento/Reports/Model/Resource/Customer/Collection.php
index c73de9efaee..537ab80d1ff 100644
--- a/app/code/Magento/Reports/Model/Resource/Customer/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Customer/Collection.php
@@ -100,6 +100,7 @@ class Collection extends \Magento\Customer\Model\Resource\Customer\Collection
* @param \Magento\Object\Copy\Config $fieldsetConfig
* @param \Magento\Sales\Model\QuoteFactory $quoteFactory
* @param \Magento\Sales\Model\Resource\Quote\Item\CollectionFactory $quoteItemFactory
+ * @param string $modelName
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
@@ -115,10 +116,11 @@ class Collection extends \Magento\Customer\Model\Resource\Customer\Collection
\Magento\Validator\UniversalFactory $universalFactory,
\Magento\Object\Copy\Config $fieldsetConfig,
\Magento\Sales\Model\QuoteFactory $quoteFactory,
- \Magento\Sales\Model\Resource\Quote\Item\CollectionFactory $quoteItemFactory
+ \Magento\Sales\Model\Resource\Quote\Item\CollectionFactory $quoteItemFactory,
+ $modelName = self::CUSTOMER_MODEL_NAME
) {
parent::__construct($eventManager, $logger, $fetchStrategy, $entityFactory, $eavConfig,
- $resource, $eavEntityFactory, $resourceHelper, $universalFactory, $fieldsetConfig
+ $resource, $eavEntityFactory, $resourceHelper, $universalFactory, $fieldsetConfig, $modelName
);
$this->_quoteFactory = $quoteFactory;
$this->_quoteItemFactory = $quoteItemFactory;
diff --git a/app/code/Magento/Reports/Model/Resource/Quote/Collection.php b/app/code/Magento/Reports/Model/Resource/Quote/Collection.php
index 81c49ad5550..47543894e6c 100644
--- a/app/code/Magento/Reports/Model/Resource/Quote/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Quote/Collection.php
@@ -151,8 +151,9 @@ class Collection extends \Magento\Sales\Model\Resource\Quote\Collection
array('product_name' => $productAttrNameTable),
"product_name.entity_id = e.entity_id
AND product_name.attribute_id = {$productAttrNameId}
- AND product_name.store_id = main_table.store_id",
- array('name'=>'product_name.value'))
+ AND product_name.store_id = " . \Magento\Core\Model\Store::DEFAULT_STORE_ID,
+ array('name' => 'product_name.value')
+ )
->joinInner(
array('product_price' => $productAttrPriceTable),
"product_price.entity_id = e.entity_id AND product_price.attribute_id = {$productAttrPriceId}",
diff --git a/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php b/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php
index 59a053cf2bf..bf48a88423c 100644
--- a/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Report/Product/Viewed/Collection.php
@@ -63,7 +63,7 @@ class Collection
) {
$resource->init(\Magento\Reports\Model\Resource\Report\Product\Viewed::AGGREGATION_DAILY);
parent::__construct($eventManager, $logger, $fetchStrategy, $entityFactory, $resource);
- $this->setModel('Magento\Adminhtml\Model\Report\Item');
+ $this->setModel('Magento\Reports\Model\Item');
}
/**
@@ -197,8 +197,8 @@ class Collection
$storeIds = array($storeIds);
}
$currentStoreIds = $this->_storesIds;
- if (isset($currentStoreIds) && $currentStoreIds != \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
- && $currentStoreIds != array(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)) {
+ if (isset($currentStoreIds) && $currentStoreIds != \Magento\Core\Model\Store::DEFAULT_STORE_ID
+ && $currentStoreIds != array(\Magento\Core\Model\Store::DEFAULT_STORE_ID)) {
if (!is_array($currentStoreIds)) {
$currentStoreIds = array($currentStoreIds);
}
diff --git a/app/code/Magento/Reports/etc/adminhtml/di.xml b/app/code/Magento/Reports/etc/adminhtml/di.xml
index 78baa2be87a..124f6cbcbc9 100644
--- a/app/code/Magento/Reports/etc/adminhtml/di.xml
+++ b/app/code/Magento/Reports/etc/adminhtml/di.xml
@@ -29,4 +29,9 @@
<value>adminhtml</value>
</param>
</virtualType>
+ <type name="Magento\Reports\Model\Resource\Customer\Collection">
+ <param name="modelName">
+ <value>Magento\Customer\Model\Backend\Customer</value>
+ </param>
+ </type>
</config>
diff --git a/app/code/Magento/Reports/etc/adminhtml/menu.xml b/app/code/Magento/Reports/etc/adminhtml/menu.xml
index 43adb7bc747..5a4a7ec25e3 100644
--- a/app/code/Magento/Reports/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Reports/etc/adminhtml/menu.xml
@@ -30,25 +30,25 @@
<add id="Magento_Reports::report" title="Reports" module="Magento_Reports" sortOrder="60" resource="Magento_Reports::report"/>
<add id="Magento_Reports::report_marketing" title="Marketing" module="Magento_Adminhtml" sortOrder="10" parent="Magento_Reports::report" resource="Magento_Reports::report_marketing"/>
<add id="Magento_Reports::report_salesroot" title="Sales" module="Magento_Reports" sortOrder="40" parent="Magento_Reports::report" resource="Magento_Reports::salesroot"/>
- <add id="Magento_Reports::report_salesroot_sales" title="Orders" module="Magento_Reports" sortOrder="10" parent="Magento_Reports::report_salesroot" action="adminhtml/report_sales/sales" resource="Magento_Reports::salesroot_sales"/>
- <add id="Magento_Reports::report_salesroot_tax" title="Tax" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report_salesroot" action="adminhtml/report_sales/tax" resource="Magento_Reports::tax"/>
- <add id="Magento_Reports::report_salesroot_invoiced" title="Invoiced" module="Magento_Reports" sortOrder="30" parent="Magento_Reports::report_salesroot" action="adminhtml/report_sales/invoiced" resource="Magento_Reports::invoiced"/>
- <add id="Magento_Reports::report_salesroot_shipping" title="Shipping" module="Magento_Reports" sortOrder="40" parent="Magento_Reports::report_salesroot" action="adminhtml/report_sales/shipping" resource="Magento_Reports::shipping"/>
- <add id="Magento_Reports::report_salesroot_refunded" title="Refunds" module="Magento_Reports" sortOrder="50" parent="Magento_Reports::report_salesroot" action="adminhtml/report_sales/refunded" resource="Magento_Reports::refunded"/>
- <add id="Magento_Reports::report_salesroot_coupons" title="Coupons" module="Magento_Reports" sortOrder="60" parent="Magento_Reports::report_salesroot" action="adminhtml/report_sales/coupons" resource="Magento_Reports::coupons"/>
- <add id="Magento_Reports::report_shopcart_product" title="Products in Cart" module="Magento_Reports" sortOrder="10" parent="Magento_Reports::report_marketing" action="adminhtml/report_shopcart/product" resource="Magento_Reports::product"/>
- <add id="Magento_Reports::report_shopcart_abandoned" title="Abandoned Carts" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report_marketing" action="adminhtml/report_shopcart/abandoned" resource="Magento_Reports::abandoned"/>
+ <add id="Magento_Reports::report_salesroot_sales" title="Orders" module="Magento_Reports" sortOrder="10" parent="Magento_Reports::report_salesroot" action="reports/report_sales/sales" resource="Magento_Reports::salesroot_sales"/>
+ <add id="Magento_Reports::report_salesroot_tax" title="Tax" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report_salesroot" action="reports/report_sales/tax" resource="Magento_Reports::tax"/>
+ <add id="Magento_Reports::report_salesroot_invoiced" title="Invoiced" module="Magento_Reports" sortOrder="30" parent="Magento_Reports::report_salesroot" action="reports/report_sales/invoiced" resource="Magento_Reports::invoiced"/>
+ <add id="Magento_Reports::report_salesroot_shipping" title="Shipping" module="Magento_Reports" sortOrder="40" parent="Magento_Reports::report_salesroot" action="reports/report_sales/shipping" resource="Magento_Reports::shipping"/>
+ <add id="Magento_Reports::report_salesroot_refunded" title="Refunds" module="Magento_Reports" sortOrder="50" parent="Magento_Reports::report_salesroot" action="reports/report_sales/refunded" resource="Magento_Reports::refunded"/>
+ <add id="Magento_Reports::report_salesroot_coupons" title="Coupons" module="Magento_Reports" sortOrder="60" parent="Magento_Reports::report_salesroot" action="reports/report_sales/coupons" resource="Magento_Reports::coupons"/>
+ <add id="Magento_Reports::report_shopcart_product" title="Products in Cart" module="Magento_Reports" sortOrder="10" parent="Magento_Reports::report_marketing" action="reports/report_shopcart/product" resource="Magento_Reports::product"/>
+ <add id="Magento_Reports::report_shopcart_abandoned" title="Abandoned Carts" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report_marketing" action="reports/report_shopcart/abandoned" resource="Magento_Reports::abandoned"/>
<add id="Magento_Reports::report_products" title="Products" module="Magento_Reports" sortOrder="60" parent="Magento_Reports::report" resource="Magento_Reports::report_products"/>
- <add id="Magento_Reports::report_products_bestsellers" title="Bestsellers" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report_products" action="adminhtml/report_sales/bestsellers" resource="Magento_Reports::bestsellers"/>
- <add id="Magento_Reports::report_products_sold" title="Ordered" module="Magento_Reports" sortOrder="40" parent="Magento_Reports::report_products" action="adminhtml/report_product/sold" resource="Magento_Reports::sold"/>
- <add id="Magento_Reports::report_products_viewed" title="Views" module="Magento_Reports" sortOrder="10" parent="Magento_Reports::report_products" action="adminhtml/report_product/viewed" resource="Magento_Reports::viewed"/>
- <add id="Magento_Reports::report_products_lowstock" title="Low Stock" module="Magento_Reports" sortOrder="30" parent="Magento_Reports::report_products" action="adminhtml/report_product/lowstock" resource="Magento_Reports::lowstock"/>
+ <add id="Magento_Reports::report_products_bestsellers" title="Bestsellers" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report_products" action="reports/report_sales/bestsellers" resource="Magento_Reports::bestsellers"/>
+ <add id="Magento_Reports::report_products_sold" title="Ordered" module="Magento_Reports" sortOrder="40" parent="Magento_Reports::report_products" action="reports/report_product/sold" resource="Magento_Reports::sold"/>
+ <add id="Magento_Reports::report_products_viewed" title="Views" module="Magento_Reports" sortOrder="10" parent="Magento_Reports::report_products" action="reports/report_product/viewed" resource="Magento_Reports::viewed"/>
+ <add id="Magento_Reports::report_products_lowstock" title="Low Stock" module="Magento_Reports" sortOrder="30" parent="Magento_Reports::report_products" action="reports/report_product/lowstock" resource="Magento_Reports::lowstock"/>
<add id="Magento_Reports::report_customers" title="Customers" module="Magento_Reports" sortOrder="50" parent="Magento_Reports::report" resource="Magento_Reports::customers"/>
- <add id="Magento_Reports::report_customers_accounts" title="New" sortOrder="30" module="Magento_Reports" parent="Magento_Reports::report_customers" action="adminhtml/report_customer/accounts" resource="Magento_Reports::accounts"/>
- <add id="Magento_Reports::report_customers_totals" title="Order Total" module="Magento_Reports" sortOrder="10" parent="Magento_Reports::report_customers" action="adminhtml/report_customer/totals" resource="Magento_Reports::totals"/>
- <add id="Magento_Reports::report_customers_orders" title="Order Count" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report_customers" action="adminhtml/report_customer/orders" resource="Magento_Reports::customers_orders"/>
- <add id="Magento_Reports::report_search" title="Search Terms" module="Magento_Reports" sortOrder="40" parent="Magento_Reports::report_marketing" action="adminhtml/report/search" resource="Magento_Reports::report_search"/>
+ <add id="Magento_Reports::report_customers_accounts" title="New" sortOrder="30" module="Magento_Reports" parent="Magento_Reports::report_customers" action="reports/report_customer/accounts" resource="Magento_Reports::accounts"/>
+ <add id="Magento_Reports::report_customers_totals" title="Order Total" module="Magento_Reports" sortOrder="10" parent="Magento_Reports::report_customers" action="reports/report_customer/totals" resource="Magento_Reports::totals"/>
+ <add id="Magento_Reports::report_customers_orders" title="Order Count" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report_customers" action="reports/report_customer/orders" resource="Magento_Reports::customers_orders"/>
+ <add id="Magento_Reports::report_search" title="Search Terms" module="Magento_Reports" sortOrder="40" parent="Magento_Reports::report_marketing" action="reports/index/search" resource="Magento_Reports::report_search"/>
<add id="Magento_Reports::report_statistics" title="Statistics" module="Magento_Reports" sortOrder="80" parent="Magento_Reports::report" resource="Magento_Reports::statistics"/>
- <add id="Magento_Reports::report_statistics_refresh" title="Refresh statistics" module="Magento_Reports" sortOrder="10" parent="Magento_Reports::report_statistics" action="adminhtml/report_statistics" resource="Magento_Reports::statistics_refresh"/>
+ <add id="Magento_Reports::report_statistics_refresh" title="Refresh statistics" module="Magento_Reports" sortOrder="10" parent="Magento_Reports::report_statistics" action="reports/report_statistics" resource="Magento_Reports::statistics_refresh"/>
</menu>
</config>
diff --git a/app/code/Magento/Reports/etc/adminhtml/routes.xml b/app/code/Magento/Reports/etc/adminhtml/routes.xml
new file mode 100644
index 00000000000..4dd85fb2d35
--- /dev/null
+++ b/app/code/Magento/Reports/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="reports" frontName="reports">
+ <module name="Magento_Reports_Adminhtml" before="Magento_Reports" />
+ </route>
+ </router>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/Reports/etc/adminhtml/system.xml b/app/code/Magento/Reports/etc/adminhtml/system.xml
index ac1a05f051b..53355dc120a 100644
--- a/app/code/Magento/Reports/etc/adminhtml/system.xml
+++ b/app/code/Magento/Reports/etc/adminhtml/system.xml
@@ -51,11 +51,11 @@
<label>Dashboard</label>
<field id="ytd_start" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Year-To-Date Starts</label>
- <frontend_model>Magento\Adminhtml\Block\Report\Config\Form\Field\YtdStart</frontend_model>
+ <frontend_model>Magento\Reports\Block\Adminhtml\Config\Form\Field\YtdStart</frontend_model>
</field>
<field id="mtd_start" translate="label comment" type="select" sortOrder="2" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Current Month Starts</label>
- <frontend_model>Magento\Adminhtml\Block\Report\Config\Form\Field\MtdStart</frontend_model>
+ <frontend_model>Magento\Reports\Block\Adminhtml\Config\Form\Field\MtdStart</frontend_model>
<comment>Select day of the month.</comment>
</field>
</group>
diff --git a/app/code/Magento/Reports/etc/module.xml b/app/code/Magento/Reports/etc/module.xml
index efac5888452..22077d21838 100755
--- a/app/code/Magento/Reports/etc/module.xml
+++ b/app/code/Magento/Reports/etc/module.xml
@@ -46,7 +46,6 @@
<module name="Magento_Review"/>
<module name="Magento_Adminhtml"/>
<module name="Magento_CatalogInventory"/>
- <module name="Magento_Page"/>
<module name="Magento_Tax"/>
<module name="Magento_Rating"/>
</depends>
diff --git a/app/code/Magento/Reports/view/adminhtml/grid.phtml b/app/code/Magento/Reports/view/adminhtml/grid.phtml
index bfa95d6721d..3bdf0fbe691 100644
--- a/app/code/Magento/Reports/view/adminhtml/grid.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/grid.phtml
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package default_default
+ * @package Magento_Reports
* @copyright Copyright (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/Reports/view/adminhtml/layout/adminhtml_report_customer_exportaccountscsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportaccountscsv.xml
deleted file mode 100644
index 638d334d08a..00000000000
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportaccountscsv.xml
+++ /dev/null
@@ -1,29 +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_report_customer_accounts_grid"/>
- <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
-</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportaccountsexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportaccountsexcel.xml
deleted file mode 100644
index 638d334d08a..00000000000
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportaccountsexcel.xml
+++ /dev/null
@@ -1,29 +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_report_customer_accounts_grid"/>
- <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
-</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportorderscsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportorderscsv.xml
deleted file mode 100644
index 1a1db7893cd..00000000000
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportorderscsv.xml
+++ /dev/null
@@ -1,29 +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_report_customer_orders_grid"/>
- <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
-</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportordersexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportordersexcel.xml
deleted file mode 100644
index 1a1db7893cd..00000000000
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exportordersexcel.xml
+++ /dev/null
@@ -1,29 +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_report_customer_orders_grid"/>
- <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
-</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_lowstock.xml b/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_lowstock.xml
deleted file mode 100644
index cf89cfaf073..00000000000
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_lowstock.xml
+++ /dev/null
@@ -1,31 +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_report_product_lowstock_grid"/>
- <referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Report\Product\Lowstock" name="adminhtml.report.grid.container"/>
- </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_customer.xml b/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_customer.xml
deleted file mode 100644
index 377453c7d78..00000000000
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_customer.xml
+++ /dev/null
@@ -1,31 +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_report_review_customer_grid"/>
- <referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Report\Review\Customer" name="adminhtml.report.grid.container"/>
- </referenceContainer>
-</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportcustomercsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportcustomercsv.xml
deleted file mode 100644
index 06f69db37a9..00000000000
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportcustomercsv.xml
+++ /dev/null
@@ -1,29 +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_report_review_customer_grid"/>
- <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
-</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportcustomerexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportcustomerexcel.xml
deleted file mode 100644
index 06f69db37a9..00000000000
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportcustomerexcel.xml
+++ /dev/null
@@ -1,29 +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_report_review_customer_grid"/>
- <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
-</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_exportsearchcsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_exportsearchcsv.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_exportsearchcsv.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_index_exportsearchcsv.xml
index 67af5f3b467..5c19589a00d 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_exportsearchcsv.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_exportsearchcsv.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<update handle="formkey"/>
- <update handle="adminhtml_report_search_block"/>
+ <update handle="reports_index_search_block"/>
<block class="Magento\Backend\Block\Widget\Grid\Container" name="report.search.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_exportsearchexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_exportsearchexcel.xml
similarity index 95%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_exportsearchexcel.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_index_exportsearchexcel.xml
index 67af5f3b467..5c19589a00d 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_exportsearchexcel.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_exportsearchexcel.xml
@@ -25,6 +25,6 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<update handle="formkey"/>
- <update handle="adminhtml_report_search_block"/>
+ <update handle="reports_index_search_block"/>
<block class="Magento\Backend\Block\Widget\Grid\Container" name="report.search.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_reorder.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_search.xml
similarity index 87%
rename from app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_reorder.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_index_search.xml
index 4ab3b665ee1..7d7d8c76d95 100644
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_reorder.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_search.xml
@@ -24,8 +24,8 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="customer_account"/>
+ <update handle="reports_index_search_block"/>
<referenceContainer name="content">
- <block class="Magento\Sales\Block\Order\View" name="sales.order.view"/>
+ <block class="Magento\Reports\Block\Adminhtml\Search" name="report.search.grid.container"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_search_block.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_search_block.xml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_search_block.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_index_search_block.xml
index a08d9aa4ab9..db9ae6ab8de 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_search_block.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_index_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">adminhtml/*/exportSearchCsv</item>
+ <item name="urlPath" xsi:type="string">*/*/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">adminhtml/*/exportSearchExcel</item>
+ <item name="urlPath" xsi:type="string">*/*/exportSearchExcel</item>
<item name="label" xsi:type="string" translate="true">Excel XML</item>
</item>
</argument>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_accounts.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts.xml
similarity index 95%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_accounts.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts.xml
index a9e5de0b4dd..d7b880d6bd9 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_accounts.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_report_customer_accounts_grid"/>
+ <update handle="reports_report_customer_accounts_grid"/>
<referenceContainer name="content">
<block class="Magento\Reports\Block\Adminhtml\Customer\Accounts" name="adminhtml.report.grid.container"/>
</referenceContainer>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_accounts_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml
similarity index 98%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_accounts_grid.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml
index 216b3d35a6c..1e8f065b36a 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_accounts_grid.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_accounts_grid.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_report_grid"/>
+ <update handle="reports_report_grid"/>
<referenceBlock name="adminhtml.report.grid">
<arguments>
<argument name="id" xsi:type="string">gridAccounts</argument>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exporttotalscsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportaccountscsv.xml
similarity index 95%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exporttotalscsv.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportaccountscsv.xml
index cdf0b024d0c..930b34012ae 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exporttotalscsv.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportaccountscsv.xml
@@ -24,6 +24,6 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_report_customer_totals_grid"/>
+ <update handle="reports_report_customer_accounts_grid"/>
<block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exporttotalsexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportaccountsexcel.xml
similarity index 95%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exporttotalsexcel.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportaccountsexcel.xml
index cdf0b024d0c..930b34012ae 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_exporttotalsexcel.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportaccountsexcel.xml
@@ -24,6 +24,6 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_report_customer_totals_grid"/>
+ <update handle="reports_report_customer_accounts_grid"/>
<block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportproductcsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportorderscsv.xml
similarity index 95%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportproductcsv.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportorderscsv.xml
index f7f42832ea3..5095b909291 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportproductcsv.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportorderscsv.xml
@@ -24,6 +24,6 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_report_review_product_grid"/>
+ <update handle="reports_report_customer_orders_grid"/>
<block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportproductexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportordersexcel.xml
similarity index 95%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportproductexcel.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportordersexcel.xml
index f7f42832ea3..5095b909291 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_exportproductexcel.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exportordersexcel.xml
@@ -24,6 +24,6 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_report_review_product_grid"/>
+ <update handle="reports_report_customer_orders_grid"/>
<block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalscsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalscsv.xml
new file mode 100644
index 00000000000..0afcf2b83f8
--- /dev/null
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalscsv.xml
@@ -0,0 +1,29 @@
+<?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="reports_report_customer_totals_grid"/>
+ <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
+</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalsexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalsexcel.xml
new file mode 100644
index 00000000000..0afcf2b83f8
--- /dev/null
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_exporttotalsexcel.xml
@@ -0,0 +1,29 @@
+<?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="reports_report_customer_totals_grid"/>
+ <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
+</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_orders.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders.xml
similarity index 95%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_orders.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders.xml
index cf18ef3f02b..de217fd70d1 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_orders.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_report_customer_orders_grid"/>
+ <update handle="reports_report_customer_orders_grid"/>
<referenceContainer name="content">
<block class="Magento\Reports\Block\Adminhtml\Customer\Orders" name="adminhtml.report.grid.container"/>
</referenceContainer>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_orders_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders_grid.xml
similarity index 99%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_orders_grid.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders_grid.xml
index d1815960d1c..23d0fbacf43 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_orders_grid.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_orders_grid.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_report_grid"/>
+ <update handle="reports_report_grid"/>
<referenceBlock name="adminhtml.report.grid">
<arguments>
<argument name="id" xsi:type="string">gridOrdersCustomer</argument>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_totals.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals.xml
similarity index 95%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_totals.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals.xml
index aae9c1bdc9d..564f2e2c966 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_totals.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_report_customer_totals_grid"/>
+ <update handle="reports_report_customer_totals_grid"/>
<referenceContainer name="content">
<block class="Magento\Reports\Block\Adminhtml\Customer\Totals" name="adminhtml.report.grid.container"/>
</referenceContainer>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_totals_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals_grid.xml
similarity index 97%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_totals_grid.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals_grid.xml
index 07765b8c273..80bb9e98734 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_customer_totals_grid.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_customer_totals_grid.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_report_customer_orders_grid"/>
+ <update handle="reports_report_customer_orders_grid"/>
<referenceBlock name="adminhtml.report.grid">
<arguments>
<argument name="id" xsi:type="string">gridTotalsCustomer</argument>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_grid.xml
similarity index 100%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_grid.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_grid.xml
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportlowstockcsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockcsv.xml
similarity index 94%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportlowstockcsv.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockcsv.xml
index 83d5b8fb4a7..12792ffb601 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportlowstockcsv.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockcsv.xml
@@ -24,6 +24,6 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_report_product_lowstock_grid"/>
+ <update handle="reports_report_product_lowstock_grid"/>
<container name="adminhtml.block.report.product.lowstock.grid.container" label="Export CSV"/>
</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportlowstockexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockexcel.xml
similarity index 94%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportlowstockexcel.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockexcel.xml
index a2c9ed6847f..adcea23d0c0 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportlowstockexcel.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportlowstockexcel.xml
@@ -24,6 +24,6 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_report_product_lowstock_grid"/>
+ <update handle="reports_report_product_lowstock_grid"/>
<container name="adminhtml.block.report.product.lowstock.grid.container" label="Excel XML"/>
</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportsoldcsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportsoldcsv.xml
similarity index 95%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportsoldcsv.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportsoldcsv.xml
index cb36ceb85ef..ebcaf612419 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportsoldcsv.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportsoldcsv.xml
@@ -24,6 +24,6 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_report_product_sold_grid"/>
+ <update handle="reports_report_product_sold_grid"/>
<block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportsoldexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportsoldexcel.xml
similarity index 95%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportsoldexcel.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportsoldexcel.xml
index cb36ceb85ef..ebcaf612419 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_exportsoldexcel.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_exportsoldexcel.xml
@@ -24,6 +24,6 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_report_product_sold_grid"/>
+ <update handle="reports_report_product_sold_grid"/>
<block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock.xml
new file mode 100644
index 00000000000..4504c012ec0
--- /dev/null
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock.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="reports_report_product_lowstock_grid"/>
+ <referenceContainer name="content">
+ <block class="Magento\Reports\Block\Adminhtml\Product\Lowstock" name="adminhtml.report.grid.container"/>
+ </referenceContainer>
+</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_lowstock_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock_grid.xml
similarity index 97%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_lowstock_grid.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock_grid.xml
index 959db28172e..3a359a75fd0 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_lowstock_grid.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_lowstock_grid.xml
@@ -25,7 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="adminhtml.report.grid.container">
- <block class="Magento\Adminhtml\Block\Report\Product\Lowstock\Grid" name="adminhtml.block.report.product.lowstock.grid" as="grid">
+ <block class="Magento\Reports\Block\Adminhtml\Product\Lowstock\Grid" name="adminhtml.block.report.product.lowstock.grid" as="grid">
<arguments>
<argument name="id" xsi:type="string">gridLowstock</argument>
<argument name="use_ajax" xsi:type="string">0</argument>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_sold.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold.xml
similarity index 95%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_sold.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold.xml
index ca715403e35..ed14c56d9a7 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_sold.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_report_product_sold_grid"/>
+ <update handle="reports_report_product_sold_grid"/>
<referenceContainer name="content">
<block class="Magento\Reports\Block\Adminhtml\Product\Sold" name="adminhtml.report.grid.container"/>
</referenceContainer>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_sold_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold_grid.xml
similarity index 98%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_sold_grid.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold_grid.xml
index 7052f32aadf..09e2e20c515 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_product_sold_grid.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_sold_grid.xml
@@ -24,7 +24,7 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_report_grid"/>
+ <update handle="reports_report_grid"/>
<referenceBlock name="adminhtml.report.grid">
<arguments>
<argument name="id" xsi:type="string">gridProductsSold</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_product_viewed.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_viewed.xml
similarity index 89%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_product_viewed.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_viewed.xml
index 028cf9d17c8..cbb81378919 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_product_viewed.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_viewed.xml
@@ -30,13 +30,13 @@
</action>
</referenceBlock>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Report\Product\Viewed" template="report/grid/container.phtml" name="product.report.grid.container">
+ <block class="Magento\Reports\Block\Adminhtml\Product\Viewed" template="report/grid/container.phtml" name="product.report.grid.container">
<block class="Magento\Backend\Block\Store\Switcher" template="Magento_Reports::store/switcher/enhanced.phtml" name="store.switcher">
<action method="setStoreVarName">
<argument name="var_name" xsi:type="string">store_ids</argument>
</action>
</block>
- <block class="Magento\Adminhtml\Block\Report\Filter\Form" name="grid.filter.form">
+ <block class="Magento\Reports\Block\Adminhtml\Filter\Form" name="grid.filter.form">
<action method="setFieldVisibility">
<argument name="field" xsi:type="string">report_type</argument>
<argument name="visibility" xsi:type="string">0</argument>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_product.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer.xml
similarity index 86%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_product.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer.xml
index 8a68cd5f0d6..bf19ec48d8f 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_product.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer.xml
@@ -24,8 +24,8 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_report_review_product_grid"/>
+ <update handle="reports_report_review_customer_grid"/>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Report\Review\Product" name="adminhtml.report.grid.container"/>
+ <block class="Magento\Reports\Block\Adminhtml\Review\Customer" name="adminhtml.report.grid.container"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_customer_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer_grid.xml
similarity index 98%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_customer_grid.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer_grid.xml
index 5214043360a..99b91464070 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_customer_grid.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_customer_grid.xml
@@ -83,7 +83,7 @@
<argument name="filter" xsi:type="string">0</argument>
<argument name="sortable" xsi:type="string">0</argument>
<argument name="is_system" xsi:type="string">1</argument>
- <argument name="renderer" xsi:type="string">Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Customer</argument>
+ <argument name="renderer" xsi:type="string">Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Customer</argument>
<argument name="id" xsi:type="string">action</argument>
<argument name="column_css_class" xsi:type="string">col-actions</argument>
<argument name="header_css_class" xsi:type="string">col-actions</argument>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomercsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomercsv.xml
new file mode 100644
index 00000000000..0d24ecbee0e
--- /dev/null
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomercsv.xml
@@ -0,0 +1,29 @@
+<?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="reports_report_review_customer_grid"/>
+ <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
+</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomerexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomerexcel.xml
new file mode 100644
index 00000000000..0d24ecbee0e
--- /dev/null
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportcustomerexcel.xml
@@ -0,0 +1,29 @@
+<?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="reports_report_review_customer_grid"/>
+ <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
+</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductcsv.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductcsv.xml
new file mode 100644
index 00000000000..857012c0c24
--- /dev/null
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductcsv.xml
@@ -0,0 +1,29 @@
+<?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="reports_report_review_product_grid"/>
+ <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
+</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductexcel.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductexcel.xml
new file mode 100644
index 00000000000..857012c0c24
--- /dev/null
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_exportproductexcel.xml
@@ -0,0 +1,29 @@
+<?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="reports_report_review_product_grid"/>
+ <block class="Magento\Backend\Block\Widget\Grid\Container" name="adminhtml.report.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
+</layout>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_search.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product.xml
similarity index 86%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_search.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product.xml
index 4d1e81e94e9..fc314fb08f9 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_search.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product.xml
@@ -24,8 +24,8 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="adminhtml_report_search_block"/>
+ <update handle="reports_report_review_product_grid"/>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Report\Search" name="report.search.grid.container"/>
+ <block class="Magento\Reports\Block\Adminhtml\Review\Product" name="adminhtml.report.grid.container"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_product_grid.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product_grid.xml
similarity index 99%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_product_grid.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product_grid.xml
index 74f9de7b8b8..f58f2bf97eb 100644
--- a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_review_product_grid.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_review_product_grid.xml
@@ -119,7 +119,7 @@
<argument name="align" xsi:type="string">center</argument>
<argument name="filter" xsi:type="string">0</argument>
<argument name="sortable" xsi:type="string">0</argument>
- <argument name="renderer" xsi:type="string">Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Product</argument>
+ <argument name="renderer" xsi:type="string">Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Product</argument>
<argument name="id" xsi:type="string">action</argument>
<argument name="is_system" xsi:type="string">1</argument>
<argument name="column_css_class" xsi:type="string">col-actions</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_bestsellers.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_bestsellers.xml
similarity index 92%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_bestsellers.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_bestsellers.xml
index 8d6f1a3b598..5b01304e22c 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_bestsellers.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_bestsellers.xml
@@ -24,9 +24,9 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="report_sales"/>
+ <update handle="reports_sales"/>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Report\Sales\Bestsellers" template="report/grid/container.phtml" name="sales.report.grid.container">
+ <block class="Magento\Reports\Block\Adminhtml\Sales\Bestsellers" template="report/grid/container.phtml" name="sales.report.grid.container">
<block class="Magento\Backend\Block\Store\Switcher" template="Magento_Reports::store/switcher/enhanced.phtml" name="store.switcher">
<action method="setStoreVarName">
<argument name="var_name" xsi:type="string">store_ids</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_coupons.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_coupons.xml
similarity index 93%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_coupons.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_coupons.xml
index 52c3082f98d..b9a856352a9 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_coupons.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_coupons.xml
@@ -24,9 +24,9 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="report_sales"/>
+ <update handle="reports_sales"/>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Report\Sales\Coupons" template="report/grid/container.phtml" name="sales.report.grid.container">
+ <block class="Magento\Reports\Block\Adminhtml\Sales\Coupons" template="report/grid/container.phtml" name="sales.report.grid.container">
<block class="Magento\Backend\Block\Store\Switcher" template="Magento_Reports::store/switcher/enhanced.phtml" name="store.switcher">
<action method="setStoreVarName">
<argument name="var_name" xsi:type="string">store_ids</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_invoiced.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_invoiced.xml
similarity index 92%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_invoiced.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_invoiced.xml
index 3475feb0aa1..be0b9912a15 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_invoiced.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_invoiced.xml
@@ -24,9 +24,9 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="report_sales"/>
+ <update handle="reports_sales"/>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Report\Sales\Invoiced" template="report/grid/container.phtml" name="sales.report.grid.container">
+ <block class="Magento\Reports\Block\Adminhtml\Sales\Invoiced" template="report/grid/container.phtml" name="sales.report.grid.container">
<block class="Magento\Backend\Block\Store\Switcher" template="Magento_Reports::store/switcher/enhanced.phtml" name="store.switcher">
<action method="setStoreVarName">
<argument name="var_name" xsi:type="string">store_ids</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_refunded.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_refunded.xml
similarity index 92%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_refunded.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_refunded.xml
index c9468108364..088d75d8911 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_refunded.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_refunded.xml
@@ -24,9 +24,9 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="report_sales"/>
+ <update handle="reports_sales"/>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Report\Sales\Refunded" template="report/grid/container.phtml" name="sales.report.grid.container">
+ <block class="Magento\Reports\Block\Adminhtml\Sales\Refunded" template="report/grid/container.phtml" name="sales.report.grid.container">
<block class="Magento\Backend\Block\Store\Switcher" template="Magento_Reports::store/switcher/enhanced.phtml" name="store.switcher">
<action method="setStoreVarName">
<argument name="var_name" xsi:type="string">store_ids</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_sales.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_sales.xml
similarity index 93%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_sales.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_sales.xml
index 6f2cb45d660..efc9e0f4d0a 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_sales.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_sales.xml
@@ -24,9 +24,9 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="report_sales"/>
+ <update handle="reports_sales"/>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Report\Sales\Sales" template="report/grid/container.phtml" name="sales.report.grid.container">
+ <block class="Magento\Reports\Block\Adminhtml\Sales\Sales" template="report/grid/container.phtml" name="sales.report.grid.container">
<block class="Magento\Backend\Block\Store\Switcher" template="Magento_Reports::store/switcher/enhanced.phtml" name="store.switcher">
<action method="setStoreVarName">
<argument name="var_name" xsi:type="string">store_ids</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_shipping.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_shipping.xml
similarity index 92%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_shipping.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_shipping.xml
index a53b8496013..6f7e101a9cc 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_shipping.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_shipping.xml
@@ -24,9 +24,9 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="report_sales"/>
+ <update handle="reports_sales"/>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Report\Sales\Shipping" template="report/grid/container.phtml" name="sales.report.grid.container">
+ <block class="Magento\Reports\Block\Adminhtml\Sales\Shipping" template="report/grid/container.phtml" name="sales.report.grid.container">
<block class="Magento\Backend\Block\Store\Switcher" template="Magento_Reports::store/switcher/enhanced.phtml" name="store.switcher">
<action method="setStoreVarName">
<argument name="var_name" xsi:type="string">store_ids</argument>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_tax.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_tax.xml
similarity index 93%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_tax.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_tax.xml
index 8be8ee69c4f..1178a294697 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/layout/adminhtml_report_sales_tax.xml
+++ b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_sales_tax.xml
@@ -24,9 +24,9 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="report_sales"/>
+ <update handle="reports_sales"/>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Report\Sales\Tax" template="report/grid/container.phtml" name="sales.report.grid.container">
+ <block class="Magento\Reports\Block\Adminhtml\Sales\Tax" template="report/grid/container.phtml" name="sales.report.grid.container">
<block class="Magento\Backend\Block\Store\Switcher" template="Magento_Reports::store/switcher/enhanced.phtml" name="store.switcher">
<action method="setStoreVarName">
<argument name="var_name" xsi:type="string">store_ids</argument>
diff --git a/app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_statistics_index.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_report_statistics_index.xml
similarity index 100%
rename from app/code/Magento/Reports/view/adminhtml/layout/adminhtml_report_statistics_index.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_report_statistics_index.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/layout/report_sales.xml b/app/code/Magento/Reports/view/adminhtml/layout/reports_sales.xml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/layout/report_sales.xml
rename to app/code/Magento/Reports/view/adminhtml/layout/reports_sales.xml
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/report/grid/container.phtml b/app/code/Magento/Reports/view/adminhtml/report/grid/container.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/report/grid/container.phtml
rename to app/code/Magento/Reports/view/adminhtml/report/grid/container.phtml
index 5237b38cac6..66e0f81e8f8 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/report/grid/container.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/report/grid/container.phtml
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package default_default
+ * @package Magento_Reports
* @copyright Copyright (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/report/refresh/statistics.phtml b/app/code/Magento/Reports/view/adminhtml/report/refresh/statistics.phtml
similarity index 97%
rename from app/code/Magento/Adminhtml/view/adminhtml/report/refresh/statistics.phtml
rename to app/code/Magento/Reports/view/adminhtml/report/refresh/statistics.phtml
index 787cc25ee43..9674df336b2 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/report/refresh/statistics.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/report/refresh/statistics.phtml
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package default_default
+ * @package Magento_Reports
* @copyright Copyright (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/report/wishlist.phtml b/app/code/Magento/Reports/view/adminhtml/report/wishlist.phtml
similarity index 98%
rename from app/code/Magento/Adminhtml/view/adminhtml/report/wishlist.phtml
rename to app/code/Magento/Reports/view/adminhtml/report/wishlist.phtml
index 4921ad4264f..c9632d7cad9 100644
--- a/app/code/Magento/Adminhtml/view/adminhtml/report/wishlist.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/report/wishlist.phtml
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package default_default
+ * @package Magento_Reports
* @copyright Copyright (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/Reports/view/adminhtml/store/switcher.phtml b/app/code/Magento/Reports/view/adminhtml/store/switcher.phtml
index e00ed023485..2c0112d9c99 100644
--- a/app/code/Magento/Reports/view/adminhtml/store/switcher.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/store/switcher.phtml
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package default_default
+ * @package Magento_Reports
* @copyright Copyright (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/Reports/view/adminhtml/store/switcher/enhanced.phtml b/app/code/Magento/Reports/view/adminhtml/store/switcher/enhanced.phtml
index 8e83128ebdd..582e5eaba88 100644
--- a/app/code/Magento/Reports/view/adminhtml/store/switcher/enhanced.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/store/switcher/enhanced.phtml
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category design
- * @package default_default
+ * @package Magento_Reports
* @copyright Copyright (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/Reports/view/frontend/home_product_compared.phtml b/app/code/Magento/Reports/view/frontend/home_product_compared.phtml
deleted file mode 100644
index 7c1ed6a76e9..00000000000
--- a/app/code/Magento/Reports/view/frontend/home_product_compared.phtml
+++ /dev/null
@@ -1,60 +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\Reports\Block\Product\Compared */
-?>
-<?php if ($_products = $this->getRecentlyComparedProducts()): ?>
-<h2 class="subtitle"><?php echo __('Your Recently Compared') ?></h2>
-<?php $_columnCount = $this->getColumnCount(); ?>
- <?php $i=0; foreach ($_products as $_product): ?>
- <?php if ($i++%$_columnCount==0): ?>
- <ul class="products-grid">
- <?php endif; ?>
- <li class="item<?php if(($i-1)%$_columnCount==0): ?> first<?php elseif($i%$_columnCount==0): ?> last<?php endif; ?>">
- <a href="<?php echo $this->getProductUrl($_product) ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>" class="product-image"><img src="<?php echo $this->getSmallImageUrl($_product) ?>" width="<?php echo $this->getSmallImageSize()?>" height="<?php echo $this->getSmallImageSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
- <h3 class="product-name"><a href="<?php echo $this->getProductUrl($_product) ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></h3>
- <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
- <?php echo $this->getPriceHtml($_product, true, '-home-compared') ?>
- <div class="actions">
- <?php if($_product->isSaleable()): ?>
- <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo __('Add to Cart') ?></span></span></button>
- <?php else: ?>
- <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <ul class="add-to-links" data-role="add-to-links">
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
- <li><a href="<?php echo $this->getAddToWishlistUrl($_product) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a></li>
- <?php endif; ?>
- <?php if ($_compareUrl = $this->getAddToCompareUrl($_product)): ?>
- <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
- <?php endif; ?>
- </ul>
- </div>
- </li>
- <?php if ($i%$_columnCount==0 || $i==count($_products)): ?>
- </ul>
- <?php endif; ?>
- <?php endforeach; ?>
-<?php endif; ?>
diff --git a/app/code/Magento/Reports/view/frontend/home_product_viewed.phtml b/app/code/Magento/Reports/view/frontend/home_product_viewed.phtml
deleted file mode 100644
index bb978c067be..00000000000
--- a/app/code/Magento/Reports/view/frontend/home_product_viewed.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
- * @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\Reports\Block\Product\Viewed */
-?>
-<?php
-/**
- * @see \Magento\Reports\Block\Product\Viewed
- */
-?>
-<?php if ($_products = $this->getRecentlyViewedProducts()): ?>
-<h2 class="subtitle"><?php echo __('Your Recently Viewed') ?></h2>
-<?php $_columnCount = $this->getColumnCount(); ?>
- <?php $i=0; foreach ($_products as $_product): ?>
- <?php if ($i++%$_columnCount==0): ?>
- <ul class="products-grid">
- <?php endif; ?>
- <li class="item<?php if(($i-1)%$_columnCount==0): ?> first<?php elseif($i%$_columnCount==0): ?> last<?php endif; ?>">
- <a href="<?php echo $this->getProductUrl($_product) ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>" class="product-image"><img src="<?php echo $this->getSmallImageUrl($_product) ?>" width="<?php echo $this->getSmallImageSize()?>" height="<?php echo $this->getSmallImageSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
- <h3 class="product-name"><a href="<?php echo $this->getProductUrl($_product) ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></h3>
- <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
- <?php echo $this->getPriceHtml($_product, true, '-home-viewed') ?>
- <div class="actions">
- <?php if($_product->isSaleable()): ?>
- <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo __('Add to Cart') ?></span></span></button>
- <?php else: ?>
- <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <ul class="add-to-links" data-role="add-to-links">
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
- <li><a href="<?php echo $this->getAddToWishlistUrl($_product) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a></li>
- <?php endif; ?>
- <?php if ($_compareUrl = $this->getAddToCompareUrl($_product)): ?>
- <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
- <?php endif; ?>
- </ul>
- </div>
- </li>
- <?php if ($i%$_columnCount==0 || $i==count($_products)): ?>
- </ul>
- <?php endif; ?>
- <?php endforeach; ?>
-<?php endif; ?>
diff --git a/app/code/Magento/Reports/view/frontend/images/i_widget-list.gif b/app/code/Magento/Reports/view/frontend/images/i_widget-list.gif
deleted file mode 100644
index df990aba0267a24083d299711fe22497b8605c1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 600
zcmZ?wbhEHb6krfwc$UJj`@-ur$6std^J?qaR~t^e*l_aY_H(b^fBrdn%l*lxyVsp~
zkumLJ*7S=pUB~)Pw#RiJef{x!)2jO`kGzQPI+;A_+>Bi>8&=+JS@R&I?Z}LC6Ka><
ziSIqJ^y-`y$KLO~__}A)lQqX)_H2Co>cjU-55F(GJmb^1-;Z8>X*gIlZ~vRxg%>Io
z-^ibRWy8r=>rTEbnR|8ag()At{91eb)$J!A?>+xKd++PH`(D5M{Bz%>*U#R5TX*tR
z&Azf}+a9es{%XS3XYoD9Lfek5I`(qfu9vr;ek@&hJ!SH_H77o9I{j+vnHL@FAHDtb
z<I}faEr;tOyH2#Pd${)a%l<7-XYF}CdHeH^-+smQot}T-ZQY8y_nv=>?>`;Ze!ObQ
z&CX*@yDq%mb^g_q?a%jLejU_u_{O6T%MQQ%^8NRJFkqlIQ2fcl$iR@opaU`(6ekSq
zTN_fEnp;|%lwCti0~`Zw<vqm3q^z4{lV;4EHAAaOBS}U@Uy_qA%3IwkNxR7;DS5-j
zO-VdWqDhH6ckNDcX^P#EEVPkvqd<6*zn6o8jh`+nBP)x0m`{^pkY%#Yk&RCFO}++h
zOwX9u7#Uf(5+s@g+1ZjAHpZxKNRVy{WshcHV62dEC}5bu*0kxy4#Q*KYa})v_#t4T
l(#avCmUe>S@W#i?jvO&M3k*`3rs-=0FEcnYDL{e28UVCeBMbll
diff --git a/app/code/Magento/Reports/view/frontend/layout/default.xml b/app/code/Magento/Reports/view/frontend/layout/default.xml
index c1ad3ee5dc6..46e55c7076c 100644
--- a/app/code/Magento/Reports/view/frontend/layout/default.xml
+++ b/app/code/Magento/Reports/view/frontend/layout/default.xml
@@ -24,15 +24,8 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="head">
- <block class="Magento\Page\Block\Html\Head\Css" name="magento-reports-widgets-css">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Reports::widgets.css</argument>
- </arguments>
- </block>
- </referenceBlock>
<referenceContainer name="right">
- <block class="Magento\Reports\Block\Product\Viewed" before="right.permanent.callout" name="right.reports.product.viewed" template="product_viewed.phtml"/>
- <block class="Magento\Reports\Block\Product\Compared" before="right.permanent.callout" name="right.reports.product.compared" template="product_compared.phtml"/>
+ <block class="Magento\Reports\Block\Product\Viewed" name="right.reports.product.viewed" template="product_viewed.phtml"/>
+ <block class="Magento\Reports\Block\Product\Compared" name="right.reports.product.compared" template="product_compared.phtml"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Reports/view/frontend/layout/print.xml b/app/code/Magento/Reports/view/frontend/layout/print.xml
index 01eec5d1b81..bd274919f46 100644
--- a/app/code/Magento/Reports/view/frontend/layout/print.xml
+++ b/app/code/Magento/Reports/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-reports-widgets-css">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Reports::widgets.css</argument>
- </arguments>
- </block>
- </referenceBlock>
-</layout>
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" />
diff --git a/app/code/Magento/Reports/view/frontend/product_compared.phtml b/app/code/Magento/Reports/view/frontend/product_compared.phtml
index 61907429dd9..4ebe8962235 100644
--- a/app/code/Magento/Reports/view/frontend/product_compared.phtml
+++ b/app/code/Magento/Reports/view/frontend/product_compared.phtml
@@ -18,27 +18,26 @@
* 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\Reports\Block\Product\Compared */
?>
<?php if ($_products = $this->getRecentlyComparedProducts()): ?>
-<div class="block block-list block-compared">
- <div class="block-title">
- <strong><span><?php echo __('Recently Compared Products') ?></span></strong>
+ <div class="block compared links">
+ <div class="title">
+ <strong><?php echo __('Recently Compared Products') ?></strong>
+ </div>
+ <div class="content">
+ <ol id="recently-compared-items" class="items compared">
+ <?php foreach ($_products as $_item): ?>
+ <li class="item">
+ <strong class="product name">
+ <a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName() , 'name') ?></a>
+ </strong>
+ </li>
+ <?php endforeach; ?>
+ </ol>
+ </div>
</div>
- <div class="block-content">
- <ol id="recently-compared-items">
- <?php foreach ($_products as $_item): ?>
- <li class="item">
- <p class="product-name"><a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName() , 'name') ?></a></p>
- </li>
- <?php endforeach; ?>
- </ol>
- <script type="text/javascript">(function($) {$('#recently-compared-items').decorate('list', false)})(jQuery)</script>
- </div>
-</div>
<?php endif; ?>
diff --git a/app/code/Magento/Reports/view/frontend/product_viewed.phtml b/app/code/Magento/Reports/view/frontend/product_viewed.phtml
index 1eb7e1aff78..1de5d43c639 100644
--- a/app/code/Magento/Reports/view/frontend/product_viewed.phtml
+++ b/app/code/Magento/Reports/view/frontend/product_viewed.phtml
@@ -18,29 +18,26 @@
* 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\Reports\Block\Product\Viewed */
?>
<?php if ($_products = $this->getRecentlyViewedProducts()): ?>
-<div class="block block-list block-viewed">
- <div class="block-title">
- <strong><span><?php echo __('Recently Viewed Products') ?></span></strong>
+ <div class="block viewed links">
+ <div class="title">
+ <strong><?php echo __('Recently Viewed Products') ?></strong>
+ </div>
+ <div class="content">
+ <ol id="recently-viewed-items" class="items viewed">
+ <?php foreach ($_products as $_item): ?>
+ <li class="item">
+ <strong class="product name">
+ <a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName(), 'name') ?></a>
+ </strong>
+ </li>
+ <?php endforeach; ?>
+ </ol>
+ </div>
</div>
- <div class="block-content">
- <ol id="recently-viewed-items">
- <?php foreach ($_products as $_item): ?>
- <li class="item">
- <p class="product-name"><a
- href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName(), 'name') ?></a>
- </p>
- </li>
- <?php endforeach; ?>
- </ol>
- <script type="text/javascript">(function($) {$('#recently-viewed-items').decorate('list', false)})(jQuery)</script>
- </div>
-</div>
<?php endif; ?>
diff --git a/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_default_list.phtml b/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_default_list.phtml
index ddf7ce6b112..6b0cdd68e57 100644
--- a/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_default_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_default_list.phtml
@@ -18,38 +18,68 @@
* 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 ($_products = $this->getRecentlyComparedProducts()): ?>
-<div class="widget widget-compared">
- <div class="block block-products">
- <div class="block-title">
- <strong><span><?php echo __('Recently Compared') ?></span></strong>
- </div>
- <div class="block-content">
- <?php $suffix = $this->getNameInLayout(); ?>
- <ol class="mini-products-list" id="widget-compared-<?php echo $suffix; ?>">
- <?php foreach ($_products as $_product): ?>
- <li class="item">
- <a class="product-image" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><img src="<?php echo $this->getThumbnailSidebarUrl($_product); ?>" width="<?php echo $this->getThumbnailSidebarSize()?>" height="<?php echo $this->getThumbnailSidebarSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
- <div class="product-details">
- <p class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></p>
- <?php echo $this->getPriceHtml($_product, true, '-widget-compared-'.$suffix) ?>
- <?php if($_product->isSaleable()): ?>
- <a href="<?php echo $this->getAddToCartUrl($_product) ?>" class="link-cart"><?php echo __('Add to Cart') ?></a>
- <?php else: ?>
- <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- </div>
- </li>
- <?php endforeach; ?>
- </ol>
- <script type="text/javascript">(function($) {$('#widget-compared-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
- </div>
+<?php
+if ($exist = $this->getRecentlyComparedProducts()) {
+ $type = 'widget-compared';
+ $mode = 'list';
+
+ $type = $type . '-' . $mode;
+
+ $class = 'widget viewed' . ' ' . $mode;
+
+ $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+ $image = 'recently_compared_products_images_names_widget';
+ $title = __('Recently Compared');
+ $items = $exist;
+
+ $showWishlist = false;
+ $showCompare = false;
+ $showCart = false;
+ $rating = false;
+ $description = false;
+}
+?>
+<?php if ($exist): ?>
+<div class="block <?php echo $class; ?>">
+ <div class="title">
+ <strong><?php echo $title; ?></strong>
</div>
+ <?php $suffix = $this->getNameInLayout(); ?>
+ <ol class="mini products list items" id="widget-compared-<?php echo $suffix; ?>">
+ <?php $iterator = 1; ?>
+ <?php foreach($items as $_product): ?>
+ <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+ <a class="product photo" href="<?php echo $_product->getProductUrl() ?>"
+ title="<?php echo $this->stripTags($_product->getName(), null, true) ?>">
+ <?php echo $imageBlock->init($_product, $image)->toHtml() ?>
+ </a>
+ <div class="product details">
+ <strong class="product name">
+ <a href="<?php echo $_product->getProductUrl() ?>"
+ title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)">
+ <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+ </a>
+ </strong>
+ <?php echo $this->getPriceHtml($_product, true, '-widget-compared-'.$suffix) ?>
+ <?php if($_product->isSaleable()): ?>
+ <div class="actions">
+ <a href="<?php echo $this->getAddToCartUrl($_product) ?>"
+ class="action tocart"><span><?php echo __('Add to Cart') ?></span></a>
+ </div>
+ <?php else: ?>
+ <?php if ($_product->getIsSalable()): ?>
+ <p class="stock available"><span><?php echo __('In stock') ?></span></p>
+ <?php else: ?>
+ <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
+ <?php endif; ?>
+ <?php endif; ?>
+ </div>
+ <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
+ <?php endforeach; ?>
+ </ol>
</div>
<?php endif; ?>
diff --git a/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_images_list.phtml b/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_images_list.phtml
index b01d8416687..7258bbcb87b 100644
--- a/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_images_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_images_list.phtml
@@ -18,29 +18,44 @@
* 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 ($_products = $this->getRecentlyComparedProducts()): ?>
-<div class="widget widget-compared">
- <div class="block block-list">
- <div class="block-title">
- <strong><span><?php echo __('Recently Compared') ?></span></strong>
- </div>
- <div class="block-content">
- <?php $suffix = $this->getNameInLayout(); ?>
- <ol class="mini-products-images-list" id="widget-compared-<?php echo $suffix; ?>">
- <?php $i=0; foreach ($_products as $_product): ?>
- <li class="item">
- <a class="product-image" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><img src="<?php echo $this->getThumbnailUrl($_product); ?>" width="<?php echo $this->getThumbnailSize()?>" height="<?php echo $this->getThumbnailSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
- </li>
- <?php endforeach; ?>
- </ol>
- <script type="text/javascript">(function($) {$('#widget-compared-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
- </div>
+<?php
+if ($exist = $this->getRecentlyComparedProducts()) {
+ $type = 'widget-compared';
+ $class = 'widget compared mini products images';
+
+ $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+ $image = 'recently_compared_products_images_only_widget';
+ $title = __('Recently Compared');
+ $items = $exist;
+
+ $showWishlist = false;
+ $showCompare = false;
+ $showCart = false;
+ $rating = false;
+ $description = false;
+}
+?>
+<?php if ($exist): ?>
+<div class="block <?php echo $class; ?>">
+ <div class="title">
+ <strong><?php echo $title; ?></strong>
+ </div>
+ <div class="content">
+ <?php $suffix = $this->getNameInLayout(); ?>
+ <ol class="items" id="widget-compared-<?php echo $suffix; ?>">
+ <?php $i=0; foreach ($items as $_product): ?>
+ <li class="item">
+ <a class="product photo" href="<?php echo $_product->getProductUrl() ?>"
+ title="<?php echo $this->stripTags($_product->getName(), null, true) ?>">
+ <?php echo $imageBlock->init($_product, $image)->toHtml() ?>
+ </a>
+ </li>
+ <?php endforeach; ?>
+ </ol>
</div>
</div>
<?php endif; ?>
diff --git a/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_names_list.phtml b/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_names_list.phtml
index d5d184e20e2..ea602575a06 100644
--- a/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_names_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/widget/compared/column/compared_names_list.phtml
@@ -18,29 +18,28 @@
* 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 ($_products = $this->getRecentlyComparedProducts()): ?>
-<div class="widget widget-compared">
- <div class="block block-list">
- <div class="block-title">
- <strong><span><?php echo __('Recently Compared') ?></span></strong>
- </div>
- <div class="block-content">
- <?php $suffix = $this->getNameInLayout(); ?>
- <ol id="widget-compared-<?php echo $suffix; ?>">
- <?php $i=0; foreach ($_products as $_product): ?>
- <li class="item">
- <p class="product-name"><a href="<?php echo $_product->getProductUrl() ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></p>
- </li>
- <?php endforeach; ?>
- </ol>
- <script type="text/javascript">(function($) {$('#widget-compared-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
- </div>
+<div class="block widget compared links">
+ <div class="title">
+ <strong><?php echo __('Recently Compared') ?></span></strong>
+ </div>
+ <div class="content">
+ <?php $suffix = $this->getNameInLayout(); ?>
+ <ol id="widget-compared-<?php echo $suffix; ?>" class="items">
+ <?php $i=0; foreach ($_products as $_product): ?>
+ <li class="item">
+ <strong class="product name">
+ <a href="<?php echo $_product->getProductUrl() ?>">
+ <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+ </a>
+ </strong>
+ </li>
+ <?php endforeach; ?>
+ </ol>
</div>
</div>
<?php endif; ?>
diff --git a/app/code/Magento/Reports/view/frontend/widget/compared/content/compared_grid.phtml b/app/code/Magento/Reports/view/frontend/widget/compared/content/compared_grid.phtml
index 1ca956ff571..223f4a1b7fc 100644
--- a/app/code/Magento/Reports/view/frontend/widget/compared/content/compared_grid.phtml
+++ b/app/code/Magento/Reports/view/frontend/widget/compared/content/compared_grid.phtml
@@ -18,48 +18,104 @@
* 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 ($_products = $this->getRecentlyComparedProducts()): ?>
-<div class="widget widget-compared">
- <div class="widget-title">
- <h2><?php echo __('Recently Compared') ?></h2>
- </div>
- <div class="widget-products">
- <?php $_columnCount = $this->getColumnCount(); ?>
- <?php $i=0; foreach ($_products as $_product): ?>
- <?php if ($i++%$_columnCount==0): ?>
- <ul class="products-grid">
- <?php endif; ?>
- <li class="item<?php if(($i-1)%$_columnCount==0): ?> first<?php elseif($i%$_columnCount==0): ?> last<?php endif; ?>">
- <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>" class="product-image"><img src="<?php echo $this->getSmallImageSidebarUrl($_product) ?>" width="<?php echo $this->getSmallImageSidebarSize()?>" height="<?php echo $this->getSmallImageSidebarSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
- <h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></h3>
- <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
- <?php echo $this->getPriceHtml($_product, true, '-widget-compared-grid') ?>
- <div class="actions">
- <?php if($_product->isSaleable()): ?>
- <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo __('Add to Cart') ?></span></span></button>
- <?php else: ?>
- <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <ul class="add-to-links" data-role="add-to-links">
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
- <li><a href="<?php echo $this->getAddToWishlistUrl($_product) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wish List') ?></a></li>
- <?php endif; ?>
- <?php if($_compareUrl = $this->getAddToCompareUrl($_product)): ?>
- <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
- <?php endif; ?>
- </ul>
- </div>
- </li>
- <?php if ($i%$_columnCount==0 || $i==count($_products)): ?>
- </ul>
- <?php endif; ?>
- <?php endforeach; ?>
+
+<?php
+if ($exist = $this->getRecentlyComparedProducts()) {
+ $type = 'widget-compared';
+ $mode = 'grid';
+
+ $type = $type . '-' . $mode;
+
+ $class = 'widget compared' . ' ' . $mode;
+
+ $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+ $image = 'recently_compared_products_grid_content_widget';
+ $title = __('Recently Compared');
+ $items = $exist;
+
+ $showWishlist = true;
+ $showCompare = true;
+ $showCart = true;
+ $rating = 'short';
+ $description = ($mode == 'list') ? true : false;
+}
+?>
+
+<?php if ($exist):?>
+ <div class="block <?php echo $class; ?>">
+ <div class="title">
+ <strong><?php echo $title; ?></strong>
+ </div>
+ <div class="content">
+ <?php echo $this->getPagerHtml() ?>
+ <?php echo '<!-- ' . $image . '-->' ?>
+ <ol class="products list items <?php echo $type; ?>">
+ <?php $iterator = 1; ?>
+ <?php foreach($items as $_item): ?>
+ <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+ <div class="product">
+ <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
+ <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
+ </a>
+ <div class="product details">
+ <strong class="product name">
+ <a title="<?php echo $this->escapeHtml($_item->getName()) ?>"
+ href="<?php echo $this->getProductUrl($_item) ?>">
+ <?php echo $this->escapeHtml($_item->getName()) ?>
+ </a>
+ </strong>
+ <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
+ <?php if ($_item->getRatingSummary() && $rating): ?>
+ <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
+ <?php endif; ?>
+ <?php if($showWishlist || $showCompare || $showCart): ?>
+ <div class="product actions">
+ <?php if($showCart): ?>
+ <div class="primary">
+ <?php if($_item->isSaleable()): ?>
+ <button class="action tocart"
+ data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_item) ?>'}}"
+ type="button" title="<?php echo __('Add to Cart') ?>">
+ <span><?php echo __('Add to Cart') ?></span>
+ </button>
+ <?php else: ?>
+ <?php if ($_item->getIsSalable()): ?>
+ <p class="stock available"><span><?php echo __('In stock') ?></span></p>
+ <?php else: ?>
+ <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
+ <?php endif; ?>
+ <?php endif; ?>
+ </div>
+ <?php endif; ?>
+
+ <?php if($showWishlist || $showCompare): ?>
+ <div class="secondary addto links">
+ <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+ <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>"
+ class="action towishlist"
+ title="<?php echo __('Add to Wishlist') ?>">
+ <span><?php echo __('Add to Wishlist') ?></span>
+ </a>
+ <?php endif; ?>
+ <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
+ <a href="<?php echo $this->getAddToCompareUrl($_item) ?>"
+ class="action tocompare" title="<?php echo __('Add to Compare') ?>">
+ <span><?php echo __('Add to Compare') ?></span>
+ </a>
+ <?php endif; ?>
+ </div>
+ <?php endif; ?>
+ </div>
+ <?php endif; ?>
+ </div>
+ </div>
+ <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
+ <?php endforeach ?>
+ </ol>
+ </div>
</div>
-</div>
-<?php endif; ?>
+<?php endif;?>
diff --git a/app/code/Magento/Reports/view/frontend/widget/compared/content/compared_list.phtml b/app/code/Magento/Reports/view/frontend/widget/compared/content/compared_list.phtml
index 3e7e25a159d..3f37b290da6 100644
--- a/app/code/Magento/Reports/view/frontend/widget/compared/content/compared_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/widget/compared/content/compared_list.phtml
@@ -18,45 +18,104 @@
* 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 ($_products = $this->getRecentlyComparedProducts()): ?>
-<div class="widget widget-compared">
- <div class="widget-title">
- <h2><?php echo __('Recently Compared') ?></h2>
- </div>
- <div class="widget-products">
- <ol class="products-list">
- <?php $i=0; foreach ($_products as $_product): ?>
- <li class="item<?php echo (++$i == count($_products))?' last':''; ?>">
- <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>" class="product-image"><img src="<?php echo $this->getSmallImageSidebarUrl($_product) ?>" width="<?php echo $this->getSmallImageSidebarSize()?>" height="<?php echo $this->getSmallImageSidebarSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
- <div class="product-shop">
- <div class="f-fix">
- <h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></h3>
- <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
- <?php echo $this->getPriceHtml($_product, true, '-widget-compared-list') ?>
- <?php if($_product->isSaleable()): ?>
- <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo __('Add to Cart') ?></span></span></button>
- <?php else: ?>
- <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <ul class="add-to-links" data-role="add-to-links">
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
- <li><a href="<?php echo $this->getAddToWishlistUrl($_product) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wish List') ?></a></li>
+
+<?php
+if ($exist = $this->getRecentlyComparedProducts()) {
+ $type = 'widget-compared';
+ $mode = 'list';
+
+ $type = $type . '-' . $mode;
+
+ $class = 'widget compared' . ' ' . $mode;
+
+ $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+ $image = 'recently_compared_products_list_content_widget';
+ $title = __('Recently Compared');
+ $items = $exist;
+
+ $showWishlist = true;
+ $showCompare = true;
+ $showCart = true;
+ $rating = 'short';
+ $description = ($mode == 'list') ? true : false;
+}
+?>
+
+<?php if ($exist):?>
+ <div class="block <?php echo $class; ?>">
+ <div class="title">
+ <strong><?php echo $title; ?></strong>
+ </div>
+ <div class="content">
+ <?php echo $this->getPagerHtml() ?>
+ <?php echo '<!-- ' . $image . '-->' ?>
+ <ol class="products list items <?php echo $type; ?>">
+ <?php $iterator = 1; ?>
+ <?php foreach($items as $_item): ?>
+ <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+ <div class="product">
+ <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
+ <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
+ </a>
+ <div class="product details">
+ <strong class="product name">
+ <a title="<?php echo $this->escapeHtml($_item->getName()) ?>"
+ href="<?php echo $this->getProductUrl($_item) ?>">
+ <?php echo $this->escapeHtml($_item->getName()) ?>
+ </a>
+ </strong>
+ <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
+ <?php if ($_item->getRatingSummary() && $rating): ?>
+ <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
<?php endif; ?>
- <?php if($_compareUrl = $this->getAddToCompareUrl($_product)): ?>
- <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
+ <?php if($showWishlist || $showCompare || $showCart): ?>
+ <div class="product actions">
+ <?php if($showCart): ?>
+ <div class="primary">
+ <?php if($_item->isSaleable()): ?>
+ <button class="action tocart"
+ data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_item) ?>'}}"
+ type="button" title="<?php echo __('Add to Cart') ?>">
+ <span><?php echo __('Add to Cart') ?></span>
+ </button>
+ <?php else: ?>
+ <?php if ($_item->getIsSalable()): ?>
+ <p class="stock available"><span><?php echo __('In stock') ?></span></p>
+ <?php else: ?>
+ <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
+ <?php endif; ?>
+ <?php endif; ?>
+ </div>
+ <?php endif; ?>
+
+ <?php if($showWishlist || $showCompare): ?>
+ <div class="secondary addto links">
+ <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+ <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>"
+ class="action towishlist"
+ title="<?php echo __('Add to Wishlist') ?>">
+ <span><?php echo __('Add to Wishlist') ?></span>
+ </a>
+ <?php endif; ?>
+ <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
+ <a href="<?php echo $this->getAddToCompareUrl($_item) ?>"
+ class="action tocompare" title="<?php echo __('Add to Compare') ?>">
+ <span><?php echo __('Add to Compare') ?></span>
+ </a>
+ <?php endif; ?>
+ </div>
+ <?php endif; ?>
+ </div>
<?php endif; ?>
- </ul>
+ </div>
</div>
- </div>
- </li>
- <?php endforeach; ?>
- </ol>
+ <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
+ <?php endforeach ?>
+ </ol>
+ </div>
</div>
-</div>
-<?php endif; ?>
+<?php endif;?>
diff --git a/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_default_list.phtml b/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_default_list.phtml
index 2d80a60471a..f9617157034 100644
--- a/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_default_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_default_list.phtml
@@ -18,43 +18,78 @@
* 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\Reports\Block\Product\Viewed
+ * @var $this \Magento\Reports\Block\Product\Viewed
*/
?>
-<?php if ($_products = $this->getRecentlyViewedProducts()): ?>
-<div class="widget widget-viewed">
- <div class="block block-products">
- <div class="block-title">
- <strong><span><?php echo __('Recently Viewed') ?></span></strong>
- </div>
- <div class="block-content">
- <?php $suffix = $this->getNameInLayout(); ?>
- <ol class="mini-products-list" id="widget-viewed-<?php echo $suffix; ?>">
- <?php foreach ($_products as $_product): ?>
- <li class="item">
- <a class="product-image" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><img src="<?php echo $this->getThumbnailSidebarUrl($_product); ?>" width="<?php echo $this->getThumbnailSidebarSize()?>" height="<?php echo $this->getThumbnailSidebarSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
- <div class="product-details">
- <p class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></p>
+<?php
+if ($exist = $this->getRecentlyViewedProducts()) {
+ $type = 'widget-viewed';
+ $mode = 'list';
+
+ $type = $type . '-' . $mode;
+
+ $class = 'widget viewed' . ' ' . $mode;
+
+ $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+ $image = 'recently_viewed_products_images_names_widget';
+ $title = __('Recently Viewed');
+ $items = $exist;
+
+ $showWishlist = false;
+ $showCompare = false;
+ $showCart = false;
+ $rating = false;
+ $description = false;
+}
+?>
+<?php if ($exist): ?>
+<div class="block <?php echo $class; ?>">
+ <div class="title">
+ <strong><?php echo $title; ?></strong>
+ </div>
+ <div class="content">
+ <?php $suffix = $this->getNameInLayout(); ?>
+ <ol class="mini products list items" id="widget-viewed-<?php echo $suffix; ?>">
+ <?php $iterator = 1; ?>
+ <?php foreach($items as $_product): ?>
+ <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+ <div class="product">
+ <a class="product photo" href="<?php echo $_product->getProductUrl() ?>"
+ title="<?php echo $this->stripTags($_product->getName(), null, true) ?>">
+ <?php echo $imageBlock->init($_product, $image)->toHtml() ?>
+ </a>
+ <div class="product details">
+ <strong class="product name">
+ <a href="<?php echo $_product->getProductUrl() ?>"
+ title="<?php echo $this->stripTags($_product->getName(), null, true) ?>">
+ <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+ </a>
+ </strong>
<?php echo $this->getPriceHtml($_product, true, '-widget-viewed-'.$suffix) ?>
- <?php if($_product->isSaleable()): ?>
- <a href="<?php echo $this->getAddToCartUrl($_product) ?>" class="link-cart"><?php echo __('Add to Cart') ?></a>
- <?php else: ?>
- <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
+ <div class="product actions">
+ <?php if($_product->isSaleable()): ?>
+ <div class="primary">
+ <a href="<?php echo $this->getAddToCartUrl($_product) ?>" class="action tocart"><span><?php echo __('Add to Cart') ?></span></a>
+ </div>
+ <?php else: ?>
+ <?php if ($_product->getIsSalable()): ?>
+ <p class="stock available"><span><?php echo __('In stock') ?></span></p>
+ <?php else: ?>
+ <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
+ <?php endif; ?>
+ <?php endif; ?>
+ </div>
</div>
- </li>
+ </div>
+ <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
<?php endforeach; ?>
- </ol>
- <script type="text/javascript">(function($) {$('#widget-viewed-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
- </div>
+ </ol>
</div>
</div>
<?php endif; ?>
diff --git a/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_images_list.phtml b/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_images_list.phtml
index dd3c4f6ea4e..8b0edbe84b2 100644
--- a/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_images_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_images_list.phtml
@@ -18,34 +18,49 @@
* 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\Reports\Block\Product\Viewed
+ * @var $this \Magento\Reports\Block\Product\Viewed
*/
?>
-<?php if ($_products = $this->getRecentlyViewedProducts()): ?>
-<div class="widget widget-viewed">
- <div class="block block-list">
- <div class="block-title">
- <strong><span><?php echo __('Recently Viewed') ?></span></strong>
+<?php
+if ($exist = $this->getRecentlyViewedProducts()) {
+ $type = 'widget-viewed';
+ $class = 'widget viewed mini products images';
+
+ $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+ $image = 'recently_viewed_products_images_only_widget';
+ $title = __('Recently Viewed');
+ $items = $exist;
+
+ $showWishlist = false;
+ $showCompare = false;
+ $showCart = false;
+ $rating = false;
+ $description = false;
+}
+?>
+<?php if ($exist): ?>
+ <div class="block <?php echo $class; ?>">
+ <div class="title">
+ <strong><?php echo $title; ?></strong>
</div>
- <div class="block-content">
+ <div class="content">
<?php $suffix = $this->getNameInLayout(); ?>
- <ol class="mini-products-images-list" id="widget-viewed-<?php echo $suffix; ?>">
- <?php foreach ($_products as $_product): ?>
- <li class="item">
- <a class="product-image" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><img src="<?php echo $this->getThumbnailUrl($_product); ?>" width="<?php echo $this->getThumbnailSize()?>" height="<?php echo $this->getThumbnailSize()?>" height="76" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
- </li>
+ <ol class="items" id="widget-viewed-<?php echo $suffix; ?>">
+ <?php $iterator = 1; ?>
+ <?php foreach($items as $_product): ?>
+ <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+ <a class="product photo" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>">
+ <?php echo $imageBlock->init($_product, $image)->toHtml() ?>
+ </a>
+ <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
<?php endforeach; ?>
</ol>
- <script type="text/javascript">(function($) {$('#widget-viewed-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
</div>
</div>
-</div>
<?php endif; ?>
diff --git a/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_names_list.phtml b/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_names_list.phtml
index 2defa19f206..670e9ca03de 100644
--- a/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_names_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/widget/viewed/column/viewed_names_list.phtml
@@ -18,34 +18,33 @@
* 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\Reports\Block\Product\Viewed
+ * @var $this \Magento\Reports\Block\Product\Viewed
*/
?>
<?php if ($_products = $this->getRecentlyViewedProducts()): ?>
-<div class="widget widget-viewed">
- <div class="block block-list">
- <div class="block-title">
- <strong><span><?php echo __('Recently Viewed') ?></span></strong>
- </div>
- <div class="block-content">
- <?php $suffix = $this->getNameInLayout(); ?>
- <ol id="widget-viewed-<?php echo $suffix; ?>">
- <?php foreach ($_products as $_product): ?>
- <li class="item">
- <p class="product-name"><a href="<?php echo $_product->getProductUrl() ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></p>
- </li>
- <?php endforeach; ?>
- </ol>
- <script type="text/javascript">(function($) {$('#widget-viewed-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
- </div>
+<div class="block widget viewed links">
+ <div class="title">
+ <strong><?php echo __('Recently Viewed') ?></strong>
+ </div>
+ <div class="content">
+ <?php $suffix = $this->getNameInLayout(); ?>
+ <ol id="widget-viewed-<?php echo $suffix; ?>" class="items">
+ <?php foreach ($_products as $_product): ?>
+ <li class="item">
+ <strong class="product name">
+ <a href="<?php echo $_product->getProductUrl() ?>">
+ <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+ </a>
+ </strong>
+ </li>
+ <?php endforeach; ?>
+ </ol>
</div>
</div>
<?php endif; ?>
diff --git a/app/code/Magento/Reports/view/frontend/widget/viewed/content/viewed_grid.phtml b/app/code/Magento/Reports/view/frontend/widget/viewed/content/viewed_grid.phtml
index 49b87748b7b..d01eeeee3f7 100644
--- a/app/code/Magento/Reports/view/frontend/widget/viewed/content/viewed_grid.phtml
+++ b/app/code/Magento/Reports/view/frontend/widget/viewed/content/viewed_grid.phtml
@@ -18,53 +18,104 @@
* 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\Reports\Block\Product\Viewed
+ * @var $this \Magento\Reports\Block\Product\Viewed
*/
?>
-<?php if ($_products = $this->getRecentlyViewedProducts()): ?>
-<div class="widget widget-viewed">
- <div class="widget-title">
- <h2><?php echo __('Recently Viewed') ?></h2>
- </div>
- <div class="widget-products">
- <?php $_columnCount = $this->getColumnCount(); ?>
- <?php $i=0; foreach ($_products as $_product): ?>
- <?php if ($i++%$_columnCount==0): ?>
- <ul class="products-grid">
- <?php endif; ?>
- <li class="item<?php if(($i-1)%$_columnCount==0): ?> first<?php elseif($i%$_columnCount==0): ?> last<?php endif; ?>">
- <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>" class="product-image"><img src="<?php echo $this->getSmallImageSidebarUrl($_product) ?>" width="<?php echo $this->getSmallImageSidebarSize()?>" height="<?php echo $this->getSmallImageSidebarSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
- <h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></h3>
- <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
- <?php echo $this->getPriceHtml($_product, true, '-widget-viewed-grid') ?>
- <div class="actions">
- <?php if($_product->isSaleable()): ?>
- <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo __('Add to Cart') ?></span></span></button>
- <?php else: ?>
- <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <ul class="add-to-links" data-role="add-to-links">
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
- <li><a href="<?php echo $this->getAddToWishlistUrl($_product) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wish List') ?></a></li>
+<?php
+if ($exist = $this->getRecentlyViewedProducts()) {
+ $type = 'widget-viewed';
+ $mode = 'grid';
+
+ $type = $type . '-' . $mode;
+
+ $class = 'widget viewed' . ' ' . $mode;
+
+ $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+ $image = 'recently_viewed_products_grid_content_widget';
+ $title = __('Recently Viewed');
+ $items = $exist;
+
+ $showWishlist = true;
+ $showCompare = true;
+ $showCart = true;
+ $rating = 'short';
+ $description = ($mode == 'list') ? true : false;
+}
+?>
+<?php if ($exist):?>
+ <div class="block <?php echo $class; ?>">
+ <div class="title">
+ <strong><?php echo $title; ?></strong>
+ </div>
+ <div class="content">
+ <?php echo $this->getPagerHtml() ?>
+ <?php echo '<!-- ' . $image . '-->' ?>
+ <ol class="products list items <?php echo $type; ?>">
+ <?php $iterator = 1; ?>
+ <?php foreach($items as $_item): ?>
+ <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+ <div class="product">
+ <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
+ <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
+ </a>
+ <div class="product details">
+ <strong class="product name">
+ <a title="<?php echo $this->escapeHtml($_item->getName()) ?>"
+ href="<?php echo $this->getProductUrl($_item) ?>">
+ <?php echo $this->escapeHtml($_item->getName()) ?>
+ </a>
+ </strong>
+ <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
+ <?php if ($_item->getRatingSummary() && $rating): ?>
+ <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
<?php endif; ?>
- <?php if($_compareUrl = $this->getAddToCompareUrl($_product)): ?>
- <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
+ <?php if($showWishlist || $showCompare || $showCart): ?>
+ <div class="product actions">
+ <?php if($showCart): ?>
+ <div class="primary">
+ <?php if($_item->isSaleable()): ?>
+ <button class="action tocart" data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_item) ?>'}}" type="button" title="<?php echo __('Add to Cart') ?>">
+ <span><?php echo __('Add to Cart') ?></span>
+ </button>
+ <?php else: ?>
+ <?php if ($_item->getIsSalable()): ?>
+ <p class="stock available"><span><?php echo __('In stock') ?></span></p>
+ <?php else: ?>
+ <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
+ <?php endif; ?>
+ <?php endif; ?>
+ </div>
+ <?php endif; ?>
+ <?php if($showWishlist || $showCompare): ?>
+ <div class="secondary addto links">
+ <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+ <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>"
+ class="action towishlist" data-action="add-to-wishlist"
+ title="<?php echo __('Add to Wishlist') ?>">
+ <span><?php echo __('Add to Wishlist') ?></span>
+ </a>
+ <?php endif; ?>
+ <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
+ <a href="<?php echo $this->getAddToCompareUrl($_item) ?>"
+ class="action tocompare" title="<?php echo __('Add to Compare') ?>">
+ <span><?php echo __('Add to Compare') ?></span>
+ </a>
+ <?php endif; ?>
+ </div>
+ <?php endif; ?>
+ </div>
<?php endif; ?>
- </ul>
+ </div>
</div>
- </li>
- <?php if ($i%$_columnCount==0 || $i==count($_products)): ?>
- </ul>
- <?php endif; ?>
- <?php endforeach; ?>
+ <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
+ <?php endforeach ?>
+ </ol>
+ </div>
</div>
-</div>
-<?php endif; ?>
+<?php endif;?>
diff --git a/app/code/Magento/Reports/view/frontend/widget/viewed/content/viewed_list.phtml b/app/code/Magento/Reports/view/frontend/widget/viewed/content/viewed_list.phtml
index 693f5b84ea5..d4ef382ad69 100644
--- a/app/code/Magento/Reports/view/frontend/widget/viewed/content/viewed_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/widget/viewed/content/viewed_list.phtml
@@ -18,50 +18,108 @@
* 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\Reports\Block\Product\Viewed
+ * @var $this \Magento\Reports\Block\Product\Viewed
*/
?>
-<?php if ($_products = $this->getRecentlyViewedProducts()): ?>
-<div class="widget widget-viewed">
- <div class="widget-title">
- <h2><?php echo __('Recently Viewed') ?></h2>
- </div>
- <div class="widget-products">
- <ol class="products-list">
- <?php $i=0; foreach ($_products as $_product): ?>
- <li class="item<?php echo (++$i == count($_products))?' last':''; ?>">
- <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>" class="product-image"><img src="<?php echo $this->getSmallImageSidebarUrl($_product) ?>" width="<?php echo $this->getSmallImageSidebarSize()?>" height="<?php echo $this->getSmallImageSidebarSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
- <div class="product-shop">
- <div class="f-fix">
- <h3 class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></h3>
- <?php echo $this->getReviewsSummaryHtml($_product, 'short') ?>
- <?php echo $this->getPriceHtml($_product, true, '-widget-viewed-list') ?>
- <?php if($_product->isSaleable()): ?>
- <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" onclick="setLocation('<?php echo $this->getAddToCartUrl($_product) ?>')"><span><span><?php echo __('Add to Cart') ?></span></span></button>
- <?php else: ?>
- <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <ul class="add-to-links" data-role="add-to-links">
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
- <li><a href="<?php echo $this->getAddToWishlistUrl($_product) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wish List') ?></a></li>
+<?php
+if ($exist = $this->getRecentlyViewedProducts()) {
+ $type = 'widget-viewed';
+ $mode = 'list';
+
+ $type = $type . '-' . $mode;
+
+ $class = 'widget viewed' . ' ' . $mode;
+
+ $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
+ $image = 'recently_viewed_products_list_content_widget';
+ $title = __('Recently Viewed');
+ $items = $exist;
+
+ $showWishlist = true;
+ $showCompare = true;
+ $showCart = true;
+ $rating = 'short';
+ $description = ($mode == 'list') ? true : false;
+}
+?>
+
+<?php if ($exist):?>
+ <div class="block <?php echo $class; ?>">
+ <div class="title">
+ <strong><?php echo $title; ?></strong>
+ </div>
+ <div class="content">
+ <?php echo $this->getPagerHtml() ?>
+ <?php echo '<!-- ' . $image . '-->' ?>
+ <ol class="products list items <?php echo $type; ?>">
+ <?php $iterator = 1; ?>
+ <?php foreach($items as $_item): ?>
+ <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+ <div class="product">
+ <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
+ <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
+ </a>
+ <div class="product details">
+ <strong class="product name">
+ <a title="<?php echo $this->escapeHtml($_item->getName()) ?>"
+ href="<?php echo $this->getProductUrl($_item) ?>">
+ <?php echo $this->escapeHtml($_item->getName()) ?>
+ </a>
+ </strong>
+ <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
+ <?php if ($_item->getRatingSummary() && $rating): ?>
+ <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
<?php endif; ?>
- <?php if($_compareUrl = $this->getAddToCompareUrl($_product)): ?>
- <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
+ <?php if($showWishlist || $showCompare || $showCart): ?>
+ <div class="product actions">
+ <?php if($showCart): ?>
+ <div class="primary">
+ <?php if($_item->isSaleable()): ?>
+ <button class="action tocart"
+ data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_item) ?>'}}"
+ type="button" title="<?php echo __('Add to Cart') ?>">
+ <span><?php echo __('Add to Cart') ?></span>
+ </button>
+ <?php else: ?>
+ <?php if ($_item->getIsSalable()): ?>
+ <p class="stock available"><span><?php echo __('In stock') ?></span></p>
+ <?php else: ?>
+ <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
+ <?php endif; ?>
+ <?php endif; ?>
+ </div>
+ <?php endif; ?>
+
+ <?php if($showWishlist || $showCompare): ?>
+ <div class="secondary addto links">
+ <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
+ <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>"
+ class="action towishlist" data-action="add-to-wishlist"
+ title="<?php echo __('Add to Wishlist') ?>">
+ <span><?php echo __('Add to Wishlist') ?></span>
+ </a>
+ <?php endif; ?>
+ <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
+ <a href="<?php echo $this->getAddToCompareUrl($_item) ?>"
+ class="action tocompare" title="<?php echo __('Add to Compare') ?>">
+ <span><?php echo __('Add to Compare') ?></span>
+ </a>
+ <?php endif; ?>
+ </div>
+ <?php endif; ?>
+ </div>
<?php endif; ?>
- </ul>
+ </div>
</div>
- </div>
- </li>
- <?php endforeach; ?>
- </ol>
+ <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
+ <?php endforeach ?>
+ </ol>
+ </div>
</div>
-</div>
-<?php endif; ?>
+<?php endif;?>
diff --git a/app/code/Magento/Reports/view/frontend/widgets.css b/app/code/Magento/Reports/view/frontend/widgets.css
deleted file mode 100644
index edddb46fdc0..00000000000
--- a/app/code/Magento/Reports/view/frontend/widgets.css
+++ /dev/null
@@ -1,42 +0,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.
- *
- * @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)
- */
-
-/* Widget: Recently Viewed Products */
-.widget-viewed { display:block; }
-.col-main .widget-viewed { margin:7px 0; }
-.widget-viewed .products-grid .product-image,
-.widget-viewed .products-list .product-image { width:85px; height:85px; }
-.widget-viewed .products-list .product-shop { margin-left:100px; }
-.sidebar .widget-viewed .block { font-size:11px; line-height:1.25; }
-.sidebar .widget-viewed .block-title strong { background:url(images/i_widget-list.gif) 0 0 no-repeat; padding-left:21px; }
-
-/* Widget: Recently Compared Products */
-.widget-compared { display:block;}
-.col-main .widget-compared { margin:7px 0; }
-.widget-compared .products-grid .product-image,
-.widget-compared .products-list .product-image { width:85px; height:85px; }
-.widget-compared .products-list .product-shop { margin-left:100px; }
-.sidebar .widget-compared .block { font-size:11px; line-height:1.25; }
-.sidebar .widget-compared .block-title strong { background:url(images/i_widget-list.gif) 0 0 no-repeat; padding-left:21px; }
diff --git a/app/code/Magento/Adminhtml/Block/Review/Add.php b/app/code/Magento/Review/Block/Adminhtml/Add.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Review/Add.php
rename to app/code/Magento/Review/Block/Adminhtml/Add.php
index 085fa08ffbe..a91ba8ea69d 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Add.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Add.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Review
* @copyright Copyright (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 add Review main block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Review
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Review;
+namespace Magento\Review\Block\Adminhtml;
class Add extends \Magento\Adminhtml\Block\Widget\Form\Container
{
@@ -40,7 +40,8 @@ class Add extends \Magento\Adminhtml\Block\Widget\Form\Container
{
parent::_construct();
- $this->_controller = 'review';
+ $this->_blockGroup = 'Magento_Review';
+ $this->_controller = 'adminhtml';
$this->_mode = 'add';
$this->_updateButton('save', 'label', __('Save Review'));
diff --git a/app/code/Magento/Adminhtml/Block/Review/Add/Form.php b/app/code/Magento/Review/Block/Adminhtml/Add/Form.php
similarity index 93%
rename from app/code/Magento/Adminhtml/Block/Review/Add/Form.php
rename to app/code/Magento/Review/Block/Adminhtml/Add/Form.php
index 57ab6ced96f..b776d41b517 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Add/Form.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Add/Form.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Review
* @copyright Copyright (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 add product review form
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Review
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Review\Add;
+namespace Magento\Review\Block\Adminhtml\Add;
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
@@ -87,7 +87,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
'label' => __('Product Rating'),
'required' => true,
'text' => '<div id="rating_detail">'
- . $this->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Rating\Detailed')->toHtml()
+ . $this->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Rating\Detailed')->toHtml()
. '</div>',
));
@@ -143,7 +143,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
/*$gridFieldset = $form->addFieldset('add_review_grid', array('legend' => __('Please select a product')));
$gridFieldset->addField('products_grid', 'note', array(
- 'text' => $this->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Product\Grid')->toHtml(),
+ 'text' => $this->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Product\Grid')->toHtml(),
));*/
$form->setMethod('post');
diff --git a/app/code/Magento/Adminhtml/Block/Review/Edit.php b/app/code/Magento/Review/Block/Adminhtml/Edit.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Review/Edit.php
rename to app/code/Magento/Review/Block/Adminhtml/Edit.php
index 207148434d0..db21dcdecb3 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Edit.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Edit.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Review
* @copyright Copyright (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 @@
/**
* Review edit form
*/
-namespace Magento\Adminhtml\Block\Review;
+namespace Magento\Review\Block\Adminhtml;
class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
{
@@ -77,7 +77,8 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
parent::_construct();
$this->_objectId = 'id';
- $this->_controller = 'review';
+ $this->_blockGroup = 'Magento_Review';
+ $this->_controller = 'adminhtml';
/** @var $actionPager \Magento\Review\Helper\Action\Pager */
$actionPager = $this->_reviewActionPager;
diff --git a/app/code/Magento/Adminhtml/Block/Review/Edit/Form.php b/app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Review/Edit/Form.php
rename to app/code/Magento/Review/Block/Adminhtml/Edit/Form.php
index 7867f8a1923..0a0cd2d72f4 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Edit/Form.php
+++ b/app/code/Magento/Review/Block/Adminhtml/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_Review
* @copyright Copyright (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 Review Edit Form
*/
-namespace Magento\Adminhtml\Block\Review\Edit;
+namespace Magento\Review\Block\Adminhtml\Edit;
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
@@ -132,14 +132,14 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
$fieldset->addField('summary_rating', 'note', array(
'label' => __('Summary Rating'),
- 'text' => $this->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Rating\Summary')->toHtml(),
+ 'text' => $this->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Rating\Summary')->toHtml(),
));
$fieldset->addField('detailed_rating', 'note', array(
'label' => __('Detailed Rating'),
'required' => true,
'text' => '<div id="rating_detail">'
- . $this->getLayout()->createBlock('Magento\Adminhtml\Block\Review\Rating\Detailed')->toHtml()
+ . $this->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Rating\Detailed')->toHtml()
. '</div>',
));
diff --git a/app/code/Magento/Adminhtml/Block/Review/Grid.php b/app/code/Magento/Review/Block/Adminhtml/Grid.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Review/Grid.php
rename to app/code/Magento/Review/Block/Adminhtml/Grid.php
index 34758723c83..3bc06c4618e 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Grid.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Review
* @copyright Copyright (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 reviews grid
*
* @method int getProductId() getProductId()
- * @method \Magento\Adminhtml\Block\Review\Grid setProductId() setProductId(int $productId)
+ * @method \Magento\Review\Block\Adminhtml\Grid setProductId() setProductId(int $productId)
* @method int getCustomerId() getCustomerId()
- * @method \Magento\Adminhtml\Block\Review\Grid setCustomerId() setCustomerId(int $customerId)
- * @method \Magento\Adminhtml\Block\Review\Grid setMassactionIdFieldOnlyIndexValue() setMassactionIdFieldOnlyIndexValue(bool $onlyIndex)
+ * @method \Magento\Review\Block\Adminhtml\Grid setCustomerId() setCustomerId(int $customerId)
+ * @method \Magento\Review\Block\Adminhtml\Grid setMassactionIdFieldOnlyIndexValue() setMassactionIdFieldOnlyIndexValue(bool $onlyIndex)
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Review
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Review;
+namespace Magento\Review\Block\Adminhtml;
class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
{
@@ -130,7 +130,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* Prepare collection
*
- * @return \Magento\Adminhtml\Block\Review\Grid
+ * @return \Magento\Review\Block\Adminhtml\Grid
*/
protected function _prepareCollection()
{
@@ -252,8 +252,8 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
'header' => __('Type'),
'type' => 'select',
'index' => 'type',
- 'filter' => 'Magento\Adminhtml\Block\Review\Grid\Filter\Type',
- 'renderer' => 'Magento\Adminhtml\Block\Review\Grid\Renderer\Type'
+ 'filter' => 'Magento\Review\Block\Adminhtml\Grid\Filter\Type',
+ 'renderer' => 'Magento\Review\Block\Adminhtml\Grid\Renderer\Type'
));
$this->addColumn('name', array(
diff --git a/app/code/Magento/Adminhtml/Block/Review/Grid/Filter/Type.php b/app/code/Magento/Review/Block/Adminhtml/Grid/Filter/Type.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Review/Grid/Filter/Type.php
rename to app/code/Magento/Review/Block/Adminhtml/Grid/Filter/Type.php
index b4ca6552cd5..8e9c57cf686 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Grid/Filter/Type.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Grid/Filter/Type.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Review
* @copyright Copyright (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 review grid filter by type
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Review
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Review\Grid\Filter;
+namespace Magento\Review\Block\Adminhtml\Grid\Filter;
class Type extends \Magento\Adminhtml\Block\Widget\Grid\Column\Filter\Select
{
@@ -56,4 +56,4 @@ class Type extends \Magento\Adminhtml\Block\Widget\Grid\Column\Filter\Select
return 3;
}
}
-}// Class \Magento\Adminhtml\Block\Review\Grid\Filter\Type END
+}// Class \Magento\Review\Block\Adminhtml\Grid\Filter\Type END
diff --git a/app/code/Magento/Adminhtml/Block/Review/Grid/Renderer/Type.php b/app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php
similarity index 84%
rename from app/code/Magento/Adminhtml/Block/Review/Grid/Renderer/Type.php
rename to app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php
index ea8fa0c7e31..fb7da5ee709 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Grid/Renderer/Type.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Review
* @copyright Copyright (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 review grid item renderer for item type
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Review
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Review\Grid\Renderer;
+namespace Magento\Review\Block\Adminhtml\Grid\Renderer;
class Type extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer
{
@@ -40,7 +40,7 @@ class Type extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Abstract
{
if (is_null($row->getCustomerId())) {
- if ($row->getStoreId() == \Magento\Core\Model\AppInterface::ADMIN_STORE_ID) {
+ if ($row->getStoreId() == \Magento\Core\Model\Store::DEFAULT_STORE_ID) {
return __('Administrator');
} else {
return __('Guest');
@@ -50,4 +50,4 @@ class Type extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Abstract
}
// return ($row->getCustomerId() ? __('Customer') : __('Guest'));
}
-}// Class \Magento\Adminhtml\Block\Review\Grid\Renderer\Type END
+}// Class \Magento\Review\Block\Adminhtml\Grid\Renderer\Type END
diff --git a/app/code/Magento/Adminhtml/Block/Review/Main.php b/app/code/Magento/Review/Block/Adminhtml/Main.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Review/Main.php
rename to app/code/Magento/Review/Block/Adminhtml/Main.php
index eac15d1f713..5c0c75035b2 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Main.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Main.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Review
* @copyright Copyright (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 review main block
*/
-namespace Magento\Adminhtml\Block\Review;
+namespace Magento\Review\Block\Adminhtml;
class Main extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
@@ -75,7 +75,8 @@ class Main extends \Magento\Adminhtml\Block\Widget\Grid\Container
$this->_addButtonLabel = __('Add New Review');
parent::_construct();
- $this->_controller = 'review';
+ $this->_blockGroup = 'Magento_Review';
+ $this->_controller = 'adminhtml';
// lookup customer, if id is specified
$customerId = $this->getRequest()->getParam('customerId', false);
diff --git a/app/code/Magento/Adminhtml/Block/Review/Product/Grid.php b/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Review/Product/Grid.php
rename to app/code/Magento/Review/Block/Adminhtml/Product/Grid.php
index 38038e6d010..ae43818c089 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Product/Grid.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Product/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Review
* @copyright Copyright (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 product grid block
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Review
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Review\Product;
+namespace Magento\Review\Block\Adminhtml\Product;
class Grid extends \Magento\Catalog\Block\Adminhtml\Product\Grid
{
diff --git a/app/code/Magento/Adminhtml/Block/Review/Rating/Detailed.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Review/Rating/Detailed.php
rename to app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php
index aed4f848991..2a0ae6edb25 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Rating/Detailed.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Detailed.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Review
* @copyright Copyright (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 detailed rating stars
*/
-namespace Magento\Adminhtml\Block\Review\Rating;
+namespace Magento\Review\Block\Adminhtml\Rating;
-class Detailed extends \Magento\Adminhtml\Block\Template
+class Detailed extends \Magento\Backend\Block\Template
{
protected $_voteCollection = false;
diff --git a/app/code/Magento/Adminhtml/Block/Review/Rating/Summary.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Summary.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Review/Rating/Summary.php
rename to app/code/Magento/Review/Block/Adminhtml/Rating/Summary.php
index 9cb9a4fd471..e4c98732802 100644
--- a/app/code/Magento/Adminhtml/Block/Review/Rating/Summary.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Summary.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Review
* @copyright Copyright (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 summary rating stars
*/
-namespace Magento\Adminhtml\Block\Review\Rating;
+namespace Magento\Review\Block\Adminhtml\Rating;
-class Summary extends \Magento\Adminhtml\Block\Template
+class Summary extends \Magento\Backend\Block\Template
{
protected $_template = 'Magento_Rating::rating/stars/summary.phtml';
diff --git a/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php b/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
index 2e23cbf34b0..64f5023ee04 100644
--- a/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
@@ -96,7 +96,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
* @param \Magento\Stdlib\DateTime $dateTime
* @param \Magento\Rating\Model\RatingFactory $ratingFactory
* @param \Magento\Rating\Model\Rating\Option\VoteFactory $voteFactory
- *
+ *
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -356,7 +356,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
}
/**
- * Retrive all ids for collection
+ * Retrieve all ids for collection
*
* @param null|int|string $limit
* @param null|int|string $offset
@@ -464,7 +464,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
$this->_getConditionSql('rdt.customer_id', array('is' => new \Zend_Db_Expr('NULL'))),
$this->_getConditionSql(
'rdt.store_id',
- array('eq' => \Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+ array('eq' => \Magento\Core\Model\Store::DEFAULT_STORE_ID)
)
);
$conditionSql = implode(' AND ', $conditionParts);
@@ -475,7 +475,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
$this->_getConditionSql('rdt.customer_id', array('is' => new \Zend_Db_Expr('NULL'))),
$this->_getConditionSql(
'rdt.store_id',
- array('neq' => \Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+ array('neq' => \Magento\Core\Model\Store::DEFAULT_STORE_ID)
)
);
$conditionSql = implode(' AND ', $conditionParts);
diff --git a/app/code/Magento/Review/etc/adminhtml/menu.xml b/app/code/Magento/Review/etc/adminhtml/menu.xml
index 24995635f0e..4349ca5f651 100644
--- a/app/code/Magento/Review/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Review/etc/adminhtml/menu.xml
@@ -29,8 +29,8 @@
<menu>
<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"/>
+ <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="reports/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="reports/report_review/product" resource="Magento_Reports::review_product"/>
</menu>
</config>
diff --git a/app/code/Magento/Adminhtml/view/adminhtml/review/add.phtml b/app/code/Magento/Review/view/adminhtml/add.phtml
similarity index 100%
rename from app/code/Magento/Adminhtml/view/adminhtml/review/add.phtml
rename to app/code/Magento/Review/view/adminhtml/add.phtml
diff --git a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
index 2144586eb27..92aa28aaead 100644
--- a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
+++ b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
@@ -63,7 +63,7 @@ abstract class AbstractProduct extends \Magento\Rule\Model\Condition\AbstractCon
/**
* Adminhtml data
*
- * @var \Magento\Adminhtml\Helper\Data
+ * @var \Magento\Backend\Helper\Data
*/
protected $_backendData;
@@ -423,7 +423,7 @@ abstract class AbstractProduct extends \Magento\Rule\Model\Condition\AbstractCon
switch ($this->getAttribute()) {
case 'sku':
case 'category_ids':
- $url = '*/promo_widget/chooser/attribute/' . $this->getAttribute();
+ $url = 'catalog_rule/promo_widget/chooser/attribute/' . $this->getAttribute();
if ($this->getJsFormObject()) {
$url .= '/form/' . $this->getJsFormObject();
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/View/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/View/Form.php
index d895eda33bb..be37385ebdc 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/View/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Billing/Agreement/View/Form.php
@@ -31,7 +31,7 @@
*/
namespace Magento\Sales\Block\Adminhtml\Billing\Agreement\View;
-class Form extends \Magento\Adminhtml\Block\Template
+class Form extends \Magento\Backend\Block\Template
{
protected $_template = 'billing/agreement/view/form.phtml';
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php
index aad4ddb678c..63044d68f96 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php
@@ -34,7 +34,7 @@
*/
namespace Magento\Sales\Block\Adminhtml\Items\Column;
-class DefaultColumn extends \Magento\Adminhtml\Block\Template
+class DefaultColumn extends \Magento\Backend\Block\Template
{
/**
* @var \Magento\Catalog\Model\Product\OptionFactory
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Comments/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Comments/View.php
index 210171e8a88..8b902908b4c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Comments/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Comments/View.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Sales\Block\Adminhtml\Order\Comments;
-class View extends \Magento\Adminhtml\Block\Template
+class View extends \Magento\Backend\Block\Template
{
/**
* Sales data
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php
index 56d2bf809de..9c5ccadd5ef 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php
@@ -37,26 +37,26 @@ namespace Magento\Sales\Block\Adminhtml\Order\Create;
class Giftmessage extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
/**
- * @var \Magento\Adminhtml\Model\Giftmessage\Save
+ * @var \Magento\GiftMessage\Model\Save
*/
protected $_giftMessageSave;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
- * @param \Magento\Adminhtml\Model\Giftmessage\Save $giftMessageSave
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
+ * @param \Magento\GiftMessage\Model\Save $giftMessageSave
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Sales\Model\AdminOrder\Create $orderCreate,
- \Magento\Adminhtml\Model\Giftmessage\Save $giftMessageSave,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\Adminhtml\Model\Session\Quote $sessionQuote,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
+ \Magento\GiftMessage\Model\Save $giftMessageSave,
+ array $data = array()
+ ) {
$this->_giftMessageSave = $giftMessageSave;
parent::__construct($context, $coreData, $sessionQuote, $orderCreate, $data);
}
@@ -77,7 +77,7 @@ class Giftmessage extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCr
}
/**
- * Retrive items allowed for gift messages.
+ * Retrieve items allowed for gift messages.
*
* If no items available return false.
*
@@ -107,7 +107,7 @@ class Giftmessage extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCr
/**
* Retrieve gift message save model
*
- * @return \Magento\Adminhtml\Model\Giftmessage\Save
+ * @return \Magento\GiftMessage\Model\Save
*/
protected function _getGiftmessageSaveModel()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php
index 28abeafbe58..857729fce0d 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage/Form.php
@@ -58,22 +58,22 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
*/
protected $_sessionQuote;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Registry $registry
- * @param \Magento\Data\FormFactory $formFactory
- * @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\Core\Model\Registry $registry
+ * @param \Magento\Data\FormFactory $formFactory
+ * @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Registry $registry,
- \Magento\Data\FormFactory $formFactory,
- \Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\Core\Model\Registry $registry,
+ \Magento\Data\FormFactory $formFactory,
+ \Magento\Adminhtml\Model\Session\Quote $sessionQuote,
+ array $data = array()
+ ) {
$this->_sessionQuote = $sessionQuote;
parent::__construct($context, $coreData, $registry, $formFactory, $data);
}
@@ -91,7 +91,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
}
/**
- * Retrive entity for form
+ * Retrieve entity for form
*
* @return \Magento\Object
*/
@@ -194,7 +194,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
$this->getMessage()->setType($this->getEntityType());
- // Overriden default data with edited when block reloads througth Ajax
+ // Overridden default data with edited when block reloads througth Ajax
$this->_applyPostData();
$form->setValues($this->getMessage()->getData());
@@ -282,7 +282,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
}
/**
- * Retrive gift message for entity
+ * Retrieve gift message for entity
*
* @return \Magento\GiftMessage\Model\Message
*/
@@ -296,7 +296,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
}
/**
- * Retrive real name for field
+ * Retrieve real name for field
*
* @param string $name
* @return string
@@ -307,7 +307,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
}
/**
- * Retrive real html id for field
+ * Retrieve real html id for field
*
* @param string $name
* @return string
@@ -318,7 +318,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
}
/**
- * Retrive field html id prefix
+ * Retrieve field html id prefix
*
* @return unknown
*/
@@ -328,7 +328,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
}
/**
- * Aplies posted data to gift message
+ * Applies posted data to gift message
*
* @return \Magento\Sales\Block\Adminhtml\Order\Create\Giftmessage\Form
*/
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
index 12718d2f4c9..f2e016968ac 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
@@ -55,7 +55,7 @@ class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
protected $_wishlistFactory;
/**
- * @var \Magento\Adminhtml\Model\Giftmessage\Save
+ * @var \Magento\GiftMessage\Model\Save
*/
protected $_giftMessageSave;
@@ -64,28 +64,28 @@ class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
*/
protected $_taxConfig;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
- * @param \Magento\Wishlist\Model\WishlistFactory $wishlistFactory
- * @param \Magento\Adminhtml\Model\Giftmessage\Save $giftMessageSave
- * @param \Magento\Tax\Model\Config $taxConfig
- * @param \Magento\Tax\Helper\Data $taxData
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
+ * @param \Magento\Wishlist\Model\WishlistFactory $wishlistFactory
+ * @param \Magento\GiftMessage\Model\Save $giftMessageSave
+ * @param \Magento\Tax\Model\Config $taxConfig
+ * @param \Magento\Tax\Helper\Data $taxData
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Sales\Model\AdminOrder\Create $orderCreate,
- \Magento\Wishlist\Model\WishlistFactory $wishlistFactory,
- \Magento\Adminhtml\Model\Giftmessage\Save $giftMessageSave,
- \Magento\Tax\Model\Config $taxConfig,
- \Magento\Tax\Helper\Data $taxData,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\Adminhtml\Model\Session\Quote $sessionQuote,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
+ \Magento\Wishlist\Model\WishlistFactory $wishlistFactory,
+ \Magento\GiftMessage\Model\Save $giftMessageSave,
+ \Magento\Tax\Model\Config $taxConfig,
+ \Magento\Tax\Helper\Data $taxData,
+ array $data = array()
+ ) {
$this->_wishlistFactory = $wishlistFactory;
$this->_giftMessageSave = $giftMessageSave;
$this->_taxConfig = $taxConfig;
@@ -217,7 +217,7 @@ class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
}
/**
- * Retrive quote address
+ * Retrieve quote address
*
* @return \Magento\Sales\Model\Quote\Address
*/
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Messages.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Messages.php
index f786140b08a..25c30ed3d98 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Messages.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Messages.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Sales\Block\Adminhtml\Order\Create;
-class Messages extends \Magento\Adminhtml\Block\Messages
+class Messages extends \Magento\View\Block\Messages
{
/**
* @var \Magento\Adminhtml\Model\Session\Quote
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php
index 6a629fa498b..dda12bd9e24 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php
@@ -47,22 +47,22 @@ class AbstractSidebar extends \Magento\Sales\Block\Adminhtml\Order\Create\Abstra
*/
protected $_salesConfig;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
- * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
- * @param \Magento\Sales\Model\Config $salesConfig
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\Adminhtml\Model\Session\Quote $sessionQuote
+ * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
+ * @param \Magento\Sales\Model\Config $salesConfig
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Adminhtml\Model\Session\Quote $sessionQuote,
- \Magento\Sales\Model\AdminOrder\Create $orderCreate,
- \Magento\Sales\Model\Config $salesConfig,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\Adminhtml\Model\Session\Quote $sessionQuote,
+ \Magento\Sales\Model\AdminOrder\Create $orderCreate,
+ \Magento\Sales\Model\Config $salesConfig,
+ array $data = array()
+ ) {
parent::__construct($context, $coreData, $sessionQuote, $orderCreate, $data);
$this->_salesConfig = $salesConfig;
}
@@ -136,7 +136,7 @@ class AbstractSidebar extends \Magento\Sales\Block\Adminhtml\Order\Create\Abstra
}
/**
- * Retreive item count
+ * Retrieve item count
*
* @return int
*/
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php
index 1c38d8b9a45..de73dcbd5ce 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Table.php
@@ -34,7 +34,7 @@
namespace Magento\Sales\Block\Adminhtml\Order\Create\Totals;
-class Table extends \Magento\Adminhtml\Block\Template
+class Table extends \Magento\Backend\Block\Template
{
protected $_websiteCollection = null;
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
index f215f7e58e8..88ad92e7561 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
@@ -25,7 +25,7 @@
*/
namespace Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create;
-class Adjustments extends \Magento\Adminhtml\Block\Template
+class Adjustments extends \Magento\Backend\Block\Template
{
protected $_source;
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php
index 5f16abe9e7d..29d7bc5ac48 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View/Comments.php
@@ -34,7 +34,7 @@
*/
namespace Magento\Sales\Block\Adminhtml\Order\Creditmemo\View;
-class Comments extends \Magento\Adminhtml\Block\Text\ListText
+class Comments extends \Magento\Backend\Block\Text\ListText
{
/**
* Core registry
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Tracking.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Tracking.php
index bcda1bf125c..b585ea2838a 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Tracking.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Tracking.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Sales\Block\Adminhtml\Order\Invoice\Create;
-class Tracking extends \Magento\Adminhtml\Block\Template
+class Tracking extends \Magento\Backend\Block\Template
{
/**
* Core registry
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php
index a0025c9c795..a9966598efa 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View/Comments.php
@@ -34,7 +34,7 @@
*/
namespace Magento\Sales\Block\Adminhtml\Order\Invoice\View;
-class Comments extends \Magento\Adminhtml\Block\Text\ListText
+class Comments extends \Magento\Backend\Block\Text\ListText
{
/**
* Core registry
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php
index 6a60a90b201..f832578c232 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Payment.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Sales\Block\Adminhtml\Order;
-class Payment extends \Magento\Adminhtml\Block\Template
+class Payment extends \Magento\Backend\Block\Template
{
/**
* Payment data
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Create/Tracking.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Create/Tracking.php
index c478ab9c041..e8b8388b146 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Create/Tracking.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Create/Tracking.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Sales\Block\Adminhtml\Order\Shipment\Create;
-class Tracking extends \Magento\Adminhtml\Block\Template
+class Tracking extends \Magento\Backend\Block\Template
{
/**
* Core registry
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging.php
index 25d76a88a0b..7b52408e48e 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging.php
@@ -30,7 +30,7 @@
namespace Magento\Sales\Block\Adminhtml\Order\Shipment;
-class Packaging extends \Magento\Adminhtml\Block\Template
+class Packaging extends \Magento\Backend\Block\Template
{
/**
* @var \Magento\Usa\Model\Shipping\Carrier\Usps\Source\Size
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging/Grid.php
index de32d82c1b3..97b53054f98 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Packaging/Grid.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Sales\Block\Adminhtml\Order\Shipment\Packaging;
-class Grid extends \Magento\Adminhtml\Block\Template
+class Grid extends \Magento\Backend\Block\Template
{
protected $_template = 'order/shipment/packaging/grid.phtml';
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Tracking/Info.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Tracking/Info.php
index c50d2cf93e2..7d2fd5af28f 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Tracking/Info.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/Tracking/Info.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Sales\Block\Adminhtml\Order\Shipment\Tracking;
-class Info extends \Magento\Adminhtml\Block\Template
+class Info extends \Magento\Backend\Block\Template
{
protected $_template = 'order/shipment/tracking/info.phtml';
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Comments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Comments.php
index 14e62ab052d..e37767f3274 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Comments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Comments.php
@@ -34,7 +34,7 @@
*/
namespace Magento\Sales\Block\Adminhtml\Order\Shipment\View;
-class Comments extends \Magento\Adminhtml\Block\Text\ListText
+class Comments extends \Magento\Backend\Block\Text\ListText
{
/**
* Core registry
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Tracking.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Tracking.php
index 4ec01e14e36..31f7af846c1 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Tracking.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Shipment/View/Tracking.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Sales\Block\Adminhtml\Order\Shipment\View;
-class Tracking extends \Magento\Adminhtml\Block\Template
+class Tracking extends \Magento\Backend\Block\Template
{
/**
* Core registry
@@ -47,20 +47,20 @@ class Tracking extends \Magento\Adminhtml\Block\Template
*/
protected $_shippingConfig;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Shipping\Model\Config $shippingConfig
- * @param \Magento\Core\Model\Registry $registry
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\Shipping\Model\Config $shippingConfig
+ * @param \Magento\Core\Model\Registry $registry
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Shipping\Model\Config $shippingConfig,
- \Magento\Core\Model\Registry $registry,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\Shipping\Model\Config $shippingConfig,
+ \Magento\Core\Model\Registry $registry,
+ array $data = array()
+ ) {
$this->_shippingConfig = $shippingConfig;
$this->_coreRegistry = $registry;
parent::__construct($context, $coreData, $data);
@@ -102,7 +102,7 @@ class Tracking extends \Magento\Adminhtml\Block\Template
}
/**
- * Retrive save button html
+ * Retrieve save button html
*
* @return string
*/
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php
index 6f1cc5b1714..7a9d1770ffd 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php
@@ -33,6 +33,7 @@ class Assign extends \Magento\Adminhtml\Block\Widget\Form\Container
{
$this->_controller = 'adminhtml_order_status';
$this->_mode = 'assign';
+ $this->_blockGroup = 'Magento_Sales';
parent::_construct();
$this->_updateButton('save', 'label', __('Save Status Assignment'));
$this->_removeButton('delete');
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php
index e65b3c7d3a2..5868cba3637 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php
@@ -32,6 +32,7 @@ class Edit extends \Magento\Sales\Block\Adminhtml\Order\Status\NewStatus
{
parent::_construct();
$this->_mode = 'edit';
+ $this->_blockGroup = 'Magento_Sales';
}
/**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php
index 9fee36cbd40..91bffc62723 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Form.php
@@ -34,7 +34,7 @@
namespace Magento\Sales\Block\Adminhtml\Order\View;
-class Form extends \Magento\Adminhtml\Block\Template
+class Form extends \Magento\Backend\Block\Template
{
protected $_template = 'order/view/form.phtml';
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php
index 48c77b0b1be..c6d9de87ecd 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Giftmessage.php
@@ -54,20 +54,20 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
*/
protected $_messageFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\GiftMessage\Model\MessageFactory $messageFactory
- * @param \Magento\Core\Model\Registry $registry
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\GiftMessage\Model\MessageFactory $messageFactory
+ * @param \Magento\Core\Model\Registry $registry
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\GiftMessage\Model\MessageFactory $messageFactory,
- \Magento\Core\Model\Registry $registry,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\GiftMessage\Model\MessageFactory $messageFactory,
+ \Magento\Core\Model\Registry $registry,
+ array $data = array()
+ ) {
$this->_coreRegistry = $registry;
$this->_messageFactory = $messageFactory;
parent::__construct($context, $coreData, $data);
@@ -114,7 +114,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
}
/**
- * Retrive save button html
+ * Retrieve save button html
*
* @return string
*/
@@ -140,7 +140,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
}
/**
- * Retrive entity for form
+ * Retrieve entity for form
*
* @return \Magento\Object
*/
@@ -154,7 +154,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
}
/**
- * Retrive default value for giftmessage sender
+ * Retrieve default value for giftmessage sender
*
* @return string
*/
@@ -172,7 +172,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
}
/**
- * Retrive default value for giftmessage recipient
+ * Retrieve default value for giftmessage recipient
*
* @return string
*/
@@ -200,7 +200,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
}
/**
- * Retrive real name for field
+ * Retrieve real name for field
*
* @param string $name
* @return string
@@ -211,7 +211,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
}
/**
- * Retrive real html id for field
+ * Retrieve real html id for field
*
* @param string $name
* @return string
@@ -222,7 +222,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
}
/**
- * Retrive field html id prefix
+ * Retrieve field html id prefix
*
* @return string
*/
@@ -254,7 +254,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
}
/**
- * Retrive gift message for entity
+ * Retrieve gift message for entity
*
* @return \Magento\GiftMessage\Model\Message
*/
@@ -279,7 +279,7 @@ class Giftmessage extends \Magento\Adminhtml\Block\Widget
}
/**
- * Retrive block html id
+ * Retrieve block html id
*
* @return string
*/
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
index 95503cd4d96..218f4cb4313 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/History.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Sales\Block\Adminhtml\Order\View;
-class History extends \Magento\Adminhtml\Block\Template
+class History extends \Magento\Backend\Block\Template
{
/**
* Core registry
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php
index 72eda211795..4dc20ededf3 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Items/Renderer/DefaultRenderer.php
@@ -79,7 +79,7 @@ class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
protected $_giftMessage = array();
/**
- * Retrive default value for giftmessage sender
+ * Retrieve default value for giftmessage sender
*
* @return string
*/
@@ -97,7 +97,7 @@ class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
}
/**
- * Retrive default value for giftmessage recipient
+ * Retrieve default value for giftmessage recipient
*
* @return string
*/
@@ -125,7 +125,7 @@ class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
}
/**
- * Retrive real name for field
+ * Retrieve real name for field
*
* @param string $name
* @return string
@@ -157,7 +157,7 @@ class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
}
/**
- * Retrive gift message for entity
+ * Retrieve gift message for entity
*
* @return \Magento\GiftMessage\Model\Message
*/
@@ -185,7 +185,7 @@ class DefaultRenderer extends \Magento\Sales\Block\Adminhtml\Items\AbstractItems
}
/**
- * Retrive block html id
+ * Retrieve block html id
*
* @return string
*/
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php
index 4eb45ad5412..43c60ebf14c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Messages.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Sales\Block\Adminhtml\Order\View;
-class Messages extends \Magento\Adminhtml\Block\Messages
+class Messages extends \Magento\View\Block\Messages
{
/**
* Core registry
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
index 5f722420d5d..95b535b3702 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
@@ -34,7 +34,7 @@
namespace Magento\Sales\Block\Adminhtml\Order\View\Tab;
class History
- extends \Magento\Adminhtml\Block\Template
+ extends \Magento\Backend\Block\Template
implements \Magento\Adminhtml\Block\Widget\Tab\TabInterface
{
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 375c72e90ad..a26592467b2 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
@@ -68,18 +68,18 @@ class Form extends \Magento\Backend\Block\AbstractBlock
*/
protected $_recurringProfile;
- /**
- * @param \Magento\Backend\Block\Context $context
- * @param \Magento\Data\FormFactory $formFactory
- * @param \Magento\Sales\Model\Recurring\Profile $recurringProfile
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Context $context
+ * @param \Magento\Data\FormFactory $formFactory
+ * @param \Magento\Sales\Model\Recurring\Profile $recurringProfile
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Context $context,
- \Magento\Data\FormFactory $formFactory,
- \Magento\Sales\Model\Recurring\Profile $recurringProfile,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Context $context,
+ \Magento\Data\FormFactory $formFactory,
+ \Magento\Sales\Model\Recurring\Profile $recurringProfile,
+ array $data = array()
+ ) {
$this->_formFactory = $formFactory;
$this->_profile = $recurringProfile;
parent::__construct($context, $data);
@@ -142,7 +142,7 @@ class Form extends \Magento\Backend\Block\AbstractBlock
/**
* if there is a parent element defined, it will be replaced by a hidden element with the same name
- * and overriden by the form elements
+ * and overridden by the form elements
* It is needed to maintain HTML consistency of the parent element's form
*/
if ($this->_parentElement) {
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 cc36ce42c02..20070d81a9c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Recurring/Profile/View.php
@@ -38,18 +38,18 @@ class View extends \Magento\Backend\Block\Widget\Container
*/
protected $_coreRegistry = null;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Registry $registry
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\Core\Model\Registry $registry
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Registry $registry,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\Core\Model\Registry $registry,
+ array $data = array()
+ ) {
$this->_coreRegistry = $registry;
parent::__construct($context, $coreData, $data);
}
@@ -68,14 +68,14 @@ class View extends \Magento\Backend\Block\Widget\Container
));
$profile = $this->_coreRegistry->registry('current_recurring_profile');
- $comfirmationMessage = __('Are you sure you want to do this?');
+ $confirmationMessage = __('Are you sure you want to do this?');
// cancel
if ($profile->canCancel()) {
$url = $this->getUrl('adminhtml/*/updateState', array('profile' => $profile->getId(), 'action' => 'cancel'));
$this->_addButton('cancel', array(
'label' => __('Cancel'),
- 'onclick' => "confirmSetLocation('{$comfirmationMessage}', '{$url}')",
+ 'onclick' => "confirmSetLocation('{$confirmationMessage}', '{$url}')",
'class' => 'delete',
));
}
@@ -85,7 +85,7 @@ class View extends \Magento\Backend\Block\Widget\Container
$url = $this->getUrl('adminhtml/*/updateState', array('profile' => $profile->getId(), 'action' => 'suspend'));
$this->_addButton('suspend', array(
'label' => __('Suspend'),
- 'onclick' => "confirmSetLocation('{$comfirmationMessage}', '{$url}')",
+ 'onclick' => "confirmSetLocation('{$confirmationMessage}', '{$url}')",
'class' => 'delete',
));
}
@@ -95,7 +95,7 @@ class View extends \Magento\Backend\Block\Widget\Container
$url = $this->getUrl('adminhtml/*/updateState', array('profile' => $profile->getId(), 'action' => 'activate'));
$this->_addButton('activate', array(
'label' => __('Activate'),
- 'onclick' => "confirmSetLocation('{$comfirmationMessage}', '{$url}')",
+ 'onclick' => "confirmSetLocation('{$confirmationMessage}', '{$url}')",
'class' => 'add',
));
}
@@ -105,7 +105,7 @@ class View extends \Magento\Backend\Block\Widget\Container
$url = $this->getUrl('adminhtml/*/updateProfile', array('profile' => $profile->getId(),));
$this->_addButton('update', array(
'label' => __('Get Update'),
- 'onclick' => "confirmSetLocation('{$comfirmationMessage}', '{$url}')",
+ 'onclick' => "confirmSetLocation('{$confirmationMessage}', '{$url}')",
'class' => 'add',
));
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php
index 67549195b53..bfb80743e1f 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Sales\Block\Adminhtml\Report\Filter;
-class Form extends \Magento\Adminhtml\Block\Report\Filter\Form
+class Form extends \Magento\Reports\Block\Adminhtml\Filter\Form
{
/**
* @var \Magento\Sales\Model\Order\ConfigFactory
diff --git a/app/code/Magento/Sales/Block/Order/Comments.php b/app/code/Magento/Sales/Block/Order/Comments.php
index d16edd3e4bb..c315751642a 100644
--- a/app/code/Magento/Sales/Block/Order/Comments.php
+++ b/app/code/Magento/Sales/Block/Order/Comments.php
@@ -51,7 +51,7 @@ class Comments extends \Magento\View\Block\Template
protected $_entity;
/**
- * Currect comments collection
+ * Current comments collection
*
* @var \Magento\Sales\Model\Resource\Order\Comment\Collection\AbstractCollection
*/
diff --git a/app/code/Magento/Sales/Block/Order/PrintOrder/Invoice.php b/app/code/Magento/Sales/Block/Order/PrintOrder/Invoice.php
index 9be5e65d407..6914aca5705 100644
--- a/app/code/Magento/Sales/Block/Order/PrintOrder/Invoice.php
+++ b/app/code/Magento/Sales/Block/Order/PrintOrder/Invoice.php
@@ -107,7 +107,7 @@ class Invoice extends \Magento\Sales\Block\Items\AbstractItems
}
/**
- * Get html of invoice totlas block
+ * Get html of invoice totals block
*
* @param \Magento\Sales\Model\Order\Invoice $invoice
* @return string
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
index 6a427b22c64..d62941eb0ff 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
@@ -84,11 +84,11 @@ class Create extends \Magento\Backend\App\Action
/**
* Retrieve gift message save model
*
- * @return \Magento\Adminhtml\Model\Giftmessage\Save
+ * @return \Magento\GiftMessage\Model\Save
*/
protected function _getGiftmessageSaveModel()
{
- return $this->_objectManager->get('Magento\Adminhtml\Model\Giftmessage\Save');
+ return $this->_objectManager->get('Magento\GiftMessage\Model\Save');
}
/**
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Shipment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Shipment.php
index 4df921a9704..0682ce675c2 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Shipment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Shipment.php
@@ -425,7 +425,7 @@ class Shipment extends \Magento\Sales\Controller\Adminhtml\Shipment\AbstractShip
}
if (is_object($response)) {
- $block = $this->_objectManager->create('Magento\Adminhtml\Block\Template');
+ $block = $this->_objectManager->create('Magento\Backend\Block\Template');
$block->setTemplate('sales/order/shipment/tracking/info.phtml');
$block->setTrackingInfo($response);
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage.php
index 5a31069c3ff..6a61a0a6570 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/View/Giftmessage.php
@@ -62,11 +62,11 @@ class Giftmessage extends \Magento\Backend\App\Action
/**
* Retrieve gift message save model
*
- * @return \Magento\Adminhtml\Model\Giftmessage\Save
+ * @return \Magento\GiftMessage\Model\Save
*/
protected function _getGiftmessageSaveModel()
{
- return $this->_objectManager->get('Magento\Adminhtml\Model\Giftmessage\Save');
+ return $this->_objectManager->get('Magento\GiftMessage\Model\Save');
}
}
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index 9aebb0b9d6e..a5786283bd7 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -1120,7 +1120,7 @@ class Order extends \Magento\Sales\Model\AbstractModel
/**
* Order state setter.
* If status is specified, will add order status history with specified comment
- * the setData() cannot be overriden because of compatibility issues with resource model
+ * the setData() cannot be overridden because of compatibility issues with resource model
*
* @param string $state
* @param string|bool $status
@@ -1136,7 +1136,7 @@ class Order extends \Magento\Sales\Model\AbstractModel
/**
* Order state protected setter.
* By default allows to set any state. Can also update status to default or specified value
- * Сomplete and closed states are encapsulated intentionally, see the _checkState()
+ * Complete and closed states are encapsulated intentionally, see the _checkState()
*
* @param string $state
* @param string|bool $status
@@ -1488,7 +1488,7 @@ class Order extends \Magento\Sales\Model\AbstractModel
// Get the destination email addresses to send copies to
$copyTo = $this->_getEmails(self::XML_PATH_UPDATE_EMAIL_COPY_TO);
$copyMethod = $this->_coreStoreConfig->getConfig(self::XML_PATH_UPDATE_EMAIL_COPY_METHOD, $storeId);
- // Check if at least one recepient is found
+ // Check if at least one recipient is found
if (!$notifyCustomer && !$copyTo) {
return $this;
}
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php
index 72324f31eef..f43f0d0320a 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php
@@ -844,7 +844,7 @@ class Creditmemo extends \Magento\Sales\Model\AbstractModel
// Get the destination email addresses to send copies to
$copyTo = $this->_getEmails(self::XML_PATH_EMAIL_COPY_TO);
$copyMethod = $this->_coreStoreConfig->getConfig(self::XML_PATH_EMAIL_COPY_METHOD, $storeId);
- // Check if at least one recepient is found
+ // Check if at least one recipient is found
if (!$notifyCustomer && !$copyTo) {
return $this;
}
@@ -920,7 +920,7 @@ class Creditmemo extends \Magento\Sales\Model\AbstractModel
// Get the destination email addresses to send copies to
$copyTo = $this->_getEmails(self::XML_PATH_UPDATE_EMAIL_COPY_TO);
$copyMethod = $this->_coreStoreConfig->getConfig(self::XML_PATH_UPDATE_EMAIL_COPY_METHOD, $storeId);
- // Check if at least one recepient is found
+ // Check if at least one recipient is found
if (!$notifyCustomer && !$copyTo) {
return $this;
}
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
index ed4b8c0f149..b0d8017add4 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
@@ -269,7 +269,7 @@ class Item extends \Magento\Core\Model\AbstractModel
$rowTotalInclTax = $orderItem->getRowTotalInclTax();
$baseRowTotalInclTax = $orderItem->getBaseRowTotalInclTax();
- if (!$this->isLast()) {
+ if (!$this->isLast() && $orderItemQtyInvoiced > 0) {
$availableQty = $orderItemQtyInvoiced - $orderItem->getQtyRefunded();
$rowTotal = $creditmemo->roundPrice($rowTotal / $availableQty * $this->getQty());
$baseRowTotal = $creditmemo->roundPrice($baseRowTotal / $availableQty * $this->getQty(), 'base');
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
index d6bf9020773..6f27e3cfcf1 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Tax.php
@@ -46,9 +46,9 @@ class Tax extends \Magento\Sales\Model\Order\Creditmemo\Total\AbstractTotal
if ($orderItem->isDummy()) {
continue;
}
- $orderItemTax = $orderItem->getTaxInvoiced();
- $baseOrderItemTax = $orderItem->getBaseTaxInvoiced();
- $orderItemQty = $orderItem->getQtyInvoiced();
+ $orderItemTax = (float)$orderItem->getTaxInvoiced();
+ $baseOrderItemTax = (float)$orderItem->getBaseTaxInvoiced();
+ $orderItemQty = (float)$orderItem->getQtyInvoiced();
if ($orderItemTax && $orderItemQty) {
/**
diff --git a/app/code/Magento/Sales/Model/Order/Invoice.php b/app/code/Magento/Sales/Model/Order/Invoice.php
index f94e8af9426..31657ad745b 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice.php
@@ -411,7 +411,7 @@ class Invoice extends \Magento\Sales\Model\AbstractModel
}
/**
- * Check invice capture action availability
+ * Check invoice capture action availability
*
* @return bool
*/
@@ -871,7 +871,7 @@ class Invoice extends \Magento\Sales\Model\AbstractModel
// Get the destination email addresses to send copies to
$copyTo = $this->_getEmails(self::XML_PATH_EMAIL_COPY_TO);
$copyMethod = $this->_coreStoreConfig->getConfig(self::XML_PATH_EMAIL_COPY_METHOD, $storeId);
- // Check if at least one recepient is found
+ // Check if at least one recipient is found
if (!$notifyCustomer && !$copyTo) {
return $this;
}
@@ -946,7 +946,7 @@ class Invoice extends \Magento\Sales\Model\AbstractModel
// Get the destination email addresses to send copies to
$copyTo = $this->_getEmails(self::XML_PATH_UPDATE_EMAIL_COPY_TO);
$copyMethod = $this->_coreStoreConfig->getConfig(self::XML_PATH_UPDATE_EMAIL_COPY_METHOD, $storeId);
- // Check if at least one recepient is found
+ // Check if at least one recipient is found
if (!$notifyCustomer && !$copyTo) {
return $this;
}
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php
index 0668d634a27..d1cb3520e06 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php
@@ -42,14 +42,14 @@ class Discount extends \Magento\Sales\Model\Order\Invoice\Total\AbstractTotal
* So basically if we have invoice with positive discount and it
* was not canceled we don't add shipping discount to this one.
*/
- $addShippingDicount = true;
- foreach ($invoice->getOrder()->getInvoiceCollection() as $previusInvoice) {
- if ($previusInvoice->getDiscountAmount()) {
- $addShippingDicount = false;
+ $addShippingDiscount = true;
+ foreach ($invoice->getOrder()->getInvoiceCollection() as $previousInvoice) {
+ if ($previousInvoice->getDiscountAmount()) {
+ $addShippingDiscount = false;
}
}
- if ($addShippingDicount) {
+ if ($addShippingDiscount) {
$totalDiscountAmount = $totalDiscountAmount + $invoice->getOrder()->getShippingDiscountAmount();
$baseTotalDiscountAmount = $baseTotalDiscountAmount + $invoice->getOrder()->getBaseShippingDiscountAmount();
}
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
index 3d2de76e96d..c81f04f5b4f 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/Tax.php
@@ -132,8 +132,8 @@ class Tax extends \Magento\Sales\Model\Order\Invoice\Total\AbstractTotal
/**
* Check shipping amount in previous invoices
*/
- foreach ($invoice->getOrder()->getInvoiceCollection() as $previusInvoice) {
- if ($previusInvoice->getShippingAmount() && !$previusInvoice->isCanceled()) {
+ foreach ($invoice->getOrder()->getInvoiceCollection() as $previousInvoice) {
+ if ($previousInvoice->getShippingAmount() && !$previousInvoice->isCanceled()) {
$includeShippingTax = false;
}
}
diff --git a/app/code/Magento/Sales/Model/Order/Item.php b/app/code/Magento/Sales/Model/Order/Item.php
index 432ea182582..c0ba19ee0ba 100644
--- a/app/code/Magento/Sales/Model/Order/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Item.php
@@ -645,7 +645,7 @@ class Item extends \Magento\Core\Model\AbstractModel
}
/**
- * Return chilgren items of this item
+ * Return children items of this item
*
* @return array
*/
diff --git a/app/code/Magento/Sales/Model/Order/Payment.php b/app/code/Magento/Sales/Model/Order/Payment.php
index 98308de75bb..d459c5e1b54 100644
--- a/app/code/Magento/Sales/Model/Order/Payment.php
+++ b/app/code/Magento/Sales/Model/Order/Payment.php
@@ -178,7 +178,7 @@ class Payment extends \Magento\Payment\Model\Info
protected $_eventObject = 'payment';
/**
- * Transaction addditional information container
+ * Transaction additional information container
*
* @var array
*/
@@ -1587,9 +1587,9 @@ class Payment extends \Magento\Payment\Model\Info
}
/**
- * Additionnal transaction info getter
+ * Additional transaction info getter
*
- * @param sting $key
+ * @param string $key
* @return mixed
*/
public function getTransactionAdditionalInfo($key = null)
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
index c38def57172..2dc7022771a 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
@@ -98,7 +98,7 @@ class Transaction extends \Magento\Core\Model\AbstractModel
/**
* Child transactions, assoc array of txn_id => instance
* Filled only in case when all child transactions have txn_id
- * Used for quicker search of child transactions using isset() as oposite to foreaching $_children
+ * Used for quicker search of child transactions using isset() as opposite to foreaching $_children
* @var array
*/
protected $_identifiedChildren = null;
diff --git a/app/code/Magento/Sales/Model/Order/Shipment.php b/app/code/Magento/Sales/Model/Order/Shipment.php
index 8d5a87f4693..53153d71bcb 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment.php
@@ -516,7 +516,7 @@ class Shipment extends \Magento\Sales\Model\AbstractModel
// Get the destination email addresses to send copies to
$copyTo = $this->_getEmails(self::XML_PATH_EMAIL_COPY_TO);
$copyMethod = $this->_coreStoreConfig->getConfig(self::XML_PATH_EMAIL_COPY_METHOD, $storeId);
- // Check if at least one recepient is found
+ // Check if at least one recipient is found
if (!$notifyCustomer && !$copyTo) {
return $this;
}
@@ -593,7 +593,7 @@ class Shipment extends \Magento\Sales\Model\AbstractModel
// Get the destination email addresses to send copies to
$copyTo = $this->_getEmails(self::XML_PATH_UPDATE_EMAIL_COPY_TO);
$copyMethod = $this->_coreStoreConfig->getConfig(self::XML_PATH_UPDATE_EMAIL_COPY_METHOD, $storeId);
- // Check if at least one recepient is found
+ // Check if at least one recipient is found
if (!$notifyCustomer && !$copyTo) {
return $this;
}
diff --git a/app/code/Magento/Sales/Model/Order/Status.php b/app/code/Magento/Sales/Model/Order/Status.php
index 9261b707924..02578047758 100644
--- a/app/code/Magento/Sales/Model/Order/Status.php
+++ b/app/code/Magento/Sales/Model/Order/Status.php
@@ -131,13 +131,12 @@ class Status extends \Magento\Core\Model\AbstractModel
public function getStoreLabel($store = null)
{
$store = $this->_storeManager->getStore($store);
- if (!$store->isAdmin()) {
- $labels = $this->getStoreLabels();
- if (isset($labels[$store->getId()])) {
- return $labels[$store->getId()];
- }
+ $labels = $this->getStoreLabels();
+ if (isset($labels[$store->getId()])) {
+ return $labels[$store->getId()];
+ } else {
+ return __($this->getLabel());
}
- return __($this->getLabel());
}
/**
diff --git a/app/code/Magento/Sales/Model/Quote.php b/app/code/Magento/Sales/Model/Quote.php
index ed219119323..42678d50259 100644
--- a/app/code/Magento/Sales/Model/Quote.php
+++ b/app/code/Magento/Sales/Model/Quote.php
@@ -1235,7 +1235,7 @@ class Quote extends \Magento\Core\Model\AbstractModel
if (!$item) {
$item = $this->_quoteItemFactory->create();
$item->setQuote($this);
- if ($this->_storeManager->getStore()->isAdmin()) {
+ if ($this->_appState->getAreaCode() === \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE) {
$item->setStoreId($this->getStore()->getId());
} else {
$item->setStoreId($this->_storeManager->getStore()->getId());
diff --git a/app/code/Magento/Sales/Model/Quote/Address/Total/AbstractTotal.php b/app/code/Magento/Sales/Model/Quote/Address/Total/AbstractTotal.php
index da6985f2b92..b5b7b54e00f 100644
--- a/app/code/Magento/Sales/Model/Quote/Address/Total/AbstractTotal.php
+++ b/app/code/Magento/Sales/Model/Quote/Address/Total/AbstractTotal.php
@@ -115,7 +115,7 @@ abstract class AbstractTotal
}
/**
- * Set address shich can be used inside totals calculation
+ * Set address which can be used inside totals calculation
*
* @param \Magento\Sales\Model\Quote\Address $address
* @return \Magento\Sales\Model\Quote\Address\Total\AbstractTotal
@@ -239,7 +239,7 @@ abstract class AbstractTotal
}
/**
- * Whether the item row total may be compouded with others
+ * Whether the item row total may be compounded with others
*
* @param \Magento\Sales\Model\Quote\Item\AbstractItem $item
* @return bool
diff --git a/app/code/Magento/Sales/Model/Quote/Address/Total/Subtotal.php b/app/code/Magento/Sales/Model/Quote/Address/Total/Subtotal.php
index 909cc2400b8..e560f30cb52 100644
--- a/app/code/Magento/Sales/Model/Quote/Address/Total/Subtotal.php
+++ b/app/code/Magento/Sales/Model/Quote/Address/Total/Subtotal.php
@@ -65,7 +65,7 @@ class Subtotal extends \Magento\Sales\Model\Quote\Address\Total\AbstractTotal
foreach ($items as $item) {
if ($this->_initItem($address, $item) && $item->getQty() > 0) {
/**
- * Separatly calculate subtotal only for virtual products
+ * Separately calculate subtotal only for virtual products
*/
if ($item->getProduct()->isVirtual()) {
$virtualAmount += $item->getRowTotal();
diff --git a/app/code/Magento/Sales/Model/Quote/Item.php b/app/code/Magento/Sales/Model/Quote/Item.php
index 74a5d7ea70b..b0b64fd71ee 100644
--- a/app/code/Magento/Sales/Model/Quote/Item.php
+++ b/app/code/Magento/Sales/Model/Quote/Item.php
@@ -319,8 +319,8 @@ class Item extends \Magento\Sales\Model\Quote\Item\AbstractItem
$qty = $this->_prepareQty($qty);
/**
- * We can't modify quontity of existing items which have parent
- * This qty declared just once duering add process and is not editable
+ * We can't modify quantity of existing items which have parent
+ * This qty declared just once during add process and is not editable
*/
if (!$this->getParentItem() || !$this->getId()) {
$this->setQtyToAdd($qty);
@@ -654,7 +654,7 @@ class Item extends \Magento\Sales\Model\Quote\Item\AbstractItem
/**
* Can specify specific actions for ability to change given quote options values
- * Exemple: cataloginventory decimal qty validation may change qty to int,
+ * Example: cataloginventory decimal qty validation may change qty to int,
* so need to change quote item qty option value.
*
* @param \Magento\Object $option
diff --git a/app/code/Magento/Sales/Model/Quote/Item/AbstractItem.php b/app/code/Magento/Sales/Model/Quote/Item/AbstractItem.php
index ce9279ba677..39f303bac8a 100644
--- a/app/code/Magento/Sales/Model/Quote/Item/AbstractItem.php
+++ b/app/code/Magento/Sales/Model/Quote/Item/AbstractItem.php
@@ -620,7 +620,7 @@ abstract class AbstractItem extends \Magento\Core\Model\AbstractModel
}
/**
- * Checking can we ship product separatelly (each child separately)
+ * Checking can we ship product separately (each child separately)
* or each parent product item can be shipped only like one item
*
* @return bool
diff --git a/app/code/Magento/Sales/Model/Recurring/Profile.php b/app/code/Magento/Sales/Model/Recurring/Profile.php
index 40c28f1bc47..62465e26724 100644
--- a/app/code/Magento/Sales/Model/Recurring/Profile.php
+++ b/app/code/Magento/Sales/Model/Recurring/Profile.php
@@ -26,7 +26,7 @@
/**
* Sales implementation of recurring payment profiles
- * Implements saving and manageing profiles
+ * Implements saving and managing profiles
*
* @method \Magento\Sales\Model\Resource\Recurring\Profile _getResource()
* @method \Magento\Sales\Model\Resource\Recurring\Profile getResource()
@@ -422,7 +422,7 @@ class Profile extends \Magento\Payment\Model\Recurring\Profile
/**
* Import quote information to the profile
*
- * @param \Magento\Sales\Model\Quote\ $quote
+ * @param \Magento\Sales\Model\Quote $quote
* @return \Magento\Sales\Model\Recurring\Profile
*/
public function importQuote(\Magento\Sales\Model\Quote $quote)
@@ -812,7 +812,7 @@ class Profile extends \Magento\Payment\Model\Recurring\Profile
}
/**
- * Add additional options suboption into itev
+ * Add additional options suboption into item
*
* @param \Magento\Sales\Model\Order\Item $item
* @param array $option
diff --git a/app/code/Magento/Sales/Model/Resource/Collection/AbstractCollection.php b/app/code/Magento/Sales/Model/Resource/Collection/AbstractCollection.php
index 22797ae8fce..5c3858e5547 100644
--- a/app/code/Magento/Sales/Model/Resource/Collection/AbstractCollection.php
+++ b/app/code/Magento/Sales/Model/Resource/Collection/AbstractCollection.php
@@ -135,7 +135,7 @@ abstract class AbstractCollection
}
/**
- * Retrive all ids for collection
+ * Retrieve all ids for collection
* Backward compatibility with EAV collection
*
* @param int $limit
diff --git a/app/code/Magento/Sales/Model/Resource/Order/Collection.php b/app/code/Magento/Sales/Model/Resource/Order/Collection.php
index d69c0878d71..b66e787399c 100644
--- a/app/code/Magento/Sales/Model/Resource/Order/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Order/Collection.php
@@ -131,7 +131,7 @@ class Collection extends \Magento\Sales\Model\Resource\Collection\AbstractCollec
/**
* Join table sales_flat_order_address to select for billing and shipping order addresses.
- * Create corillation map
+ * Create correlation map
*
* @return \Magento\Sales\Model\Resource\Order\Collection
*/
diff --git a/app/code/Magento/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Child.php b/app/code/Magento/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Child.php
index 472497ab6f2..a9bc41dc8d8 100644
--- a/app/code/Magento/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Child.php
+++ b/app/code/Magento/Sales/Model/Resource/Order/Shipment/Attribute/Backend/Child.php
@@ -40,7 +40,7 @@ class Child
/**
* Performed before data is saved
*
- * @param Varieb_Object $object
+ * @param Varien_Object $object
* @return \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
*/
public function beforeSave($object)
diff --git a/app/code/Magento/Sales/Model/Resource/Quote/Address/Rate/Collection.php b/app/code/Magento/Sales/Model/Resource/Quote/Address/Rate/Collection.php
index 351ae1b313e..f11b3721598 100644
--- a/app/code/Magento/Sales/Model/Resource/Quote/Address/Rate/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Quote/Address/Rate/Collection.php
@@ -26,7 +26,7 @@
/**
- * Quote addresses shiping rates collection
+ * Quote addresses shipping rates collection
*
* @category Magento
* @package Magento_Sales
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php
index b7ec10b886a..4a2293c5299 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers.php
@@ -235,7 +235,7 @@ class Bestsellers extends \Magento\Sales\Model\Resource\Report\AbstractReport
$columns = array(
'period' => 'period',
- 'store_id' => new \Zend_Db_Expr(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID),
+ 'store_id' => new \Zend_Db_Expr(\Magento\Core\Model\Store::DEFAULT_STORE_ID),
'product_id' => 'product_id',
'product_name' => new \Zend_Db_Expr('MIN(product_name)'),
'product_price' => new \Zend_Db_Expr('MIN(product_price)'),
@@ -244,7 +244,7 @@ class Bestsellers extends \Magento\Sales\Model\Resource\Report\AbstractReport
$select->reset();
$select->from($this->getMainTable(), $columns)
- ->where('store_id <> ?', 0);
+ ->where('store_id <> ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
if ($subSelect !== null) {
$select->where($this->_makeConditionFromDateRangeSelect($subSelect, 'period'));
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php
index d6ce3bf58bb..c5d164aa056 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Bestsellers/Collection.php
@@ -200,8 +200,8 @@ class Collection
$storeIds = array($storeIds);
}
$currentStoreIds = $this->_storesIds;
- if (isset($currentStoreIds) && $currentStoreIds != \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
- && $currentStoreIds != array(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)) {
+ if (isset($currentStoreIds) && $currentStoreIds != \Magento\Core\Model\Store::DEFAULT_STORE_ID
+ && $currentStoreIds != array(\Magento\Core\Model\Store::DEFAULT_STORE_ID)) {
if (!is_array($currentStoreIds)) {
$currentStoreIds = array($currentStoreIds);
}
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Collection/AbstractCollection.php b/app/code/Magento/Sales/Model/Resource/Report/Collection/AbstractCollection.php
index 54016b5e96e..04b2469f226 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Collection/AbstractCollection.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Collection/AbstractCollection.php
@@ -59,7 +59,7 @@ class AbstractCollection
\Magento\Sales\Model\Resource\Report $resource
) {
parent::__construct($eventManager, $logger, $fetchStrategy, $entityFactory, $resource);
- $this->setModel('Magento\Adminhtml\Model\Report\Item');
+ $this->setModel('Magento\Reports\Model\Item');
}
/**
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Invoiced.php b/app/code/Magento/Sales/Model/Resource/Report/Invoiced.php
index 2006034d8a3..520df2bc412 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Invoiced.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Invoiced.php
@@ -149,7 +149,7 @@ class Invoiced extends \Magento\Sales\Model\Resource\Report\AbstractReport
$columns = array(
'period' => 'period',
- 'store_id' => new \Zend_Db_Expr(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID),
+ 'store_id' => new \Zend_Db_Expr(\Magento\Core\Model\Store::DEFAULT_STORE_ID),
'order_status' => 'order_status',
'orders_count' => new \Zend_Db_Expr('SUM(orders_count)'),
'orders_invoiced' => new \Zend_Db_Expr('SUM(orders_invoiced)'),
@@ -158,7 +158,8 @@ class Invoiced extends \Magento\Sales\Model\Resource\Report\AbstractReport
'invoiced_not_captured' => new \Zend_Db_Expr('SUM(invoiced_not_captured)')
);
- $select->from($table, $columns)->where('store_id <> ?', 0);
+ $select->from($table, $columns)
+ ->where('store_id <> ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
if ($subSelect !== null) {
$select->where($this->_makeConditionFromDateRangeSelect($subSelect, 'period'));
@@ -251,7 +252,7 @@ class Invoiced extends \Magento\Sales\Model\Resource\Report\AbstractReport
$columns = array(
'period' => 'period',
- 'store_id' => new \Zend_Db_Expr(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID),
+ 'store_id' => new \Zend_Db_Expr(\Magento\Core\Model\Store::DEFAULT_STORE_ID),
'order_status' => 'order_status',
'orders_count' => new \Zend_Db_Expr('SUM(orders_count)'),
'orders_invoiced' => new \Zend_Db_Expr('SUM(orders_invoiced)'),
@@ -260,7 +261,7 @@ class Invoiced extends \Magento\Sales\Model\Resource\Report\AbstractReport
'invoiced_not_captured' => new \Zend_Db_Expr('SUM(invoiced_not_captured)')
);
- $select->from($table, $columns)->where('store_id <> ?', 0);
+ $select->from($table, $columns)->where('store_id <> ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
if ($subSelect !== null) {
$select->where($this->_makeConditionFromDateRangeSelect($subSelect, 'period'));
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Order/Createdat.php b/app/code/Magento/Sales/Model/Resource/Report/Order/Createdat.php
index 04c00872d35..cf3195f7f80 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Order/Createdat.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Order/Createdat.php
@@ -235,7 +235,7 @@ class Createdat extends \Magento\Sales\Model\Resource\Report\AbstractReport
$columns[$k] = new \Zend_Db_Expr('SUM(' . $k . ')');
}
$columns['period'] = 'period';
- $columns['store_id'] = new \Zend_Db_Expr(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+ $columns['store_id'] = new \Zend_Db_Expr(\Magento\Core\Model\Store::DEFAULT_STORE_ID);
$columns['order_status'] = 'order_status';
$select->reset();
diff --git a/app/code/Magento/Sales/Model/Resource/Report/Shipping.php b/app/code/Magento/Sales/Model/Resource/Report/Shipping.php
index d7e8d4df196..5a8b371bb22 100644
--- a/app/code/Magento/Sales/Model/Resource/Report/Shipping.php
+++ b/app/code/Magento/Sales/Model/Resource/Report/Shipping.php
@@ -128,7 +128,7 @@ class Shipping extends \Magento\Sales\Model\Resource\Report\AbstractReport
$columns = array(
'period' => 'period',
- 'store_id' => new \Zend_Db_Expr(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID),
+ 'store_id' => new \Zend_Db_Expr(\Magento\Core\Model\Store::DEFAULT_STORE_ID),
'order_status' => 'order_status',
'shipping_description' => 'shipping_description',
'orders_count' => new \Zend_Db_Expr('SUM(orders_count)'),
@@ -136,7 +136,8 @@ class Shipping extends \Magento\Sales\Model\Resource\Report\AbstractReport
'total_shipping_actual' => new \Zend_Db_Expr('SUM(total_shipping_actual)'),
);
- $select->from($table, $columns)->where('store_id != ?', 0);
+ $select->from($table, $columns)
+ ->where('store_id != ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
if ($subSelect !== null) {
$select->where($this->_makeConditionFromDateRangeSelect($subSelect, 'period'));
@@ -237,7 +238,7 @@ class Shipping extends \Magento\Sales\Model\Resource\Report\AbstractReport
$columns = array(
'period' => 'period',
- 'store_id' => new \Zend_Db_Expr(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID),
+ 'store_id' => new \Zend_Db_Expr(\Magento\Core\Model\Store::DEFAULT_STORE_ID),
'order_status' => 'order_status',
'shipping_description' => 'shipping_description',
'orders_count' => new \Zend_Db_Expr('SUM(orders_count)'),
@@ -245,7 +246,8 @@ class Shipping extends \Magento\Sales\Model\Resource\Report\AbstractReport
'total_shipping_actual' => new \Zend_Db_Expr('SUM(total_shipping_actual)'),
);
- $select->from($table, $columns)->where('store_id != ?', 0);
+ $select->from($table, $columns)
+ ->where('store_id != ?', \Magento\Core\Model\Store::DEFAULT_STORE_ID);
if ($subSelect !== null) {
$select->where($this->_makeConditionFromDateRangeSelect($subSelect, 'period'));
diff --git a/app/code/Magento/Sales/Model/Resource/Setup.php b/app/code/Magento/Sales/Model/Resource/Setup.php
index 3bcc41506e1..61302020f77 100644
--- a/app/code/Magento/Sales/Model/Resource/Setup.php
+++ b/app/code/Magento/Sales/Model/Resource/Setup.php
@@ -118,7 +118,7 @@ class Setup extends \Magento\Eav\Model\Entity\Setup
}
/**
- * Add entity attribute. Overwrited for flat entities support
+ * Add entity attribute. Overwritten for flat entities support
*
* @param int|string $entityTypeId
* @param string $code
diff --git a/app/code/Magento/Sales/Model/Service/Order.php b/app/code/Magento/Sales/Model/Service/Order.php
index b7268081ace..e14a243f8ea 100644
--- a/app/code/Magento/Sales/Model/Service/Order.php
+++ b/app/code/Magento/Sales/Model/Service/Order.php
@@ -330,7 +330,7 @@ class Order
}
/**
- * Check if order item can be invoiced. Dummy item can be invoiced or with his childrens or
+ * Check if order item can be invoiced. Dummy item can be invoiced or with his children or
* with parent item which is included to invoice
*
* @param \Magento\Sales\Model\Order\Item $item
@@ -370,7 +370,7 @@ class Order
}
/**
- * Check if order item can be shiped. Dummy item can be shiped or with his childrens or
+ * Check if order item can be shipped. Dummy item can be shipped or with his children or
* with parent item which is included to shipment
*
* @param \Magento\Sales\Model\Order\Item $item
diff --git a/app/code/Magento/Sales/etc/sales.xml b/app/code/Magento/Sales/etc/sales.xml
index 1876c1dabb8..7aefbb77b38 100644
--- a/app/code/Magento/Sales/etc/sales.xml
+++ b/app/code/Magento/Sales/etc/sales.xml
@@ -59,4 +59,10 @@
<item name="grand_total" instance="Magento\Sales\Model\Order\Creditmemo\Total\Grand" sort_order="400"/>
</group>
</section>
+ <order>
+ <available_product_type name="simple"/>
+ <available_product_type name="virtual"/>
+ <available_product_type name="configurable"/>
+ <available_product_type name="grouped"/>
+ </order>
</config>
diff --git a/app/code/Magento/Sales/i18n/de_DE.csv b/app/code/Magento/Sales/i18n/de_DE.csv
index f907cc1d624..f1aee67e8f7 100644
--- a/app/code/Magento/Sales/i18n/de_DE.csv
+++ b/app/code/Magento/Sales/i18n/de_DE.csv
@@ -465,7 +465,7 @@
"Orders and Returns","Bestellungen und Retouren"
"Orders and Returns Search Form","Suchmaske Bestellungen und Rücksendungen"
"Original Price","Originalpreis"
-"Original order item that recurring payment profile correspondss to.","Ursprünglich bestellter Artikel, der dem Zahlungsprofil entspricht."
+"Original order item that recurring payment profile corresponds to.","Ursprünglich bestellter Artikel, der dem Zahlungsprofil entspricht."
"PDF Credit Memos","PDF Gutschriften"
"PDF Invoices","PDF Rechnungen"
"PDF Packing Slips","PDF Packzettel"
diff --git a/app/code/Magento/Sales/i18n/en_US.csv b/app/code/Magento/Sales/i18n/en_US.csv
index b8f1d6296a0..23c0dbb6acd 100644
--- a/app/code/Magento/Sales/i18n/en_US.csv
+++ b/app/code/Magento/Sales/i18n/en_US.csv
@@ -468,7 +468,7 @@
"Orders and Returns","Orders and Returns"
"Orders and Returns Search Form","Orders and Returns Search Form"
"Original Price","Original Price"
-"Original order item that recurring payment profile correspondss to.","Original order item that recurring payment profile correspondss to."
+"Original order item that recurring payment profile corresponds to.","Original order item that recurring payment profile corresponds to."
"PDF Credit Memos","PDF Credit Memos"
"PDF Invoices","PDF Invoices"
"PDF Packing Slips","PDF Packing Slips"
diff --git a/app/code/Magento/Sales/i18n/es_ES.csv b/app/code/Magento/Sales/i18n/es_ES.csv
index bc1d43e119b..56c9423f592 100644
--- a/app/code/Magento/Sales/i18n/es_ES.csv
+++ b/app/code/Magento/Sales/i18n/es_ES.csv
@@ -465,7 +465,7 @@
"Orders and Returns","Pedidos y devoluciones"
"Orders and Returns Search Form","Impreso de pedidos y devoluciones"
"Original Price","Precio original"
-"Original order item that recurring payment profile correspondss to.","Pedido original al que corresponde el perfil de pago periódico."
+"Original order item that recurring payment profile corresponds to.","Pedido original al que corresponde el perfil de pago periódico."
"PDF Credit Memos","Notas de cŕedito en PDF"
"PDF Invoices","Facturas en PDF"
"PDF Packing Slips","Albaranes en PDF"
diff --git a/app/code/Magento/Sales/i18n/fr_FR.csv b/app/code/Magento/Sales/i18n/fr_FR.csv
index 8d1e957d987..cf1992a6da1 100644
--- a/app/code/Magento/Sales/i18n/fr_FR.csv
+++ b/app/code/Magento/Sales/i18n/fr_FR.csv
@@ -465,7 +465,7 @@
"Orders and Returns","Commandes et Retours"
"Orders and Returns Search Form","Formulaire de recherche des Commandes et Retours"
"Original Price","Prix d'origine"
-"Original order item that recurring payment profile correspondss to.","Article de la Commande d'origine qui correspond au profil de paiement récurrent"
+"Original order item that recurring payment profile corresponds to.","Article de la Commande d'origine qui correspond au profil de paiement récurrent"
"PDF Credit Memos","Notes de crédit PDF"
"PDF Invoices","Factures PDF"
"PDF Packing Slips","Bons de livraison PDF"
diff --git a/app/code/Magento/Sales/i18n/nl_NL.csv b/app/code/Magento/Sales/i18n/nl_NL.csv
index 3a3af6ce018..80d2178c647 100644
--- a/app/code/Magento/Sales/i18n/nl_NL.csv
+++ b/app/code/Magento/Sales/i18n/nl_NL.csv
@@ -465,7 +465,7 @@
"Orders and Returns","Bestellingen en Teruggaven"
"Orders and Returns Search Form","Bestellingen en Teruggaven Zoekscherm"
"Original Price","Originele prijs"
-"Original order item that recurring payment profile correspondss to.","Oorspronkelijke volgorde van item waar een terugkerend betalings profiel mee overeenkomt."
+"Original order item that recurring payment profile corresponds to.","Oorspronkelijke volgorde van item waar een terugkerend betalings profiel mee overeenkomt."
"PDF Credit Memos","PDF Kredietmemo's"
"PDF Invoices","PDF-facturen"
"PDF Packing Slips","PDF Packing Slips"
diff --git a/app/code/Magento/Sales/i18n/pt_BR.csv b/app/code/Magento/Sales/i18n/pt_BR.csv
index ce8f5786e1f..69e72e45321 100644
--- a/app/code/Magento/Sales/i18n/pt_BR.csv
+++ b/app/code/Magento/Sales/i18n/pt_BR.csv
@@ -465,7 +465,7 @@
"Orders and Returns","Pedidos e Devoluções"
"Orders and Returns Search Form","Busca de Pedidos e Devoluções"
"Original Price","Preço Original"
-"Original order item that recurring payment profile correspondss to.","Item de pedido original a que corresponde perfil de pagamento recorrente."
+"Original order item that recurring payment profile corresponds to.","Item de pedido original a que corresponde perfil de pagamento recorrente."
"PDF Credit Memos","Avisos de crédito em PDF"
"PDF Invoices","Faturas em PDF"
"PDF Packing Slips","Guias de remessas em PDF"
diff --git a/app/code/Magento/Sales/i18n/zh_CN.csv b/app/code/Magento/Sales/i18n/zh_CN.csv
index c74f9e5d29c..e582a6d5df1 100644
--- a/app/code/Magento/Sales/i18n/zh_CN.csv
+++ b/app/code/Magento/Sales/i18n/zh_CN.csv
@@ -465,7 +465,7 @@
"Orders and Returns","订å•ä¸Žé€€è´§"
"Orders and Returns Search Form","订å•ä¸Žé€€è´§æœç´¢è¡¨å•"
"Original Price","åŽŸå§‹ä»·æ ¼"
-"Original order item that recurring payment profile correspondss to.","循环支付é…置文件所对应的原始订å•é¡¹ã€‚"
+"Original order item that recurring payment profile corresponds to.","循环支付é…置文件所对应的原始订å•é¡¹ã€‚"
"PDF Credit Memos","PDF版信用记录"
"PDF Invoices","PDF版å‘票"
"PDF Packing Slips","PDF版包裹清å•"
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
index e172280e9d9..15387546d38 100644
--- 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
@@ -56,7 +56,7 @@
<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\Backend\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>
@@ -64,7 +64,7 @@
</block>
</referenceBlock>
<referenceContainer name="js">
- <block class="Magento\Adminhtml\Block\Template" template="Magento_Sales::order/create/js.phtml" name="create"/>
+ <block class="Magento\Backend\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">
@@ -108,7 +108,7 @@
</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\Backend\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\View\Block\Text\ListText" name="order_item_extra_info"/>
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
index fe3896f2619..98a29816a8d 100644
--- 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
@@ -59,7 +59,7 @@
</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\Backend\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\View\Block\Text\ListText" name="order_item_extra_info"/>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml
index 39abf257ae9..a647250ad8a 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml
@@ -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">adminhtml/sales_order_status/edit</item>
+ <item name="path" xsi:type="string">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/Sales/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
index 641aa08275a..2d4c4618e1a 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_view.xml
@@ -53,7 +53,7 @@
</block>
<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\Backend\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\Sales\Block\Adminhtml\Order\Totals" name="order_totals" template="order/totals.phtml">
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php
index b0e2330e902..129c35fe533 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons.php
@@ -34,7 +34,7 @@
namespace Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab;
class Coupons
- extends \Magento\Adminhtml\Block\Text\ListText
+ extends \Magento\Backend\Block\Text\ListText
implements \Magento\Adminhtml\Block\Widget\Tab\TabInterface
{
/**
diff --git a/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_edit.xml b/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_edit.xml
index 18d9e36951a..efd14d846a6 100644
--- a/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_edit.xml
+++ b/app/code/Magento/SalesRule/view/adminhtml/layout/sales_rule_promo_quote_edit.xml
@@ -63,7 +63,7 @@
<argument name="block" xsi:type="string">promo_quote_edit_tab_coupons</argument>
</action>
</block>
- <block class="Magento\Adminhtml\Block\Template" template="Magento_SalesRule::promo/salesrulejs.phtml" name="promo_quote_edit_jsinit"/>
+ <block class="Magento\Backend\Block\Template" template="Magento_SalesRule::promo/salesrulejs.phtml" name="promo_quote_edit_jsinit"/>
</referenceContainer>
<referenceContainer name="content">
<block class="Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit" name="promo_quote_edit"/>
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 6f44077195e..8fca208b2b1 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
@@ -24,12 +24,10 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="root">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">1column.phtml</argument>
- </action>
- <action method="setTemplate">
- <argument name="template" xsi:type="string">2columns-right.phtml</argument>
+ <update handle="page_one_column"/>
+ <referenceBlock name="page.main.title">
+ <action method="setPageTitle">
+ <argument name="title" translate="true" xsi:type="string">Email to a Friend</argument>
</action>
</referenceBlock>
<referenceContainer name="content">
diff --git a/app/code/Magento/Sendfriend/view/frontend/send.phtml b/app/code/Magento/Sendfriend/view/frontend/send.phtml
index e429a397b44..6ef0ffc2d20 100644
--- a/app/code/Magento/Sendfriend/view/frontend/send.phtml
+++ b/app/code/Magento/Sendfriend/view/frontend/send.phtml
@@ -18,105 +18,113 @@
* 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\Sendfriend\Block\Send */
/**
* Send to friend form
*
- * @see \Magento\Sendfriend\Block\Send
+ * @var $this \Magento\Sendfriend\Block\Send
*/
?>
<script id="add-recipient-tmpl" type="text/x-jQuery-tmpl">
- <p id="btn-remove${_index_}">
- <a href="delete_email" class="btn-remove" title="<?php echo $this->escapeJsQuote(__('Remove Email')) ?>"><?php echo $this->escapeJsQuote(__('Remove Email')) ?>"</a>
- </p>
- <div class="field">
- <label for="recipients-name${_index_}" class="required"><em>*</em> <?php echo __('Name:')?></label>
- <div class="input-box">
- <input name="recipients[name][${_index_}]" type="text" title="<?php echo __('Name:')?>" class="input-text" id="recipients-name${_index_}" data-validate="{required:true}"/>
+ <a href="delete_email" id="btn-remove${_index_}" class="action delete"
+ title="<?php echo $this->escapeJsQuote(__('Remove Email')) ?>"><span><?php echo $this->escapeJsQuote(__('Remove Email')) ?></span></a>
+
+ <div class="field name required">
+ <label for="recipients-name${_index_}" class="label"><span><?php echo __('Name:')?></span></label>
+ <div class="control">
+ <input name="recipients[name][${_index_}]" type="text" title="<?php echo __('Name:') ?>" class="input-text"
+ id="recipients-name${_index_}" data-validate="{required:true}"/>
</div>
</div>
- <div class="field">
- <label for="recipients-email${_index_}" class="required"><em>*</em> <?php echo __('Email Address:') ?></label>
- <div class="input-box">
- <input name="recipients[email][${_index_}]" title="<?php echo __('Email Address:') ?>" id="recipients-email${_index_}" type="text" class="input-text" data-validate="{required:true, 'validate-email':true}"/>
+
+ <div class="field email required">
+ <label for="recipients-email${_index_}" class="label"><span><?php echo __('Email Address:') ?></span></label>
+ <div class="control">
+ <input name="recipients[email][${_index_}]" title="<?php echo __('Email Address:') ?>"
+ id="recipients-email${_index_}" type="text" class="input-text"
+ data-validate="{required:true, 'validate-email':true}"/>
</div>
</div>
</script>
-<div class="send-friend">
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
- <div class="page-title">
- <h1><?php echo __('Email to a Friend') ?></h1>
- </div>
- <form action="<?php echo $this->getSendUrl() ?>" method="post" id="product-sendtofriend-form">
- <div class="fieldset">
- <?php echo $this->getBlockHtml('formkey')?>
- <h2 class="legend"><?php echo __('Sender:') ?></h2>
- <ul class="form-list" id="sender_options">
- <li class="fields">
- <div class="field">
- <label for="sender-name" class="required"><em>*</em><?php echo __('Name:') ?></label>
- <div class="input-box">
- <input name="sender[name]" value="<?php echo $this->escapeHtml($this->getUserName()) ?>" title="<?php echo __('Name') ?>" id="sender-name" type="text" class="input-text" data-validate="{required:true}"/>
- </div>
- </div>
- <div class="field">
- <label for="sender-email" class="required"><em>*</em><?php echo __('Email:') ?></label>
- <div class="input-box">
- <input name="sender[email]" value="<?php echo $this->escapeHtml($this->getEmail()) ?>" title="<?php echo __('Email Address') ?>" id="sender-email" type="text" class="input-text" data-validate="{required:true, 'validate-email':true}"/>
- </div>
- </div>
- </li>
- <li class="wide">
- <label for="sender-message" class="required"><em>*</em><?php echo __('Message:') ?></label>
- <div class="input-box">
- <textarea name="sender[message]" class="input-text" id="sender-message" cols="3" rows="3" data-validate="{required:true}"><?php echo $this->escapeHtml($this->getMessage())?></textarea>
- </div>
- </li>
- </ul>
+
+<form action="<?php echo $this->getSendUrl() ?>" method="post" id="product-sendtofriend-form" class="form send friend" data-hasRequired="<?php echo __('* Required Fields') ?>">
+ <fieldset class="fieldset sender" id="sender_options">
+ <?php echo $this->getBlockHtml('formkey')?>
+ <legend class="legend"><span><?php echo __('Sender:') ?></span></legend>
+ <br>
+ <div class="field sender required">
+ <label for="sender-name" class="label"><span><?php echo __('Name:') ?></span></label>
+ <div class="control">
+ <input name="sender[name]" value="<?php echo $this->escapeHtml($this->getUserName()) ?>"
+ title="<?php echo __('Name') ?>" id="sender-name" type="text" class="input-text"
+ data-validate="{required:true}"/>
+ </div>
+ </div>
+
+ <div class="field email required">
+ <label for="sender-email" class="label"><span><?php echo __('Email:') ?></span></label>
+ <div class="control">
+ <input name="sender[email]" value="<?php echo $this->escapeHtml($this->getEmail()) ?>"
+ title="<?php echo __('Email Address') ?>" id="sender-email" type="text" class="input-text"
+ data-validate="{required:true, 'validate-email':true}"/>
+ </div>
</div>
- <div class="fieldset">
- <h2 class="legend"><?php echo __('Recipient:') ?></h2>
- <ul class="form-list" id="recipients-options">
- <li class="no-display"> </li>
- </ul>
+
+ <div class="field text required">
+ <label for="sender-message" class="label"><span><?php echo __('Message:') ?></span></label>
+ <div class="control">
+ <textarea name="sender[message]" class="input-text" id="sender-message" cols="3" rows="3"
+ data-validate="{required:true}"><?php echo $this->escapeHtml($this->getMessage()) ?></textarea>
+ </div>
</div>
- <div class="buttons-set">
- <p class="back-link"><a href="#" role="back"><small>« </small><?php echo __('Back') ?></a></p>
- <button type="submit" class="button<?php if (!$this->canSend()):?> disabled<?php endif ?>"<?php if (!$this->canSend()):?> disabled="disabled"<?php endif ?>><span><span><?php echo __('Send Email') ?></span></span></button>
- <div id="max-recipient-message" style="display:none;">
+ </fieldset>
+
+ <fieldset class="fieldset recipients" id="recipients-options">
+ <?php echo $this->getBlockHtml('formkey')?>
+ <legend class="legend"><span><?php echo __('Recipient:') ?></span></legend><br />
+ </fieldset>
+ <div class="actions">
+ <div class="primary">
+ <button type="submit"
+ class="action submit"<?php if (!$this->canSend()): ?> disabled="disabled"<?php endif ?>>
+ <span><?php echo __('Send Email') ?></span></button>
+ <div id="max-recipient-message" style="display: none;" class="message notice limit">
<?php if ($this->getMaxRecipients()): ?>
- <p class="limit"><?php echo __('Maximum %1 email addresses allowed', $this->getMaxRecipients()) ?></p>
+ <span><?php echo __('Maximum %1 email addresses allowed.', $this->getMaxRecipients()) ?></span>
<?php endif; ?>
</div>
<?php if (1 < $this->getMaxRecipients()): ?>
- <p>
- <button type="button" id="add-recipient-button" class="button"><span><span><?php echo __('Add Recipient') ?></span></span></button>
- </p>
+ <button type="button" id="add-recipient-button" class="action add">
+ <span><?php echo __('Add Recipient') ?></span></button>
<?php endif; ?>
</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')?>",
- "<?php echo $this->getViewFileUrl('Magento_Page::js/row-builder.js')?>", function() {
- $('#product-sendtofriend-form').rowBuilder({
- rowTemplate: '#add-recipient-tmpl',
- rowContainer: '#recipients-options',
- maxRows: '<?php echo $this->getMaxRecipients() ?>',
- maxRowsMsg: '#max-recipient-message',
- addRowBtn: '#add-recipient-button',
- additionalRowClass: 'additional-row'
- }).validation();
- $('p.back-link a[role="back"]').on('click', function() { history.back(); return false; });
- })
- })(jQuery);
- </script>
-</div>
+ <div class="secondary">
+ <a class="action back" href="#" role="back"><span><?php echo __('Back') ?></span></a>
+ </div>
+ </div>
+</form>
+<script type="text/javascript">
+ //<![CDATA[
+ (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')?>",
+ "<?php echo $this->getViewFileUrl('Magento_Page::js/row-builder.js')?>", function() {
+ $('#product-sendtofriend-form').rowBuilder({
+ rowTemplate: '#add-recipient-tmpl',
+ rowContainer: '#recipients-options',
+ rowParentElem: '<div></div>',
+ btnRemoveSelector: '.action.delete',
+ maxRows: '<?php echo $this->getMaxRecipients() ?>',
+ maxRowsMsg: '#max-recipient-message',
+ addRowBtn: '#add-recipient-button',
+ additionalRowClass: 'additional'
+ }).validation();
+ $('a[role="back"]').on('click', function() { history.back(); return false; });
+ })
+ })(jQuery);
+ //]]>
+</script>
diff --git a/app/code/Magento/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php b/app/code/Magento/Shipping/Block/Adminhtml/Carrier/Tablerate/Grid.php
similarity index 94%
rename from app/code/Magento/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php
rename to app/code/Magento/Shipping/Block/Adminhtml/Carrier/Tablerate/Grid.php
index 6798661931b..be1c1dda571 100644
--- a/app/code/Magento/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Carrier/Tablerate/Grid.php
@@ -19,7 +19,7 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Shipping
* @copyright Copyright (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 @@
* WARNING: This grid used for export table rates
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Shipping
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Shipping\Carrier\Tablerate;
+namespace Magento\Shipping\Block\Adminhtml\Carrier\Tablerate;
class Grid extends \Magento\Adminhtml\Block\Widget\Grid
{
@@ -97,7 +97,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
* Set current website
*
* @param int $websiteId
- * @return \Magento\Adminhtml\Block\Shipping\Carrier\Tablerate\Grid
+ * @return \Magento\Shipping\Block\Adminhtml\Carrier\Tablerate\Grid
*/
public function setWebsiteId($websiteId)
{
@@ -122,7 +122,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
* Set current website
*
* @param int $websiteId
- * @return \Magento\Adminhtml\Block\Shipping\Carrier\Tablerate\Grid
+ * @return \Magento\Shipping\Block\Adminhtml\Carrier\Tablerate\Grid
*/
public function setConditionName($name)
{
@@ -143,7 +143,7 @@ class Grid extends \Magento\Adminhtml\Block\Widget\Grid
/**
* Prepare shipping table rate collection
*
- * @return \Magento\Adminhtml\Block\Shipping\Carrier\Tablerate\Grid
+ * @return \Magento\Shipping\Block\Adminhtml\Carrier\Tablerate\Grid
*/
protected function _prepareCollection()
{
diff --git a/app/code/Magento/Shipping/Model/Shipping.php b/app/code/Magento/Shipping/Model/Shipping.php
index 4fec3925601..d88c2d0b6be 100644
--- a/app/code/Magento/Shipping/Model/Shipping.php
+++ b/app/code/Magento/Shipping/Model/Shipping.php
@@ -77,11 +77,6 @@ class Shipping
*/
protected $_shippingConfig;
- /**
- * @var \Magento\Backend\Model\Auth\Session
- */
- protected $_authSession;
-
/**
* @var \Magento\Shipping\Model\Carrier\Factory
*/
@@ -111,7 +106,6 @@ class Shipping
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
* @param \Magento\Shipping\Model\Config $shippingConfig
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Backend\Model\Auth\Session $authSession
* @param \Magento\Shipping\Model\Carrier\Factory $carrierFactory
* @param \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory
* @param \Magento\Shipping\Model\Rate\RequestFactory $rateRequestFactory
@@ -122,7 +116,6 @@ class Shipping
\Magento\Core\Model\Store\Config $coreStoreConfig,
\Magento\Shipping\Model\Config $shippingConfig,
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Backend\Model\Auth\Session $authSession,
\Magento\Shipping\Model\Carrier\Factory $carrierFactory,
\Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory,
\Magento\Shipping\Model\Rate\RequestFactory $rateRequestFactory,
@@ -132,7 +125,6 @@ class Shipping
$this->_coreStoreConfig = $coreStoreConfig;
$this->_shippingConfig = $shippingConfig;
$this->_storeManager = $storeManager;
- $this->_authSession = $authSession;
$this->_carrierFactory = $carrierFactory;
$this->_rateResultFactory = $rateResultFactory;
$this->_rateRequestFactory = $rateRequestFactory;
@@ -499,83 +491,4 @@ class Shipping
return $this->_carrierFactory->create($carrierCode, $storeId);
}
-
- /**
- * Prepare and do request to shipment
- *
- * @param \Magento\Sales\Model\Order\Shipment $orderShipment
- * @return \Magento\Object
- * @throws \Magento\Core\Exception
- */
- public function requestToShipment(\Magento\Sales\Model\Order\Shipment $orderShipment)
- {
- $admin = $this->_authSession->getUser();
- $order = $orderShipment->getOrder();
- $address = $order->getShippingAddress();
- $shippingMethod = $order->getShippingMethod(true);
- $shipmentStoreId = $orderShipment->getStoreId();
- $shipmentCarrier = $order->getShippingCarrier();
- $baseCurrencyCode = $this->_storeManager->getStore($shipmentStoreId)->getBaseCurrencyCode();
- if (!$shipmentCarrier) {
- throw new \Magento\Core\Exception('Invalid carrier: ' . $shippingMethod->getCarrierCode());
- }
- $shipperRegionCode = $this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_REGION_ID, $shipmentStoreId);
- if (is_numeric($shipperRegionCode)) {
- $shipperRegionCode = $this->_regionFactory->create()->load($shipperRegionCode)->getCode();
- }
-
- $recipientRegionCode = $this->_regionFactory->create()->load($address->getRegionId())->getCode();
-
- $originStreet1 = $this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_ADDRESS1, $shipmentStoreId);
- $originStreet2 = $this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_ADDRESS2, $shipmentStoreId);
- $storeInfo = new \Magento\Object($this->_coreStoreConfig->getConfig('general/store_information', $shipmentStoreId));
-
- if (!$admin->getFirstname() || !$admin->getLastname() || !$storeInfo->getName() || !$storeInfo->getPhone()
- || !$originStreet1 || !$this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_CITY, $shipmentStoreId)
- || !$shipperRegionCode || !$this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_ZIP, $shipmentStoreId)
- || !$this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_COUNTRY_ID, $shipmentStoreId)
- ) {
- throw new \Magento\Core\Exception(
- __('We don\'t have enough information to create shipping labels. Please make sure your store information and settings are complete.')
- );
- }
-
- /** @var $request \Magento\Shipping\Model\Shipment\Request */
- $request = $this->_rateRequestFactory->create();
- $request->setOrderShipment($orderShipment);
- $request->setShipperContactPersonName($admin->getName());
- $request->setShipperContactPersonFirstName($admin->getFirstname());
- $request->setShipperContactPersonLastName($admin->getLastname());
- $request->setShipperContactCompanyName($storeInfo->getName());
- $request->setShipperContactPhoneNumber($storeInfo->getPhone());
- $request->setShipperEmail($admin->getEmail());
- $request->setShipperAddressStreet(trim($originStreet1 . ' ' . $originStreet2));
- $request->setShipperAddressStreet1($originStreet1);
- $request->setShipperAddressStreet2($originStreet2);
- $request->setShipperAddressCity($this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_CITY, $shipmentStoreId));
- $request->setShipperAddressStateOrProvinceCode($shipperRegionCode);
- $request->setShipperAddressPostalCode($this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_ZIP, $shipmentStoreId));
- $request->setShipperAddressCountryCode($this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_COUNTRY_ID, $shipmentStoreId));
- $request->setRecipientContactPersonName(trim($address->getFirstname() . ' ' . $address->getLastname()));
- $request->setRecipientContactPersonFirstName($address->getFirstname());
- $request->setRecipientContactPersonLastName($address->getLastname());
- $request->setRecipientContactCompanyName($address->getCompany());
- $request->setRecipientContactPhoneNumber($address->getTelephone());
- $request->setRecipientEmail($address->getEmail());
- $request->setRecipientAddressStreet(trim($address->getStreet1() . ' ' . $address->getStreet2()));
- $request->setRecipientAddressStreet1($address->getStreet1());
- $request->setRecipientAddressStreet2($address->getStreet2());
- $request->setRecipientAddressCity($address->getCity());
- $request->setRecipientAddressStateOrProvinceCode($address->getRegionCode());
- $request->setRecipientAddressRegionCode($recipientRegionCode);
- $request->setRecipientAddressPostalCode($address->getPostcode());
- $request->setRecipientAddressCountryCode($address->getCountryId());
- $request->setShippingMethod($shippingMethod->getMethod());
- $request->setPackageWeight($order->getWeight());
- $request->setPackages($orderShipment->getPackages());
- $request->setBaseCurrencyCode($baseCurrencyCode);
- $request->setStoreId($shipmentStoreId);
-
- return $shipmentCarrier->requestToShipment($request);
- }
}
diff --git a/app/code/Magento/Shipping/Model/Shipping/Labels.php b/app/code/Magento/Shipping/Model/Shipping/Labels.php
new file mode 100644
index 00000000000..61f6c4e9728
--- /dev/null
+++ b/app/code/Magento/Shipping/Model/Shipping/Labels.php
@@ -0,0 +1,153 @@
+<?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_Shipping
+ * @copyright Copyright (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\Shipping\Model\Shipping;
+
+/**
+ * Shipping labels model
+ */
+class Labels extends \Magento\Shipping\Model\Shipping
+{
+ /**
+ * @var \Magento\Backend\Model\Auth\Session
+ */
+ protected $_authSession;
+
+ /**
+ * @param \Magento\Core\Model\Store\Config $coreStoreConfig
+ * @param \Magento\Shipping\Model\Config $shippingConfig
+ * @param \Magento\Core\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Backend\Model\Auth\Session $authSession
+ * @param \Magento\Shipping\Model\Carrier\Factory $carrierFactory
+ * @param \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory
+ * @param \Magento\Shipping\Model\Rate\RequestFactory $rateRequestFactory
+ * @param \Magento\Directory\Model\RegionFactory $regionFactory
+ * @param \Magento\Math\Division $mathDivision
+ */
+ public function __construct(
+ \Magento\Core\Model\Store\Config $coreStoreConfig,
+ \Magento\Shipping\Model\Config $shippingConfig,
+ \Magento\Core\Model\StoreManagerInterface $storeManager,
+ \Magento\Backend\Model\Auth\Session $authSession,
+ \Magento\Shipping\Model\Carrier\Factory $carrierFactory,
+ \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory,
+ \Magento\Shipping\Model\Rate\RequestFactory $rateRequestFactory,
+ \Magento\Directory\Model\RegionFactory $regionFactory,
+ \Magento\Math\Division $mathDivision
+ ) {
+ $this->_authSession = $authSession;
+ parent::__construct(
+ $coreStoreConfig,
+ $shippingConfig,
+ $storeManager,
+ $carrierFactory,
+ $rateResultFactory,
+ $rateRequestFactory,
+ $regionFactory,
+ $mathDivision
+ );
+ }
+
+ /**
+ * Prepare and do request to shipment
+ *
+ * @param \Magento\Sales\Model\Order\Shipment $orderShipment
+ * @return \Magento\Object
+ * @throws \Magento\Core\Exception
+ */
+ public function requestToShipment(\Magento\Sales\Model\Order\Shipment $orderShipment)
+ {
+ $admin = $this->_authSession->getUser();
+ $order = $orderShipment->getOrder();
+ $address = $order->getShippingAddress();
+ $shippingMethod = $order->getShippingMethod(true);
+ $shipmentStoreId = $orderShipment->getStoreId();
+ $shipmentCarrier = $order->getShippingCarrier();
+ $baseCurrencyCode = $this->_storeManager->getStore($shipmentStoreId)->getBaseCurrencyCode();
+ if (!$shipmentCarrier) {
+ throw new \Magento\Core\Exception('Invalid carrier: ' . $shippingMethod->getCarrierCode());
+ }
+ $shipperRegionCode = $this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_REGION_ID, $shipmentStoreId);
+ if (is_numeric($shipperRegionCode)) {
+ $shipperRegionCode = $this->_regionFactory->create()->load($shipperRegionCode)->getCode();
+ }
+
+ $recipientRegionCode = $this->_regionFactory->create()->load($address->getRegionId())->getCode();
+
+ $originStreet1 = $this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_ADDRESS1, $shipmentStoreId);
+ $originStreet2 = $this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_ADDRESS2, $shipmentStoreId);
+ $storeInfo = new \Magento\Object($this->_coreStoreConfig->getConfig('general/store_information', $shipmentStoreId));
+
+ if (!$admin->getFirstname() || !$admin->getLastname() || !$storeInfo->getName() || !$storeInfo->getPhone()
+ || !$originStreet1 || !$this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_CITY, $shipmentStoreId)
+ || !$shipperRegionCode || !$this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_ZIP, $shipmentStoreId)
+ || !$this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_COUNTRY_ID, $shipmentStoreId)
+ ) {
+ throw new \Magento\Core\Exception(
+ __('We don\'t have enough information to create shipping labels. Please make sure your store information and settings are complete.')
+ );
+ }
+
+ /** @var $request \Magento\Shipping\Model\Shipment\Request */
+ $request = $this->_rateRequestFactory->create();
+ $request->setOrderShipment($orderShipment);
+ $request->setShipperContactPersonName($admin->getName());
+ $request->setShipperContactPersonFirstName($admin->getFirstname());
+ $request->setShipperContactPersonLastName($admin->getLastname());
+ $request->setShipperContactCompanyName($storeInfo->getName());
+ $request->setShipperContactPhoneNumber($storeInfo->getPhone());
+ $request->setShipperEmail($admin->getEmail());
+ $request->setShipperAddressStreet(trim($originStreet1 . ' ' . $originStreet2));
+ $request->setShipperAddressStreet1($originStreet1);
+ $request->setShipperAddressStreet2($originStreet2);
+ $request->setShipperAddressCity($this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_CITY, $shipmentStoreId));
+ $request->setShipperAddressStateOrProvinceCode($shipperRegionCode);
+ $request->setShipperAddressPostalCode($this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_ZIP, $shipmentStoreId));
+ $request->setShipperAddressCountryCode($this->_coreStoreConfig->getConfig(self::XML_PATH_STORE_COUNTRY_ID, $shipmentStoreId));
+ $request->setRecipientContactPersonName(trim($address->getFirstname() . ' ' . $address->getLastname()));
+ $request->setRecipientContactPersonFirstName($address->getFirstname());
+ $request->setRecipientContactPersonLastName($address->getLastname());
+ $request->setRecipientContactCompanyName($address->getCompany());
+ $request->setRecipientContactPhoneNumber($address->getTelephone());
+ $request->setRecipientEmail($address->getEmail());
+ $request->setRecipientAddressStreet(trim($address->getStreet1() . ' ' . $address->getStreet2()));
+ $request->setRecipientAddressStreet1($address->getStreet1());
+ $request->setRecipientAddressStreet2($address->getStreet2());
+ $request->setRecipientAddressCity($address->getCity());
+ $request->setRecipientAddressStateOrProvinceCode($address->getRegionCode());
+ $request->setRecipientAddressRegionCode($recipientRegionCode);
+ $request->setRecipientAddressPostalCode($address->getPostcode());
+ $request->setRecipientAddressCountryCode($address->getCountryId());
+ $request->setShippingMethod($shippingMethod->getMethod());
+ $request->setPackageWeight($order->getWeight());
+ $request->setPackages($orderShipment->getPackages());
+ $request->setBaseCurrencyCode($baseCurrencyCode);
+ $request->setStoreId($shipmentStoreId);
+
+ return $shipmentCarrier->requestToShipment($request);
+ }
+}
diff --git a/app/design/adminhtml/magento_basic/theme.xml b/app/code/Magento/Shipping/etc/adminhtml/di.xml
similarity index 84%
rename from app/design/adminhtml/magento_basic/theme.xml
rename to app/code/Magento/Shipping/etc/adminhtml/di.xml
index da74ec55b06..ee26b6a78ce 100644
--- a/app/design/adminhtml/magento_basic/theme.xml
+++ b/app/code/Magento/Shipping/etc/adminhtml/di.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
/**
* Magento
@@ -19,12 +20,11 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Design
+ * @package Magento_Shipping
* @copyright Copyright (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 Basic</title>
- <version>2.0.0.0</version>
-</theme>
+<config>
+ <preference for="Magento\Shipping\Model\Shipping" type="Magento\Shipping\Model\Shipping\Labels" />
+</config>
diff --git a/app/code/Magento/Adminhtml/Block/Sitemap/Edit.php b/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php
similarity index 95%
rename from app/code/Magento/Adminhtml/Block/Sitemap/Edit.php
rename to app/code/Magento/Sitemap/Block/Adminhtml/Edit.php
index c9d79209247..88be189127e 100644
--- a/app/code/Magento/Adminhtml/Block/Sitemap/Edit.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php
@@ -31,7 +31,7 @@
* @package Magento_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sitemap;
+namespace Magento\Sitemap\Block\Adminhtml;
class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
{
@@ -64,7 +64,8 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
protected function _construct()
{
$this->_objectId = 'sitemap_id';
- $this->_controller = 'sitemap';
+ $this->_controller = 'adminhtml';
+ $this->_blockGroup = 'Magento_Sitemap';
parent::_construct();
diff --git a/app/code/Magento/Adminhtml/Block/Sitemap/Edit/Form.php b/app/code/Magento/Sitemap/Block/Adminhtml/Edit/Form.php
similarity index 98%
rename from app/code/Magento/Adminhtml/Block/Sitemap/Edit/Form.php
rename to app/code/Magento/Sitemap/Block/Adminhtml/Edit/Form.php
index 5122754073d..d79872cb9ba 100644
--- a/app/code/Magento/Adminhtml/Block/Sitemap/Edit/Form.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Edit/Form.php
@@ -31,7 +31,7 @@
* @package Magento_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\Adminhtml\Block\Sitemap\Edit;
+namespace Magento\Sitemap\Block\Adminhtml\Edit;
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
diff --git a/app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Action.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php
rename to app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Action.php
index 754750d651e..a1e4ad55a8b 100644
--- a/app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Action.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Action.php
@@ -30,7 +30,7 @@
* @category Magento
* @package Magento_Sitemap
*/
-namespace Magento\Adminhtml\Block\Sitemap\Grid\Renderer;
+namespace Magento\Sitemap\Block\Adminhtml\Grid\Renderer;
class Action extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\Action
{
diff --git a/app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
similarity index 97%
rename from app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php
rename to app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
index 3baf481abd6..b6bdada067f 100644
--- a/app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
@@ -30,7 +30,7 @@
* @category Magento
* @package Magento_Sitemap
*/
-namespace Magento\Adminhtml\Block\Sitemap\Grid\Renderer;
+namespace Magento\Sitemap\Block\Adminhtml\Grid\Renderer;
class Link extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer
{
diff --git a/app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Time.php
similarity index 96%
rename from app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php
rename to app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Time.php
index 414d0bc23c7..afbb63daa66 100644
--- a/app/code/Magento/Adminhtml/Block/Sitemap/Grid/Renderer/Time.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Time.php
@@ -30,7 +30,7 @@
* @category Magento
* @package Magento_Sitemap
*/
-namespace Magento\Adminhtml\Block\Sitemap\Grid\Renderer;
+namespace Magento\Sitemap\Block\Adminhtml\Grid\Renderer;
class Time extends \Magento\Adminhtml\Block\Widget\Grid\Column\Renderer\AbstractRenderer
{
diff --git a/app/code/Magento/Adminhtml/Block/Sitemap.php b/app/code/Magento/Sitemap/Block/Adminhtml/Sitemap.php
similarity index 90%
rename from app/code/Magento/Adminhtml/Block/Sitemap.php
rename to app/code/Magento/Sitemap/Block/Adminhtml/Sitemap.php
index 36be7601ca5..4343064b579 100644
--- a/app/code/Magento/Adminhtml/Block/Sitemap.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Sitemap.php
@@ -30,7 +30,7 @@
* @category Magento
* @package Magento_Sitemap
*/
-namespace Magento\Adminhtml\Block;
+namespace Magento\Sitemap\Block\Adminhtml;
class Sitemap extends \Magento\Adminhtml\Block\Widget\Grid\Container
{
@@ -40,7 +40,8 @@ class Sitemap extends \Magento\Adminhtml\Block\Widget\Grid\Container
*/
protected function _construct()
{
- $this->_controller = 'sitemap';
+ $this->_controller = 'adminhtml_sitemap';
+ $this->_blockGroup = 'Magento_Sitemap';
$this->_headerText = __('XML Sitemap');
$this->_addButtonLabel = __('Add Sitemap');
parent::_construct();
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap.php
index faf3fc14353..e3e67a4baf5 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap.php
@@ -131,7 +131,7 @@ class Sitemap extends \Magento\Backend\App\Action
$id ? __('Edit Sitemap') : __('New Sitemap'),
$id ? __('Edit Sitemap') : __('New Sitemap')
)
- ->_addContent($this->_view->getLayout()->createBlock('Magento\Adminhtml\Block\Sitemap\Edit'));
+ ->_addContent($this->_view->getLayout()->createBlock('Magento\Sitemap\Block\Adminhtml\Edit'));
$this->_view->renderLayout();
}
diff --git a/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php b/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php
index 184f77343be..e7b3c4cfad2 100644
--- a/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php
+++ b/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php
@@ -188,7 +188,8 @@ class Product extends \Magento\Core\Model\Resource\Db\AbstractDb
->joinLeft(
array('t1_' . $attributeCode => $attribute['table']),
'e.entity_id = t1_' . $attributeCode . '.entity_id AND '
- . $adapter->quoteInto(' t1_' . $attributeCode . '.store_id = ?', \Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+ . $adapter->quoteInto(' t1_' . $attributeCode . '.store_id = ?',
+ \Magento\Core\Model\Store::DEFAULT_STORE_ID)
. $adapter->quoteInto(' AND t1_'.$attributeCode . '.attribute_id = ?', $attribute['attribute_id']),
array());
diff --git a/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index.xml b/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index.xml
index 3c8548e8360..6a507c454aa 100644
--- a/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index.xml
+++ b/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index.xml
@@ -26,6 +26,6 @@
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<update handle="adminhtml_sitemap_index_grid_block"/>
<referenceContainer name="content">
- <block class="Magento\Adminhtml\Block\Sitemap" name="adminhtml.sitemap.container"/>
+ <block class="Magento\Sitemap\Block\Adminhtml\Sitemap" name="adminhtml.sitemap.container"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index_grid_block.xml b/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index_grid_block.xml
index 572fedd35a0..58d47266c97 100644
--- a/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index_grid_block.xml
+++ b/app/code/Magento/Sitemap/view/adminhtml/layout/adminhtml_sitemap_index_grid_block.xml
@@ -63,7 +63,7 @@
<block class="Magento\Backend\Block\Widget\Grid\Column" as="link">
<arguments>
<argument name="header" xsi:type="string" translate="true">Link for Google</argument>
- <argument name="renderer" xsi:type="string">Magento\Adminhtml\Block\Sitemap\Grid\Renderer\Link</argument>
+ <argument name="renderer" xsi:type="string">Magento\Sitemap\Block\Adminhtml\Grid\Renderer\Link</argument>
</arguments>
</block>
<block class="Magento\Backend\Block\Widget\Grid\Column" as="sitemap_time">
@@ -89,7 +89,7 @@
<argument name="filter" xsi:type="string">0</argument>
<argument name="sortable" xsi:type="string">0</argument>
<argument name="width" xsi:type="string">100px</argument>
- <argument name="renderer" xsi:type="string">Magento\Adminhtml\Block\Sitemap\Grid\Renderer\Action</argument>
+ <argument name="renderer" xsi:type="string">Magento\Sitemap\Block\Adminhtml\Grid\Renderer\Action</argument>
</arguments>
</block>
</block>
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
index 8452d1ca86a..18e8d64a529 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
@@ -34,7 +34,7 @@
namespace Magento\Tax\Block\Adminhtml\Rate\Toolbar;
-class Add extends \Magento\Adminhtml\Block\Template
+class Add extends \Magento\Backend\Block\Template
{
protected $_template = 'toolbar/rate/add.phtml';
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
index 6183d11988b..84c6b308e49 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
@@ -34,7 +34,7 @@
namespace Magento\Tax\Block\Adminhtml\Rate\Toolbar;
-class Save extends \Magento\Adminhtml\Block\Template
+class Save extends \Magento\Backend\Block\Template
{
protected $_template = 'toolbar/rate/save.phtml';
diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index cc4dd9bb924..ffb56b0c1e8 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -714,7 +714,7 @@ class Data extends \Magento\App\Helper\AbstractHelper
$$rateVariable = '';
foreach ($$rateArray as $classId => $rate) {
if ($rate) {
- $$rateVariable .= sprintf("WHEN %d THEN %12.4f ", $classId, $rate/100);
+ $$rateVariable .= sprintf("WHEN %d THEN %12.4F ", $classId, $rate / 100);
}
}
if ($$rateVariable) {
@@ -829,7 +829,7 @@ class Data extends \Magento\App\Helper\AbstractHelper
* @param null|int|string|\Magento\Core\Model\Store $store
* @return string
*/
- public function getCalculationSequence($store=null)
+ public function getCalculationSequence($store = null)
{
return $this->_config->getCalculationSequence($store);
}
@@ -840,7 +840,7 @@ class Data extends \Magento\App\Helper\AbstractHelper
* @param null|int $store
* @return string
*/
- public function getCalculationAgorithm($store=null)
+ public function getCalculationAgorithm($store = null)
{
return $this->_config->getAlgorithm($store);
}
diff --git a/app/code/Magento/Tax/Model/Calculation.php b/app/code/Magento/Tax/Model/Calculation.php
index f786d9076af..fa8d1755eb7 100644
--- a/app/code/Magento/Tax/Model/Calculation.php
+++ b/app/code/Magento/Tax/Model/Calculation.php
@@ -24,11 +24,11 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Tax\Model;
+
/**
* Tax Calculation Model
*/
-namespace Magento\Tax\Model;
-
class Calculation extends \Magento\Core\Model\AbstractModel
{
const CALC_TAX_BEFORE_DISCOUNT_ON_EXCL = '0_0';
@@ -245,7 +245,7 @@ class Calculation extends \Magento\Core\Model\AbstractModel
$value = $this->getRateValue();
$id = $this->getRateId();
- $rate = array('code'=>$title, 'title'=>$title, 'percent'=>$value, 'position'=>1, 'priority'=>1);
+ $rate = array('code' => $title, 'title' => $title, 'percent' => $value, 'position' => 1, 'priority' => 1);
$process = array();
$process['percent'] = $value;
@@ -295,7 +295,7 @@ class Calculation extends \Magento\Core\Model\AbstractModel
protected function _getRequestCacheKey($request)
{
$key = $request->getStore() ? $request->getStore()->getId() . '|' : '';
- $key.= $request->getProductClassId() . '|' . $request->getCustomerClassId() . '|'
+ $key .= $request->getProductClassId() . '|' . $request->getCustomerClassId() . '|'
. $request->getCountryId() . '|'. $request->getRegionId() . '|' . $request->getPostcode();
return $key;
}
@@ -309,7 +309,7 @@ class Calculation extends \Magento\Core\Model\AbstractModel
* @param null|string|bool|int|\Magento\Core\Model\Store $store
* @return float
*/
- public function getStoreRate($request, $store=null)
+ public function getStoreRate($request, $store = null)
{
$storeRequest = $this->getRateOriginRequest($store)
->setProductClassId($request->getProductClassId());
@@ -325,9 +325,18 @@ class Calculation extends \Magento\Core\Model\AbstractModel
public function getRateOriginRequest($store = null)
{
$request = new \Magento\Object();
- $request->setCountryId($this->_coreStoreConfig->getConfig(\Magento\Shipping\Model\Config::XML_PATH_ORIGIN_COUNTRY_ID, $store))
- ->setRegionId($this->_coreStoreConfig->getConfig(\Magento\Shipping\Model\Config::XML_PATH_ORIGIN_REGION_ID, $store))
- ->setPostcode($this->_coreStoreConfig->getConfig(\Magento\Shipping\Model\Config::XML_PATH_ORIGIN_POSTCODE, $store))
+ $request->setCountryId($this->_coreStoreConfig->getConfig(
+ \Magento\Shipping\Model\Config::XML_PATH_ORIGIN_COUNTRY_ID,
+ $store
+ ))
+ ->setRegionId($this->_coreStoreConfig->getConfig(
+ \Magento\Shipping\Model\Config::XML_PATH_ORIGIN_REGION_ID,
+ $store
+ ))
+ ->setPostcode($this->_coreStoreConfig->getConfig(
+ \Magento\Shipping\Model\Config::XML_PATH_ORIGIN_POSTCODE,
+ $store
+ ))
->setCustomerClassId($this->getDefaultCustomerTaxClass($store))
->setStore($store);
return $request;
@@ -335,6 +344,7 @@ class Calculation extends \Magento\Core\Model\AbstractModel
/**
* Get request object with information necessary for getting tax rate
+ *
* Request object contain:
* country_id (->getCountryId())
* region_id (->getRegionId())
@@ -376,7 +386,7 @@ class Calculation extends \Magento\Core\Model\AbstractModel
if ($basedOn == 'billing' && $defBilling && $defBilling->getCountryId()) {
$billingAddress = $defBilling;
- } else if ($basedOn == 'shipping' && $defShipping && $defShipping->getCountryId()) {
+ } elseif ($basedOn == 'shipping' && $defShipping && $defShipping->getCountryId()) {
$shippingAddress = $defShipping;
} else {
$basedOn = 'default';
@@ -402,7 +412,9 @@ class Calculation extends \Magento\Core\Model\AbstractModel
->setCountryId($this->_coreStoreConfig->getConfig(
\Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_COUNTRY,
$store))
- ->setRegionId($this->_coreStoreConfig->getConfig(\Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_REGION, $store))
+ ->setRegionId($this->_coreStoreConfig->getConfig(
+ \Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_REGION,
+ $store))
->setPostcode($this->_coreStoreConfig->getConfig(
\Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_POSTCODE,
$store));
@@ -505,6 +517,7 @@ class Calculation extends \Magento\Core\Model\AbstractModel
{
return $this->_getRates($request, 'product_class_id', \Magento\Tax\Model\ClassModel::TAX_CLASS_TYPE_PRODUCT);
}
+
public function getRatesForAllCustomerTaxClasses($request)
{
return $this->_getRates($request, 'customer_class_id', \Magento\Tax\Model\ClassModel::TAX_CLASS_TYPE_CUSTOMER);
@@ -552,7 +565,7 @@ class Calculation extends \Magento\Core\Model\AbstractModel
*/
public function calcTaxAmount($price, $taxRate, $priceIncludeTax = false, $round = true)
{
- $taxRate = $taxRate/100;
+ $taxRate = $taxRate / 100;
if ($priceIncludeTax) {
$amount = $price * (1 - 1 / (1 + $taxRate));
diff --git a/app/code/Magento/Tax/Model/Config.php b/app/code/Magento/Tax/Model/Config.php
index 6ad3732a3b2..828a4e7152b 100644
--- a/app/code/Magento/Tax/Model/Config.php
+++ b/app/code/Magento/Tax/Model/Config.php
@@ -25,7 +25,7 @@
*/
/**
- * Configuration pathes storage
+ * Configuration paths storage
*
* @category Magento
* @package Magento_Tax
@@ -267,7 +267,7 @@ class Config
}
/**
- * Check if shiping prices include tax
+ * Check if shipping prices include tax
*
* @param store $store
* @return bool
diff --git a/app/code/Magento/Tax/Model/Resource/Calculation.php b/app/code/Magento/Tax/Model/Resource/Calculation.php
index 1f5cd8bcd9b..d158480e2f5 100644
--- a/app/code/Magento/Tax/Model/Resource/Calculation.php
+++ b/app/code/Magento/Tax/Model/Resource/Calculation.php
@@ -100,7 +100,7 @@ class Calculation extends \Magento\Core\Model\Resource\Db\AbstractDb
}
/**
- * Retreive distinct calculation
+ * Retrieve distinct calculation
*
* @param string $field
* @param int $ruleId
diff --git a/app/code/Magento/Tax/Model/Resource/Report/Tax/Createdat.php b/app/code/Magento/Tax/Model/Resource/Report/Tax/Createdat.php
index 776915a011f..5550bb48e58 100644
--- a/app/code/Magento/Tax/Model/Resource/Report/Tax/Createdat.php
+++ b/app/code/Magento/Tax/Model/Resource/Report/Tax/Createdat.php
@@ -128,7 +128,7 @@ class Createdat extends \Magento\Reports\Model\Resource\Report\AbstractReport
$columns = array(
'period' => 'period',
- 'store_id' => new \Zend_Db_Expr(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID),
+ 'store_id' => new \Zend_Db_Expr(\Magento\Core\Model\Store::DEFAULT_STORE_ID),
'code' => 'code',
'order_status' => 'order_status',
'percent' => 'MAX(' . $writeAdapter->quoteIdentifier('percent') . ')',
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 30a0c7ec7ca..5ca7025b884 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
@@ -31,7 +31,7 @@ namespace Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content;
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class Uploader extends \Magento\Adminhtml\Block\Media\Uploader
+class Uploader extends \Magento\Backend\Block\Media\Uploader
{
/**
* Path to uploader template
@@ -43,7 +43,7 @@ class Uploader extends \Magento\Adminhtml\Block\Media\Uploader
/**
* Prepare layout
*
- * @return \Magento\Adminhtml\Block\Media\Uploader
+ * @return \Magento\Backend\Block\Media\Uploader
*/
protected function _prepareLayout()
{
diff --git a/app/code/Magento/Usa/Model/Shipping/Carrier/Dhl/International.php b/app/code/Magento/Usa/Model/Shipping/Carrier/Dhl/International.php
index 8dc452b343f..fd811e79562 100644
--- a/app/code/Magento/Usa/Model/Shipping/Carrier/Dhl/International.php
+++ b/app/code/Magento/Usa/Model/Shipping/Carrier/Dhl/International.php
@@ -1057,10 +1057,10 @@ class International
/**
* Add rate to DHL rates array
*
- * @param \Magento\Usa\Model\Simplexml\Element $shipmentDetails
+ * @param \SimpleXMLElement $shipmentDetails
* @return \Magento\Usa\Model\Shipping\Carrier\Dhl\International
*/
- protected function _addRate(\Magento\Usa\Model\Simplexml\Element $shipmentDetails)
+ protected function _addRate(\SimpleXMLElement $shipmentDetails)
{
if (isset($shipmentDetails->ProductShortName)
&& isset($shipmentDetails->ShippingCharge)
diff --git a/app/code/Magento/User/Helper/Data.php b/app/code/Magento/User/Helper/Data.php
index 8c8cb7a768f..e481111ec6c 100644
--- a/app/code/Magento/User/Helper/Data.php
+++ b/app/code/Magento/User/Helper/Data.php
@@ -42,9 +42,9 @@ class Data extends \Magento\App\Helper\AbstractHelper
= 'admin/emails/password_reset_link_expiration_period';
/**
- * @var \Magento\Core\Model\Config
+ * @var \Magento\Backend\App\ConfigInterface
*/
- protected $_coreConfig;
+ protected $_config;
/**
* @var \Magento\Math\Random
@@ -53,15 +53,15 @@ class Data extends \Magento\App\Helper\AbstractHelper
/**
* @param \Magento\App\Helper\Context $context
- * @param \Magento\Core\Model\Config $coreConfig
+ * @param \Magento\Backend\App\ConfigInterface $config
* @param \Magento\Math\Random $mathRandom
*/
public function __construct(
\Magento\App\Helper\Context $context,
- \Magento\Core\Model\Config $coreConfig,
+ \Magento\Backend\App\ConfigInterface $config,
\Magento\Math\Random $mathRandom
) {
- $this->_coreConfig = $coreConfig;
+ $this->_config = $config;
$this->mathRandom = $mathRandom;
parent::__construct($context);
}
@@ -83,9 +83,6 @@ class Data extends \Magento\App\Helper\AbstractHelper
*/
public function getResetPasswordLinkExpirationPeriod()
{
- return (int)$this->_coreConfig->getValue(
- self::XML_PATH_ADMIN_RESET_PASSWORD_LINK_EXPIRATION_PERIOD,
- 'default'
- );
+ return (int)$this->_config->getValue(self::XML_PATH_ADMIN_RESET_PASSWORD_LINK_EXPIRATION_PERIOD);
}
}
diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
index 74c6062aca7..b7ab9dd27a7 100644
--- a/app/code/Magento/User/Model/User.php
+++ b/app/code/Magento/User/Model/User.php
@@ -115,9 +115,9 @@ class User
/**
* Core store config
*
- * @var \Magento\Core\Model\Store\Config
+ * @var \Magento\Backend\App\ConfigInterface
*/
- protected $_coreStoreConfig;
+ protected $_config;
/**
* Factory for validator composite object
@@ -155,7 +155,7 @@ class User
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\User\Helper\Data $userData
* @param \Magento\Email\Model\Sender $sender
- * @param \Magento\Core\Model\Store\Config $coreStoreConfig
+ * @param \Magento\Backend\App\ConfigInterface $config
* @param \Magento\Validator\Composite\VarienObjectFactory $validatorCompositeFactory
* @param \Magento\User\Model\RoleFactory $roleFactory
* @param \Magento\Email\Model\InfoFactory $emailInfoFactory
@@ -173,7 +173,7 @@ class User
\Magento\Core\Model\Registry $registry,
\Magento\User\Helper\Data $userData,
\Magento\Email\Model\Sender $sender,
- \Magento\Core\Model\Store\Config $coreStoreConfig,
+ \Magento\Backend\App\ConfigInterface $config,
\Magento\Validator\Composite\VarienObjectFactory $validatorCompositeFactory,
\Magento\User\Model\RoleFactory $roleFactory,
\Magento\Email\Model\InfoFactory $emailInfoFactory,
@@ -189,7 +189,7 @@ class User
parent::__construct($context, $registry, $resource, $resourceCollection, $data);
$this->_userData = $userData;
$this->_sender = $sender;
- $this->_coreStoreConfig = $coreStoreConfig;
+ $this->_config = $config;
$this->_validatorComposite = $validatorCompositeFactory;
$this->_roleFactory = $roleFactory;
$this->_emailInfoFactory = $emailInfoFactory;
@@ -211,7 +211,7 @@ class User
'_eventManager',
'_sender',
'_userData',
- '_coreStoreConfig',
+ '_config',
'_validatorComposite',
'_roleFactory',
'_emailInfoFactory',
@@ -227,7 +227,7 @@ class User
$this->_eventManager = $objectManager->get('Magento\Event\ManagerInterface');
$this->_sender = $objectManager->get('Magento\Email\Model\Sender');
$this->_userData = $objectManager->get('Magento\User\Helper\Data');
- $this->_coreStoreConfig = $objectManager->get('Magento\Core\Model\Store\Config');
+ $this->_config = $objectManager->get('Magento\Backend\App\ConfigInterface');
$this->_coreRegistry = $objectManager->get('Magento\Core\Model\Registry');
$this->_validatorComposite = $objectManager->get('Magento\Validator\Composite\VarienObjectFactory');
$this->_roleFactory = $objectManager->get('Magento\User\Model\RoleFactory');
@@ -461,9 +461,9 @@ class User
$this->_mailer->addEmailInfo($emailInfo);
// Set all required params and send emails
- $this->_mailer->setSender($this->_coreStoreConfig->getConfig(self::XML_PATH_FORGOT_EMAIL_IDENTITY));
+ $this->_mailer->setSender($this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY));
$this->_mailer->setStoreId(0);
- $this->_mailer->setTemplateId($this->_coreStoreConfig->getConfig(self::XML_PATH_FORGOT_EMAIL_TEMPLATE));
+ $this->_mailer->setTemplateId($this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_TEMPLATE));
$this->_mailer->setTemplateParams(array(
'user' => $this
));
@@ -533,7 +533,7 @@ class User
*/
public function authenticate($username, $password)
{
- $config = $this->_coreStoreConfig->getConfigFlag('admin/security/use_case_sensitive_login');
+ $config = $this->_config->getFlag('admin/security/use_case_sensitive_login');
$result = false;
try {
diff --git a/app/code/Magento/Webhook/etc/module.xml b/app/code/Magento/Webhook/etc/module.xml
index d935fd4b674..dea459d8455 100755
--- a/app/code/Magento/Webhook/etc/module.xml
+++ b/app/code/Magento/Webhook/etc/module.xml
@@ -34,7 +34,6 @@
<module name="Magento_Webapi"/>
<module name="Magento_Backend"/>
<module name="Magento_Page"/>
- <module name="Magento_Adminhtml"/>
</depends>
</module>
</config>
diff --git a/app/code/Magento/Webhook/sql/webhook_setup/install-1.0.0.0.php b/app/code/Magento/Webhook/sql/webhook_setup/install-1.0.0.0.php
index 9f5df258990..5f261019d98 100644
--- a/app/code/Magento/Webhook/sql/webhook_setup/install-1.0.0.0.php
+++ b/app/code/Magento/Webhook/sql/webhook_setup/install-1.0.0.0.php
@@ -54,7 +54,7 @@ $subscriptionTable = $connection->newTable($this->getTable('webhook_subscription
array('nullable' => true,'default' => NULL,'unsigned' => true),
'Subscription Endpoint')
->addForeignKey(
- 'FK_WEBHOOK_SUBSCRIPTION_ENDPOINT_ID',
+ $this->getFkName('webhook_subscription', 'endpoint_id', 'outbound_endpoint', 'endpoint_id'),
'endpoint_id',
$this->getTable('outbound_endpoint'),
'endpoint_id',
@@ -92,7 +92,7 @@ $hookTable = $connection->newTable($this->getTable('webhook_subscription_hook'))
$this->getIdxName('webhook_subscription_hook', array('topic')),
array('topic'))
->addForeignKey(
- 'FK_WEBHOOK_SUBSCRIPTION_SUBSCRIPTION_ID',
+ $this->getFkName('webhook_subscription_hook', 'subscription_id', 'webhook_subscription', 'subscription_id'),
'subscription_id',
$this->getTable('webhook_subscription'),
'subscription_id',
@@ -159,7 +159,7 @@ $dispatchJobTable = $connection->newTable($this->getTable('webhook_dispatch_job'
array('default' => '0000-00-00 00:00:00', 'nullable' => false),
'Retry At')
->addForeignKey(
- 'FK_WEBHOOK_SERVICE_DISPATCHER_ID',
+ $this->getFkName('webhook_dispatch_job', 'subscription_id', 'webhook_subscription', 'subscription_id'),
'subscription_id',
$this->getTable('webhook_subscription'),
'subscription_id',
@@ -167,7 +167,7 @@ $dispatchJobTable = $connection->newTable($this->getTable('webhook_dispatch_job'
\Magento\DB\Ddl\Table::ACTION_CASCADE
)
->addForeignKey(
- 'FK_WEBHOOK_MESSAGE_DISPATCHER_ID',
+ $this->getFkName('webhook_dispatch_job', 'event_id', 'webhook_event', 'event_id'),
'event_id',
$this->getTable('webhook_event'),
'event_id',
diff --git a/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_activate.xml b/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_activate.xml
index 69d6df3232a..955fa494779 100644
--- a/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_activate.xml
+++ b/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_activate.xml
@@ -25,7 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<block class="Magento\Page\Block\Html" name="root" output="1" template="empty.phtml">
- <block class="Magento\Adminhtml\Block\Page\Head" name="head" as="head" template="page/head.phtml">
+ <block class="Magento\Backend\Block\Page\Head" name="head" as="head" template="page/head.phtml">
<block class="Magento\Page\Block\Html\Head\Css" name="mui-reset-css">
<arguments>
<argument name="file" xsi:type="string">mui/reset.css</argument>
diff --git a/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_failed.xml b/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_failed.xml
index 4374451c97d..9fe59844735 100644
--- a/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_failed.xml
+++ b/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_failed.xml
@@ -25,7 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<block class="Magento\Page\Block\Html" name="root" output="1" template="empty.phtml">
- <block class="Magento\Adminhtml\Block\Page\Head" name="head" as="head" template="page/head.phtml">
+ <block class="Magento\Backend\Block\Page\Head" name="head" as="head" template="page/head.phtml">
<block class="Magento\Page\Block\Html\Head\Css" name="mui-reset-css">
<arguments>
<argument name="file" xsi:type="string">mui/reset.css</argument>
diff --git a/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_succeeded.xml b/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_succeeded.xml
index 7243d45dbd9..6fc417e3d68 100644
--- a/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_succeeded.xml
+++ b/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_succeeded.xml
@@ -25,7 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<block class="Magento\Page\Block\Html" name="root" output="1" template="empty.phtml">
- <block class="Magento\Adminhtml\Block\Page\Head" name="head" as="head" template="page/head.phtml">
+ <block class="Magento\Backend\Block\Page\Head" name="head" as="head" template="page/head.phtml">
<block class="Magento\Page\Block\Html\Head\Css" name="mui-reset-css">
<arguments>
<argument name="file" xsi:type="string">mui/reset.css</argument>
diff --git a/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_user.xml b/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_user.xml
index 8768da57ef6..b97b78f07b8 100644
--- a/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_user.xml
+++ b/app/code/Magento/Webhook/view/adminhtml/layout/adminhtml_webhook_registration_user.xml
@@ -25,7 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<block class="Magento\Page\Block\Html" name="root" output="1" template="empty.phtml">
- <block class="Magento\Adminhtml\Block\Page\Head" name="head" as="head" template="page/head.phtml">
+ <block class="Magento\Backend\Block\Page\Head" name="head" as="head" template="page/head.phtml">
<block class="Magento\Page\Block\Html\Head\Css" name="mui-reset-css">
<arguments>
<argument name="file" xsi:type="string">mui/reset.css</argument>
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 3642fc74376..26352ca9a7c 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
@@ -32,7 +32,7 @@
namespace Magento\Widget\Block\Adminhtml\Widget\Instance\Edit\Tab\Main;
class Layout
- extends \Magento\Adminhtml\Block\Template implements \Magento\Data\Form\Element\Renderer\RendererInterface
+ extends \Magento\Backend\Block\Template implements \Magento\Data\Form\Element\Renderer\RendererInterface
{
/**
* @var \Magento\Data\Form\Element\AbstractElement
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php
index 428755b8391..af49a12c94a 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance.php
@@ -181,7 +181,7 @@ class Instance extends \Magento\Backend\App\Action
* @param string $body
* @return null
*/
- private function setBody($body)
+ protected function setBody($body)
{
$this->_translator->processResponseBody($body);
diff --git a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml
index aef3b7e056b..0e60abfb1be 100644
--- a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml
+++ b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml
@@ -72,6 +72,6 @@
</block>
</referenceContainer>
<referenceContainer name="js">
- <block class="Magento\Adminhtml\Block\Template" template="Magento_Widget::instance/js.phtml" name="widget_instance_js"/>
+ <block class="Magento\Backend\Block\Template" template="Magento_Widget::instance/js.phtml" name="widget_instance_js"/>
</referenceContainer>
</layout>
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Items.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Items.php
index a7eedbbe2a6..6414151dd89 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Items.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Items.php
@@ -36,7 +36,7 @@ namespace Magento\Wishlist\Block\Customer\Wishlist;
class Items extends \Magento\View\Block\Template
{
/**
- * Retreive table column object list
+ * Retrieve table column object list
*
* @return array
*/
diff --git a/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php b/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
index 50ab2fcfab7..ea27f3a4f2b 100644
--- a/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
+++ b/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
@@ -151,6 +151,11 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
*/
protected $_catalogAttrFactory;
+ /**
+ * @var \Magento\App\State
+ */
+ protected $_appState;
+
/**
* @param \Magento\CatalogInventory\Helper\Data $catalogInventoryData
* @param \Magento\Sales\Helper\Admin $adminhtmlSales
@@ -168,6 +173,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
* @param \Magento\Catalog\Model\Resource\ConfigFactory $catalogConfFactory
* @param \Magento\Catalog\Model\Entity\AttributeFactory $catalogAttrFactory
* @param \Magento\Wishlist\Model\Resource\Item $resource
+ * @param \Magento\App\State $appState
*/
public function __construct(
\Magento\CatalogInventory\Helper\Data $catalogInventoryData,
@@ -185,7 +191,8 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
\Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollFactory,
\Magento\Catalog\Model\Resource\ConfigFactory $catalogConfFactory,
\Magento\Catalog\Model\Entity\AttributeFactory $catalogAttrFactory,
- \Magento\Wishlist\Model\Resource\Item $resource
+ \Magento\Wishlist\Model\Resource\Item $resource,
+ \Magento\App\State $appState
) {
$this->_inventoryData = $catalogInventoryData;
$this->_adminhtmlSales = $adminhtmlSales;
@@ -198,6 +205,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
$this->_productCollFactory = $productCollFactory;
$this->_catalogConfFactory = $catalogConfFactory;
$this->_catalogAttrFactory = $catalogAttrFactory;
+ $this->_appState = $appState;
parent::__construct($eventManager, $logger, $fetchStrategy, $entityFactory, $resource);
}
@@ -265,16 +273,16 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
\Magento\Profiler::start('WISHLIST:'.__METHOD__, array('group' => 'WISHLIST', 'method' => __METHOD__));
$productIds = array();
- $isStoreAdmin = $this->_storeManager->getStore()->isAdmin();
+ $isBackendArea = $this->_appState->getAreaCode() === \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE;
$storeIds = array();
foreach ($this as $item) {
$productIds[$item->getProductId()] = 1;
- if ($isStoreAdmin && !in_array($item->getStoreId(), $storeIds)) {
+ if ($isBackendArea && !in_array($item->getStoreId(), $storeIds)) {
$storeIds[] = $item->getStoreId();
}
}
- if (!$isStoreAdmin) {
+ if (!$isBackendArea) {
$storeIds = $this->_storeIds;
}
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 206653a3a35..424c18bf647 100644
--- a/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
+++ b/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
@@ -54,6 +54,7 @@ class Grid extends \Magento\Wishlist\Model\Resource\Item\Collection
* @param \Magento\Catalog\Model\Entity\AttributeFactory $catalogAttrFactory
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Wishlist\Model\Resource\Item $resource
+ * @param \Magento\App\State $appState
*/
public function __construct(
\Magento\CatalogInventory\Helper\Data $catalogInventoryData,
@@ -72,12 +73,13 @@ class Grid extends \Magento\Wishlist\Model\Resource\Item\Collection
\Magento\Catalog\Model\Resource\ConfigFactory $catalogConfFactory,
\Magento\Catalog\Model\Entity\AttributeFactory $catalogAttrFactory,
\Magento\Core\Model\Registry $registry,
- \Magento\Wishlist\Model\Resource\Item $resource
+ \Magento\Wishlist\Model\Resource\Item $resource,
+ \Magento\App\State $appState
) {
$this->_registryManager = $registry;
parent::__construct($catalogInventoryData, $adminhtmlSales, $eventManager, $logger, $fetchStrategy,
$entityFactory, $storeManager, $date, $wishlistConfig, $productVisibility, $coreResource,
- $optionCollFactory, $productCollFactory, $catalogConfFactory, $catalogAttrFactory, $resource);
+ $optionCollFactory, $productCollFactory, $catalogConfFactory, $catalogAttrFactory, $resource, $appState);
}
/**
diff --git a/app/code/Magento/Wishlist/Model/Wishlist.php b/app/code/Magento/Wishlist/Model/Wishlist.php
index 25643cbc479..b8ec3dcfaeb 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist.php
@@ -116,6 +116,11 @@ class Wishlist extends \Magento\Core\Model\AbstractModel
*/
protected $dateTime;
+ /**
+ * @var bool
+ */
+ protected $_useCurrentWebsite;
+
/**
* @param \Magento\Catalog\Helper\Product $catalogProduct
* @param \Magento\Wishlist\Helper\Data $wishlistData
@@ -130,6 +135,7 @@ class Wishlist extends \Magento\Core\Model\AbstractModel
* @param \Magento\Catalog\Model\ProductFactory $productFactory
* @param \Magento\Math\Random $mathRandom
* @param \Magento\Stdlib\DateTime $dateTime
+ * @param bool $useCurrentWebsite
* @param array $data
*/
public function __construct(
@@ -146,8 +152,10 @@ class Wishlist extends \Magento\Core\Model\AbstractModel
\Magento\Catalog\Model\ProductFactory $productFactory,
\Magento\Math\Random $mathRandom,
\Magento\Stdlib\DateTime $dateTime,
+ $useCurrentWebsite = true,
array $data = array()
) {
+ $this->_useCurrentWebsite = $useCurrentWebsite;
$this->_catalogProduct = $catalogProduct;
$this->_wishlistData = $wishlistData;
$this->_storeManager = $storeManager;
@@ -315,11 +323,9 @@ class Wishlist extends \Magento\Core\Model\AbstractModel
public function getItemCollection()
{
if (is_null($this->_itemCollection)) {
- /** @var $currentWebsiteOnly boolean */
- $currentWebsiteOnly = !$this->_storeManager->getStore()->isAdmin();
$this->_itemCollection = $this->_wishlistCollFactory->create()
->addWishlistFilter($this)
- ->addStoreFilter($this->getSharedStoreIds($currentWebsiteOnly))
+ ->addStoreFilter($this->getSharedStoreIds())
->setVisibilityFilter();
}
@@ -479,13 +485,12 @@ class Wishlist extends \Magento\Core\Model\AbstractModel
/**
* Retrieve shared store ids for current website or all stores if $current is false
*
- * @param bool $current Use current website or not
* @return array
*/
- public function getSharedStoreIds($current = true)
+ public function getSharedStoreIds()
{
if (is_null($this->_storeIds) || !is_array($this->_storeIds)) {
- if ($current) {
+ if ($this->_useCurrentWebsite) {
$this->_storeIds = $this->getStore()->getWebsite()->getStoreIds();
} else {
$_storeIds = array();
diff --git a/app/code/Magento/Wishlist/etc/adminhtml/di.xml b/app/code/Magento/Wishlist/etc/adminhtml/di.xml
index 135b6aff7a5..7d7328db7c5 100644
--- a/app/code/Magento/Wishlist/etc/adminhtml/di.xml
+++ b/app/code/Magento/Wishlist/etc/adminhtml/di.xml
@@ -24,6 +24,11 @@
*/
-->
<config>
+ <type name="Magento\Wishlist\Model\Wishlist">
+ <param name="useCurrentWebsite">
+ <value type="bool">false</value>
+ </param>
+ </type>
<virtualType name="Magento\Wishlist\Model\Session" type="Magento\Core\Model\Session\Generic">
<param name="sessionNamespace">
<value>wishlist</value>
diff --git a/app/design/adminhtml/magento_backend/css/styles.css b/app/design/adminhtml/magento_backend/css/styles.css
index 74aebf26d94..09afe07811f 100644
--- a/app/design/adminhtml/magento_backend/css/styles.css
+++ b/app/design/adminhtml/magento_backend/css/styles.css
@@ -140,7 +140,7 @@ button.primary,
.catalog-rule-promo-catalog-index .page-actions .add,
.sales-rule-promo-quote-index .page-actions .add,
.adminhtml-reminder-index .page-actions .add,
-.adminhtml-newsletter-template-index .page-actions .add,
+.newsletter-template-index .page-actions .add,
.adminhtml-system-email-template-index .page-actions .add,
.adminhtml-sitemap-index .page-actions .add,
.adminhtml-googleshopping-types-index .page-actions .add,
@@ -272,9 +272,9 @@ button.primary:active,
.adminhtml-reminder-index .page-actions .add:hover,
.adminhtml-reminder-index .page-actions .add:focus,
.adminhtml-reminder-index .page-actions .add:active,
-.adminhtml-newsletter-template-index .page-actions .add:hover,
-.adminhtml-newsletter-template-index .page-actions .add:focus,
-.adminhtml-newsletter-template-index .page-actions .add:active,
+.newsletter-template-index .page-actions .add:hover,
+.newsletter-template-index .page-actions .add:focus,
+.newsletter-template-index .page-actions .add:active,
.adminhtml-system-email-template-index .page-actions .add:hover,
.adminhtml-system-email-template-index .page-actions .add:focus,
.adminhtml-system-email-template-index .page-actions .add:active,
@@ -409,7 +409,7 @@ button.primary:active,
.catalog-rule-promo-catalog-index .page-actions .add:active,
.sales-rule-promo-quote-index .page-actions .add:active,
.adminhtml-reminder-index .page-actions .add:active,
-.adminhtml-newsletter-template-index .page-actions .add:active,
+.newsletter-template-index .page-actions .add:active,
.adminhtml-system-email-template-index .page-actions .add:active,
.adminhtml-sitemap-index .page-actions .add:active,
.adminhtml-googleshopping-types-index .page-actions .add:active,
@@ -473,7 +473,7 @@ button.primary:visited,
.catalog-rule-promo-catalog-index .page-actions .add:visited,
.sales-rule-promo-quote-index .page-actions .add:visited,
.adminhtml-reminder-index .page-actions .add:visited,
-.adminhtml-newsletter-template-index .page-actions .add:visited,
+.newsletter-template-index .page-actions .add:visited,
.adminhtml-system-email-template-index .page-actions .add:visited,
.adminhtml-sitemap-index .page-actions .add:visited,
.adminhtml-googleshopping-types-index .page-actions .add:visited,
@@ -563,8 +563,8 @@ button.primary.disabled,
.sales-rule-promo-quote-index .page-actions .add.disabled,
.adminhtml-reminder-index .page-actions .add[disabled],
.adminhtml-reminder-index .page-actions .add.disabled,
-.adminhtml-newsletter-template-index .page-actions .add[disabled],
-.adminhtml-newsletter-template-index .page-actions .add.disabled,
+.newsletter-template-index .page-actions .add[disabled],
+.newsletter-template-index .page-actions .add.disabled,
.adminhtml-system-email-template-index .page-actions .add[disabled],
.adminhtml-system-email-template-index .page-actions .add.disabled,
.adminhtml-sitemap-index .page-actions .add[disabled],
@@ -743,10 +743,10 @@ button.primary.disabled:active,
.adminhtml-reminder-index .page-actions .add.disabled:hover,
.adminhtml-reminder-index .page-actions .add[disabled]:active,
.adminhtml-reminder-index .page-actions .add.disabled:active,
-.adminhtml-newsletter-template-index .page-actions .add[disabled]:hover,
-.adminhtml-newsletter-template-index .page-actions .add.disabled:hover,
-.adminhtml-newsletter-template-index .page-actions .add[disabled]:active,
-.adminhtml-newsletter-template-index .page-actions .add.disabled:active,
+.newsletter-template-index .page-actions .add[disabled]:hover,
+.newsletter-template-index .page-actions .add.disabled:hover,
+.newsletter-template-index .page-actions .add[disabled]:active,
+.newsletter-template-index .page-actions .add.disabled:active,
.adminhtml-system-email-template-index .page-actions .add[disabled]:hover,
.adminhtml-system-email-template-index .page-actions .add.disabled:hover,
.adminhtml-system-email-template-index .page-actions .add[disabled]:active,
@@ -910,7 +910,7 @@ button.primary,
.catalog-rule-promo-catalog-index .page-actions .add,
.sales-rule-promo-quote-index .page-actions .add,
.adminhtml-reminder-index .page-actions .add,
-.adminhtml-newsletter-template-index .page-actions .add,
+.newsletter-template-index .page-actions .add,
.adminhtml-system-email-template-index .page-actions .add,
.adminhtml-sitemap-index .page-actions .add,
.adminhtml-googleshopping-types-index .page-actions .add,
@@ -964,7 +964,7 @@ button.primary,
.catalog-rule-promo-catalog-index .page-actions .add,
.sales-rule-promo-quote-index .page-actions .add,
.adminhtml-reminder-index .page-actions .add,
-.adminhtml-newsletter-template-index .page-actions .add,
+.newsletter-template-index .page-actions .add,
.adminhtml-system-email-template-index .page-actions .add,
.adminhtml-sitemap-index .page-actions .add,
.adminhtml-googleshopping-types-index .page-actions .add,
@@ -1042,8 +1042,8 @@ button.primary:hover,
.sales-rule-promo-quote-index .page-actions .add:hover,
.adminhtml-reminder-index .page-actions .add:focus,
.adminhtml-reminder-index .page-actions .add:hover,
-.adminhtml-newsletter-template-index .page-actions .add:focus,
-.adminhtml-newsletter-template-index .page-actions .add:hover,
+.newsletter-template-index .page-actions .add:focus,
+.newsletter-template-index .page-actions .add:hover,
.adminhtml-system-email-template-index .page-actions .add:focus,
.adminhtml-system-email-template-index .page-actions .add:hover,
.adminhtml-sitemap-index .page-actions .add:focus,
@@ -1137,7 +1137,7 @@ button.primary:active,
.catalog-rule-promo-catalog-index .page-actions .add:active,
.sales-rule-promo-quote-index .page-actions .add:active,
.adminhtml-reminder-index .page-actions .add:active,
-.adminhtml-newsletter-template-index .page-actions .add:active,
+.newsletter-template-index .page-actions .add:active,
.adminhtml-system-email-template-index .page-actions .add:active,
.adminhtml-sitemap-index .page-actions .add:active,
.adminhtml-googleshopping-types-index .page-actions .add:active,
@@ -1196,7 +1196,7 @@ button.primary:visited,
.catalog-rule-promo-catalog-index .page-actions .add:visited,
.sales-rule-promo-quote-index .page-actions .add:visited,
.adminhtml-reminder-index .page-actions .add:visited,
-.adminhtml-newsletter-template-index .page-actions .add:visited,
+.newsletter-template-index .page-actions .add:visited,
.adminhtml-system-email-template-index .page-actions .add:visited,
.adminhtml-sitemap-index .page-actions .add:visited,
.adminhtml-googleshopping-types-index .page-actions .add:visited,
@@ -1310,10 +1310,10 @@ button.primary.disabled:active,
.adminhtml-reminder-index .page-actions .add.disabled:hover,
.adminhtml-reminder-index .page-actions .add[disabled]:active,
.adminhtml-reminder-index .page-actions .add.disabled:active,
-.adminhtml-newsletter-template-index .page-actions .add[disabled]:hover,
-.adminhtml-newsletter-template-index .page-actions .add.disabled:hover,
-.adminhtml-newsletter-template-index .page-actions .add[disabled]:active,
-.adminhtml-newsletter-template-index .page-actions .add.disabled:active,
+.newsletter-template-index .page-actions .add[disabled]:hover,
+.newsletter-template-index .page-actions .add.disabled:hover,
+.newsletter-template-index .page-actions .add[disabled]:active,
+.newsletter-template-index .page-actions .add.disabled:active,
.adminhtml-system-email-template-index .page-actions .add[disabled]:hover,
.adminhtml-system-email-template-index .page-actions .add.disabled:hover,
.adminhtml-system-email-template-index .page-actions .add[disabled]:active,
@@ -1469,7 +1469,7 @@ button.primary.disabled:active,
.catalog-rule-promo-catalog-index .page-actions .add,
.sales-rule-promo-quote-index .page-actions .add,
.adminhtml-reminder-index .page-actions .add,
-.adminhtml-newsletter-template-index .page-actions .add,
+.newsletter-template-index .page-actions .add,
.adminhtml-system-email-template-index .page-actions .add,
.adminhtml-sitemap-index .page-actions .add,
.adminhtml-googleshopping-types-index .page-actions .add,
@@ -1512,7 +1512,7 @@ button.primary.disabled:active,
.catalog-rule-promo-catalog-index .page-actions .add,
.sales-rule-promo-quote-index .page-actions .add,
.adminhtml-reminder-index .page-actions .add,
-.adminhtml-newsletter-template-index .page-actions .add,
+.newsletter-template-index .page-actions .add,
.adminhtml-system-email-template-index .page-actions .add,
.adminhtml-sitemap-index .page-actions .add,
.adminhtml-googleshopping-types-index .page-actions .add,
@@ -1563,7 +1563,7 @@ button.primary.disabled:active,
.catalog-rule-promo-catalog-index .page-actions .add:focus,
.sales-rule-promo-quote-index .page-actions .add:focus,
.adminhtml-reminder-index .page-actions .add:focus,
-.adminhtml-newsletter-template-index .page-actions .add:focus,
+.newsletter-template-index .page-actions .add:focus,
.adminhtml-system-email-template-index .page-actions .add:focus,
.adminhtml-sitemap-index .page-actions .add:focus,
.adminhtml-googleshopping-types-index .page-actions .add:focus,
@@ -1609,7 +1609,7 @@ button.primary.disabled:active,
.catalog-rule-promo-catalog-index .page-actions .add > span,
.sales-rule-promo-quote-index .page-actions .add > span,
.adminhtml-reminder-index .page-actions .add > span,
-.adminhtml-newsletter-template-index .page-actions .add > span,
+.newsletter-template-index .page-actions .add > span,
.adminhtml-system-email-template-index .page-actions .add > span,
.adminhtml-sitemap-index .page-actions .add > span,
.adminhtml-googleshopping-types-index .page-actions .add > span,
@@ -1658,7 +1658,7 @@ button.primary.disabled:active,
.catalog-rule-promo-catalog-index .page-actions .add > span:before,
.sales-rule-promo-quote-index .page-actions .add > span:before,
.adminhtml-reminder-index .page-actions .add > span:before,
-.adminhtml-newsletter-template-index .page-actions .add > span:before,
+.newsletter-template-index .page-actions .add > span:before,
.adminhtml-system-email-template-index .page-actions .add > span:before,
.adminhtml-sitemap-index .page-actions .add > span:before,
.adminhtml-googleshopping-types-index .page-actions .add > span:before,
@@ -1718,7 +1718,7 @@ button.primary.disabled:active,
.eq-ie9 .catalog-rule-promo-catalog-index .page-actions .add > span:before,
.eq-ie9 .sales-rule-promo-quote-index .page-actions .add > span:before,
.eq-ie9 .adminhtml-reminder-index .page-actions .add > span:before,
-.eq-ie9 .adminhtml-newsletter-template-index .page-actions .add > span:before,
+.eq-ie9 .newsletter-template-index .page-actions .add > span:before,
.eq-ie9 .adminhtml-system-email-template-index .page-actions .add > span:before,
.eq-ie9 .adminhtml-sitemap-index .page-actions .add > span:before,
.eq-ie9 .adminhtml-googleshopping-types-index .page-actions .add > span:before,
@@ -2092,11 +2092,11 @@ button.primary.disabled:active,
[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,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back.active,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back[disabled],
+[class^=" newsletter-"] .page-actions .action-back,
+[class^=" newsletter-"] .page-actions .action-back:hover,
+[class^=" newsletter-"] .page-actions .action-back:active,
+[class^=" newsletter-"] .page-actions .action-back.active,
+[class^=" newsletter-"] .page-actions .action-back[disabled],
.notifications [class^="action-"],
.notifications [class^="action-"]:hover,
.notifications [class^="action-"]:active,
@@ -6667,7 +6667,7 @@ table .col-draggable .draggable-handle {
.catalog-rule-promo-catalog-index .col-1-layout,
.sales-rule-promo-quote-index .col-1-layout,
.adminhtml-reminder-index .col-1-layout,
-.adminhtml-newsletter-template-index .col-1-layout,
+.newsletter-template-index .col-1-layout,
.adminhtml-system-email-template-index .col-1-layout,
.adminhtml-sitemap-index .col-1-layout,
.adminhtml-googleshopping-types-index .col-1-layout,
@@ -6706,8 +6706,8 @@ table .col-draggable .draggable-handle {
.sales-recurring-profile-index .col-1-layout,
.adminhtml-googleshopping-items-index .col-1-layout,
.customer-online-index .col-1-layout,
-.adminhtml-newsletter-queue-index .col-1-layout,
-.adminhtml-newsletter-subscriber-index .col-1-layout,
+.newsletter-queue-index .col-1-layout,
+.newsletter-subscriber-index .col-1-layout,
.adminhtml-report-shopcart-product .col-1-layout,
.adminhtml-report-shopcart-abandoned .adminhtml-report-product-downloads .col-1-layout,
.adminhtml-report-product-sold .col-1-layout,
@@ -6720,7 +6720,7 @@ table .col-draggable .draggable-handle {
.adminhtml-report-review-product .col-1-layout,
.adminhtml-report-search .col-1-layout,
.adminhtml-report-statistics-index .col-1-layout,
-.adminhtml-newsletter-problem-index .col-1-layout,
+.newsletter-problem-index .col-1-layout,
.adminhtml-system-store-index .col-1-layout,
.sales-order-status-index .col-1-layout,
.adminhtml-system-currency-index .col-1-layout,
@@ -6751,7 +6751,7 @@ table .col-draggable .draggable-handle {
.catalog-rule-promo-catalog-index .grid-actions,
.sales-rule-promo-quote-index .grid-actions,
.adminhtml-reminder-index .grid-actions,
-.adminhtml-newsletter-template-index .grid-actions,
+.newsletter-template-index .grid-actions,
.adminhtml-system-email-template-index .grid-actions,
.adminhtml-sitemap-index .grid-actions,
.adminhtml-googleshopping-types-index .grid-actions,
@@ -6796,7 +6796,7 @@ table .col-draggable .draggable-handle {
.catalog-rule-promo-catalog-index .page-actions.fixed,
.sales-rule-promo-quote-index .page-actions.fixed,
.adminhtml-reminder-index .page-actions.fixed,
-.adminhtml-newsletter-template-index .page-actions.fixed,
+.newsletter-template-index .page-actions.fixed,
.adminhtml-system-email-template-index .page-actions.fixed,
.adminhtml-sitemap-index .page-actions.fixed,
.adminhtml-googleshopping-types-index .page-actions.fixed,
@@ -6842,7 +6842,7 @@ table .col-draggable .draggable-handle {
.catalog-rule-promo-catalog-index .page-actions,
.sales-rule-promo-quote-index .page-actions,
.adminhtml-reminder-index .page-actions,
-.adminhtml-newsletter-template-index .page-actions,
+.newsletter-template-index .page-actions,
.adminhtml-system-email-template-index .page-actions,
.adminhtml-sitemap-index .page-actions,
.adminhtml-googleshopping-types-index .page-actions,
@@ -7771,9 +7771,9 @@ table .col-draggable .draggable-handle {
[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 {
+[class^=" newsletter-"] .page-actions .action-back,
+[class^=" newsletter-"] .page-actions .action-back:hover,
+[class^=" newsletter-"] .page-actions .action-back:active {
overflow: hidden;
padding: 5px 6px 3px;
margin-left: 12px;
@@ -7782,9 +7782,9 @@ table .col-draggable .draggable-handle {
.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,
+.eq-ie8 [class^=" newsletter-"] .page-actions .action-back,
+.eq-ie8 [class^=" newsletter-"] .page-actions .action-back:hover,
+.eq-ie8 [class^=" newsletter-"] .page-actions .action-back: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 {
@@ -7792,16 +7792,16 @@ table .col-draggable .draggable-handle {
border: 0;
}
[class^=" catalog-product-"] .page-actions .action-back:hover,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:hover,
+[class^=" newsletter-"] .page-actions .action-back:hover,
.sales-order-create-index .page-actions-inner .cancel:hover {
color: #000;
}
[class^=" catalog-product-"] .page-actions .action-back.mage-error,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back.mage-error {
+[class^=" newsletter-"] .page-actions .action-back.mage-error {
color: #b57c72;
}
[class^=" catalog-product-"] .page-actions .action-back:before,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:before,
+[class^=" newsletter-"] .page-actions .action-back:before,
.sales-order-create-index .page-actions-inner .cancel:before {
display: inline-block;
font-family: 'MUI-Icons';
@@ -7815,7 +7815,7 @@ table .col-draggable .draggable-handle {
font-size: 16px;
}
[class^=" catalog-product-"] .page-actions .action-back span,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back span,
+[class^=" newsletter-"] .page-actions .action-back span,
.sales-order-create-index .page-actions-inner .cancel span {
display: inline-block;
overflow: hidden;
@@ -8494,80 +8494,80 @@ table .col-draggable .draggable-handle {
/*
Newsletter
-------------------------------------- */
-[class^=" adminhtml-newsletter-"] .page-actions .action-back {
+[class^=" newsletter-"] .page-actions .action-back {
float: right;
}
/*
Newsletter Templates
-------------------------------------- */
-.adminhtml-newsletter-template-index .col-id {
+.newsletter-template-index .col-id {
width: 35px;
}
-.adminhtml-newsletter-template-index .col-actions {
+.newsletter-template-index .col-actions {
width: 80px;
}
-.adminhtml-newsletter-template-index .col-type {
+.newsletter-template-index .col-type {
width: 100px;
}
-.adminhtml-newsletter-template-index .col-added,
-.adminhtml-newsletter-template-index .col-updated {
+.newsletter-template-index .col-added,
+.newsletter-template-index .col-updated {
width: 140px;
}
-[class^=' adminhtml-newsletter-'] .buttons-set {
+[class^=' newsletter-'] .buttons-set {
margin: 0 0 15px;
}
-[class^=" adminhtml-newsletter-"] .buttons-set button {
+[class^=" newsletter-"] .buttons-set button {
margin-right: 4px;
}
/*
Newsletter - Queue
-------------------------------------- */
-.adminhtml-newsletter-queue-index .col-id {
+.newsletter-queue-index .col-id {
width: 35px;
}
-.adminhtml-newsletter-queue-index .col-finish,
-.adminhtml-newsletter-queue-index .col-start {
+.newsletter-queue-index .col-finish,
+.newsletter-queue-index .col-start {
width: 130px;
}
-.adminhtml-newsletter-queue-index .col-status,
-.adminhtml-newsletter-queue-index .col-processed,
-.adminhtml-newsletter-queue-index .col-recipients {
+.newsletter-queue-index .col-status,
+.newsletter-queue-index .col-processed,
+.newsletter-queue-index .col-recipients {
white-space: nowrap;
width: 85px;
}
-.adminhtml-newsletter-queue-index td.col-processed,
-.adminhtml-newsletter-queue-index td.col-recipients {
+.newsletter-queue-index td.col-processed,
+.newsletter-queue-index td.col-recipients {
text-align: right;
}
-.adminhtml-newsletter-queue-index .col-actions {
+.newsletter-queue-index .col-actions {
width: 80px;
}
/*
Newsletter - Subscribers
-------------------------------------- */
-.adminhtml-newsletter-subscriber-index .col-id {
+.newsletter-subscriber-index .col-id {
width: 35px;
}
-.adminhtml-newsletter-subscriber-index .col-type {
+.newsletter-subscriber-index .col-type {
width: 75px;
}
-.adminhtml-newsletter-subscriber-index .col-status {
+.newsletter-subscriber-index .col-status {
white-space: nowrap;
width: 85px;
}
/*
Newsletter - Problems
-------------------------------------- */
-.adminhtml-newsletter-problem-index .col-select {
+.newsletter-problem-index .col-select {
width: 25px;
}
-.adminhtml-newsletter-problem-index .col-id {
+.newsletter-problem-index .col-id {
width: 35px;
}
-.adminhtml-newsletter-problem-index .col-start {
+.newsletter-problem-index .col-start {
width: 130px;
}
-.adminhtml-newsletter-problem-index .col-error-code {
+.newsletter-problem-index .col-error-code {
width: 150px;
}
.table-fieldset-alt,
diff --git a/app/design/adminhtml/magento_basic/i18n/en_US.csv b/app/design/adminhtml/magento_backend/i18n/en_US.csv
similarity index 99%
rename from app/design/adminhtml/magento_basic/i18n/en_US.csv
rename to app/design/adminhtml/magento_backend/i18n/en_US.csv
index 05cf0012840..88faa919186 100644
--- a/app/design/adminhtml/magento_basic/i18n/en_US.csv
+++ b/app/design/adminhtml/magento_backend/i18n/en_US.csv
@@ -47,7 +47,7 @@
"Expiration Date","Expiration Date"
"Add New Class","Add New Class"
"Super product attributes configuration","Super product attributes configuration"
-"Previus page","Previus page"
+"Previous page","Previous page"
"Something went wrong...","Something went wrong..."
"Lifetime Sales","Lifetime Sales"
"SKU","SKU"
diff --git a/app/design/adminhtml/magento_backend/less/styles/admin.less b/app/design/adminhtml/magento_backend/less/styles/admin.less
index 9201fb7567f..8a46c3163a1 100644
--- a/app/design/adminhtml/magento_backend/less/styles/admin.less
+++ b/app/design/adminhtml/magento_backend/less/styles/admin.less
@@ -282,11 +282,11 @@
[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,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back.active,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back[disabled],
+[class^=" newsletter-"] .page-actions .action-back,
+[class^=" newsletter-"] .page-actions .action-back:hover,
+[class^=" newsletter-"] .page-actions .action-back:active,
+[class^=" newsletter-"] .page-actions .action-back.active,
+[class^=" newsletter-"] .page-actions .action-back[disabled],
.notifications [class^="action-"],
.notifications [class^="action-"]:hover,
.notifications [class^="action-"]:active,
@@ -5558,7 +5558,7 @@ button,
.catalog-rule-promo-catalog-index,
.sales-rule-promo-quote-index,
.adminhtml-reminder-index,
-.adminhtml-newsletter-template-index,
+.newsletter-template-index,
.adminhtml-system-email-template-index,
.adminhtml-sitemap-index,
// products
@@ -5630,8 +5630,8 @@ button,
// customer
.customer-online-index,
// marketing
-.adminhtml-newsletter-queue-index,
-.adminhtml-newsletter-subscriber-index,
+.newsletter-queue-index,
+.newsletter-subscriber-index,
// reports
.adminhtml-report-shopcart-product,
.adminhtml-report-shopcart-abandoned
@@ -5646,7 +5646,7 @@ button,
.adminhtml-report-review-product,
.adminhtml-report-search,
.adminhtml-report-statistics-index,
-.adminhtml-newsletter-problem-index,
+.newsletter-problem-index,
//store
.adminhtml-system-store-index,
.sales-order-status-index,
diff --git a/app/design/adminhtml/magento_backend/less/styles/pages.less b/app/design/adminhtml/magento_backend/less/styles/pages.less
index 8e3cf0933e5..8ba6964fc10 100644
--- a/app/design/adminhtml/magento_backend/less/styles/pages.less
+++ b/app/design/adminhtml/magento_backend/less/styles/pages.less
@@ -29,9 +29,9 @@
[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 {
+[class^=" newsletter-"] .page-actions .action-back,
+[class^=" newsletter-"] .page-actions .action-back:hover,
+[class^=" newsletter-"] .page-actions .action-back:active {
overflow: hidden;
padding: 5px 6px 3px;
margin-left: 12px;
@@ -41,9 +41,9 @@
.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,
+.eq-ie8 [class^=" newsletter-"] .page-actions .action-back,
+.eq-ie8 [class^=" newsletter-"] .page-actions .action-back:hover,
+.eq-ie8 [class^=" newsletter-"] .page-actions .action-back: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 {
@@ -52,18 +52,18 @@
}
[class^=" catalog-product-"] .page-actions .action-back:hover,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:hover,
+[class^=" newsletter-"] .page-actions .action-back:hover,
.sales-order-create-index .page-actions-inner .cancel:hover {
color: #000;
}
[class^=" catalog-product-"] .page-actions .action-back.mage-error,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back.mage-error {
+[class^=" newsletter-"] .page-actions .action-back.mage-error {
color: #b57c72;
}
[class^=" catalog-product-"] .page-actions .action-back:before,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back:before,
+[class^=" newsletter-"] .page-actions .action-back:before,
.sales-order-create-index .page-actions-inner .cancel:before {
display: inline-block;
font-family: 'MUI-Icons';
@@ -76,7 +76,7 @@
}
[class^=" catalog-product-"] .page-actions .action-back span,
-[class^=" adminhtml-newsletter-"] .page-actions .action-back span,
+[class^=" newsletter-"] .page-actions .action-back span,
.sales-order-create-index .page-actions-inner .cancel span {
display: inline-block;
overflow: hidden;
@@ -499,8 +499,8 @@
/*
Reports - Customer Reviews
-------------------------------------- */
-.adminhtml-report-review-customer .col-qty,
-.adminhtml-report-review-customer .col-actions {
+.reports-report-review-customer .col-qty,
+.reports-report-review-customer .col-actions {
width: 85px;
}
@@ -508,23 +508,23 @@
Reports - Product Reviews
-------------------------------------- */
-.adminhtml-report-review-product .col-id {
+.reports-report-review-product .col-id {
width: 35px;
}
-.adminhtml-report-review-product .col-qty,
-.adminhtml-report-review-product .col-rating,
-.adminhtml-report-review-product .col-avg-rating,
-.adminhtml-report-review-product .col-actions {
+.reports-report-review-product .col-qty,
+.reports-report-review-product .col-rating,
+.reports-report-review-product .col-avg-rating,
+.reports-report-review-product .col-actions {
text-align: right;
width: 85px;
}
-.adminhtml-report-review-product .col-date {
+.reports-report-review-product .col-date {
width: 140px;
}
-.adminhtml-report-review-product .col-rating {
+.reports-report-review-product .col-rating {
width: 104px;
}
@@ -532,7 +532,7 @@
Reports - New Accounts
-------------------------------------- */
-.adminhtml-report-customer-accounts .col-period {
+.reports-report-customer-accounts .col-period {
white-space: nowrap;
width: 70px;
}
@@ -541,76 +541,76 @@
Reports - Refresh Statistics
-------------------------------------- */
-.adminhtml-report-statistics-index .col-period {
+.reports-report-statistics-index .col-period {
white-space: nowrap;
width: 140px;
}
-.adminhtml-report-statistics-index .col-select {
+.reports-report-statistics-index .col-select {
width: 25px;
}
/*
Reports - Products Ordered
-------------------------------------- */
-.adminhtml-report-product-sold .col-period {
+.reports-report-product-sold .col-period {
white-space: nowrap;
width: 70px;
}
-.adminhtml-report-product-sold .col-qty {
+.reports-report-product-sold .col-qty {
width: 110px;
}
/*
Reports - Customers by Orders Total
-------------------------------------- */
-.adminhtml-report-customer-totals .col-period {
+.reports-report-customer-totals .col-period {
white-space: nowrap;
width: 70px;
}
-.adminhtml-report-customer-totals .col-qty {
+.reports-report-customer-totals .col-qty {
width: 65px;
}
-.adminhtml-report-customer-totals .col-rating {
+.reports-report-customer-totals .col-rating {
width: 100px;
}
/*
Reports - Tag by popular
-------------------------------------- */
-.adminhtml-report-tag-popular .col-qty,
-.adminhtml-report-tag-popular .col-actions {
+.reports-report-tag-popular .col-qty,
+.reports-report-tag-popular .col-actions {
width: 80px;
}
/*
Reports - Tag by customer
-------------------------------------- */
-.adminhtml-report-tag-customer .col-id {
+.reports-report-tag-customer .col-id {
width: 35px;
}
-.adminhtml-report-tag-customer .col-qty,
-.adminhtml-report-tag-customer .col-actions {
+.reports-report-tag-customer .col-qty,
+.reports-report-tag-customer .col-actions {
width: 80px;
}
/*
Reports - Tag by product
-------------------------------------- */
-.adminhtml-report-tag-product .col-id {
+.reports-report-tag-product .col-id {
width: 35px;
}
-.adminhtml-report-tag-product .col-actions {
+.reports-report-tag-product .col-actions {
width: 70px;
}
-.adminhtml-report-tag-product .col-unique-numbers,
-.adminhtml-report-tag-product .col-total-numbers {
+.reports-report-tag-product .col-unique-numbers,
+.reports-report-tag-product .col-total-numbers {
text-align: right;
width: 95px
}
@@ -618,28 +618,28 @@
/*
Reports - Customers by Number of Orders
-------------------------------------- */
-.adminhtml-report-customer-orders .col-period {
+.reports-report-customer-orders .col-period {
white-space: nowrap;
width: 70px;
}
-.adminhtml-report-customer-orders .col-qty,
-.adminhtml-report-customer-orders .col-average,
-.adminhtml-report-customer-orders .col-total {
+.reports-report-customer-orders .col-qty,
+.reports-report-customer-orders .col-average,
+.reports-report-customer-orders .col-total {
width: 105px;
}
/*
Reports - Customers by Orders Total
-------------------------------------- */
-.adminhtml-report-customer-totals .col-period {
+.reports-report-customer-totals .col-period {
white-space: nowrap;
width: 70px;
}
-.adminhtml-report-customer-totals .col-qty,
-.adminhtml-report-customer-totals .col-average,
-.adminhtml-report-customer-totals .col-total {
+.reports-report-customer-totals .col-qty,
+.reports-report-customer-totals .col-average,
+.reports-report-customer-totals .col-total {
width: 105px;
}
@@ -664,13 +664,13 @@
/*
Reports - Most Viewed
-------------------------------------- */
-.adminhtml-report-product-viewed .col-period {
+.reports-report-product-viewed .col-period {
white-space: nowrap;
width: 70px;
}
-.adminhtml-report-product-viewed .col-qty,
-.adminhtml-report-product-viewed .col-price {
+.reports-report-product-viewed .col-qty,
+.reports-report-product-viewed .col-price {
white-space: nowrap;
width: 80px;
}
@@ -678,24 +678,24 @@
/*
Reports - Search Terms
-------------------------------------- */
-.adminhtml-report-search .col-id {
+.reports-index-search .col-id {
width: 35px;
}
-.adminhtml-report-search th.col-results,
-.adminhtml-report-search th.col-hits {
+.reports-index-search th.col-results,
+.reports-index-search th.col-hits {
text-align: left;
width: 117px;
}
-.adminhtml-report-search td.col-results,
-.adminhtml-report-search td.col-hits {
+.reports-index-search td.col-results,
+.reports-index-search td.col-hits {
text-align: right;
width: 117px;
}
-.adminhtml-report-search .col-results .range-line:first-child,
-.adminhtml-report-search .col-hits .range-line:first-child {
+.reports-index-search .col-results .range-line:first-child,
+.reports-index-search .col-hits .range-line:first-child {
float: left;
margin-right: 3px;
}
@@ -704,21 +704,21 @@
Reports - Bestsellers
-------------------------------------- */
-.adminhtml-report-sales-bestsellers .col-period {
+.reports-report-sales-bestsellers .col-period {
white-space: nowrap;
width: 70px;
}
-.adminhtml-report-sales-bestsellers .col-qty,
-.adminhtml-report-sales-bestsellers .col-price {
+.reports-report-sales-bestsellers .col-qty,
+.reports-report-sales-bestsellers .col-price {
width: 80px;
}
/*
Reports - Downloads
-------------------------------------- */
-.adminhtml-report-product-downloads .col-qty,
-.adminhtml-report-product-downloads .col-price {
+.reports-report-product-downloads .col-qty,
+.reports-report-product-downloads .col-price {
width: 80px;
}
@@ -726,31 +726,31 @@
Reports - Abandoned Carts
-------------------------------------- */
-.adminhtml-report-shopcart-abandoned .col-ip,
-.adminhtml-report-shopcart-abandoned .col-subtotal,
-.adminhtml-report-shopcart-abandoned .col-number,
-.adminhtml-report-shopcart-abandoned .col-coupon {
+.reports-report-shopcart-abandoned .col-ip,
+.reports-report-shopcart-abandoned .col-subtotal,
+.reports-report-shopcart-abandoned .col-number,
+.reports-report-shopcart-abandoned .col-coupon {
text-align: right;
}
-.adminhtml-report-shopcart-abandoned .col-ip {
+.reports-report-shopcart-abandoned .col-ip {
width: 105px;
}
-.adminhtml-report-shopcart-abandoned .col-subtotal {
+.reports-report-shopcart-abandoned .col-subtotal {
width: 65px;
}
/*
Reports - Products in Carts
-------------------------------------- */
-.adminhtml-report-shopcart-product .col-id {
+.reports-report-shopcart-product .col-id {
width: 35px;
}
-.adminhtml-report-shopcart-product .col-carts,
-.adminhtml-report-shopcart-product .col-qty,
-.adminhtml-report-shopcart-product .col-price {
+.reports-report-shopcart-product .col-carts,
+.reports-report-shopcart-product .col-qty,
+.reports-report-shopcart-product .col-price {
text-align: right;
width: 80px;
}
@@ -759,14 +759,14 @@
Reports - Refunds
-------------------------------------- */
-.adminhtml-report-sales-refunded .col-period {
+.reports-report-sales-refunded .col-period {
white-space: nowrap;
width: 70px;
}
-.adminhtml-report-sales-refunded .col-ref-total,
-.adminhtml-report-sales-refunded .col-ref-online,
-.adminhtml-report-sales-refunded .col-ref-offline {
+.reports-report-sales-refunded .col-ref-total,
+.reports-report-sales-refunded .col-ref-online,
+.reports-report-sales-refunded .col-ref-offline {
text-align: right;
width: 23%;
}
@@ -775,14 +775,14 @@
Reports - Shipping
-------------------------------------- */
-.adminhtml-report-sales-shipping .col-period {
+.reports-report-sales-shipping .col-period {
white-space: nowrap;
width: 70px;
}
-.adminhtml-report-sales-shipping .col-qty,
-.adminhtml-report-sales-shipping .col-total-sales-shipping,
-.adminhtml-report-sales-shipping .col-total-shipping {
+.reports-report-sales-shipping .col-qty,
+.reports-report-sales-shipping .col-total-sales-shipping,
+.reports-report-sales-shipping .col-total-shipping {
text-align: right;
width: 115px;
}
@@ -791,16 +791,16 @@
Reports - Invoiced
-------------------------------------- */
-.adminhtml-report-sales-invoiced .col-period {
+.reports-report-sales-invoiced .col-period {
white-space: nowrap;
width: 70px;
}
-.adminhtml-report-sales-invoiced .col-qty,
-.adminhtml-report-sales-invoiced .col-invoiced,
-.adminhtml-report-sales-invoiced .col-total-invoiced,
-.adminhtml-report-sales-invoiced .col-total-invoiced-paid,
-.adminhtml-report-sales-invoiced .col-total-invoiced-not-paid {
+.reports-report-sales-invoiced .col-qty,
+.reports-report-sales-invoiced .col-invoiced,
+.reports-report-sales-invoiced .col-total-invoiced,
+.reports-report-sales-invoiced .col-total-invoiced-paid,
+.reports-report-sales-invoiced .col-total-invoiced-not-paid {
text-align: right;
width: 19%;
}
@@ -809,14 +809,14 @@
Reports - Tax
-------------------------------------- */
-.adminhtml-report-sales-tax .col-period {
+.reports-report-sales-tax .col-period {
white-space: nowrap;
width: 70px;
}
-.adminhtml-report-sales-tax .col-rate,
-.adminhtml-report-sales-tax .col-qty,
-.adminhtml-report-sales-tax .col-tax-amount {
+.reports-report-sales-tax .col-rate,
+.reports-report-sales-tax .col-qty,
+.reports-report-sales-tax .col-tax-amount {
text-align: right;
width: 105px;
}
@@ -824,20 +824,20 @@
/*
Reports - Orders
-------------------------------------- */
-.adminhtml-report-sales-sales .col-period {
+.reports-report-sales-sales .col-period {
white-space: nowrap;
width: 70px;
}
-.adminhtml-report-sales-sales .col-orders,
-.adminhtml-report-sales-sales .col-sales-items,
-.adminhtml-report-sales-sales .col-sales-total,
-.adminhtml-report-sales-sales .col-invoiced,
-.adminhtml-report-sales-sales .col-refunded,
-.adminhtml-report-sales-sales .col-sales-tax,
-.adminhtml-report-sales-sales .col-sales-shipping,
-.adminhtml-report-sales-sales .col-sales-discount,
-.adminhtml-report-sales-sales .col-canceled {
+.reports-report-sales-sales .col-orders,
+.reports-report-sales-sales .col-sales-items,
+.reports-report-sales-sales .col-sales-total,
+.reports-report-sales-sales .col-invoiced,
+.reports-report-sales-sales .col-refunded,
+.reports-report-sales-sales .col-sales-tax,
+.reports-report-sales-sales .col-sales-shipping,
+.reports-report-sales-sales .col-sales-discount,
+.reports-report-sales-sales .col-canceled {
text-align: right;
width: 10.5%;
}
@@ -846,18 +846,18 @@
Reports - Coupons
-------------------------------------- */
/* TODO: re-check styles for coupons table after coupons functionality will have been repaired */
-.adminhtml-report-sales-coupons .col-period {
+.reports-report-sales-coupons .col-period {
white-space: nowrap;
width: 70px;
}
-.adminhtml-report-sales-coupons .col-sales,
-.adminhtml-report-sales-coupons .col-users,
-.adminhtml-report-sales-coupons .col-sales-discount,
-.adminhtml-report-sales-coupons .col-total-amount,
-.adminhtml-report-sales-coupons .col-subtotal,
-.adminhtml-report-sales-coupons .col-discount,
-.adminhtml-report-sales-coupons .col-total {
+.reports-report-sales-coupons .col-sales,
+.reports-report-sales-coupons .col-users,
+.reports-report-sales-coupons .col-sales-discount,
+.reports-report-sales-coupons .col-total-amount,
+.reports-report-sales-coupons .col-subtotal,
+.reports-report-sales-coupons .col-discount,
+.reports-report-sales-coupons .col-total {
text-align: right;
}
@@ -865,19 +865,19 @@
Reports - Low Stock
-------------------------------------- */
-.adminhtml-report-product-lowstock .col-qty {
+.reports-report-product-lowstock .col-qty {
width: 10%;
}
-.adminhtml-report-product-lowstock .range-line {
+.reports-report-product-lowstock .range-line {
display: inline-block;
}
-.adminhtml-report-product-lowstock .col-product {
+.reports-report-product-lowstock .col-product {
width: 65%;
}
-.adminhtml-report-product-lowstock .col-sku {
+.reports-report-product-lowstock .col-sku {
width: 25%;
}
@@ -901,78 +901,78 @@
/*
Newsletter
-------------------------------------- */
-[class^=" adminhtml-newsletter-"] .page-actions .action-back {
+[class^=" newsletter-"] .page-actions .action-back {
float: right;
}
/*
Newsletter Templates
-------------------------------------- */
-.adminhtml-newsletter-template-index .col-id {
+.newsletter-template-index .col-id {
width: 35px;
}
-.adminhtml-newsletter-template-index .col-actions {
+.newsletter-template-index .col-actions {
width: 80px;
}
-.adminhtml-newsletter-template-index .col-type {
+.newsletter-template-index .col-type {
width: 100px;
}
-.adminhtml-newsletter-template-index .col-added,
-.adminhtml-newsletter-template-index .col-updated {
+.newsletter-template-index .col-added,
+.newsletter-template-index .col-updated {
width: 140px;
}
-[class^=' adminhtml-newsletter-'] .buttons-set {
+[class^=' newsletter-'] .buttons-set {
margin: 0 0 15px;
}
-[class^=" adminhtml-newsletter-"] .buttons-set button {
+[class^=" newsletter-"] .buttons-set button {
margin-right: 4px;
}
/*
Newsletter - Queue
-------------------------------------- */
-.adminhtml-newsletter-queue-index .col-id {
+.newsletter-queue-index .col-id {
width: 35px;
}
-.adminhtml-newsletter-queue-index .col-finish,
-.adminhtml-newsletter-queue-index .col-start {
+.newsletter-queue-index .col-finish,
+.newsletter-queue-index .col-start {
width: 130px;
}
-.adminhtml-newsletter-queue-index .col-status,
-.adminhtml-newsletter-queue-index .col-processed,
-.adminhtml-newsletter-queue-index .col-recipients {
+.newsletter-queue-index .col-status,
+.newsletter-queue-index .col-processed,
+.newsletter-queue-index .col-recipients {
white-space: nowrap;
width: 85px;
}
-.adminhtml-newsletter-queue-index td.col-processed,
-.adminhtml-newsletter-queue-index td.col-recipients {
+.newsletter-queue-index td.col-processed,
+.newsletter-queue-index td.col-recipients {
text-align: right;
}
-.adminhtml-newsletter-queue-index .col-actions {
+.newsletter-queue-index .col-actions {
width: 80px;
}
/*
Newsletter - Subscribers
-------------------------------------- */
-.adminhtml-newsletter-subscriber-index .col-id {
+.newsletter-subscriber-index .col-id {
width: 35px;
}
-.adminhtml-newsletter-subscriber-index .col-type {
+.newsletter-subscriber-index .col-type {
width: 75px;
}
-.adminhtml-newsletter-subscriber-index .col-status {
+.newsletter-subscriber-index .col-status {
white-space: nowrap;
width: 85px;
}
@@ -980,19 +980,19 @@
/*
Newsletter - Problems
-------------------------------------- */
-.adminhtml-newsletter-problem-index .col-select {
+.newsletter-problem-index .col-select {
width: 25px;
}
-.adminhtml-newsletter-problem-index .col-id {
+.newsletter-problem-index .col-id {
width: 35px;
}
-.adminhtml-newsletter-problem-index .col-start {
+.newsletter-problem-index .col-start {
width: 130px;
}
-.adminhtml-newsletter-problem-index .col-error-code {
+.newsletter-problem-index .col-error-code {
width: 150px;
}
diff --git a/app/design/adminhtml/magento_basic/Magento_Adminhtml/layout/default.xml b/app/design/adminhtml/magento_basic/Magento_Adminhtml/layout/default.xml
deleted file mode 100644
index cd9b8a867a1..00000000000
--- a/app/design/adminhtml/magento_basic/Magento_Adminhtml/layout/default.xml
+++ /dev/null
@@ -1,87 +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\Css" name="reset-css">
- <arguments>
- <argument name="file" xsi:type="string">reset.css</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Css" name="boxes-css">
- <arguments>
- <argument name="file" xsi:type="string">boxes.css</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Css" name="custom-css">
- <arguments>
- <argument name="file" xsi:type="string">custom.css</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Css" name="iestyles-css">
- <arguments>
- <argument name="file" xsi:type="string">iestyles.css</argument>
- <argument name="properties" xsi:type="array">
- <item name="attributes" xsi:type="string"/>
- <item name="ie_condition" xsi:type="string">lt IE 8</item>
- </argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Css" name="below-ie-css">
- <arguments>
- <argument name="file" xsi:type="string">below_ie7.css</argument>
- <argument name="properties" xsi:type="array">
- <item name="attributes" xsi:type="string"/>
- <item name="ie_condition" xsi:type="string">lt IE 7</item>
- </argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Css" name="ie-css">
- <arguments>
- <argument name="file" xsi:type="string">ie7.css</argument>
- <argument name="properties" xsi:type="array">
- <item name="attributes" xsi:type="string"/>
- <item name="ie_condition" xsi:type="string">IE 7</item>
- </argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Css" name="menu-css">
- <arguments>
- <argument name="file" xsi:type="string">menu.css</argument>
- <argument name="properties" xsi:type="array">
- <item name="attributes" xsi:type="string">media="screen, projection"</item>
- </argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Css" name="print-css">
- <arguments>
- <argument name="file" xsi:type="string">print.css</argument>
- <argument name="properties" xsi:type="array">
- <item name="attributes" xsi:type="string">media="print"</item>
- </argument>
- </arguments>
- </block>
- </referenceBlock>
-</layout>
diff --git a/app/design/adminhtml/magento_basic/below_ie7.css b/app/design/adminhtml/magento_basic/below_ie7.css
deleted file mode 100644
index c76d1eec0de..00000000000
--- a/app/design/adminhtml/magento_basic/below_ie7.css
+++ /dev/null
@@ -1,57 +0,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)
- */
-/* Set min-width */
-.wrapper { width:expression(document.body.clientWidth<1004?'1003px':'auto'); zoom:1; }
-.wrapper-popup { width:expression(document.body.clientWidth<751?'750px':'auto'); }
-.grid tr.filter .range div.date { width:121px; }
-
-/* Set min-height */
-.middle { height:450px; }
-.icon-head { height:18px ;}
-.footer .powered-by { height:19px; }
-.simple-container { height:350px; }
-.messages li { height:23px; }
-#widget_window .magento_content { height:450px !important; overflow:visible !important; }
-
-.main-col { height:450px; zoom:1; }
-
-#nav ul li { background:none !important; padding:0 !important; float:none; width:auto; border-left:1px solid #b6b6b6; border-right:1px solid #b6b6b6; vertical-align:top; }
-#nav ul li.active { float:none; width:auto; }
-#nav ul { border-bottom:2px solid #b6b6b6; padding-top:0 !important; padding-bottom:0 !important; }
-#nav ul ul { border-top:1px solid #b6b6b6; background-image:none; }
-#nav ul li a { background-color:#e5edef; }
-#nav ul li a:hover { background-color:#d0dfe2; }
-#nav ul,
-#nav ul li,
-#nav ul a,
-#nav ul a span { zoom:1; }
-
-#message-popup-window-mask .flash-window { position:absolute; top:350px; }
-#popup-window-mask,
-.popup-window-mask { padding:0 27px; }
-.product-configure-popup { position:absolute; }
-
-.product-options .options-list li { zoom:1; }
-
-/* Hover Fix */
-iframe.hover-fix { position:absolute; left:-1px; top:-1px; z-index:-1; background:transparent; filter:progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0); }
\ No newline at end of file
diff --git a/app/design/adminhtml/magento_basic/boxes.css b/app/design/adminhtml/magento_basic/boxes.css
deleted file mode 100644
index 2011a323673..00000000000
--- a/app/design/adminhtml/magento_basic/boxes.css
+++ /dev/null
@@ -1,1858 +0,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)
- */
-
-/***************** WIDGETS ******************
- Loading Indicator
- Tables
- Grid ( ubiquitous, massaction and dynamic)
- Accordion
- Tabs ( vertical and horizontal )
- Messages
- Forms ( setter and elements)
- Switcher
- Space
- Boxes
- Scroller
-*/
-
-/**************** STRUCTURE *****************
- Layout
- Header & Footer
- Columns
- Headings
-*/
-
-/************** PAGE-SPECIFIC ***************
- Login
- Sales
- Catalog
- Customers
- Newsletter
- System
-*/
-
-/********** ALIGNMENT AND CLEARS ***********/
-
-
-/******************************************************************/
-/**************************** WIDGETS *****************************/
-/******************************************************************/
-
-
-/* LOADING INDICATOR
-*******************************************************************/
-#loading-process {
- position:absolute;
- top:45%;
- left:50%;
- margin-left:-60px;
- border:2px solid #f1af73;
- padding:15px 60px;
- background:#fff4e9;
- color:#d85909;
- font-size:1.1em;
- font-weight:bold;
- text-align:center;
- z-index:501;
- }
-#loading-mask,
-.loading-mask {
- background:background:url(images/blank.gif) repeat;
- position:absolute;
- color:#d85909;
- font-size:1.1em;
- font-weight:bold;
- text-align:center;
- opacity:0.80;
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; /* IE8 */
- z-index:500;
- }
-#loading-mask .loader,
-.loading-mask .loader {
- position:fixed;
- top:45%;
- left:50%;
- width:150px;
- margin-left:-105px;
- padding:15px 30px;
- background:#fff4e9;
- border:2px solid #f1af73;
- color:#d85909;
- font-weight:bold;
- text-align:center;
- z-index:1000;
- }
-.loading-mask .loader {
- position:absolute;
- }
-.loading-mask {
- *filter:alpha(opacity=60);
- -moz-opacity:.6;
- opacity:.6;
- -webkit-opacity:.6;
- background: #ffffff;
- }
-#message-popup-window-mask { position:absolute; top:0; right:0; bottom:0; left:0; width:100%; height:100%; z-index:980; background-color:#efefef; opacity:.5; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";/*IE8*/ }
-.message-popup { position:absolute; z-index:990; width:407px; top:-9999em; left:50%; margin:0 0 0 -203px; background:#f3bf8f; padding:0 4px 4px; }
-.message-popup.show { top:280px; }
-.message-popup .message-popup-head { padding:1px 0; }
-.message-popup .message-popup-head h2 { padding:0 10px; margin:0; font:bold 12px/19px Arial, Helvetica, sans-serif; color:#644f3b; }
-.message-popup .message-popup-head a { float:right; border:1px solid #ea7601; padding:0 12px 0 7px; background:url(images/bkg_btn-close.gif) 0 50% repeat-x !important; font:normal 12px/17px Arial, Helvetica, sans-serif; color:#fff; text-decoration:none !important; cursor:pointer; }
-.message-popup .message-popup-head a span { float:left; background:url(images/bkg_btn-close2.gif) 0 50% no-repeat; padding-left:19px; }
-.message-popup .message-popup-content { background:#fdf4eb; padding:21px 21px 10px; }
-.message-popup .message-popup-content .message-icon { float:left; width:50px; padding:47px 0 0; background-position:50% 0; background-repeat:no-repeat; font-size:10px; line-height:12px; text-transform:uppercase; text-align:center; overflow:hidden; }
-.message-popup .message-popup-content .message-critical { color:#e41101; }
-.message-popup .message-popup-content .message-major { color:#f55600; }
-.message-popup .message-popup-content .message-minor { color:#ff9e22; }
-.message-popup .message-popup-content .message-notice { color:#659601; }
-.message-popup .message-popup-content .message-text { float:right; width:295px; min-height:4.5em; overflow:hidden; color:#644f3b; }
-.message-popup .message-popup-content .read-more { margin:7px 0 0; text-align:right; }
-.message-popup .message-popup-content .read-more a { background:url(images/more_arrow.gif) 0 50% no-repeat; padding-left:14px; text-decoration:underline; }
-.message-popup .message-popup-content .read-more a:hover { text-decoration:none; }
-
-/* TABLES
-*******************************************************************************/
-
-/* Grid - General */
-.grid { border-bottom:0; padding-bottom:.5em; }
-.grid table { width:100%; border:1px solid #cbd3d4; border-bottom:none; }
-.grid table.border { border:1px solid #cbd3d4; }
-.grid tbody { background:#fff; } /* Zebra odd-row */
-.grid tr.even, .grid tr.even tr { background:#f6f6f6; } /* Zebra even-row */
-.grid tr.on-mouse { background:#fcf5dd; cursor:pointer; } /* Rows mouse-over */
-.grid tr.invalid { background-color:#f5d6c7; }
-.grid th, .grid td { padding:2px 4px 2px 4px; }
-.grid th { white-space:nowrap; }
-.grid td.editable input.input-text { width:50px !important; margin-left:4px !important; }
-.grid td input.input-text { width:86%; }
-.grid td input.input-text-export-filter { width:272px; }
-.grid td input.input-text-range { width:104px; }
-.grid td input.input-text-range-date { width:87px; }
-.grid td input.input-inactive { background:#eee; }
-.grid table td { border-width:0 1px 1px 0; border-color:#dadfe0; border-style:solid; }
-.grid table.border td { background:#fff !important; }
-.grid table td.first,
-.grid table td.last { border-right:0; }
-.grid table td.product { text-align:right; }
-.grid table td.empty-text { padding:15px; }
-.grid table td .action-select { width:100%; }
-.grid .separator { padding:0 4px; color:#b9b9b9; }
-
-.grid tbody.odd tr { background:#fff !important; }
-.grid tbody.even tr { background:#f6f6f6 !important; }
-.grid tbody.odd tr td,
-.grid tbody.even tr td { border-bottom:0; }
-.grid tbody.odd tr.border td,
-.grid tbody.even tr.border td { border-bottom:1px solid #dadfe0; }
-
-
-/* Grid - Pager and Buttons row */
-table.actions { width:100%; margin:.5em 0; }
-table.actions td { vertical-align:top; }
-.pager select { width:4em!important; margin:0 4px; }
-.pager input.page { width:2em !important; }
-.pager .arrow { margin:0 3px; vertical-align:middle; }
-
-
-/* Grid - Headings */
-.grid tr.headings { background:url(images/sort_row_bg.gif) 0 50% repeat-x; }
-.grid tr.headings th { border-width:1px; border-color:#f9f9f9 #d1cfcf #f9f9f9 #f9f9f9; border-style:solid; padding-top:1px; padding-bottom:0; font-size:.9em; }
-.grid tr.headings th.last { border-right:0; }
-.grid tr.headings th.no-link { /* Grid th with no sorting functionality */ padding-top:2px; padding-bottom:1px; color:#67767e; }
-.grid tr.headings th span.nobr { display:block; /* FF3 fix */ }
-.grid tr.headings th a { display:block; padding:2px 4px 1px 0; color:#2d444f; text-decoration:none; }
-.grid tr.headings th a:hover { color:#d85909; text-decoration:none; }
-.grid tr.headings th a.sort-arrow-desc,
-.grid tr.headings th a.sort-arrow-asc { background:url(images/sort_on_bg.gif) 0 0 no-repeat; border-bottom:1px solid #fff; border-right:1px solid #fff; padding-bottom:2px; }
-.grid tr.headings th span.sort-title { display:block; padding:3px 12px 4px 0; line-height:1; }
-.grid tr.headings th a.sort-arrow-desc span.sort-title,
-.grid tr.headings th a.sort-arrow-asc span.sort-title { background-position:right 50%; background-repeat:no-repeat; padding:3px 12px 2px 8px; }
-.grid tr.headings th a.sort-arrow-desc span.sort-title { background-image:url(images/grid_sort_desc.gif); }
-.grid tr.headings th a.sort-arrow-asc span.sort-title { background-image:url(images/grid_sort_asc.gif); }
-
-
-/* Grid - Mass Action */
-.massaction { width:100%; height:26px; border:1px solid #d1cfcf; border-bottom:none; background:url(images/massaction_bg.gif) repeat-x 0 100% #ebebeb; font-size:.9em; }
-.massaction td { width:50%; border-top:1px solid #fff; padding:1px 8px; vertical-align:middle; }
-.massaction .entry-edit fieldset .select { width:auto; /*width:120px;*/ display:inline; }
-.massaction .entry-edit fieldset select.validation-failed { border:1px dashed #eb340a !important; background:#faebe7 !important }
-.massaction .entry-edit fieldset { margin:0; padding:0; background:none; border:none; }
-.massaction .entry-edit fieldset .field-row { display:inline; }
-.massaction .entry-edit .field-row label { float:none; width:auto; margin-left:13px; }
-.massaction .entry-edit { margin:0 !important; padding:0; }
-.massaction .entry-edit .validation-advice { display:none !important; }
-.massaction a { text-decoration:none; }
-.massaction .entry-edit fieldset span.form_row,
-.massaction .entry-edit fieldset span.field-row { clear:none !important; display:inline; float:left !important; margin:0; padding:0 5px 0 0; }
-
-.massaction .entry-edit .outer-span { float:left; }
-
-/* Grid - Filter */
-.grid tr.filter { background:url(images/filter_row_bg.gif) repeat-x #e3eff1; cursor:default; }
-.grid tr.filter th { padding-top:5px; padding-bottom:5px; border:1px solid #bdbdbd; border-width:0 1px 1px 0; white-space:normal; }
-.grid tr.filter th.last { border-right:0; }
-.grid tr.filter input.input-text { width:85%; }
-.grid tr.filter select { width:100%; }
-.grid tr.filter .range .range-line { margin-bottom:3px; width:100px; }
-.grid tr.filter .range div.date { min-width:121px; }
-.grid tr.filter .range input { float:right; width:50px !important; margin-top:0; }
-.grid tr.filter .range select { float:right; width:56px !important; margin-top:0; }
-.grid tr.filter .range .label { display:block; width:36px; float:left; padding-left:2px; }
-.grid tr.filter .date img { width:15px; height:15px; cursor:pointer; vertical-align:middle; }
-.grid .head-massaction select { width:auto !important; max-width:90px; }
-.grid select.select-export-filter,
-.grid select.multiselect-export-filter { width:278px; }
-
-/* Grid Footer */
-.grid table tfoot tr { background:#D7E5EF; }
-.grid table tfoot tr td { border-top:1px solid #9babb9; background:#e5ecf2; line-height:1.7em; }
-.grid table.border tfoot tr td { background:#D7E5EF !important; }
-
-
-/* Dynamic Grid */ /* Used in pages like Catalog -> Attributes */
-.dynamic-grid th { padding:2px;width:100px; }
-.dynamic-grid td { padding:2px; }
-.dynamic-grid td input { width:94px; }
-tr.dynamic-grid td,
-tr.dynamic-grid th { padding:2px 10px 2px 0; width:auto; }
-tr.dynamic-grid input.input-text { width:154px; }
-.available { color:#080; font-weight:bold; }
-.not-available { color:#800; }
-
-
-/* ACCORDION
-*******************************************************************************/
-dl.accordion .grid { margin-bottom:0; }
-dl.accordion dt,
-.entry-edit .entry-edit-head { background:#6f8992; padding:2px 10px; }
-dl.accordion dt, div.collapseable { margin-top:1px; }
-dl.accordion dt a, div.collapseable a { background:url(images/entry_edit_head_arrow_down.gif) 100% 50% no-repeat; color:#fff; display:block; font-weight:bold; text-decoration:none; }
-div.disabled { background:#c6cbc9 !important; }
-div.disabled a { background-image:url(images/entry_edit_head_arrow_down2.gif) !important; color:#f6f6f6 !important; }
-
-.entry-edit fieldset.collapseable { margin-bottom:10px; }
-
-dl.accordion dt a:hover, div.collapseable a:hover { color:#fff; text-decoration:none; }
-dl.accordion dt.open a, div.collapseable a.open { background:url(images/entry_edit_head_arrow_up.gif) 100% 50% no-repeat; }
-dl.accordion dd { display:none; }
-dl.accordion dd.open { display:block; }
-img.accordion-btn { float:right; margin-top:1px; margin-right:5px; }
-
-/* TABS
-*******************************************************************************/
-
-/* Vertical Tabs */
-ul.tabs { border-top:1px solid #bebebe; background-color:#e7efef; }
-ul.tabs a, ul.tabs span { display:block; }
-ul.tabs a, ul.tabs a:hover { text-decoration:none; }
-/* ul.tabs a.notloaded { color:#999; } */
-ul.tabs a, ul.tabs a:hover { color:#000; }
-ul.tabs, ul.tabs a { background:url(images/tabs_link_bg.gif) repeat-y 100% #E7EFEF; }
-ul.tabs a:hover { background-color:#D8E6E6; background-image:url(images/tabs_link_over_bg.gif); }
-ul.tabs a.active,
-ul.tabs .ui-state-active a { padding:0; border-bottom:1px solid #bebebe; background:none; }
-ul.tabs a:hover.active,
-ul.tabs .ui-state-active a:hover { padding:0; }
-ul.tabs span { background:url(images/tabs_span_bg.gif) repeat-x 0 100%; padding:.3em 0.5em .28em 1.5em; cursor:pointer; }
-ul.tabs span em { float:right; }
-ul.tabs a.active span,
-ul.tabs a:hover.active span,
-ul.tabs .ui-state-active a span,
-ul.tabs .ui-state-active a:hover span { background:#fff; font-weight:bold; }
-ul.tabs a.subitem { padding-left:2.2em; }
-ul.tabs span.changed,
-ul.tabs span.error,
-ul.tabs span.loading { float:right; background:0; padding:0; }
-ul.tabs a.changed span.changed { background:url(images/fam_bullet_disk.gif) 0 0 no-repeat !important; width:16px; height:16px; }
-ul.tabs a.error span.error { background:url(Magento_Adminhtml::images/fam_bullet_error.gif) 0 0 no-repeat !important; width:16px; height:16px; }
-ul.tabs a.ui-tabs-loading span.loading { background:url(images/loader-small.gif) 0 0 no-repeat !important; width:16px; height:16px; }
-ul.tabs a.changed { font-style:italic; }
-
-/* Horizontal Tabs */
-ul.tabs-horiz { margin:0 0 18px 0; background:url(images/horiz_tabs_ul_bg.gif) repeat-x 0 100% #f8f8f8; padding:8px 0 0 5px; }
-ul.tabs-horiz li { float:left; margin:0 4px; }
-ul.tabs-horiz li a { display:block; background:#e2e2e2; border:1px solid #ccc; padding:2px 10px; color:#333 !important; text-decoration:none !important; }
-ul.tabs-horiz li a.notloaded { /* not used for now */ }
-ul.tabs-horiz li a.active,
-ul.tabs-horiz .ui-state-active a { border-bottom:1px solid #fff; background:#fff; }
-
-
-/* MESSAGES
-*******************************************************************************/
-.notification-global { padding:5px 27px 5px 47px; background:#fff9e9 url(Magento_Adminhtml::images/error_msg_icon.gif) 27px 5px no-repeat; border-bottom:1px solid #eee2be; border-top:1px solid #eee2be; font-size:11px; line-height:16px; margin:0 0 -3px; color:#444; position:relative; }
-.notification-global-notice { background-image:url(Magento_Adminhtml::images/note_msg_icon.gif); }
-.notification-global .label { color:#eb5e00; }
-.notification-global .clickable { cursor:pointer; }
-.notification-global span.critical { color:#d20000; }
-.notification-global a:hover { text-decoration:none; }
-
-.error,
-a.error span,
-.required,
-.validation-advice,
-label.mage-error { color:#D40707 !important; font-weight:bold !important; }
-label.mage-error {width: auto !important; display: block;}
-.notice { color:#ea7601}
-.messages ul { border:0 !important; }
-.messages li { min-height:23px !important; margin-bottom:11px !important; padding:8px 8px 2px 32px !important; font-size:.95em !important; font-weight:bold !important; }
-.messages ul li { margin:0 0 3px 0 !important; border:0 !important; padding:0 !important; }
-.error-msg { border:1px solid #f16048 !important; color:#df280a !important; background:#faebe7 url(Magento_Adminhtml::images/error_msg_icon.gif) no-repeat 10px 10px !important; }
-.success-msg { border:1px solid #95a486 !important; color:#3d6611 !important; background:#eff5ea url(Magento_Adminhtml::images/success_msg_icon.gif) no-repeat 10px 10px !important; }
-.notice-msg { border:1px solid #ffd967 !important; background:#fffbf0 url(Magento_Adminhtml::images/note_msg_icon.gif) no-repeat 10px 10px !important; color:#3d6611 !important; }
-.warning-msg { border:1px solid #666e73 !important; background:#e6e6e6 url(Magento_Adminhtml::images/warning_msg_icon.gif) no-repeat 10px 10px !important; color:#000000 !important; }
-.validation-advice,
-label.mage-error { clear:both; min-height:15px; margin:3px 0 0 9px; background:url(images/validation_advice_bg.gif) no-repeat 2px 1px; padding-left:16px; font-size:.95em; font-weight:bold; line-height:1.25em; }
-input.validation-failed, textarea.validation-failed { background:#fef0ed; border:1px dashed #d6340e; }
-
-/* Noscript Notice */
-.noscript { border:1px solid #000; border-width:0 0 1px; background:#ffff90; font-size:12px; line-height:1.25; text-align:center; color:#2f2f2f; }
-.noscript .noscript-inner { width:900px; margin:0 auto; padding:12px 0 12px; background:url(images/i_notice.gif) 20px 50% no-repeat; }
-.noscript p { margin:0; }
-
-/* For Demo store only */
-.demo-notice { margin:0; background:#d75f07; padding:5px 10px 6px 10px; color:#fff; line-height:1em; text-align:center; }
-
-
-/* FORMS
-*******************************************************************************/
-select.countries option { background-repeat:no-repeat; }
-.entry-edit .fieldset .tree li,
-.entry-edit .tree li { margin:0; }
-
-
-/* Entry Edit */ /* Site-wide form fieldset */
-table.form-edit { width:100%; }
-.box,
-.entry-edit fieldset,
-.entry-edit .fieldset { padding:10px 15px; margin-bottom:15px; }
-.entry-edit .entry-edit-head h4 { float:left; padding:0; background:none; margin:0; color:#fff; font-size:1em; line-height:18px; min-height:0; }
-.entry-edit .entry-edit-head .tools { float:right;}
-.entry-edit .entry-edit-head strong,
-.entry-edit .entry-edit-head a { color:#fff; font-size:1em; line-height:18px; min-height:0; font-weight:bold}
-.entry-edit .entry-edit-head .entry-edit-head-link {height:41px; margin:-41px 0 0; position: absolute; visibility: hidden;}
-.entry-edit .content { margin-left:0 !important; padding:10px 15px; }
-.entry-edit fieldset li,
-.entry-edit .fieldset li { margin:4px 0; }
-.entry-edit fieldset span.form_row,
-.entry-edit .fieldset span.form_row,
-.entry-edit fieldset .field-row .hint,
-.entry-edit .fieldset .field-row .hint { float:left; color:#999; padding-left:12em; }
-.entry-edit .form-buttons { float:right; margin:2px -3px 2px 0pt; }
-label.inline { float:none !important; width:auto !important; }
-.nested-content .entry-edit { margin-left:2em; }
-.nested-content .entry-edit .entry-edit { margin-left:0; }
-#coupon_container .entry-edit { min-width:310px; }
-
-/* Form Elements */
-input.input-text,textarea,select { border-width:1px; border-style:solid; border-color:#aaa #c8c8c8 #c8c8c8 #aaa; background:#fff; font:12px arial, helvetica, sans-serif; }
-select { min-height:17px; /* to set the height for empty selects */ }
-input.input-text,textarea { padding:2px; }
-input.qty { width:40px !important; }
-input.item-qty { width:22px !important; }
-input.price { width:50px !important; text-align:right; }
-input[type=text].disabled { background:#eee; }
-select optgroup { font-style:normal; }
-select optgroup option { padding-left:10px; }
-select optgroup option.even { background:#f6f6f6; } /* Zebra even-row */
-select.multiselect option { padding:3px 4px; border-bottom:1px solid #ddd; }
-.checkboxes li { margin:0 0 5px !important; }
-.field-100 { background-color:#fff; border-width:1px; border-style:solid; border-color:#aaa #c8c8c8 #c8c8c8 #aaa; padding:2px; }
-.field-100 textarea,
-.field-100 input.input-text { float:left; width:100% !important; border:0 !important; padding:0 !important; }
-@media screen and (-webkit-min-device-pixel-ratio:0) {
- select option:disabled,
- select:disabled option { color:#c9c9c9!important;color:#cacaca!important; text-shadow:2px 2px 2px #000; }
-}
-
-/* Form List */ /* Table for default form data */
-.form-list { width:auto; border:0 !important; }
-.form-list td.label,
-.form-list td.value,
-.form-list td.value2,
-.form-list td.note,
-.form-list td.scope-label,
-.form-list td.use-default { border:0 !important; padding-top:5px !important; padding-bottom:5px !important; padding-left:5px !important; background:0 !important; }
-.form-list td.hidden { border:0 !important; padding:0 !important; background:0 !important; }
-.form-list td.label { width:200px; }
-.form-list td.label label { display:block; width:185px; padding-right:15px; }
-.form-list td.value input.input-text,
-.form-list td.value textarea { width:274px; }
-.form-list td.value textarea { height:15em; }
-.form-list td.value select { width:280px; }
-.form-list td.value select.select-date { width:87px; }
-.form-list td.note { background:url(images/note_cell_bg.gif) 6px 10px no-repeat !important; padding-left:18px; }
-.form-list td.scope-label { padding-left:5px; color:#6f8992; font-size:.9em; }
-.form-list p.note { margin:0; padding:0 0 0 13px; background:url(images/note_bg.gif) 1px 6px no-repeat; font-size:11px; }
-
-.columns .form-list { width:auto; }
-.columns .form-list td.value { width:280px; padding-right:5px !important; }
-.columns .form-list td.value .next-toinput { width:75px; display:inline; margin-right:5px; }
-.columns .form-list td.value .next-toselect input.input-text { width:195px!important; display:inline; }
-
-.fieldset-wide .form-list { width:100% !important; }
-.fieldset-wide .form-list td.value { width:auto !important; }
-.fieldset-wide .form-list td.value input.input-text,
-.fieldset-wide .form-list td.value textarea { width:98% !important; }
-#weight {width: 110px !important; }
-/*.fieldset-wide .form-list td.value select { display:block; }*/
-.fieldset-wide .form-list td.scope-label { white-space:nowrap; width:1px; }
-.fieldset-wide .form-list td.note { width:120px; }
-
-.multi-input { margin-bottom:8px; } /* Example: Address fields with 2 input lines */
-.grid tr .form-list tr { background:#fff !important; } /* Follows grid row background-color */
-.grid tr.even .form-list tr { background:#f6f6f6 !important; } /* Follows grid row background-color */
-.grid tr.on-mouse .form-list tr { background:#fcf5dd !important; } /* Follows grid row background-color */
-.grid tr .form-list { margin:8px 0; }
-.field-row { display:block; margin-bottom:5px; }
-span.delete-image,
-span.delete-file { display:block; white-space:nowrap; padding-left:25px; }
-span.delete-file { padding:0; }
-
-/* Back compatibility with span forms */
-.entry-edit .field-row { display:block; }
-.entry-edit .field-row label { float:left; width:150px; }
-
-/* Form Button */
-.content-buttons.form-buttons,
-.content-header .form-buttons { text-align:right; margin-bottom:0; }
-.content-header .content-buttons-placeholder { display:inline !important; }
-.content-header .form-buttons { float:right; }
-.content-header td.form-buttons { float:none; }
-.content-header .form-buttons button { margin-bottom:3px; }
-.sub-btn-set { border:1px solid #ddd; border-width:0 1px; background:url(images/sub_button_bg.gif) repeat; padding:3px 10px; text-align:right; }
-button,
-.form-button { vertical-align:middle; border-width:1px; border-style:solid; border-color:#ed6502 #a04300 #a04300 #ed6502; padding:0 7px 1px 7px; background:#ffac47 url(Magento_Adminhtml::images/btn_bg.gif) repeat-x 0 100%; color:#fff; font:bold 12px arial, helvetica, sans-serif; cursor:pointer; text-align:center !important; white-space:nowrap; }
-button:hover { background:#f77c16 url(Magento_Adminhtml::images/btn_over_bg.gif) repeat-x 0 0; }
-button:active { background:#f77c16 url(Magento_Adminhtml::images/btn_on_bg.gif) repeat-x 0 0; }
-button span { line-height:1.35em; background-repeat:no-repeat; background-position:0 50%; }
-button span span { background:none !important; padding:0 !important; margin:0 !important; display:inline !important; }
-button.delete,
-button.save,
-button.add { padding-left:6px; }
-button.cancel span,
-button.delete span,
-button.save span,
-button.add span,
-button.back span,
-button.add-image span,
-button.add-widget span { padding-left:20px; }
-/* Google Chrome specific fix for empty buttons */
-button.add span:after,
-button.delete span:after { display:inline-block; clear:both; content:"."; font-size:0; line-height:0; height:0; overflow:hidden; }
-button.back { border-color:#ccc #aaa #aaa #ccc; background-color:#fff; background-image:url(images/btn_back_bg.gif); color:#555; }
-button.back span { background-image:url(images/icon_btn_back.gif); }
-button.fail,
-button.cancel,
-button.delete { border-color:#d24403 #a92000 #a92000 #d24403; background-image:url(images/cancel_btn_bg.gif); background-color:#fcaf81; color:#fff; }
-button.fail:hover,
-button.cancel:hover,
-button.delete:hover { background-image:url(images/cancel_btn_over_bg.gif); }
-button.fail:active,
-button.cancel:active,
-button.delete:active { background-image:url(images/cancel_btn_active_bg.gif); background-color:#e0612f; }
-button.cancel span,
-button.delete span { background-image:url(images/cancel_btn_icon.gif); }
-button.add span { background-image:url(images/add_btn_icon.gif); }
-button.save span { background-image:url(images/save_btn_icon.gif); }
-button.show-hide span { background-image:url(images/btn_show-hide_icon.gif); padding-left:26px; }
-button.add-image span { background-image:url(images/btn_add-image_icon.gif); }
-button.add-widget span { background-image:url(images/btn_add-widget_icon2.gif); padding-left:24px; }
-button.add-variable span { background-image:url(images/btn_add-variable_icon.gif); padding-left:26px; }
-button.go span { background-image:url(images/btn_go.gif); padding-left:16px; }
-button.btn-chooser { display:block; margin:0 0 10px; }
-button.success { background-image:url(images/btn_gr_bg.gif); border-color:#46745E; }
-button.success:hover { background:url(images/btn_gr_over.gif) #6cac46; }
-button.success:active { background:url(images/btn_gr_on.gif) repeat-x 0 0 #3fa05e; }
-
-button.disabled,
-button.disabled:hover,
-button.disabled:active { border-color:#777 #505050 #505050 #777; background:#919191 url(images/btn_bg-disabled.gif) 0 0 repeat-x; color:#fff; cursor:default; opacity:.8; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=20)"; }
-button.add.disabled span { background-image:url(images/add_btn_icon-disabled.gif); }
-
-button.loading > span { padding-left:20px; background-image: url(images/btn_loading-icon.gif) !important;}
-
-button.icon-btn { width:32px !important; }
-button.icon-btn span { text-indent:-999em; display:block; width:16px; padding:0; overflow:hidden; }
-
-.buttons-set { margin:0 0 10px; }
-.buttons-set button { margin-right:5px; }
-
-
-/* Buttons group */
-
-.btn-add { padding-left:6px; }
-.btn-add span {
- background-image:url(images/add_btn_icon.gif);
- padding-left:20px;
-}
-div.button {
- border-width:1px;
- border-style:solid;
- order-color:#ed6502 #a04300 #a04300 #ed6502;
- padding:1px 7px 3px 7px;
- background:#ffac47 url(Magento_Adminhtml::images/btn_bg.gif) repeat-x 0 100%;
- color:#fff;
- font:bold 12px arial, helvetica, sans-serif;
- cursor:pointer;
- text-align:center !important;
- white-space:nowrap;
-}
-div.button:hover {
- background:#f77c16 url(Magento_Adminhtml::images/btn_over_bg.gif) repeat-x 0 0;
-}
-div.button:active {
- background:#f77c16 url(Magento_Adminhtml::images/btn_on_bg.gif) repeat-x 0 0;
-}
-div.button span {
- line-height:1.25em;
- background-repeat:no-repeat;
- background-position:0 50%;
-}
-div.button {
- -webkit-touch-callout: none;
- -webkit-user-select: none;
- -khtml-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
-}
-.buttons-group {
- position: relative;
- display:inline-block;
- vertical-align:middle;
-}
-.buttons-group:before,
-.buttons-group:after {
- display: table;
- content: "";
-}
-.buttons-group:after {
- clear: both;
-}
-.buttons-group > .button {
- position:relative;
- float:left;
- margin-left:-1px;
- border-radius:0;
-}
-.buttons-group > .button:first-child {
- margin-left:0;
-}
-.buttons-group > .button:last-child,
-.buttons-group > [data-toggle="dropdown"] {
-}
-
-/* Button toggle (with dropdown menu) */
-.dropdown-menu {
- position:absolute;
- display:none;
- list-style:none;
- margin:1px 0 0 0;
- padding:0;
- right:0;
- top:100%;
- min-width: 100%;
- border-width:1px; border-style:solid; border-color:#ed6502 #a04300 #a04300 #ed6502;
- box-shadow: 0 3px 6px rgba(0, 0, 0, 0.2);
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- -ms-box-sizing: border-box;
- box-sizing: border-box;
- white-space: nowrap;
-}
-.dropdown-menu li {
- background:#ffac47;
- background:rgba(255, 172, 71, .95);
- text-align: left;color:#fff; font:bold 12px arial, helvetica, sans-serif; cursor:pointer;
- padding:0;
- position: relative;
- z-index: 1;
-}
-.dropdown-menu li .item {
- display: block;
- padding:4px 25px 4px 8px;
-}
-.dropdown-menu li > .tooltip {
- position: absolute; top:5px; right:3px;
-}
-.dropdown-menu li.selected {
-}
-.dropdown-menu li:hover {
- background:#f77c16;
- z-index: 2;
-}
-.dropdown-menu li:active {
- background:#f77c16;
-}
-.dropdown-menu li:last-child {
-
-}
-.dropdown-menu-top {
- margin:0 0 3px 0;
- top:auto;
- bottom:100%;
-}
-.buttons-group.active {
- z-index:20;
-}
-.buttons-group.active .dropdown-menu {
- display:block;
-}
-.btn-toggle span {
- width:6px; overflow: hidden; display: block;
-}
-.active .btn-toggle {
- background:#f77c16 url(Magento_Adminhtml::images/btn_on_bg.gif) repeat-x 0 0;
-}
-.btn-toggle span:before {
- display: inline-block;
- content:'';
- margin-left:100px;
- /*position: absolute;*/
- text-indent: 0;
- margin-left:0;
- width: 0;
- height: 0;
- border-right:3px solid transparent;
- border-left:3px solid transparent;
- border-top: 6px solid #fff;
-}
-
-/* =============================================================================
- Tooltip
- ========================================================================== */
-
-/* Styles for simple "css" tooltip */
-.tooltip {
- display:inline-block;
- vertical-align:middle;
- line-height:1.1;
-}
-.tooltip > .help {
- width:15px;
- height: 15px;
- line-height: 15px;
- text-indent: -999em;
- overflow: hidden;
- display: block;
- background: url(images/icon-tooltip.png) no-repeat 0 0;
- position: relative; z-index: 111;
- cursor:help;
-}
-.tooltip-content {
- display:none;
- position:absolute;
- max-width:200px;
- margin-top:5px;
- margin-left:-18px;
- padding:8px;
- border-radius:3px;
- background:#000;
- background:rgba(0,0,0,.8);
- color:#fff;
- text-shadow:none;
- z-index:20;
- font-weight: normal;
- font-size: 11px;
-}
-.tooltip-content:before {
- content:'';
- position:absolute;
- width:0;
- height:0;
- top:-5px;
- left:20px;
- border-left: 5px solid transparent;
- border-right: 5px solid transparent;
- border-bottom: 5px solid #000;
- opacity:.8;
-}
-.tooltip:hover {
- z-index:20;
-}
-.tooltip:hover > .help {
- background-position: 0 -15px;
-}
-.tooltip > .help:hover + .tooltip-content {
- display:block;
-}
-
-
-/* SWITCHER
-*******************************************************************************/
-.switcher { margin-bottom:10px; border:1px solid #cddddd; background:#e7efef; padding:10px; }
-.side-col .switcher { padding-right:26px; }
-.side-col .switcher label { display:block; }
-.side-col .switcher .link-store-scope { float:right; margin-right:-19px; margin-left:3px; }
-.side-col .switcher select { width:100%; float:left; }
-/*.side-col .switcher { margin-right:20px; margin-bottom:20px; }*/
-.catalog-categories .side-col .switcher { margin-right:0; margin-bottom:15px; }
-.link-store-scope { display:inline-block; vertical-align:middle; margin:0 0 1px; width:16px; height:16px; background:url(images/i_question-mark.png) 0 0 no-repeat; text-decoration:none !important; text-indent:-999em; overflow:hidden; }
-.store-scope .link-store-scope { float:left; margin-right:10px; }
-.store-scope .tree-store-scope { float:left; padding:7px 10px; border:1px dotted #dedede; }
-.store-scope table.stores-tree { float:left; width:auto !important; }
-.form-list td.value .store-scope { white-space:nowrap; }
-.form-list td.value .link-store-scope { float:none; margin-right:0; vertical-align:top; margin-top:6px; }
-
-
-/* SPACE
-*******************************************************************************/
-.box-left, .box-right { width:48.5%; }
-.box-left { float:left; }
-.box-right { float:right; }
-.box-left .content,
-.box-right .content { padding:6px 14px; }
-.separator, .pipe { padding:0 6px; font-size:.9em; } /* vertical pipe */
-.divider { display:block; height:1px; margin:8px 0; background:#ddd; overflow:hidden; } /* horizontal pipe */
-td.divider { font-size:1px; line-height:0; }
-.box,
-.entry-edit fieldset,
-.entry-edit .fieldset { border:1px solid #d6d6d6; background:#fafafa; }
-
-
-/* SCOLLER */ /* Used primarily in Sales -> Order -> Create Order */ /*
-*******************************************************************************/
-.scroll-cont {
- position:absolute;
- top:-25px;
- left:503px;
- width:16px;
- height:265px;
- background:transparent url(images/db-scroll-bg.gif) no-repeat top;
- z-index:10000;
- }
-.auto-scroll { overflow:auto; height:11em; }
-.root { position:relative; height:260px; margin:0; width:1px; }
-.thumb { position:absolute; height:40px; width:16px; margin-top:-28px; z-index:11000; }
-.up { margin-top:254px; height:16px; }
-.dn { margin-top:0; padding:0; height:15px; }
-.up a, .up a img,
-.dn a, .dn a img,
-.thumb a ,
-.thumb a img { border:0; }
-.up a:active, .dn a:active { outline:none; }
-.scrollContainer {
- position:absolute;
- left:0;
- top:19px;
- clip:rect(0 467px 200px 0);
- overflow:auto;
- border:0;
- }
-.scrollContent { position:absolute; left:0; top:0; }
-
-/* Horizontal scroll */
-.hor-scroll { width:100%; padding-bottom:4px; margin-bottom:-4px; } /* IE has personal style, see iestyles.css */
-
-
-/**/
-.note-list { width:100%; overflow:hidden; }
-.note-list li { border-top:1px solid #e3e3e3; margin-top:9px !important; background:url(images/icon_note_list.gif) no-repeat 0 4px; padding-bottom:9px; padding-left:18px; }
-
-
-
-/******************************************************************************/
-/********************************** STRUCTURE *********************************/
-/******************************************************************************/
-
-/* LAYOUT
-*******************************************************************************/
-.wrapper { min-width:960px; }
-.wrapper-popup { min-width:750px; }
-.header { background:url(images/header_top_bg.gif) repeat-x #425e66; text-align:right; }
-.middle { min-height:450px; background:url(images/simple_container_bg.gif) repeat-x #fff; padding:23px 27px 0 27px; }
-.middle-popup { border-bottom:3px solid #fff; background:url(images/middle_bg.gif) repeat-x 0 100% #fff; padding:0 0 0 0; background:yellow; }
-.container-collapsed { padding:1.8em 2.2em 1.8em 2em; padding-top:0; }
-.columns {background:url(images/side_col_bg.gif) repeat-y 217px 0; }
-
-div.side-col { float:left; width:220px; margin-right:-220px; padding-bottom:25px; }
-div.main-col { margin-left:220px; min-height:450px; padding:0 0 25px 25px; }
-div.main-col-inner { float:left; /* Fixes some inner clears in the liquid main-col */ width:100%; }
-
-.footer { clear:both; background:url(images/footer_bg.gif) repeat-x #e6e6e6; padding:105px 2.8em 2.8em 2.8em; font-size:.95em; text-align:center; }
-.simple-container-popup { min-height:50px !important; padding:1.8em 2.3em 6em 2.3em; background:url(images/simple_container_bg.gif) repeat-x; }
-
-.page-popup { background:#fff; }
-
-
-/******************************************************************************/
-/************************************* BOXES **********************************/
-/******************************************************************************/
-
-/* HEADER & FOOTER
-*******************************************************************************/
-
-.logo { float:left; margin:5px 20px 5px 27px; height:43px; }
-.header-top { border-bottom:1px solid #5F767F; }
-
-/* Header right */
-.header-right { padding:10px 25px 0 15px; font-size:.95em; color:#fff; }
-.header-right a, .header-right a:hover { color:#fcce77; }
-.header-right .separator { color:#999; }
-.header-right fieldset { display:inline; padding-left:10px; }
-.header-right fieldset input.input-text { width:18em; }
-.header-right .super {
- float:right;
- line-height:1.8em;
- margin-bottom:14px;
- margin-left:1.3em;
- }
-
-/* Search autocomplete */
-div.autocomplete {
- z-index:10000;
- position:absolute;
- width:250px;
- background-color:white;
- border:1px solid #888;
- margin:0;
- padding:0;
- }
-div.autocomplete ul { margin:0; padding:0; }
-div.autocomplete ul li.selected { background-color:#dcebf0; }
-div.autocomplete ul li { padding:.5em .7em; min-height:32px; cursor:pointer; text-align:left; color:#2f2f2f; line-height:1.3em; }
-
-/* Mage suggest */
-/*.mage-suggest { position:relative; display: inline-block; background: #fff; border-radius: 5px; box-shadow: 1px 0 2px #ddd; }
-.mage-suggest .input-text { border-radius: 5px; margin: 7px; border: 1px solid #ddd; height: 20px; padding: 3px 25px 3px 10px; line-height: 26px; background: url(images/bkg_search-magnifier.png) 98% 50% no-repeat; }
-.mage-suggest-dropdown { overflow-x: hidden; position: absolute; top: 100%; margin-top:-4px; left: 0; min-width: 100%; background: #fff; border: solid #ddd; border-width: 0 1px 1px; padding: 10px 0; box-sizing: border-box; border-radius: 0 0 5px 5px; box-shadow: 1px 1px 2px #ddd; }
-.mage-suggest-dropdown.overflow-y { overflow-y: scroll; }
-.mage-suggest-dropdown .ui-menu-item a { display:block; padding: 0 10px; text-decoration: none; font:normal 12px/26px Arial, sans-serif; text-align: left; border-bottom: 1px solid #f2f2f2; color:#2d2d2d; }
-.mage-suggest-dropdown .ui-state-active,
-.mage-suggest-dropdown .ui-state-focus { background: #f2f2f2; color:#000; }*/
-.mage-suggest-inner {padding: 5px 0;}
-.mage-suggest {position: relative;}
-.mage-suggest-inner {position: absolute; background: #fff; top:0px; left:0px; border: 1px solid #ddd; border-radius: 5px; box-shadow: 1px 1px 2px #ddd;}
-.mage-suggest-inner > input {
- height: 22px;
- margin: 0 5px;
-}
-.mage-suggest-dropdown > h2 {
- font-size:0.8em;
- text-transform: uppercase;
- font-family:Arial, Helvetica, sans-serif;
- color: #555555;
- font-weight: normal;
- padding: 0 8px;
-}
-.mage-suggest-dropdown .ui-menu-item a { display:block; padding: 0 10px; text-decoration: none; font:normal 12px/26px Arial, sans-serif; text-align: left; border-bottom: 1px solid #f2f2f2; color:#2d2d2d; }
-.mage-suggest-dropdown .ui-state-active,
-.mage-suggest-dropdown .ui-state-focus { background: #f2f2f2; color:#000; }
-.mage-suggest-dropdown .ui-corner-all {
- border-radius: 0px;
-}
-.mage-suggest-dropdown .ui-widget-content, .mage-suggest-dropdown .ui-menu .ui-menu-item a, .mage-suggest-dropdown .ui-menu .ui-menu-item a.ui-state-focus {
- background: #ffffff;
- border: none;
- color: #000000;
-}
-.mage-suggest-dropdown .ui-menu .ui-menu-item a, .mage-suggest-dropdown .ui-menu .ui-menu-item a.ui-state-focus {
- border-top: 1px solid #efefef;
- margin: 0;
- padding: 3px 8px;
-}
-.mage-suggest-dropdown .ui-menu {
- padding: 0px;
- width: 100%;
-}
-.mage-suggest-dropdown .ui-menu .ui-menu-item a.ui-state-focus {
- background: #ebebeb;
-}
-.mage-suggest-dropdown .show-all {
- padding: 5px 8px;
- color: #555555;
- font-family:Arial, Helvetica, sans-serif;
- font-size: 0.8em;
-}
-.mage-suggest-dropdown {
- overflow: auto;
- max-height: 500px;
- z-index: 1;
-}
-.mage-suggest.category-select .mage-suggest-inner {background: transparent; position: static; border: none; border-radius: 0px; box-shadow: none;}
-.mage-suggest.category-select .mage-suggest-choices {background: #fff; border: 1px solid #ddd; border-radius: 5px; box-shadow: none; overflow: hidden;}
-.mage-suggest.category-select .mage-suggest-choices li {float: left; margin: 5px 0 5px 7px;}
-.mage-suggest.category-select .mage-suggest-search-field input {
- background: none repeat scroll 0 0 transparent !important;
- border: 0 none;
- box-shadow: none;
- font-family: sans-serif;
- font-size: 100%;
- height: 22px;
- margin: 1px 0;
- outline: 0 none;
- padding: 0 5;
-}
-.mage-suggest.category-select .mage-suggest-dropdown {
- position: absolute;
- width: 100%;
- background: #fff; border: 1px solid #ddd; border-radius: 5px;
- margin-top: 2px;
-}
-.mage-suggest-dropdown .jstree-default.jstree-focused {
- background: #ffffff;
-}
-.mage-suggest-dropdown .jstree li {
- margin-left: 18px;
-}
-.mage-suggest-dropdown .jstree > ul > li {
- margin-left: 0px;
-}
-.mage-suggest-dropdown .jstree a {
- padding: 2px 3px;
-}
-.mage-suggest-dropdown .jstree .jstree-hovered {
- border: none;
- background: #efefef;
-}
-.mage-suggest-dropdown .jstree .jstree-clicked {
- border: none;
- background: #e5e5e5;
-}
-.mage-suggest-dropdown .category-path {
- color: #777777;
- margin-left: 7px;
- font-size: 11px;
-}
-.mage-suggest-dropdown .ui-menu {
- float: none;
-}
-.mage-suggest-dropdown .ui-menu .ui-menu-item{
- margin: 0px;
-}
-
-/* Footer */
-.footer .bug-report { float:left; width:35%; text-align:left; }
-.footer .legality { float:right; width:35%; min-height:19px; padding-left:22px; text-align:right; }
-
-/* COLUMNS
-********************************************************************************************/
-
-.catalog-categories .side-col { width:25em; padding-right:25px; } /* Catalog/Categories */
-.catalog-categories .main-col { padding-left:25px; margin-left:25em; } /* Catalog/Categories */
-.order-summary .side-col { padding-right:25px; } /* Order/Create */
-.order-summary .main-col { padding-left:25px; } /* Order/Create */
-
-
-/* HEADINGS
-********************************************************************************************/
-
-/* Content Header */
-.content-header { margin-bottom:18px; -webkit-box-sizing:border-box; -moz-box-sizing:border-box; box-sizing:border-box; border-bottom:4px solid #dfdfdf; padding-bottom:.25em; padding-top: 6px; }
-.content-header table { width:100%; }
-.content-header h3 { float:left; margin:.3em .5em 0 0; color:#eb5e00; font-size:1.25em; line-height:1.2em; }
-.content-header .head h3 { float:none; }
-.content-header .button-set { white-space:nowrap; text-align:right; }
-.content-header .content-buttons { white-space:nowrap!important; margin:0; }
-.content-header td.content-buttons { width:13%;white-space:nowrap!important; margin:0; }
-.content-buttons button,
-.content-header button,
-.filter-actions button { margin:0 0 0 5px; }
-.side-col .content-header { border-bottom:0; margin-right:12px; margin-bottom:.6em; }
-.catalog-categories .side-col .content-header { margin-right:0; } /* Catalog/Categories */
-
-.left-col-block { width:200px; }
-
-.content-header.fixed { padding:6px 8px; margin-bottom:0; border:0; position:fixed; left:0; top:0; width:100%; border-bottom:solid 1px #988753; z-index:100; z-index:auto\9; background:#fdfaa4; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=85)"; opacity:.85; z-index: 100; }
-.content-header.fixed button { margin-top:3px; }
-.content-header.fixed .content-buttons { float:right; }
-.content-buttons { margin-bottom:5px; float:right; display:inline; white-space:nowrap; }
-.content-header.fixed .form-buttons { padding-right:20px; }
-.content-header.fixed h3 { margin: 0 0 0 20px; display:inline; }
-
-
-/* Box Head */
-.box-head { margin-bottom:.6em; text-align:right; }
-.box-head h4 { float:left; margin-bottom:0; }
-
-
-/* Icon Head */ /* Headings with icon preceding text*/
-.icon-head { min-height:18px; background-repeat:no-repeat; background-position:0 0; padding-left:22px; }
-.head-customer-address-list { background-image:url(images/fam_house.gif); }
-.head-edit-form { background-image:url(images/fam_page_white.gif); }
-.head-customer-view { background-image:url(images/fam_status_online.gif); padding-left:18px; }
-.head-customer,
-.head-customer-groups { background-image:url(images/fam_group.gif); }
-.head-user { background-image:url(images/fam_user.gif); }
-.head-user-edit { background-image:url(images/fam_user_edit.gif); }
-.head-user-comment { background-image:url(images/fam_user_comment.gif); }
-.head-comment { background-image:url(images/fam_comment.gif); }
-.head-cart { background-image:url(images/fam_cart.gif); }
-.head-account { background-image:url(images/fam_account.gif); }
-.head-online-visitors { background-image:url(images/fam_monitor.gif); }
-.head-products { background-image:url(images/fam_package.gif); }
-.head-catalog-product { background-image:url(images/fam_package.gif); }
-.head-newsletter-queue { background-image:url(images/fam_newspaper_go.gif); }
-.head-newsletter-list { background-image:url(images/fam_newspaper.gif); }
-.head-newsletter-report { background-image:url(images/fam_newspaper_error.gif); }
-.head-tag, .head-tag-product { background-image:url(images/fam_tag_orange.gif); }
-.head-sales-order,
-.head-sales-invoice { background-image:url(images/fam_folder_table.gif); }
-.head-categories { background-image:url(images/fam_folder_database.gif); padding-left:20px; color:#253033 !important; }
-.head-catalog-product-attribute { background-image:url(images/fam_rainbow.gif); padding-left:24px; }
-.head-product-attribute-sets { background-image:url(images/fam_folder_palette.gif); padding-left:23px; }
-.head-tax { background-image:url(images/fam_money_add.gif); }
-.head-cms-page, .head-cms-block { background-image:url(images/application_view_tile.gif); }
-.head-backups-control { background-image:url(images/fam_server_database.gif); }
-.head-money, .head-promo-quote { background-image:url(images/fam_money.gif); }
-.head-shipping-address,
-.head-billing-address { background-image:url(images/fam_house.gif); }
-.head-shipping-method { background-image:url(images/fam_lorry.gif); }
-.head-payment-method { background-image:url(images/fam_creditcards.gif); }
-.head-order-date { background-image:url(images/fam_calendar.gif); }
-.head-customer-sales-statistics { background-image:url(images/fam_money.gif); }
-.head-notification { background-image:url(images/fam_folder_table.gif); }
-.head-compilation { background-image:url(images/fam_package_go.gif); }
-
-
-
-/******************************************************************************/
-/********************************* PAGE SPECIFIC ******************************/
-/******************************************************************************/
-
-
-/* LOGIN
-*******************************************************************************/
-#page-login { background:#f8f8f8; text-align:center; }
-.login-container { width:581px; margin:170px auto; padding-left:32px; background:url(images/login_logo.gif) no-repeat; }
-.login-form { padding:27px 57px 35px 57px; background:url(images/login_box_bg.jpg) no-repeat; text-align:left; }
-.login-form .input-left { float:left; }
-.login-form .input-right { float:right; }
-.login-form .input-box input.input-text { width:224px; }
-.login-form h2 { font-size:1.7em; font-weight:normal; }
-.login-form label { font-weight:bold; }
-.login-form .form-buttons { margin:12px 0 0 0; clear:both; text-align:right; }
-.login-box .bottom { width:581px; height:5px; background:url(images/login_box_bottom.jpg) no-repeat; overflow:hidden; }
-.login-container .legal { margin:0; background:url(images/login_box_legal_bg.gif) no-repeat; padding:8px 8px 5px 8px; font-size:.95em; }
-.login-form .validation-advice,
-.login-form label.mage-error { margin:3px 0 0 0; }
-.login-form .forgot-link { margin:0 17px 0 0; text-align:right; }
-.login-form .captcha { padding:10px 0 0; }
-.login-form .captcha-image { border:1px solid #aaa; margin:1.5em 0 0; position:relative; }
-.login-form .captcha-image img { vertical-align:bottom; }
-.login-form .captcha-reload { cursor:pointer; position: absolute; top:2px; right:2px; }
-.login-form .captcha-reload.refreshing { animation:rotate 1.5s infinite linear; -webkit-animation:rotate 1.5s infinite linear; -moz-animation:rotate 1.5s infinite linear; }
-
-@-webkit-keyframes rotate {
- 0% { -webkit-transform:rotate(0); }
- 0% { -webkit-transform:rotate(360deg); }
-}
-@-moz-keyframes rotate {
- 0% { -moz-transform:rotate(0); }
- 0% { -moz-transform:rotate(360deg); }
-}
-@keyframes rotate {
- 0% { transform:rotate(0); }
- 0% { transform:rotate(360deg); }
-}
-
-
-/* DASHBOARD
-*******************************************************************************/
-.dashboard-container { border:1px solid #ccc; }
-.dashboard-container .switcher { margin-bottom:0; border:0; }
-
-/* STORE MANAGEMENT
-*******************************************************************************/
-.adminhtml-system-store-deletestore .content-footer .content-buttons,
-.adminhtml-system-store-deletegroup .content-footer .content-buttons,
-.adminhtml-system-store-deletewebsite .content-footer .content-buttons { float:left; }
-
-
-/* SALES
-*******************************************************************************/
-
-/* Disabled block */
-.overlay span { display:block; width:100%; text-align:center; position:absolute; top:50%; margin:-5px 0 0; color:#000; }
-
-/* Prices */
-.price { white-space:nowrap !important; }
-
-/* Incl tax (for order tables) */
-.price-incl-tax { display:block; }
-.price-incl-tax .label { display:block; white-space:nowrap; }
-.price-incl-tax .price { /*display:block;*/ font-weight:bold; }
-
-/* Excl tax (for order tables) */
-.price-excl-tax { display:block; }
-.price-excl-tax .label { display:block; white-space:nowrap; }
-.price-excl-tax .price { /*display:block;*/ font-weight:bold; }
-
-/* Orders / Invoices / Shipments / Credit Memos Table */
-.order-tables td h5.title { font-size:1em; font-weight:bold; }
-.order-tables td .option-label { font-weight:bold; font-style:italic; }
-.order-tables td .option-value { padding-left:10px; }
-.order-tables td .qty-table { border:0 !important; width:100% }
-.order-tables td .qty-table td { border:0 !important; padding:0 4px !important; }
-
-dl.item-options dt { font-weight:bold; font-style:italic; }
-dl.item-options dd { padding-left:10px; }
-
-ul.item-options li { padding-left:.7em; }
-
-
-/* Create Order */
-.page-create-order .side-col { width:260px; background:none; padding:0; }
-.page-create-order .main-col { padding-left:28px; }
-.page-create-order .switcher { margin-bottom:25px; }
-.create-order-sidebar-container { border:1px solid #d6d6d6; background:#fafafa; }
-.create-order-sidebar-block .content { margin:0 !important; padding:4px 6px; }
-.create-order-sidebar-block .head { border-top:1px solid #ddd; background:#ececec; padding:2px 6px 1px; font-size:.9em; text-align:right; }
-.create-order-sidebar-block .head h5 { float:left; margin:0; color:#2c464f; text-align:left; }
-.create-order-sidebar-block .content table td,
-.create-order-sidebar-block table th { padding:0 3px 0 0; }
-.create-order-sidebar-block select { width:170px; }
-.create-order-sidebar-block ul { margin-left:20px; }
-.order-choose-address { margin:0 0 10px 0;padding:8px 15px;background:#e7efef; } /*Address Selector */
-.order-save-in-address-book { margin:0 0 0 0;padding:8px 15px;background:#e7efef; } /* Save in Address Book Checkbox */
-.entry-edit .content .form-list { width:100%; }
-
-.entry-edit .order-address td.label label { width:100px; }
-.entry-edit .order-address input.input-text,
-.entry-edit .order-address .textarea { width:95% !important; }
-.entry-edit .order-address .select { width:96.5%; }
-.entry-edit .order-address .validate-vat { text-align:right; padding:10px 0 0; width:96%; }
-.order-search-items .entry-edit .grid { height:610px; overflow:auto; }
-.order-search-items .entry-edit .grid table { width:99.9%; }
-/* .create-order-totals { background:url(images/bg_create_order_totals.gif) repeat-y 50% 0 !important; } */
-
-/* Product Configuration Popup */
-#popup-window-mask,
-.popup-window-mask { background:url(images/bg_window_mask.png) repeat 0 0; background:rgba(239, 239, 239, 0.5); position:absolute; top:0; right:0; bottom:0; left:0; width:100%; height:100%; z-index:399; }
-.product-configure-popup { background:#fafafa; border:1px solid #d6d6d6; left:50%; margin:0 0 0 -271px; position:fixed; top:50%; width:540px; z-index:400; }
-.product-configure-popup .validation-advice,
-.product-configure-popup label.mage-error { margin-left:0; }
-#product_composite_configure_messages { margin-left:0 !important; padding:10px 15px; }
-.product-configure-popup .content { max-height:400px; overflow:auto; }
-.product-configure-popup .content .grid { padding:0; }
-.product-configure-popup .content .grid table { border-bottom:1px solid #CBD3D4; }
-.product-configure-popup .product-options { border-bottom:1px solid #e7e7e7; margin:0 0 15px; padding:0 0 12px; }
-.product-configure-popup .product-options .required { color:#333 !important; font-weight:normal !important; }
-.product-configure-popup .product-options .required em { color:#d40707; }
-.product-configure-popup .last-fieldset .product-options { border:0 none; margin-bottom:0; padding-bottom:0; }
-.product-configure-popup .buttons-set { margin:0; padding:10px; }
-.product-configure-popup .buttons-set button { margin:0 0 0 5px; }
-
-/* Gift Card Product */
-.giftcard-form .availability { font-weight:bold; margin-bottom:1em; }
-.giftcard-form .in-stock { color:#1b6800; }
-.giftcard-form .out-of-stock { color:#cf3a00; }
-.giftcard-form .price-box { margin:1em 0; }
-.giftcard-form label { float:left; width:25%; }
-
-.giftcard-amount-form { margin:0 0 10px; }
-.giftcard-amount-form li { overflow:hidden; width:100%; }
-.giftcard-amount-form .field { overflow:hidden; margin-bottom:10px; width:100%; }
-.giftcard-amount-form .form-list .input-text { width:70px; }
-.giftcard-amount-form .form-list select { width:150px; }
-.giftcard-amount-form .form-list .input-box { float:left; width:75%; }
-.giftcard-amount-form .form-list .input-box .v-fix { white-space:nowrap; }
-.giftcard-amount-form .form-list .input-box p.notice { margin:5px 0 0; font-size:11px; white-space:nowrap; }
-.giftcard-amount-form .form-list .input-box p.notice span { display:block; margin-right:5px; }
-
-.giftcard-send-form .field { overflow:hidden; margin-bottom:10px; width:100%; }
-.giftcard-send-form .field .input-text { width:98%; }
-.giftcard-send-form .form-list .input-box { float:left; width:75%; }
-.giftcard-send-form .form-list textarea { height:100px; width:98%; }
-
-/* Product Options */
-.product-options { margin:10px 0 0; }
-.product-options dt label { font-weight:bold; font-size:12px; }
-.product-options dt .qty-holder { float:right; }
-.product-options dt .qty-holder label { vertical-align:middle; }
-.product-options dt .qty-disabled { background:none; border:0; padding:3px; color:#000; }
-.product-options dd { margin:5px 0 15px; padding:0 0 12px; border-bottom:1px solid #e7e7e7; }
-.product-options dd.last { border-bottom:0; margin-bottom:0; padding-bottom:0; }
-.product-options dd .input-box { display:block; }
-.product-options dd input.input-text { width:98%; }
-.product-options dd input.datetime-picker { width:150px; }
-.product-options dd .time-picker { display:-moz-inline-box; display:inline-block; padding:2px 0; vertical-align:middle; }
-.product-options dd .time-picker select { vertical-align:middle; }
-.product-options dd textarea { width:98%; height:8em; }
-.product-options dd select { width:100%; }
-.product-options .options-list {}
-.product-options .options-list li { vertical-align:middle; margin:0; padding:2px 0; line-height:1.315; }
-.product-options .options-list input.radio { float:left; margin:2px -18px 0 0; }
-.product-options .options-list input.checkbox { float:left; margin:2px -20px 0 0; }
-.product-options .options-list .label { display:block; margin-left:20px; }
-.product-options li { margin:3px 0; }
-
-/* Wishlist Bundle Product Options */
-.bundle-product-options { padding:5px 0 0 13px; }
-.bundle-product-options dl { padding:5px 0 0 15px; }
-.bundle-product-options dt { color:#111; }
-.bundle-product-options dd { color:#5b5b5b; margin-bottom:10px; }
-
-/* Order Totals */
-.order-totals { margin-left:auto; border:1px solid #d7c699 !important; padding:12px 0; background:#fcfac9; text-align:right; }
-.order-totals table { border:none; background:none; margin-left:auto; }
-.order-totals table td { padding:3px 20px 3px 10px; }
-.order-totals table td.label { white-space:normal; padding:3px 10px 3px 20px; }
-.order-totals table td.last { padding:2px 6px; }
-.order-totals-bottom { padding:0 20px; }
-.order-totals table .validation-advice,
-.order-totals table label.mage-error { text-align:right; white-space:nowrap; background-position:100% 1px; padding-right:14px; padding-left:0; }
-.grand-total, .grand_total { font-size:1.2em; font-weight:bold; color:#eb4d00 !important; }
-
-/* Shopping cart total summary row expandable to details */
-.summary-total { cursor:pointer; }
-.summary-total td { padding-top:5px !important; padding-bottom:5px !important; }
-.summary-total .summary-collapse { float:right; padding-left:20px; background:url(images/bg_collapse.gif) 0 4px no-repeat; text-align:right; cursor:pointer; }
-.show-details .summary-collapse { background-position:0 -52px; }
-.show-details td { border-top:1px solid #eae1b2; }
-.summary-details td { font-size:11px; background-color:#fdfcdf; }
-.summary-details-first td { border-top:1px solid #eae1b2; }
-
-/* Order Constants */
-.payment-methods dt { margin-bottom:3px; }
-.payment-methods dd { margin-left:20px; }
-.payment-methods .validation-advice,
-.payment-methods label.mage-error { margin-left:2px; }
-
-/* Cards List */
-.cards-list .offset { margin-left:10px; }
-.cards-list .info-table td { padding:2px 7px 2px 0; text-align:left; vertical-align:top; }
-
-.release-amounts { margin:0.5em 0; }
-
-/* Centinel */
-.centinel .authentication { background:#fff; }
-.centinel .authentication iframe { width:99%; height:400px; background:transparent !important; margin:0 0 7px !important; padding:0 !important; border:1px solid #ddd !important; }
-
-/* Gift Messages */
-.giftmessage-order-create .entire-order,
-.giftmessage-order-create .each-order-item { background-color:#eee; padding:6px 14px; height:275px; }
-.giftmessage-order-create .entire-order .entry-edit,
-.giftmessage-order-create .each-order-item .scroll { height:250px; overflow:auto; }
-.giftmessage-order-create .single { width:100%; float:left; padding:1.2em 1.5em; }
-.giftmessage-order-create h5 { font-size:12px; font-weight:normal; line-height:1.5; margin-bottom:10px; }
-.giftmessage-order-create h6 { font-size:11px; font-weight:normal; line-height:1.55; background-color:#cfcfcf; margin-bottom:10px; padding:2px 6px; width:95%; }
-.giftmessage-order-create .fieldset { padding:0; }
-.giftmessage-order-create .form-list { width:100%; }
-.giftmessage-order-create .form-list td.label label { width:100px; }
-.giftmessage-order-create .form-list td.value input.input-text,
-.giftmessage-order-create .form-list td.value textarea { width:95%; }
-
-.giftmessage-single-item { padding:0 !important; }
-.giftmessage-single-item .item-container { cursor:auto; }
-.giftmessage-single-item .item-text { padding:2px 4px; }
-.giftmessage-single-item .gift-form { margin-top:3px; background:#f7f6f4 url(images/gift-message-grid-column-bg.gif) 0 0 repeat-x; }
-.giftmessage-single-item .gift-form .entry-edit fieldset { border:none !important; margin-bottom:0; background:none !important; padding:15px; }
-.giftmessage-single-item .gift-form .entry-edit fieldset .last { margin-bottom:0; }
-.giftmessage-single-item .gift-form .entry-edit input.input-text { width:75% !important; }
-.giftmessage-single-item .gift-form .entry-edit textarea { width:96% !important; }
-.giftmessage-single-item .action-link-holder {}
-.giftmessage-single-item .action-link { padding-right:10px; background:url(images/gift-message-expand.gif) 100% 50% no-repeat; cursor:pointer; }
-.giftmessage-single-item .open { background:url(images/gift-message-collapse.gif) 100% 50% no-repeat; }
-
-.giftmessage-whole-order-container .entry-edit input.input-text { width:280px !important; }
-.giftmessage-whole-order-container .entry-edit textarea { width:99% !important; padding:2px 3px; }
-.giftmessage-whole-order-container .entry-edit label { width:121px; }
-
-/* PayPal */
-ul.tabs a.paypal-section,
-ul.tabs a.paypal-section:hover { background:url(images/tabs_span_bg.gif) repeat-x 0 100%; border-bottom:none; padding:0.5em 0.5em 0.28em 1.5em; }
-
-/* Packaging for Shipping Popup */
-#popup-window-mask,
-.popup-window-mask { background:url(images/bg_window_mask.png) repeat 0 0; background:rgba(239, 239, 239, 0.5); position:absolute; top:0; right:0; bottom:0; left:0; width:100%; height:100%; z-index:399; }
-.packaging-window,
-.packed-window { background:#fafafa; border:1px solid #d6d6d6; left:50%; margin:-200px 0 0 -471px; position:fixed; top:50%; width:1100px; z-index:400; -webkit-box-shadow: 0px 3px 5px #ccc; -moz-box-shadow:0px 3px 5px #ccc; box-shadow:0px 3px 5px #ccc; z-index:400; }
-.packaging-window .entry-edit-head { padding:3px 5px; }
-.packaging-window .entry-edit-head button { float:right; }
-.packaging-window .messages { border:1px solid #f16048; color:#df280a; background:#faebe7 url(Magento_Adminhtml::images/error_msg_icon.gif) no-repeat 10px 10px; font-weight:bold; margin-bottom:10px; padding:10px 10px 10px 35px; }
-.packaging-window .validation-failed { background:#fef0eD; border:1px dashed #D6340E; }
-.packaging-window .packaging-content { overflow:auto; height:400px; height:auto !important; max-height:400px; margin:0 0 10px; padding:10px 10px 0; }
-.packaging-window .package-block { background:#f6f6f6; border:2px solid #d4d4d4; margin:0 0 10px; padding:10px; }
-.packaging-window .package-options { width:100%; border-top:1px solid #ccc; padding:10px 0 0; margin:3px 0 0; }
-.packaging-window .package-options td { vertical-align:middle; }
-.packaging-window .package-options select { width:130px; }
-.packaging-window .package-options .input-text { width:50px; }
-.packaging-window .package_prapare { margin-bottom:15px; }
-.packaging-window .package-options .customs-value { width:80px; }
-.packaging-window .package-options .options-weight { width:75px; }
-.packaging-window .package-options .options-units-weight { width:45px; }
-.packaging-window .package-options .options-units-dimensions { width:45px; }
-.packaging-window .package-options .options-content-type { width:120px; }
-.packaging-window .package-options input[type=text].disabled { background:#eee; }
-.packaging-window .package-options select.disabled { background:#eee; }
-.packaging-window .package-options-contents { border-top:0; }
-.packaging-window .package-add-products { border-top:1px solid #ccc; padding:10px 0 0; margin:10px 0 0; }
-.packaging-window .package-add-products .grid { padding:0; }
-.packaging-window .package-add-products .grid button { vertical-align:middle; }
-.packaging-window .package-number {font-weight: bold;}
-.packaging-window .package-number span {margin-left: 5px;}
-
-.packed-window .entry-edit-head { padding:3px 5px; }
-.packed-window .packed-content { padding:10px 10px 0; overflow:auto; max-height:400px; }
-.packed-window .package { background:#fefefe; border:7px solid #d5d5d5; margin-bottom:10px; padding:10px; }
-.packed-window .package h4 { background:#fefefe; border:solid #ccc; border-width:0 0 1px 1px; float:right; color:#222; font-size:12px; margin:-10px -10px 0 0; padding:5px 10px; position:relative; z-index:100; }
-.packed-window .package strong{ display:block; padding:0 0 3px; }
-.packed-window .package .grid { padding:0; }
-.packed-window .package-info { background:#f3f3f3; border-bottom:1px solid #ccc; margin:-10px -10px 10px; padding:5px 10px; position:relative; }
-.packed-window .package-options { width:60%; }
-.packed-window .package-options td,
-.packed-window .package-options th { padding:1px 0; }
-.packed-window .buttons-set { padding-right:5px; }
-
-
-/* CATALOG
-*******************************************************************************/
-
-/* Category */
-.categories-side-col .content-header { padding:0; }
-.categories-side-col .content-header h3 { float:none; }
-.categories-side-col .content-header button { margin:5px 0 0; }
-.categories-side-col .switcher { margin:10px 20px 0 0; }
-.categories-side-col .tree-actions { text-align:center; margin:10px 20px 10px 0; }
-.categories-side-col .tree-holder { margin-right:20px; }
-
-.no-active-category a span { color:#aaa !important; }
-
-#tree-div { overflow:auto!important; padding-bottom:15px; width:200px; }
-
-.x-tree-node { margin:0 !important; }
-.x-tree-node .leaf .x-tree-node-icon { background-image:url(images/fam_leaf.png); }
-.x-tree-node .system-leaf .x-tree-node-icon { background-image:url(images/fam_application_form_delete.png); }
-.x-tree-node-ct { overflow:hidden; }
-
-/* Product - Websites */
-.website-name .checkbox { vertical-align:top; margin-top:2px; }
-.webiste-groups { padding:10px 20px; }
-.group-stores { padding:2px 10px; }
-
-/* Products - Bundles */
-.bundle-option-row table tbody td { white-space:nowrap; }
-.bundle-option-row table tbody td label { float:left; }
-.bundle-option-row input.option-label { width:50% !important; }
-.bundle-option-row input.option-position{ width:70px !important; }
-.catalog-categories .side-col { width:240px; }
-
-/* Products - Tier Price */
-.tier-price-input { margin-bottom:8px; }
-.tier-price-input input.price { width:80px; margin-right:10px; }
-.tier-price-input input.qty { width:80px; }
-.tier-price-input .tier-container { position:relative; clear:both; }
-.tier-price-input .tier-container div { float:left; }
-.tier-price-input .tier-container label { width:30px; margin:0; padding:0; }
-.tier-price-input .validation-advice,
-.tier-price-input label.mage-error { margin:0; height:25px; }
-.tier-price-input .custgroup-div select { width:auto; padding:0; }
-.tier-price-input .qty-div { padding-left:20px; }
-.tier-price-input .price-div { padding-left:20px; }
-.tier-price-input .price-div .validation-advice,
-.tier-price-input .price-div label.mage-error { margin:0; }
-.btn-remove-tier-group { float:right; right:24px; top:5px; }
-
-/* Product - Gallery */
-.image-preview { position:absolute; cursor:pointer; }
-
-/* Attributes */
-.edit-attribute-set .form-list td.label { width:105px; }
-.edit-attribute-set .form-list td.label label { width:105px; }
-.edit-attribute-set .entry-edit fieldset input.input-text { width:200px; }
-/* Review & Ratings */
-.ratings { margin:0; }
-.rating-box {
- float:left;
- position:relative;
- width:69px;
- height:16px;
- margin:0 5px 3px 0;
- background:url(images/product_rating_blank_star.gif) repeat-x;
- }
-.rating-box .rating {
- position:absolute;
- top:0;
- left:0;
- height:16px;
- background:url(images/product_rating_full_star.gif) repeat-x;
- }
-.field-row .ratings { width:120px; float:left; clear:right; }
-.field-row .ratings-container { width:250px; float:left; }
-.product-review-box { width:450px; }
-.product-review-box table { width:100%; }
-.product-review-box td,
-.product-review-box th { text-align:center; padding-right:5px; }
-.product-review-box td.label { width:100px; text-align:left; }
-
-
-/* Price Rules */
-.rule-tree ul { padding-left:16px !important; border-left:dotted 1px #888; }
-.rule-tree .x-tree ul { padding-left:0 !important; border-left:none !important; }
-.rule-param .label { font-weight:bold; color:black; }
-.rule-param .label:hover { font-weight:bold; color:blue; }
-.rule-param .label-disabled { color:black; cursor:default; text-decoration:none; }
-.rule-param .label-disabled:hover { color:black;}
-.rule-param .element { display:none; }
-.rule-param input,
-.rule-param select { width:auto !important; min-width:170px; }
-.rule-param select.multiselect { vertical-align:top; }
-.rule-param-edit .label { display:none; }
-.rule-param-edit .element { display:inline; }
-.rule-param-add { font-weight:normal; color:green; text-decoration:none; }
-.rule-param-add:hover { font-weight:normal; color:blue; text-decoration:none; }
-.rule-param-apply { font-weight:normal; color:green; text-decoration:none; }
-.rule-param-apply:hover { font-weight:normal; color:blue; text-decoration:none; }
-.rule-param-remove { font-weight:normal; color:red; text-decoration:none; }
-.rule-param-remove:hover { font-weight:normal; color:blue; text-decoration:none; }
-.rule-chooser { border:solid 1px #CCC; margin:5px; padding:5px; display:none; }
-.rule-param-wait { padding-left:20px; background-image:url(images/rule-ajax-loader.gif); background-repeat:no-repeat; background-position:0 50%; }
-
-/* Product Customer Defined options */
-.custom-options .box {padding:0 1.5em; }
-.custom-options .option-box {border:1px solid #cddddd; padding:1em; background:#e7efef; margin:1.5em 0; }
-
-.custom-options .option-header {border:0; width:100%; background:#e7efef; border-bottom:1em solid #e7efef; }
-.custom-options .option-header .input-text,
-.custom-options .option-header .select {width:95%; }
-.custom-options .option-header th {padding:2px; }
-.custom-options .option-header td {padding:5px 2px; }
-
-.custom-options .opt-title {width:175px; }
-.custom-options .opt-type {width:150px; }
-.custom-options .opt-req {width:80px; }
-.custom-options .opt-order {width:60px; }
-
-.custom-options .option-box .border {width:615px; }
-
-.custom-options th {white-space:nowrap; }
-.custom-options .type-title {width:auto; }
-.custom-options .type-price {width:60px; }
-.custom-options .type-type {width:80px; }
-.custom-options .type-uqty {width:100px; }
-.custom-options .type-sku {width:150px; }
-.custom-options .type-order {width:60px; }
-.custom-options .type-butt {width:33px; }
-.custom-options .type-last {width:auto; }
-
-.custom-options .option-box .border input.input-text,
-.custom-options .option-box .border select.select { width:90% !important; }
-
-.custom-options .option-box .border .type-last input.input-text { width:60px !important; }
-.custom-options .option-box .border input.type-sku {width:150px !important; }
-
-/* Bundle product */
-.bundle .option-box {padding-bottom:2em; }
-.bundle .option-box .border {width:100%; border-bottom:0; }
-.bundle .option-box .border td {border-bottom:1px solid #dce5e6!important; }
-.bundle .option-title {padding:0 0 10px; border-bottom:1px solid #cddddd; }
-.bundle .option-title button {float:right; }
-.bundle .option-title label {font-weight:bold; line-height:21px; padding-right:1em; float:left; }
-.bundle .option-title .input-text {float:left; width:260px; vertical-align:middle; }
-.bundle .option-header {clear:both; margin-top:5px; }
-
-.bundle .border .last {width:33px; }
-
-/* Downloadable Product */
-.files { width:195px; }
-.files input.input-text { float:left; width:134px !important; }
-.files-wide { width:355px; }
-.files-wide input.input-text { float:left; width:294px !important; }
-.files label,
-.files-wide label { float:left; width:55px; }
-.files .row,
-.files-wide .row { margin-bottom:5px; }
-/* Files Uploader */
-.files .flex,
-.files-wide .flex { float:right !important; position:static !important; }
-.files .uploader,
-.files-wide .uploader { float:left; overflow:hidden; }
-.files .uploader { width:100px; }
-.files-wide .uploader { width:260px; }
-.files .uploader .file-row-info,
-.files-wide .uploader .file-row-info,
-.files .uploader .file-row-narrow,
-.files-wide .uploader .file-row-narrow { margin:0 !important; }
-.progressbar { height: 20px; }
-.upload-progress { background-color: #fcffac; }
-.upload-success { background-color: #E4FFB1; }
-.upload-failure { background-color: #FF7E77; }
-
-td.input-price { white-space:nowrap; }
-td.input-price .validation-advice,
-td.input-price label.mage-error { white-space:normal; }
-td.input-price input.input-text { width:4em !important; }
-
-input.sort { width:4em !important; }
-input.downloads { width:6.5em !important; }
-
-/* CUSTOMER
-*******************************************************************************/
-
-/* Addresses */
-.address-list { width:28em; padding-right:22px; }
-.address-list address { width:100%; overflow:hidden; }
-.address-list .btn-edit-address,
-.address-list .btn-remove-address { position:absolute; top:8px; }
-.address-list .btn-edit-address { right:8px; }
-.address-list .btn-remove-address { right:27px; }
-.address-list li { position:relative; padding:12px 14px; cursor:pointer; border-top:1px solid #e6e6e6; background:url(images/address_list_li.gif) repeat; }
-.address-list li.on { background:#e7efef; }
-.address-list li.over { background-color:#fcf5dd; }
-.address-list li table { width:100%; }
-.delete-address { float:right; margin:0 0 10px 10px; }
-.address-type .address-type-line { display:block; margin:2px 0; }
-.address-type .address-type-line input { margin-right:3px; }
-
-
-
-/* NEWSLETTER
-*******************************************************************************/
-.template-preview { width:100%; height:200px; background-color:#fff; }
-
-
-/* SYSTEM
-*******************************************************************************/
-.stores-tree td { padding-top:3px !important; padding-bottom:3px !important; }
-.stores-tree td.label label { display:inline; width:auto; padding-right:10px; }
-.stores-tree td.website-label label { font-weight:bold; }
-.stores-tree td.store-group-label label { font-weight:bold; padding-left:15px; }
-.stores-tree td.store-label label { padding-left:30px; }
-.stores-tree .buttons-set { margin:10px 0; }
-
-.log-details { border:1px solid #d6d6d6; padding:15px; background:#fafafa; margin:0 0 15px; }
-.log-details table { width:100%; }
-.log-details table th,
-.log-details table td { padding-top:4px; padding-bottom:4px; vertical-align:middle; }
-.log-details table th { font-weight:bold; padding-right:30px; white-space:nowrap; }
-
-.sync-indicator { margin-left:5px; margin-right:5px; position:absolute; white-space:nowrap; }
-.sync-indicator img,
-.sync-indicator span { vertical-align:middle; }
-
-/* Configuration */
-/*fieldset.config td { padding-top:5px; padding-bottom:5px; }
-fieldset.config input.input-text { width:250px; }
-fieldset.config select.select { width:256px; }*/
-div.tree_item,
-div.tree_item_last { background-position:left; background-repeat:no-repeat; padding-left:20px; }
-div.tree_item { background-image:url(images/tree_icons/join.gif); }
-div.tree_item_last { background-image:url(images/tree_icons/joinbottom.gif); }
-div.tree_line { position:absolute; left:0; background-image:url(images/tree_icons/line.gif); }
-img.attribute-global { width:16px; height:16px; vertical-align:middle; }
-
-ul.config-tabs { border-top:none; }
-ul.config-tabs dt {
- border-top:1px solid #849ba3;
- background:#d1dedf url(images/config_tab_dt_bg.gif) no-repeat 0 50%;
- padding:2px 0 2px 1.5em;
- font-weight:bold;
- text-transform:uppercase;
- color:#306375;
- }
-ul.config-tabs dl { margin-bottom:16px; }
-ul.config-tabs a.last span { background-image:none; }
-
-.inline-table { border:0 !important; }
-.inline-table td { border:0 !important; padding:0 5px 5px !important; }
-
-.system-fieldset-sub-head td { padding:20px 5px 5px 5px; }
-.system-fieldset-sub-head h4 { border-bottom:1px solid #ccc; margin:0; }
-
-.system-tooltip-wrap { float:left; }
-.system-tooltip-box { border-left:1px solid #ccc; float:left; line-height:16px; margin-left:5px; padding-left:5px; width:180px; }
-.system-tooltip-small { clear:both; border:none; margin:0; padding:5px; width:100%; }
-
-.comment { padding:5px; }
-
-/* Import/export */
-
-#profile-generator select { width:207px; }
-#profile-generator input.input-text { width:200px; }
-.field-row .with-tip {display:block; margin-left:150px; }
-.field-row .with-tip input {float:none; }
-.field-row .with-tip small {display:block;padding-top:2px; }
-
-#profile-generator .field-row button.delete {vertical-align:middle; }
-#profile-generator fieldset button.add {display:inline; margin:0; }
-
-/** Product mass attribute update **/
-
-.attribute-change-checkbox { white-space:nowrap; clear:none; margin-left:5px; }
-
-.attribute-change-checkbox label{ margin-left:5px; float:none !important; }
-
-/* PopUp Calendar */
-.calendar { z-index:105; }
-
-/** Order view **/
-.order-history { width:70%; margin-right:27px; }
-
-ul.super-product-attributes { padding-left:15px; }
-
-/** Media Library **/
-.uploader .file-row { width:600px; padding:0.5em 0.6em; margin:0.5em 0.6em; border:1px solid #ccc; background-color:#f9f9f9; /*vertical-align:middle;*/ }
-.uploader .file-row-narrow { width: auto; margin: 0 0 2px 40px; }
-.uploader .file-row .file-info { float:left; }
-/*.uploader .file-row .file-info-name { with: 80%; overflow: hidden; }
-.uploader .file-row .file-info-size { width: 20%; }*/
-.uploader .file-row-info { margin: 0 0 0 10px; }
-.uploader .file-row-info .file-info-name { font-weight:bold; }
-.uploader .file-row .progress-text { float:right; font-weight:bold; }
-.uploader .file-row .delete-button { float:right; }
-.uploader .buttons { float:left; }
-.uploader .flex { float:right; }
-.uploader .progress { border:1px solid #f0e6b7; background-color:#feffcc; }
-.uploader .error { border:1px solid #aa1717; background-color:#ffe6de; }
-.uploader .error .progress-text { padding-right:10px; }
-.uploader .complete { border:1px solid #90c898; background-color:#e5ffed; }
-
-.grid tr.read { background:#fff !important; }
-.grid tr.unread { background:#fcf6f5 !important; }
-.grid-row-title { color:#444; font-weight:bold; }
-
-.grid-severity-critical,
-.grid-severity-critical span,
-.grid-severity-major,
-.grid-severity-major span,
-.grid-severity-minor,
-.grid-severity-minor span,
-.grid-severity-notice,
-.grid-severity-notice span { display:block; height:16px; background-image:url(images/bg_notifications.gif); background-repeat:no-repeat; font:bold 10px/16px Arial, Helvetica, sans-serif; text-transform:uppercase; text-align:center; padding:0 0 0 7px; margin:1px 0; white-space:nowrap; color:#fff; }
-.grid-severity-critical { background-position:0 0; }
-.grid-severity-critical span { background-position:100% 0; padding:0 7px 0 0; }
-.grid-severity-major { background-position:0 -16px; }
-.grid-severity-major span { background-position:100% -16px; padding:0 7px 0 0; }
-.grid-severity-minor { background-position:0 -32px; }
-.grid-severity-minor span { background-position:100% -32px; padding:0 7px 0 0; }
-.grid-severity-notice { background-position:0 -48px; }
-.grid-severity-notice span { background-position:100% -48px; padding:0 7px 0 0; }
-
-.super-attributes { margin:0; padding:0; }
-.super-attributes li.attribute { border:1px solid #dfdfdf; background-color:#ededed; margin:1px 0; }
-.super-attributes li.attribute ul.attribute-values { margin:0; padding:0; }
-.super-attributes li.attribute div.values-container { width:80%; margin-top:2px; margin-bottom:2px; }
-.super-attributes li.attribute-value { display:block; margin:1px 0; }
-.super-attributes li.attribute-value .validation-advice,
-.super-attributes li.attribute-value label.mage-error { margin:0; white-space:normal; }
-.super-attributes li.attribute-value .attribute-value-label-container { width:200px; }
-
-.super-attributes div.attribute-name-container,
-.super-attributes li.attribute div.values-container,
-.configurable-simple-product div.values-container,
-.super-attributes li.attribute-value .attribute-values-container,
-.configurable-simple-product .attribute-values-container,
-.super-attributes li.attribute-value .attribute-values-container-main,
-.configurable-simple-product .attribute-values-container-main,
-.super-attributes li.attribute-value .attribute-value-label-container { display:block; }
-
-.super-attributes li.attribute-value .attribute-price,
-.configurable-simple-product .attribute-price { width:70px !important; }
-
-.super-attributes li.attribute-value .attribute-price-type,
-.configurable-simple-product .attribute-price-type { width:70px !important; }
-
-.super-attributes div.attribute-name-container {
- cursor:move;
- background-image:url(images/arrow_sort_move.gif);
- background-repeat:no-repeat;
- background-position:4px 50%;
- font-weight:bold;
- padding-left:15px;
- margin-top:2px;
- margin-bottom:2px;
- }
-
-
-/** Product Gallery Image Previews **/
-.preview .cell-image .place-holder { border:1px solid #AEAEAE; width:100px; height:100px; text-align:center; }
-.preview .cell-image .place-holder span { margin-top:30px;display:block; }
-.preview .cell-position input.input-text { width:90% !important; }
-.fieldset-wide .data .preview .cell-position input.input-text { width:90% !important; }
-
-.tier .data { width:465px; }
-.tier .data select { width:99%; }
-.tier .data input.qty { width:20px !important; }
-
-.weee .data { width:465px; }
-.weee .data select { width:99%; }
-
-.giftcard-amounts .data { width:465px; }
-.giftcard-amounts .data select { width:99%; }
-
-/* Links */
-.link-feed { background:url(images/icon_feed.gif) no-repeat left 2px; padding-left:18px; }
-
-#page-help-link {
- line-height:26px;
- padding-left:20px;
- color:#ebebff;
- background:url(images/fam_help.gif) no-repeat 0 50%;
- }
-#page-help-link:link, #page-help-link:visited { text-decoration:none; }
-#page-help-link:hover { color:white; }
-
-/* Magento Connect Package Extensions */
-.table-editable { border:solid 1px #ccc; background:#fafafa; padding:5px; margin-bottom:5px; }
-.table-editable th { border-bottom:solid 1px #ccc; text-align:center; }
-.table-editable th, .table-editable td { padding:1px 3px; vertical-align:middle; }
-.table-editable select { height:19px; }
-
-
-/* CMS
-*******************************************************************************/
-.breadcrumbs { margin: 0 0 10px; }
-.breadcrumbs li { display:inline; }
-.breadcrumbs li span { margin:0 2px; }
-
-/*table.mceLayout { width:100% !important; }*/
-
-.cms-revision-preview { height:100%; }
-.cms-revision-preview iframe { width:100%; height:91%; border:0; }
-
-/* CMS Widgets Instance */
-.options-box .option-box { border:1px solid #cddddd; padding:1em; background:#e7efef; margin:1.5em 0; }
-.options-box .option-title { padding:0 0 10px; border-bottom:1px solid #cddddd; }
-.options-box .option-title button { float:right; }
-.options-box .option-title label {font-weight:bold; line-height:21px; padding-right:1em; float:left; }
-.options-box .option-title select { float:left; width:260px; vertical-align:middle; }
-.options-box .option-header { margin:5px 0 0; width:100%; border:0; background:#e7efef; border-bottom:1em solid #e7efef; }
-.options-box .option-header .input-text,
-.options-box .option-header select { width:95%; }
-.options-box .option-header th { padding:2px; }
-.options-box .option-header td { padding:5px 2px; }
-.options-box .option-header .tree { margin:5px 0 0; }
-
-/* CMS Popup Window */
-.popup-window .magento_message { padding:0 18px; }
-.popup-window .content-header { font-family:Arial, Helvetica, sans-serif; padding-top:9px; }
-.popup-window .content-header h3 { color:#eb5e00; padding:0; }
-.popup-window { height:auto !important; }
-.popup-window .grid { position:static; }
-.popup-window .table_window td.value2 .grid td,
-.popup-window .table_window td.value2 .grid th { padding:2px 4px !important; }
-.popup-window .table_window td.value2 .grid tr.headings th { padding:1px 4px 2px !important; }
-.popup-window .columns { background-image:none; }
-.popup-window .middle { background:none; padding:10px 0; }
-
-.popup-window .uploader .file-row { margin:16px 0; width:auto; }
-.popup-window #contents-uploader { margin-bottom:10px; background:#d7e5ef; padding:5px 10px; }
-.popup-window #contents-uploader .flex { font-size:0; line-height:0; height:20px; }
-.popup-window #contents { margin-left:-3px; height:400px; overflow:auto; position:relative; }
-.popup-window #contents .filecnt { float:left; border:1px solid #ccc; cursor:pointer; padding:3px; display:inline; margin:0 0 15px 4px; overflow:hidden; position:relative; width:100px; }
-.popup-window #contents .selected { border:1px solid #f1af73; background:#f0f0f0; cursor:default; }
-.popup-window #contents .nm { text-align:center; }
-.popup-window #contents .nm img { vertical-align:bottom; }
-
-/* Widget Insert */
-#widget_window .magento_content { height:auto !important; min-height:450px; }
-
-/* CMS Widget Chooser */
-#widget-chooser .columns { background-image:none; }
-#widget-chooser .magento_message { padding:10px 18px; }
-#widget-chooser .grid th,
-#widget-chooser .grid td { padding:2px 4px 2px 4px; }
-#widget-chooser .grid tr.filter th { padding-top:5px; padding-bottom:5px; }
-#widget-chooser .side-col { padding-top:0.5em; }
-#widget-chooser .main-col { padding-right:4px; }
-
-/* CMS Variables Popup */
-#variables-chooser .magento_message { padding:10px 18px; }
-
-/* Product description WYSIWYG editor */
-#catalog-wysiwyg-editor .buttons-set { margin-top:10px; }
-#catalog-wysiwyg-editor .magento_content { height:auto !important; overflow:hidden; }
-#catalog-wysiwyg-editor .textarea { width:930px !important; }
-#catalog-wysiwyg-editor .magento_message { padding:0 7px; }
-#catalog-wysiwyg-editor .magento_buttons { padding-left:7px; padding-right:7px; }
-
-/* Backups */
-.backup-dialog { background-color:#6f8992; background:rgba(111, 137, 146, 0.5); cursor:default; left:50%; margin:0 0 0 -271px; position:fixed; top:50%; width:470px; padding:8px; z-index:400; -moz-box-shadow:0 0 100px #ccc; -webkit-box-shadow:0 0 100px #ccc; box-shadow:0 0 100px #ccc; }
-.backup-dialog .entry-edit { border:1px solid #6f8992; }
-.backup-dialog .content { background:#fff; border-bottom:1px solid #ccc; max-height:400px; overflow:auto; }
-.backup-dialog .question {margin-top: 15px;}
-.backup-dialog .buttons-set { border-top:1px solid #ddd; background:#eee; margin:0; overflow:hidden; padding:7px 10px 8px; width:448px; }
-.backup-dialog .buttons-set button { margin:0 0 0 5px; }
-.backup-dialog #ftp-credentials-container {margin-top: 25px;}
-.backup-dialog .password-box-container {margin-top: 15px;}
-.backup-dialog #ftp-credentials-container fieldset {margin-bottom: 0;}
-.backup-dialog input[type=text], .backup-dialog input[type=password] {width: 180px}
-.backup-dialog .exclude-media-checkbox-container {margin-top: 15px;}
-.backup-dialog td.maintenance-checkbox-container {margin-top: 0; padding-top: 4px;}
-
-/*****************************************/
-/******** ALIGNMENTS AND CLEARS **********/
-/*****************************************/
-
-/* Directional and spacial */
-.f-left, .left { float:left; }
-.f-right, .right { float:right; }
-.v-top { vertical-align:top; }
-.v-middle { vertical-align:middle !important; }
-.v-bottom { vertical-align:bottom; }
-.a-left { text-align:left !important; }
-.a-center { text-align:center !important; }
-.a-right { text-align:right !important; }
-.nm { margin:0 !important; }
-.np { padding:0 !important; }
-.no-display { display:none; }
-.no-show { display:none; }
-.nowrap, .nobr { white-space:nowrap; }
-.wrap { white-space:normal !important; }
-.no-float { float:none !important; }
-.pointer { cursor:pointer; }
-
-/* Color */
-.emph, .accent { color:#eb5e00 !important; }
-.subdue { color:#306375; }
-
-/* Font */
-.bold { font-weight:bold !important; }
-.normal { font-weight:normal !important; }
-
-/* Clear */ /* This keeps our HTML free of buncha clearing elements */
-.side-col .switcher:after,
-.message-popup .message-popup-head:after,
-.message-popup .message-popup-content .message:after,
-.login-form .form-buttons:after,
-.wrapper:after,
-.option-title:after,
-.columns:after,
-.main-col:after,
-.content-header-floating:after,
-.entry-edit .entry-edit-head:after,
-.content-header:after,
-.login-box .button-set:after,
-ul.tabs-horiz:after,
-.header-top:after,
-dl.accordion dt:after,
-.field-100:after,
-.entry-edit fieldset li:after,
-.entry-edit fieldset span.field-row:after,
-.content:after,
-#topnav:after,
-.main:after,
-.container:after,
-.footer:after,
-.middle:after,
-.header:after,
-.box-head:after,
-div.actions:after,
-.tier-container:after,
-.clear:after,
-.notification-global:after,
-.files .row:after,
-.files-wide .row:after,
-.grid tr.filter .range .range-line:after,
-.store-scope:after { display:block; clear:both; content:"."; font-size:0; line-height:0; height:0; overflow:hidden; }
diff --git a/app/design/adminhtml/magento_basic/custom.css b/app/design/adminhtml/magento_basic/custom.css
deleted file mode 100644
index 734128e887d..00000000000
--- a/app/design/adminhtml/magento_basic/custom.css
+++ /dev/null
@@ -1,22 +0,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)
- */
diff --git a/app/design/adminhtml/magento_basic/ie7.css b/app/design/adminhtml/magento_basic/ie7.css
deleted file mode 100644
index 81034a34b55..00000000000
--- a/app/design/adminhtml/magento_basic/ie7.css
+++ /dev/null
@@ -1,27 +0,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)
- */
-
-.db-menu ul li a { background:transparent url(images/db-menu-bg-up.gif) repeat-x 0px 3px; height:26px; }
-.db-menu ul li a:hover, .db-menu ul li a.hover { background:transparent url(images/db-menu-bg-hov.gif) repeat-x 0px 3px; }
-.graph-block { height:auto; }
-.db-menu { width:947px; }
\ No newline at end of file
diff --git a/app/design/adminhtml/magento_basic/iestyles.css b/app/design/adminhtml/magento_basic/iestyles.css
deleted file mode 100644
index 68d51d7e92e..00000000000
--- a/app/design/adminhtml/magento_basic/iestyles.css
+++ /dev/null
@@ -1,114 +0,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)
- */
-/* Clearing */
-.message-popup .message-popup-head,
-.message-popup .message-popup-content,
-.message-popup .message-popup-content .message,
-.login-form .form-buttons,
-.wrapper,
-.footer,
-.option-title,
-.columns,
-.main-col,
-.field-row,
-.nav-bar,
-ul.tabs-horiz,
-dl.accordion dt,
-.field-100,
-.entry-edit fieldset li,
-#nav,
-.main,
-.middle,
-.clear,
-.container,
-dl.accordion dt,
-.grid thead th a,
-.content,
-.box-head,
-.header-top,
-ul.tabs,
-ul.tabs li,
-ul.tabs li span,
-ul.tabs li a,
-.address-list li,
-.entry-edit .entry-edit-head,
-.notification-global,
-.files .row,
-.files-wide .row,
-.uploader .file-row,
-.grid tr.filter .range .range-line,
-.centinel .authentication,
-.paypal-payment-notice,
-.product-options .options-list li,
-.store-scope { zoom:1; }
-
-.clear { display:block; clear:both; height:0; font-size:0; line-height:0; overflow:hidden; }
-
-input.input-file { padding:2px; }
-input.checkbox,
-input.radio { width:13px; height:13px; }
-button.disabled,
-button.disabled:hover,
-button.disabled:active { filter:alpha(opacity=80); }
-
-/* Opacity fix */
-#loading-mask { filter:alpha(opacity=80); }
-#message-popup-window-mask { filter:alpha(opacity=20); }
-.content-header-floating { filter:alpha(opacity=85); }
-
-.message-popup .message-popup-content .message { _height:4.5em; }
-
-#popup-window-mask,
-.popup-window-mask { background:#efefef; filter:alpha(opacity=50); }
-
-/* Scalable Button Override */
-button, .form-button { width:auto; margin-left:5px; overflow:visible; }
-.massaction button { width:auto; height: 20px; margin-left:0; overflow:hidden; }
-
-.hor-scroll { overflow-y:hidden; padding-bottom:20px; /*margin-bottom:-16px;*/ }
-
-/* Grid Filter Override */
-.grid tr.filter th { padding-top:3px; padding-bottom:3px; }
-.grid tr.filter th input { margin-right: -10px; }
-.grid tr.filter th .range input { margin-right: 2px; }
-button.icon-btn { width:31px; }
-
-.nested-content .content-header { position:relative; zoom:1; }
-dl.accordion dt a,
-div.collapseable a { width:100%; }
-.product-image-gallery .grid tbody td { padding: 4px !important; }
-.massaction .entry-edit fieldset{ float: right;}
-.massaction .entry-edit fieldset button.scalable {text-align:center !important; padding-left:0;padding-right:0; margin-top:1px;}
-.content-header {zoom:1;}
-
-#tree-div {overflow-x:auto !important; height:auto !important; overflow-y:hidden !important; padding-bottom:30px; }
-
-#nav ul li,
-#nav ul li.active { float:left; clear:left; width:185px; }
-#nav ul a span { zoom:1; }
-
-.grid-severity-critical,
-.grid-severity-major,
-.grid-severity-minor { margin:3px 0; }
-button.add span,
-button.delete span { display:inline-block; height:16px;}
diff --git a/app/design/adminhtml/magento_basic/images/accordion_close.gif b/app/design/adminhtml/magento_basic/images/accordion_close.gif
deleted file mode 100644
index 7463cfd06c6b55c8d4e5735ed22f75beb1e00012..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 394
zcmV;50d@XINk%w1VGsZj0M$GIaBXY<hY_J_D*uKN|ILQ|)U9`Pa{sY6|H_B|ml6Mk
z5&w%6^Q1`sr5D_K2B&f}|ArObeG6b-UH#s%|H6#be;KlSI`W`D|CJE`%ZLBWhX0un
z{nV`g&W8V@6aSVoW@BRe)uaE$hyRrk|Hy~`)sg?35dYDO|Hq8~$%o>93#EEV|A`R)
ze-ZzK5dXi2|Imj2g%baw5MW(g|Dh27iV^>v5dV@9|DO>5j}h*H0ssI1d3JOF00000
z00000A^8LW002AyEC2ui01yBX000K3K;EjND;kfL70+@Bm0-{)v=q8nRFgwP#_e(&
zhlxse^3cxcwC7ap;NI}~yHh0C?)dzjP}G<(EG~kBEEpylMHw3bJB^Nw0UH@b2nhp^
zj{^w^MJXdW3N50e3OOSwMI<+?tgWjgMIt$~w6(J$MJNk3yuH2)C^``w9}qFe$j1;L
o91#x;1r#sS)YB9N3=aST4oBWP4gvrM03Z@G=;`PZAmc#*JE+aF<p2Nx
diff --git a/app/design/adminhtml/magento_basic/images/accordion_close.png b/app/design/adminhtml/magento_basic/images/accordion_close.png
deleted file mode 100644
index 17f2f42358d6432528e189f467be7a9c18716e21..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 476
zcmV<20VDp2P)<h;3K|Lk000e1NJLTq000mG000pP1^@s6)UPbW00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzZb?KzRCwBy
zQ$0@tK@ferw|F@YC{BWjjnG)xYRM0<@+VN(5MpCxY|w_-8)G2_t(}!WfKnS0t%wQ4
zg2InW_)u~jcjqj3F_OT!yyRs!n|W_%c4k>Nn??KRvjm__+=Ch(h}YYf>kal^WoLS!
zST%MJAz%aUSG+V~VhRi6$2y!&^IR~7vROO^f2skaF5o%w2AU3$%EK(4V$yAv1!u_d
zVH@bb0D<>^@>6FPD>YIpW`~|j^q>we)DS|0faqg21Xy4&A&#PT5!Q&QXq`7;WI!Cy
z{=|;I`N9G<A=D7~Tn2$+>i)743}VfSFCn?iKsG@mrq!A-Z{SCVtHA$jz!Eedn%W@E
z;<ZpCAJOsHho8;^<`$WdpUdJYV<=W?q*lE4`E9CIuOw-<x!w7lu;qUt0pBX%yLAJp
zW%Qjl8V7@`o!oRkqX&jc1p|kTpWnoN=`K@|2C^7A8k<oMxWe-di9MqIBftO#4u*Bn
SI@#s`0000<MNUMnLSTX|;K{H6
diff --git a/app/design/adminhtml/magento_basic/images/accordion_open.gif b/app/design/adminhtml/magento_basic/images/accordion_open.gif
deleted file mode 100644
index aaea5003490e3638d202f679caaa10f1797b1747..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 627
zcmZ?wbhEHb6krf!c;>=TkemI#R`7qT;Q!eIo2sq;_X_+!)0UQ;^na@0-z#hW*9-oi
zDY(4I_<ys&{|3QN3+(UJa{oWu_J5J^ohr8f$9w+X+xWj*<o|TR@{*#ZRi6K+8Gl~l
zkq{UAzg_VERDu7e+W&7f|9`Um|15$3hk72>bN@fr_Wxq{|6}d{TLk`}X#ah6@&D89
zf3K|l-y`rpU+{mM=>I|>DfoY>_`)o$|D6I?>m~nRo%nyD!2d46|NGnjUugS3SKxoE
z(EmjO|0fClpD&OQ8}q+k@LeP0|Ns9h%SsrA8c_Vn!pOkj!k`0kI4DjS*e^7=NSZpe
zwzZo|y0GwTnORMkIKfPdpG8Gf!N_*b+&M-HqAE^mLgverSXq^pn+vJ6s@iY1*L8N*
z-D0oWDrmjmT4TG$0c*ilHfA{!UW4rhye4wYY^~bdvfFRnlI7NJl@~X>ecMo6zEzRK
zk%>!hyB-&lBZp$Errl3F#_f#1>@>ONayS`uG)MDsu~`OoG_lGEu(EI{FeveHi?ld+
zEO^M;->+c5@4^HIre<Cpw<i%Ni=J|bNlP%yFnl<{S5Y{P;Q+$}26hF9W~QeF3F!(9
F)&P;pyTbqg
diff --git a/app/design/adminhtml/magento_basic/images/accordion_open.png b/app/design/adminhtml/magento_basic/images/accordion_open.png
deleted file mode 100644
index 9d5259955e9201c195eb4f2270fbad52688c1837..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 548
zcmV+<0^9wGP)<h;3K|Lk000e1NJLTq000mG000pP1^@s6)UPbW00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzwn;=mRCwBq
zQ$0@tK@fd=9P&-{Aeh()jg_sI`~WL|0)-7BCPo`$A=(fdjfpW9QqbC2`2#4mA<>GM
zKrAd&P(Bn7xI1Urjc}(To4o8~cHZ0Bof#I5Mp0g`r2wP}%b09k6V4V+A_exGWqY1P
zGV5DfgNi!Pdmm4A2hfLx&P^VArMRy$hIAmg3FS5iw5x!jj~8%xpa$azBzMrQ7SpQ2
z5K~%Zpm7ga#xRiUw4@y(c%<Fe2eF*Px$3}a^azIirY2$QRoI6!KxFjL5FA=Uz#^EA
zR6iZI^W4HO0$oB|?sYZ{u90m~&=lE0h}|wg0VWe^Z`Xf*+|h{dKm!#)aA+yE46F${
zz!7VIf{&2X#1q~K$MWV4@=eRs{eKDYBDiG9;P|vK>{T$F0;Y7@8pdHe&&^Q*=B5U5
z*&B&m*wuvXCG<wf%q2Md6Lo{Vn4vfjm?sg^>oEZkyb@qTKaZhU&f#43p`ly^OZkkS
zdRwVizB}yiS#ZPD68I>cgL4^;^K4<YdAb<uuY^68Z<1MV>a273q+X>i!x=8XAHyFz
mCu^Ym!#CxaJ@S725?}xzxR#yg^0+7f0000<MNUMnLSTZ+VC_o)
diff --git a/app/design/adminhtml/magento_basic/images/add_btn_icon-disabled.gif b/app/design/adminhtml/magento_basic/images/add_btn_icon-disabled.gif
deleted file mode 100644
index 213541cabff77b9f7fff02f77c0233097382e1c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 234
zcmZ?wbhEHb<YnMxI3mOF{@uF?ZEeq=KAqU!et6%$-lnE0U0pY>UR^wE)|=O_U%z^F
z=J@floSd82u5DPk^7x@cEtQq8Uc8vv-MwV?>{CaNo;ZBCGC#kjuy9&W&*aX|>sPK!
z@9kwk0*XIb7#SF37<52lAUhdY(-qXkniKh2SFoL6+`}%kW-1d$FN4O_7=?-AjgA$r
z0xD;@H*C<E)*j^KP+_6a$L=^`LIMNtG1f_qF%rB7+>F-7ZNB~Pz}GCh#1)<b20Bbi
d!kUaCW)@alBF0KOB@BjLS}JO68d{1B)&S?yUP1r>
diff --git a/app/design/adminhtml/magento_basic/images/add_btn_icon.gif b/app/design/adminhtml/magento_basic/images/add_btn_icon.gif
deleted file mode 100644
index 0c7645a983d3a86c2c625aa65fc58573c07180dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 344
zcmZ?wbhEHb<YnMxxT?zVIhEn}xt0I_{`#}X^55@o|Ni{^vmxT&pYLA^IsX0m@n??S
zmweX0H`o5XzUt3h{cnBN|DT=wv(W6%BC9_e!u~9={e5Ngzpw9ppIr23rux5c@4i+`
z{XVtm&s@Dfv($fXEdTrX{GScse-@hme}4MUJj4J0|1(e<DE?$&WMEKb&;c0?@)HAF
z>48ZC#$1x_5(|SEg(l8Zn&5OYQ^aGYe_KdKf!AElhdUW_=CK5%vs6yf>h6j*>Eh6t
z-r)Y2Ge(DrSx7~mfkTR4ii1I3MTEJ$vbwguQQ6PGpeR6DmW@3n&7Yl3R+W#3Ga^cb
WlZP+Fw^$+GOV!0q(ZkD;!5RRDUv~=t
diff --git a/app/design/adminhtml/magento_basic/images/address_list_li.gif b/app/design/adminhtml/magento_basic/images/address_list_li.gif
deleted file mode 100644
index 58776764860191f435315f9873db3a2389285102..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 72
zcmZ?wbhEHb<YC}pn8?8J|NsAAzkdDx{hNV-LGdRGkYr%c0TCd11}4cCr8ceU=MFS|
XIV-Js$?R@kL)5pzi_<&985yhrhanlo
diff --git a/app/design/adminhtml/magento_basic/images/address_list_on_arrow.gif b/app/design/adminhtml/magento_basic/images/address_list_on_arrow.gif
deleted file mode 100644
index a0afc67cfb248f90e64df258eb7b099a1c71e541..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 185
zcmZ?wbhEHb<YC}rI3mpO>f^`1|Ni~>_3O)zA8$W@{`Ke2=kMRY|N8ae>(_t({{8*?
z_w}bw|NsC0_y7O<uU|iY`}XJW-xnV~Jb(WlD9AtrQ2fcl$iN`XpaW71vXg<;Okt5v
zN~YJui8Gd~FtU5^G6~#J@{c8To;&lgBhRBbIxG(ea^~=Ka@^BNKfE(xQ)1TCQin}T
H1sJRW875U3
diff --git a/app/design/adminhtml/magento_basic/images/address_list_over_arrow.gif b/app/design/adminhtml/magento_basic/images/address_list_over_arrow.gif
deleted file mode 100644
index c7728c62082204672c45268fcdc1be0af9d37837..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 184
zcmZ?wbhEHb<YC}rIKsg2|Np;#f4=_v{o&uQ_kX`X{r~UppRf1-{r&m(=gU9e?*IAr
z@bAx8f4)Ed^X<{UKcD~o`SSnYpa1`U|NZ&;&)2*E|Nmzo1QdU=fR*TgNRXWjtfmS~
zfhn1O#~5ZjH__zx-epp_p+rwKb)I_DO#R~=JjJ|^1$S8KRUEpt_G{4z4UMZ)n>unl
H6&b7n$VOK5
diff --git a/app/design/adminhtml/magento_basic/images/address_list_over_bg.gif b/app/design/adminhtml/magento_basic/images/address_list_over_bg.gif
deleted file mode 100644
index d72815959aa3ade84e8c15a9f10931b36a4e27c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 236
zcmZ?wbhEHbWM)WbIKsg2@8_3)-#`BU_vioLKmWeH`S<(B|G&Tf{rLF*&#(VL_MadB
zzP_&Sng0LJ&wsza|NHgr|KH#LzJK`l{r$fmpZ@>*_wU!&e?LF}|Nrm*zrX*!z5Dm=
z?Z2;Y{{R2a00W9YS-?yk5DBuAfi+V>y)PxRFMQQHou~UYbe}EBz3jA(zlQ&>!-7N)
z7YXSTDMklFEVwVMNcLK4w=N<l_4M03#s>vAob+a&pS-1NuHBCNjXP|FI&QqL=&U<`
jJ^f!pV^gzKYg>CqCrfvabYK63iIXNz;o;_1WUvMRKL?9c
diff --git a/app/design/adminhtml/magento_basic/images/ajax-loader-tr.gif b/app/design/adminhtml/magento_basic/images/ajax-loader-tr.gif
deleted file mode 100644
index efb7ba77049448a34cd45c8509e5c63f8ac5fb5b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2608
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
diff --git a/app/design/adminhtml/magento_basic/images/ajax-loader.gif b/app/design/adminhtml/magento_basic/images/ajax-loader.gif
deleted file mode 100644
index b525a23bdbb3fecbfac17c7d498decfa5b45f18b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 505
zcmZ?wbhEHb6krfw_{abP|Ns9#apDA!q4=NM&ow02*)hP?NY8+o5hV0a)~Pfzr$nJV
zvm`^o-P29MH@_@1Rlz+qu}Hy0&j6@E)Hg9DRUxTT!7(eb!Y4m5MK3ciEuTU0CkrPR
z&;%VI23jS+z`&&2(w}+g?LG(V;B{J(dz)Ty7saJ_%5>I6wy#UxGD)xJ>dWj?-=@Ec
z`p==&*1?3w1Tkygj)<pQt8Poy#(nb?(P+yQpLDfsr-DxZEz3(k&fQ(}1E&c(5I6Wu
z7VbFuV(+!IGp$pPmo9Nj)R5Si@M7MFh|c>rFMZ$s{Tp)#haf99CqNB2k~w*;)?(I~
zS#_0nu5~_Z?-M-Mr1@l4n0eaQ(A&@dPCK6;%)yA&0B9)O$P7M`m3*$@)!M|nmpmUv
z%z9a}E?jfooas&PxGvpWw)zkA6OFb8tf2sP!mWwgT_+2UTo21HO?uYJP&!F@W|{hp
ZEKT?Q1}Tdttz7-^a{$N>)}ROg0{|uTw+8?K
diff --git a/app/design/adminhtml/magento_basic/images/application_view_tile.gif b/app/design/adminhtml/magento_basic/images/application_view_tile.gif
deleted file mode 100644
index 8965c0e108e084cdf2b8e69d7fc854acb9368317..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 377
zcmV-<0fzoZNk%w1VGsZi0M$JJ{{H^_{QPE%z*>B=d7{{Lp44`r)r_IWw!_<BgSoBQ
z|8SAPQ*)_afwxzAu5OgddZgP?a;a#J!=KXsna_}Hl*w<G%yOE~V1>H>>zh_~t^51?
zTz<7!da!ex(R!rXRCTOTajE~Rb69(^lC<7>rrdL#(rl8*fS$);g}YO8s&JXkpVF69
zb*p)!*<60KZ<fo3t=(jZzGH{I{r&xz&;S3IRPfbjfy4ijx#)YR+;6dF|NsC0|Nj60
z00000A^8LW002DzEC2ui01yBW000J-z@BhOEcOs2UFkzG6ik;Dtb#)HV!5n#t6lVT
z;ILRM=s|esv^qWOxp=rZZ%60V?mSG70H5II6gvPl3N<_pJqB=cbUQS6h8#TwY5<lr
zm^1-A13eydbO1J^G&iO^9X%FvERHrJHUT#oH#{Ic51=~%qc$6+wJJR)YsF|0JqHp3
XGARi!10xO^Ees(CM%miiLqPyLDWbBK
diff --git a/app/design/adminhtml/magento_basic/images/arrow_sort_move.gif b/app/design/adminhtml/magento_basic/images/arrow_sort_move.gif
deleted file mode 100644
index 9dcb050136e8cf86e8a015525a88f6dcec6055d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 110
zcmZ?wbhEHbWM$xH*v!E2zl87KlElB;8vlHG`@fj`@BT@DUflej!|><(X9jFQ@h1x-
t0|N(x4oDJY1_O(<z(Ru*OD4&J4od|M*-H^hDpGRM=?dX$fgUUj)&LCn9%=vp
diff --git a/app/design/adminhtml/magento_basic/images/bg_collapse.gif b/app/design/adminhtml/magento_basic/images/bg_collapse.gif
deleted file mode 100644
index 5d21686469609c21366b9fdf80e6bc92c65279fe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 86
zcmZ?wbhEHb<YaJSXkcW}*VlJRouv4ag^_`QkwJ$62tYCpOu8;T)1}|?FP^i-kELkS
op6Wc4g^zk3w=a8jYTMPH2j2Ny|JM6lr`dDnB1PA_JxmPN04jMOr2qf`
diff --git a/app/design/adminhtml/magento_basic/images/bg_create_order_totals.gif b/app/design/adminhtml/magento_basic/images/bg_create_order_totals.gif
deleted file mode 100644
index 3852cfcd1ee3f0ec61782b7f5a57022ab9e0e909..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 141
zcmV;80CN9FNk%w1VW1BI0Du7i`uXPn|NkNR1OWg50RSuj0001>4*>uG0%VMjsmtvT
zqnxzbi?iOm`wxcVNS5Y_rs~SJ?hD8AOxN~}=lag~{tpZaXMm#dh)gP%%%<}RjY_A~
vs`ZM^YPa03_X`e-$K<m4j83c9?6&(2kIU!uy8VvN>-YS={|^`_R{#JzeWXfW
diff --git a/app/design/adminhtml/magento_basic/images/bg_notifications.gif b/app/design/adminhtml/magento_basic/images/bg_notifications.gif
deleted file mode 100644
index fb47f6ea7a71bdba54e06b1f26cc5cf688d32cd6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1962
zcmeH``8(Tr0)W49RA^M{OuH?irqYx)C^}nhQcOkJGGkV?8{Oz`XB30ZSUQGz1XD*f
zLm9o4xQ0rmj=GPIxEdNqW9w)tB}jy*5b+f`KKsl+u|LiG54_LwKF{mxcj5G>;h{Pt
z2+o2)G3416t_Xn^_apu>oD6<*g5#YeXHMK0$xv%G=X!3e_?-n>HPEPmS`A)!E*&s}
zfAmyP3_+=(N~^A0`W<MLfQ1Jt<-)e4V!l~^KL?I;P|fmHosZye@w*K<VCoUr;4hy(
zzQuSHI+O%>IU$_efa#zW^R-IlvKvmjC8te3Ru)keRi!{St(oV6_f_${JWye}bjWxo
z=aQ<gYQ@_lV)PCuHzBgW0`2~k;S^9~y~`T|n}Wc>Z&w3IpeGDYa#t3HZO7OHHdVzg
zZ(ANz@u!zvKareso>Pdxt{i;iX+DgBGSsa%bm`T=ck+3`))J_-59iV}vs^_@`F5l=
zkdCEIJ`usIppKyGE(Q(m+v=U*R|#+`arZ4xaSf%F2*4_LcZ_?XFA8*A`WSIdQBlm7
z3!B7!VEt{gxL?7n0<he>_om3sOzdQ%`n^;&{dW7h=}wkEXd;4lrC_F5WP{c$O@E9E
zSI-IH1cGMaZG(s{y&SMjH39tcsm%}2pZs46*edl95R?Tu{$cy$2?z<G{f6;9UyT^i
zkY;!ar@pK&6Mf`jF}b09;4a2B@;xVCnEEr;JLiyJW93i*F1VI5)L8ZU0pVZ6#eS|L
z8u5xHo{ea%7%L^E8y&vbRP*^yZUy+T;ihL3)j<`{&2^CTCP>?#BWH)3nNxK>RXK<K
zTUawMB2@9D%Cu~9ecZzEQ~%4jcb&K8E3-c&(9(^MtQuJdw8<zhv&@cP<A&O2>(Y$<
zO9I+m1_vLyMhUv&5q_^3-glpK+nXd4HN@-pJUg0Kr^13?m;CLCvy|WVT_S6wvvs|p
zBYm%pK-RjkzzOzBRTs6%#cc)trSxRPoM`+-RBJ$YCp=>x`d`3)+1;h=_%Oj7>+;gK
zJLT3`QW^+WcU3zIUVC~T_kM{&A4d&UT0}6uJi_`VPxmC+r8gCQf%ArD9zvc#1oyLp
zbpL72re$F7oX&^riz0;CxL<38IgTyM!n=e)+(PcD$%ut}r$rGJh!fa`JR6@voG{M^
zU%8M^KKg9&et^4Vv4B7i-{TcTre4nv-DkK|L`je=J)qvXLN>~xqB+@DemxfcFuFw|
zdJ>m*;JhxDQ6qY)Gx$tglDsVuXIo>a4kZ~Su(&MiXl=y({gt816?`YWq_QyNV)-xW
zUbV+=6(y`ls(*~Z*Tyl5B3GVK=(YHmnwFIn=81~{i+jwRe0Px5CfbeE`wuU2wXR5l
zm)4ggVKXgX>M&X1{qC!d<%g)LNXr|Pc4>3QS>{?xtk4$e<&3elZ&~CGthF!4C=rhg
z-Kf6SHigGyDU!*kSo)snI9+d)%vsM!zDH^S=~+d~*hmMKtQX}WmGz;09XI;TFGp_-
zV7`vNh495RqES?HM;Yhp&FIY`Ts3QR*s)dW(w_v;#x2b-0h=Q}-7NX2CoGkZkyf!f
zc9yqq5k|?n`dhpJkF~7{BC#jc5b5xZn{Uw9zbPgui79bN{V!7#(^lVqvpo}0eQ#6O
zuwc#ov&dIY@cVc(%8Th(@mkPqG7Q!dr;-dt$3J9P#q5lxInc-Fb3Hz`^_gX)Gzqhb
zG0G)6k)&8GG@vWR4ES)G*||8u_kyzO=eskw&{WQW&!>|+1k9<J&WTf9v~jbLEYCA5
ztp+F6udPr|(Yim#;@ImwChKasl@;R-3iSzryw`yM5}@~q>l%12^Q3lX@j<Lsxm;bR
z-IcbkYgMvW>*o-Zo`xW^%kg#H{7rZr00_l^49Gn?<tGioNJtCwxo%DVNGdv)q31wm
z8(odtcYvg)pCmhLKp#oNqRNoI<X$5?EaD(kYET!_YuO?DiI6)F<4KUkbHYs*ZrQ#>
zP9LzvCVTXUn`CB^`|S=oL#U>3bZkQZ(Z6nFJ5%gN8RP-{Rp+!X{w=g<<qVuC3PiX`
zsg}N?0hh-Ocah{W%qvX2YsbdDODqy5t^R`h@Lu|DZpFSp62j-ubpzw3g|00!$BRxd
w{yT~MmwpEEyx>h<UT!7AKaZVZ-(&m*j&{W6*wCe<%@n<d=S@vb(a@Ry0jhCc?EnA(
diff --git a/app/design/adminhtml/magento_basic/images/bg_window_mask.png b/app/design/adminhtml/magento_basic/images/bg_window_mask.png
deleted file mode 100644
index 1824283aa64469e44d7104aa9ccc2c244635f0be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 277
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$`B3Ea{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i<T_jGX#skrs#A|o$@0SC)Q!>1N?
z+&2`Ks6UMI{FUi@pGkp<$;F|8gF}FkQHic>2NtNkJMVEAFnsV~5&gW(^cT>{44$rj
JF6*2UngB`LJqG{)
diff --git a/app/design/adminhtml/magento_basic/images/bkg_btn-close.gif b/app/design/adminhtml/magento_basic/images/bkg_btn-close.gif
deleted file mode 100644
index 11299fabad2143ea57c17ee0c9669245681ddaac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 146
zcmZ?wbhEHbWMmLzIKseice2fm0*PDIDmN<?Zg&`5P2sxTsBw3q<@GGVt4SQ!)A??<
z>fFc|yICfCx8Lk`xAE0DRt8dl;!hT^avcx}vXg<8U!lN)f1|{q3oJZ~L^ws57_0#^
Ck|5py
diff --git a/app/design/adminhtml/magento_basic/images/bkg_btn-close2.gif b/app/design/adminhtml/magento_basic/images/bkg_btn-close2.gif
deleted file mode 100644
index 24f6252a98ecae743f826b0eb6ddc9b800c909a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 356
zcmV-q0h|6uNk%w1VGRHc0M!Nn`||1g^XmKY==<{O`}6Dj@aWx-Hq~Sb?AXTb-OI#W
z3CC<2?cB@i*2L3e3d(&z)MgIYw2{+n71@U{p;s2zi89KAM$d#W(1$afT^!ApTFYV$
z>e0W*aUq*f5!Qh#&X8T#s)p5R5zt`@&5~95?&Z#UCC{L4+lw>UxRlR<E!VAz*o!sn
z*2T+e7RzN2$zKWEjyBh44(ipyqFWoqZXN2`$IF8;$bm8X@aFjJ;=x-9tY8`d00000
z00000A^8LW000I6EC2ui01W^Q000JoK!YL1!rX8-3@auyR4$s7EoVz<E)~N>bxIJv
z-^58Z`H&cav^u~beN2&bMm-NiOr6GHPaE|24IMQl0EGZNh5#is3p0ik0FZ?<3oa`H
z0v?!|m@6(476_Z82o@3sFCZ-itgI~{FG3I-4<Q^n93c-I5KRsvFbX>gFe45^K>#~|
CRG1t9
diff --git a/app/design/adminhtml/magento_basic/images/bkg_search-magnifier.png b/app/design/adminhtml/magento_basic/images/bkg_search-magnifier.png
deleted file mode 100644
index cc7a26f8b8f7bf643a8ae437686ca8e96ded9f25..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1352
zcmeAS@N?(olHy`uVBq!ia0vp^f*{Pn1SGfcUswyIBuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrIztFso#SM3hAM`dB6B=jtVb)aX^@765fKFxc2v6eK2Rr<N!r
zrKV@**($x?y<bToGsRXZ+|<{=x4=0yBh#a*C^fjsFC@7tJJ~Wt$=*)EroswnKyGSD
zqC!P(PF}H9g{>0UTq__OB&@Hb09I0xZL0)vRD^GUf^&XRs)DJWv2L<~p`n7AnVzAE
zshOFfj)IYap^?4;5Si&3npl~dSs9rtK!Fm_wxX0Ys~{IQs9ivwtx`rwNr9EVetCJh
zUb(Seeo?x<p{1oI$P6PRU7!lx;>x^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal@=Hr>
zm4GgVcp<j{ZfssLG?;(^reBd*pl_&W0P+${p|3A~rMbCq)x{-2sR;LCHMlsWvLIDI
zD784hv?v)EacRmRs|u`~i&7Iy@{2<9^K)RK7?6=)l3$#WU!dR|Y^I>$o0y!L2NKW(
z>+top^2{qPNz6-5^>ndS0-B+hnVDi`>}YOaVdQ3M;$q-vXy|HWX=r5ZVr=Z<>SAQ-
zWb9@M)9aF-T$-DjR|3<Ug3#-TQ!gkn<Q4#Jc1bPDEK5ysE6UGR0DIah6SrH;aheC!
zn}XXd7C80l10ACeidv+oh6w@F4~Pj*xIhj(>8Iua(|ZvxVNY(bmt$aH+~w)w7*cVo
zWm0(ep#Xta-=4jTl32CNTt58&&n@V<W(}{PPQ)U$UGw8QJ|<qT+;Q^klQWjZX-i&z
z&Dwl3Z~N`@+S_igRq^aUt~~jq%i@a>I%!*@bmuGHegFOPOB1PHwaJ|2AKB&gr+1%!
z?yVx!>U8jB$t**z(A#gn<(P4^FaZ@y@SNJj<G=oT^xCkydEuA0WNppbew(*vPmCU;
zi_%25#S?wh?&g_?#_EM{zPaZ5>zI>yX41y}HWEA~vFk&$Jf8QdD7$wiZLF}H|NQe$
z_BJWLc4Zm9ZtM5YO0=dPQruFLpy1fENMljymD!gwK3CYRS|!KVZthmiDpt&>f1u6j
ztLUPW=4$iLe|9j8V@wFxBf)k3wW-AZ`~5BEYIFUP-xXNQ@mv0*ugdQu`;*5XXXqR@
ztzO&Wq{zm;?DES1q4f=ojWe}M{O#XxX*%C4_6^`~n{@o~L|cZ#oIdreHZ`5cAD?MH
zHc#T?)X6LL#kje+nTvMH?B0C)twM@R$&9mU-b;mY{N+yHZ#??9ZhlclGw;)<MUmV7
zNXM-gPmWYIWUyeYKPVt^H*4z)_Z-f(br;i))a_rc9o8fHkIR6eidjf@<xwvuP}%0`
L>gTe~DWM4fX8qw`
diff --git a/app/design/adminhtml/magento_basic/images/blank.gif b/app/design/adminhtml/magento_basic/images/blank.gif
deleted file mode 100644
index d6e9b014cef6741099e49b0427b487030f3d224a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 43
mcmZ?wbhEHbWMp7uXkdT>#h)yUAf^t80LeHoF}W}@SOWla!2~=2
diff --git a/app/design/adminhtml/magento_basic/images/box_bg.gif b/app/design/adminhtml/magento_basic/images/box_bg.gif
deleted file mode 100644
index 8b51ee0882f8cb89a38f9b5493d4ae64ba61b185..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 217
zcmZ?wbhEHbWMXJ%IKsg2?eE_ofB*gX@#E94KVSa*`SknGw?BWs{Q3Lg=kFi?{(bxV
z@5}E$?|=UK^b5%S|MTDfuYdl2{{83s-+v!|{`&aqHv=J{_>%>!L<dBI>||gKQ&8?x
zv7DQ+YMs`jeR`_rOLFh~u6ti&%+tESz)44{|HO%;lR0{vEzKobtr6>QtPx9kQMJ3l
pz`;>(_Q^?Gs?O$ZX8z!i<hS1X-H$!@KEC+<zoC(ziAj;c8UWpZY;*ts
diff --git a/app/design/adminhtml/magento_basic/images/breadcrumb_bg.gif b/app/design/adminhtml/magento_basic/images/breadcrumb_bg.gif
deleted file mode 100644
index 9e82a9099c0e63154a22f34d5bd7bcab71265737..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 50
zcmZ?wbhEHbWMp7rn8?7ed-v{pckiw{dbYH*RPiSZ0|@AV2#`Dj6Y~`TRt9STmIVzT
diff --git a/app/design/adminhtml/magento_basic/images/btn_add-image_icon.gif b/app/design/adminhtml/magento_basic/images/btn_add-image_icon.gif
deleted file mode 100644
index 85d971ade82a568d8d93d10f5d367a10be8be94d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 71
zcmZ?wbhEHb<YC}pXkcKto6i0J|9{1wEDRu^10p~&3`}x8{p_c6<s7Db_Dp*jV;1%<
UaQb)K(2S(ptd_mgR9G3T0l$+KmjD0&
diff --git a/app/design/adminhtml/magento_basic/images/btn_add-variable_icon.gif b/app/design/adminhtml/magento_basic/images/btn_add-variable_icon.gif
deleted file mode 100644
index 7f50e6fd7731a2350159d96688cd973211780cfe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 80
zcmZ?wbhEHb6ky<EXkcXc4+e@qSr{1@7#VaJfB+=Jz@*;8xUBK?yGfHi-S{bScG|mL
fu6LIv`rk-d@JqMTJn6&BNm;xzgSTq4GFSruh{_+<
diff --git a/app/design/adminhtml/magento_basic/images/btn_add-widget_icon.gif b/app/design/adminhtml/magento_basic/images/btn_add-widget_icon.gif
deleted file mode 100644
index 2c06933eebbc0db35ff3a6b2bfc5aea563e7e252..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 540
zcmZ?wbhEHb<YnMvc*e-^|NsAQrTl;9S^isU|96qi_X?qZ+f#ou%l_<E{rmXL&vwNh
z4O0Jqe)&1o<<GAAzq^WmZz=jU+3<Uf*xw@^zh>C}dv^Zcy9Ymewg2p?|NryzuYS$H
z2b+Iyul{%c;J;H7|9^k?_uTBC9V)+fwftI>{j*E$N2kW$M`wRbb^rhG&!0uk|29Va
z=rsKQ=jYFvzCS0L{h4p`@AC4$2U@;WOZ}MX`|s<!zgO4(|MTnr_YZ$g&ilK+`R|Qg
z|9^b?_xSXmZF&EmUHtdpz`ymuzvsLBySL}xi_70CME~7f|9f5D?`>5KLj)-PWMO1r
zU}Vq%xfc{C4D6K+j7^LVY;9W2os4n}y{=u&3cU>Wo%#m+{PL3}g@v6oZ6_~YENwbj
z)X>pVbh51ZWC=kjL5ay40(QM39D7B2odviQZ5a5(xy1Px#8kMNI2kx)^xQ96t2VhU
kS!~gy%+t$bHQ7w5SzAqqmr>V5>`kYOakIKnb0dQ_0L3N2asU7T
diff --git a/app/design/adminhtml/magento_basic/images/btn_add-widget_icon2.gif b/app/design/adminhtml/magento_basic/images/btn_add-widget_icon2.gif
deleted file mode 100644
index 75055bb71450923311468f9384d57385c2a6e778..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 547
zcmZ?wbhEHb6ky<Ec*el+y;l5th0xzcHh<<>{$1wqt(5=QRQ(O>HvDLjJALZ(pV_9L
zKYxDv_ALVg!>?bzUc7j*VBUfyi<YcfzUs`0GaJ@!IK2Px!ubn5HM!TXUB7VN!kN=%
ze){yW$Wi#`&!0vL+z%HewmEVgJ9_N-^XGSJRbIY)d2L4crE?bpOhukm%e*KPTe@iJ
z+jjNYGiQJQ{{3{i@Yx2v<=GlKlI%IQ0-qXX-@SXccJ<mPPo8Aj2wv}S@AMQrUZnV;
zi2p*l(ue70kEU4O?f1KP@7`2@p$sFoOk<7}OIJK;s6ThD@71eUix)0lwq)6<lc!$f
z@qJlfSLG*rXy2i&8@B*GGN^#!PZmaygLFUyC{7sI8yXmzntjymnmalf40wIJ`fcU(
z`<vy3gw=#a{j{W1yV!-?T>V8vTqJcCaIRVFr6|y>ZEnTRr^~l<r>uvKjIt3gFFUsh
z_wnP>f`+`}#+D51JSsd_ueu8|IBGPr^WVR(Wac2&WzYVCUBc8;z+wu6Ca>Oy4h3H4
Nug%s@-u;aX)&SkDv|a!J
diff --git a/app/design/adminhtml/magento_basic/images/btn_back_bg.gif b/app/design/adminhtml/magento_basic/images/btn_back_bg.gif
deleted file mode 100644
index 0824ca688214ff331a7bee26a4e9694b81de487a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 147
zcmZ?wbhEHbWMmL#IKsg2{rmUl&!6AAb?eEKC;$Had-v|$@87@g-Mjbo>(?7MZajMQ
z=*^oqKY#wbbLY;>moGnm{`}#?hrfUSK6vnefjFS}lLf3$2SkGGWMCCg5R~L;unE{`
Oad3f$yRwQRgEatojy*sC
diff --git a/app/design/adminhtml/magento_basic/images/btn_bare_bg.gif b/app/design/adminhtml/magento_basic/images/btn_bare_bg.gif
deleted file mode 100644
index 24fc5ba5a63031e8feba479d1dc9d8fc5c48e699..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1454
zcmd6k=Tp-M06?Qe;6wyl4jjcpK@3B{>M^7PPKpSKaOD(FPpNXss-t-7wc4YS0wNX!
zWN6r$O*X%55(p4RLU0g}kp##dBoIiz5Yzf!^nHAv-rYNOIx#xtm)b25kTL^A#$%A3
zEqc9vU|@jQg|JvGYinz4CY{4(PzV?j4#j5DXaH$=pm(UBYqeT8H#coIo84~5W8m-(
z*z)o+pU-b@svY2Qap*U_Y&s5$YHx00(Yh511)&Q~2gpn+iN|3sEX)f=_#`4uBogs@
zd(39DP$>NHZhU%rn!{qOtgO(fWQjz==W+VEEF1>j25V%{0h7rzCKU8@nMR`#jp*dE
zXiBA0EEdb85`)1oJ3Bi*K1QPusboBbfF*XJaA-IIi|9hVrUN7fK*k_C0MdW19oASg
zGT6tYQc!PN9S#TRf5U+d@D>m#0~GqD=*tt3i=#Lr<E!9rea@6Wsd!rX?4PRY=QXu;
zFX|f_n_j+xHMg|3wb!Kvcs|bXJiO<Gdm0W;Ad<+GZh%UoGng!P4~N^^$Lk*$<TDO_
z9R|<v_t_cYd-lVGcyj9F^vvv>L@JwKSd=T2Dz!$d(;H+*)4aaV*tHv+wzTodwrT(D
z06A@!tDvA#SC1?RH;T~CEA#YEh9w=nSOPx2-z$qi=-^lRovipK$aK)vX`fHvg<;a0
z(T0d?Be2tCxbRhUk#=^Nj1aZPm2CG-&Q$&642d}r-$y~cN2GTqHz#+aCooy${JD{C
z%p^XWSK*ri=*69<eVi|h0$nrI+m6MN<`gP!j`_f>og1a%rJQ0XxBaPE;nQ_#P{?Hg
zjkw6K_D^X^rIQq+jmHWk0y<eGYCHLKfAa?6-67=9n9D*&w{DVfZM5YK6EMusigXeo
zlWLT5OQezP+vUrPL$x7S##nT-YP>V0HI2<!(@l{Jq+@KR)j07ac1v6jYs0L5kGUf1
zVcV>x#nINYoF2Pv-K>*}IF5(Q31En<80?)Z`^z;DDSNylQY|a-OoYrsz0T#%|GoP<
z@&I&aK(W`=L?~pTJfJ>z;RyteT&M^I)C*4|1|f@;$Hlpe&!Uw`|4QFKk(s;VoP*@m
z3Ep|~=ShJmxuYgEQX{WTPYhDjWuD7ZyvVw~kyDiybEm%{yEI7Im{XspY|4eBlrIYb
zjq=s)!5|gvt~gKC{D3ih=xXw+M%7yE9IS4GdgrU#%LCEsj><@_y0bblSo6B>Tz*jJ
zAHf6taM(Sq2GLd;tVO=A&)1@maI_YU1+-cWVK7*SrJxyyw_4-cbvTwqtHX1hL-d4x
z?*ct>C=jD32_kiR@_1s1fimoU7nDpp5pMuy@97LwS!u`;P5yhq5rAHgSz_n`-4fF@
zXw%WR<%Ag7>q?BVXR{^+&$c^<nz&$}henQOFV@tzBT64ZbS<!%`n}E<E<1X`moDDw
z^SQ5I=KIC&yE7EfP`EPe--=xs2|Wh;Z8U-(TEq$$6`F<7MHh?4zO(9!h_Q~))$t!(
z&aA#o;uYR~mm1~1LiYf@g*xp8XRl3U-RN2qU%GEto6IgdVwuWm_|@_;7tv*zE~FYP
zGuO&ItK2;j2t1cPxy1s>L#x3mEp`c8mqE>sc;J`^p7CA~Z2DH0j)brcdENP&8;Zso
zIJ*2;A@`))<GA!*x4^6jt_F#~ebQp7OP_QEewa;9nY?K;&{R0v63e<|Gjd07#&7>o
zHZJh<$dr|U1X0FK^Z2Q7`|5}Dx9n?EH}H1L?0uu%Dk}^B?6xj%sCwkSEy*v*4;1?^
DVowtu
diff --git a/app/design/adminhtml/magento_basic/images/btn_bg-disabled.gif b/app/design/adminhtml/magento_basic/images/btn_bg-disabled.gif
deleted file mode 100644
index 3ec0b3154e91aa06087ec36eecd180e03af0d54d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 148
zcmZ?wbhEHbWMmLwIKsft)zvj?)~p2!7EGHqt*NPL-n@BJrc9YQabinL%ZwQ_Iy*b-
z>+2gD8hU$s=ggVY*4EbF-(Oo>yLj>9g$oxl5CIf_vVc|TfJl&?46K3+OgLMGRhkPO
Pco*1k9MlQqV6X-N!gwnD
diff --git a/app/design/adminhtml/magento_basic/images/btn_bg.png b/app/design/adminhtml/magento_basic/images/btn_bg.png
deleted file mode 100644
index 09448f4ab3b0cb2f2b87d0c31fd883a99fa0c490..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1887
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
Z0RSsWU4rIy2-pAs002ovPDHLkV1n@ITSNc=
diff --git a/app/design/adminhtml/magento_basic/images/btn_cancel_bg.gif b/app/design/adminhtml/magento_basic/images/btn_cancel_bg.gif
deleted file mode 100644
index a3d92e461f740967cc32aab47fb157ad0b0a5756..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 147
zcmZ?wbhEHbWMmL#IKsg2Da7o(iSX~`y+2wqKF8UAEe!cy758V|ls8&zAH8+{ZkheT
zS^1qV&+qvyzou3H>@E6|?)h)m!VlKc48#G&pDbX7Iv^5cCj+ZM!V(#$$2QG@4lEON
Lf(|GsGFSruXAUZ)
diff --git a/app/design/adminhtml/magento_basic/images/btn_delete_bg.gif b/app/design/adminhtml/magento_basic/images/btn_delete_bg.gif
deleted file mode 100644
index b0cbd8337dba2f9d4f77169872ee13800895a8f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 173
zcmZ?wbhEHbWMYtHIKsei=FFLsCr|F$wd>fiV-qG!m^pLi;>C;CtXb33({ts@mF3Hq
zZ``<X-@bh<EiLor&1-CItgEZLbm`L8ty`<Bs}CJI)X~v#{`~o=Q>Ru`R4`xzia%Mv
z!a5)lWG4fwR>CBgiK&bZ0zAyFhCK=%mo~|?FOq0`EYf<q)xkkQYpUDhj|~oL!aQm$
G4AuZ4dqfNX
diff --git a/app/design/adminhtml/magento_basic/images/btn_go.gif b/app/design/adminhtml/magento_basic/images/btn_go.gif
deleted file mode 100644
index 30f87d685dd3e9dc8bd02c619026c49200649d7e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 204
zcmV;-05ktbNk%w1VG95Z0K@<Q|L@=b@ZkRG+53|%`<F5JfExFF7XIzs`G+C+gB|&c
zCI0N({_NZOk177^+x(t6`?7WZ>e~M9-utw6{_frSuyX$E+Wo+S{JDGlws`%;hx)E?
z{JVblcoO}-fB*mhA^8LV00000EC2ui01E&N000F^U?7fU0BAs(KCJ4#5+Tp>B~e4J
z=N@%5jf3#l;2ai;<YJk`EEtF=V;apc9EpTuqRmbmg@OeVE<-GaNX5WzS0aK<M?kOB
GLjXH{V`z^6
diff --git a/app/design/adminhtml/magento_basic/images/btn_gr_bg.gif b/app/design/adminhtml/magento_basic/images/btn_gr_bg.gif
deleted file mode 100644
index d91a78b537f489ee43baeef28397625dace4b425..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 148
zcmZ?wbhEHbWMmLwIKseSGczh+cah_=MB6zr_6y?Nw`F_p%(I>r;k&EAd3B1@%H)te
zrFQdUUDl;}?8ph+UF@(V!EH;X>&6TQ;(+2$7O+Ac5DBuAfmQIqCzg(fA``EubTJ5?
LVPJ6QV6X-NlQ<+x
diff --git a/app/design/adminhtml/magento_basic/images/btn_gr_on.gif b/app/design/adminhtml/magento_basic/images/btn_gr_on.gif
deleted file mode 100644
index b9f7bdeedbf052964092bed39af7ceca9ed05e05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 137
zcmZ?wbhEHbWMp7tIKseS))i>KAkJz^xN)<u?c5l{8cznQ0>z&!VDof9B*;z%R<;B~
K1}4E425SIopbOOi
diff --git a/app/design/adminhtml/magento_basic/images/btn_gr_over.gif b/app/design/adminhtml/magento_basic/images/btn_gr_over.gif
deleted file mode 100644
index 73afeb6200c4dd4752393730b631114da01382a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 147
zcmZ?wbhEHbWMmL#IKse?ailHwK&{iN<jGf8G@hFkzOQ2HwN<U>=XPIOlys=kduN`@
zy0rewOWihSR-c*bzCAntcz59L;__3I7>EOkKUu&EbwDJ@P6k$i1%?JE94&-cR2&60
L{Wo(cGFSruG2ket
diff --git a/app/design/adminhtml/magento_basic/images/btn_loading-icon.gif b/app/design/adminhtml/magento_basic/images/btn_loading-icon.gif
deleted file mode 100644
index 7735ef6e5798b95dff4bb9620eaf72c326b5037b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 847
zcmZ?wbhEHb6krfw_`<-jc=6)@|Nk#ty7cACm*>u%`~Ca(hYue%ZrphA;K6U-zFoe2
z`R2`=Yu2nee*F0M?c1L`d2;{$eFjp1;(u;G*N|Xm#{gF&Jp*P&pkBp)QqD!Gi6yBi
z3gww4848J6i4{5di79%Sd1?6!ia%L6xqzy4K(>G!$-o+*pwO3+Id7?fNRFabOTwzP
zGenL}lrnAjz;?5vA-b2vhAFc(V4^@PV`uB4zBQUU4W3ay7O5nC*yS;4f<?;;Q#IL&
zPSb1!8)1=8m9j_Q_d8*;Btt==%l%SMhL+UP2P;-MsJPZ1IB@XVQ6`R_DGjL^B0@X|
z4=6YYa`_x+_>dgv-pu5*<>|Hn(-{gjt4u>v0=H?uP};XReTu;fv2}|U_B&<^oL6>a
z;I;`cH(<BnWN9$qi)6FV;^k~tR>Wp`0?>!bpC@SC67kUDIuanlsk@}z@V#*(mzDEr
zL+>pfElm&EJoIL$+}v2nz#*{j;u+Q(S=@S!;Vuq$_#zn=8F+Atwdxr3IbGrE%NFo@
z_Le8q-n5*VrA8&2H%616ryHxKL6Bf=P?*AGD00+cMYFRU+Zyp>+1*WZ7!{qKB-k@F
zZfDvzLD{v*qRJ^Sq9J*A?xHeoA*F>1FAptFXiRA14Ru>4S#(E|Z)w46&ChB78?agf
z@*6PrRygpu8VVdbDUlm1aeSwQN6&?}8yf5aT`VR{3ePokB$l};CVDVL1kd1T%r#xI
zl`+Z1V+$L@s-1~RI$V9K4F$$x$w!nosQ=)7qr`4vW*(rX6`|jt(bKDf)zWyVr5-?!
zaV&E%VK}tun4^;CM2-!!7AA1m<+ZYU8mM$g^vZdgZ{qdPVL#ZZThgr6)a)uHBCzDJ
t?!|-^9SH}RehL_Na!72L?$FQYY@WfPZ^)9y8l&0Wqo&AU4N9J1002xz6F~p~
diff --git a/app/design/adminhtml/magento_basic/images/btn_login.gif b/app/design/adminhtml/magento_basic/images/btn_login.gif
deleted file mode 100644
index 93ed65b587745368989f298dc3720f56b2cfee97..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1518
zcmeH`*;7+@7=}*(Ay~j5?q$mfV8o+9MMYs+hzpC<indx?3TUl$)Q)t9Q55ThLLlZK
z`|7X;#3)b#2Cxvu15tql*=4EPN(s2IB!pO?<b1!5{U3VQ_u{#HE}og!KXAX-t`h;+
zdTbuUmINHg*-WQwgrco*lYmTDNasSq7K6~4CS8zPi6)frC><@#B6SByLeZiQy0X!@
z61`GEN2a0dE9lIEsxVEGljb@H#ya5M3HY-E&8pGUQW$O5kWREBoo-EqnlFG#fa-9=
zgJh`q22@!vkORsLxaAE`bKyxQ-I4-|pO%`FL4HLe;y`cKLSqurs-Y)qIsr%BCGap6
z`m_I*-+-=6q#K9MjQRUX(4G!`+0d3TlZZoG8az&e{wk<AVo2FGBjjk3oYC|!dNT;^
z85$u64U|H2Bwcn04OgQVa*!O>+;9d}5qdj>7IZ+x81jRm>GDhh4!8Hyb(heHluq}A
znur-8j^@VE<Pdr$rOQL1{v_P-N7F+{r-u3;p!zIS1fZAAkhdKQz0mJ+DBcC~3v}VZ
zX#pFaH)%vpbOCSahKC{Z6ExZkVmByrpTEX_7vn&edo2Ep(~^&L(f0J+ZJH=My3+Gq
z0||q<Q*m~0FES89*#G;_3a}SV{&f@Y`Ti3a6Je{(Z3CpmEpbd6*U)HInj(?K3Ca(s
z5kDeX72K02B&BUBj(bG5fwg5F$wVeM$WL-hmE-=cGC%NM`IGET?%Y1M<aT$FZ`^Xb
zAep4MaCej`<Du+M|LsGiK?Ol|uKkX?zt@i_>net-BNQUL0~aSPSfcaV<Er|qXAO~K
z%7O!zsw`zbrmtV98Z>-!djs!y?U~*}>zHHFd?}Ncx7v7raI^=dh~IG~JXou`?6yL-
z#Y$-ZX`?=N-v>e6$30zIZJ4Yc;la4wtwsZ8U4$s|W&MY})@$<YKW=<vx9?*nH@r)}
zi!tyd#y7R}szU5$QcKiIull8I9sKnV6ef%13-)#OyUnxrq=_)?n5xJjBF$vce@$T8
zXQl`EUL@rgzK$$r@l94resow)_PmO?>MAqa%UE^v%&1@)A?6F530|yVIdRxmxax5+
zb^Y_Gh0*Khh?U06@RMAQ!1q)!)7n%m8B6xrAQc*Whe?@M-eEOD#t}l7!1&s$rv+cj
z9EoRGVQ-wQ{Qr`Cm%MlQ%XlmzVbese5g~5LwTxo9*ptI-%$!VRm9xnF$X1-kEN;mQ
zA^Ir%l<9`k);lIrsS=^f-7`ky07aErI8hXC>qD8^kUpu{I!jNAGPW=*QpV(7CBrOn
zL&&hW62BQ|BND3kRHbb2>}Dgucw>9zQT1>9wX(ihzhAb;^ZDz^bxSQ~_wd<QRXu&K
zyp^K+7*#iXx?;M1WFo|G+4Hv{v1^`ZpPQ-QDl8G2$I2#WnzWBMYvlUDa~GOiEJ~Ob
z*YuN`2bdY5rA*eIk9^?%x=G<+v2#kRVEGfX4_6)Q)LMmdc?w6{OH;FLj){b>-6^Nj
z!*VBAw}(wMOzBkaZNyxs=TN6^#U=;wT$j)M)Lgf(*%p0|&rnGK9<Z@W-xs`dTHk-j
Kzd6bm^Zo}w3Vh7~
diff --git a/app/design/adminhtml/magento_basic/images/btn_show-hide_icon.gif b/app/design/adminhtml/magento_basic/images/btn_show-hide_icon.gif
deleted file mode 100644
index 6670833a4102376c32b151e2eccff5a32903e1b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1014
zcmZ?wbhEHb6lUOM_|C}i|NsBLi)_A?^8cA<`MpBu&ur80HDZU_V-`3w+)3klH_7Pt
zbi?<j*DZ8o{`>pqiXhQ5ITAk_r2c+;|Kro!YilQN4`lt`B>Syi@=B%Zxn#bh-AO0X
zME1uBUMiLUHO=75OtY`E%+IIt|C*$;FN**1g4B0M=HJfb-&^aqr^@?wrNaGMrNfEh
zZ+dioPu9J&Ytioo)~B+>uhnWVbY*^2CATYt{pHrSO=$+Nt{(d_%lyRToGWDtzrTGx
zS7v-NfoEfi?jm=#!yU2jk1e^~Vf$cS*4;fz?xu4;uUELeWB$LtzwXaUcu+3=YWLKW
zQ}dVj@*IxmzgQ&mW>?SIWd38xLhlRtE-i2WUN7~ofbY%CGgoW%_BV#SEZ{$xF7kb*
z*}3^O51KTNXUM<k(7Ms-@w8fYYmUXsZ5?lm1P(;=><(o=5W{yWhV$o_4|k^oUQOj)
z6D5DALhk*8t2atyzSW3*Ym~WMp?;(*;qijRM@KilKRWMDkK_Gf@k6aqFLz9SS|Rys
zzSX6A``_=L{Qds%W?#^SYRk(da&K;(y`RDT{=~|!)uMaCIUl!bzCASWXe7tJNbWzs
zejJV$U>F6|4gtlVEQ|~cj0`#;gF$(Mf#Wg*Gl$F%rk18=`CmLS76R@{vJx#<4hk=B
z7T4op-6Ubc-o?V8z<B52Cl(%OQGsiJI8Q!lk!29_aPWAj=)i3roz=opd6=C^T*3Q5
zgYuyc5hF#;#+)h4N153bnsa6-s+~E<9^2t_!C~RS*%Lgcd?;L`v830KeHMeIf-|p&
zbKj>3j>I(16UrQ$0xT}H@p-UiEIPp%pvt_+p@AXb=S7Cbd9ogD2CoVe6J&(b!`?7H
rcyNk^foI=^gkp{4nI@ucA3i8|IJde+8R^Xl(rA3E6lTQ6!e9*mIK4sD
diff --git a/app/design/adminhtml/magento_basic/images/btn_task_bg.gif b/app/design/adminhtml/magento_basic/images/btn_task_bg.gif
deleted file mode 100644
index 87280126cb087ad7bb2bd3a0c3d88bc86a49b78d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1735
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
diff --git a/app/design/adminhtml/magento_basic/images/button-close.png b/app/design/adminhtml/magento_basic/images/button-close.png
deleted file mode 100644
index b02bc1d33bbb753badbf7399d20462dd1fe685c8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 410
zcmV;L0cHM)P)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzEJ;K`RCwB)
zlD&$9P!NSxq7k&Qj=fq3?Nksftn-|{fe4AE2JFlO#8yNR`~lsQ-DS8dyUVhtkQwhc
zb3Nnm+qQ9x=6QZTpVKrUJ|2&{u1k`{0z4J0>w3T6%d%u!@H}strfu7@EPp9z+crs(
zrfInEq^fEZMVh947L4N<$MG->+|N=J<#M^;9sx;F6hw=n$a0hd$nzY50Do0g(Qz1t
zXhvO;QqAM>04&sXO)i&Zxn8fn?<?;@fD|u3PJsbFbX~`O1Fi-X1OehSO?Srnz84_w
z&%%@s7};(bp68)AVg$F_jlBf0a5|k(N2Upa5FjPfz+Nz{WLd@zid^ne%d%Y8eHp-?
zr%|#rn*unW&;MPG-<QuY499Wy%SXb$+^sjBEbu1401yAg*sI|k8UO$Q07*qoM6N<$
Ef`00*?*IS*
diff --git a/app/design/adminhtml/magento_basic/images/cancel_btn_active_bg.gif b/app/design/adminhtml/magento_basic/images/cancel_btn_active_bg.gif
deleted file mode 100644
index add491809bafe88cf98604dc059328c7c1b3552c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 295
zcmZ?wbhEHbe9oZGu$h73ssq<cAHGwT95)=fw`s9$)neVQ#dgz)`?Vh*12&-elLaiS
z10q3YFtA+NAmF@uuf^-LyZ<L>^rd7@J5;bH=k>k<o%1ER_bb-DuQ|`m*izu3Bh`Om
zNzut1tN9mJlz7c$T76?p+3B}c`;TZ>_~^|(pK4fjHgEU!SKDj+*6Tn1wx_QC*ysNZ
zjX`xyt!?cbEgjuGrCq%fCe}JmnmR3W%Jf;YBm3vfU*JA(;gSW5m#&z;eC3)6tJiL5
zU%zon!{)6!D!1?4Q?z^Ufr6O_kL)^p^u)g7C(j%@dp>9Xh06h#u3RraedBh>wLABn
i?mf8k=<$uG&#t_9dExb&v+v%Y{P^kUm#+r}8LR>E9h21n
diff --git a/app/design/adminhtml/magento_basic/images/cancel_btn_bg.gif b/app/design/adminhtml/magento_basic/images/cancel_btn_bg.gif
deleted file mode 100644
index d52fb2562c179f483538b59f0433a257946b48ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 147
zcmZ?wbhEHbWMmL#IKsg2Hd6YPE6ex(=y&l-pR1fc6<hsYR{k-^=xaytYd^j(jov?|
zCjVLA_&!zZ=j^OMt83l_i~L$x_{x)$fjFS}lLf3$2SkGGWMCCg_$)DTGe?J$h`TXE
KfD)@BgEasKjwqY}
diff --git a/app/design/adminhtml/magento_basic/images/cancel_btn_icon.gif b/app/design/adminhtml/magento_basic/images/cancel_btn_icon.gif
deleted file mode 100644
index 976481765e1d64550717dd6ce8cdbadcddfdeeb6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 648
zcmV;30(bpKNk%w1VGsZi0OorD{_W}g<KEgo1Nx+P`^CEYqjlLm0Q#(j-AWJKMG5+*
zdfP+@-&7y^<lE<HG5qc4_p_q;x}M!n82YoN``_03)5+OB0s5qO{`K?!`}_RQ#@ayz
z@r6_Px~uxBfBChQ-&G*`t%dW%vH8Qc;9M#Ct%m&R<K9da;8!F3+0yySzTjIZ`KEjN
zt%vlZj^}SZ_Mv#{ay{Q!CH9tO-b@nv=;Hg~+3bvK?~7jbtC#uS)#h(T`P|aqSR~+A
zBHBU*>vKN!xTfJ%8|ijX`Q6muQ5X8CeeI%!_`Iy}jbZnwf%eS3;8-N_pM~v$RQ0HY
z_t?zof?e~CTldz<<a9{ubUyac!{1pX`lWaK=HK8{8u!Jw@t1z-Za3<ba{l`H^`egW
zoNU}k4C<6~-c1tdbwlfzc=xS~>U&r0fKm9qulm)@_N9{Xwx9a2i}|5*?tDn#T`TyT
zYv58C;b1QLo^SfEiu${+`l58&Jpljz|N5eH000000000000000A^8LW004UcEC2ui
z01yBW000N&fO~>_c!Pt5hJ<@{F+u_cMO|Tvf`w8vURGavP-bErlm#3XZF;7sB2;h%
zdlzyGB6<xErVkBzQvx$s3RPnnJQ5@(CL|I%8AlEZ16oTMS#fziS9x?b7(@sI0|^uW
z02DHLc`G*H02^;c32OlX6%6DI74HEXEC+KzDJmd&Onl@4p(4c=1SJjtiJ}3?2^1qn
zpg5sM!wm-|1}It3gaCvN1PFA1Kp=+z7#H>&z+r*QotH3O>`2pMkewtyhJcwcfejh~
iPTVB&aHb3y0|pShc;X?EpaLO2M2PSq1gk-T0029M^Fm+%
diff --git a/app/design/adminhtml/magento_basic/images/cancel_btn_over_bg.gif b/app/design/adminhtml/magento_basic/images/cancel_btn_over_bg.gif
deleted file mode 100644
index d24eb118385de13c4b91f7c0f362b6b01e7267eb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 149
zcmZ?wbhEHbWMmLyIKsg2V_xa+HEn<Q&ib=;;*Xj6pUPc-F0TI49QtiS%C8lT-+JQz
z9hmob=d}OFmi{}u=u1Pu?~Og*r)GVw^!VBy^|{99|A`e0c!A<i7O=byhy>Zmz$%n*
X)uQ_VPrw8T20_JBB{ow+S{SSWVpBMC
diff --git a/app/design/adminhtml/magento_basic/images/cancel_icon.gif b/app/design/adminhtml/magento_basic/images/cancel_icon.gif
deleted file mode 100644
index 1fd7cfd6a23b77660711f95400ae18e9495bf9d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 600
zcmZ?wbhEHb<YVAtc$UHNwA|}KyzU)uq5Gi<f8IWS5Tkj|NA%y<&%Z98e3)!_KSciP
z&UycT|Gw)delJMs=eb?K?_c|K^U}}5+kWg?{UBWV`{qTTH_!NaYTuuikAH1m`s>N<
zyZ#clJ^BB=e)#A7vCl^~{y4kq=f(ZsE*}22bkfheSH7;E{`c+EkJIaZzj*Zb-Se-D
z`u@Ip@Ns_Yzh6JUo!R@QC;RJ;We*}$-Y#l=oN0O2SM=A_Gk@Pc`*~sC{Ycf1+vfk+
zxBlmyORuIBJ*^44AEEO7#+e_dwmwYIdtM&!D9z+Sw8ochvtLz*Kdbb8J)`19eejE#
zfWL1Z-;Y#z*%bTl^`p<*=RHW&|FXF6`?Zrl_N@7JaqsVkH$U%M_#j;A=e?^hY6D-E
z1-z&W{(f}(?`QWP#A<)pG4K1Cov)@8|313w-`kgeAK&}6d;Kk2hW}u|Kn<YylZBCi
zA%j5&WEdz;7}&QqWHkB3dzvtLxym;6gc#c>>89IzIP>@L%UGt*nJaJWkRi({pDx8R
zheawqh*6t6k;ht^RYHPQI)cYYELx8}HZIN1C(TiVU4?;9AURpUA}!4&^jtD8pJ_@8
z2iGMoj@v1`kp_a|%xQ+<Y0Tn+F$~<ka=~mOLP8>JR&x4cYC;<Xf)kr04288iGzAkl
sXGzQWO_}Lo*d<`l<K%F0k&<(ppc_*|f{I4#RAnX>hKi)-Km`VC0D%b;SpWb4
diff --git a/app/design/adminhtml/magento_basic/images/config_tab_dt_bg.gif b/app/design/adminhtml/magento_basic/images/config_tab_dt_bg.gif
deleted file mode 100644
index 376d898333859ae80ed830551245c8ffb64ccd65..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 383
zcmV-_0f7ETNk%w1VaEW-0J8u9cbTMoou`bcvd`V#z|qvHzr>ofyUW?zhNZ5y%FejU
z&V!?@$=KS_-roQK00000A^8LV00000EC2ui0LK8x000F4u*pfQy*TU5yZ>M)j$~<`
zXsWJk>%MR-&vb3yc&_h!@BhG{a7Zi~kI1BQ$!t2G(5Q4uty-_xtai)odcWYXcuX#v
z&*-#z&2GEj@VI<VuiNkVynfH``~QG}f`f#GhKGoWii?bmj*pO$l9QB`mY0~Bnwy-R
zo}ZwhqNAjxrl+W>s;jK6uCK7Mva__cwzs&sy1Tr+zQ4f1!o$SH#>dFX%FE2n&d<=%
z(#-+{(-Hsx1_#sG009L9(cakz3ee;L3km4i;NtBD4Aa%u_V@Vt`uqI-{{H|23LHqV
zpuvL(6DnNDu%W|;5F<*QNU@^Dix@L%+{m$`$B!T^Ly8<pvZTqAC{wCj$+D%(moQ_>
doJq5$&6_xL>fFh*r_Y~2g9;r=v}m#j06VTc)kXjS
diff --git a/app/design/adminhtml/magento_basic/images/dashboard-close.gif b/app/design/adminhtml/magento_basic/images/dashboard-close.gif
deleted file mode 100644
index c4b6bbc9f7fa4fda2c9fd2c98799fce3c5011a66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 373
zcmZ?wbhEHb<YnMxxXQq=diCnPd-v|yv*+2fXNL|Qdhp=E%9Shs{Q2|f(WA$YAHRJ0
z^4`6BfB*hHefso^7cU+@eE9qK?@O01egFRb*s)_zo;>;d`SbJV&zCJ*cKPz<ckkZq
z+O_M>ojV&gY?wcP{>P6WZ{NOs^XAP97cQJRb7uGM-B+$$S+Qcp`t|GAtXZ>m?b`S6
z-+%k|?Zbx;Cr+F=eE9IMU%!qYKmPCEzk>%4zJ2@l_3PLB_wV1gZ{M3YZw?$d@aom8
z|Ns9pU;xFREMPGm5DD@V1KT8rODbv{SD3cUXcOr6iQ~NKlQ`Qlr-Mz~?PO%p24)rW
z$vhe6(OsWU?i5tL`oQA!Lm%$&M@pL)v*#HB^_QlYnpz}SD#%J0Sn^nynpjL=WfNiJ
zo@i#?X*omN(o93z(#Vv>!h%6^!V+~+ep7P}OHoS!_B<hWF>_sgexndGK2AASC4E7C
Rb0%fO3=<|6b45o6YXHc&y^jC@
diff --git a/app/design/adminhtml/magento_basic/images/db-graph-bg.gif b/app/design/adminhtml/magento_basic/images/db-graph-bg.gif
deleted file mode 100644
index 5781f67e63c0fb4991fe8df7349e22e8a7fd1847..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 820
zcmV-41IzqJNk%w1VF3U#0QUd@z`(%w_xAz<0s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
y{r&#_{{R2~A^8LV00000EC2ui0096p000OP0PhJLNU-3*aRw7A90<%{Kma><6^=y!
diff --git a/app/design/adminhtml/magento_basic/images/db-graph-bottom-bg.gif b/app/design/adminhtml/magento_basic/images/db-graph-bottom-bg.gif
deleted file mode 100644
index fca47802095681aacb2dbbeb9dec5f9b914bea8f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 823
zcmV-71IYYGNk%w1VF3UU0QUd@@$vEQ?(XaB>*(m{_4W1d@9*sF?CI(0_V)Jk^Yird
z^vul6_xJY=4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LV00000EC2ui0096I000OS0PhJDXs;f<dGX%4W4A6HI%WX@06TcY
Bt}y@r
diff --git a/app/design/adminhtml/magento_basic/images/db-graph-line-bg.gif b/app/design/adminhtml/magento_basic/images/db-graph-line-bg.gif
deleted file mode 100644
index 17b2e7b23fb16fffaace705471bc25a40a0e68eb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 815
zcmV+~1JL|ONk%w1VF3UO0QUd@=z9?PiyrNJ3-W;y_J$eyj35RE1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
t{r&#_{{R2~A^8LV00000EC2ui0096C000OK01F5l7=XY40RRF506S9NjfVgL
diff --git a/app/design/adminhtml/magento_basic/images/db-graph-line2-bg.gif b/app/design/adminhtml/magento_basic/images/db-graph-line2-bg.gif
deleted file mode 100644
index c10bde98dba48117836d15a93b08e165930d6e37..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 815
zcmV+~1JL|ONk%w1VF3UO0QUd@ZiIkyiiUB7fOn6Jdz6rTm5~Mp1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
t{r&#_{{R2~A^8LV00000EC2ui0096C000OK01F5lNMJw!00II606QchjSK()
diff --git a/app/design/adminhtml/magento_basic/images/db-graph-x-bg.png b/app/design/adminhtml/magento_basic/images/db-graph-x-bg.png
deleted file mode 100644
index 1f983cd9f0786ba2b296ee512be51cd7fb8478a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^j6lrB!3-o#&#{0gmUKs7M+S!VC(K#9UIO`&C9V-A
z!TD(=<%vb942~)JNvR5+xryniL8*x;m4zo$Z9paj_=LFbK64ky)ZJ+J97yqbx;TbZ
g+)7GtU}#_fn#;q$m?F|%4U}Q<boFyt=akR{0NO?)6951J
diff --git a/app/design/adminhtml/magento_basic/images/db-header-bg.png b/app/design/adminhtml/magento_basic/images/db-header-bg.png
deleted file mode 100644
index 1dd4993fd49bc5732a2cd3ee8fd691a0392dea6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1272
zcmV<U1PA+xP)<h;3K|Lk000e1NJLTq000~S000vR0{{R3w1u5>00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#08mU+MSiL1
z{##Z%ecArCvj4!o|CNop)Ad%4-w`dro4oEuh1>p}nxVq(k+tk~qvol{@M@jqioA+)
zq2>O*yk?o>{%~w*lfq(};)bv45;ewsHGQST@Eb#Q4kpKnvh0Jb>Hm*@dZy=5dWc_^
z;{Ix8Tan<e%JKeVU;d+^j<f5CvFd1=;*_}Taj|#)cXIxCbg$I4d8OubuBQK+jFQEe
zw%NQ^k>GWs=fc<a{-mH%i{7f!r2m6{ZJy*|mf`+(a3M;1s?etXr=zCSqfD0VX{&D_
zQB<(h`h%|O`CVPFUW)!$RQ|ZNuh^-j&#a8Xl!mbD|Cp68ThOY=@Q}lm89#FuP}6Xs
z=nhiWF<Q`Nt6r+nrDCD(SdrjZli;a*rLR|jez1N`mPMA3z<a3btjX~Il!QQqIsSlr
z{Fjx0M2CyB>usInZ=U2~mEmHR;rnW6V1lszb#ecyp|8sGl8U{hn8Oh^&S#Cj|F^FR
zJI;Bg=CEgvbfoD2l8;V`-A{_&kbk#sp5tYi<XM;EBVplNh=u>d!9t1Vj<xJahuqDa
zv$xRlmTs&6ql-*4o2J&6x8$I><e<9Yt@l<}7HQi_i=3@NYiCEFgtdf+zK!~1V>)MX
zfUD?<&uspXi-#_8DNoBTRn2Owa2q|EFjmg~hJ!MA+WkH}bhd6(o$-G`g{{`75n0zC
zSlf_vvJ+w1d8g_cZ{GiTZ7y;ldcJfyd@?zM;wWt2rp568qm}-loi2Xh^+ripk>Z%h
zo_D)&_DxU{JIymyp?J4{vDUa#pG&aYqEU_BVVC5bmc#z1r2n6ilehA4uXcE>c}9*u
zwp)DtfP54}&ij#({hyty*qatf(TcI^`-q79jE&XM<87bk3P8{dOw_N=++mmFW0&HA
ztmvK1nqq^uGIcHeb#fzj;QnuG|F5ByxbBv@?U04K|CorOn#P&Sm3ye?CQ@`|h`V>K
zZ&ZDY|G29UGRnv3xP3f<kb1SSVvL-<?H@;Ycc$w8kd6QU|7wv-vj6}Aen~_@RCwBA
z_zwmae`~|<2sA7A{6_{15Q=T1oLqnh!-G_;k|`x>{K3*E)v!sroA3Ossl&OCADiUu
z7#<x7%~uW5sFLk0EG)v6-K&0g&eh`O;z5<v&sb)2X>+{GYpv=>H<&olBsExkn7@{F
z@IDgyAiw-9s^qiN%>U-Ue78OOg8(1Hj{B&Rq8d(mdb>{Tk>Go1YuIWu$#;!)v?ENi
z;Hss4(V67ubDLB}gw{=)xAnlvsADk6+1$HDUl^BeQq*Qw&IuFye$>EJFbO8<naQo9
z^7hSCKD+u@k?UfU{b%_JUVuqXxe}<Zp4PY_SC#8T-sOtpM|AhkOovGxyjADzt?+ZL
zwiQ#C>Y-29bQhZ>Zi7kgy;;Y|sIWdFzn+PUz5L09bFLxhpTZ<p*c7v}_VwNq7msT(
z`&Kyd@q6dbTVRsY6KZ~WU7T?@D01ndg|dg+z9=cpaf3-_t^Oe;wV=OBQj&v%Lw3nW
ihd(khp-@SH00RJA&R_~>Nrkfj0000<MNUMnLSTZIYP@g&
diff --git a/app/design/adminhtml/magento_basic/images/db-menu-bg-hov.gif b/app/design/adminhtml/magento_basic/images/db-menu-bg-hov.gif
deleted file mode 100644
index ea7b7bd2d7a02287a4e7192ab654015d9b5d7c1f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 817
zcmV-11J3+MNk%w1VF3Uf0QUd@yw1_t+1c&w?f?J(1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
v{r&#_{{R2~A^8LV00000EC2ui0096T000OM00I0PNU)&6g9Wp-3kU!^f9jJE
diff --git a/app/design/adminhtml/magento_basic/images/db-menu-bg-up.gif b/app/design/adminhtml/magento_basic/images/db-menu-bg-up.gif
deleted file mode 100644
index 59ca66db0b856aebb294a0a075616c75185efd50..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 821
zcmV-51IqkINk%w1VF3Uf0QUd@+1c5<(9^HU&F$^&vc$*#|Np<!)&~a%2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LV00000EC2ui0096T000OQ00|fvNU)&6f&l~&_{T6?yMO>Ypo5zZ
diff --git a/app/design/adminhtml/magento_basic/images/db-menu-bg.gif b/app/design/adminhtml/magento_basic/images/db-menu-bg.gif
deleted file mode 100644
index 5bba621a810b9c03e7d66acf5a082ffb786a1882..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 824
zcmV-81IPSFNk%w1VF3Ul0QUd@*yrib-r&^a=h@lW$JW^G?d`+R(*OVe*5>F52?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LV00000EC2ui0096Z000OT00AHvNU)&6g9HTxAYkC1!))yW0suRh
CpP`Ka
diff --git a/app/design/adminhtml/magento_basic/images/db-menu-sep-last.gif b/app/design/adminhtml/magento_basic/images/db-menu-sep-last.gif
deleted file mode 100644
index 998916da9c8c4cea36fee440cecd5253103e842d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 826
zcmV-A1I7GDNk%w1VF3Ul0QUd@*yriZ-r%*z%Guf3?d|Qp&Cj&P$=2rR|NsB8#K#H>
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LV00000EC2ui0096Z000OV00A5rI52>K1PBu<T&U1MfqxLQwF?LU
EJ9HPKT>t<8
diff --git a/app/design/adminhtml/magento_basic/images/db-menu-sep.gif b/app/design/adminhtml/magento_basic/images/db-menu-sep.gif
deleted file mode 100644
index c8974d8ca4db39e972f0ec5e788090ecbcc6f893..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 879
zcmV-#1CabjNk%w1VFdsp0QUd@wa3cO-r&d9*wp0b&EDX&#>v6a)4t8m!_d;$=jqwm
z+3oG^|NsB8#K+d==noGM5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LV00000EC2ui00jUd000O~022rl=%Ap%g9sBIBw&yL0D}M;7;GT1
zAjOFl9bB}SaihkLATf&MIPzmjj}!-}q!^$jfC2(y8aRNUCW3!BbL!lgt!K}6K!FAX
F06Uzx#A^Tm
diff --git a/app/design/adminhtml/magento_basic/images/db-menu-start.gif b/app/design/adminhtml/magento_basic/images/db-menu-start.gif
deleted file mode 100644
index 11ef78430b8197e0d5307a42870b86b6f6cd22f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 890
zcmV-=1BLuYNk%w1VF&;s0QUd@&*0*}(bUi0;MC;j$JW@x(9+oF>Dk%Y?d|Qn&e8w>
z|JLT{3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LV00000EC2ui00;mg000PA01XHnC~$$ng9sBUT*$DYK>!N_EKD%5
zqC$!nEhfacQ6oZ*A3YufIZ~uSk|zhKTsa_tfR``@Bp^VuCV>P6a_TIQ;GfT*K!XbX
QnXRbNqV19@O&SmYJ2id5DF6Tf
diff --git a/app/design/adminhtml/magento_basic/images/db-scroll-bg.gif b/app/design/adminhtml/magento_basic/images/db-scroll-bg.gif
deleted file mode 100644
index 2208140ec50f887a585949f72bea0755ed7a4687..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1551
zcmW-gc{tQ*9Ka_!HkDjkyV?pVL|eHYX}1<nZEM@uv^`tuS&7_7N{Nm!#yG}(-v&7b
z!_2s57&G%5jENlMHjaca#*ASwhrzz}{p0=n{eC{5@9%$Hx48631$KOw7zU$IDBD|d
z?jmnycDBENK(M?#HTAi<xp{4Ey@5oU{W3Q&I7lLq<`))LS4E$vr`I>cy}fMC*cc9n
zlS!q*mDS<l5ju_D)I@1-XEjr)EiJ9nGc$`kKAYVKrn9rNuD<@`$B%V&b@L0{q2ZD8
z^75LR8YZ*7jme~vpyg$uR3d@s(Ae0xTqcERl#Gnb@ySVcUzd1go!m%HO-m;b3DtP~
zmPqpH)2FVk?(Cc#9$&DtvqP*Q=H}(CiG|zS+oHu~7K=49I@;aSGc-CfGdo>WR8&z>
z!RnxObaYB2vZaLuDwVb&k!5CPW@Tk@g~Ha>wvv+4(NRu(d_r+aNnv5(`1r(!4;}K&
z&4GczExDWlL2}vVm$^B<Kp>OJRse#vHL*mpA(oIEn>;)`JUu<Vyu7@<y?uOqe0_cW
z{QUg={hvO48W0fh?Af#D&z}bd2EKUl;^oViK|w*UUcCwq4h{(kdHwqJn>TOXzJ2@d
z-8(oO9vT{oKp?`x!jMR0cz8Gpg^GxXh>VPkii(Pkjz*)=F)=Z*v9WP+aq-}z2?>db
ziAhOG$;rtnDJiL`scC6x>FMbifZDgcva<o6oZMUhCNDofAA`XZ6cm8f0FC$W-xn8y
zMN3LcOUug2uvjc`0T5MIRsx$<RaMp105hIIAP|W};Hb8?7FesVuWx7oEs)4$a${p-
z6EIDofI_H%CXGg?(;*0AFc>XBJOJ7TtTNj{3M|$KfD)kZ>;(3^fVOU6rl%Lw^R0}2
zP#d5;I5;#kGz=OV0qRCM98lKSIM6ULF*!L2bWedCKZEW-Q=rh<FJFL-x%qj};{un<
zU0ht`@pwy1OME_11may53WX~xK-8*81YE7Hudi=xY>34`nnWs<0*RZOn{v5)YikQM
z0}|4f?uLCGqp#1`n}B_{19R)@!^7#yF8XQL@LFLuVY{xW=?Y;`%oP&_YWUw%Q!$w)
zhl1C2;PCLHO26(!TERlmS1-5(t?1a#6~Po0TQw}ywcykY6R$jS<}<gRd}9wzD>k{*
z4r3c(Y$h|s+86#6Z{2J;XwZlG6CFIEY0h&vq^X~F5l?SZ+;tg}hZzJwN(#83R+6*L
zKPcl}`YDNAZN-F}|K7oQp0-t2-s5yOl5(Nk7N_~2xpz>~)OFm2q>wrp+e=aXRNs*l
zyo$Es_iAeF2kwxO_5O2b_vue*Sy@M_xKq8Ow7TFn7Zog#9!`6X{(R6NLp4G8TPR#f
zS*3CTLzjjlAD%e4qmpo(@#F42mQM6uop93whi_>3JE0WNB859;aDod{Rrl6GD@Bd-
zrinHx4j9$(BM;qGQ9qc4Lg7bcIaVkH!%X6YRKFYa8KG(IjzVhOkJJuRj=oVCp@(8U
ziaPluV;XIQu$YNFp5;D+vS5r%#~Lo`pNh9)M(QM9(&ReFn<-<RldkG;XX5N`adl&@
zPuz1&zVD3HO|ZYsbxm=6LUu`Xi8DBp`~>0Qn(qD9;B>kh>XmDb$29p&RtRUmUj9o3
zS!sSC^`3sNua2c#HoD_pNs;GXTld14D_NzOh`X9x4C=NLHZSP~XQ4Pbj#FBemRIgx
zUQpHOQIhYxv}k}Wqgqy!XCXSU6^#sA!)js{$Fm9|HX0I&HF<_rgfm_h_;zzguj&S6
z!*lrV+Xwi>q3!6U+O{hd-gWHY5Pri5BHM?=iEBDX9#8A6B(HUQ`89|;(92ZW#<69Z
zaIaiI7aTDXKzyB#0tU~#QqaP^9wTU-zx&`k4W?d+Z&7p1@ni1QGcs;bad=IjDMZ{1
zXx9s)JpFLuan5R|(Ys$nte>*IYnT=-<EveUJR_4HtM(XU_N8O|fF85MxPZQ^r}(07
oJ3GE<m-Weqf&KR%<4k+)9r%F*j&9A**)H+t%=<O=?S@_cANVz-2><{9
diff --git a/app/design/adminhtml/magento_basic/images/db-scroll-but-bot-roll.png b/app/design/adminhtml/magento_basic/images/db-scroll-but-bot-roll.png
deleted file mode 100644
index b52d7868e4b375b1f5ae7cec5559a0306ca3b1db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 565
zcmV-50?Pe~P)<h;3K|Lk000e1NJLTq000mG000jN0{{R3+O5AG00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy;ZRIeMe_3V
zy}rKa>gwa<<n8Y6>+SCF@$&xu{!mX(@9*%tyS&uY)y~h))6>+qxVYNe+rGZPRaI89
zv$E;x>)+qsxw^am|Nm4}RJFFY>g(<0=H}<<=-1cSuCK4Ht*vWpZ0_&xWoBklQc_M&
zPL-CIv9PgGQBmUK<F>Z9%F4^p(b9T(dbzr}U0z<$(9y%g#8OdG;Nam<P*B3c!?Cil
zq@<)yO-<C*)!5nDuduMl$jH*t()0B6^z`-d^78!q`~Lm>_4fC@y}kYX{Jgxp`S|$v
z`1tns`1<+z{QCR)`uaOe=qdmJ0NP1JK~#9!9M4sD!$1&3(H66roy1{gPNX4?hkE}D
zij@CX_nd;Zt%O3R13xw{aTGkSAgG)Q)}i5vZD7Bzg+nxf4}x(Sc13Np<|dd%N=gQO
zq4mdjeD-{L?iScU+tvi*lVzGd_<Uh0j79}mn=db4e}v=RB+nm(X7=uLH&rfSacA5T
zXYnh2%M6$9A8k;hJoGc;IMN<%v}A6!4T+UDgZaEP)*`vuM2&L#7zTr?F{q+pe@2Nl
ztX3r@;p}_(vWcjmTbN9a+Utw=d++JDEDoxhKLG{+#2hMTVs}4V00000NkvXXu0mjf
DplURI
diff --git a/app/design/adminhtml/magento_basic/images/db-scroll-but-bot.png b/app/design/adminhtml/magento_basic/images/db-scroll-but-bot.png
deleted file mode 100644
index 25f9da7ac20273a378fd48b0a10c4cbfc8816b54..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 583
zcmV-N0=WH&P)<h;3K|Lk000e1NJLTq000mG000jN0{{R3+O5AG00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy@K8)tMe_3V
z@$&M$zP{7b)Z^sj&d<;O{{Has^3>GTj*X4$?e6I6>gVX_zP`WZ=H|D!xVyW&@9*&Y
z`ugAB-;$D&wYIj}+uOOiyONTVva_=P|NrXi?a0Z=?(Xl`*Vyjw@9FC5t*x!PyS&iQ
z(Zj>Uwzjv7jf{+oi}&~V%F4@`nwrng(2tLg*xA{wtgZO@`H+v0@A2``(bABRkmBRx
zj*gDs;NZf-!m+Tixw^Tap`oOurT6&xv9htq$jIQ};nLF5^z`-Z?(X&W_w)4h{QLX<
z{rvg(_`SWo{rvpAyuA1L`1bes`uX|%`uqC&`m@^VJOBUy-AP12RCwAP&()TMFcd`5
zn?@RFcOQ3m7l@Kha`XRxGcfO`_F4sH88GFA30qBzF%oDrlEN!g;fh)rI}Y1z&d_@s
zwtxw#X;tLb+{&-L&AroFKwTK~I-j51Js#lFb12Ka@cd((rWaH$9f3|K0XMuHUp=qS
zP*#(E|Bx9mygB{cD2zq3G9C(a{v{2-N{#<0_r~ir9axl})F?Mv;HXUtr`-T%v&cH<
zi>GeJ6`Eb>^#X3a%BJ-h#a1wxM5Lgj>*;SdBaF0RvDhz<-@e})M?X=r6P*7EFaUxE
VEdDjy(ait=002ovPDHLkV1ne?QU(A3
diff --git a/app/design/adminhtml/magento_basic/images/db-scroll-but-top-roll.png b/app/design/adminhtml/magento_basic/images/db-scroll-but-top-roll.png
deleted file mode 100644
index f3e5f229b82f9cf69f4a670dfb2782ea1dfca596..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 610
zcmV-o0-gPdP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy{7_6(Me_3V
z=<4ddzP{t+<m>J3@bU8P?(Y8n{<pZeySu#a@9@*p)KE`P&d<-()YaeL-?g^3+S}Xd
z>g%eis<N}PrlzN_u&}YPv9YqTRaI8LzQ5}0?d9g?|NsBz=;%~bRJppjxw^Z^$jHjd
z%eJ<+!^6bx@9$1cO~S#!t*x!3q@+<%QQO<xQc_al<Kx)b*=1&C;Nao2v$M_3&cedO
z;o{=Q$H-DqQch1!uCK4u)zx}=deG3((b3YPp`u-0Uf0*ym6n%lY-~_aP}0)U^Yrxe
z^!4%b^8EYz{{8&*_V>NLz5V?Byu7^m`1tqu`1bes`uX|%`uqC&`lf7H=Kufz>`6pH
zRCwAHkJXZdFcbwZ?u@&yySvQ_1QIgQ|NobT*HeAEs-fRMtqw-xwRyOgq~Fm#wA)F6
z+}3sHc5WA>Sc30IxzNn+ScW4QnZah02q`tXn%g;3{0OQl%Q-DoYw03MWeB@nmTRu*
zs}Tx?bx{wWNJ;$`KZF8P1rP)ugqQOD__xcHS2{4ArXXdoI{zCIg-d9pNIN&HINlm~
zAsa`=`PpRh@_hND7CHyh%mn9HSY4Y@T3>2{D6NHM04XtbYa&IODQ3-Ffjybm(ugo!
w@+L)js(`^@e6qe94ZnIl|LOkm;$MIP00Yo5<2w8LTmS$707*qoM6N<$f{A}oD*ylh
diff --git a/app/design/adminhtml/magento_basic/images/db-scroll-but-top.png b/app/design/adminhtml/magento_basic/images/db-scroll-but-top.png
deleted file mode 100644
index 51a1bcabcc0baeb84616ecae61b53e0d9a451c6a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 631
zcmV--0*L*IP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz4p2-~Me*|T
z^78Y&zP{t+<kQpCx45|Q@$!z1jnvfD>+SCT{{GI-&*<vvrlzO=|NphNw(jolva_<1
zl9T1;=IZP1l9H0KvazwSv8t-7=jiCZzQ5n!-@CiK@9*%)$;r98yZie3+S}W?y1C%s
z;n>;P(b3Yw!^F?e(BI(Tq@|_0yS&@m+}GFG@A2`+$H<V6kgu??prN6ytgXVr!ua|5
zkB^Vx;^K~uj>yQ!nVOomwztsG(Tt0W!ok7H%FDB}v+nQjqM@R#t*!U?`H+y1>FVm@
z<KxZE&Ww$W_xJeH($e(w_3iHN_4fDk^z{7u`~Lm>`S|#~y}kYX{Jgxp_xSks_xSqx
z`TY9(`uh4Iy_3=a008evL_t(|+7ypfa>GCr1fR$vGc$#mnK_ZPr1jGMFB188s;8?O
z8jbh-zSmva+qZFW=srWO7DJkiHWwSM5D*N&^IR+q3l~ngBpGVMY!*wUO#0mlG1KA|
z@;t$U6FnMasp4t^t5t%HFnpR#q^1UnVJp?j?E0=HDc2T^#}7!5`T65so#}{_U^omc
zHQ(u6-Aw;9CDvM+8hqCA{kx1-)!LB=anWr4o_y}>s=;8}i4>Rg<Ewt8I4>>*fwVEw
zDO-q8o)tup8m5`k&LoW#E~GAEhKO~Fjx<1}(tTRK^iJRUeed|^`ru!H0RU(?H7_t9
R_y7O^002ovPDHLkV1mLmZ`S|-
diff --git a/app/design/adminhtml/magento_basic/images/db-scroll-roller.png b/app/design/adminhtml/magento_basic/images/db-scroll-roller.png
deleted file mode 100644
index 55d53b9225b76eb64508979a85e19630635f22cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1258
zcmV<G1Qq*<P)<h;3K|Lk000e1NJLTq000mG001Zm0{{R3zyyku00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#08mU+MUS`P
zhPdNjmd}E;;jgf*eXH7*y5Wnw<&C%DinrlLbGLJ&);eISR*lIvPM<ePo2s&}ySuz*
zpVYLuw?T2XxwN(U`1rH0uDrgnt*@%CxUjFVuB@=FtE{lCuCKSay;X?Dv9Yr6@9<`v
z)3Ua(w5__Wuduhfx;j&$WMpGagTlJGy+?n*m%ZYLx#7FNzKp}_T#Cn+yyK#zw>wUr
zwYIpjv$UAc@I6qV+}_^3y}6ak?pKDyV2;UZV_~<nu~B`!c&OPsSfxH<s$rSYk+a@D
zU#Wbo+pe#y#=*gjxZsAo<<Za1P=UeE&C%rS>V=cIdX%u2p|E+c-fV}gh_Kx`T&8}5
zi9~g|w7bAtk<4$0g-Le0f1=dU%*H)yvT~%>m7SzjgQ|nF-q+IHVREmnt*vN_zh{`x
zP>9Bv*!Gvr?|H1;YN6G=xViE2_jah*JZiB%YqCjtyfIOraHG~xjLEI7tKRD3d!f{1
zl+9yfV_c5Omd@~7h{a%ckd@Z-X@Iy+cB{g{!CRQo!otQ<f1}05#*xwTlGgQ=(DCr@
z@A&KFH(;r=xV?Lx(u|_Ek-FkQR-;*!&zHR9in-x=j=6}t<-xweSC!7n#l|~luRUk4
z=j7^yvEF~T<MsCUe}RQ~ii(E1<h;DT<mKkRzrm5Ay2H)HiO20|p45-T>fhVfeW26!
z_xM$d$Z(v|yS%q?Z+7eP^J<mN($dm3PoV1S?UTprhqd5`u-aLCyw}&*H%gp$tlU_R
z%0qs@)795yb*G1}+rYiMXpO}+UZ}aXv9Pwg$;ryj$;pbf-%EeDx45{8&G2@Jk(HL4
zlbDuZevn_F)q1YoZ=u!U;^I12p7HYZl*sILtJ}rH##Vp7Yie#jXs~*#+vDKlPJ6vK
zRH8d`xI9^<YK*w)>FnXx*|M{;gss~_S)@f<p?IOxmdx&!&F?r+pkbBHin866$?bcq
z+hb&7mABwliN-cdosGERexK5Zy5yMH^{ub2Wt!2H%I&SKuYYQQ?EnA)a7jc#RCwBA
zkdRo`9yhC1|Ln#UDbH@?_b|xIA2DupKE@L-awa74_5*(gVd0?H8azc@2ku1ePl`VN
zoIzAHbsJBi$U|PHzX?|_UGQTN7oX&m`Jqm0vJfltyr<z-3<3fs4xtPM3RT?9>??CN
znKH=8?A<bvVW&cdBjb(^_PZ|_BqjMPr*LqtSH92qw&7-VIfJw`|5_t2PF`jA#kCFZ
zG(8yp|Ns8;>yMA${(k=T@As!Ke?|ppARsHN(a$#ZaLuYK)2*|zHCY(c)c9iA^jsB$
z_Idy7G_Pi1kdu4ALDzMcjmw+)23_au>={&5`F5Y?c&XKr%gVU=)+RFsMaAn+W?r`S
zHFV()PCmMD34@f>Aq%(JTnEaSTvnCVUp&R2qGJ5&QSZHoVl7_Vwncqw7}VAC0>Vmo
z<~)wkX*!>Fu!2EbdxmG^@@Y@g11FsDncKaYK~S*y<kmfw*OqQqS|BF2P6;5u0Bh{R
UaZsU$!2kdN07*qoM6N<$f+|VRPyhe`
diff --git a/app/design/adminhtml/magento_basic/images/db-tab-bottom-left-bg.gif b/app/design/adminhtml/magento_basic/images/db-tab-bottom-left-bg.gif
deleted file mode 100644
index e8725966d7d2e8fe38580bd0a26ae92512b5b3df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 812
zcmV+{1JnFRNk%w1VFCaH0QUd@>FMd&+1c~+^RltA?Ck6X1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
q{r&#_{{R2~A^8LV00000EC2ui00IC5000OH0MiX%mu()qfB-u|{gXui
diff --git a/app/design/adminhtml/magento_basic/images/db-tab-bottom-mid-bg.gif b/app/design/adminhtml/magento_basic/images/db-tab-bottom-mid-bg.gif
deleted file mode 100644
index 8464f9a18272673469b17dac2827319751f2d931..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 809
zcmV+^1J?XUNk%w1VF3UG0QUd@&d$#1>FKhuu>%7G1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
n{r&#_{{R2~A^8LV00000EC2ui00964000OE00lTp7Z3nD9-NA)
diff --git a/app/design/adminhtml/magento_basic/images/db-tab-bottom-right-bg.gif b/app/design/adminhtml/magento_basic/images/db-tab-bottom-right-bg.gif
deleted file mode 100644
index d4cca0057dd7a01f3b31a6541098dbd22ef98431..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 812
zcmV+{1JnFRNk%w1VFCaH0QUd@>FMd&+1c~+^RltA?Ck6X1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
q{r&#_{{R2~A^8LV00000EC2ui00IC5000OH00*SY#*W>*fB-v4dX$R*
diff --git a/app/design/adminhtml/magento_basic/images/db-tab-footer.gif b/app/design/adminhtml/magento_basic/images/db-tab-footer.gif
deleted file mode 100644
index 615cb2ca21bd9197364cb534d9f91ec6c3a2ad86..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 809
zcmV+^1J?XUNk%w1VF3UG0QUd@x4gf*&fV1G?*jt^1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
n{r&#_{{R2~A^8LV00000EC2ui00964000OE009IL5D)-6DA|fM
diff --git a/app/design/adminhtml/magento_basic/images/db-tab-header-sep.gif b/app/design/adminhtml/magento_basic/images/db-tab-header-sep.gif
deleted file mode 100644
index 038f92c4a48190fd8cb039cf442ebd4ef22b325b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 832
zcmV-G1Hb%7Nk%w1VFCad0QUd@ZgO*MadMrWo^^F~Z*+8Vbak1TnQ(M<pP!!z2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~A^8LV00000EC2ui00ICR000Ob06!HFNN}LRf(Q?MQpj+j!-fzS3LuaP
KK%D>q0RTJJ_?Z3x
diff --git a/app/design/adminhtml/magento_basic/images/db-tab-header.gif b/app/design/adminhtml/magento_basic/images/db-tab-header.gif
deleted file mode 100644
index 572aa19741ad550b3a0fbaf432a8dae9a3959d7f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 809
zcmV+^1J?XUNk%w1VF3UG0QUd@o12?;b#;P*f&&8s1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
n{r&#_{{R2~A^8LV00000EC2ui00964000OE00nKT6A%D9Tf>O9
diff --git a/app/design/adminhtml/magento_basic/images/db-tab-left.gif b/app/design/adminhtml/magento_basic/images/db-tab-left.gif
deleted file mode 100644
index cf39fda5a86ffb37bae798266e924fcb892ef2a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 808
zcmV+@1K0dVNk%w1VFCaF0QUd@>FMdRv9SUI0s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
m{r&#_{{R2~A^8LV00000EC2ui00IC3000OD0Mi8s2mm`bBZzwd
diff --git a/app/design/adminhtml/magento_basic/images/db-tab-right.gif b/app/design/adminhtml/magento_basic/images/db-tab-right.gif
deleted file mode 100644
index 435a9e572b4783114932a72de12d309062d7fbd9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 808
zcmV+@1K0dVNk%w1VFCaF0QUd@?Ck8av9SUI0s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
m{r&#_{{R2~A^8LV00000EC2ui00IC3000OD00XcK2mm`#kceUc
diff --git a/app/design/adminhtml/magento_basic/images/dotted_divider_dark.gif b/app/design/adminhtml/magento_basic/images/dotted_divider_dark.gif
deleted file mode 100644
index b4f6c700caf1bc98066c5dc1cbdb4839c0e1a9ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 43
tcmZ?wbhEHbWM*JwXkcXU_4Q?7U{L(Y!pHy=&;ha;Kr#$WOfEqT)&PyM1v&r#
diff --git a/app/design/adminhtml/magento_basic/images/dotted_divider_light.gif b/app/design/adminhtml/magento_basic/images/dotted_divider_light.gif
deleted file mode 100644
index 538a9262ae8dd234af9e6f086985fe6a110c1f8c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 43
ucmZ?wbhEHbWM*JwXkcX6y?ZwU1B2pE7Dfi3fDVw&0Fq%~VsZ&$um%9L69$9;
diff --git a/app/design/adminhtml/magento_basic/images/edit_icon.gif b/app/design/adminhtml/magento_basic/images/edit_icon.gif
deleted file mode 100644
index 8b277aa621877b1cd10e1dddb8d57244334f60f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 561
zcmZ?wbhEHb<YVAtc;?9v&^yPxX^L5G->Z+GU0SC;e*1p^)!P<zeFlY%CRIJ3zyENY
zzWUqGUv7(c?znh8amG^3l;ZBqd%e46*00%q;mJ$?ZRe)$I&9uJ*|u?_ZSMl>`U&=v
zmY#d?)N|#2r|D~Ky5?$UR$P4XE_voMw?#V)OIl;5E}FUbsNIAmPBYiJ&fjWK+~T%i
zt9{cX{ep&7C(e7VI^f<uZOzFGbM_tg-+I=4@s5*s9_VCN>gU%Rm$e(0cbM1pAG>vb
z`tBq4lb4&-^y*|)`EERM>+Q#zFW+8&_Da97$!pa?=h+*KE4!_`=KcTwpJC7g#h)yU
z3=EzOIv|&V;)H>{ufem4%ZA^MUCD^2sfSHSPG8hmmYcz}$57J5Va{A_c|K28DP`AX
z%a>{DFbhlbDmrf5<jAWo$fDu4Yxkb1R<^bxPKS>;9bjVeICc8WDLWQMMj7WTSDhKf
z8H73A@7}x5DagvM<?`(LGZhJDPdy8B`;VV=Ef+Si8E_~F2$*pQSxfM43OLl>&#orM
J$;HB84FDx;uA%?{
diff --git a/app/design/adminhtml/magento_basic/images/entry_edit_head_arrow_down.gif b/app/design/adminhtml/magento_basic/images/entry_edit_head_arrow_down.gif
deleted file mode 100644
index ea3aba2a2c61869a2b69f2cae7c8c01fe210a9fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 677
zcmV;W0$Tk?Nk%w1VG{rn0Oof9!qV8i%g%e0oZjZ??(y@4oTK9E?0J%!f0v(pm7Rf^
zp^KrYhMlE}pQe?nuzHi5h@Pg2pQnSHqm84gf|{apjh2I&qK2KMeU_eon4oo!n6Jah
znXI#fo1>eqw1S$Uy~)mwq^pITqg;1_maDS2$Ih3lvWK3gu)oBnx4gQ@%%!!vXn~8R
zy1=@}%yNvCoUpf*tFqhU<$su;vBk=GlA4U7seqZFo3OX4y1;#voqLj-p0m1{t+S-I
zyT{Ymrn$h1p{Sg%wJS|qb&r?H*4>Jssodk{ag3FTpr^jj*3jMIjG?J?j+T<At?cmf
z%GKD9rL4);+%HjInys^Zl$^!W**IBdfta9nkC>9Dub;BIhn}U1qN=F4zN56dlBck$
zyu;Ps;=Rkzlc%nhs<3j6mY1uskfyA5keE4IXOgF`+T`ca-QvvJ-__vb>hJNz)Y^cU
zpvl+VCrVi7?e2b;pM92|000000000000000000000000000000A^8LW004IYEC2ui
z022Tb000O7fOmp}b^-^733h{vga=4pARsPO6#@v1f(RNpPXwNxM=LcmjB;rxaH*=Q
zDGwQg2pB$fw6(T%OgD;m7ENLX1_8puP{1kza(8wT4Fk?BbkWgX&N5~NcXAyhY~4Ro
z(j(p70t|NwA|`L^Z#&ULW9)Aj5OxX;Ms50SQfhQr``Rpd5yXz12^EUCS?C7L6)Ozg
zl&BIxSrQ6c=4jLiWTQqc3oZyMutr0eI4D!5grNh?2SIWcI3a=qfX$mqVmxqgV%MDy
zAvj>^(qaRR4Lq3jSdfem1sfd5SV$ls0faIRA~Y?<Aj%mJLOeK_P~a6NLG}tT;BujZ
L9G`*$0s#O!>&Q;|
diff --git a/app/design/adminhtml/magento_basic/images/entry_edit_head_arrow_down2.gif b/app/design/adminhtml/magento_basic/images/entry_edit_head_arrow_down2.gif
deleted file mode 100644
index 47ff52de0c6bb3025d972fe99ba16be82bca7a43..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 670
zcmZ?wbhEHb6lM@&c*ekR?DWYq7tXzY`{wM$3tzu|UAbZH%QvszzJGuE!nyB1eti7&
z>CL;hXD?lN|MA0xE0>=>fBxe2s~<mqp1pYf($y=c&Yih><NEo_7e9UZeEs&#lV{I-
z`TF(T<%<uWJU(^)?1{6d&s;cv_2!M+_wHW2dgbEP%U5n(yL|2HjoY_w+`f73){V>8
zuU@!(>E_+r8@6pZe&*DLE0^v(xOe{Yr6<pxuGzfd<k{0de*8Fo_SEW)>kpqe_Uy&;
z+xPD6JAClfo7eXq-hcn${gda<?mc|?;PJz|5AHpG_2T90S2yn5W*BNf@h1z|$vPks
z6ekSqzZ)2uni)An+Bq1TyIVwb75VuMCFD4SdYXhJZA=8`&Ev8ZncmH8?7+El)hb0<
z=4K&zMV2jFx3LHdbumcG*-A-GJj8E(z>s4-qcorRS##D47aY%WnTjzm8z^wyaW=YW
zb>|KT9|Mn=2Jb6g*$ZYCuX*M97<u@V*nhG!>99)v`We;1VX&ZuosnBeZ^eN_4To6m
z1bP?*5?Go=nT*nE78)kEa%!<eDolLX-Z)t!Q0V7`rp5(~!XC3495yc#5Rlc{aU*pd
z3mcnKT!F-{B*`|;^&EyX8XAwVu>{CAtT0g0T+GN9w7??qkxQ$P*qWqO=?5FRMGe?K
Kh=_17SOWm04gy^O
diff --git a/app/design/adminhtml/magento_basic/images/entry_edit_head_arrow_up.gif b/app/design/adminhtml/magento_basic/images/entry_edit_head_arrow_up.gif
deleted file mode 100644
index 4f0f11cf45bd67e43b595c1f1a1a2114e06f6e20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 637
zcmV-@0)qWVNk%w1VG#fk0Oof9eV(Vp*W2y!^S;v9ny$5em!Eu<oq?I5bBvU`$IG3$
zz<rjUb&ZvKl$>^smX)fpa*ULZrL1j+j&+Wfbc~dVqpOOcsehTFgPEa+o~C}6o`s#H
zhMlF!*V~Anrf!IkoVLD#nV?>SkJaGhYlV$~nW1-)nS+|4d6S!`y~L)ryq2)Itj5iF
zkeGChm4lk1ldH0!v9};mVv(n=Z-|hHr?8Hwub;5BJ!yBJvA1o8kB_CRl(4yRij#Vi
zn|6<vhMS|0s<Lm1k;K;9caWD=e2KKf$dRV4mZ+|hr>;6?b-2XIo3y*EyTE^*r_kHq
zY=w@hz{Y@=p4;N(>+kWGth0})uy&7_maDOwueN=ZoQa^Pe3YD!rL4Qp)zRGGgqos<
zpr~+(k<;Mgf0mwmlA6ic-FcFlZikS#%g~>?!J@OcbCjO0$<NE%-_hUW-skGq<mR%=
z(dh2*<Lm7lPG7js)qR$p000000000000000000000000000000A^8LW004IYEC2ui
z01*HY000NtfOmp|4Ob8l2qp%DjCTeIBsU2OOGpwEjdu+nDpUfWpHneC3xf+nO>?TN
zt7`~@6FGFVvtP8cKxcwzPjJ3)9ZDm=a7He7J|S_-%OZ7b%yDB9cU(Jf*l#Iybuww$
zZwv-x5pL#YINWtb=H@>dFDC)>PU_qs^FvSv96DYD18M*mIFJXxC@l&UkOISw!-o*<
zgz+FKf*2-pGHTRlg@^?~2aeFN(WazH78NKwV3dJCnF}ivs8J9E1sDP)8Xc(8MT-Ll
X4lq2JQ6Q6`Em#O-A&_K4qd)*VV;(o5
diff --git a/app/design/adminhtml/magento_basic/images/entry_edit_head_bg.gif b/app/design/adminhtml/magento_basic/images/entry_edit_head_bg.gif
deleted file mode 100644
index 1f6d083278fbfe22c9c885eb7f20685fe41e6486..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 43
rcmZ?wbhEHbWMp7sXkcK7ENe(_>Q?;8!T<s~AOa-Az{JGE#b6Bpyu${O
diff --git a/app/design/adminhtml/magento_basic/images/error-msg.png b/app/design/adminhtml/magento_basic/images/error-msg.png
deleted file mode 100644
index d9607f0e83875deb0dad0f93bea6301677960790..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1411
zcmV-}1$_F6P)<h;3K|Lk000e1NJLTq000{R0012b1^@s6Ta6b;00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%6-h)vRCwB?
zR$FXTRTSO#+}FH1BW-6owL@*8N@;=cC>XUVAHWZ3h#H^a(U_P(FoB?-l4v5t#H8U%
z&_rXZG4(?uny6p2p#ciSw$h4eR4j$Tw$lggOy_Z*$Frw*+L`v=7U3o<Idf<4wa&hK
z?{hW>?3sFJ2Q2fPWZ1><F2fagfTy_iy6t=7Ahd>|6CrJHe%1Thdo^r*8XoZx9NvHK
zdH(GxY5TqiC%dyY>Okj&cC+hEw*2g2#fZ}%oU2I43E?Ac-u)Dvi>?P@Q2GtSIYl@3
zPo(wmqeRx4xqAKssbOy<_d;CX=;2Evvb*_M5PzF9v0AF6bR#<0EcbWBRD=FFozc&R
zyyEx+N5+!N%_v6PxP4=dIUS=5k$OR_+RW>N-5lsTN4&)zzBuBSHtmjh_n+S4+tGX^
z=oNopzD;Ppq8JKAk2M@DUc2E7Qe5Fydw(f#;#b##{!brJRVjp~a>Ck%uxsa`I`l;j
zJ3*2!^!L%NyF4N}F4i_xNZa;_YJVpbiq!!%O`w^yEl407KwsoQuEm1$V%Oi;RKChB
zye~JrSi^Cm%mEKH83(n$V<Ewn^#FzekeUTZr)+_~$bnqQxkQXbMJkG<!_u0kYdBZH
zPt!?2@Zoi!Tx>6_sMYI1zkLI8Hg-S`<U-E;fU=8@1N9NNNSeuGl_8p94i<>J6wIkn
z&<3wAe9E$FFeZi}-_8!mg`CJeFNRT71?0Vaa9ue~rMM+do)D<r=NH8AQ>y6|#gGd*
zkvkU@_8IRM$PSKpiYVq{adXQhpxx>NeW)LV>P-wAS&<lEXS>9gxP6Sf0Z$}s&8!$t
zxJpn>nd<fg9Onk*(sx-g&gBC>R0Zb!d%#J7<<(5;V%$}z!JwfS$6f@ek`Wwwk%<LB
z`@M?^i~?B|X88z#K5~y$rm#Y6R6y=r3kbOd#nN>UoAaYEd+s>1o6UlMyatSaZ?TO8
zmlK=c@BG<lm~@8MQaVr~I{NWKHX><H3y2$<m|z0pr(Vt$i*wRU-4N+a{y|JLx_M93
z(h3;7qZsw3K&)>BY5U$e9=8uj`C2fChOKPaZP3VMIP-2UL@Y@<mC<{Fs0q+iZ~~Vi
zpj`W@fXmhN3Q$pT^kJN{jQh8o7;eev8jfE$uu(n)aWm|gIGq_r|71-*lKq6rwVy%j
zzX*_|Ky}SNVIFg&Yao6BHFAl==)8kRwww&<Vhbdp%z3zA4xXZ{Saz=oENBN?FO0<m
zt*!QxzEkX15*q<$5EF0xwt?|44L=<M7l{L5ZDEILb~ul*s=YtAW;wREV;snZoXCwr
z`8T!p;pOO^XDWQHjp5RdIK?HieaH_tXqXC>Gn3uX=~m>-kDbd+SL}?$N-VnEvT=W1
zFnEGBatYg_|Nkjv;*`!z{xLp&=DD_kuNQx4p|AuX$&A{+f2nq?u`+Q&^i@|AcX?>}
zZl5a#Gd&X1W}`!w?j+8<@a<rSl_$NR?egbFysdGN!t@^97JlNbhVa31pR|)Nc``)2
zWqu$Mo4ATRS#~9n0#nt^<XGI8{3|vxt6u#0*U_)e_KXf<dgIvP3LT5F>Umcn)tZ
zi@aVRe0H^8+9vUw-z)OfXqVKCAvRIP@5a@h_M78ZKJ6Wgve$U#Wvqzkk^{wQ^u~J*
zCparo*;)&EH?L`tVonq*5-nGGwx`z$bAC>gw?s%@{-{N4T1{)NR6hR+FaX$ypz3#N
RFuec(002ovPDHLkV1i*3rpN#Q
diff --git a/app/design/adminhtml/magento_basic/images/fam_account.gif b/app/design/adminhtml/magento_basic/images/fam_account.gif
deleted file mode 100644
index 5ec10006ff2053cd14b81fc3ec169685801c0ae0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 358
zcmZ?wbhEHb6krfwxXQp#?x*(b*|WW~O2g*fp0e#&`Rt8XuU;*iw(S4^|3{A=t=RQ>
z@7}#f4{!MX{d>yp|JxdTH*DCDu=K&_6LWWNUG)C_`<ZFR_wL=RSbe_l%%7NL|4X*L
zIdkSr-=6m&OMlkSKHD{A&DO13v(`P^HLI!j<d4R+=YO1A7`yI!$@(XitFLq%dJnXP
zfij@@lZ91;L5o2LWDLkp3~bE~QwuzFr20=h+2FX4WnMt{l_Ucj=^JapW^*VQtUUCv
z$xy*$;R%L|f4k&F51g2gt0Wf3;}Ik@MOvXzp<IkZSx%Too{P=5uZ2THhEG;fy|<}Z
zp_N6Ek55gdHy}<Sjbnw6FQdqc6#{9D(yi-Our1@*AT6!M$;o|yyHQI(fZOZD2}cHN
E01%6c#{d8T
diff --git a/app/design/adminhtml/magento_basic/images/fam_application_form_delete.png b/app/design/adminhtml/magento_basic/images/fam_application_form_delete.png
deleted file mode 100644
index cd305ec83b6a7560de21a287fa7a780bad893efe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 605
zcmV-j0;2tiP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz?@2^KR2Uhh
z!M{t?aU93-=jZOLT^;=*N<-?@Xu1}|ts5eOAZVyTq&X}M5nBq15Q?BBQ4p#A0wWxR
z7Hf!pKr~piSVO4c9ZH~*dRE_izhC)91cQD_k4KQi{|KkM1}_$lHs78tD=Pu+$Q^S-
zE?kbxa0!`V?rf`$m&V45mxu1O^heD{n)|9U*;Gx2jmR#Qtq<sr%CS=A*+n*LIaZ1l
zkxX1WQ^!Vi^iGn9Bu5e=ArKG(Z$?M?ox@E{m>Y=*2{WUucY-zdJL^dl3I%>;ad8o^
z7>UT-aEZGeIS2v;T;fmM9XBTt$%UH}0?1h*2qK@)Ge19v#5w^G0dO}Gk-On;h*g0V
zg0c5w{A6?(dp$&D`V;BhwH(@f3^+wpiDS%+&U-Vg>20eaQ79BhObrh(SA506v+ZnZ
z$g})zgzWPtJU(945y>2Pr{~-rKqTCq^~N9e(A;`~%*Utj>?T{b@1P-<WAuZ%B6r7K
zfD-_*s<H6^rBVq9d@oIqscnFhmsk^Z?<MV_J}Qn+KDaR$x40Q@j+x=^SRCW-xI{~4
zC*`+~$PTyjZF!n9u<#{~r6~nT{LPEjy6)<&*{l0@RiY?0#lq(b6EkUxzv_CB#J_mi
ry8p`3Z0UU3LeA1E3I<M$RBrtMF3c7U8sGJe00000NkvXXu0mjf%W((U
diff --git a/app/design/adminhtml/magento_basic/images/fam_application_view_tile.gif b/app/design/adminhtml/magento_basic/images/fam_application_view_tile.gif
deleted file mode 100644
index 8965c0e108e084cdf2b8e69d7fc854acb9368317..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 377
zcmV-<0fzoZNk%w1VGsZi0M$JJ{{H^_{QPE%z*>B=d7{{Lp44`r)r_IWw!_<BgSoBQ
z|8SAPQ*)_afwxzAu5OgddZgP?a;a#J!=KXsna_}Hl*w<G%yOE~V1>H>>zh_~t^51?
zTz<7!da!ex(R!rXRCTOTajE~Rb69(^lC<7>rrdL#(rl8*fS$);g}YO8s&JXkpVF69
zb*p)!*<60KZ<fo3t=(jZzGH{I{r&xz&;S3IRPfbjfy4ijx#)YR+;6dF|NsC0|Nj60
z00000A^8LW002DzEC2ui01yBW000J-z@BhOEcOs2UFkzG6ik;Dtb#)HV!5n#t6lVT
z;ILRM=s|esv^qWOxp=rZZ%60V?mSG70H5II6gvPl3N<_pJqB=cbUQS6h8#TwY5<lr
zm^1-A13eydbO1J^G&iO^9X%FvERHrJHUT#oH#{Ic51=~%qc$6+wJJR)YsF|0JqHp3
XGARi!10xO^Ees(CM%miiLqPyLDWbBK
diff --git a/app/design/adminhtml/magento_basic/images/fam_asterisk_orange.gif b/app/design/adminhtml/magento_basic/images/fam_asterisk_orange.gif
deleted file mode 100644
index 46d8baecbcc17c8899d6545c1779d367bee92167..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1019
zcmeH`>rYZ~0EQ2FGHWYSOuLwaf~93yCTW)$frpEk8k%j@hs>6?`p~*;u2r*E4bw`~
z)ChE%mVu=rs0cPRyDD9_O189%l1l3FBq!i-IOkXX1N{ZPpWnUP^K7qJDvH~jxe!_i
zxvC(_iPAs&K%2<<2qCoyZQlR8m|?FJO)7cB4~wT6A)6CO_1clUV!~ztoqODk2r#7s
zy%6XGu8$hpyw6z^Nuq<E$MHl%92oyQwG*#iH*z(=Gx>$6-$*`=o34(futBd@0F1Ja
zr<kCH?|HP%-jL(H0}Y&k9c6*E%{V3xqV);nXdn6E4x!mLR4)Fd3I_(MSC<G{CF3s}
zrYob|cm1dO8mQV}sxEB&!Cw4HE?&fN++Ymk$By3SdA}Q{D!BMp%amd@^+xV8W`j=I
z*iG)xIUnpkGSQer>JumLiM%?Iqb8bAZ>5bgyf%i$2FFw)(2@N5Xb5N%1HFK56@s2D
zhZ^x{qKB?59+q>QB@ED$Nx4w0D}SVrO||dDRh)?%OlRGuu_7*bag27McEdGCufo<+
zKo6)Lt=U8qf)+E~rfjlVKy{>gbqHP-=%|jiT?qoFG_pnNX%ynMyy<#mxPa@d2y`l!
zVij!nCk<A@biGx$9>nyYfQhP*FSjJl&nDW9QpPmekWAtz-I;-wuj((95LS)7f(P0q
zWaD=C3{EoW|En$*w2Ns&sz)nERXhLy^gsVJz$Rb@1XV$iGp(6VKz>$e``l1T6Klu(
zbux2+-%~RbFni;q^-_MGS$HHqNRd!9`{t|zC)1a#2%lBDIci>5Cd(II&QVB|8xCV7
zp;3!64qLO>3%Vc%9Nq2n>iz94mCyZ>zUA?2)?f5ZH3(N0aN(5FNc%hfMHTP55|e7B
zg1Y$f;Ny~&KHdJT3mx7r7Qc6H;vDE9zgEs#7NZpT$=NX9l9Cj6TE=`P;so)|_vP|?
zb}>VluXPcUoOh*5&q9%&LxRNo6>x;^W!B|FGmC9LXxNPj{MUrRKa22@_vSok>mNxN
Blg0o5
diff --git a/app/design/adminhtml/magento_basic/images/fam_bin.gif b/app/design/adminhtml/magento_basic/images/fam_bin.gif
deleted file mode 100644
index 3cf0aaf9be82f283fef99812ef18ac6ecb6555e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 288
zcmZ?wbhEHb6krfwIKse?mX>z)>ea1Vx6Yh7^ZonxM~)n+t*w3b?AiMD>%V>bR#a5f
z)6;YB-o0hZmhIiU_sp3yEiEno|NjT-0;&fx7zhEypDe5*3?d9VAcY`18Cd5ksP;WR
zD3Ic1=u|Awcwog9W=lsQ*}jh}nh(94pdcf_9on3bq9)O^WJN`d!TOfADIXk6q?($N
zb@UuuS{XiHsM^8J)Yw?0VKQ@VL$$(k3m--veRhE=#u_dWCL4Z6Mi(~LUT%&~qa0p-
z9!@U4yeSMKhMZ~vEL?f~+)N8aIGC2O=WuW0VdU*pir>b_z{SOIkc(4=pN*TF)kH**
G!5RR`>0Xfl
diff --git a/app/design/adminhtml/magento_basic/images/fam_bullet_disk.gif b/app/design/adminhtml/magento_basic/images/fam_bullet_disk.gif
deleted file mode 100644
index d72c413e8ef9454af8bb2fbf526bc9a8161979db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 542
zcmZ?wbhEHb6krfwcoxG@G5<#6@<-1;ynpubeeukTzyAEKTYC4;-+zTOF3dQYA6$R1
zWq;tzlZAQHujF>$YS|xh{mY_^zO&Wyt|WGyvdUbQ*nQHaU_(OZ$-K#D7VdvlIsbM>
z_vPd7+I!YNamiiXu<Y*Bk8fXn{`~*{-ST-itLNO^eEe~0@0rxzQ{R98pSj~z@vJK!
zfBX+=Jd)RSJ*W3h&Enhh4!r;U=WoTl8==j|0_zV~&bgY?efIC)f6;BnTNm9;>OQgI
z?C02y6MFH>rf+-o^2?JKpI^nc?EnA&!KAIve*OMiz3|S${qHLm-2DCL-}P^c-hTa@
z*mXQ}!r5mZ-|jm1zIO4wS=-)MEw~w8x4WSKp<UMM(peXpmRxIG{;+k$-H4XM$KUn*
z2LlFr0mYvzj0_Ah3_2hSL2<&sUfmGW)ZEhA*51+C#w)}TCg>B&V%4r@9jzKYD_T;#
z&B7pBVwQ%staqD@8>@#oyNh82SDU&fo4kIYJA;v9o2WBmxWB8EvQ|)=j-8?}Gn0as
vsaTsyfCD!t55K*NNSm>rl8k_7l#^vhn{cFbupXbTnVfCcx9>k%8yTztP~Pd#
diff --git a/app/design/adminhtml/magento_basic/images/fam_calendar.gif b/app/design/adminhtml/magento_basic/images/fam_calendar.gif
deleted file mode 100644
index 3721980f9effac8fab7d947f5f324324776bfa6c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1036
zcmeH`=}VJw0LLGl!VI)0BCtzThDr6p62s6)ja&wy$tp9?Qka^z;sKV5Z8GN^smmjE
zUZv(Sk6~(FsoS$Q%?oeM=CM7`<FRM6*{1MI`x|=MhwsZTpBG>FQa#)qZwA8<4DCaZ
zN~7OZ>xezQN~0T{-%|h5R}JnWGnjM^U)oSFt`n*~{jNs$h#`8+6hC80{8%D?)<_^*
z6#i}^s(328bUL+qA+2^Pv*AZp<0`ZHXLgI6-L}qdUCZm(;0ibMI~BZcw4hT_@&zyI
zMoW9~ih=F&{;je;ymD~o!w_0OtZWoxjUu#3j5Uc-fdmsE%H9cFGK<OP@j1C_MWI>V
zRPXH{xFz*?XARL9!%taA07n{_Ck@O+Uc4O($seQhCgRFx68N);m9wce^RMcb)9aTT
zL};T}*(|}DC1^9E6iCoEDb_B-+NG#)6cfsnonu({INmdkcYnwFCh`6$d|(P++#psI
zYB{#IxvkyN=(g3r)!GA0wT~0~YOS8o>LZ)zQ7z%oEfKMTmkDjrajj8_?J@DK(a9b0
zDZ+$QVPfGVr*ygi2!cU79ej=iU9q4i5%i{jk2LVf7nJ#da(_?}2>3yuG8j}n2h|~<
z<|v_n`v4SpgF+hM(Lm7?Q0xOrd_fKsq&b1tw?LK~_zU!(f46{@&d30QxX{&O<?$yV
zG74FlT(~D#bs^b!vB?H<64Uf7*H2(+XUxelw-2CLtBg3V8HXy5gzRx^YHkb-_Az8y
zIwx&SSK3oOE!-V#$Q0rl%)gzcwRH=rgE^LlcUQd#`bae;ufUl_(Ag(5ED%cApxpTM
zrLeK0;;(O*17@K-=S;%(TlJ0Dap#3e7e2$-lRuEM#yD}_A)-V!X9bf;m-AMU6piw}
zIYf>+gp;#e&s>SQF6FkRGYk!2qjS2<jfXs{uSJ(7Kgb0#G0aInwN{&BYV2S}f$jJ%
YMj3Z($p({a8KjFyzQPW9e^he%1AXG3VE_OC
diff --git a/app/design/adminhtml/magento_basic/images/fam_cart.gif b/app/design/adminhtml/magento_basic/images/fam_cart.gif
deleted file mode 100644
index 7612ea22cd3f66e09b17d706dfa1d260acff4e53..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 257
zcmZ?wbhEHb6krfwIKse?mX>z(=+UK1m)^T~ueZ1N{rmS@wrr`cuD*8d+W-ImXU?2i
zTwHwS%$dD=_pVv9=Gn7nEiElyzI*|S17#VA0E$0ZSVb6w8FWBuL3T2*);&<^OUazq
zv_Qe}_8zx4OB_FOlrDL{J3xWUjo~8)Pfu?n<HH0#mtF_QTN)B_eX|!SM5#?ay{y4e
zK~m{zcG!mi84r%ONu3hx_f@7g9ccf-%dM`?T_GIIRn1bz&feIl#3Rh(sKUt3%b=XX
Z$HUaa&CSJ_r&`CTGGk`bYGFkNYXEivTVDVG
diff --git a/app/design/adminhtml/magento_basic/images/fam_comment.gif b/app/design/adminhtml/magento_basic/images/fam_comment.gif
deleted file mode 100644
index b2013a17f06ca25400f71973d6d25a190b1ac8b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 329
zcmZ?wbhEHb6krfwxXQo~(Z1u(vk!B3Ts?Q^RsQrt??3-&U4DAy!CUb?yYIaEd*R97
z|Ns9#`|xke$@|aWeVx4VVpPx8>IKIiy#06W`QLpP9_LIw@csMu#d~jbuQ~Vn<M)`Z
zUD;EPu03+6bk32jryhLx_OEu)37`oKGy{r1Sy)9F6d80tHh}!Zz?ODkLV<^lRKMG4
zXXXqmMmBcA;)sa#*Vr04B5EWO+EgY+xG){^Nfn&dBRrWkZ9-i0-6x(kc5k|lS8;K1
xD`Yr@L<n*5a7Vd#`7wpDGRX#cu<$WS$#^)4GjYhxbK+wWS+a7~>Lrd0)&LW-b8!Fw
diff --git a/app/design/adminhtml/magento_basic/images/fam_creditcards.gif b/app/design/adminhtml/magento_basic/images/fam_creditcards.gif
deleted file mode 100644
index 86996b7b20425c48c7bff5feb24c25c85ad8cd30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 599
zcmZ?wbhEHb6krfwc*el+v8=3c_T|{#vv=;?`F<h!3=nLu+i~{g-o1NYcVyo=J!|I9
zn|YnvzW(@gZhz;$dsW}pumA4n_v^=x@3(6YU3v5M^yzPpmbb0D`|#DbFUyyg&pG`4
z-qP<;QJ*iAT)TGd*Q2@LZ`Qn8QoCgT<AT0jKb}14+Vb$s?e|}<UTt1><8y24_bb^)
zjvV>@?M3ChW8V`K*ByKI|6cLeJ!`H#`t<+*|L;LTRSS=w-P8K>?b}avbzR#Y_pH6w
zyx_$5YenC$CAX}-Rx)MZ_ghW%^Dm#<+VcJSsb9}meYxHM)W|S&fZ|UURuKj_1|5)-
zL2<&szNLZNRJTQ{P0GI0+O0=dwO>_y(j*NH<sP@b{>f9PI`YhrGZryYTc*aVZ)_~L
z&{&C4O@Ff*lhK-W5=utwMw|6TcJwSVX60Z#aq@&V2Qwc(KZnreD_5Dd%`UJCscTwD
zI?D?Si<xV4v9YnL=)KjGakcs6!a9Rh;Ju8D;wKv|`L7b9Cl>h2_ws3l2ry)<Z*r94
p6cLJ$xNyRZ!6d__gE2*kLriq3@9w}}siuJAQ#73)C<-uG0|1-I*-iie
diff --git a/app/design/adminhtml/magento_basic/images/fam_folder_database.gif b/app/design/adminhtml/magento_basic/images/fam_folder_database.gif
deleted file mode 100644
index 0d78a5a0cad0331b2c8719ccb4a4e61ca104fbef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1043
zcmeH``Abs)0DxajV@lSd0xcOS778Xs%N&+R9!t7NrK})4A}qR36v-KxW@g#!nrLJb
zCYVPDDk@BKV{O!Co6f!G)~?Li*7lCQ_x9#{3;PTD1Nwgde)-@N<mIODOE>@rAX<T7
zkg-pc;W%!y*+`NM1Ogt9hp^U+j*g-zs?}=!en0d)Ri#oHjmE*jLA6><I+_@UCTz7n
zu*3(J28e|KK93m+y<RV~h?9;+pShU{c>GSu+`F5UtJfksO8#g@^wkta;pVH(p<3_}
z-}b3wL4F%IU81R9Zo@6qa1YT591h3(KB-2dfgp%-zjyQ&V;JUDZ@~=5X#X#Un)f?j
zGn5B<njY{Bi9{l(IqkQqqrbloF;!zwJ33v6X!-8B8K32qR4N7a%8rf>SaUW=lh&TY
zu=ad=dplvhgX#owx!fr$9v&X1DcI$5*(XW^h-!Lznpq@Z7$z*0l&c$h%b)#_2}x6p
z4|ueHo}7D%nWQ-4K&EPF3PER@oVtsXlas{v3Y|_jFfcIlO#!`0wfCGf&!|U6MivpJ
zOePC5w83ETfn`2(3;gXWqN~7WMV9g7N~O~DQb5@2X!0l2wp*c4==FMXVI2Cn+bTVR
zg3p394nbgW(TAHZ%=Tn-c6N%zV%*x@*4E~ByQik6f(%2!X821IX>ULf#MsCKTXqKj
z0{rKn3&i+CmH|L3kho+lJpr)2z^<_9!7iC_1)HmlY7uVAOg<jFHU9C~7^{x8hArKG
zL<q!1hN^}f7P&C(<c8YW>{{VUR`|N|{CD?PHvlQUcgwRfo-AW?czcY6`<4syZU9BX
z%#4TY6YlW%AeOT~WR-w>gS~hB>sX|?>U?QosD`_vKz#ayI(e<+;He~uu&iDY9-V88
zyCRA&$l3<H*p%PG%D$Vvw@8v8%Cl^YxK?@HSRAGj=d8O3oEu5dzKr534y4F(azbO1
zCN7`p%c`qqZT?+cpD%e5k+?F1dYyen8N=I}JO9~!IxL2}yrzn*=^8@kN)El?L~?-C
EKb8*A`2YX_
diff --git a/app/design/adminhtml/magento_basic/images/fam_folder_palette.gif b/app/design/adminhtml/magento_basic/images/fam_folder_palette.gif
deleted file mode 100644
index 9f170d1467acd993539cf9f6c16cf23f8d0c196a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1051
zcmdth{Zo<$0KoAFtD&P^d9BWMwbQ%VR@YkXbSKlwN+Exkqt2@}Z(YJl*QHIvoVDh`
zv{Od5XCkO$h(ry@mqeu$xOmZ>(WV8O2}1Hn4v0`*9$p^cd3OC9`~C-?AHL)wQVy|f
zBd`$&D}kkPnuV7eakQdn0>jX-osmF%!)<i8(-Cp&Y!jETL?moy!gb}3Z(WP~CqveY
zI({W=F2fR`h=aYKFVS|LkGjMMJ7mGRlHfvH)YTKRR-%Z<J@FHCAGGul$Anh`&r0Th
z$%6D{4}Lw5$d9OdZ(wma5q0`!8Ovi_Ig{)+)ytd8e8w8{O`_X4q`CvD2D=;sXFPx1
zj;)M(HNwE0(lU~_)L*LY|K06+sTAL|NOGM^FG9AOW%*^_^mlh#Xps8Hh5mf6L4^2h
zDB?^k6oATtMC9K`sy?q;Fw%V5HQHp6w?g7No~k&!cxCp_YptV&uXTL5;uO5teUEi6
z@VwP4tDm~fSQtJOkHumk=c4YEQ!RweG=r!CLlX(auesZW#>1g|$9*#-yIL^7JdJn;
zUddZR^zw(2mdH!+Xs0MJcO7{>6sY<pXqBwYD16qR72FHHfA*|C-VvWa`n0Fks{htx
zcsQ-QAG8Q~ib5?&^*<pFvM+|ACK<B;esI>>Nrq<C(NVhPRxWI&+GJnYCC36L@|2=8
z<~MkySEqU!4c(W_vWCcVyG>UWeo>!5UU{9*v-paDnH!&`!8VS6rop8-qwlG;{E=q?
z4-A8~7>WkxPCB1yBTKBIMk<P|Af8@RU$wjM90uk2o?IC3s`i`6?qvv#haeRTwt?Zn
zLi+&I(tdEBon_`^V;BbfkIIOy#Q}g4*!{-z<_RD<0@S5!`-sAQ?>PQ)JbiL?Lk7N}
zqI#!xoS?_;UpwM<?0R%#D<{5}v#$tDDZOee0p-v;`s}KHA#tX${kQze!;B1^uw3>Q
zU8jN8NDpr-O08L+PGPYL*(Zc))P1x~*FWAe#!saX2!h?k2Po2a&rWufe#lB&6(3qB
zA&o(X+099~=1<<I=ZHY*5m8!>hi{yq@irt8b_nxzB+d49Jfy;y`Tf&g{AVYQ<xc>c
z@F{n=6kDe3Z$5$h_U4Wx2H5=7P7<Cnf-A<QQ$Nky${~L#29i>@OV>2FZ6S7lt@<JJ
Y1Kb`4iODt;sy~NQ_X?8NCj+_v0cr#LbpQYW
diff --git a/app/design/adminhtml/magento_basic/images/fam_folder_table.gif b/app/design/adminhtml/magento_basic/images/fam_folder_table.gif
deleted file mode 100644
index 13acdab3371e5bde473b3297358eb2ccf7491f31..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1039
zcmeH`Yfn-E0EUlt5jD5wTDAO;-K=G6&a7lQQ@6x4OU>3=tpeTB)=k$+UDm;oS~wNO
z&_c}%P8*t;d0U!_lDEpdByt3~21h|U2RP@5a_I64`T;$k-#s7R?V+8D2&B?C1DgSy
z4+uZ$)q{x+2Z<}0#wD#p^%LR+wG8V^#@Hxk!<E^X><*3@F{{z4sKR8o2u*=yHbE$c
zt#S^zhONNWmiZEuh)%BI#E(*_A;<z%5?aoW*88iN{(O!&?~MxXdUEIG^n6=bmSEmt
z$MWB*d5wKb2(Ibpm}he?J{vA<(@rXJyA65XuHts+9CiZveE8>>4^(=>zM_9Wt{)n0
zGMjV`(q8$|V3t0A*n6K?9Js<BvLSN84F6p>52^@WHFe2#D6Yu7S~zAi2r+q@-G=sv
z>RyZC=8;9PKeN53(mX|L8G#dW2A4-`&?y?B$#;<CDmrSF((QyUzg4qr&^p$v=I;sV
zwURk@fN&T=zNR1(H%mHn=nNB`%CO40)l+4p&4f-ruIOD-3|xe?2=qR<tQ*d%o*>lE
z%#wn5mI!Q=C6#<>5Syfh)HQS%ouJ;}eZv<r=9@!t)f1Lb!4f@M9D20SL{~RoT7m1J
zChE(crH(PBW%j~1NN$lekfa@|4QlNyMkdp2#&=bHMg+52rHOq*^$;gS*$`)yGGyg6
zlbLub&aM~1bNK;M?okWA>i7%rpMQH`*UEY)0N?|M{>=Y00Z<G8)pd(R6<r&^XayB}
zatGN=XE^yqB!{srkAE-OnX!>62#HBg_GG3O)yEt-cYBiMlIRt~V~l>NODTBa?vyqF
zcDaI4TOuUhp0WE}*z2SB{+4S&kKMiz*Fe91rYr4q=IhJmutK)~Rxv-4(<q!fy`hGJ
zDqM={PHfttm<R_$_qBxtQ1ap!>}szfZlG&TUTl5fZO^!tBN|HSaW^!$GoBLd!wfI>
zbK}y#g1g;)Qp@Aj{`=QmKX`XLsEK3ke~>iZ!U**i?94r80BfB+%1_e!EU$LOM&(A9
Q75koD7M!6lot%K6UwJdh2><{9
diff --git a/app/design/adminhtml/magento_basic/images/fam_group.gif b/app/design/adminhtml/magento_basic/images/fam_group.gif
deleted file mode 100644
index bef3d22b9c7909ec88fd9b1b339dcff38481763a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1014
zcmZ?wbhEHb6krfw_&%B8=`zU)(T>j#O!|0q+V2YspRX<cdwt#WO||!?`90p)cx_4X
zlk?k-%*gqCY}&KgKD)N>{(Sey*DD)7U0gFG-KBoQ_9siFug^1_c&;p}KPtTA-t=?j
zX}kU(c=7-0nWMgw|2|u5eRM%pXLHD|P5W2YB_>WwxW7a>V@0H6&Bf^D|BBZ?f4a^j
zWpP;Cf&bHzTuUb{m~`}iYV(QZRgSgumM<+1?L1q0^ZemO^EXecDQMl_RNqrNd(+)B
zYbHNkF1z~1-0!dMUT!tpbp7xA3pMTYPH*qa{{8D$-?{SADNiQPY<YfRNAu}|HLZnn
zPJQn?TUdEAYf`MUW8I~1Kfhg_Ygn)$x4klaN>yIR*`lbb^Ha`OhA;nbUv)NRNsLLs
z>8yzvN4KvzyKhC}_W#$G)oi@Fq_pe6(bdhfvwXrPhlFkUU%jq8cGLg<a}~!Ydw>1@
zJG%DT$(<XIFRq-G84$PO|GI|c{&Qv3r-3#)#%%fTJN<v?g1?XE1bsWvJ0r<$UVr|b
z!)rRH)OIiLxV?XQOzHN>x)b*osvKEX9>3vVU2%K-j{m8r{_BL6lx)eikKeLtQf<q%
z|81+*KHHI+zC6;g?(){dcfbGo_W%EXhEYIq2q^w!VPs&K%%B4@36v)oI4(1&bINF3
z@Seie#3rbCVuKqeg8*YsqQ`|^F84~i4;vf`6*yFwIZPrJEL(hlol8ZcLm@%%uwKfG
z7c-rfIy5o!>~N60vCy?)KI1o;my?xw`iv*B^i>G6pW#s#ZpugqTG}pR&(!{h)6&RI
zO3L$@iDKh}lv7igoMJSUo;xY=@Ud|1OcYjE(p8gNtD($vNJTcx!er9Jq)tJJYza3e
zmX?c(Vrd)pBse!d?3dN#5p*g%-p4MT%K0czDC4lWMaHWX4Uy>!`0bLm*)*0YbuTij
K<78uDum%9SkYVWn
diff --git a/app/design/adminhtml/magento_basic/images/fam_help.gif b/app/design/adminhtml/magento_basic/images/fam_help.gif
deleted file mode 100644
index b57481ff1bb85202f9653fb6a454471d34ea43de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1024
zcmeH`TThY!0EWL%6I%yb%W`9tu3S1Va%<~2n>aIX(hFBvZidGcF%g|E%7G^W6e=+U
zPY8Lalu@E7q#*KXCMur@g2NLB#ZN+#Ks#JCe?b4B_xibb_H1ul{LRZ(uqXfp?C^oC
z7xGlvrv;mvK&tfY{$`73JiC9O6$kb)DV;uuYXBctw=QmY$*mx+L1naVXVUw1=I<7V
zH=WjpuUAIpwrE$kiaByp=d9V`DdB6XJ16n=ie-4m@qOnJTiGmIYLP8B^=YNEuBbf0
zlxgdoVqx3+ORimSk}YO42gVGJQYxpmTO*ya$fnI-4E8+UxOexrP&O}7+nKE&5=lKq
zn_DtzeNa7+$5sw#oV^p)as6gmjkI5F#!^3)b?G`sEUU0P3g1!I0rh~Z@kL#jg11F<
zfz!QP%%5o+GIk6Zb2%!x)<$jv=PW;}yXW&7#_!@QGg!koE|~LLHLS7Z)Q`$%ZFZ-3
zP;J$lUGG(90(U%}A**=V!jqW_Tc&VqMK-aF({I8uKG*jdd42kJ`Lc9+jr3+l0a-Ij
z7&^<=ONm~kTdxyJ)FznttSYI1W!m^j>7J)_LAP-X%cf`1?yc&WFs`}FS<MT!Z9*dm
z>f!9V5z!Z`Wcr&_y^@N5LTeNylSNM%+$Zf&8hs#>HLSOKW>=i1bq}FgJ*tDR<Jyz+
zt0oLEO=O5I5acptsl?~XIr!_s2CjqxyS(>{UNJ>F&5|=Kp9uWlzY7Ha^xX#ld>~>E
z+4}^5Tm+&6(6_`7qpud0))=sF#()aGQX}q-Ba`E5=gx-PsfpACOn7`eBs_u)^zkpn
zip|WE0YUq*_l~uJp%kisjTBJG`+R&|Vj4S)rnq<s6A>iz_dgJnfL0KSqWRn#v1h<U
zSIk6U=xLxB3f5?SV(&DiT#2ki2*c4!O-Bt11TQRk&n$FAaEOQsNKu^AaE4A@_CsD+
zjjg+lm`o8^%WGH&KLij7ts%=P`GqP-8RzGFzDj(Cn}n*X4dNX}lY`5Bk3UDk_d-J6
PVot@NDoz|k0@wZm9{8rc
diff --git a/app/design/adminhtml/magento_basic/images/fam_house.gif b/app/design/adminhtml/magento_basic/images/fam_house.gif
deleted file mode 100644
index 3f9d5fc055343d146587cd8330862d5356ae660b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1024
zcmZ?wbhEHb6ky<I_&%B8%a<=7K71%IFTZ-_(&hD4Wo2bIPaf><?(XdDeERfhO-;?)
zw{I`6F5cH@*Kn}p^4hZY_V$LIRcB70nm2FW?OQkZcRD|M^k~Jkg>&Z2IW{ri*yO;?
z4ffBTJ!@@kUAAo5#s=rVzkhxF`0>#71K&TqI^64ByT7PlOWK8HSu0nr^lS6j-RXL4
za?pkIXQN9ai+5)2ot3?2&6=e3k%#A`-?@GB_~XOJrUdn$YMD86=FV!fDhKuBOUn;U
z3tv>~9$y<1w<L5+v*VEozI!Hy?rXJAnVInB&hg#7p_f(_G<xe678cGgaOq3*J2E}|
z(A2QT#>VN{VaKKh|M~sv(wdSz4K~wLEbOYSUfn)^sN18ux_W1|)x`eZ-tMmGuE@GQ
zWy{KJ>+0$r+`IGm;r)Xh?h$=KyPB<!O$}LcaM9&;mAPAz78ls<Y_;j>={Yq!X?Lsj
z?s}(P?ap!Y!q+wUZZ9`IGCgd`i3KGkB@^PU_H;TXO^hpAmvv-%=(lg*Hul6UT)5Dy
z!fnEY37MIhyV{*DttxEVRrB=oquq5j@7}$$C^KHNWJyIuMcSOiO)UWzSLU5xQ`^+k
z^!>xjDJeD+V=e#w`St$&`~Uy{GmHX?LqPE-3nK%=WCk6ONuWHzz;TyBol{2Q<i!pT
zW?{9SD{6dw1{|V7N0Oc%QQ{R<(&};PXqo5`$Z;ZYVPJxarh~*4iOFr8ixuQe+_EM-
zWR$dKX8WVD$XQTIV6qZtWTG0s0w=f1*%wUDS@}HzuGuJVIKtcQG-*@Nj7cfymDOEt
zyt(l~HS^k<guW{$6BB|&B_qFhEDCmDQ1WEhqLFER!JosEDK8<QVLJnRD?5|NE~7?&
z;XNKg95OD>6J{7O?veR)LGeJVM8&g?g2Y8fW?FMfEo^8!z$7lsS0mB&K`n5;7?*;A
R#e!%4{UXjQayU5{tO2YmT<ib<
diff --git a/app/design/adminhtml/magento_basic/images/fam_layout.gif b/app/design/adminhtml/magento_basic/images/fam_layout.gif
deleted file mode 100644
index c2172ded0e10cc6e00c208c90acd2bdf9dc67366..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 574
zcmZ?wbhEHb6krfwc;>;NowD}Xo3C?@ywyoxfAH3q#7Sp;YIjAq9bK^Pc3j_Szx)+m
zHM`;`pNpS#HoS3PaK*Ox31=*dw>2-j7+AI`rstG@(b}krHJMY-WluP<<NQnig5_ls
zc4th#(7o<Pbk_-ovh8(CFGMySDqnK7birBw!c~Fg+e+r24Jg@|F!}7#LywaupA9Hl
z)4A$e;>6QYZAXGDcg@@TFtz_g{mL7mb$k5smj#w>G0xl4z2<t`q6<+S$9?mbN46Xc
zsoxXVav;2HrC!damK9h13s;2H>^yY)%j@^wW*>Qb@9BsCV8AdGfZ|UUMg|5C1|5)N
zL2<&sKD)uAskx=KNmA2@M}t>@RZCagLDsy<z<tKdSu=E+l-!vXx-MSg>TcL1vw(%g
zdENSD)=jMLOSdiKYvP=}$KAL|#NCFC+uiN>33sO^Id^#>!DB9$UEJLHn=IYU6znfC
zGG28TZen+5R%W>W@S1j$-gC8AZdV>THYq-5_<Z8HyHu0Gms=^00!%WtaZ^?lE@I+j
QwaWN$BVmQoLI(zG0I?6jRsaA1
diff --git a/app/design/adminhtml/magento_basic/images/fam_leaf.png b/app/design/adminhtml/magento_basic/images/fam_leaf.png
deleted file mode 100644
index 9cd988dfb177b2f344368a0a2c8a0e2b551f1cda..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3695
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
B(rEwy
diff --git a/app/design/adminhtml/magento_basic/images/fam_link.gif b/app/design/adminhtml/magento_basic/images/fam_link.gif
deleted file mode 100644
index 42467ac442ae26f1401e423e8e033c04b5b65dbe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 220
zcmZ?wbhEHb6krfwIKsf->gu|7?b^1swlinWq=CWAnKSq9-Fx@$T_B^ny86Y77lDC+
zy}i9RZrnI><cNod$EHo2ii?Xse*F0V|9=KTK=CIFs|bS#gAPa`$W8{<NCnltl+1Y<
ztJYn)D8XyA_iW%H?oWIA{`Il9Iv-Fl5n*XlShOKfiiw@INWz9m;M4|1E)O;)hK7Rz
n+-#E?I2;XJnAkdx2y{qrbO_E?sJD2+QlZn_(%Pn@$Y2cs$hS(?
diff --git a/app/design/adminhtml/magento_basic/images/fam_lorry.gif b/app/design/adminhtml/magento_basic/images/fam_lorry.gif
deleted file mode 100644
index b902ce12c782b0bbb77844a736da011a98b9079d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 580
zcmZ?wbhEHb6krfwc*elsW2JOwPuHFnZ=>{8yDq+pjEr1YW<Gn*!@w!$o`3qU5;o`Z
znqrOU1^4dV+q`-6={d1#W`1dDY4)WDjE#-YoH_IO<ieNNHrH&q>+0(I|Ns9J^Gn>D
z4_@C?V_m%EaCazB<%7dhj^22i-hVpOSufB|W8?9MSLWnyuXnw&uG*{P#P!Y1t_}On
z%uIW7X4!>h*(WB%I9BaEdhh-ItMBgao8(-5_&`VC`)~gr9+|D1xO7K@+qp%lw^!C{
zS_K9<Xx-b|;#9NSEO-6$i)$AjcoZ`0f?MNJr{b-?eWy>|c@K09!%zT<KUr8s7(5ts
zK#m2)2?P7W29KuZme#iR7Hc&%9UXl+Qzmt(RyDEdj*hybqULO^I%4Ju3XF_0GRD%{
z_6DjRI+B|<Z`M{ca&q<17kB1x({wQrQZg{&G-LLV6V+P5t!HH=BkS&NX5qnPuEBl5
zil1M@L6O~v$HP*=*jVeG#s_92BNi?X<sY`c82&KW{I^lyI3%EWsD*=7iAQNhfIw>t
VpOBfv7lT7CE)vFBXCycntO16wue$&M
diff --git a/app/design/adminhtml/magento_basic/images/fam_money.gif b/app/design/adminhtml/magento_basic/images/fam_money.gif
deleted file mode 100644
index ab0babcbfe58ca586a82f70ffb47099c63b78420..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 380
zcmZ?wbhEHb6krfwxXQo~G{b-Sg(Yn}nvXm=Sh6|){=2&~j!s>BZgtY)xaS|9)o-oo
zI@q$|?&_I`rk{I!_VdqAD{n8}_F&`OtJ5YN?QYmoTeYn;eO+?oys%p@Z!Nwtck}(V
z?faXHcICeR{(jx%)lqYTvX-aMJTvphpYL}+-#qp7IFP;j-u6kydQ#UUth%$fX?Jbc
z;nw<H)$NCx7F?ehIy>;h^CQJui=Tae7P~NV)3x>a>$209Cw~9_y=+&}|Ns9PFo5Du
z7FH1kO9mZ~49HImY%>qcDX^F$(0|-BquFJh)5L(KmNjlc6NMYIT2r)UiE`{Ta0%0%
zuDv)=u|xW^he*c8$jyoFrB>ZithziEm6j?sf&#jXtW3?~2BM6XI<*2>T1`4)2Fz*<
z{3cq8QY=D}Jfao`CNkpe68t(kY&<JOHB5v>csZTr6j{_)>WeDyvAT0=sVRsuFtLYN
UvYDAOu<pCe%Efot$&tYt0A>E5IsgCw
diff --git a/app/design/adminhtml/magento_basic/images/fam_money_add.gif b/app/design/adminhtml/magento_basic/images/fam_money_add.gif
deleted file mode 100644
index 1f9dc6bf223a5510a25b134227bb699ab4798efa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1034
zcmZ?wbhEHb6krfw_&$T7VRv=S_VR5HHf+4N`p@4#n=Vb=aCg;@Ki_M1RKzZfv@K9r
zeql-Pt`x^&Rr74gr8nnK+0b(T-QD@uX9V|X^zTXUJ>1cHu)b<r>E`=uH{D;e>E4>0
zHR%)AHGcp7ebMzf-+q0o-&)hOySDvM)66qdW}lt5^7i6wSLSpdYRg}j-E+7-ZF%DM
zha3BMXH7pnY1@O1t@|3<_cz-YDs>%dop)_|`_6>SRjDm|8?qP1rS<u@9H?vC(R}Xl
z*$sDBFTOGN;kyTmZp>~!*tG58#<k~GFE~4A#?h$_OA1!qS=_R>e(9;j)!WOL-&%O#
z*{&^Drfz?<x$AIi&<y|Wk2V!=%$szqXXCX=C7bj6k94;0N|<$aO5^U@&p$qIygcE@
zpC1Wb?%#iXZ#~%1vnO@I^_g?dP47C`GWFzy-S@VK&JHZ!QatzSw7Z{g*6*x}SrBpR
z>GAqq)$hN*Z(N<Y{?4l6P5D06hN){3CZFh=aeDHk<GsN%{imOv`1$9j+MSin2kQJf
z?SK6K5j8(-)3x<0ZY>J$*KOX>@Z#h1t@qbYInh7u)WjKQCdYNUO+PfXdRy6+`|D3U
zKa#XKZr$b8#WUi14z<7f{POPWI}?s}ckfDS+EbUmByswtj{ji5FbYTy0mYvzj0_Aj
z7<52dL3x6K<2i#Nr;J6wC9x(B&M?J~P5w?TqU%f+3NJY9+}Q8tV5sEaHARo#Um_~-
zQM;t8W>$@Z#xhp{^|%8b6%!b_m75H>b~+R%IQFqiF{nt~ICe~e(TGo>OCgCt+LV(c
zAxgMuLW8}Sm<xxAg717+jtL1&2I&)oIE}wBJe>HvO<AV>Tgt~`6&^ON^ePF5fRntF
zRdpCd4>Btpn9C@~!!qHp>**=p@fsQju4Hh`vC0>k>M3;m$kOwyG6_vCooCv({YyAH
u4Nsm@m6~KIsIZ8sb*@K~LFB9h3mBR?WmtYOY-Cn!VdIl>I3OaxU=0ARo_VeS
diff --git a/app/design/adminhtml/magento_basic/images/fam_monitor.gif b/app/design/adminhtml/magento_basic/images/fam_monitor.gif
deleted file mode 100644
index 299ec4fb3c47d7e5692cb45721ca36522d8759b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1027
zcmeH`T~AU00EQ2yhR#fvu9g?6*`n5#)ij;0L1UIpovW>_kBfAzfsrA?#+nik5K;^f
zM5SRS5-=SJ%AAmMB#1{50y!TD9zeQkPFI^!^TPB`bk*|*-aYU3+^nmus&38$@_>{G
zFq_RjpO4LE>vTF0^hP4s?(QzFXCakJMWV6U+1U^jey&=K#nzuGJPwB=7GDpALQ<&|
z!xB3?J4T}shT+c6PPrMeTCMNK(20qO(b3UXg~#rgnVXx_*jDX!yL)~i1h1-8s%SLU
zDxY^coiF;9_4-c=g@QF0G8ha@?TSXD@h%4~7E2(Acovr12mAs90zuH!)KqjWE*(Rt
zRI1fF;c~gwu=vKtrpxWw+WLv2XwP^!mPpEEvThSB5C}LUa9i&Zy>D5mR0j81fdhd6
zR}XjTV3WxNf?yO&tYHZljwF-cvDi9|M(cPVcr~)`foiqd>FH^{9zu`^hr>a`QMUG*
zP$-<7oMa6w$>nmf31P8VJ!W{x8}R%6i;IhNI$dmpUJm-yYBfy>uB;#)k0%&}x`sm%
ziG;~yLNLN$Ffa_W*=#~1LY2AO)LzBsu+zD~==ULL#OZYLc)acH?JqN~28Lm8Zx8s-
zzj~nLPdW|&M8JiE!Gk6Md>lA}v*hvWfQt6(1oq?8hqz}&IneKt^c%0w9~+4h6hlNA
zF29#ZAX`Vkiw{aODNPiA|CM5XoS-u_9lx6Yv7YecE2$`_OH99Xhmt)Yt{E=)LFeL5
zRGy?%otxw~k~6ZhtJxjt?hn-s;|2V?Wi8?~q2?Fqa`N`uLSYNLn;?1vI)t@&F`g^Y
zp5dm=5R;@_T-yCja=r3!CKq?KY8)*W2(q&tmbO+F4DrPo{6-p9PvYmE;^4ts%}<%+
gYlS(*L*;lLuPpyj5u=?%)K=VM2m%eAOd?S87h<k-#sB~S
diff --git a/app/design/adminhtml/magento_basic/images/fam_newspaper.gif b/app/design/adminhtml/magento_basic/images/fam_newspaper.gif
deleted file mode 100644
index a0d25bb53601a303a26be755fef08ea991f3a685..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 606
zcmZ?wbhEHb6krfwcoxO5e*OBjYuEPn_C9_3blbLVM~@!;`0?YWO`E1po%-(GyQ^2P
zzIyfQ*RNmi-@iY8{P@<bTaO$$vVHsZzkmO(Tet4Tix+R-zCCvA*sfi>o;`c^<jIqN
z|Niy$_1(OAv%9-{!GZ-}zI<7+V#VFNcen4@dG+Sq2M-=xym)cL>4!gl{CM;B-L-4i
z&fR`GYu2pWw{Op%KY#i1<>$|zzkK=frag!E?Afz#-@ZkQ7ERrG{lbL{mo8m8eE9I{
z)vHrxpM3M?O;1nH%a<<?95}Fh_wG-hK0SK!Y|WZA^XAPvbm-9a>(>`AUc7ACvMpP-
zRIfZ=y!hOX9Xq~#`*#2S{gsEV-@0|{+_`g`H*fCWdiBGH4}bprS+Zow(v5pIZrr$G
z!-n6#fB*mgpMkzW@h1x-149&p4#-+ioG`HOZis4XZi?jNl4|K{<ztUf?d)z9V;7NE
z2nd-JDHbjf9^oJ-F4PstIxj+xpI6?QZ)q!Q1T%xXhgOgp2cvqc00XmdXrQR6m6s!j
zWK`q<W=6MgZaWQ6KSL&!C<{hgCzA+nc4J@VFlmt{7X?Wjaqe&yMJ^?2-eyblV1Jni
ze$5;gfrN&D1|~rvk%tQ&urfAv&DipTaX}NKgpt*Q=pzT18#xuHeYm0MDbOq$v981;
Qph$q3g(<>|i-o}&0Q_GI%>V!Z
diff --git a/app/design/adminhtml/magento_basic/images/fam_newspaper_delete.gif b/app/design/adminhtml/magento_basic/images/fam_newspaper_delete.gif
deleted file mode 100644
index dd1fce9c454f3347c43aae563eb90db3f233677e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 639
zcmV-_0)YKTNk%w1VGsZi0Oo%HudlDIt*yt$$NKvE<>lq->gtu1m9nz3#l^+$?(XgF
z?VzBb^z`(Njg79ZuExg3#Kgqi-QB3DsQvx@-KK`<=;*q-y0*5qwY9b8=H}$&<ki*H
zyh8=NLIv5`+5Z0i*4EbUb^zUE0mH+?zgi-)yu<SH^7wWDmATjNe;B}79?Weo)6>(y
zz`%}<j=sLW&d$#NcM*@Z)z8n*;;)p|+1=pa;K5lR^qphAPY33AA*Hdr;^gL{qN4uI
zuDMei|Ary=wT-8zr^3R*rlzLju$Ah01^oQ{>FMeAwT;S{eZpKMtgNit+uQN+@%Z@o
zx3{;-W+?3K?*EcazgQmLr--Yot8=5y;j4_!+vVTi->}Q!>xw|XR~_%~@4URc;b;T!
z@bK5y*NlvepP!$!w6y<!7@C@zi;IiW($cuNxc=6-d#TU6ySvfR(W9fI&6<D0TqDqR
zJD#4N+S=Nw!q>C2v-bA(q@<+vsB&bR$+5Aqu&}WE`}_a@|NsC0A^8LW004ggEC2ui
z01yBW000NvfPaF6f_(xTAB2j90tb9<iHn5~2NetwFh`Po4|^GVd?pJP6N-HZo_s<W
zUJP>rrG*H51OP;3Su$G&0Z)Yx00a(rb_ytZS3Cw9e|^9N0dIQ+EmCZCB@H%zBLPTE
zJ$wZRFIqJ_E){}95*kew1$!3}a3md6Rf1M&VRRmR7(ghI6J$-E6*T??Kma9y7!Mm}
z{75n-1`sYw{@fwc27m%5EWUK`;iqH@4uS?OxZogynlW8)m^l#wjEX@6&hXiTCIOZx
ZI*f?OL4nW!0}T=gDiVjojiP}706UD)SzQ1C
diff --git a/app/design/adminhtml/magento_basic/images/fam_newspaper_error.gif b/app/design/adminhtml/magento_basic/images/fam_newspaper_error.gif
deleted file mode 100644
index 5a48a701cca2aa7427f9055c2bc646a07f4c7f60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 628
zcmV-)0*n1eNk%w1VGsZi0OorDudlDIt*!d{`jwTH<>lqY#l`OK?#IW+>gwvUva+tO
zuI=sZprD|&wYBv0^r)z)#>U3g)z#+a=GocV{{H^`{r%|Z=)}atjg5`Ey1L}#<k8X5
z_ML_Gp^B!art<Rg?v#w|n1rLFqxSapw6wJAkbKVD<)oyf-QC^MmW!UAp7{9q>U?q9
z+S>AwecX<G;^gLgsn4RKqUW28?CtKSr>EO<W0kqr*Vos=!osP-*K?!J#<sKI;NaWa
z+nSo1_MwX0gmli%&iJyO`QqK}dT3;u$()IV<b-kHhIF#L!~FdGpP!%SYhLm3@#}3_
z+<9rhz`(n^yYTSv<g%#z<KFGTxc9@nxVX6K>FNFO?dQ6&_J?ZI)6=)Nx9{)o>V9>L
zi;LKPZRn$vtgNi<pN+q+tM!X;kG0k9uAsxi!=!$8^M!5gg?O;b;j62w@q1yjv$O1W
zX42Bq@|uS7j(WDXw%mnvv9YnRu(134`~Uy{000000000000000A^8LW004UcEC2ui
z01yBW000NkfO~?2f_euL6oiU}2MKu_iHn602^J0yLQ9f*5O@-Jc^?cJ6^eQVo_RG5
zUk)k<rG*7~1OOf+CTMO00V{<U00asraSJy_J1_$pdwReG0U~$^Q8Y0+N*FzRY5`ef
zGI<CIJZWVqM;3xP4;nrh2zX|6KtmlRM1pT~Q!NvD4aRWbqJ@o%8G-^7@L~YRga{$d
zz^PJ1P7*;Qm`DMzz)6=Eb)H;l!s5;#0SxRYK!Ifqk~Sc~K-oe_z>hq5!Wgg;#D*9u
Oiv$e7U_jEIKma@Z^<7B-
diff --git a/app/design/adminhtml/magento_basic/images/fam_newspaper_go.gif b/app/design/adminhtml/magento_basic/images/fam_newspaper_go.gif
deleted file mode 100644
index db3b7e32bdafe3ab6af710826489543215a625c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1035
zcmZ?wbhEHb6krfw_};>>apT7I>({ScyLRf-slR^xI(qczyLa!7A3y%|>C;V{HmyB7
z<<+ZKy}i9(zI<7+V#Tv(&yF2C_Tt5hzkmO(Iz92okt0u@JXx?{!P~cQ|NZ;7Zr!?F
zyLRo{w{QBPrfCNolI9s~IQ`JLgL~1UMU9)IZr;2Zv%u!&%d6%coZGf-OIqx9`}XbZ
z#pYYLZk@XGx_PH`{6go?KRz5jeE89mXY-DBJbZU=_3G8F+tMywy0m4>mgw1<4Vx3g
zXJ}|Oab3K4@!Yv{t=qEtcIB@;HKBO%xfzF=XU&?W(a5}b@#5{<w}1NdDPy6@pFe-{
z7F+c6buBx1v1WZ}>U_gBYu2ndJ>lxrtKHq*^XJd++>!nM{ri&D{!5lD`S$C}!ed<r
z4jlOL<Hxz%Pfa={9z1xEztlE)zG2*as}1L-U3qqX*|KE?%j~XSzn-?#!)=1(o!2)!
zC(3;I@WHuX^wzCg8B5)kp6Fe8yengog<LhWafj&g<;yp3-rT?SYRc@BLDQAKef#$E
z<x87xf!(`z&zm=I!k&_*t?7pj9on?#@P-W=e*gac|Nno6Q9$1iQ2fcl$iUFTpaZfN
zlqVQCUNCTS%4if^Xw;D4(9)?;XjG8n6c=lmpy0&JZac|ChK2C}Gec8f#03S%hYOhG
zST9BfE_IyGtjaAW(4xRFQ#$5Njf6siw<8y$K+2Aw=S<z!j!8T#95Ms~SeUvPA{H#|
z5msxIs8D2aZkVU8$fE19L9vfR)?0~#<;emkF5dVl3Lh_|G>Mu-uw2@(aoJf8(IgR{
zhDYpu(!%;2oEiy78YB(4>H=0yeB3V}<ihcE<{|Y1tTGPwQYJoZK0MPhnMG(rffBQv
qY0kHnmko=&Ih$D8IG7ZUGAIh@MJ<W+NMK;T-%@sBrlElXgEau`{8#V*
diff --git a/app/design/adminhtml/magento_basic/images/fam_package.gif b/app/design/adminhtml/magento_basic/images/fam_package.gif
deleted file mode 100644
index b5d50708d8e80fa17ae19dfdad7e9ddb84ac18a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1054
zcmd7RYfn>m0D$phXeVe!aL#19i(}JdAuQX_4TL$*Ae8C|AWDb6k%2BEOC*lW#!Sfo
zp#{bY6wt`xh*Y<-4vQ8Fu0XMcUa-{KQhK5GlwN30ZxniZKmWyVvF8)~-aJLeNjXQp
zOM}v&kQ@S=>NsYJS|2J0PDKI^u&GIeEs;4gjxgQgX0NC@96*4Lg)X*uWi>2v~>L
zMsgzvJ1Brd)-l6awOiH_@)?11+$n(9rwbDCutj_gtp5qtN7N6_S^mn=j8tfc&#mxI
z`xeM1!H?QeijG$XFhdYk&C@b8_fL9E(+*X)op%fvJMowUAa`7v!FbpXd?Gt9SJHJz
z#?01FP-MMdC8C&LkcT7vR%xGN@L0^y;}R7hvsdtCYEaqe5|ZNH1&^v{{Yj}?Tx6V}
zVzwFJnYN8m06G;BktNK$khVj{%(Bf~wuzbyPwDu}KKpnb2q^F{;#j0vxy9=<Wb^EG
z9k0Zpyk(U&N6=^J3I}-ruTEW4vq>_>2>>uXrwrhJ%wtpyRpMr*qzeXHdcS4TJbwdE
zL_-?7y#EM51zJv>Wq}%9V_VqSn+}az#|^BG2A3K=dV!O7bVEqdJ}mJgbMEn+nEqD~
z)Pb!<J1-x&9+_q?_+E<9XTNP|7+^~q)G{1XUjx4sSXm}%A8>F?ce8Na`ltb{
z-BsPIj2T-tR2}h%KY>}aW91u5tuf3E(23Q_THV-rbmg9Ig5uG!EEAXgiuQ%hPi(TG
zz;YkJR;Asa+m?EQ(pu-^V*BHx1}<fpU+-6Th7G@)p4<$1pM$`nQE*k#^)ZgeW0+Sv
zS{g)`fNRn--{uq)#yoNyTl2}<qi#h|Nd-P3@CvQmLUf)Cd=j9!3IKrq$E8OI+aO2|
zWxg`LdICz0K?5o8@Xb5hb|&pkRUg>V)|uJ(FSVSXIdG@o@9zmO3esuxPv3qmz}~#y
zzxVL00`6w8^FM;+XB*P{nurH7xbSECL-MYhdumFmw$%*(@@8de>+7zHLfwbOCrNvu
z_y2g2R(+OGMN2=QzrXMb>4!_Fs!9ea{}2TAZ(Nk`I+LA4tZX=Vrg#61R5u(LQ6_C4
z`H2XbFVcs|y=3UQ`GclggfAqsWfkt;?a5y<E>Ma2J$r~5CyeDyb8jVmlT1_dpNhU^
zWnD5`Q-mxUC$(<hySquXaO&w?g3E=}>`32tyO^F+*a3+TAFn@{A#P25uRUegb-t*r
I8iw-z1Ja8&G5`Po
diff --git a/app/design/adminhtml/magento_basic/images/fam_package_go.gif b/app/design/adminhtml/magento_basic/images/fam_package_go.gif
deleted file mode 100644
index 70f05046d8d74b31d50afb52024fdc9d786d930d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 645
zcmV;00($*NNk%w1VGsZi0OkMy9(x1l(vjD&PLRBG@888~qBF&aD%QAg>)5SCkQRKe
zRnnta|Mb_}!-?wEoawba`sA>v%aB)?DD}{I|J8T=_~tl>3HR>N+p=O}qekhpOw5@x
z>&1ij@7DI^zn;a2_}iWP+=PX;YURIg*|kpI$(2TuD)GTqGKUo4#(v0-K=0PIT%bJl
z_3d=4Pe6$p_vEto*Ngw}$bqw3mcfABw|LpIWc9s3W|=e9rcwX)-T(gZ&YVB~-<9RW
zg8${EQkWv}(2VuTY1+3|Yoj;lzevcAGu^pqiMVU!&ywxlzW?pM+O1Ik>9*dzb7rMT
z`NBy5^3M6;s^`pz?b)R%fCBKnJ2{35$do&+&6L=+RPxr9|LCjn&xZH!+@;8k{Q2<J
zt5tTUIRERn|NrLq)|7>|W@x2G|J;n1!h+qpdh*?`N|GGZr(au}DgM@YJd6<Dzh(d7
zo8-xrOqDb5-nB=M82|tF=(|tJku{FGZ|2U7|Ns900000000000A^8La6aahxEC2ui
z01yBW000N#fP8|3UOp*agNcJ+R6`C^0!d(sf^~686%}hRPGJa%7bz(hcXu*OF;ZI?
zHUxYDBvcnlB@G8hWfLG$964$vIu`*`BU)G&3}ZbMKOuQT6$}tvT@xA*O>%EH4_jDT
z(F{v5LK<jjVg*HbL3!W|Q8LOWP*w#q5*l530?{%{O^67@p&)__I~<Jk)3Ia>7b00A
zMi}tnj0FQuoOodPqd*otNX&>#!=efw1YuIhkl`l6moFbgq<Qk9g&;6<c=!OqCIK84
fG%}c=<fVp@Jx5er$v}tFAOdX`C_w=rQ6K<2_IpN4
diff --git a/app/design/adminhtml/magento_basic/images/fam_page_white.gif b/app/design/adminhtml/magento_basic/images/fam_page_white.gif
deleted file mode 100644
index a572f4589cee4941173e80c4481dd436e8def9de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 379
zcmV->0fhcXNk%w1VGsZi0M$AG`uh6y_4VK1-^<I()YR1X_xJt%{r2|u!^6Yk;^M->
z!t?X<#>U3T$jIvI>hbaMz`($?w6waqy7ct)#l^+!?Cj>|=I7_<v9Ynu&CSQh$FHxi
zy}iB8&d$op%JA^;yu7^f^785F>At?c*4Eb3)6?7A+tt<8+1c6e@9(Ors->l+?d|QX
ztgP49*SNU2<KyG5uCCqP-Ota@`1ttw`T6_%`^m}4%*@RE{QUp_{{R300000000000
z00000A^8LW0024wEC2ui01yBW000J<KphNsD;kRegKnwA(QLV>l%_~BZ?;Kb`$&m$
z7lc)J%N1&c!s6q|9VQgPvRs2mA{*68n!C+&P=GW64;2m;eSbL`3L`HO7%?p@iDZ0H
zHZ%tdA(dr09Ucq_5F8*92cDOhH8nJ<IV2@B83PRs46lBcQZ_aKz`(FFCMYf^1j$gl
ZpR0Vk12xW4H8@KN14r67I0-sI06VTT&G`TT
diff --git a/app/design/adminhtml/magento_basic/images/fam_page_white_edit.gif b/app/design/adminhtml/magento_basic/images/fam_page_white_edit.gif
deleted file mode 100644
index be24b456bc8122f6acfe0d6009403ac5d848e310..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 604
zcmZ?wbhEHb6krfwc$UoY{rmT?U%&qP_3Q8V<BuLa`uq3q{rmS%pFaKZ<HxrbD&AeL
z{PN|?&*M|>%<z17t?}KXD>s%#eEat8=i^O39>spRT>0@z_1|wt{(pLK{qWMKSJofz
z^Z0r{I?7q%<I4xn_mw}ry6NsL??;OQ_jUQ)-q?C~Zs4j;=j*%5F3nGSadXA<)8+53
z)PBF8{Q239_m|c@IT?C=aq_26pI*Lv`RdiH$B!R>{`~pL)itf@dVjwi`t#t(&yy4X
ze}4M*RPMVQ8^6B3|Ltzh=O^ngZlCb}{reA>ww#$3dFarg(<}17KD}~vTh*z38$Nva
z@bymohsV3Vy?gTM>E4sAj-ReoU6||k{ZaI~Y_(4>@9nFS`g$ks#;lNUm)AW%(Ea^k
z)RjfqM`w6;CTjoq@#E*upTB?qK6&!wnKNhp{Q2|$|9=J=0L7myj0_CP3_2jQL2<&s
zzOy0OI5DBMt(A>6xjQ*AHa=<Mq*#~Eo`iUA#@QT>hDoLZ$^kaX2}ulb3=AfoM)q<}
zR=Up1lHztS2pVYc2}OikL~Wap6d&uYC1z)>ukN#LQj#whvsa+MqDS}gNs^k(p^>5r
zZV7iL$*Y-b3ybguCq2I?;qIU(&8cD=`{_lJs$RsxO|Hz{dVimlZa%2cF09GV;_*ei
pmswoU)vD$uhv&jA{ga-_eqaikHQk__L&oBWkdFjYG7}?%H30T|C>Q_$
diff --git a/app/design/adminhtml/magento_basic/images/fam_rainbow.gif b/app/design/adminhtml/magento_basic/images/fam_rainbow.gif
deleted file mode 100644
index a0b0a53a48495543f808a0d17545655253936cd9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 644
zcmZ?wbhEHb6krfwcoxgBbl3IU>`dOJ>)kgR2UKpn&Bpj^s`;m>W#?|b{IS!wd%w%i
zXEVQDh*`4h+RN04PgBb7E6V=fUi<m1>DuFd->$?-&t>r0WKy%o@%zExcP#~<PaFTN
zX83v|F>B`XSJ@dalf(Y(sk<j7`Z6_1cs9eQrHj9pGdy;%S-k5~^y0G5v&%o#*seb2
z`|Vo7o4UMj9j1Y+LSC0=ye><>&B`$Ce0|Dx>z`B2zqVUs%~*a<TI}(am^)mocevT!
z)aH6^GWogGp<~IZpO2=!Z74`?-?eDRwZcgUe)O8&;p6-`clOWajz6||eLoT2ai+#&
zqw$AIw|DKuUmA=aS?IlMD|%a>->`VkmqwFUSK|sM?*BQ_?0I;|m$?-`cKLm~k@#!6
z`Tzg_8R!BOf3h$#FvK$GfNTTB2?P7XhS;X&7I!s8Yev?V7C8$>c>`TXqn=n5fdE5E
zb}chO)gC1`K0jYQ)0h|q>6Qp98-9Pb7&}fc2dQQys~}C+7!L`N=xA=CCKWdu&F~mc
zo@h&9abwXY0Y3f%Q93f(CbrDp%CT~+fg$I0Lb=44HDuM9Vl50K**th;xP0`@c^P;F
z3sfA~#A6I{A`>4T6=AS%5l~2abhuH<PUFb}!v|~(+AIPbT#U}F(^;a`zBpWbz|QDo
z9d+ZuqLkCEjIs<If|eQ%6F3wabY^UPa%95v7OoQ-8y%ZlxRhBq6b@+!FjxZs{0`*|
diff --git a/app/design/adminhtml/magento_basic/images/fam_refresh.gif b/app/design/adminhtml/magento_basic/images/fam_refresh.gif
deleted file mode 100644
index 14b878b452a210e9fce59948ae9714c24aa66928..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 324
zcmZ?wbhEHb6krfwxXQqwo~GQowIOR|((<eGBc=x)zkaM{QI$)L!^BhV89QQAm&Dc`
zExGgYrdgF?!R)-WnQ3+VO1q9V&pb18)2-DdTXF)Ld}CGyRcz1K%h!zT3@=+(u=d8%
z?6t{>>%+76Buu^B(|ok5XKRagwpz>H>UmeD1$X%Oo^Oeo9W?!H@7jAyt2dVF7iy&~
zjc?!AVBKI^yflC7y|wvkGEz22{r~@;fe4`ZlZ91;!I(h@q!#2S2DZclGYdR)q}rD(
z77__OCn4Xj&e*i2k4HGu=w=R^$h5-dSq)axxLr$QR8p=-`aITQdv(}4ZiV1^Ic;rr
tcP%C^Jzf?;E;cuH9Sx3296F+`?)vKL+DZ(P)4ljrtDX6lR68<Q0{~%CbzlGh
diff --git a/app/design/adminhtml/magento_basic/images/fam_server_database.gif b/app/design/adminhtml/magento_basic/images/fam_server_database.gif
deleted file mode 100644
index 6f4f4c7c04e259beec1482a2631137d870215ff4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1045
zcmeH`+fPz)0Dyl2I<zt`WDi-xHdnbGaBI!77MK&N2W|DzTP%BMy5^b>J@|myOdlL0
zZ{&s(&B@Ynk&D3Lat@c{5lle2h#am`OT<KUCSF$A|Il0CKk#ke_AwvSRo!A2fCBKd
z2PBh8yWJiP24NW9+uO6*Y^hXge}6xbNJJtLzu&*LwFT+TYPEWOeSKtPgva}k$z*su
zp4;v2>+74GoZQ~tPN&m5J3CINGZYGi!(o@p)!W-UF)@MTIEtcDsZ=BqiN#_Ff?~0l
z20{)G568yFFbq>Fl?tT}F=JZDq|qX34eW3@EU3MyscC44KdXUpJUB2gI6gjZv7*av
zkJsy!%jGq~YLgjLD3pOfKsKXoZEck+py}!9<KttAL;@poR@AOHT6G3XAQ0Nz+-zxS
z3E*Ko6cq}E8yg$*wgtUjpG^KZI5-H0qhA)6mzLZJGN+m~3=a=~!bVs8xX0sLcKcUW
z`~rdC=;+93H16*1ie(y~&nJ~>rsPw8|LTkaQmPC_1Vv1kN^Mwl{0Y);u~@8DtJz}n
zcvn>_6`#-7Xmw(-BpQuHqtSVr!(g=Hcvzv*udRK9bY`zFz~yp19*=BR7LUi}O1;5|
z%49RY{sR8<j|-G#NLc{%fa@oolP3T<4T^J1SyC!O%8s0-GOpC-b+SoqskL|Y#pO@#
zP!uqmNVv<4OJUPj1_JU+BR!R7^a7cappax#F6UCSH_4_kYmh8Z<fakI8s6tWu4BET
zJtyQ8ft#b1{c&z?_3gphDmI-#JO^&Hv7ILCAcKT9m(%IBg;xn${##eq+{aUS<N+2N
z=_Hc~Z=Bc?vztr2SJH@a$k}<sT(RgGF9#D6J4#4o&UZ%l#p2J@YmHqC0%9q!WVN#%
yT|QI)I+BW^Hgd(whZIhGw+TL5)IsAh$^e0Q9#FuG25Mn;Mb}diHRnDZRR0DcIhhOq
diff --git a/app/design/adminhtml/magento_basic/images/fam_status_online.gif b/app/design/adminhtml/magento_basic/images/fam_status_online.gif
deleted file mode 100644
index c77eb38b267f05d7281ce611c4b02c14ab19f2c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 997
zcmeH`=}VIV0Eb`e#g@(sMY;%=1)h<Wk(n{eW15m_K^K)~i3C=npe5*3a%v)yBg1RW
z)OjrNo}04EU2W6dm)o3EY@3?8z3=8eS^f=u?f3n8K0NSCO-s2Nmx~1a0T&*aSHm>P
z?>U)6WN?ZNE{+Cft6{Ddo)qm+7IwHAct+wF<ZOMV*gB|ImD$}qZfhE~3H45v%8naY
z>Y`Z`W;b8=7li0?XkG)oZZpoxAeIVdDz}T;mum)BSV}0ZLMk%2#)aEr@#>>y_45`L
ziDAO^DF%5v&Eyq^5(>^Blj!R+68k83<7T<+JwbP=aJGkLrBIZgCpTlVsVAOr)N6aF
zJ9Dig8r<;Oti)d2Wu{4X`C4aYC9kkW%hNiixYjS!ExODekk~KKIi<^c?G&pIW-P3L
zzqsrw?KYNn8<;A1M(UtRA;FT9%(XC8P%X(!S3oo3%`0zMOTXNH>0?-eVQOKwtb4hS
zwbezlU4J|<!rShhv;7e4_Ru$!W>-<!FkxCloLyxo9rBgE)@h4S?-ChZ<05<gkU_KR
z=$u?_Bg>{2p$XA0LjirGnl8LzX4lE9NqUwFsw3MZCf6``t9HnYDG|}6ju)Q<bftr?
zfH`W2qjfxOR0?%4wuv2hfBvW5d8?S(Nwt!B+kFg6CBZl$+~}bgb7~a$Y0LipKJb74
zPypoyJpcd?L>)K|J^>(DK;%&*T95)Jgn<#rtb9gI?1v7*-3RqzAR6q09){q~fZpJF
zfKtr_lW(L|9Sb?zn|`|CqG#+1y1&XRB`Bw(%KkB<HL4&e&mC&@^^1&O2h;9_`yzbe
z^q8z2_F??-SW`)iJU8hifQU#U`g0pmp{QU~ZX!|Ia5=gngqT}^!J_k8-@Y4t$;QSU
zLgtg$1ds2jw|((g6k6<^`i#LZFRtYuK_z%)VoW@bkmPfqIUpw7Gw{^4A_Niv#Qy;u
CSd{4i
diff --git a/app/design/adminhtml/magento_basic/images/fam_tag_orange.gif b/app/design/adminhtml/magento_basic/images/fam_tag_orange.gif
deleted file mode 100644
index e039fd2535cd66ad9074f119aa2e46ab0b46e53b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 592
zcmZ?wbhEHb6krfwcoxiX_UzeTzkYrB^5y2un-3m5ICt*c_U+q$J-z(s(WAcyC;h&<
zecQHeKY#wba^=dWPoJJVdGhYvyT6C0egFRb@BRsI-@g5`sq**xXTN{{{`&Rng$oyc
zZ>>Ll`t;xJjh8N6`h9uJ-+jF=UcA`3bLY=*pa1S`y?XWP_3PKa@9ls6`t|3}pa1^(
z{d-^E-;XbUJ-+bt>C?YEn(p1Z_v^`}EnBu+ym;~J*48_B?wmY%^3S&Vy?gim`Sa)S
z;lnRqzPx<-^7H4<H*DB&=+L2$A3q*Fdi2+p+V}6@|2;J2#*G^X4jlNiz47nQ?|-+|
zA3uKl_thOAK76=!>(<t-TYvocv2WkLzx(@l@813Q@8AFb|1%5%p!k!8k%1wYK?md(
zP@FKZuWeA_l{J!NWe^YU>h7`*>hI@gVC?CZ4dP&B>F1E1GF38&A(&S~Jcz|}emCn1
zX;vXIuONNP)xiw?7DC!?qFg~Ht~}ig>OqWRX7Zde2Yk$r1oN3%1?h+e2%bH_taypf
zK_Q4;O8B;iT#%}-Uzfd|&68)&%Ep?^Y!cnx{<=>bV`d0U^mkBI43zU|T=>Z2pjVfI
ggu{o715C{V%EuHOo+P=siBwhm;V6n<>cC(P0JW0~{Qv*}
diff --git a/app/design/adminhtml/magento_basic/images/fam_user.gif b/app/design/adminhtml/magento_basic/images/fam_user.gif
deleted file mode 100644
index 3ff9b77784d71faf5e41d3f41487c4c8de0c9282..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 583
zcmZ?wbhEHb6krfwc*ekxYA55|`+v#Q4jGR<GuB=?QLg)TN1aPZ*Q?DH$F6_#id&Mr
z?f;5u-=_XOU0(cE(=UC0ar52T<*&}HF3zgY*#B?+p3CQ|HR9`!uWpRi_F3C*$FpO>
zgwVzRPs}NtdFKDS`)8Lt`CqmDe__qcmfc@X6ZR)3cP!5}nH?eY`O}w*bw9peS)Y91
zfAE}tACFGI^5{#cqtK4&HAPqc8~QGfUi1I{*3K#OHp_b+oww!I<Y2*eFaB4TcSWSl
z-*fWe#g+A|PyE?7r{~9+IqOPH($4%p-(-?$FJ=+C>dE%5_j{UEJU2FZO8HIyw`ywJ
z+G?-q-uw+K|3xnS_wD@B7w5M`ZT(;5A~`8QCfikM_J-@Z$N!Z!FK9UU|LfOp*PeV^
zvh)7a-F^T6|7V~*Q2fclD#8%QpaZfB6ekSqOB&*unp;}i>_hnYJiXhRr7hIeEiCn!
z`r>@mySnrlW=I*h$+`rGy39}$(2cb<k$0RSAt)3OAS5U;BSOtVODn)psn48QkLLsr
zCo@ZHj9IjTp_4XuB&S(evkkkQT)2oxkiWm8AG>Ii7>6nMJ7a$xFGgNA)>rP<%Erbr
tIx;dr8Wu(8yZN|PJ$6LzU^v;L7|4-X8KA-}q#~IT<IuQr@d5`1YXF6A-U$Ez
diff --git a/app/design/adminhtml/magento_basic/images/fam_user_comment.gif b/app/design/adminhtml/magento_basic/images/fam_user_comment.gif
deleted file mode 100644
index eb244381421b04bac7d1963f6c6353a37437c557..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 606
zcmZ?wbhEHb6krfwc*ekxXv(|x$en54961Y*o5t;$yz!z*?2b?8SDsu_^Z59x)f39H
zifjF5{lD<!?}u;yV!C$SZPIxE`A6!Z|BK6G@4Wh(RJ<;`?ZArb|DM15y1Lx+%bO<=
zZQB-fH;44RO5FCpVb;aNE2s5%vCUX@DS!H*p6Ls-SG}Bh=KskBWt-M*Y}xtm&XOG8
z!b5BK-V0m(zcXCDaMkexJy8`??xyta*gmUcM!5WrH~(vAUFlwP?&*hrm)5lAblkeV
zApOtJumAu5|8afGz6+0+tUXk{;CSTHe>qbR+*nfla9yQy($?LRva%{VicbCS4UsHu
z-hA!(-~Rb0@4flAs=q0!XY1S@S97hnww`)mnz-luhQ7ER|Nr0G^!fX*<X!(u=Nx(3
zt-ZcJ`pLSI;weXCHvG3q-5uYvd&|lDXV*;&n)~nl_wTLCPnT~xwsga(+C?XT&S0Pn
zDE?$&6=BF?&;c0(iW3I*-3?hyO%bg8(jA>?63tEKjJ6Xe*(NFXX7Std@mW~-&9`;z
z6?C?pJKtxet@-qs^ZZuw^4exL8=H7cm}tRkF=bko0+XT_cSqnv!N91VEJ;ZNy&wiI
zWr;w3#$I<$c1!h8mB7T{=~)^scHwp$M)uE|#Qd#Yv}D9SWSJS7rt34SmDCutr=4t7
z5n8iFVA3L{3Et7irhNF|$|1=nd(2_SmDEFBItrU>3=b_mp(-ck(y-8}wV_c>sv?Gq
Hg~1vC$p{r(
diff --git a/app/design/adminhtml/magento_basic/images/fam_user_edit.gif b/app/design/adminhtml/magento_basic/images/fam_user_edit.gif
deleted file mode 100644
index 338eed2173c6221d82f65ab99e2cedbf34f5103b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 614
zcmV-s0-60sNk%w1VGsZi0OkMyT0<D*$yFRkyk^Y*s)<9Sm5B4?y2y7ebdsm>#h0td
z{Hm3PsC!LaWR{+^+KNgKW48bG-&=;ezxL|f*p)}Pva@q)f7GID>eISJREn9*|A#&d
z<-3l)dK&N2tY3e})Z+BtwTbP}c$-)fdY970m`U!<r_8BvguC_q_QZi?Ez`JmtASf}
zgP`ZWcYvp`iDE1B^7PoHSf_0?(YKH_V83-i62FQryvgC}%&W<TLC$+9?%&PGoN;p0
z|M}yx>aun1%5A=iOr+%hq+%m|qqG0=;I^EM_{^O5-($>{S!q8OlT#6gN)Nh>LX@7f
z_tdZ3v4!HIQE0#ZV`GRyRGja;gXhb4(w0%rf;9Z##P{ggtZ*;)@8yC?8urhnA56rz
zh)KAYe3wfPN>!22oksuj<?+;et$Rx7&$Mzx8EZu%l29D>-E8pEv}HaV`N@%3W}l?F
z-`3>z<hP2^sejeBdiC}8*P~<Vvv{?fl>f|`z?4L7$Nt!wRR90~A^8La6aaq!EC2ui
z01yBW000NWfPaF6goTAiY!44!3x<P7Od}&qO*RFNe`6zxiZ*YU8)9@lOKNLNm@``m
z9CaZ)Tm~{xWp0BkCOKbUIVOBAZe|`zgDo>iP*7htXFnWJS{H&20w4_6PG>1?L3kHk
ze{x`RLp}o%A}J9OXHpY?I2j5WeN!)2>g*I1f;)Ln5Fiv;ks?WwGZcUv=w~Gk3Iuj&
z1c)F4O9Lwl|6tfbr3L{bemay0Q^i7-G=%PuPyq*y4kBbe#J~gqhL98B3<UxJJEnUt
Ag#Z8m
diff --git a/app/design/adminhtml/magento_basic/images/filter_row_bg.gif b/app/design/adminhtml/magento_basic/images/filter_row_bg.gif
deleted file mode 100644
index d284f0f0a776a56a6e78b3cda0333f74e31e394b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 111
zcmZ?wbhEHbWM)WVSj50^=hd6bkDlCm@oMt)>E~|UzWL(S#RrcV7#I|PvH(d21|1Lq
zQp><>V&Rp-pvI!yvU8cp9P?{3KPsn3Op5K8^>W3&yqZIs?_Ar#>^UWM^MR=o%Cy-!
OkKYgIjENIsum%7^xGx?6
diff --git a/app/design/adminhtml/magento_basic/images/footer_bg.gif b/app/design/adminhtml/magento_basic/images/footer_bg.gif
deleted file mode 100644
index d5b9d37c2d0d513ab5e1c8a518d479d408991e82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 332
zcmZ?wbhEHbWMYV7xXQrr^5x4HFJ659{Q2wGug{-9fBW|B)2B~={`~pn%a;ca9(?-r
z>BEN)Z{EE5_U+rNSFhf`e}CuBot~ba%a<?j+O_NB$B*ycz5D(9_v_cMfBg9I<jIpq
zj~@N`^XJ*KXOAC0{`>duuV25ufB*jP-@k_sAO8RUpMeHI@h1z|R2>ir@)HAF=7EU?
z8a$HyZv90&Gp%$3PN#d>M)1$jVLS5HY+r9<MT3SiOGabT+66l_yMH`#tPgoNwQ1jh
z7sh%G;(X0~3~daIos29!EHeEQ*e0<_PMsz@W2V&XIZE^9&*NOgDInmoe1)>0ps=uz
IkRyXN0R32x0{{R3
diff --git a/app/design/adminhtml/magento_basic/images/gift-message-collapse.gif b/app/design/adminhtml/magento_basic/images/gift-message-collapse.gif
deleted file mode 100644
index 8270754504773d094fe4dd89003b375821f70ae5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 258
zcmZ?wbhEHbWM^PwxXQrr{qvV^U%r0*{N>B1&tE=${rdI$moMLdVxPZ$0SbKuioSdC
z>Ds|BH;;W;+xU6kysy^|{fuDv5y9|1oZ)*U)6aPJADPnMD)hdd-}UY4p)Zeb{s4-H
zGyV)``VqnOb7Iu@B~@Rq9R7Oc=$FU0zrK3*`TaYfxt~9OW}p(#0ht5x3j>?F!_fsS
qMl)F2o0FRqMHm)$J#X@uV<+ABL@*;jWny3I!p0T}NkL5x25SJjRc*Hb
diff --git a/app/design/adminhtml/magento_basic/images/gift-message-expand.gif b/app/design/adminhtml/magento_basic/images/gift-message-expand.gif
deleted file mode 100644
index 888fde5f5ee7f54db215d8ff0e86baf5532cef1b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 152
zcmV;J0B8S4Nk%w1VFv&O0K@<Q_Vo4j^Yruc_4M`k^7Hla_4f4i^7HfY_4M%d^z!uB
z!}jgw`B(t>SOEB00QXk__gDb;SpfN20ryz~`CA0~X&UmUee}Jb`d$n8dpY)qP4|~%
z_Q0g{<J<P>;{X5vEC2ui00#gC000FYAQwT*gLOz2HIsD!3guKwAq<;z5djc*nnc17
G0suQd22MQy
diff --git a/app/design/adminhtml/magento_basic/images/gift-message-grid-column-bg.gif b/app/design/adminhtml/magento_basic/images/gift-message-grid-column-bg.gif
deleted file mode 100644
index 7edcc8bb1a3937c6303cb4522bb749071b62803a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 42
vcmZ?wbhEHbWMp7rn8?8J{o9u}PwzgseEQqF*E$S901{_lVh&+rWv~VSS&|Lw
diff --git a/app/design/adminhtml/magento_basic/images/grid-cal.gif b/app/design/adminhtml/magento_basic/images/grid-cal.gif
deleted file mode 100644
index d0235c7e023cab8100e0916375dabeca2f4b478c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 391
zcmV;20eJpLNk%w1VGaNe0M$PL|GIOc!SAri>6p`zceHZ<h()%|>i?-%<m~nC^7)3Y
z;oau)jk4r(v2K#K=X<2utjFp9o?ULPYQECzUyjPm+3Tsr>0OJ)|CCZyhQ|M)VXn#P
zfvVo|^!nT6@&B4xZ<^Hb^ZD!X_i2~WT8hcZ*XsX%Je$4i|D<K|_WE_9*JP8<yU^?Z
zqhz|z>hksam%8cym{)S1)<So?v&-th)9aqU?AYS)eyH95uwnnRXnM7EQiQ|w_xu0<
z{{R30A^8LW002J#EC2ui01f~S000K0z+b>-JHZ?dhC;!4JOaI_bQ)FJdZ?Br^1)yV
z1yc`n!UE0!UG8uYk6>8smK*c-R*s&<x8Fm20zM)X3@H{6h#LY85)uXrB!wG*J~TcJ
z0}?(S844XVG&?&41_TWa8zmVWAqGA>13Nx0DIpaL6gVL)ETTIT1|1b19TyJ?6FxP{
lJ`lqp2^T5}A_xcz9ycWm9U(6lG9V)>6eJlu=;<>-06XQ!y7&M9
diff --git a/app/design/adminhtml/magento_basic/images/grid_sort_asc.gif b/app/design/adminhtml/magento_basic/images/grid_sort_asc.gif
deleted file mode 100644
index 1136ddcfd69a98e88efe098c82e437b8428e6bf7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 105
zcmZ?wbhEHbWM$xH*v!H3zl87KlElB;8vlHG`@fj`@BT@DUflej!|><(X9jFQ@h1x-
p0|N(x4oDJY1_O(jKySk;3s%XZ21|tq*{cysDKlrin(4-14FHjSASM6+
diff --git a/app/design/adminhtml/magento_basic/images/grid_sort_desc.gif b/app/design/adminhtml/magento_basic/images/grid_sort_desc.gif
deleted file mode 100644
index d6349fefe91c4c245e930d8d938375975cefcda9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 106
zcmZ?wbhEHbWM$xH*v!H3zl87KlElB;8vlHG`@fj`@BT@DUflej!|><(X9jFQ@h1x-
q0|N(x4oDJY1_O(@z(Qr!wb!rhG@kEXA#uP_!lRHQ)IdRy!5RR=BOl-Z
diff --git a/app/design/adminhtml/magento_basic/images/grid_th_bg.gif b/app/design/adminhtml/magento_basic/images/grid_th_bg.gif
deleted file mode 100644
index 8ccc66e7ba9e92789d5d6fcc3fcb3cc32ba11a60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 49
zcmZ?wbhEHbWMp7wn8?6z`RbKZr%tV1yOx20LGdRGkYr%c0TCd11}3JE00wISV519A
diff --git a/app/design/adminhtml/magento_basic/images/grid_th_onclick_bg.gif b/app/design/adminhtml/magento_basic/images/grid_th_onclick_bg.gif
deleted file mode 100644
index 3bf5e263bdbfc5fbd858543ef93858101ec0d4f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1242
zcmV<01SR`NNk%w1VL%2#0HOc@l9H0t)6>Sr$IZ>n`S<tj?Cjp(-v9srA^8LV00000
zEC2ui06+#p000C32)f+<Fv>}*y*TU5yZ>M)j$~<`XsWJk>%MR-&vb3yc&_h!@BhGt
zATSsfiN+*yd2A}3%%?O;g<7ZADt4>wX1`ppH%uOz#prVStZuX4>$qDEpWEwry8gb;
z^Z$N<eS?66f`y2OiiV7djf;+vkdu#<l9rU0nwgxKo|~VYY5)WU2BoK_sH>{2sjsZC
zuCcVUwz9ajxwpE#yuZ7_zQVx6#>L3Q%E!ye%+Joz&C}4-($(14+Sc6J-P_*b;N#!r
z;^yS%>gnw0?(6UE@bmKZ@%Qxj_WAt#{`vs>1^mYh0KtO;6AE02kfFkc5Fbi(NHJo?
zi54?r+<3A7qehP$KZ*=V5~RtICrhGSsj?+M04`akoGG(r%$qcE+RVvwr%#<gdj|a}
zv?$S|Lz5a+igc+{ZKRq?WlHsF)u~pqV%>VRt5&aEzlse@7OdH^XUn2JXE3eXwQA$O
zl?!*S-MV<`>b<)+FW<j@1NR+F4W?kggbyoD%owrb#g7|9o-Da?<ja&XTP_t<v**m9
zH;eu}IyC9irc;+*jheOU*6!NAp6$9eY}&VN<KC^ickbW3f%^_l!0_<n!jlt6zFax;
z=gy-ypAMZm>CV=(SKlt3yY}wjzl--yK79G_vd^nG&whOS_3q=tpZ~tTeEaE)<KKV3
zKYjoI{QW0jfCK_);DB&phv0$*GI(Hv5I!iOgA_(s;eF{@sNsYgUg%+mAaW?;ha-mA
zlzt_qNaBhnwy2_uEWRjXj5MaAAdEQ9m}8AP_Q>OpI|k|FUl|T*B#=i6iR6+>Hkss;
zOwNO1lvFxdC6rcXiRG48c8TAOTx#iMm}HJ=rkH4!nI>UHo~h=WZpOLhoN&@9XPqzE
zsVAOy_PM8@eEumYoL~ZK=%9xNs%WB&BI;;!Z9dxQqLNlh>7|oqYAIb)Zt5wfpK1!~
zsG^n{>O+N|N~)@+uIg&5u(B#^q_4_a>#eckYHO~%(%Gr5!1fyKuEY*&tgs%YdTg=(
z$TI8fvd}gg?P;`1YwfewPOELU++yp}uib9zt+?cdYwoz`ilc10?4s*#x$m|MFTB;p
zYwx`B=6kQc_&y5mz5w?tFuw!`TriaD8m#cZ3m@!o!w_TmFvAp2Y;nXFS1jGX8h4!W
z#~6p~vB-=iJo3pPqfGM3Dz{u#y)Lty^2{>V9P`cla7;7KHt+0n&p`9cnb1EI9dyx1
zAH6cnNgM5S(@-n@bg?>19re^$U#+#(f112?)?9-v_Sa+w$#mFdkB#=)YPZc})o!z$
z_S|yU9k+a5+fDb~d-tvP-<h4wH{gB`Zg}B{p9Oc~hZF92<B&6cRNj$4F1h8Om{+d(
zNP=I!dFGyn4*KZEEKa)UpQn!c>Y!83y6UIL4*TqhcP{(uxZkcj?NXc0`|r5}zkBc&
zyFUE!!Y5BW^7`7YJoC^$Fa7f5`cD1z(PKY-_J|t4{rB33&pr5aIxjx?=%26t_#|4-
z{`={}zkd8adO!dD^5;)K{^;@VzyAN*9{}6qJ^>mqfCwDm0X1Vk1txHT5PYBnsgeKy
EJJm0~K>z>%
diff --git a/app/design/adminhtml/magento_basic/images/grouped_to_order_icon.png b/app/design/adminhtml/magento_basic/images/grouped_to_order_icon.png
deleted file mode 100644
index d7e92ab9935186870f484411e687d8802baae010..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 902
zcmV;119|+3P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#7)eAyRCwBS
zQ(0&eK^UGrlI*5QW74EmYcSTPZPcU}LMyf^9tcYD02^o#s-QksQR<7JDEi_{A4I%C
zQBizQFjlc8jc3&=rZhb*J&d-MtlJoqZ02w_P|+T<47>b0-#_0s-#3iOWCC-Iit0+k
zoA%eg@?B2WVzG!FFW<)ITE_{3Fspdt*6HRo^;Nes;-as3Yx%ad2RF4YUa&Cy=~d^a
zc^g!1S*Q0Nu5ZjX+6Hr0*}b}K(PPfDZZzlHwi6ALDfLgjFZ2}36*bj6*(m7@hr>k0
zG1C%`G&dc~TVHTC9!tuMjy2G~93&VZi~uGCC<!G>G^{`X;d?K>-F)xbo#!f!ou<;~
z@4oRnmXLvtF;O6=U<e=uLkdpOH_`xOia<@IZz34|E_eJVq3Pzy<{bADuVBmYKmu4q
z5RgYAgJb@IOH-rL2R=)55-p=wnIIl;qGLfx;mV?%uE56*zO16$U~*dbGdv@vRLb<3
z8kPpTuDsshd+Zxkcd7C2yq0%h^()Fkk44tXEj8@s6~*CpyDxCkkBDN72|nZUtc{Gw
zS|BFiTVUwY{mXYAOw;V`>KS+BE{$oI8Mi73fmm>|?PtrEhL?dClWbnma@JOwTh8b?
zvkIm<0T9?(-g0(>D?z~tlmf`YFXR^)?CE-et3Y3RU|lQLGMVX9r<1dY&PBxB(i;qo
ztBZCW-@8XwW<8@I$Up=E5?LG4GAp$s$*XA_>l*hpFj_7*YqR4hZDd3kgH#g!j*rUi
zSjQTPO;bs0^l%A)W4{J)k9-|Ol;ET5_aFYv!H$Eq#fxiKy+bU~KuQ&2H3PJfYA2P2
zRC#oFEGZ-S?odgKuSNPV2ST>7QlTbA`zAlf<@k>z)tbObpynY7AyCF*11O@5Bn6Pe
zoAsXAcR@;ZisK|8zx#TMvuBi`OnwFImfNWA1QZw>`$0Mn{o(!MaO&A`us<*{F_Dfk
zKi#P-7{qj@<5^Q&=f@B_aC`U=w(9KIoq3LvQo(0Wo~pF{|GLA>cb#1>7at0R;LPut
c<BtFX08h+}mjE5m0ssI207*qoM6N<$f^PhunE(I)
diff --git a/app/design/adminhtml/magento_basic/images/header_bg.gif b/app/design/adminhtml/magento_basic/images/header_bg.gif
deleted file mode 100644
index 591ae51eee22207354caee6cccc661cab3982a09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 268
zcmZ?wbhEHbWMnX9xXQqw?-pq07wMl<7MNFI;2xys7T_G0VHF%_85HZ0lINFQ>YG(!
z9uVaioo4JEW*r*uol)cxpXr*I?G&4C6P92R810^%YZsYp<P~Zgo@C+^?wOiz=o#Xb
zUTEME?2}on=Nb@@Tke*W6PRCN>Kow@mExaUrt9L*Kqa8~lLc&&4u}N#iGfY?z~llC
sl_oBRruOE-3=c*(*20Paqv=7(NgW<8(~c}-{;4Cv6r5qe#l&C@0ETEf8vp<R
diff --git a/app/design/adminhtml/magento_basic/images/header_top_bg.gif b/app/design/adminhtml/magento_basic/images/header_top_bg.gif
deleted file mode 100644
index 47e9a5762994c991dbac829d337d7399a16dc8ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 286
zcmZ?wbhEHbWMpt;xXQr5rKl>RXJQf*EvTh$8=0iy=%wKnpz7o;XX(VJrp>FOsp}PD
z6`r8y9V%{QVHcIGWaqAE>!$A$W)qpHVB;!fW^3RZE^TfvW?*jUAIYPv?i80MW8vTs
zlVTnc%c-C&q-|*E7r~{d!mXsH?HQ!(;Hl{zU>q2w?&@zD7H<(6Cuw41ADzsvp(}6g
zEMaVA9g%1j9BUL1X&MwGpsA<h6)db{q~_vlACn@gZ>r@HsOIcr8<oVXs$~@x?--k^
z_>+YJ1av?I$WIJx)(84I3@&L@b&BOOY+@~vIG!E4vp_)4izP@)rp$cG!6nL9#dtea
dr%as7vU!I4)K7*9!c6ZE9xAP~mv&^Z1^|<ENHqWe
diff --git a/app/design/adminhtml/magento_basic/images/horiz_tabs_ul_bg.gif b/app/design/adminhtml/magento_basic/images/horiz_tabs_ul_bg.gif
deleted file mode 100644
index 672fbfb34d24c16daef66c64920e91f06cc4c4e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 50
zcmZ?wbhEHbWMp7vn8?8J<HwKBUp^l@bMEu!&x$`;7(hS=M1bTOn3!G6f*7m;;@S_F
diff --git a/app/design/adminhtml/magento_basic/images/i_notice.gif b/app/design/adminhtml/magento_basic/images/i_notice.gif
deleted file mode 100644
index 17733eff3fa73171ffbce8254fa0b368d940b74d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 802
zcmcJM|1Z>W9LHbp<2c`rJ9KE|IG-Fg*CdBp<VNMPaxvN}cSs^%65BPCyVFtJY2GV0
zj%dSL{6PBTSesKK>(*uKkgc;TvRP8X(&pli==sC*r|09B$1~|vB0pNp0e@Hmuv+i$
zSP=ktd(*!zqKF94>#rLOH%IkoVxpw96h52LI|HIpZRm86NPteKi9}#BNhOjfv$-lc
z8AviOKOag<<0>l?x3=ovOdua0;Br|@OLBtn)D0tofL1N4tc3RVOo4zH(xIfJV38<X
z-G~|+&j|!jRRxPnXnR}r(X`9D&dj2UiiF5W=<P!zBiAA${dBskn_H-_PeP@FuP?N<
zBPJ7mt)t~-g~d|c+bfnz;W>%;d?+j19k_XV!q`~R#wKcMMXjwF#l`S_6-7lIsIO09
zFd!=nl(k4I70k||?(R#gtIG8BL$!5?!Eh7`L-~Av8V%k~p@oGi7RzPV%zq90kL{j)
z2-~Z@Pr%+<4RS@z9XKAJ7N=}bso~^h3MF%2W3$SShp`J&)1mOjXJfHfXNSF(plKbR
zG`nL4LasQdUu~zoNQTGY=#hpa*pVc;I5B;^hJ)!&Q;5&TAx61}8$N0x6WSgbML5DT
z6^h-BPcdzU+^@A84<00i)E#PSAy+e)JL8h#T$r}NS&;Wp>B_F@HSshp*C{%Buq%h@
z?ArNIXfaX(U#VsW9429Ep5tSB%*zoQY<p}pJYhh9nwr3{1PF(3a8ZxcB;eVy)%ur7
zLBz2Pd%3uw`~)#qk|S<XvsNTL;Q-yjVKxM(oQ{8Q-xK)zHf2p?E0eQ5amC@g^VzAg
zA#_C>!s*l}kJdfVwbYau!%(Q3^{<mxGk7R&o%vL)VM}^&5iLd*)}Qw}kSH$^p9faR
z-R#f;y*O2M5Z`l~HH^IYVIJ)lHhpO6{P|@P&)daa(5-)?q&p3C<W_I2%swkHuL_hb
IkO9R0132Fp3;+NC
diff --git a/app/design/adminhtml/magento_basic/images/i_question-mark.png b/app/design/adminhtml/magento_basic/images/i_question-mark.png
deleted file mode 100644
index 889bf696e2fdac4c51300a90ef6a5dec6b09d7cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1654
zcmbVNX;2eq7>;Nefie-O2UhDEN6{9tN6uY{n6QZiIYTU=YKJ9Rk`<B-n}r0bGXj=!
zm6^^!1w|-gtqP)c>eQo31x2B#SXvLJDhdUqOlhT7t&ViVVf(}BkM7LwcRkPhKJW3(
z7RSe~_4Qup&ExTWwUM}v8|S#+*`C~Y$=Eo-4S}rMz$VgZtdn3!p3+38l7QAqm`NQ;
zm~t{Z$S@vnW*Vh8u!fju%t%{>gc~DtS?wH~#|sO0*$HDh$pWdQnX)Maqo-N~0A*4L
zk|Z%uj6H(1P?5O|nV1`^H|C}rQIjBiH4x^)I0IIaB><N-!{)$T3c-Y3jGMc+K>;uU
zVbc|YNl}KFcp!piNI)WlLX40U2BcykEQU}q8Vn#141q8LLb4DT!Xz>bf`O?=z<Fa#
zX_yYzO!?wg3W0@X?HC9;olc=sB%~QL2%{(pLI{W;Asiyakz->CSBTBAY}x`&I*bfu
zXDQkSxGfT?bQY@+a7rgbu-ao{UK+MJrV_=a40I885Eeq9)#{FG0_|XR<UcZAiFW97
z>?Eio9ds6B<m!>OY?{pF?!O(mft(sFj-j}s5E(da%(9X;R*NeH+=<XcnJ@%ZB1)AQ
zk*dUy8irw|TqRZ^(g=wP70aY@&9seIaiww&p_YopkVXQ-YFH_g$?yodCPFF4VML5i
zbG0@HOW2I$v|ozzJH-|KCl`xgNP?vqJxym!cR;*_W@(3owgVA~5+MvEQ8p9pbhyhi
z87)pSR5oeSFtinz$S+2{!auA+QCulSG?K}<RU)O7(=U~aL`qcY);`HK{hyqHoEXsE
z9RF&T=`F4U-P4z?&n;eF9@56$7>2tVnO(bWJf6osEw0qNdiN%7h<qbq!Hcw-o9j1>
zMZJIBXHTQBqOU|ndKS+*#9y8_w;uSTyMW)jF3#Uik-_&={7@PX5cB7JIBQAQ#rbXD
zrIM=#eY3M~G1qS`cA5vfqRkcW>h3%z`fA3vjLU|eU3n}z+1xKbySQ>o=!v^g1IfG4
z4qXGa5QoDKJt#Z;sOi`k@F{Gwf6*9JYdNu%KHj=BmapG`@Z>II@;qeIWubL&=acQ9
z96fvH_R!YmHkpNL3C{o{+q3a=t%XI8!Ug)63kUQ8BTs|w9wEKzTAm&jZyH7VPM;bW
zFQL9qtgf3ytUK3T#wU_nKQ2`Lv^f~plmsrb%}Bou4O^>QPdXb5J4ea`y6@fX+*9@-
z#n5`ch9BzZCA%_zX<Mpl-}$n^;f$&Uiv#X#y|JgNw<N5gDI|8zjq+{gtm8@fMeU}Q
zJEQWD_My{N?>#K2uk!q0UcSD!tCQZFERVhf`eb@k!aqXYM~C@&-R&KCd%x3>66k9#
z>GA7LIC3U1FG}3xJ;VOhfdmQBQhc>)03KO$KPbQpv(_99PpT~7RrcqKN~@w%<c0CN
z-JO074_7NKp(`(Le(Pb6zn}N$nx5HZk4JOh6F$1R9-UEM?7*N&@b;>r;-zsL^G|mT
zk3CWAckC@N|LM)HZ)+&e4a+z@vwr(_{{^@AA0v&KA=?^vEc!XqV{_T%`Zyo`oA#Rt
zyjtU$qWtUq;n0)chia?EuU*O_`vMH#`~~?8cb1Mn-PTl&)t#wRGJ=n;6(SXbpQpaq
z!T(h~V>udh^%}b{nbNwt!@U}xpU)WxuKBGT-8A#wx5wHKR;*YHckR=SNUHmO`Em*P
zpza;R*JItmi^_bQ&rV%h(Y#TIsvE%8VgI<E(ts;i?IJY#LUD`7>pX)rH2JfR^hfSL
NfmR)hH>*<e{{{pKcaH!7
diff --git a/app/design/adminhtml/magento_basic/images/ico_success.gif b/app/design/adminhtml/magento_basic/images/ico_success.gif
deleted file mode 100644
index f1bce8e97421cf082c0db06da3c9567fdf34c29f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 338
zcmZ?wbhEHb6krfwxXQp_Rb%w&)2HUMWl2lJ7VMj|;nLcG*&aDtk}kYB_xt;guCsNY
zzJD&=n?3W)Oxrfo)V0wO^Zk3ywS52nz2!vp{`<R@9b0JKXz}Iq`|tn1*PkfMS{v7M
zttD<zWb2u_|Ns9lJH6=2^NaS)R<n;zwXQYWe0}5h@Bd?$1{Z8e{P6XC)q$++4GD=$
zBb-_cCtYg0_VTJrzYS0q11Ui9Ckv|xg8_pMNE66U3~c!hodq5`QvD~E6s;7gogsAb
zVL+r;^khcGgT5lJTCGVBB4#*F$#YsFxZa6zVfREO&YMY-mGvAA)CAR7mH1_u)Wp(a
zxcPZ>nY6Tog*(LE)YN5VB_#!vYg`%G_?hN1O!HvWml0sli1TFRn;+xm$Y2cs$}@p=
diff --git a/app/design/adminhtml/magento_basic/images/icon-tooltip.png b/app/design/adminhtml/magento_basic/images/icon-tooltip.png
deleted file mode 100644
index c9b1ce706b28e091341268307c7102206790f9a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1441
zcmeAS@N?(olHy`uVBq!ia0vp^{6H+n!3HEh$GDULDajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_cg49p6dArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8
zNvY|XdA3ULckfqH$V{<S3ODsN@GWpo&B*kqDoPEm@(W3>%1*XSQL?vFu&J;D8jzb>
zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XP}#GU}m6TW~gUq
zY+`P1uA^XNU}&IkV5Dzoq-$tyWo%?+V4wg6N<iC+Qqrt~T-=~`0eQAc86_nJR{Hwo
z<>h+i#(Mch>H3D2mX;thjEr=FDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaoz
zEwNPsx)kDt+yc0<dBxCR0tT3VMPh-zp`HQAOE87LzW9~q=E7AMmjtCE+>6!V;*iRM
zRQ;gT;{4L0WMIUlDTAykuyQU+O)SYT3dzsUfrVl~Mt(_taYlZDf^)E`LU?9gN`84U
zShcUOm1kaYNn&1ds;7&s5>UThW@d_&vw@MNg|mf=tC_Qrp`ojxldF@nlZ%O^fupmV
zk-4)OOs`9Ra%paAUI|QZ3PP_dPQ9RnkXrz>*(J3ovn(~mttdZN0qkL`Ox$j9!f75<
zZwhX=IOEi-4|I$^C|Z%C872fwJ0K=J(E>T}WS^P`OzTC!MBTaSm@NYXlenjgV@SoV
zBcc1d9|Z`^JJOM$xM&@BUan#kXVcZfwXLm7TO&B9ZEC%(5piQp!p7FAtsSlP4IOVq
zn@%O=DtE;ym~s7c>NWqYSGail^px#88&6j28{eN@Y5d;Xg5g2c-h2M5ul_n!7{kKz
zq-f_J`Tpb6BXqubA297dP^KVI@ukAXEh0j1`oxndmyW#@?&oJzw%c_#Z$j$NRlD!<
ziFF@6YaR4Sx&F|`6I+xeLnL|F3}pCj-bvf+Xd=~GV6kS|+Fc*_Jk#+BUoFbq=A?My
zY0-nPRX3xyW*<<<IH<zc&b;ZSPJ*n%B$aJ9V~^A~XD$ihZ)YyCk~LGC>{+|v+ZmP1
zFGa4sHdPVgoOX6^thfvhTja!VzisFEE%(1&#ybD}bLqnwCQTnJcs^Fh)Y#3p`(bAk
zdi(wN=DT_SO;Rs>iCFSE^R}aFvDMs!jS+eGCd>a^J@M(yoNqmkrO$unce^g!IO&mo
z@sAA)Zi$K>h*(h-9mG`Z_3QfTERmR-4rvolJ^jS*C=gdDWyn}}{Mud-u2%agE(z9C
zy=E>;0S4Lvl~>a>Jpb*Qa^&vKIUJMxmY)rt)KIcKd#lvz(#<zb{7+_Wty=mdZSzk#
zRqd%<503MBExmMIbLZVW#rfy!`zL*^ik&`b&$LNVZ@>SZa55#qZvOvNW7m^O8#8=7
zb=q#cE%OZw`uKanlG9JC#9TkFy_jJ$<Huc(C;#g;e?~VjGH_b1yqA(YZ8@mW^mO%e
JS?83{1OP~PBFq2)
diff --git a/app/design/adminhtml/magento_basic/images/icon_btn_add.gif b/app/design/adminhtml/magento_basic/images/icon_btn_add.gif
deleted file mode 100644
index 0c7645a983d3a86c2c625aa65fc58573c07180dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 344
zcmZ?wbhEHb<YnMxxT?zVIhEn}xt0I_{`#}X^55@o|Ni{^vmxT&pYLA^IsX0m@n??S
zmweX0H`o5XzUt3h{cnBN|DT=wv(W6%BC9_e!u~9={e5Ngzpw9ppIr23rux5c@4i+`
z{XVtm&s@Dfv($fXEdTrX{GScse-@hme}4MUJj4J0|1(e<DE?$&WMEKb&;c0?@)HAF
z>48ZC#$1x_5(|SEg(l8Zn&5OYQ^aGYe_KdKf!AElhdUW_=CK5%vs6yf>h6j*>Eh6t
z-r)Y2Ge(DrSx7~mfkTR4ii1I3MTEJ$vbwguQQ6PGpeR6DmW@3n&7Yl3R+W#3Ga^cb
WlZP+Fw^$+GOV!0q(ZkD;!5RRDUv~=t
diff --git a/app/design/adminhtml/magento_basic/images/icon_btn_back.gif b/app/design/adminhtml/magento_basic/images/icon_btn_back.gif
deleted file mode 100644
index a59ed3984560b0b31b9cca8191f363cbfc808b7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 216
zcmZ?wbhEHb<YnMxI3mLE_3PK;$B*yWvE$RHPt&GNn>TOX&!0aZJb3W?_wPxQCf&Vr
z=i$SL*RNeWefso?6DN)yJ^JCphs&2QfBEv||Ns9CL;%H~EQ|~cA`ChpwIDkgSVI+5
zwE{nzOjKIev)O@Tiv`bbkKlRU{%b8P=K4KS&~0IB%nNLK!PnZtm*n(>sdEiqVUZsL
oW0Q${uS{`6qtWp{tgXU}x(b^=XDzy>ZFYFQhnj|#k|KjO0C1{UDF6Tf
diff --git a/app/design/adminhtml/magento_basic/images/icon_btn_delete.gif b/app/design/adminhtml/magento_basic/images/icon_btn_delete.gif
deleted file mode 100644
index 458068dfaa73d48ebb73040317b1e74e399edafd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 220
zcmZ?wbhEHb<YnMxI3mjM@#DuMM~>XOb!+L;rJp{1nmc#ynKNf@-@bk7)Tujn?kroj
zY{iNdKY#w5KY#xB@83VXfA{*;%WGFIO`0_6|NsAMS1w^71QdU=FfuTRGU$L5g6w2q
zjZ9DtO7ZN}kaXk`nW*{I$K>yUCpi|An|;i$swhNSh)p{1#I@0ffw$A?5`&L|3fo!3
v2|N|TY$q$Hh;-TLs2X_&a9%vT$wWAUlS#oZZ1X|4Y#qINLp60JMFwjCj-yqf
diff --git a/app/design/adminhtml/magento_basic/images/icon_btn_save.gif b/app/design/adminhtml/magento_basic/images/icon_btn_save.gif
deleted file mode 100644
index 87a9815b4975e0ddea63c6e57705e5196528fec8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 203
zcmV;+05tzcNk%w1VGIBa0K^{v{_^Sgc@+Qr`TzO!{n@?#^z8l7ululd{LZQQhAR8G
zgZ<pX{_o@e_wo6SIQf-E`?Y=hvwHfMN%@aE`kz+&uX6wW{P~J9{IFO3#)kj*?f&1q
z{^G*>r9l7x|NEIIA^8LW0018VEC2ui01N;O000F@;P-VIr)gZ)i66FkaJ*sT8{Zpw
z!-D~ryMjXjGu<qdzyWshG$IQ`pdw&$JcNYg0=cDNfXSm8Q`rCv+{(4{%vdB7N+k*b
F06TF=Z!!P?
diff --git a/app/design/adminhtml/magento_basic/images/icon_edit_address.gif b/app/design/adminhtml/magento_basic/images/icon_edit_address.gif
deleted file mode 100644
index 78e7bbb1e50713fe0ef63ff626b7f8955707b86f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 540
zcmZ?wbhEHb<Y(Y#c*el6apT4xkK+IS_`G}f?x#<mK7aoF&zD1+Hf?(K>ebKp=b!J(
zc(^p_&$svQP8S~OReyWA;?I`@-yfuYzkBf4m$$Fa7e87SzqiBh|Ld!d9zD8#aPrwn
zo=<mmf4Z{%=+vmIhgMzRS^WR?l@I4jF3gI2e0lG=C4t}Xr+$ANzrRHH?djr2D^mY_
zJ2a)l=G~c+4HE;dY-xFWHuvN6i=TGazCN?^;`)N0A1}YXRQ~7d+Zp+mKTl2n`R+`z
zx8nEvDR(!d-(H;j<MZ23cancT&G`A@(t}L}?;oFDxpL+I|Nj|=6j1!h0(P$shy=w6
z1AAoy2eV5{Ynux*2ZMxbZ(pyYjgcIKOMkzKzKoDU%k*ALQvpRM>3P#R`Pl>=xNMjA
z8Hli{s_}|4ZE$s#*Rp2R(KK`2plmE@x8)4M@eT#8RciK%acwuPa(m~j6FD|1;r
cyXm{;U!V5k89U4CJ{ES?sqO6ytc?uT0NoJ6NB{r;
diff --git a/app/design/adminhtml/magento_basic/images/icon_export.gif b/app/design/adminhtml/magento_basic/images/icon_export.gif
deleted file mode 100644
index e9fcf7cc93e0b1d7a036fa58f452b4b8c56d2f8b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1022
zcmeH`=}(dY0Eb@_NorFgUD>P=wPj_^tA+7uv>KRES?jLlRax28WpnG=I7BE<icFWO
zs4OfirrF5x0qGF66g!srqQg9rmXLriFYlTC34QPP{n>tdwnwm=&q>G#0YU(84M0&O
zfx0Jp@<`l0{w9mWoFwjg`awlvj&G&$kNcF#$`#)663lBS2@ge}7aHS9l7MYD=DA68
zE{gjw0wZx)_VS{-`!=LZ@>uUe55Y>q6`x&A;=h0PUCPrWIzOuj%uS#!5_L|s6=v1P
z<Tl5Df1LrAg>mG8&?D|GeU7%TGP8+)Uc+}<t|603o9Vd5T;>@%<>*&zkkEHkE`zk(
zqt%fVIseqs(p!nnjyeV|<1VugL!2K)!h3PkmLeRPfyY{R$ivDz^XlFzPS<byF>up8
zT!q6!Hp4N@`6}hkN_3_@t1cRux_7od=DtZXH>wn<He>KKiF;vt&%x?7;`S4H%^aV-
zdCpdEGak9|{4i|21l{MJ(<HCD?tkUUe(N({p%#?AJSXYMp6R_<)g_u6RmI9fou6cB
z>YcvnT3vsYXGELRv~~PVCNfbz{D7NSy2RR+1T}K4FLs=Ku%5!_kSP`VtJOO$JJkS+
z+B2$6Qm6wY@mb9K(>2-Y=xtQLyX_qlL(f3RKq2n=>P2DbX@cvE*xpqz?_i`x;DPF(
zCN4$51UgF*2t`rA|NWzZ)jpaZ0Mr0cf4RR+0D%w?$B0PQHFQY>vYS~(T~IaKk4;~`
zdN)fQ2owr|bcIAzu}2ZX)UPX9xiPIYG(Wl_)sGfj8weJ(e4r=i@C-|s(!mP)Ra%mX
zZQ`%pM5ixDelv}1aRQLu_Borkbi2rs+A^q+8B>;tK;Kfim=+VMpSGz5tcA=21|efG
zK%$CX^gc?zCSS-1jtw1D7VyL+LE-7GA)KD>h!o+z2;N6_8EcDl!HBuYTvSYBAf5(g
nB%^r4nQ~67K44K0m@;J0GihVIu>9gfx<t#~@WuZA3jppPE`OE&
diff --git a/app/design/adminhtml/magento_basic/images/icon_export.png b/app/design/adminhtml/magento_basic/images/icon_export.png
deleted file mode 100644
index 34a736f70261338c9bca98c38b78193740fa83a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 694
zcmV;n0!jUeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!NJ&INR5;6}
zlgmq#VHAg-_j6{P!Vya;?|~6{DQHoaWt(n`a8uhBF6v(h7l9FoP@8C#t6BxoGKe6u
zBr*yt#1?^)kwcoAIpf^E@4cNCURwl#zvbbahu^s=5n($D*rs9tlh2NgCo9|AmD<V^
zqTJWCvzaa+`m0I-P&nB0*~S2r1g%Zo593NHkkw+8!iK+E=ErZPWi1L&mZ%hQW+6ZK
z>N@Zw27r|iugjyK_i?%mf=ZN1k*q&Uedp~2B7g_+fS`hk+Nr1A{hI)z0`VHB6Nndl
zX$Di6C%-U4JXr@~z-vS-U`e(1B@n-FV+JTmdRsylL39C=TOrljOR~Cct>JYCvg#mK
z1ulqf0!%<`#~!NMu5Ba=9<P63GcOUB<>u&fmP-Zhc6E?!yaAE01t20W#1|(JmqlC-
zu^GHsMqCzbhR}vI*0gbTWQ<2wA~0LlNQ8*Dc(aJuEaI~Cy?zX0(B7i0rEb>&+G>xJ
z3k&o-xX8WohAjXsqHu`)jo1ugGgz-V-_eT`kMj<XFq=(txbYNuU7~m9O|mc$s2G4~
zzif+3J54^3!lwd}IHA=z@qAyJ!g!1I2ICAXQH~=`r^%ZlAHKZ}R{>#kXL{&TC&D=t
zDS)urCatsVt!&16hZE0Sc81**wR}pC@@4w{a?#MB{`E|khgw{yHQH-JtJz=E5u9kb
zz}U<?h9_T4XiMkpphW6_zwyvOuz0ljOwGvT@JH=AIXftN^@RQt(9*9KoiD2?c^6+8
c6uTb(1Ir#-k!Gql2mk;807*qoM6N<$g8hs$mH+?%
diff --git a/app/design/adminhtml/magento_basic/images/icon_feed.gif b/app/design/adminhtml/magento_basic/images/icon_feed.gif
deleted file mode 100644
index 6ed34f093bbf7caf0a5d37a7e914a392cd7cf494..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 351
zcmZ?wbhEHb<YC}pxXQrrrOM&QrU^gyE&Q>v<x7R_*S4U~#b)1U=YMH%|JvaBrQGIg
zXXxi#-Ou@kpGz&j&B*!p{qy%_^*`2if18%^wKwMP^E+RAqQ1{7`CMf3bJv{D1xBAT
z)V|Hi{l2i`$A-SYPj3Esc;$1R{*P5{pR%;Rc1M1nQ}|<f!;kg7pUbVkwg&wB@%7*P
z7ysTp|6F46rQZGTqibJ)mR8z-ZSnik=>4VI=}WWEmpZrq|Nk@K0E$0Zz%n`@667Za
zwweRsI&PbHrkO_SDqiu4ago-U>9i$kyR`R)1xlGKnimvB%LW;*)K%MYfK5yEIGe$x
zP1=E;M^`P($mC|!HfL5dXJlhBHIQW#)7D|ok>};}(lVD5GUt~x=h0;~QV<YPF;^Ef
fXI13PDA8c!<x!UA(&x}KFf(D{)0Noa$Y2csXvLKX
diff --git a/app/design/adminhtml/magento_basic/images/icon_feed.png b/app/design/adminhtml/magento_basic/images/icon_feed.png
deleted file mode 100644
index c20804da936c01478d75e4b7a1031941ff420d66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 530
zcmV+t0`2{YP)<h;3K|Lk000e1NJLTq000aC000aK1^@s6R&`wG00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzq)9|URCwA%
zQcWmCQ5Ze<zBlj9$kdZC5+y&S6iv1kQ!Fg({H!P`vJhDzmMqLl7E+|Jva!I%X6#97
z)}m}?O3lzP-n=*O`o24iTVMCSI_Ep*JKqx@^IiQS5=~J#kOp9wfDnMBTMBwgC=~#o
z@A)8?Nk|3*aAa!_V1@wC1$+-EbCoriNg`VB2&XY+!n7PBAhNK}7gR0-@9_ry-4#@+
zsKH<rY9eau94YJ?vSHx+a2ci436%Q@D>048+#ZZrM-}|1DA}_hzp^8a;3bXX!6MxA
zEs~7Fp4x_JXsv+#5)d#!4`}GF;h7|AmX38-_iRI343Dh?Aqz??_(b3|Nabs10`BFm
z2HE3lJS0jNNr<`_%)X&&5R#)~1<8Kt6pvP*@>y8Jv+&cmI)qSsL=zM%=oDyZdvX)@
z=n{<10UG{Pcb09v@b0f6Te``=PZ6q$B_;*gXQ=N2%1;lv_{gSq1aGgEcXJoOF&9<`
zbG(#lbd-i3(Ely!tSC;tg%!!0yl$a_lnB>Weht(5UlxCp4Z(JNFR$FM#E$?20DW?^
UCQGuu<^TWy07*qoM6N<$f}6GBAOHXW
diff --git a/app/design/adminhtml/magento_basic/images/icon_note_list.gif b/app/design/adminhtml/magento_basic/images/icon_note_list.gif
deleted file mode 100644
index 5327e200559188c20ab46c2489f76c60088eb5a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 189
zcmZ?wbhEHb<YM4qI3mdK>eZ{ypFe;3^5y&Y@2_9K{`&Rn`}gnPy?giR)29y~KK%Ic
z<LA$x-@bkO_3PK~-@j+ip8e;~9|lr@;!hSv1_nU}9grrFoeZp23150rQtWt_IGrlq
z)X3=2^LvAj!y4r$8mvbWuYJ~)XkuBC;i8wn`dHG3n4eNB7bWjr8x_heohie~$Y2cs
Dz*kL;
diff --git a/app/design/adminhtml/magento_basic/images/icon_remove_address.gif b/app/design/adminhtml/magento_basic/images/icon_remove_address.gif
deleted file mode 100644
index e9e3b92c2eaf9ec4fd75c53853101db300d946ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 349
zcmZ?wbhEHb<Y(Y#xXQq=apT6n@813Y`}g1H&!6VbeVv;6wy^Nkt5=U6J=(Ns)9&57
z-#0h^`}y<v^XKpD>;JrZ_4Mh}@B8+BKXT;z!GoU{E&BWM<Gb40uNyXeS-tvAdisx}
zN5Add`Q!NUj}s<*+qUh?nl*2Wihkd__i^IHFKgHSym;|VcJ|LJS3dUlf8Dg{_uaei
zs;YiJc<_1Nygx5qyvfY`G-Jl=w6u4Xm4BW*`L=!g>*VB>D_8#i|DORjQ2faPmec`}
zAU`p%RUK$v<fbE)-Nnq1m~A!RjAa4aTC+~GHaC@Gwm9Q9-ro|UV!F{!U6gH(T~TY>
z#!-5!DSOXP%^ev!l~n<JCTva3eln^iCer>9zCs2H!eS<Jei4j<l5A>b+FB;!j0I-Q
g8ip!<ntUS6%fkXpIR!TR32^cTySp>+Ix<)T04x!wjQ{`u
diff --git a/app/design/adminhtml/magento_basic/images/loader-small.gif b/app/design/adminhtml/magento_basic/images/loader-small.gif
deleted file mode 100644
index 62feaa6c3c85d98a0d6f81d9a75fe837d6243bbb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1849
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
HS{c6pnK%ux
diff --git a/app/design/adminhtml/magento_basic/images/login_box_bg.gif b/app/design/adminhtml/magento_basic/images/login_box_bg.gif
deleted file mode 100644
index b15f180d93b760d4640d0f960cac0fe1c0e1772c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 23788
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
diff --git a/app/design/adminhtml/magento_basic/images/login_box_bg.jpg b/app/design/adminhtml/magento_basic/images/login_box_bg.jpg
deleted file mode 100644
index 3ad1f5d0928955529d285278f259f8435444bb0b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 23561
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
diff --git a/app/design/adminhtml/magento_basic/images/login_box_bg_auth.jpg b/app/design/adminhtml/magento_basic/images/login_box_bg_auth.jpg
deleted file mode 100644
index 8f7f13689d0914ef2aa95b2de791e53308d76b0a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 51012
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
NXJCb<T5;yde*v=zZq)z)
diff --git a/app/design/adminhtml/magento_basic/images/login_box_bottom.jpg b/app/design/adminhtml/magento_basic/images/login_box_bottom.jpg
deleted file mode 100644
index 9db375bbe6d402e5a4d809964287804f33aa4170..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1259
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5JQfguVg^p1hgF(p4Kl_BK-
zP=xXSZH5*GMmS&svY42FB#?jrW+rAJ01_-9z|0B;>>$7a2O#Z0)vV0Stn92TtVl9&
zCHNWt4=@OFFt9SYGBXM?FbOg;3o`yc!jK1Y7|@YOfQ<`e7pfo=BeMVlBP&plm4%5J
zqL`gQgf(>PRYpN3Ar@v~Q8q<!M<X#o24<jECYTza%EX0=N`j7z2R||i{lCS)!wi%a
zWENzwXSjS)`0>C046py5{>C40E@Jz~{gEGk)+?WWS+`zR`RhX)yYPEoEq=@G@BLgi
zeev<*?|$$77dQXg=g<FYuKuaC_;>&O{PGu_S@rvDQ_hr3d)4yk1(ZEGL}r)N{P+El
z#<D6`+4b6%|9*VU=eVb-<LQMf|NZzn+3=EYK+&k;(a;zHX=D0)=NEM^|5j_h_~JFK
zev7^82b;R^lYeTa|Mh=-`_K8U55LW;Jr?)A{`329)&Cie&pP`l+|Ks?$^SP2yiOL+
diff --git a/app/design/adminhtml/magento_basic/images/login_box_legal_bg.gif b/app/design/adminhtml/magento_basic/images/login_box_legal_bg.gif
deleted file mode 100644
index 79b1ad4f0e626f7aaf3d6e750e17b0beb80b83dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 884
zcmV-)1B?7eNk%w1VMPL&0HOc@va+()*4F&|{Nm!`rLC_2|Nj6000000A^8LV00000
zEC2ui07U|s000C3I8@yJFv>}*y*TU5yZ>M)j$~<`XsWInF(^PR&vb3yc&_h!@BhG{
za7Zi~kI1BQ$!t2G(4R{Ys9LYstai)odcWYXcuX#v&*-#z&2GEj@VI<VA5RH_ynfH`
z`~QG}f`f#GhKGoWii?bmj*pO$l9QB`mY0}^cPyNpo}ZwhqNAjxrl+VBo2jg=uCK7M
zva__VtF^efy1Tr+zP}r{z{AAF#>dFXsxJ%5&d<=%($gry)YsVA+S|X@+~45g;^QaY
z<mc$=>fz?=?(gvNzU}h$_V@Up^!fb#{{I*D0USuMU_F5b6DnND4I#sa5F;9MD6yi&
zi?JwT+{m&2qbH3XLy8>f0VK(jC{s2tsj{WZjVxcvoVhS2&6_y;+04na=ewOgg9>HG
zY^c$r@qi*-%Ji7hrck5qdMdT5)mK!nYTY_2E7z}JRd@|cwk(LTX49&*fOf6hw+!0C
zooiMu-Me4y;@xXiFW<jS{Q@3rR50PgJq;sXOj9xA$1NR0o=j3Q<;xu{W8Q30Gw06_
zJ%b)?P&Db&|4gG^jZZb}*GY@Qo*h{>?c0@Y<KCTFH}Bt_eFGmJS~&6JrHvzBo?1Ec
z=dGPXpB`HQ_3P2CW8YrA8Taq%T!SCqN<8`Vrp%*XA4)y@_nh3rpI=Qn{rlbQ<KM4K
zKL7v!!RQCzfLIAg;DM<4hv0$^D99j#4nBxrgc1@+VTAx*h#`L(Zirup9?}P5i13X_
zB6}vDh+c{+lE-3;;JpYVcQVe1U5z$UhhvV=?Z_i@KK_VYkU|niWRbufi6n1IE{R){
zPSOTtl(0=nC2Lk*iCUIglE!71pnVA@XJU?tS(#>1hGv?Ot;r^1ZoY|FoN^LIXPtoE
zi6>ur?ul2Qe$oYKpl}UJs9S~}s#c<k)@5L$7Cs7ThLTRoVWpOSh-s!GZpvwio_>mA
zsG_b&YN;-sifW9iu1aI8uHFc1tUAt0Ymc_x3S_Rj4#{h;M*a$HlEMzlWU<CRiEOet
zQZCDEmCinkWwg?6No}=WUW;v*+HOl`x89x!Zn$cWOKzLyo(pHX>dwh-yLP?{Z=Ukb
K%jW<I0029wxX&d3
diff --git a/app/design/adminhtml/magento_basic/images/login_logo.gif b/app/design/adminhtml/magento_basic/images/login_logo.gif
deleted file mode 100644
index 3141a687bc46c60891cd553e46655548e7061fd9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 816
zcmV-01JC?NNk%w1VH^Nk0M!5ho}Qk_$jI?qP(3|8tgNhASy}RFUrS3%_M4Qty1Mc4
z@#Ev;)z#Je&B}s;f{>7qbaZt1t*7;beE#+H^KfSU>goH|)AD6o`M0wC;NJC)hweEn
z{_^tu=H&L7lJ7(}^?-NpLN@VTQt(hk?mRE`jD_=XXZ47H_oJQnqMQ1`z42L2@JT)I
zKs4}DNAq@V@?lo`z`XgiukJT0FE1~>y}f2;X8-^H0000000000000000000000000
z00000A^8LV00000EC2ui02}~Y000L6z?yJKEE<osn{vr)I-A0$bgGO}uS_cztKCw&
zUMV>295)pN073ChP8SE7{IHmsmyiJ=Ko~&mZc;P}O9?c9RD*?wVu4S2dwqY6RB&=M
z0}O~%Xle|alv6eUO96~ecMdiK2R5#8n@*;em!zRm4+LI!WL1u`akQ~dajwS0PKsN+
zHx9O3zfAx%1;#eWO*XW0*u6{4WZ(g+Hvw%_1eXjny0^p*rV4r8OEdwd<)>xQOa%qg
z3H;Gh!eGFq0p{F2=>(w8z+TL>Z5!|`3%@1PTE+241C&K7HXbZ_aP8l|M1+(Wx-shH
zlmi7K6`-TXrIZ8)<qSvwU;rEcC>NJ306?_Pf}cRIFt~TGV$vxOw&{B+#ZR@KPCrhu
z2cW=>1P2}taIh|cgQ;4j5C~g9&NYQj*eD>1)TTG8Oc+?(+s)K~y{@{g!{mT~!*e$u
zw59eSC90rH<^~(6Ac0~z1w_KVu|VR1!gU`%@e6^d>8#)Q&60{X^<B}g@y5OZE==uR
zki+G+y&Jcb3NSXz7*2df4A@RI2w+j1_z2`oEC>*wg7*^&0wmn1(4f2b?i^&_h%i0F
z1PURV4>usY!gLhl1*{ORUPf9a5(H3~Fg`+r6bJ+;;0GUs=L-`PTp)l4Scot~1FkVa
zo&Xu#;DH1Zm|(z$9L~T^UW80wr=4^zs5e{(_bDNr02tg*0tqG}Al?niUBI7jPE?>E
u2m<yfqg_m3AV3Qyz5rblCvd2w0Vo0)+ilDA7UgUyJ}D(MNMxyH5CA(9(`#)2
diff --git a/app/design/adminhtml/magento_basic/images/logo-large.gif b/app/design/adminhtml/magento_basic/images/logo-large.gif
deleted file mode 100644
index 1aefe01b5bb6038cba4b740d17495ade777309ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 5636
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
KiZLkQ!2bbE2MOZ<
diff --git a/app/design/adminhtml/magento_basic/images/logo.gif b/app/design/adminhtml/magento_basic/images/logo.gif
deleted file mode 100644
index 822079d8fc66b8aead86e7ad90c74b1005d063ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3144
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
diff --git a/app/design/adminhtml/magento_basic/images/massaction_bg.gif b/app/design/adminhtml/magento_basic/images/massaction_bg.gif
deleted file mode 100644
index 3c29ce38edbc950edccd668edcde3f52a8c52287..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 151
zcmZ?wbhEHbWMq(FIKsei>(;GTuU<WS_U!TF$9M1Ey?OKI^XJbWJb3W%;lq3P?!A8f
z`u6SHFJ8Pjefso`8#kUleR|@=iK|zyK6>=%(xpr1&!4|@=g!NQFVCDg!+--Q{$v5m
j=zvI&oeZoZ3xo`&DcUr*$Z!VgIy`g{E;S9{V6X-N>s&}i
diff --git a/app/design/adminhtml/magento_basic/images/massaction_button_bg.gif b/app/design/adminhtml/magento_basic/images/massaction_button_bg.gif
deleted file mode 100644
index b45618a99a2dbd04722f71f256b3282a65d57367..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 87
zcmV-d0I2^*Nk%w1VF3UT0J8u9{r&y;`1thn^zZNQ>FMd@<mBDm-PYFD(b3V%%ge;X
t#J;}1x3{;nw6v|Qt*WZ3EC2ui0096H000CG5CkzuF$X2JSaVMV06Y5vEm{Bo
diff --git a/app/design/adminhtml/magento_basic/images/massaction_links_delimiter.gif b/app/design/adminhtml/magento_basic/images/massaction_links_delimiter.gif
deleted file mode 100644
index 489fce6932f9444d07e179105f4875840a8a2e9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 57
zcmZ?wbhEHbWMtrASj52K?d|R1;o<J??&jv^>gwv~=*R#DIv^6HhJl$)B1ptpfsw%)
E05m=bp#T5?
diff --git a/app/design/adminhtml/magento_basic/images/middle_bg.gif b/app/design/adminhtml/magento_basic/images/middle_bg.gif
deleted file mode 100644
index f44ad896d43909b91aa8b89ea8487d444faaa7de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 327
zcmZ?wbhEHbWMT+mxXQrr_U+qOuU>uo_U-4-pFe*5c>VhImoHylzI=J-&Yf2;U%r0*
z>gB7KFJ8U`%6<Lz_2r8fZ{ECq{pQW9SFc|@fARj^`&S?ZuReeI45WVi`1#@`P{G@;
zU%$S8|Nism&mTX2{P*wQyLaz?|Ni~y)2Baw{=9kf=EH{%zkdDt{{8#kzkgr6c=7-L
ze+CMG;!hT^ZXFN_@)HAF%7Li`9xRgmE0-8~W?8vjc#-KP8^J!4Ez#Sda(~l?hQ|+P
zShj6>_$YI``-dOte&#pd&#h^{#QF0-LnDJUgKAs5fFNr(E2Aiv5aT392~II?_L-bg
XTI@VpTKo&NgcoygxUAH6WUvMRB(J4}
diff --git a/app/design/adminhtml/magento_basic/images/more_arrow.gif b/app/design/adminhtml/magento_basic/images/more_arrow.gif
deleted file mode 100644
index 38274038067bcc9939437f77351cca250ab0597f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 90
zcmZ?wbhEHb<YeGvSj5ios*LgPm)Bo**8YBe`Q2pm*Hs)JmxTTO{!#HK3nK#qJA)1b
s5P;M&Fw0jchp0G9I;@N|4Vh+|;h@mfa5>O_8*eac4A)}^cP0jF04xw6Z2$lO
diff --git a/app/design/adminhtml/magento_basic/images/nav1_active.gif b/app/design/adminhtml/magento_basic/images/nav1_active.gif
deleted file mode 100644
index cda58c6b3fdad22a1e1bb85af444013c29820b8b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1315
zcmcJM{Xf$Q0LQ<x*=B}{<nE>D@)9<^x{_1pUhT9zpIlG$3h8yO*39d4I@GJKd78(v
z%VQ5jW5$NDN5W=dD?|vzGWPt0nK)OMyY7Fu&kye(-#@%RK_P*DhcBW*&VUL46xojN
zlDANgf+PVJ6JeIGBcNkg@OTh}^c^T|AJEs=mzi5w;07)tmn7Q)G&+Oc+(Mx?q}|H6
zz8#d~Vv({Hc;XKm_<73^VXO3ahwS`2wRP0nUs_bvQj+ZeJQ7I2Cp|g@{lx|-+h^Gs
zWpg$C*3C?kFwXXV)nnEP>!g(QAS7_r4!A+gzE^&~;$c;85t$ZXRqO#7OW78U1n%A|
zYY9P2r`t!x#0!PO_Cppe%(j+R=6E=i%j0u692SQw#z6Rden)4g;D`m*4%Xe(B@hUH
z^#%<GTC&*etKL9&PtS+8Sn_^QtP5}y4oC@hvp8G%ZHLK|u!UO=^Ed2esoQ1}kaH<p
z-(IwS6N{KWXQjy8K6M8EiE}|oas>X*?cRX=r$>M0=T89GCJ}Kw%qoYJo0nfuSaj!Z
zG5L>sC8cHM6_xiNl%0q~AW-lpl)8Fq1Ff-%&S?I(Mq4|J&EfJ`!6-zKkA*<kD|*(~
zKOmMoe=#^T{BmUU)!6vNXoSz<Ko{_=^xd3nenGBKs?-{-PH!+SE-jmkM_j@KzJhN2
z_2J{+pEdz7!a0~()0+ji_ll7)Ymen%vB-^i8L_|6=^%bq(nb*%yB;fW4r#A@UgB}8
zDdzftJg`fs|CY)S7IpZcUy5$_IjdphF(wPKGn7qxMG4M#Hv!qOLW@XBXjLeu=`}r?
zg_pkI(5G7CpB3y3;}WKKp;Iw5OnvhVFL_h`qAHBnB7K@})=39>t#bk**!t6XkSNP4
zZW}6Yh~Fj`llO#Ghj+9q2P+RIz8mUbsfX=%VP(R4wsxF$iXJ!I$<a?Se;Ta*;VIWR
z!%xxo4DS{}5$7|lT_U>pCb^^pb>U@Khgm&J340vT-T7YY;Cn5;rvB;rlI&Tb%ZZ+@
z4YOvPeqp4i`@{OOeDL;24H)r7^oo9NL?GDQ1fU)=BE%6V%YeJnWSK}`jV$v(&9Vr7
z@-%Kf$LSJnp5&aWna_14c`W3)mE#ujJ*c#W{5@T=0Qir69`YieNu2zSpNb~G>%XRv
z7h|BF3NqI5ih{hGADOjj3G&e@N+JV2m8GZ8UQw1sUusmA$E0eN74albRfXfkC<b}1
zu2J=Xz}2cACJ%V3A6=WgqOM9;HL9y`u4&cPU;6-AHc<|EO>Lfgljcd0uTDcD2YPAi
zO3&i8^_7>JwDrEin(q;3v%Pe*x^ld(kw$IOH8Hq49i2JgrDw1w@p^_QjtN+uS=H%V
zg;11%+2@#OXp^|p4edj|dIM`T5M^Y!q2onXrxNH!?rf^w$di#!i+n|S;$nw}N?+_W
zaP^Cwdn-ppma!9wOWl8}=u15x*YryQ0ES)`LUs_Ad*OQ-%e_0;t{^CYMVtB@q6j8p
zztd%gX}~$nU=q9LqE{qt6@(RuQ*fjR8P7JX4DJ`B%|kv@1oN<;nqhwFziu#(U|`;>
zBL_=sL^j9vHm{C_e`8!7j|@sO+jtSl857Z$o8M2yq&5Erb(JmmPbX9)t-ZlDG_SoS
b@QiCS$zt#I*=tit>(cZYDa1Ad0KWYPc1MGN
diff --git a/app/design/adminhtml/magento_basic/images/nav1_bg.gif b/app/design/adminhtml/magento_basic/images/nav1_bg.gif
deleted file mode 100644
index f04614925d0d42c6d481d31c5260325e7374f44d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 50
ycmZ?wbhEHbWMp7rn8?838x)$7T@V%>AD5D$_>+YJ1av?INS=X-`3wsygEasXU<nWa
diff --git a/app/design/adminhtml/magento_basic/images/nav1_off.gif b/app/design/adminhtml/magento_basic/images/nav1_off.gif
deleted file mode 100644
index 2284d977a6a1d115775932c639ca9b0f9becc08b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 154
zcmZ?wbhEHbWMq(GIKseCQQtgq+N}Oblk3~MimK{ro7>B3o2Jd2J!8)N%)+vkuD;$$
z({f8HyC+O(>gbt1XMSE;bwNc<Np(YZaYg@>85sqoZ9NmF&6?BMH)-;WIa6oNt!`{%
tKmv+CS-?CU5DBuAfmJ+Vst=Ed;3USJqYpI1uIYqK$mB1Qb>d*K1^`wNI3fT5
diff --git a/app/design/adminhtml/magento_basic/images/nav1_on.gif b/app/design/adminhtml/magento_basic/images/nav1_on.gif
deleted file mode 100644
index cda58c6b3fdad22a1e1bb85af444013c29820b8b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1315
zcmcJM{Xf$Q0LQ<x*=B}{<nE>D@)9<^x{_1pUhT9zpIlG$3h8yO*39d4I@GJKd78(v
z%VQ5jW5$NDN5W=dD?|vzGWPt0nK)OMyY7Fu&kye(-#@%RK_P*DhcBW*&VUL46xojN
zlDANgf+PVJ6JeIGBcNkg@OTh}^c^T|AJEs=mzi5w;07)tmn7Q)G&+Oc+(Mx?q}|H6
zz8#d~Vv({Hc;XKm_<73^VXO3ahwS`2wRP0nUs_bvQj+ZeJQ7I2Cp|g@{lx|-+h^Gs
zWpg$C*3C?kFwXXV)nnEP>!g(QAS7_r4!A+gzE^&~;$c;85t$ZXRqO#7OW78U1n%A|
zYY9P2r`t!x#0!PO_Cppe%(j+R=6E=i%j0u692SQw#z6Rden)4g;D`m*4%Xe(B@hUH
z^#%<GTC&*etKL9&PtS+8Sn_^QtP5}y4oC@hvp8G%ZHLK|u!UO=^Ed2esoQ1}kaH<p
z-(IwS6N{KWXQjy8K6M8EiE}|oas>X*?cRX=r$>M0=T89GCJ}Kw%qoYJo0nfuSaj!Z
zG5L>sC8cHM6_xiNl%0q~AW-lpl)8Fq1Ff-%&S?I(Mq4|J&EfJ`!6-zKkA*<kD|*(~
zKOmMoe=#^T{BmUU)!6vNXoSz<Ko{_=^xd3nenGBKs?-{-PH!+SE-jmkM_j@KzJhN2
z_2J{+pEdz7!a0~()0+ji_ll7)Ymen%vB-^i8L_|6=^%bq(nb*%yB;fW4r#A@UgB}8
zDdzftJg`fs|CY)S7IpZcUy5$_IjdphF(wPKGn7qxMG4M#Hv!qOLW@XBXjLeu=`}r?
zg_pkI(5G7CpB3y3;}WKKp;Iw5OnvhVFL_h`qAHBnB7K@})=39>t#bk**!t6XkSNP4
zZW}6Yh~Fj`llO#Ghj+9q2P+RIz8mUbsfX=%VP(R4wsxF$iXJ!I$<a?Se;Ta*;VIWR
z!%xxo4DS{}5$7|lT_U>pCb^^pb>U@Khgm&J340vT-T7YY;Cn5;rvB;rlI&Tb%ZZ+@
z4YOvPeqp4i`@{OOeDL;24H)r7^oo9NL?GDQ1fU)=BE%6V%YeJnWSK}`jV$v(&9Vr7
z@-%Kf$LSJnp5&aWna_14c`W3)mE#ujJ*c#W{5@T=0Qir69`YieNu2zSpNb~G>%XRv
z7h|BF3NqI5ih{hGADOjj3G&e@N+JV2m8GZ8UQw1sUusmA$E0eN74albRfXfkC<b}1
zu2J=Xz}2cACJ%V3A6=WgqOM9;HL9y`u4&cPU;6-AHc<|EO>Lfgljcd0uTDcD2YPAi
zO3&i8^_7>JwDrEin(q;3v%Pe*x^ld(kw$IOH8Hq49i2JgrDw1w@p^_QjtN+uS=H%V
zg;11%+2@#OXp^|p4edj|dIM`T5M^Y!q2onXrxNH!?rf^w$di#!i+n|S;$nw}N?+_W
zaP^Cwdn-ppma!9wOWl8}=u15x*YryQ0ES)`LUs_Ad*OQ-%e_0;t{^CYMVtB@q6j8p
zztd%gX}~$nU=q9LqE{qt6@(RuQ*fjR8P7JX4DJ`B%|kv@1oN<;nqhwFziu#(U|`;>
zBL_=sL^j9vHm{C_e`8!7j|@sO+jtSl857Z$o8M2yq&5Erb(JmmPbX9)t-ZlDG_SoS
b@QiCS$zt#I*=tit>(cZYDa1Ad0KWYPc1MGN
diff --git a/app/design/adminhtml/magento_basic/images/nav1_over.gif b/app/design/adminhtml/magento_basic/images/nav1_over.gif
deleted file mode 100644
index 2878e7fb750a2577234a4225d60230ce4fa22b63..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 368
zcmV-$0gwJiNk%w1VJra|0J8u9&)?$I*4F3f=!T4t&Ck%z-QmXA+`ZD*!qwTz+urHv
z>CoTe000000000000000A^8LV00000EC2ui04xC+000F4a1ceSy*TU5yZ>M)j$~<`
zXlfEeAOK4&&vb3yc&_h!@BhG{a7Zi~g8)H50XsUM(5Q4uty*&c%5}@_dcWYWHcT#?
z&uH#A&2GEj?=^f*uiKsSyME8-=lg(xf@Ob$hKGnxg^7%fjyQ{tl9Py$l$V%#mYJNL
zY@42;qF$h*rl(P*sH?0&s;#iGH?Oj_vb46js}u#jzQ4f1!o$SH#>dFX%FE2n&d<=%
z($N$N*4NnC+S}aS-rwNi;^XAy=I7|?>g(zh2Ji6k^7Hid_V@Vt`uqI-{{H|23LHpq
zAO!>n6DnNDu%W|;5F<*QNU@^Dix@L%+{m#bM+yfWLW&$ovZTqAC{wCj$+D%(moQ_>
OoJq5$&6)}#0029NU&TTI
diff --git a/app/design/adminhtml/magento_basic/images/nav1_sep.gif b/app/design/adminhtml/magento_basic/images/nav1_sep.gif
deleted file mode 100644
index 2284d977a6a1d115775932c639ca9b0f9becc08b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 154
zcmZ?wbhEHbWMq(GIKseCQQtgq+N}Oblk3~MimK{ro7>B3o2Jd2J!8)N%)+vkuD;$$
z({f8HyC+O(>gbt1XMSE;bwNc<Np(YZaYg@>85sqoZ9NmF&6?BMH)-;WIa6oNt!`{%
tKmv+CS-?CU5DBuAfmJ+Vst=Ed;3USJqYpI1uIYqK$mB1Qb>d*K1^`wNI3fT5
diff --git a/app/design/adminhtml/magento_basic/images/nav2_last_li_bg.png b/app/design/adminhtml/magento_basic/images/nav2_last_li_bg.png
deleted file mode 100644
index 9d116872d15b83ee9adee54d4a96bbd088d168e8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 350
zcmeAS@N?(olHy`uVBq!ia0vp^dx6-9gAGV>8s4%6QY`6?zK#qG>ra@ocD)4hB}-f*
zN`mv#O3D+9QW+dm@{>{(JaZG%Q-e|yQz{EjrrH1%eeiT~45_&F=89q0AqR%Gi@tMs
zs+m5rRCB)$+0?2N5m~8Ny*l@3@QrHb>d1(IoD_~uWAP6RA8ls{Ec^3w#)WNf!@V;9
z?Y4homvH2o{b}Exj}fz*%9X2J_!qHXY<}VRMWIT-wnGkui(95c4ws%iefx}=^Otb{
zEIzNkcAxm|eeai>B~Dpi9sB>NMDWYKF7>CymoLjyJ8W>~%wdVp&{EC0)9-nI(Ttzt
q%<=!{|I0Q#SCr>xzx=CtfI)ASl2*xU@2^0=GkCiCxvX<aXaWHLM30F8
diff --git a/app/design/adminhtml/magento_basic/images/nav2_last_li_over_bg.png b/app/design/adminhtml/magento_basic/images/nav2_last_li_over_bg.png
deleted file mode 100644
index 7103bc834431337e59447137823ebbcf6eb65cca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 351
zcmeAS@N?(olHy`uVBq!ia0vp^dx6-9gAGV>8s4%6QY`6?zK#qG>ra@ocD)4hB}-f*
zN`mv#O3D+9QW+dm@{>{(JaZG%Q-e|yQz{EjrrH1%ee`s345_&F=E}xQW<!Ryz}Jg}
z=P9Hx<v;wD#v#F@7Q4zv=+f+lbkF&`ci5W`s`&~Wk6prQ)9^>`g+<7}8V#Pq8%|lS
zzi-d~o7Ln^?)F+w&Dzps5AJoyU2J~g_(h>gz_vrqg?|w{GPfV64F4i`9D4Y-FP1-h
zKvpvO=bvel<IT^@UpBG5)uI;veVz5vDMfGhy4CB7-><!If9CU_6uBr7rynclUcZ<9
tWoL{`a?kTm`%U<Je`!Ats{SvYz);bk6r7#$unXvU22WQ%mvv4FO#p#iiyZ&}
diff --git a/app/design/adminhtml/magento_basic/images/nav2_li_bg.gif b/app/design/adminhtml/magento_basic/images/nav2_li_bg.gif
deleted file mode 100644
index 7d89746e9679208d8a53813028d15b221eafe3fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 75
zcmZ?wbhEHb+{?hou!w=-)vH%8U%veR|Nrsh$4{L)_4Ms~1~5?k$pWTzKqN>l1G9jH
W^3{I^r#x5hwRnBjTFrrp!5RR*(HxZk
diff --git a/app/design/adminhtml/magento_basic/images/nav2_li_bg.png b/app/design/adminhtml/magento_basic/images/nav2_li_bg.png
deleted file mode 100644
index c943091ad941751a5381c89ba603c2683877e04d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 163
zcmeAS@N?(olHy`uVBq!ia0vp^dx4mlgAGU?6X!DpQY`6?zK#qG>ra@ocD)4hB}-f*
zN`mv#O3D+9QW+dm@{>{(JaZG%Q-e|yQz{EjrrH1%nR>c7hE&{2Dk(1y|NZs#^tX$y
zW<NLRX$myxag50*;F6ZUow)4c0tr@S-X67Ifd-El92yuI*poOJW4-2l1{%QN>FVdQ
I&MBb@06IM~x&QzG
diff --git a/app/design/adminhtml/magento_basic/images/nav2_li_over_bg.png b/app/design/adminhtml/magento_basic/images/nav2_li_over_bg.png
deleted file mode 100644
index 06822f953b3c9e131caf5ee4e934c5ecd8704edd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 162
zcmeAS@N?(olHy`uVBq!ia0vp^dx4mlgAGU?6X!DpQY`6?zK#qG>ra@ocD)4hB}-f*
zN`mv#O3D+9QW+dm@{>{(JaZG%Q-e|yQz{EjrrH1%nRvQ5hE&{2Dk(1y|NZs#^xXe@
zT8kyz4r)joTVSAR*V^0r*5GnRKu^;|HaFqF8WM#J3I`ZElsOrFe<%0?^)q<7`njxg
HN@xNA5o9vs
diff --git a/app/design/adminhtml/magento_basic/images/nav2_link_bg.gif b/app/design/adminhtml/magento_basic/images/nav2_link_bg.gif
deleted file mode 100644
index 0af1f607e58017178caf50977560620be4f1499b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 43
tcmZ?wbhEHbWM*JwXkcXUOGsm2U{L(Y!pHy=&;ha;Kr#$WOfEqT)&P>S1!n*N
diff --git a/app/design/adminhtml/magento_basic/images/nav2_parent_arrow.gif b/app/design/adminhtml/magento_basic/images/nav2_parent_arrow.gif
deleted file mode 100644
index 591c49a3036bb7a33747437cac05dd376bca739b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 84
zcmZ?wbhEHb<YeGtSj5KAH-FiMTXzqfx!{*pU=<SY5}VEd28usf7#SGY7<529kXi<2
h$&6J&yK`-X53gpJCdiN&?Ox;dqBnTeI&UThYXA%!7!Uve
diff --git a/app/design/adminhtml/magento_basic/images/nav3_bg.png b/app/design/adminhtml/magento_basic/images/nav3_bg.png
deleted file mode 100644
index 96793a4007eb26a0da3e0165d09035c843dd656e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 164
zcmeAS@N?(olHy`uVBq!ia0vp^dx4mVgAF9&eRl$oVo7)Ob!1>zf5M!#>m`scS>hT|
z5}cn_Ql40p%HWuipOmWLnVXoN8kCxtQdxL1)dr}@%+tj&q~camNqKpCazerb_M|w4
zv_uKk#R(Nn_6~m}JM1?(2=7r8*xcWCT0`R519gG<>>LIRZXv86X59O01T=xc)78&q
Iol`;+02nbcC;$Ke
diff --git a/app/design/adminhtml/magento_basic/images/nav_bg.gif b/app/design/adminhtml/magento_basic/images/nav_bg.gif
deleted file mode 100644
index e013b09f3bf4802513500b8a252818dbea14886b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 50
zcmZ?wbhEHbWMp7vn8?8Je}Ta7%^8hzmN76eDE?#tk_-$wAOa-Mz{K35%*tR506)75
A1ONa4
diff --git a/app/design/adminhtml/magento_basic/images/nav_list_bg.gif b/app/design/adminhtml/magento_basic/images/nav_list_bg.gif
deleted file mode 100644
index cf42c6543d5e51b0ff9f019dde08fdfd8095650b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1514
zcmd6k=}(h)0D#|?qo_<@!GIY|F*@Et0ZBB7(=0GeVbeLBMqD&nHUpJAaY5pk11W8>
z2<1Lnpd7Y^9w1aG2ndQ4<y06jK`2-0-EtLZ;r(s?7kj=wU!LR%`kv^2I?N1Rh7=)?
zrI8FcFkr$U4F>rzD271>402&m0D}@3l)``lgC{UZhruHlq{84a46<O50|OQeieOL%
z13C<-|5=AW3oF9^pkxZ0X;q@qiUN%|CiDUAK?xVFLeMM(<sj+Y`s}(^l!aspn$S`t
zp3dBAAS(pXXbyrh5ws9N%aJF7=V(4ctrRgu(uYNr3|@nn^$?^w<`iZ!#Vsh4kX9i`
zE#qg@NYEk#EkMv>gkD{jTh30%DvqOOq1ni+AReti&^#ndB;Dp+xyQ((l-HtV2%3wG
zapR!>8ArCPF%T32d42Bs`~<>*<d8?Hlr$=hp8lAT@gy^gnVplHmtRm=R9wPhmzI@t
zDk`h0pK^Kpnp%NSB(AG}*3c+<-qb8@X?@Yw-XS{d_VRVNwChdp+dA31fx)N!Lmx(1
z??=Zcvd8|J`b3+Yp8X`BTO3_bs0Ng3UAI=h+-6)^H*IWgnJwEpD1fYXy9U>Dx)LD=
zTmN3)5$ayZ^CbJa>Ih_W-~_S3Kd?$hbaG5`E$;mllY`&$OEt6M>jMnCn_Nk7fcp;&
zTy%~EAGj3Ez$QJE91P?KG3+xUCFFp+L<Y?MSuzozKF@Fx`biQ43FjDAZHFY%0AV0w
zU%!(?8Q|UZ#diQw#-H)s<>*3C?)JKz+T+lUxzMlNZ|&O&(H#l5`lZk2Wz3@&$}YAv
zEcO+hh?-719hNr4ImbBkW2;0p!oMQ8HPHH8GhY8&U+h<}tZ+8cdz$Hi7tMy5&eT1J
zFSSXR=X-Mrw`1G<XuF21E|gztZ(Y|+G)Bz~w!hdg$X_!K8+PbAYvqXG_E1N=Wy3h%
zSN_w>jvdS9s%9qcFNzKe+2ZBN)=p%3ik&-O{>a`>DNluo_*u$cvkYT%Fq}V2bxlyt
z(%h){Ir^~z@?1Ke%b$Df-a&G~`u5=GGfs|?=b!j1`16@(P0IPK09%g*=C^)fE|_5V
zngx(^(NDFI8$$G0%)5H+?qdG+@S4SfYn7x)42kNYD7sT{S5Zvn)+kD%n^X!`e2>Qx
zJGO+xvQAXgER`jhR7>T_ww_83#VJx*L3giJR#HE{O@Ww1PgQl^wMf;|qVQT3mz|(i
z@i<gZHNOlScEg&_tyR|wo78GSeUGO`C>e{?h@^^Ijkw87a<S^PC1~rrouahQdff%u
zhJHVdwsDw9&`AbcNi57nxIou5m7viz%c%stbfF+h-=gFS^sNe%<YH~?AsE`$#-a@E
zn+k!UW80)Lyo7LG#!j?{bi>LH5gK3FpVAs%!$Drl-3LOWm%*EZ5yIsjr=wvk8#kKQ
zO7F44=#{s4o^a)zSF?7d&sXNP+V68FY|_SmNw_+Ac0;>56oB(y8$RzGv-Un15v_e7
zHj*ZxkRb2%(W{{`>wjO55Ur2hysujyC(*o36SthhCb49m$n-I~S!bGzmw9hY{XQPE
z@hNdhv@xB~Oq#Sx#`$c@DbBH*vvfqfIhS!tzd6qg^4VI*WRO@^MG@jH1^d2!Yl%bi
zF)OPJW6df)Pi$6mZwz8=>t#L`tz<mbqLVI(E&8?%y~WUpJHBmfpW#sUyB@3FUg<w&
z*j^nDI=-_u8XC8=J`qv3W16~M_sY?q$>|E(Tquk~x0Jj()U0hbpcbR-IM`krj{}zT
w)xOsIeDBBsfb2OCF1Qo>r7_v=A_wc-+iClaF$K=xVDGzGIk4SuDG+q#Unb23xBvhE
diff --git a/app/design/adminhtml/magento_basic/images/nav_nest_link_bg.gif b/app/design/adminhtml/magento_basic/images/nav_nest_link_bg.gif
deleted file mode 100644
index 7dac4f1ff7307b937fe91404215668dd379fe450..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 43
rcmZ?wbhEHbWM*JwXkcLQOGx|q{k!5%76uT|0TCb>1|}w#AO>py-Qx&L
diff --git a/app/design/adminhtml/magento_basic/images/nav_nest_link_over_bg.gif b/app/design/adminhtml/magento_basic/images/nav_nest_link_over_bg.gif
deleted file mode 100644
index 8d808d18d56f41495ca7371e62ffef04d641a93c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 328
zcmZ?wbhEHbT+YDAaFv1K!NZ65?%%(A_wM}%4{qPN^XSo|hmRiJy9X2l3IHV^Ub}Yf
z`i&cR@7;U+`0<k`Pj1}2`QpWkmoH!5x_x`qs#VvnU%znS!qcZu_wL>M{Q2`|&z{}B
zef!ScyFjIn9zVW$>lRSy(`V0~zj*QF>C<P=pWnH2=jKhI@U0s+ZoGW;>iYHT43q)I
zpDbVlbU-A?PYi6S2c{HgO!06yk)ooMWo5i%#grwSk?W^VEc;zivQM`Cu(O)@xwb7y
zycx_w9~xyG`EM|{*Cgw|;I?Q`Rh4OKWoei0lol3N@9UGFs5U`fZQ67J0gc&nG<dWY
TESNWc;ZjlV6=D)1jttfS)C`+0
diff --git a/app/design/adminhtml/magento_basic/images/nav_on_bg.gif b/app/design/adminhtml/magento_basic/images/nav_on_bg.gif
deleted file mode 100644
index 1ba0ba779557bea2861c1b8c315665f92b34d910..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 151
zcmZ{dJr2PD97q2W5{u+V3?13K*oZC$E#d$Miz_%neT1eBQN%}x!#Ijdm>#uz!&~0)
zg1+BuO>*Yg(~Ox2E6hbAQn3+7aTXVG7u#<Y4-tu#h{al5#Z4^5LL9_SoMeBfzw^K1
cX3m~gsMgY6c{=vHqd~(fy@q>pJ4I`M0GXaJ+W-In
diff --git a/app/design/adminhtml/magento_basic/images/nav_parent_arrow.gif b/app/design/adminhtml/magento_basic/images/nav_parent_arrow.gif
deleted file mode 100644
index f790175fb94643ebedfde1f830594949038f5e79..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 240
zcmZ?wbhEHb+|Izwa72i~Gp%6a($(9KpAIdonzCZuf=xU6m#p$mFAU5rTYun)UslPS
zbz6e+Dtt1FSMNEvY{%X$M^5-9q@BKTn}Il>_>+Z^fkB8t2c#TiCj)El0+qg$%y}8B
z*5$n3SD>@}SkC>5b?^7MFzj7W;Gxqe*3eLRGRMlZ)!E_0nyB^L+>@;iRPBE-(fJ^2
z+xZu%Oo3+0?|+bKxmb4m{f|9$|9d+A2sJd-w=}jkw{>=OxA%7S_4H4gIAy}L$<wFK
Jn54*H4FDeJV8Q?Z
diff --git a/app/design/adminhtml/magento_basic/images/note_bg.gif b/app/design/adminhtml/magento_basic/images/note_bg.gif
deleted file mode 100644
index 9b2d91ad9c5602859247271f013a565fac485834..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 107
zcmZ?wbhEHb<X~W9*v!qaV%LG!@819T@$>PES6{w<yL$J*+I@#lT)w{L@QH0lPo2DS
zodFdn{$ycfVBluZ0SSZ5U|^9bIBB><RD*Lj7elM7#C%7O<KH#C7p!t*VXy`ODm*Bq
diff --git a/app/design/adminhtml/magento_basic/images/note_cell_bg.gif b/app/design/adminhtml/magento_basic/images/note_cell_bg.gif
deleted file mode 100644
index b8786a7b9d6a4010a946b6b5b4b44cffa5aef1e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 106
zcmZ?wbhEHbWMkl9*v!qa?dYkKSFUe4eB#9A>yKZ&TD$M?>v!+JeEs(0$Iq*GAFSAQ
z;McET3`junCkrD312=;XNDO2K1B-ZpXXZ1`tc4*{lp3B3HqFS5Rg-PDk`!dH1^}y;
BD_Q^m
diff --git a/app/design/adminhtml/magento_basic/images/notice-msg.png b/app/design/adminhtml/magento_basic/images/notice-msg.png
deleted file mode 100644
index 0bf433b7e7c1433f10e66992372799f8a126feba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1375
zcmV-l1)%zgP)<h;3K|Lk000e1NJLTq000{R0012b1^@s6Ta6b;00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$@kvBMRCwCV
zR%>V+RTRE+=drWz>?WJ2X<`zMt;YIp5v<i(t!O~RpcWM0e<DJ#KlG0fM1Qpq=pO^s
zAF<Gim{<#<R9Y*xD#Vbq)%uDxO}0_DyV=dY=5c54jQ4DJCcEh-CM}2qhq-g+-tU`p
z?sv`|g#N>eoBF)#vH;p2I=$k#_<t2yI%{6xlliT@fbM3G5gv2bfuCCTZ|s(#COW2Q
z^vLbofBpNC$!7i{O-&7AuYl2`p{7lZa_HJ17QBKa$7Fa<w4`R4s;T9E&*u`y&zlzd
zB#|-(?|ES|v0^f|2i%E|)@}C7cxPSn*7i`th8W_w<v-cBQ7-j;a(?#6R8g~DyXEm;
zz6S5IWI%Lk<oajp8#?>_(VOeN!Pekv_C(Fk<csN(b91T5H*f0s`TfO&xRPje|Jnz<
z68CC2w&5z-+Yq!(1+B(l4XgzWz=B|EM)uPgt+}(+GZI^~txNVc1ujQ*nwlsi&wX)v
zaz^jze&x)p;}^<N@u!B@^@bzsukrByfK3V&+hHQLcwxTR-^{j8Sk@00U;tJNIoZn|
z`$4>J8ixluT4WD?Bp^37*d&h}v-Au~{`n=c0v#nQjhSyLf8|=h0!+YmBV$qFu@BaE
z2fS;VY@<+>4n<3#Kx+@G?|QxToWdTYB)=`~do90DZme1lm~B^1ceCLjGYeuDBnjW?
z;dqw5Ty^p(K^9dOQfleUr<caH{EOF1i1&*kw~-Csh0+8vo)vB@Hi=|YS~b}NEh2sp
zr6AiJj}$hJNU_qpT7F1h<;C07Bl27u3>|@Bj^iT8P<X3`vckxV^!TUl*e1m#{r1Jn
z`4V<n8-h~{l?q&ZdEAj+1-O*oP47Y_bFTDRQ_ZrXq?~QL`qiWyvaq?T`oc^CG6^k^
zaU7+Bl&!2YThr}X1L;JvOqUF^FQRQPBeAt_MMTETZiLV7DRmOphXq}u;*1j{fLoco
zITj0{`$VexTr$G!+&ieQb32m4>z5@W*&omxn~RB!Y-%hdmk%nLoH+p;PDbg`(Zb=P
z98B6w>W*=QAYL_5>Z{Gj$o;r<MC={Rfw{1z5(6*++vy-6N&DD%L49Idv?bu7ouZ-m
zSm8kNAZ#)Kc6=1$L!epKl9&lW2BaZlew;~uKbjwX9tjHjFpVH*9hl+?&CM3%126VZ
zAA|z|cm&pnE!IV}eV?U=`ks#6E10@08H(T4u1XL#C{iZgLPe2hZQz2uFgq<d<`;GL
zL1uM*646)8`(yEa2a-deH7AXZAdEf3sk0kz^zGVmLu4nz6M4&&+@qnihis2Y4Rx}j
zX0sQX4i<>&iOhd@qPPn%0sEpOhD8V9;gNy%=We~4@AFxtPO?q^YNSs%p{QVKeqx&L
z?%6Q~QGx79)e+-F$1Kk#?HzohC9&zYz>cUOv;+h`x)P#-Nz-Z5j2|B_4D`MoKLl8n
zQPun{C^v@SQx8WwUh0WH6N`vj!roB5EP4Gr=6R79OFujYH8g5bsu8uARdaL6jB)h6
zk@Q}+_kWa$^u@mgHGg>6O@uQMNS}N#((>5-;k%j}r8`7{3kQ6-y%dRJO&O-0ojp&+
zK0ciN=EFmoc$q{kM`W+~R}N0^GATqVm+ykp!OOK{mLt&0cf+ZvOZrKL!?jG{7+29}
hX@yz;wy*yPFaR!4p(fOeKt})o002ovPDHLkV1niqoS6Us
diff --git a/app/design/adminhtml/magento_basic/images/pager_arrow_left.gif b/app/design/adminhtml/magento_basic/images/pager_arrow_left.gif
deleted file mode 100644
index c0bb54f39b37b842bfb92ab8cb914fc45119d197..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 334
zcmZ?wbhEHb<YnMxxXQrr^y$-2pFX{O`BK-#|G<F*SyfH?Zh?;;Ju>zTdHncsaZ_h*
zP0RW7=WpM=cj(Ze%hzwddGqGVjhn}hAAk4m-NT0u7p`8v>);VfzsSRf55Il;_Wu3*
z7cN|I3`@9j<;u73-%p%4v0=xa@87>ad-m-4ix;n6z1nr)@a4;wzkdDt?c2A{pFh8T
z{rcz6pD$j#c>n(WrcImHu3fu(_wK!W_db9A{Kt<UPo6wsAOsYDvVfK7fJl&^7}&B8
zFsQldh^cBcbsozxGnWs~c3T^kYVa~^_tu>Bh|H_Zj{=+*y<uss3ejWx#yO#NNzl?m
z42Av|H>v3ADhqNmH|cUlGHLZ{@pARCM;hr&n?8+6B$C0;k3q`7K-OsKvSmDcl7{+g
M*R5k=bY!pw0HcqjZ~y=R
diff --git a/app/design/adminhtml/magento_basic/images/pager_arrow_left_off.gif b/app/design/adminhtml/magento_basic/images/pager_arrow_left_off.gif
deleted file mode 100644
index e057ce0e30cc45efc60e72ea4c53453e4854de8d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 218
zcmZ?wbhEHb<YnMxIKsg2<;$0M@7{g*@Zs05U!OmJe)Hzd>({T}zkmPu@#9yoUOjyH
z@b~ZEFJHd=_U+rBKYyM)dGh1Oj~6dqJbLu#=g*(dpFjWl_3Piif4_hK&VU0b{$v5m
z=zvI&oeZqu4<@*zL`v}$hveL5J8B$R5*t4yC;GtL^Cs+!f;oR=`nnw!Iq3E9pGa~{
z&=9%os>(joM}c>B`KH<!g$x7b*nK<h7dWhYSY-M{gt10G!AD7`v8joNS&_jS0G*m?
A8UO$Q
diff --git a/app/design/adminhtml/magento_basic/images/pager_arrow_right.gif b/app/design/adminhtml/magento_basic/images/pager_arrow_right.gif
deleted file mode 100644
index f464481ba14c88214a0c72a6d2b1daf7948279fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 332
zcmZ?wbhEHb<YnMxxXQrr^y$-2pFX{O`BK-#|G<F*SyfH?Zh?;;Ju>zTdHncsaZ_h*
zP0RW7=WpM=cj(Ze%hzwddGqGVjhn}hAAk4m-NT0u7p`8v>);VfzsSRf55Il;_Wu3*
z7cN|I3`@9j<;u73-%p%4v0=xa@87>ad-m-4ix;n6z1nr)@a4;wzkdDt?c2A{pFh8T
z{rcz6pD$j#c>n(WrcImHu3fu(_wK!W_db9A{Kt<UPo6wsAOsYDvVfK7fJl&^7}zo$
zrl`2-h#5AXZ#$M_=F2i8$8Bv`wBE~{t(yw=N6gT0dD>ueUFSiIlce5M_v%SYm%i(8
zTv*bcBCOlU%q^(gs1nJp)y>7*-OUs!!lW~G+Ek-RDF#1320cC=qs2>>$Qm%R=&xS0
K#!%9c!5RSlP^K&Z
diff --git a/app/design/adminhtml/magento_basic/images/pager_arrow_right_off.gif b/app/design/adminhtml/magento_basic/images/pager_arrow_right_off.gif
deleted file mode 100644
index 95f17d5face7d7d8c00a9c56a00b8b1c4857b934..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 219
zcmZ?wbhEHb<YnMxIKsg2<;$0M@7{g*@Zs05U!OmJe)Hzd>({T}zkmPu@#9yoUOjyH
z@b~ZEFJHd=_U+rBKYyM)dGh1Oj~6dqJbLu#=g*(dpFjWl_3Piif4_hK&VU0b{$v5m
z=zvI&oeZoI3zA(@BGsG)Lvn7*@sviE#QOKgFmG!O=4Iz~6u4B^+j@B61P;B^@u`lX
z8WJp8D&aFL*7J6hd#`jj*YiQL=p>`whaGqB7VMPbcXK!=9>B&U)YRN8D6Gg}4FID$
BXwU!v
diff --git a/app/design/adminhtml/magento_basic/images/process_spinner.gif b/app/design/adminhtml/magento_basic/images/process_spinner.gif
deleted file mode 100644
index 0ebe4d8430c58416a60a055eaf8ff7ec318ab653..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1849
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
diff --git a/app/design/adminhtml/magento_basic/images/product_rating_blank_star.gif b/app/design/adminhtml/magento_basic/images/product_rating_blank_star.gif
deleted file mode 100644
index 72d763388e2359238762f43000e74862cf460e3e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 304
zcmZ?wbhEHb<YVAvxT?VL=l9P?4<9_ZfA{;hFF${LfBEA1ySJ~uef|9J@9!VqzrK3;
z{Ogy`_wU_(_Vme{*RMW*`taoOqu;-Nym<cf+0(}#KfHhQ`sJ^m-#@&6`|9P3CyyUK
zxPR~Us~2zIy#Dg}<Co8$?%lluG>3tfK=CIFBLjm1gAT|Nke?XXd>tkfcqsDpyEiOr
z$SJa$?^rC6=%DW5eO!UlVWH&Frwj%)=hGXvG}#&RIlD@~vQ*lW;U0Y9m;z%luLoxU
WD<{8zJfjD<w3{<GFNc#OgEau=PI!?3
diff --git a/app/design/adminhtml/magento_basic/images/product_rating_full_star.gif b/app/design/adminhtml/magento_basic/images/product_rating_full_star.gif
deleted file mode 100644
index ab252f8890a191fbcb3b977b5e62c955cd809340..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 306
zcmZ?wbhEHb<YVAvxT?YM@wCXlKOg>nzw`A@(x-E(U#@w4f86x@!=C^D{(L&G@#pi2
zueamB-Oc!TO7PE@bDu9;{{3<P&)19JAC`T&>h%3l&965re!biL?OyhWlYIYvzx(s~
z^v5%jKVQ!IdNbtr$3uUAKK*(-=J&__pD&sGdbjb%vxy&0a({nN^5F!>|Ns9Pr~wpz
zvM@3*XfWu23<LRzfz97xO2G+1p8n$p*jjRe{M22Ge;jmB_c(Flf}+F1MT{qf4QkG(
yH?XBT&6i&I@Ib9rWFLoq)FqZ3k{*&JtR8{^+<c<^>YN_z;%?6DtQ<~`4AuZCk%1im
diff --git a/app/design/adminhtml/magento_basic/images/rule-ajax-loader.gif b/app/design/adminhtml/magento_basic/images/rule-ajax-loader.gif
deleted file mode 100644
index f077a0b27947e17af8fc5ab7bb53f28909622d8b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1849
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
Ht&JZ6SS$_j
diff --git a/app/design/adminhtml/magento_basic/images/rule_chooser_trigger.gif b/app/design/adminhtml/magento_basic/images/rule_chooser_trigger.gif
deleted file mode 100644
index 673d31ad5e03cb1627797ec84ff47a23bed086ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 591
zcmZ?wbhEHb6krfwcoxX;|NsB$<##6SeDU}1-+%x9{rU6f_wV03ckW!fc5UbUBT+S*
zDi__@wEy~&B}+=@T`5~|HLd%=rcIk>&YXGh;K8k1x5m_M-M4RF)sov`WozS`cgECh
zS+Qcp;lqa$T6g77J3V*q-1+n8Z{NN>v2}O-ykp0YAD=yYcG0Z!leXN8+xb7ZcxBt#
zyX)4ii)-9oJm;dvn*TwY{wKHZty*>`ymDP&;mWEdw?azSq;%|Cwrts=MT>H#oD3{l
z2?QB^hmRdQwtM&P%EdQBN>^v>|6efi;D!wwcJ10#F!S8TjT<AXHsnk?5nQ|~fBKpI
z`}gNfIaNIOQbhH}g$oz%-Mjb4j~@(!1}OeyVPs$kWY7V*2oxs_>}whVo0?l%19{XL
z4NbWD`Fzz}<t&wX0=1ZC&YC^TDUfl&!bOV&0>v3ttX#FyAkdz{kwL{)M%X*Rj-8!B
zHjsPu3YJ66%nUk#{0tfl!eTCpB7)A^91Nm?e5($z967?uz!j*=pwGfC;>KZZ&THY%
z;2!A3aOWQDcebAlrhz^Tddx}+H!d(7X%`YwVek-Q<=oJ2wMgXw<H5EL9w`xviH(dN
QU6PzUoid(90SXM(0DR}u$p8QV
diff --git a/app/design/adminhtml/magento_basic/images/rule_component_add.gif b/app/design/adminhtml/magento_basic/images/rule_component_add.gif
deleted file mode 100644
index 4032f76a2027f42b04aa0137bd904673092bf4fe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 340
zcmZ?wbhEHb<YC}pxN6McH!aqoKPY5YO7rsiQ@4(++P{9?q0Psx9cx+A-MhAL#r`$9
z({iS5o?bA$WY2}IZWF_T8{(e7d12od<UKXEWoc(zS5nvNw)1z+Z#%KOV?}>_cT)G7
z_T8uVSIupT?@Bp%>G0mO2NSwe_n$lb^6je)N4EM@N4$RjCa^AM(Y~31GZNl^dFwwd
zZpwz))3^0LdGoMq#l#(__FjK{dHwO_KYsjRAOa}<WMO1rFlNvJsRj9ofvxbs%mS9=
zjR|TCCxtj^h;Vdd%-p$R-75cflkO>ede>8g?4~HOdgbT}tVy17sN2zFDHEf0<Hssh
z8EtJLp+-JVeKuaBZU%;KBVIOTbukSMe*S6F>dM9na?HAmbeR=pybJ_Hxw)m(4ZNJx
MTy-Qoog5jg0o4M9&;S4c
diff --git a/app/design/adminhtml/magento_basic/images/rule_component_apply.gif b/app/design/adminhtml/magento_basic/images/rule_component_apply.gif
deleted file mode 100644
index 45c61c3247ae622451c924660b5e0cd19dea1ef8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1024
zcmZ?wbhEHb6krfw_&$%}|NsB%?kwH@aQ)VY>;C-xz46S3=5yt9Z%isWkx_Lfcfz^)
z+s|&7p2(=(lV;arHS1J+{^7)!16EsZE!%Q`jmHLcyDqDe?a>RbPyO=iQ~90*zuAr^
zeTIv#Pg{Ry*`_NS^0r3w?dhrCk-7TP?6{R4MLVP04;2;ch%DS0ox44J<?ZQZCo@wv
z_{1EtnSFhtU5nNHOA}{a=vjAt;k`GvAHKicd8F*ti(AeMjJDieHQ`A2=9^24cg0+L
zcWLIu?)+mZAAf#0{$lsSYg0A*RU1wfmu!!zJebmOrfBQ!6(;qD`yOvAIh;~(FxhE=
zQQ8rY?GHBuEpW14sAgPa(7Z1<YiB^zK6ASn)-z7G-FkX!_2t=HZZ3WN>3;s9#Jr=)
z*+;zcw?-BmPi;S0IrD5+?Y{I`S9)8ImUf@0*m{4>%{N!3oo=f;o<HYY&)e^>dv|o#
z>`Hm|<#FMukh`yM7amE@-x{&$_KMo=X@T2xHOf@>Ki=Up-8Sz?l3I~U=5f#ZQw6h*
zx94mN+j?!oj5F<X&vh5<53f9#{rBJBjdz#ty|=M%ThGp08w>ZvufM)v+VSS;XIe84
zd8pMXt2HZ^oXCjTVpn`TZTXEU)6RArd%o-O$NO~$Geb6;9C)&`<WQtWrOMj-v&&9p
z<sC`<@#6=>C?FI9ia%Kx85rg<=ztW0@&p6NT?SiD8IKJK2X$uOahY+*;}TEvyt)@B
zk0?4YC<N(=YI$_FGBL9ANLUy&oSE#*tZf)*punik(l5a=%OUxsbfYE{r$@tq(_%IS
z6BcM1GqpSDiASw?agno0%!lFD2L=~c1z9IoCDWS=kMJ=t8R#4>P?_M=ZtGOT5b(M5
zQl~+u6lcp9C!b0B5)3?6%}qy?>_l0XMHV)5EHX?x@a3n0OH-REQ|b*3MfGMr;n+tJ
zCj=jzXlkr$axwh0oN=~R#Iq-w0T&Llsq?Sv2q<Ca%5FAwu(%L%yj4+Kpjn)UgTWdA
D0z-Bv
diff --git a/app/design/adminhtml/magento_basic/images/rule_component_remove.gif b/app/design/adminhtml/magento_basic/images/rule_component_remove.gif
deleted file mode 100644
index 9f2f4edf9ced7be6d4acc662d8730f3612623ffb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 343
zcmZ?wbhEHb<YC}pxN6AoapuI&>y|(Ear}At{M+h+mpMtFmM?njYWcpS?n$WEmu2%l
zPU(J`5b|;HoVOhf&m;XlZ(RL((X21)S3FORc^d5gwyo}wi{*#jmUqonPr`j4Ihp@B
zf9C71t#1lbe_TBOG&%B3QQEWAn6G=bKXSJCwsqZOZ--Aa`d*afeLS@9Sytljhxfj}
zfA{^!zL)hC?>Ddi`}XyR?#3TKelQRX6o0ZXGB6l2=zw&9{KUXka$ttQ)l(`_8Vd_b
zXGxgJ9e%P!s7-7Anr%W|JGr#lJ(dbthOmaOGJL?HAkdg`!DFh5PS}AY&L^s>s)8yi
z49ZdrErP0=5?tcS+}z6IToRgkB5EugYHA!TY9e}u^85xXR`SOh`mpoJD)6v}cp195
Kd3ZT8SOWlA2#K%&
diff --git a/app/design/adminhtml/magento_basic/images/save_btn_icon.gif b/app/design/adminhtml/magento_basic/images/save_btn_icon.gif
deleted file mode 100644
index 87a9815b4975e0ddea63c6e57705e5196528fec8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 203
zcmV;+05tzcNk%w1VGIBa0K^{v{_^Sgc@+Qr`TzO!{n@?#^z8l7ululd{LZQQhAR8G
zgZ<pX{_o@e_wo6SIQf-E`?Y=hvwHfMN%@aE`kz+&uX6wW{P~J9{IFO3#)kj*?f&1q
z{^G*>r9l7x|NEIIA^8LW0018VEC2ui01N;O000F@;P-VIr)gZ)i66FkaJ*sT8{Zpw
z!-D~ryMjXjGu<qdzyWshG$IQ`pdw&$JcNYg0=cDNfXSm8Q`rCv+{(4{%vdB7N+k*b
F06TF=Z!!P?
diff --git a/app/design/adminhtml/magento_basic/images/sec_nav_bg.gif b/app/design/adminhtml/magento_basic/images/sec_nav_bg.gif
deleted file mode 100644
index d1d4535534e1090d8e0cece56d225733fa131dcf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 43
scmZ?wbhEHbWMp7rXkcKt^Xe@F1B2pE79h#MpaUX6G7L;iErATy0K%3BL;wH)
diff --git a/app/design/adminhtml/magento_basic/images/section_menu_bg.gif b/app/design/adminhtml/magento_basic/images/section_menu_bg.gif
deleted file mode 100644
index 53ac32a24706c9650b66bc0cd8c46be3d5e5d2e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 49
zcmZ?wbhEHbWM*Jwn8?6z@ZiBWZ{FOwbBBR}LGdRGkYr%c0TCd11}3JS00wISc6tm#
diff --git a/app/design/adminhtml/magento_basic/images/section_menu_bottom.gif b/app/design/adminhtml/magento_basic/images/section_menu_bottom.gif
deleted file mode 100644
index 640214713f5dd983abc157642dceb45dbe53e92d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1036
zcmdUs`%}{e0KmU{$(%99u4|Aur(QO4XZAxl$isc}QVFie!>+on2CX3T&dc*ot<xJD
zxe0~1DWKqB!jM*JNm_}r2OE1Z*w_O$wz2n%0eivNV6e{qi#|Vme*WBjj#V5bm)33p
zh9Q0c*xcN-+wIHC%aKTAeSLj(bu}7|E-o%6lgW5IzOk_}H#fJmw3J9B(&_Zd%1S1a
zaX1_vk0+H%dA(kz)9Lg1L?Y4J+S>g5d>{~zN~L14*yVD?VllZ~9u9{mCMF~j$>`{)
zQmK^5WO}_`p-_yEk6W!)wOXy!Y7GX1+wHbkEMsG1CX-30(*=V;jYcy)Jv}os<M;bj
zDwWY_G@H#+Q&W?Zlc7*(c6N4TWMpAs!Dh2%vsvJO%dRy1zjo4dKYs$`Wa%K|Fr}OU
zHeF%<z`FX=k1fsYHZG_2`nC2O9XD_BI(zT%yZgHaZV&d{{YCI|-#y`PfBgR7{;z-j
z_4whVp(lS2|MN`xR3?#&l_K?sW^_!enox{SPMM4bz0Pc%owm%(*&KG4-x>6UybGQs
zcQi1cSd4`u@s)IHHMyM0W<uffLEsf84h5|sBKdD$0gFoDQm|Hj6~{c#d!eC^-AXA(
z#gS)^sJMF?JF7~ev`P?0fBFJ;NXEZ?u+iMK)qCW<o<og#czk#L2fSC&g#f2Uryl^@
zIn^kd&>*ZiLlX!Y`%b>d!UB+e$4M4KU40Yc?qgCL=9{eR$<3CRl&z1>+wYT&fbui&
z(ic(0?t%lD9nAdgC2w@b+!7LDCl-J!yy}ix+DH{M;d{B~^#JBl5Q4!8-oLkWz3iQ^
z9`fn7?=S@5v~>tZA~#VEMu7awIXL66^o&OaJC}NP=wgdQ%dI5W5X9#|Q*rg@y*t*S
z+pLoBaXb6P(CyYYPj`IVAcZCwwnT%7dO3qEM3;&m9EP$tvs)iJ@;35`R76e@1Hxco
zsv)r4ax*mtR`n5|06$KpFtHcJd{)7`Z2)Tz3JO8w7M-nY-g|;TZ{9C#khJXmgf8BN
zGPC<~5zayI8iUv?ftO>8kw9TVA^d9&x=7m3B~YE-yc75e0XGLj7qlNki+vmz#n}(3
z!&eM&@kA#LdJ11m>8eBlbZ(wT)pf`0`k2Q<M=!DoCreWGm@nOAVmF8{8{}2)FAMgy
Z9epj-f8)bbAwlO?!q7nXmV6}e*1tK2){g)H
diff --git a/app/design/adminhtml/magento_basic/images/section_menu_link_bg.gif b/app/design/adminhtml/magento_basic/images/section_menu_link_bg.gif
deleted file mode 100644
index 4f5b1e1f4305b9a03628943016cd5a398f300b50..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 43
tcmZ?wbhEHbWM*JwXkcVWPEKZEU{L(Y!pHy=&;ha;Kr#$WOfEqT)&P|&1$+Pi
diff --git a/app/design/adminhtml/magento_basic/images/section_menu_link_over_bg.gif b/app/design/adminhtml/magento_basic/images/section_menu_link_over_bg.gif
deleted file mode 100644
index be6bc4eefa3476282d9fdfd48e8400fb53ca59b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 600
zcmcJM$xa#p06>Ro#a0rFVnoFhQ&EgyVpojT8f#n*UF;r>T0AuU1dp__Nt5<slb)I;
z<<Jjk6AwL<O^`(d1Yw2&X5SbXU>KAoY0}t#=sUdQyS#;^dDDd11;_vf0FcsYN~r85
ziA?d-3E?0wCi9XvL+_`lW40J&gdm;`k^CM^xRN+hsyZPoh;cEtfQhwC@nk<m*+DeU
z75xZ9NR2pG@?~fr!i34314KP3>JZPmVZsfQ?i7iaYY{4cMCZd)4lCCVFwT=A4+$PG
z*I}V@L<^1t`a6#JQ6^QWprvY*DTJwf0Ar(U0T!eH#@XV?0m^|{k(3${D(6GkWUg$p
z+3X;8%oTB|?n#p|rVu2uiLB^N(=M2BK$sK6P_YK_<p`Y*5xh6Ugvgv9VZ8{Q6r?CE
zz<CMcMO!S6id90YyC6J(vQVx}RvHcvOJqyw!ihbB0{?-5dh@@k;ml`G0Qs(E<L$=n
zo}ShBt8)g!;GkaL*?Di}^UAgMcHm3XSCwkhYP~A^ZZw*nwmffXS)W<|asS2n-Kj<M
zFLQ5iclX^3&W?`x>$fiYo{fzS4e4|bZcGmk_xC?iJX9z~N4468HbSW!8JU<|Tf50W
zzN1!;YnC;AeNW^|a(U~YuCB||s%7iucB}Hr?Dp$#b2Ck{a~cyiyVLgO!zHc7{Igl1
Y9(XymwKe|g<GW9KBWKysEoy<uzgHkT(EtDd
diff --git a/app/design/adminhtml/magento_basic/images/section_menu_over_span_bg.gif b/app/design/adminhtml/magento_basic/images/section_menu_over_span_bg.gif
deleted file mode 100644
index 9f06882b424f433bac8f6d3f1dde2c276467b1f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 316
zcmZ?wbhEHboXfz-aFu~!|D{WZuU$KS^XApZk5AvZbK${*lecc2y?gh{<Ht9iKE3+n
z$(cKM4qUl%;^xhZ4;~!3e*N&(t7q=sJ#y{ZzDt*`JbHBD{{71jA6|U;@WicK$8X#?
zdHeRM+qd^$zI^%7qeEA(9=(43+`W4TE?+)&<Hq^>_b)wsc<{=VYfqkBfBN*svu6y{
z0E$0Zz{co+NRXcx*diUK6nN-J^`A&lD$KI-4Oro1xI$^&l)i1rij|(??Ta1O^_)|l
zAXSp#uGGz%xNl{?Nt?~GivmB4l^T`gTjcrqg@hQp1q9^!<y0q4;^9%8t|&80hGDL-
Iup@&t043;(`~Uy|
diff --git a/app/design/adminhtml/magento_basic/images/section_menu_span_bg.gif b/app/design/adminhtml/magento_basic/images/section_menu_span_bg.gif
deleted file mode 100644
index 627e9ec35ea28069e2c145439730643903065c3e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 43
scmZ?wbhEHbWMW`sXkcL2cjU<NbLSL)vM_*v4u}BBFfcLka4}c|0P#i$cK`qY
diff --git a/app/design/adminhtml/magento_basic/images/section_menu_ul_bg.gif b/app/design/adminhtml/magento_basic/images/section_menu_ul_bg.gif
deleted file mode 100644
index d1b4d718bd9043805ad8fb6a854838cd7d784ef1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 64
zcmZ?wbhEHb<X~WASj50^_VU$z`}W;<`1H~HFE4)lV}Jq0pDbXe4u}M)WngCY@KP4w
HWUvMR<y{e|
diff --git a/app/design/adminhtml/magento_basic/images/side_col_bg.gif b/app/design/adminhtml/magento_basic/images/side_col_bg.gif
deleted file mode 100644
index 33801a6aec488b94f6e9443a1f85d8b2f3d5d633..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 49
zcmZ?wbhEHbWM*Jwn8?8J`0?WpA3mHtdzOKLLGdRGkYr%c0TCd11|}w+5C&@ie%}lW
diff --git a/app/design/adminhtml/magento_basic/images/simple_container_bg.gif b/app/design/adminhtml/magento_basic/images/simple_container_bg.gif
deleted file mode 100644
index 933999856de941409869a654365812bd7695a20e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 49
zcmZ?wbhEHbWMp7wn8?8J;>C-%Z{Oa!b&G+4LGdRGkYr%c0TCd11}3JKAO>pyh6xO=
diff --git a/app/design/adminhtml/magento_basic/images/sort-arrow-down.gif b/app/design/adminhtml/magento_basic/images/sort-arrow-down.gif
deleted file mode 100644
index 825e492e761b368a980bb35e27d8e11c6971ba34..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 117
zcmZ?wbhEHb<YeGx*v!S?6q~+t|DnByjutd`%~-PX=&3Vq30bGlT{v_8Vq8hh^&2-C
zP=Vr47DfgJE(RTtFvtuB7Nr1B)@4h}ul4+#=PJOEq{zv(K<bdo3Wh@70}~WaE<9)>
Iz{p??0F*c;PXGV_
diff --git a/app/design/adminhtml/magento_basic/images/sort-arrow-down.png b/app/design/adminhtml/magento_basic/images/sort-arrow-down.png
deleted file mode 100644
index 74288ad241171966d184847de65e3dfac4a1d7ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2944
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
diff --git a/app/design/adminhtml/magento_basic/images/sort-arrow-up.gif b/app/design/adminhtml/magento_basic/images/sort-arrow-up.gif
deleted file mode 100644
index ea2ee5ef595016fd77f88d70b259995531c366b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 117
zcmZ?wbhEHb<YeGx*v!S?6q~+t|DnByjutd`%~-PX=&3Vq30bGlT{v_8Vq8hh^&2-C
zP=Vr47DfgJE(RTtFvtuB7A1ibmQ!sxZ?0vNnB(MgL``C{VuY&zL!KbhL$~XvVqY7J
IGcs5M0CwCZIRF3v
diff --git a/app/design/adminhtml/magento_basic/images/sort-arrow-up.png b/app/design/adminhtml/magento_basic/images/sort-arrow-up.png
deleted file mode 100644
index 2863a05111d4aac943777bbd30c5b7fb07d5821f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2940
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
diff --git a/app/design/adminhtml/magento_basic/images/sort_heading_bg.gif b/app/design/adminhtml/magento_basic/images/sort_heading_bg.gif
deleted file mode 100644
index c9642dfdaa9bcc634c18d60612f92b492f99c04e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 55
zcmZ?wbhEHbWMU9zn8?7eV&%#=uU>83wCU&f?}|TJ7(hS=M1bTOm^iNVEI;|0*NKtA
F8UPr)5wrjR
diff --git a/app/design/adminhtml/magento_basic/images/sort_on_bg.gif b/app/design/adminhtml/magento_basic/images/sort_on_bg.gif
deleted file mode 100644
index be9ef00458c5c5b7f8bc864128e0b2026739d816..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1244
zcmV<21S9)LNk%w1VL%2#0HOc@l9H0l$i&>rwd%{L_~z06`u6hFumAu6A^8LV00000
zEC2ui06+#p000C32)f+<Fv>}*y*TU5yZ>M)j$~<`XsWJk>%MR-&vb3yc&_h!@BhF?
zKrk2<iN+*yd2A}3%%?O;g<7ZADt4>wX1`ppH%uOz#prVStZuX4>$qDEpWEwry8gb;
z^Z$N<eS?66f`y2OiiV7djf;+vkdu#<l9rU0nwgxKo|~VYWd;BQ1_h?5r>U%~uBx!D
zv9GeVw70Xlwz{~xzP-S_!oS18#K*?T#mmUd%FWQv($3V;)zjA5*xT3L+TPsX;^E}r
z=Hut(=<Dk3>F@0D?(y{V_VW1k`S<$${Qvs``V$DS8GwQa2`U`OFk!=m4kJRG_^_fx
zixe+v%*YY{qsNUOJAxc3vSi4UBvG17$#SL3egIy!R7rEDO_?}r=Dex1C(oZdgZdN-
zbg0pyNQo*vx-==%r`t+7o!Yc2RI604YR$?OtJkexyMi4nwrtq5WYL;Ui|(M>w`|wS
zg*!Jc-Me=4*4>Mjuin0Z{|fd?xLVA?feRyEthjOF$BZF6j!b#7WyzQ;XTEGo>gLay
zLvtPtnzZQBs86dl%{q1K)vn*Ug-!dl?bx+(-_Ff@w{P9Rdk6n5oWNn?$cHO0o}Bse
z=Fp!@cTPQe_0pcNYq!pQdiU+#!-F6Hy}Wqy;Af*>f4)6=_w3)xk53=I{rUIR9na4n
zzyJFG|MdspfC3g6;DH3jm0f}i8rUF$4n_#!gb!9Ip@sOVcj1N<a){xF9){TAh#-<E
zqEq{ssA7pMp6KF=FSZEdj55}!%7QWGNTZH6?&xEWK=LT$kAP`N<dH!lIb@PdF6pF_
zP&P?Vic(hjq?J)#sb!X2V(DdmICi<^mtvMl=9y!rX{MTm8HwhaaK0%gn{>um=bU!J
zbmyLV;^`-!fA$IJpmBy7=%IunD(Iq$Hk#<8&bbMxql`{!X{DG_s_CV5QOW72nS#1$
zsHBc+s;CedifXB=p33U0uEyHxtdhbytF5@on(M8)_FAW>y9Vp4u)G#a?6Jdss4BAm
z#wOeBv&=^8thA`rI_<U4VoU9|+IE}mOTc=|?YHBWEAF}EqC3vA>b9HiyXL~{ZoKhY
zEAPGZ&Z{rJ`{oO2xcmm}@4)>QEU>{*vU~8t1T&2A!wyHBA;b+=O!37MV{Gws0B`KE
z#vo@b^2Z}LrZCAUhn#ZBEU)acS@yo%vdT2iY_rTb^V4z7Ip56l&prp;b7w;XU9`|f
zCyg}AF)Mxa(@sadG}OlKJhjwRXN~pNR|9%7*IIWS_Sj&TEo9STn@x7wY_IKhk5<3k
zw%T;hZMWR>eSLS`c=PS|-hgX{cHe>jP59x4CyrL!iX&e5<Bmt(I8u5`4*BGvmuGJI
z<|GY{Ip>;xE_&#sAH#U*ql2z`>a2%edF!jAE_>{>EAIL1u;-5Z?zK;SdhfvN9z5^D
zU;H}p$Pcf4@yYLd`|{045B>Dam-~D5*h`;1_1Y(TJon&lFMjvo)A{`P<)@GS`s9~*
zef#jMA3yu@|M)%q_|LC@{rRWY|Nr{~ApZjBp7#y#fC5Y)0TH;F`z=s`42&QICs>sP
G0029kpUnUO
diff --git a/app/design/adminhtml/magento_basic/images/sort_row_bg.gif b/app/design/adminhtml/magento_basic/images/sort_row_bg.gif
deleted file mode 100644
index a02c2c0205be6131ce43f1663568e2f08d0e9242..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 535
zcmV+y0_gomNk%w1VIBZF0K@<Q;^N}p-{0iq<kZyE*4EbN=jZI~?CR?3=;-L><>lJi
z+S%FJ>FMd$*Vo(I+uYpT-QC^%{QUX(`R3;4?d|Q=)z#qO;O_43)6>)Y`}^bL<Kf}q
z-rn8-0000000000A^8LV00000EC2ui03HB3000I5V76T%IhN?Dnyf`hF8s#yY|A*C
z>g%53HQ+5+>lt}S)Nm<m(tJlKlE|bslhLfnS?$WS(y-S`4ug;6F%!!+bKmK6yEm`@
z((t9+th4Vo5gQbNgMx&IhKYrX00t3_kB*R&l9iE{jvASp5t^Nxo}rl$0tcj~rKhT?
ztf;ODrmzvRw6V6cx3UZo6T7{<zQMr5zr_&+2*=6D%FWEr%h3o08PnC&*4fzG*WC>Q
z3*X`3;^pM$<LLql1nceW?(y*R@AVD@8u$75`u+U>`vO+b@L*s;f(8>JTzIgd1_%Qo
zK8#3lqD6@qD{vS9U}Hy)9z%j0`LX1H4FOJ+rbMZ-CCis9W5RS9lcvp=7%Xhaxl<?4
zpFV^3><M&e(W63n1^|FzX;Y?7qe7kfw5kRS9Ij@?s<kWEuUo@voG`X52eN0)qFp;S
ztXH>S-+E=6wl3YfX5;FG%eSjtwSfQrmAjWP-@teU-|btt@z%tU5o>g8xUyo&m(y0J
Zycct1#f(F5{!BWrXwGgkm;M_906Uf@DNO(X
diff --git a/app/design/adminhtml/magento_basic/images/spacer.gif b/app/design/adminhtml/magento_basic/images/spacer.gif
deleted file mode 100644
index 5bfd67a2d6f72ac3a55cbfcea5866e841d22f5d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 43
mcmZ?wbhEHbWMp7uXkdT>#h)yUAf^t80Ld^gF}W}@SOWlZ0R#L1
diff --git a/app/design/adminhtml/magento_basic/images/sub_button_bg.gif b/app/design/adminhtml/magento_basic/images/sub_button_bg.gif
deleted file mode 100644
index 17d1bf74d4a3efaf233face6d1507eb236f48bf7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 62
zcmZ?wbhEHb<Y3@nn8?8J?%lf|KYo1p@Zs05Uy46j7(hS=M1bTOnD}E9+NRsAh-y}M
Md#*8eGXsM)0O7F}h5!Hn
diff --git a/app/design/adminhtml/magento_basic/images/success-msg.png b/app/design/adminhtml/magento_basic/images/success-msg.png
deleted file mode 100644
index 24bfc750a218f5b78a8c3bff6ecb0459db63593d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1662
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
IM6N<$g3@dq0{{R3
diff --git a/app/design/adminhtml/magento_basic/images/tabs_link_bg.gif b/app/design/adminhtml/magento_basic/images/tabs_link_bg.gif
deleted file mode 100644
index 94506909fef67d0cae48ac0a1790836e04ad271a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 49
zcmZ?wbhEHbWM*Jwn8?6z_2I+k@87RIaDah<LGdRGkYr%c0TCd11|}w+5C&@ibWjVl
diff --git a/app/design/adminhtml/magento_basic/images/tabs_link_over_bg.gif b/app/design/adminhtml/magento_basic/images/tabs_link_over_bg.gif
deleted file mode 100644
index 185af722bb46dfc396892708afdd024b6c2a2354..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 49
zcmZ?wbhEHbWM*Jwn8?7;y>#h;OP6jud&a=Pp!kyoNHQ?!fC!L00~1q70E0CETqX-l
diff --git a/app/design/adminhtml/magento_basic/images/tabs_span_bg.gif b/app/design/adminhtml/magento_basic/images/tabs_span_bg.gif
deleted file mode 100644
index 4f5b1e1f4305b9a03628943016cd5a398f300b50..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 43
tcmZ?wbhEHbWM*JwXkcVWPEKZEU{L(Y!pHy=&;ha;Kr#$WOfEqT)&P|&1$+Pi
diff --git a/app/design/adminhtml/magento_basic/images/tag_blue_edit.gif b/app/design/adminhtml/magento_basic/images/tag_blue_edit.gif
deleted file mode 100644
index 6a9d3700b71250c23501f0c03c71a7f9009de31c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1021
zcmeH`+fPz)0Dylm^0JxImd&ipWXqba`O>o03iIxq^TC?8Ow+Qh+FUags|Qe1Fq<`J
z%)&5bk~vLgnWLDZh$td(4oHfM2s;=dHxUtzr~E5=>H7!1?c2W8^pyCEB}703ZW@@I
zo7>vj+TGoi$z(d6&h2)?FzoeuT`pIh6q}u$RsZ(t^?JEn{#}nc91heiRw|WCZ_+k4
zHaz0ChVpY-trmhH^=K9Sc8o+K+0ow=i9~PJ7-aSu3<g1M_>Xl|Fu<DlOLOwbCl=!L
z8keD^p$0@y?a~%u4&5mCd0#onr<=5>sC3z$)oNYnF5QGEjQKretXcZ80^Jt+d_JqP
z-?Pr^T)_J1iS00Ex7$U`benS6rM<<3F@-{*>B#xzLTxsi$z(DbjdE6*LtSf;*VrIR
z^E{^dTFW2oLboTI=1`N<3xBvT6biQtgRa#A_iCwzlWT#Wt-R0rDe5)CpSPDENE#B@
zlLEKCK+Z}*5JW5%^M^Q2r_&BUSy@?eujO~BFrI9DhW}c?$lQho1OkC&=Ao9E!5?5N
zMp{)W)uv{MJN3nEHs>dXN!#<7DvZzT#hgZi<oaSqmVILtnXUFnUZE(8VHo(&zbJ6Z
zL%;z*1F`$^{U<=cB0$2L;(Epb@F$!t<l3&W8$+%F;#fsVJvqpaSTjw=i5Lg*IAR%F
zN+lDfo)*Rf4h?spr#_(a?qo&+h|r(Ou1~@HQ)BzbX;DEZKoveP4%eO9aXPrK2k@f(
zJN?5?6CADN>6gKei%eX_l<06mNc{1@;mC}L^Lgw_3W-EN*>Hv1RN}qkS07p2c8@|U
z?mBcK?VFFv#<v`ekHY7?7{^bv#2jO$$w{O7Bhim`a`TjpnF!<Z4I<87m-G$_jmZWE
UPI90o)LK?tx}LPgz~R89KjuJ$W&i*H
diff --git a/app/design/adminhtml/magento_basic/images/tn_cancel_bg.gif b/app/design/adminhtml/magento_basic/images/tn_cancel_bg.gif
deleted file mode 100644
index a3d92e461f740967cc32aab47fb157ad0b0a5756..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 147
zcmZ?wbhEHbWMmL#IKsg2Da7o(iSX~`y+2wqKF8UAEe!cy758V|ls8&zAH8+{ZkheT
zS^1qV&+qvyzou3H>@E6|?)h)m!VlKc48#G&pDbX7Iv^5cCj+ZM!V(#$$2QG@4lEON
Lf(|GsGFSruXAUZ)
diff --git a/app/design/adminhtml/magento_basic/images/tooltip_bg.gif b/app/design/adminhtml/magento_basic/images/tooltip_bg.gif
deleted file mode 100644
index e4d9e99348ea72d4105793b9702701c1e6a7263a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 294
zcmZ?wbhEHbWMqhExXQqA{r0(=cP~DB`S8Y_3)k<Qzj5dM<7ano-Mjqs#e+K!uHL?X
z`QD=&cOG21|M<q;hu3c2yY%Sko#!tf-FtNX`t9=%p4@u!{Qi^Y_Z~jE_3+8<`;Tuv
ze0uxA<6AfGUbu7r%99uOZ{54}`1!rt_pjW0c>U>%`#0}heE#au<7f96s0S2(vVaZK
z0g)g-F|auw2vSkf5EDExae2_j2A{SSj7%33^h8dnUCz)E6Y4zi&|`*VkDtduyB+-V
fk2i~~xNX^7v+sbuz&{pY24NP4w)T#8M+R#ExT1vW
diff --git a/app/design/adminhtml/magento_basic/images/tooltip_corner.gif b/app/design/adminhtml/magento_basic/images/tooltip_corner.gif
deleted file mode 100644
index f49f64f7fa41b9505fa2699681f04110e85b7e5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 854
zcmcJMNlz020ELIzuqlc|6-p>lsuB|o7#Bc@6i`5M_kuf^m=F(c@nGVmKr2w90nrEw
zmKb*rkf^vFtW^^Y5#kapWt(>PeWrV7reN_u_zv&z4&O`OtKLynRNRmWtOPIsh{iM<
zB`6rirab5*M!Hb~LhxxfGJ)VT7zx4Hv>TmJ6xofqWLZLq8HAX@DNi)2C{YE*r$sM^
zQ?Lh}z)25;xM&vR1zM6K5bW|`Q{iyXAMg@1OtZMG$R2Ex7io$?3EJZidPOhGiwq~w
zkw{3ABP>UfG$MFeL1ZC#oMe!2ESJJQpFlCVq9`<jaXcmZIFdy};ea48f{!C8REf$A
zPY@)G5YvLl_yVFR#>gy1p|T>;EFsB~Kj_1$7@QM*Jd94UJQ)o6y?!AS4l*nu%Q8u$
zqMr|i0u+rh97)h9#l{x;ztTt4{|eU5`}`+B!kj5LS7kQ0SlZgH*79R|od&4T<>>SC
zI;<r*K-^uMZF9}eUR9pHf8ePtr^uY1ZYf&#?4?a-7y`|Cn}^@W={ADk&=I?R%_nf*
zlP@nd1>nXdV{w3Ue7sP*+U6Qh>w=(l1$_umSGa3S*%H!Oo0~$WY|%!v`7ok6p7z7?
zWuK|ONu~4b51-UqEv>0<vij=mt&X*t4X0m#gK^1MHOn-q?e~tq%>*@%kAA(d%9<$x
zjq8ow51VfnRljcQg_A~Yn+|ohC7BY`iN^DLzLwwE+59NJGrK?8?HIk3cA#|kxg3=_
zvHoLK2H3sr`hv#qXO77?s!Kt`^B)gST{h882C*;e@zAU06K_lh@8216@Xa3=#sgLF
z1}bjGcNz*Wom(ZEMs6)NjP^Obz*tXZNA~W+7u$b6NJwmJaHw1VWYwj1RSXQXBP+Jn
z&l-)N>$SrzY0$Tl*OnQFHZh&MGpROYWYkm}`++O;Z|%{ui?2D7Dd<V<iZNqp=ZE$7
v5+h{)5EgzFm-g(PEAQ5^x<==qzD$lv+Y21=>gCSLrP(WcphX+hDxl;q<`>21
diff --git a/app/design/adminhtml/magento_basic/images/tooltip_top.gif b/app/design/adminhtml/magento_basic/images/tooltip_top.gif
deleted file mode 100644
index 0e7fd0fa283bff6d0feeaf9a0a3ffd8890788e60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 295
zcmV+?0oeXWNk%w1Vfp|H0K^^uiHV8r@9OOC=<e|A@9^yG?&<LI?(6R8^7HWV^6&5Q
z?d$F6@bT{L@9XjN@9gjC^YroX@$K&L?CS03^7HZS@9FC7=Irn4>+a|3?dI|G@ayg8
z?e6LC@$BmG?f?J)A^8LW0015UEC2ui0Qvw5000G~peK%GX##+$u59bRa4gSsZQpp#
z0uYqyz@TtQEE<m<0Afk`A)nBwbP5F|5)Ow3;iP)M;4l@yFqqBPu6WIEyITN4M?qIa
z7>tPe&F}lG4GjYW5)uT5h<ksFjEyn?0tFWVlmUW+n2L^@oQ(hr7zYKTqYn=il>r=@
tovp4%D6z7#784m08w(2uyaximzyh<w#Kp$P$jQpf%+1cv(9zH#06U3tqRs#S
diff --git a/app/design/adminhtml/magento_basic/images/tree_icons/join.gif b/app/design/adminhtml/magento_basic/images/tree_icons/join.gif
deleted file mode 100644
index 34dd47610a5d7c3580dedc342683559bf77abce2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 69
zcmZ?wbhEHb6k-r!XkcV$XlVHV|G(l-7DfgJMg|=QAOOiQFv;}DH=KUEdfpt3ORshA
Wx&LIzk};W<<T-c6l68)Z4Aua>vKC_i
diff --git a/app/design/adminhtml/magento_basic/images/tree_icons/joinbottom.gif b/app/design/adminhtml/magento_basic/images/tree_icons/joinbottom.gif
deleted file mode 100644
index 48b81c80a9e25f6f29e2614aaa33bdf4a4d2881b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 66
zcmZ?wbhEHb6k-r!XkcV$XlVHV|G(l-7DfgJMg|=QAOOiQFiG~vH=KUEdfpt3ORshA
Tx&LIzy5lkJS?4l0Mh0sDgH;v`
diff --git a/app/design/adminhtml/magento_basic/images/tree_icons/line.gif b/app/design/adminhtml/magento_basic/images/tree_icons/line.gif
deleted file mode 100644
index 1a259eea00c330eee85fb18aa64e2e232d5410b1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 66
zcmZ?wbhEHb6k-r!XkcV$XlVHV|G(l-7DfgJMg|=QAOOiQFiG~vH=KUEdfpt3ORshA
Txqp6J8?ND(@^elGBZD;ng_;%{
diff --git a/app/design/adminhtml/magento_basic/images/tree_icons/minus.gif b/app/design/adminhtml/magento_basic/images/tree_icons/minus.gif
deleted file mode 100644
index 3d212a97ae0d8f83aa39836c5a85d442f8602553..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 86
zcmZ?wbhEHb6k-r!n8?h~)YR0_(7?dJ@c;jR#h)yU3=GT+IzTQ^R)~RtNqvre<LS4n
p=gnCd^;_wTuW@}thtibPCaqZ=Ryx^xZkGCPW4^O%_kC6dYXEJi9vuJx
diff --git a/app/design/adminhtml/magento_basic/images/tree_icons/minusbottom.gif b/app/design/adminhtml/magento_basic/images/tree_icons/minusbottom.gif
deleted file mode 100644
index dc3198be275d3da71011a6cb4fa59b8b94656c8d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 85
zcmZ?wbhEHb6k-r!n8?J?(9poZ!0`Y7e;}#&lZBCifr&u}$Og&^0oiI(^czmUT|IBk
lf~en0XMBz88#;uhq&8{I>afzu-gC3m_gnAtsyGG)YXIxA8@>Pl
diff --git a/app/design/adminhtml/magento_basic/images/tree_icons/nolines_minus.gif b/app/design/adminhtml/magento_basic/images/tree_icons/nolines_minus.gif
deleted file mode 100644
index 2592ac20f3f4c28e38f789309ec52f08505bdf6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 861
zcmZ?wbhEHb6k-r!_|DAG)YR0_(7-SXMnhmkhJfNv7DfgJW(FOQ??HKjfy0V{okPZB
z!-9j&9Ku>LGYlFIxARNO@hDtWaBUIiPTOMfV7_}lvsu=hh(Z;&NfL@qDJM29Jw4q(
Jn2m+O8UP#&8=e3F
diff --git a/app/design/adminhtml/magento_basic/images/tree_icons/nolines_plus.gif b/app/design/adminhtml/magento_basic/images/tree_icons/nolines_plus.gif
deleted file mode 100644
index f258ce211a0a19c2ecbcb11170b9a8b35ae2436c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 870
zcmZ?wbhEHb6k-r!_|DAG)YR0_(7-SXMnhmkhJfNv7DfgJW(FOQ??HKjfy0@BokPZB
z!-9j&9Ku>LGYlFIxARNO@hAj7*xx83m?l#Y_`t1M<bS7#<%8sdy|Uh6PdW-!9VhE6
SI;D7QUUqi2g)kcngEatK=pa`B
diff --git a/app/design/adminhtml/magento_basic/images/validation_advice_bg.gif b/app/design/adminhtml/magento_basic/images/validation_advice_bg.gif
deleted file mode 100644
index 46b1a2267ba5ad31f59a9c6cd8eaac9ee3b0f8ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 134
zcmZ?wbhEHb<YeGw*v!N5efR3Gi+Vq|<$PN`<DHe@&&Rhu1nT^HdiR|<-?uG`-<fiM
zKd|xluWt-6p!k!8k%57SK?fuNGJ}D|c!FoxGGCR*X%n1gT@mDBG-62NIhCN$kRa2&
gNv2Ie#%HfV`++0dU*7CG;(KY+91%8APZkDi0Dg`$ivR!s
diff --git a/app/design/adminhtml/magento_basic/images/varien_logo.gif b/app/design/adminhtml/magento_basic/images/varien_logo.gif
deleted file mode 100644
index f24f00c36ddf0018d827dd4b5735987fa2a7b67e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 403
zcmZ?wbhEHb6lM@-xT?wU^6-HdyS6{Sd-p?1<eLSv-_@19FU|QF>Gx{Wy0`ruFL!N!
zy>iL(+qYg<7Cygv`OS<;A99l4S?YZ7w0-Mj_G;$jcQ*PjjvjuUm-^z&skeElAH40~
z`Z~Q_GXHIH*1PulkKx`Qg4|!OU;QS+_x1FN?<0I)^>w^Sj{F!M@XlQ8*|TR16a&Sd
zEQ|~cnhZK1lR$oAVB2tDN`Z!mLdS^|E<+1P1}~Lm1*^h@n^rtXw3S@b>>6}&jnsma
z*O4z4gdIMTD}LKDX7kC+uf|599s!zsasezX6&yl>s%jc)PTan&eq2r(8a;hZLS>WL
zC8y2k?bp;0RcMtGTrz#;n(2(1s?*o6Td1*d^Q@(dc2D22Y0JWGdk*Z{x_JA}Lwi)k
y_iZ?ML4@brsY^?QWjyzv-W@2tMNw%wZ=loF{Tjj|&t1fNd3oM>iamE^um%8>uAmzL
diff --git a/app/design/adminhtml/magento_basic/images/window_close.png b/app/design/adminhtml/magento_basic/images/window_close.png
deleted file mode 100644
index 6e2b6dfb1d098287e6f7f87f1d2acefcd4a074ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 872
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<w6XvX4FBupZPXzdc
zxN?b0rR3zL=H|zxWh7)|CFkUFOGsCPft8h2QBjedtzASyvYoB1ot>SdqZ1HjW@eO?
zmHGSodwF@exw#b<6{V!40NKI8!FE8^wszIkRXmb1K&ga;c(0H!ODn6G=;+AA<nZwD
z`1DLyH`nsAGN287QnJpz{<(R%W#wgletv;bF+eRq!;6Xvfd)E(L0MTjP(g5Tkb;&D
zP)kluPHIXD(Dss&Qg45MSN}jGTYF6-6L)VPO(WCumoAr=l?R4Jc=`Iq#m1}Z8-|62
z0iBePnx<!N0dx}3g(3<{AyLte&d!FGR;qdiE}mZM`bOt3T?z^f@$&XkF)#`V3j=yp
zSV76j+c!EUMp@s`z}hw|CkN;ZpdWpLLj%Jjy!`yHUcUhp^YZlz4GoJ<PW2875m#0d
zRaB{}u6FYFNlZ(>e)FbJXvF!8m(p``qY{%fjLrN*!$Kn>tz6vBUA!b9BY)%8?bOVy
z(CC<;h)AGcgCnEdJv?;Gt#01FBde+77al1jrw9xp3nv!`FJDV%S9?z%w}2q`z+gdH
z1>dkperY*gDH#z3<&fBTVR@yuEzO64aco`^<Ohmt5O^CX&HR}m>VVL?ORG<29y`FF
z%zq$i7Xz~*gR~-pA_E)GE(V57p-T*V5AXf6PH1U@mgy8=nqlPdba4!+xTSimwW!%a
z#Ni@)OT}F%Fnu>qV3LDk&i8Wf+s4J|dKXL_1yojE44JT`#w1{hQ((vn>w7VmmM+uC
z(zp;_TK@C-o@wdb-!IOex2*lztvL(c{+_RUBaG|m&FkiFfhiJhBE9<TKQG)UI{x{g
zzNGxK<8GT5EO_7i_{_Tsn|Ef#cV0?`*dI;eY(M_MphBqg#t)^CckbubF6=)4`{{(Q
z2A`@}Qqv`rTb7xByC-lcL+(@Cuf-CxnJf|xU3^idZj$n5M~vTm1rEFA6XxW!Pg>T_
zT4wh1^|ZUPZ&;U_eJ^sIq!O0*dX+Qxf}C@6Hu|qwKhNi8d-baa{ktN*+8Hfa6@L0Z
YGuOs21*KYrPoS{$boFyt=akR{0Lf8D(*OVf
diff --git a/app/design/adminhtml/magento_basic/images/window_content.png b/app/design/adminhtml/magento_basic/images/window_content.png
deleted file mode 100644
index db3c448660b828cfba275f9536f4abb80ab68e03..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^j6fX4!2~3~*{yyBq*&4&eH|GX)}JtE?Rp91OP07s
zlmzFem6RtIr7}3C<R_&nc;+Uirv{}arc@T5Otk?jGVpY945_%4bZd9HzOb^gvP3h3
z*(?#m6w8vroL3(@7bml^v2BPF==J5BE9WAiaDX9<hk5a$A6usa^)h(6`njxgN@xNA
D>QpYU
diff --git a/app/design/adminhtml/magento_basic/images/window_top.png b/app/design/adminhtml/magento_basic/images/window_top.png
deleted file mode 100644
index d30bc1c89e0827a2873a8804144f648a2cedf883..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^j6f{I!2~4r?VV-=DVB6cUq=Rp^(V|(yIunMk|nMY
zCBgY=CFO}lsSJ)O`AMk?p1FzXsX?iUDV2pMQ*D5XEIeHtLn>~Cbe-g7P!M3^eR`|S
zKU*xuY#zT+BE#0wj;13W4nnFsV@lNC9{c%g`t8GeXJ4<+<1%3IzZR$-vii#dpcxFF
Lu6{1-oD!M<9!WI@
diff --git a/app/design/adminhtml/magento_basic/media/editor.swf b/app/design/adminhtml/magento_basic/media/editor.swf
deleted file mode 100644
index cfb41be837eeda8be10f6c43cb8ed93d05b42625..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 266207
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	W%gU0qaZytkFIa6lj87J<!BjC
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
diff --git a/app/design/adminhtml/magento_basic/media/flex.swf b/app/design/adminhtml/magento_basic/media/flex.swf
deleted file mode 100644
index a8ecaa083fbb8b2809da535392eef7ff20b361b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 19507
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
Ws+i$%Tv08ib=cWaqWB5%p&B2rCPPjD
diff --git a/app/design/adminhtml/magento_basic/media/uploader.swf b/app/design/adminhtml/magento_basic/media/uploader.swf
deleted file mode 100644
index 9d176a75f67162985262ba3b178eeb879960596c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 180912
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
I58cl)02aI;RsaA1
diff --git a/app/design/adminhtml/magento_basic/media/uploaderSingle.swf b/app/design/adminhtml/magento_basic/media/uploaderSingle.swf
deleted file mode 100644
index 1d3a0bb9935a0455879958e33ddb06fe47cf3e78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 181368
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
diff --git a/app/design/adminhtml/magento_basic/menu.css b/app/design/adminhtml/magento_basic/menu.css
deleted file mode 100644
index 19eb0cbbc73..00000000000
--- a/app/design/adminhtml/magento_basic/menu.css
+++ /dev/null
@@ -1,99 +0,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)
- */
-
-.nav-bar { border-top:1px solid #2d444f; border-bottom:1px solid #2d444f; background:url(images/nav1_bg.gif) repeat-x 0 100% #666e73; padding:0 30px; }
-
-#nav { float:left; }
-
-/************** ALL LEVELS *************/ /* Style consistent throughout all nav levels */
-#nav li { position:relative; text-align:left; }
-#nav li.over { z-index:99; }
-#nav li.active { z-index:100; } /* to prevent the li separator from showing through on mouseover on li */
-#nav a,
-#nav a:hover { display:block; text-decoration:none; }
-#nav span { display:block; /*cursor:pointer;*/ }
-#nav a { line-height:1.3em; }
-
-
-/************ 1ST LEVEL ***************/
-#nav li { float:left; background:url(images/nav1_sep.gif) no-repeat 100% 0; }
-#nav li.active { margin-left:-1px; background:url(images/nav1_active.gif) no-repeat; color:#fff; font-weight:bold; }
-#nav li.active em { display:block; position:absolute; top:0; right:-1px; width:3px; height:27px; background:url(images/nav1_active.gif) no-repeat 100% 0; }
-#nav a { float:left; padding:0 14px; color:#fff; line-height:27px; }
-#nav li.over a { color:#d6e2e5; }
-
-
-/************ 1ST LEVEL RESET ************/
-#nav ul li,
-#nav ul li.active { float:none; height:auto; background:none; margin:0; }
-#nav ul a,
-#nav ul a:hover { float:none; padding:0; line-height:1.3em; }
-#nav ul li.over a,
-#nav ul li.over a:hover,
-#nav ul a,
-#nav li.active li { font-weight:normal; }
-
-
-/************ 2ND LEVEL ************/
-#nav ul { position:absolute; width:189px; top:27px; left:-10000px; padding-bottom:3px; border-top:1px solid #2d444f; }
-#nav ul ul { border-top:0; background:url(images/nav3_bg.png) 0 0 no-repeat; padding-top:2px; left:100px; top:13px; }
-
-/* Show menu */
-#nav li.over ul { left:-1px; }
-#nav li.over ul ul { left:-10000px; }
-#nav li.over ul li.over ul { left:100px; }
-
-#nav ul li { background:url(images/nav2_li_bg.png) repeat-y; padding:0 2px; }
-#nav ul li a { background:#e3ecee; }
-#nav ul li a:hover { background:#d0dfe2; }
-#nav li.over ul a,
-#nav ul li.active a,
-#nav ul li a,
-#nav ul li a:hover { color:#2f2f2f; }
-#nav ul span,
-#nav ul li.last li span { padding:5px 15px; background:url(images/nav2_link_bg.gif) repeat-x 0 100%; }
-#nav ul li.last span,
-#nav ul li.last li.last span { background:none; }
-#nav ul li.last { background:url(images/nav2_last_li_bg.png) no-repeat 0 100%; padding-bottom:3px; }
-
-#nav ul li.parent a,
-#nav ul li.parent li.parent a { background-image:url(images/nav2_parent_arrow.gif); background-position:100% 100%; background-repeat:no-repeat; }
-#nav ul li.parent li a,
-#nav ul li.parent li.parent li a { background-image:none; }
-
-/************ 3RD+ LEVEL ************/
-/* Cursors */
-#nav li.parent a,
-#nav li.parent li.parent a,
-#nav li.parent li.parent li.parent a { cursor:default; }
-
-#nav li.parent li a,
-#nav li.parent li.parent li a,
-#nav li.parent li.parent li.parent li a { cursor:pointer; }
-
-/* Show menu */
-#nav ul ul ul { left:-10000px; }
-#nav li.over ul li.over ul ul { left:-10000px;}
-#nav li.over ul li.over ul li.over ul { left:100px; }
-
-.nav-bar:after { content:"."; display:block; clear:both; font-size:0; line-height:0; height:0; overflow:hidden; }
\ No newline at end of file
diff --git a/app/design/adminhtml/magento_basic/print.css b/app/design/adminhtml/magento_basic/print.css
deleted file mode 100644
index 00bb0bad4e1..00000000000
--- a/app/design/adminhtml/magento_basic/print.css
+++ /dev/null
@@ -1,41 +0,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.
- *
- * @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)
- */
-
-* { background:none !important; text-align:left !important; }
-html { margin:0 !important; padding:0 !important; }
-body { background:#fff !important; font-size:9pt !important; padding:0 !important; margin:0 !important; }
-a { color:#2976c9 !important; }
-th,td { color:#333 !important; border-color:#ccc !important; }
-
-.middle { padding:0; }
-
-.header,
-.notification-global,
-.actions,
-.massaction,
-#sales_order_grid_massaction,
-.content-header-floating,
-.content-header .form-buttons,
-.footer { display:none !important; }
diff --git a/app/design/adminhtml/magento_basic/reset.css b/app/design/adminhtml/magento_basic/reset.css
deleted file mode 100644
index 236d9bed19a..00000000000
--- a/app/design/adminhtml/magento_basic/reset.css
+++ /dev/null
@@ -1,73 +0,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)
- */
-/******************************************/
-/***************** BASE *******************/
-/******************************************/
-
-* { margin:0; padding:0; }
-
-body { background:#e6e6e6; color:#2f2f2f; font:12px/1.5em Arial, Helvetica, sans-serif; }
-
-a { color:#ea7601; text-decoration:underline; }
-a:hover { color:#ea7601; text-decoration:underline; }
-a img { border:0; }
-:focus { outline:0; }
-
-/* Heading */
-h1, h2, h3, h4 { margin-bottom:.5em; line-height:1.4em; }
-h2 { font-size:1.7em; }
-h3 { margin-bottom:.5em; color:#253033; font-size:1.25em; }
-h4 { margin-bottom:.6em; color:#494848; font-size:1.05em; }
-h5 { font-size:1.05em; }
-h6 { font-size:1em; }
-h1 a, h1 a:hover,
-h2 a, h2 a:hover,
-h3 a, h3 a:hover,
-h4 a, h4 a:hover { font-weight:normal; }
-
-/* Table */
-th { padding:0; text-align:left; vertical-align:top; }
-td { padding:0; vertical-align:top; }
-
-/* Paragraph */
-p, address { margin-bottom:.5em; }
-address { font-style:normal; }
-cite { font-style:normal; font-size:10px; }
-q:before,
-q:after { content:'';}
-
-/* Form */
-form { display:inline; }
-fieldset { border:0; }
-legend { display:none; display:block !important; height:0; line-height:0; margin:0; overflow:hidden; padding:0; width:0; visibility:hidden; }
-label { color:#333; }
-input, select { vertical-align:middle; }
-textarea { overflow:auto; }
-
-/* Lists */
-ul,ol { list-style:none; }
-dt { display:block; }
-
-/* Size */
-small { font-size:.9em; }
-big { font-size:1.25em; }
diff --git a/app/design/frontend/magento_backup/Magento_Captcha/captcha.js b/app/design/frontend/magento_backup/Magento_Captcha/captcha.js
deleted file mode 100644
index 2f43f664a69..00000000000
--- a/app/design/frontend/magento_backup/Magento_Captcha/captcha.js
+++ /dev/null
@@ -1,71 +0,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.
- *
- * @category mage
- * @package captcha
- * @copyright Copyright (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($, undefined) {
- "use strict";
- $.widget('mage.captcha', {
- options: {
- refreshClass: 'refreshing',
- reloadSelector: '.captcha-reload',
- imageSelector: '.captcha-img'
- },
-
- /**
- * Method binds click event to reload image
- * @private
- */
- _create: function() {
- this.element.on('click', this.options.reloadSelector, $.proxy(this.refresh, this));
- },
-
- /**
- * Method triggeres an AJAX request to refresh the CAPTCHA image
- * @param e - Event
- */
- refresh: function(e) {
- var reloadImage = $(e.currentTarget);
- reloadImage.addClass(this.options.refreshClass);
- $.ajax({
- url: this.options.url,
- type: 'post',
- async:false,
- dataType: 'json',
- context: this,
- data: {
- 'formId': this.options.type
- },
- success: function (response) {
- if (response.imgSrc) {
- this.element.find(this.options.imageSelector).attr('src', response.imgSrc);
- }
- },
- complete: function() {
- reloadImage.removeClass(this.options.refreshClass);
- }
- });
- }
- });
-})(jQuery);
-
diff --git a/app/design/frontend/magento_backup/Magento_Captcha/default.phtml b/app/design/frontend/magento_backup/Magento_Captcha/default.phtml
deleted file mode 100644
index 88467e786b4..00000000000
--- a/app/design/frontend/magento_backup/Magento_Captcha/default.phtml
+++ /dev/null
@@ -1,57 +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 Magento
- * @package Magento_Captcha
- * @copyright Copyright (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\Captcha\Block\Captcha\DefaultCaptcha */ ?>
-
-<?php /* @var $captcha \Magento\Captcha\Model\ModelInterface */ ?>
-<?php $captcha = $this->getCaptchaModel() ?>
-<li role="<?php echo $this->getFormId()?>">
- <label for="captcha_<?php echo $this->getFormId() ?>" class="required"><em>*</em><?php echo __('Please enter the letters below')?></label>
- <div class="input-box captcha">
- <input name="<?php echo \Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE ?>[<?php echo $this->getFormId()?>]" type="text" class="input-text required-entry" data-validate="{required:true}" id="captcha_<?php echo $this->getFormId() ?>" />
- </div>
-</li>
-<li data-captcha="<?php echo $this->getFormId()?>" id="captcha-container-<?php echo $this->getFormId()?>">
- <div class="captcha-image">
- <img class="captcha-reload" src="<?php echo $this->getViewFileUrl('Magento_Captcha::reload.png') ?>" alt="<?php echo __('Reload captcha') ?>">
- <img class="captcha-img" height="<?php echo $this->getImgHeight() ?>" src="<?php echo $captcha->getImgSrc() ?>"/>
- <?php if ($captcha->isCaseSensitive()) :?>
- <div class="captcha-note">
- <?php echo __('<strong>Attention</strong>: Captcha is case sensitive.') ?>
- </div>
- <?php endif; ?>
- </div>
- <script type="text/javascript">//<![CDATA[
- (function ($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_Captcha::captcha.js') ?>",function() {
- $('#captcha-container-<?php echo $this->getFormId()?>').captcha({
- url: '<?php echo $this->getRefreshUrl()?>',
- type: '<?php echo $this->getFormId() ?>'
- });
- });
- })(jQuery);
- //]]></script>
-</li>
diff --git a/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/checkout_onepage_index.xml b/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/checkout_onepage_index.xml
deleted file mode 100644
index 6084f7595ea..00000000000
--- a/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/checkout_onepage_index.xml
+++ /dev/null
@@ -1,75 +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="checkout.onepage.login">
- <container name="login.form.additional.info" label="Form Additional Info">
- <block class="Magento\Captcha\Block\Captcha" name="captcha">
- <action method="setFormId">
- <argument name="formId" xsi:type="string">user_login</argument>
- </action>
- <action method="setImgWidth">
- <argument name="width" xsi:type="string">230</argument>
- </action>
- <action method="setImgHeight">
- <argument name="width" xsi:type="string">50</argument>
- </action>
- </block>
- </container>
- </referenceBlock>
- <referenceBlock name="checkout.onepage.billing">
- <container name="form.additional.info" label="Form Additional Info">
- <referenceBlock name="head">
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-captcha-onepage-js">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Captcha::onepage.js</argument>
- </arguments>
- </block>
- </referenceBlock>
- <block class="Magento\Captcha\Block\Captcha" name="captcha.guest.checkout">
- <action method="setFormId">
- <argument name="formId" xsi:type="string">guest_checkout</argument>
- </action>
- <action method="setImgWidth">
- <argument name="width" xsi:type="string">230</argument>
- </action>
- <action method="setImgHeight">
- <argument name="width" xsi:type="string">50</argument>
- </action>
- </block>
- <block class="Magento\Captcha\Block\Captcha" name="captcha.register.during.checkout">
- <action method="setFormId">
- <argument name="formId" xsi:type="string">register_during_checkout</argument>
- </action>
- <action method="setImgWidth">
- <argument name="width" xsi:type="string">230</argument>
- </action>
- <action method="setImgHeight">
- <argument name="width" xsi:type="string">50</argument>
- </action>
- </block>
- </container>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/contacts_index_index.xml b/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/contacts_index_index.xml
deleted file mode 100644
index de3980ceb36..00000000000
--- a/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/contacts_index_index.xml
+++ /dev/null
@@ -1,40 +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="form.additional.info">
- <block class="Magento\Captcha\Block\Captcha" name="captcha">
- <action method="setFormId">
- <argument name="formId" xsi:type="string">contact_us</argument>
- </action>
- <action method="setImgWidth">
- <argument name="width" xsi:type="string">230</argument>
- </action>
- <action method="setImgHeight">
- <argument name="width" xsi:type="string">50</argument>
- </action>
- </block>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_create.xml b/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_create.xml
deleted file mode 100644
index 99cb001b740..00000000000
--- a/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_create.xml
+++ /dev/null
@@ -1,42 +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="customer_form_register">
- <container name="form.additional.info" label="Form Additional Info">
- <block class="Magento\Captcha\Block\Captcha" name="captcha">
- <action method="setFormId">
- <argument name="formId" xsi:type="string">user_create</argument>
- </action>
- <action method="setImgWidth">
- <argument name="width" xsi:type="string">230</argument>
- </action>
- <action method="setImgHeight">
- <argument name="width" xsi:type="string">50</argument>
- </action>
- </block>
- </container>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_forgotpassword.xml b/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_forgotpassword.xml
deleted file mode 100644
index c9abccaf050..00000000000
--- a/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_forgotpassword.xml
+++ /dev/null
@@ -1,42 +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="forgotPassword">
- <container name="form.additional.info" label="Form Additional Info">
- <block class="Magento\Captcha\Block\Captcha" name="captcha">
- <action method="setFormId">
- <argument name="formId" xsi:type="string">user_forgotpassword</argument>
- </action>
- <action method="setImgWidth">
- <argument name="width" xsi:type="string">230</argument>
- </action>
- <action method="setImgHeight">
- <argument name="width" xsi:type="string">50</argument>
- </action>
- </block>
- </container>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_login.xml b/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_login.xml
deleted file mode 100644
index 160e8839ec5..00000000000
--- a/app/design/frontend/magento_backup/Magento_Captcha/layout/override/base/customer_account_login.xml
+++ /dev/null
@@ -1,42 +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="customer_form_login">
- <container name="form.additional.info" label="Form Additional Info">
- <block class="Magento\Captcha\Block\Captcha" name="captcha">
- <action method="setFormId">
- <argument name="formId" xsi:type="string">user_login</argument>
- </action>
- <action method="setImgWidth">
- <argument name="width" xsi:type="string">230</argument>
- </action>
- <action method="setImgHeight">
- <argument name="width" xsi:type="string">50</argument>
- </action>
- </block>
- </container>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Captcha/onepage.js b/app/design/frontend/magento_backup/Magento_Captcha/onepage.js
deleted file mode 100644
index 3ecfd263a38..00000000000
--- a/app/design/frontend/magento_backup/Magento_Captcha/onepage.js
+++ /dev/null
@@ -1,36 +0,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.
- *
- * @category mage
- * @package captcha
- * @copyright Copyright (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, document) {
- "use strict";
- $(document).on("login",function() {
- $("[data-captcha='guest_checkout'], [data-captcha='register_during_checkout']").hide();
- $("[role='guest_checkout'], [role='register_during_checkout']").hide();
- var type = ($("#login\\:guest").is(':checked')) ? 'guest_checkout' : 'register_during_checkout';
- $("[role='" + type + "'], [data-captcha='" + type + "']").show();
- }).on('billingSave', function() {
- $(".captcha-reload:visible").trigger("click");
- });
-})(jQuery, window, document);
diff --git a/app/design/frontend/magento_backup/Magento_Captcha/reload.png b/app/design/frontend/magento_backup/Magento_Captcha/reload.png
deleted file mode 100644
index 2b1e64bc158ab6cb284628823b12db2af8565dfc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1538
zcmV+d2L1VoP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS000HKNkl<ZNQt$UTa1-g6~}*Tf8Te$bDcY9t_(2TN`N*^1H_V$ng*j7ZHP5Z
zUo`R2H+|KIHu})`YBVPGMG`gDL~XUzSg}+trG#6_%z(hm6wWZr0CVQdxqa8Yw-2W?
zEfN}ET*-deS;_jXwf2AQz2X0C@_EkbZ*EuFq482?WXnb;Um6uZ+YKT%4pw!$c{jdy
z`*u{BsqgyzP5rnS?&BPjN6KD)%Z`J&t$V-b4UHdkviU(#ZXOV8(zc0$2bqDvv&!@S
zIQiB3sXcGsi~gqyre50U`u!WW7I!@Jsz3h3mz+XR3B<7$5D_eZwIX1#+O+G<X#U3O
z_RY&bY%f-(_PkL^J{!;Z?B=5v``zN$rZ46<?|j7{nK+`9Q!q*Dh?f_qG$5)pfXa8H
zoQ#+_5!0?IF^R8o`3dE!-O9vwzcU)%{zh5rW4H99E%FP6t(o4w?|D7_&l9ygV;%7}
z@5Y~a3RUbzTn_-7CYYc}JU2-)b6#v%cQa$V4w|6;eSc+PsV`_>eB=yHf4Sggd%J(+
zb#*;&!=@*Lqmn;x6mNJ7048W+8g;-Tejc~GANT3!NJh7jEPjkzDmrHQ=ArCB-)lh_
zya?_3I^g{yMW?Ie9P<164hz;3FDLo^FW?Pr#>N5R^hx5`E9ljGU@cB}8E<?S*}c!<
z4UXe(7$d1%5ip+L-Fqmrbm#EDjuiiN=$)o^0rELj%5~+x?qmx^L?p9)Ki=>JHVFwX
z{f+hqf4~L}Fctv4c!PNEBC30c?9P2C*9B`p$D(q1KU>JYkZlI<0aX{k&3c=??(S!;
zjUA_J1OCou0SG6L(?0WCY^z2`J!{g);EwOXE01AXE1ed$YS^R=I>zfN9mq7>6VUhs
z;K`VBWDp(U^bX>54Pe4L@yuCl>s}|jjyyX6Yp~VpH2?e>Rs;l0*ub<OfYB(=>2*A3
z960X+h@uD5oY+)UzJz!_roM!(&OzG5V!_%^tI#ddyDMk`93KjU;ATO2paT%?D~H~-
zLl%uuHeMCI+9EjjE8^?#Vv`8H_-||+Je>Wybuw4w?Q|Xe0p7?inkRlv`_wP6Q6$<V
z3J@2tfu_+Tgh*;lYe{f@B-f8K@?@tYQ5{p81s!!b@+rg_7)SLCgHqUV8HllB<3Ljf
ztP9YH%~Ba^;;IqJm&kwNTlhN;gDAifockrwm3fGhhl_A>coPS3y2_Z=GP*X4IA9db
zW?~ls6hNhJ<{GiND4rOVadCUgxaA4l4V$pRGRf>ah!df5&iax<0srZj$v^Wl;$?|v
zj$^9V5Km~tcCu2}GwXwPWiejvEvUB#2E3!bD+L6>q@Wz!@(!~5zDrU$g>BA*wW#7K
z&d7dpPrZaH_M@vaM3cV;-LOW`m1_Eziwp7nb--_?!+5c2{;_pDGdbKR`%y@I>ph&l
zZ8$v><o10V|B0_)+RGh4z8_U8BVHE0GDCRbXPDY`tio1X=K9&&@n3&;EsWrk+q9KJ
zrJ;k}Wp}>Zo7wA|<qgU7F-aFr2_`@l2T}PxoYD|ZR~hj#*tkYK^CscBpOD@;gVEZo
zH1za^+31z4i^+#4Zl!h|01#;y$jMSq&NQ>>(xzNCEvuv|dik>G<xA+=6lP@#eg8aZ
z<?kdn-yoTN3){S7t<ko+nqHm09sl&iweYQf&P3sI(2?~+@4@A}X`EAbE(p_GeMM(?
zsiX#!N|cT6Vpp$Xs+TYiE}*NE*j5E}h)%6uyr0gVoDP3{d@6YJ_47e(E%+k<fNIl3
z7<=P`nebhc*ab&{>yfi!t+m={W6~tiK|9bZ^NZ<)vs3NYkDYA1I=zs*e|k1<uSO3K
z<YOOw-$4#+_6kpK%nWZE^>z>Tx#NYL>On->ZC!h?s_)!fNTxpeIG#T<7dIpQ$f$ol
o;J-}KQQTU^21tR&{wCJ!KhPV<Zd|KM(EtDd07*qoM6N<$f+J)7SO5S3
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/cart.phtml b/app/design/frontend/magento_backup/Magento_Checkout/cart.phtml
deleted file mode 100644
index 2931540d95f..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/cart.phtml
+++ /dev/null
@@ -1,172 +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
-/**
- * Shopping cart template
- *
- * @see \Magento\Checkout\Block\Cart
- */
-?>
-<?php if ($this->getItemsCount()): ?>
-<div class="cart">
- <div class="page-title title-buttons">
- <h1><?php echo __('Shopping Cart') ?></h1>
- <?php if(!$this->hasError()): ?>
- <ul class="checkout-types">
- <?php foreach ($this->getMethods('top_methods') as $method): ?>
- <?php if ($methodHtml = $this->getMethodHtml($method)): ?>
- <li><?php echo $methodHtml; ?></li>
- <?php endif; ?>
- <?php endforeach; ?>
- </ul>
- <?php endif; ?>
- </div>
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
- <?php echo $this->getChildHtml('form_before') ?>
- <form action="<?php echo $this->getUrl('checkout/cart/updatePost') ?>" method="post" id="form-validate" data-mage-init="{validation: []}">
- <fieldset>
- <table id="shopping-cart-table" class="data-table cart-table">
- <col width="1" />
- <col />
- <col width="1" />
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllowInCart()) : ?>
- <col width="1" />
- <?php endif ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <col width="1" />
- <?php endif; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <col width="1" />
- <?php endif; ?>
- <col width="1" />
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <col width="1" />
- <?php endif; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <col width="1" />
- <?php endif; ?>
- <col width="1" />
-
- <?php $mergedCells = ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 2 : 1); ?>
- <thead>
- <tr>
- <th rowspan="<?php echo $mergedCells; ?>"> </th>
- <th rowspan="<?php echo $mergedCells; ?>"><span class="nobr"><?php echo __('Product Name') ?></span></th>
- <th rowspan="<?php echo $mergedCells; ?>"></th>
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllowInCart()) : ?>
- <th rowspan="<?php echo $mergedCells; ?>" class="a-center"><span class="nobr"><?php echo __('Move to Wish List') ?></span></th>
- <?php endif ?>
- <th class="a-center" colspan="<?php echo $mergedCells; ?>"><span class="nobr"><?php echo __('Unit Price') ?></span></th>
- <th rowspan="<?php echo $mergedCells; ?>" class="a-center"><?php echo __('Qty') ?></th>
- <th class="a-center" colspan="<?php echo $mergedCells; ?>"><?php echo __('Subtotal') ?></th>
- <th rowspan="<?php echo $mergedCells; ?>" class="a-center"> </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; ?>
- </thead>
- <tfoot>
- <tr>
- <td colspan="50" class="a-right">
- <?php if($this->getContinueShoppingUrl()): ?>
- <button type="button" title="<?php echo __('Continue Shopping') ?>" class="button btn-continue"><span><span><?php echo __('Continue Shopping') ?></span></span></button>
- <?php endif; ?>
- <button type="submit" name="update_cart_action" value="update_qty" title="<?php echo __('Update Shopping Cart'); ?>" class="button btn-update"><span><span><?php echo __('Update Shopping Cart'); ?></span></span></button>
- <button type="submit" name="update_cart_action" value="empty_cart" title="<?php echo __('Clear Shopping Cart'); ?>" class="button btn-empty" id="empty_cart_button"><span><span><?php echo __('Clear Shopping Cart'); ?></span></span></button>
- <!--[if lt IE 8]>
- <input type="hidden" value="" id="update_cart_action_container" />
- <![endif]-->
- <script type="text/javascript">
- //<![CDATA[
- (function($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_Checkout::js/shopping-cart.js')?>",
- function() {
- // Internet Explorer (lt 8) does not support value attribute in button elements
- $('#shopping-cart-table').shoppingCart({
- continueShoppingButton: 'button.btn-continue',
- continueShoppingUrl: '<?php echo $this->getContinueShoppingUrl() ?>',
- emptyCartButton: 'button.btn-empty',
- updateCartActionContainer: '#update_cart_action_container'
- });
- });
- })(jQuery);
- //]]>
- </script>
- </td>
- </tr>
- </tfoot>
- <tbody>
- <?php foreach($this->getItems() as $_item): ?>
- <?php echo $this->getItemHtml($_item) ?>
- <?php endforeach ?>
- </tbody>
- </table>
- <script type="text/javascript">(function($) {$('#shopping-cart-table').decorate('table')})(jQuery)</script>
- </fieldset>
- </form>
- <div class="cart-collaterals">
- <div class="col2-set">
- <div class="col-1">
- <?php echo $this->getChildHtml('crosssell') ?>
- </div>
- <div class="col-2">
- <?php /* Extensions placeholder */ ?>
- <?php echo $this->getChildHtml('checkout.cart.extra') ?>
- <?php if (!$this->getIsVirtual()): echo $this->getChildHtml('shipping'); endif; ?>
- </div>
- </div>
- <div class="totals">
- <?php echo $this->getChildHtml('totals'); ?>
- <?php if(!$this->hasError()): ?>
- <ul class="checkout-types">
- <?php foreach ($this->getMethods('methods') as $method): ?>
- <?php if ($methodHtml = $this->getMethodHtml($method)): ?>
- <li><?php echo $methodHtml; ?></li>
- <?php endif; ?>
- <?php endforeach; ?>
- </ul>
- <?php endif; ?>
- </div>
- </div>
-</div>
-<?php else: ?>
-<div class="page-title">
- <h1><?php echo __('Shopping Cart is Empty') ?></h1>
-</div>
-<div class="cart-empty">
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
- <?php echo $this->getChildHtml('checkout_cart_empty_widget'); ?>
- <p><?php echo __('You have no items in your shopping cart.') ?></p>
- <p><?php echo __('Click <a href="%1">here</a> to continue shopping.', $this->getContinueShoppingUrl()) ?></p>
- <?php echo $this->getChildHtml('shopping.cart.table.after'); ?>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/cart/coupon.phtml b/app/design/frontend/magento_backup/Magento_Checkout/cart/coupon.phtml
deleted file mode 100644
index 9386430baa0..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/cart/coupon.phtml
+++ /dev/null
@@ -1,60 +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)
- */
-?>
-<form id="discount-coupon-form" action="<?php echo $this->getUrl('checkout/cart/couponPost') ?>" method="post">
- <div class="discount">
- <h2><?php echo __('Discount Codes') ?></h2>
- <div class="discount-form">
- <label for="coupon_code"><?php echo __('Enter your coupon code if you have one.') ?></label>
- <input type="hidden" name="remove" id="remove-coupon" value="0" />
- <div class="input-box">
- <input class="input-text" id="coupon_code" name="coupon_code" value="<?php echo $this->escapeHtml($this->getCouponCode()) ?>" />
- </div>
- <div class="buttons-set">
- <button type="button" title="<?php echo __('Apply Coupon') ?>" class="button apply-coupon" value="<?php echo __('Apply Coupon') ?>"><span><span><?php echo __('Apply Coupon') ?></span></span></button>
- <?php if(strlen($this->getCouponCode())): ?>
- <button type="button" title="<?php echo __('Cancel Coupon') ?>" class="button cancel-coupon" value="<?php echo __('Cancel Coupon') ?>"><span><span><?php echo __('Cancel Coupon') ?></span></span></button>
- <?php endif;?>
- </div>
- </div>
- </div>
-</form>
-<script type="text/javascript">
-//<![CDATA[
- (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')?>",
- "<?php echo $this->getViewFileUrl('Magento_Checkout::js/discount-codes.js')?>", function() {
- $('#discount-coupon-form').discountCode({
- couponCodeSelector: '#coupon_code', removeCouponSelector: '#remove-coupon',
- applyButton: 'button.apply-coupon', cancelButton: 'button.cancel-coupon'
- });
- });
- })(jQuery);
-//]]>
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/cart/crosssell.phtml b/app/design/frontend/magento_backup/Magento_Checkout/cart/crosssell.phtml
deleted file mode 100644
index 18ca99909fb..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/cart/crosssell.phtml
+++ /dev/null
@@ -1,59 +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
-/**
- * Cart cross sell items template
- *
- * @see \Magento\Checkout\Block\Cart\Crosssell
- */
-?>
-<?php if($this->getItemCount()): ?>
-<div class="crosssell">
- <h2><?php echo __('Based on your selection, you may be interested in the following items:') ?></h2>
- <ul id="crosssell-products-list">
- <?php foreach ($this->getItems() as $_item): ?>
- <li class="item">
- <a class="product-image" href="<?php echo $_item->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_item->getName()) ?>"><img src="<?php echo $this->getThumbnailUrl($_item) ?>" width="<?php echo $this->getThumbnailSize() ?>" height="<?php echo $this->getThumbnailSize() ?>" alt="<?php echo $this->escapeHtml($_item->getName()) ?>" /></a>
- <div class="product-details">
- <h3 class="product-name"><a href="<?php echo $_item->getProductUrl() ?>"><?php echo $this->escapeHtml($_item->getName()) ?></a></h3>
- <?php echo $this->getPriceHtml($_item, true) ?>
- <button type="button" title="<?php echo __('Add to Cart') ?>" class="button btn-cart" onclick="window.location.href='<?php echo $this->getAddToCartUrl($_item) ?>'"><span><span><?php echo __('Add to Cart') ?></span></span></button>
- <ul class="add-to-links" data-role="add-to-links">
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
- <li><a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wish List') ?></a></li>
- <?php endif; ?>
- <?php if($_compareUrl=$this->getAddToCompareUrl($_item)): ?>
- <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
- <?php endif; ?>
- </ul>
- </div>
- </li>
- <?php endforeach; ?>
- </ul>
- <script type="text/javascript">(function($) {$('#crosssell-products-list').decorate('list', false)})(jQuery)</script>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/cart/item/configure/updatecart.phtml b/app/design/frontend/magento_backup/Magento_Checkout/cart/item/configure/updatecart.phtml
deleted file mode 100644
index e24f55d04ae..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/cart/item/configure/updatecart.phtml
+++ /dev/null
@@ -1,62 +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 $_product = $this->getProduct(); ?>
-<?php $buttonTitle = __('Update Cart'); ?>
-<?php if ($_product->isSaleable()): ?>
- <div class="add-to-cart">
- <?php if (!$_product->isGrouped()): ?>
- <label for="qty"><?php echo __('Qty:') ?></label>
- <input type="text" name="qty" id="qty" maxlength="12" value="<?php echo $this->getProductDefaultQty() * 1 ?>"
- title="<?php echo __('Qty') ?>" class="input-text qty"
- <?php if ($_product->getStockItem() && $_product->getStockItem()->getIsQtyDecimal()) : ?>
- data-validate="{required:true, 'validate-greater-than-zero':true}"/>
- <?php else: ?>
- data-validate="{required:true, digits:true}"/>
- <?php endif; ?>
- <?php endif; ?>
- <button type="button" title="<?php echo $buttonTitle ?>" class="button btn-cart" id="product-updatecart-button"><span><span><?php echo $buttonTitle ?></span></span></button>
- <?php echo $this->getChildHtml('', true) ?>
- </div>
-
- <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')?>",
- "<?php echo $this->getViewFileUrl('Magento_Catalog::js/msrp.js') ?>", function () {
- $('#product_addtocart_form').addToCart({
- cartButtonId: "#product-updatecart-button",
- cartForm: "#product_addtocart_form"
- }).validation();
- });
- })(jQuery);
- </script>
-<?php endif; ?>
-
-
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/cart/item/default.phtml b/app/design/frontend/magento_backup/Magento_Checkout/cart/item/default.phtml
deleted file mode 100644
index 1c3fff9ed0a..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/cart/item/default.phtml
+++ /dev/null
@@ -1,291 +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 $_item \Magento\Sales\Model\Quote\Item */
-$_item = $this->getItem();
-$isVisibleProduct = $_item->getProduct()->isVisibleInSiteVisibility();
-$canApplyMsrp = $this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($_item->getProduct(), \Magento\Catalog\Model\Product\Attribute\Source\Msrp\Type::TYPE_BEFORE_ORDER_CONFIRM);
-?>
-<tr>
- <td><?php if ($this->hasProductUrl()):?><a href="<?php echo $this->getProductUrl() ?>" title="<?php echo $this->escapeHtml($this->getProductName()) ?>" class="product-image"><?php endif;?><img src="<?php echo $this->getProductThumbnailUrl() ?>" width="<?php echo $this->getThumbnailSize()?>" height="<?php echo $this->getThumbnailSize()?>" alt="<?php echo $this->escapeHtml($this->getProductName()) ?>" /><?php if ($this->hasProductUrl()):?></a><?php endif;?></td>
- <td>
- <h2 class="product-name">
- <?php if ($this->hasProductUrl()):?>
- <a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a>
- <?php else: ?>
- <?php echo $this->escapeHtml($this->getProductName()) ?>
- <?php endif; ?>
- </h2>
- <?php if ($_options = $this->getOptionList()):?>
- <dl class="item-options">
- <?php foreach ($_options as $_option) : ?>
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
- <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 endforeach; ?>
- </dl>
- <?php endif;?>
- <?php if ($messages = $this->getMessages()): ?>
- <?php foreach ($messages as $message): ?>
- <p class="item-msg <?php echo $message['type'] ?>">* <?php echo $this->escapeHtml($message['text']) ?></p>
- <?php endforeach; ?>
- <?php endif; ?>
- <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
- <?php if ($addInfoBlock): ?>
- <?php echo $addInfoBlock->setItem($_item)->toHtml() ?>
- <?php endif;?>
- </td>
- <td class="a-center">
- <?php if ($isVisibleProduct): ?>
- <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo __('Edit item parameters') ?>"><?php echo __('Edit') ?></a>
- <?php endif ?>
- </td>
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllowInCart()) : ?>
- <td class="a-center">
- <?php if ($isVisibleProduct): ?>
- <a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getMoveFromCartUrl($_item->getId()); ?>" class="link-wishlist use-ajax"><?php echo __('Move'); ?></a>
- <?php endif ?>
- </td>
- <?php endif ?>
-
- <?php if ($canApplyMsrp): ?>
- <td class="a-right"<?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?> colspan="2"<?php endif; ?>>
- <span class="cart-price">
- <span class="cart-msrp-unit"><?php echo __('See price before order confirmation.'); ?></span>
- <?php $helpLinkId = 'cart-msrp-help-' . $_item->getId(); ?>
- <a id="<?php echo $helpLinkId ?>" href="#" class="map-help-link"><?php echo __("What's this?"); ?></a>
- <?php $_product = $_item->getProduct(); ?>
- <script type="text/javascript">
- (function ($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/msrp.js') ?>", function () {
- $('#<?php echo $helpLinkId ?>').addToCart({
- popupId: "#<?php echo $helpLinkId ?>",
- productName: '<?php echo $_product->getName() ?>',
- realPrice: '<?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>',
- msrpPrice: '<?php echo $this->helper('Magento\Core\Helper\Data')->currency($_product->getMsrp(),true,true) ?>',
- closeButtonId: '#map-popup-close',
- showAddToCart: false
- });
- });
- })(jQuery);
- </script>
- </span>
- </td>
- <?php else: ?>
-
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td class="a-right">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <span class="cart-price">
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
- <?php endif; ?>
-
- </span>
-
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="weee"><?php echo __('Total'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <span class="cart-price">
- <?php endif; ?>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
- <?php endif; ?>
-
- </span>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="weee"><?php echo __('Total incl. tax'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
- <?php endif; ?>
- <td class="a-center">
- <input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>" size="4" title="<?php echo __('Qty') ?>" class="input-text qty" maxlength="12" data-validate="{required:true,'validate-greater-than-zero':true}"/>
- </td>
- <?php if (($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
- <td class="a-right">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <span class="cart-price">
- <?php endif; ?>
-
- <?php if ($canApplyMsrp): ?>
- <span class="cart-msrp-subtotal">--</span>
- <?php else: ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
- <?php endif; ?>
- <?php endif; ?>
-
- </span>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="weee"><?php echo __('Total'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
- <?php if (($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
- <td>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <span class="cart-price">
- <?php endif; ?>
-
- <?php if ($canApplyMsrp): ?>
- <span class="cart-msrp-subtotal">--</span>
- <?php else: ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
- <?php endif; ?>
- <?php endif; ?>
-
- </span>
-
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="weee"><?php echo __('Total incl. tax'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
- <td class="a-center"><a href="<?php echo $this->getDeleteUrl()?>" title="<?php echo __('Remove item')?>" class="btn-remove btn-remove2"><?php echo __('Remove item')?></a></td>
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/cart/shipping.phtml b/app/design/frontend/magento_backup/Magento_Checkout/cart/shipping.phtml
deleted file mode 100644
index 89aa5e352ff..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/cart/shipping.phtml
+++ /dev/null
@@ -1,127 +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\Checkout\Block\Cart\Shipping */ ?>
-<div class="shipping">
- <h2><?php echo __('Estimate Shipping and Tax') ?></h2>
- <div class="shipping-form">
- <form action="<?php echo $this->getUrl('checkout/cart/estimatePost') ?>" method="post" id="shipping-zip-form">
- <p><?php echo __('Enter your destination to get a shipping estimate.') ?></p>
- <ul class="form-list">
- <li>
- <label for="country" class="required"><em>*</em><?php echo __('Country') ?></label>
- <div class="input-box">
- <?php echo $this->getDirectoryBlock()->getCountryHtmlSelect($this->getEstimateCountryId()) ?>
- </div>
- </li>
- <?php //if($this->getStateActive()): ?>
- <li>
- <label for="region_id"<?php if ($this->isStateProvinceRequired()) echo ' class="required"' ?>><?php if ($this->isStateProvinceRequired()) echo '<em>*</em>' ?><?php echo __('State/Province') ?></label>
- <div class="input-box">
- <select id="region_id" name="region_id" title="<?php echo __('State/Province') ?>" style="display:none;"<?php echo ($this->isStateProvinceRequired() ? ' class="validate-select"' : '') ?>>
- <option value=""><?php echo __('Please select a region, state or province.') ?></option>
- </select>
- <input type="text" id="region" name="region" value="<?php echo $this->escapeHtml($this->getEstimateRegion()) ?>" title="<?php echo __('State/Province') ?>" class="input-text" style="display:none;" />
- </div>
- </li>
- <?php //endif; ?>
- <?php if($this->getCityActive()): ?>
- <li>
- <label for="city"<?php if ($this->isCityRequired()) echo ' class="required"' ?>><?php if ($this->isCityRequired()) echo '<em>*</em>' ?><?php echo __('City') ?></label>
- <div class="input-box">
- <input class="input-text<?php if ($this->isCityRequired()):?> required-entry<?php endif;?>" id="city" type="text" name="estimate_city" value="<?php echo $this->escapeHtml($this->getEstimateCity()) ?>" />
- </div>
- </li>
- <?php endif; ?>
- <li>
- <label for="postcode"<?php if ($this->isZipCodeRequired()) echo ' class="required"' ?>><?php if ($this->isZipCodeRequired()) echo '<em>*</em>' ?><?php echo __('Zip/Postal Code') ?></label>
- <div class="input-box">
- <input class="input-text validate-postcode<?php if ($this->isZipCodeRequired()):?> required-entry<?php endif;?>" type="text" id="postcode" name="estimate_postcode" value="<?php echo $this->escapeHtml($this->getEstimatePostcode()) ?>" />
- </div>
- </li>
- </ul>
- <div class="buttons-set">
- <button type="submit" title="<?php echo __('Get a Quote') ?>" class="button"><span><span><?php echo __('Get a Quote') ?></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') ?>",
- "<?php echo $this->getViewFileUrl('Magento_Checkout::js/region-updater.js') ?>",
- function() {
- $('#country').regionUpdater({
- optionalRegionAllowed: <?php echo ($this->getConfig('general/region/display_all')? 'true' : 'false'); ?>,
- regionListId: '#region_id',
- regionInputId: '#region',
- postcodeId: '#postcode',
- form: $('#shipping-zip-form').validation(),
- regionJson: <?php echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
- defaultRegion: "<?php echo $this->getEstimateRegionId() ?>",
- countriesWithOptionalZip: <?php echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
- });
- });
- })(jQuery);
- </script>
-
- <?php if (($_shippingRateGroups = $this->getEstimateRates())): ?>
- <form id="co-shipping-method-form" action="<?php echo $this->getUrl('checkout/cart/estimateUpdatePost') ?>">
- <dl class="sp-methods">
- <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
- <dt><?php echo $this->escapeHtml($this->getCarrierName($code)) ?></dt>
- <dd>
- <ul>
- <?php foreach ($_rates as $_rate): ?>
- <li<?php if ($_rate->getErrorMessage()) echo ' class="error-msg"';?>>
- <?php if ($_rate->getErrorMessage()): ?>
- <?php echo $this->escapeHtml($_rate->getErrorMessage()) ?>
- <?php else: ?>
- <input name="estimate_method" type="radio" value="<?php echo $this->escapeHtml($_rate->getCode()) ?>" id="s_method_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod()) echo ' checked="checked"' ?> class="radio" />
- <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $this->escapeHtml($_rate->getMethodTitle()) ?>
- <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?>
- <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
- <?php echo $_excl; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
- (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
- <?php endif; ?>
- </label>
- <?php endif ?>
- </li>
- <?php endforeach; ?>
- </ul>
- </dd>
- <?php endforeach; ?>
- </dl>
- <div class="buttons-set">
- <button type="submit" title="<?php echo __('Update Total') ?>" class="button" name="do" value="<?php echo __('Update Total') ?>"><span><span><?php echo __('Update Total') ?></span></span></button>
- </div>
- </form>
- <?php endif; ?>
- </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/cart/sidebar.phtml b/app/design/frontend/magento_backup/Magento_Checkout/cart/sidebar.phtml
deleted file mode 100644
index b6a106c9228..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/cart/sidebar.phtml
+++ /dev/null
@@ -1,96 +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)
- */
-
-/**
- * Shoping cart sidebar
- *
- * @see \Magento\Checkout\Block\Cart\Sidebar
- */
-
-?>
-<?php if ($this->getIsNeedToDisplaySideBar()): ?>
-<div class="block block-cart">
- <?php $_cartQty = $this->getSummaryCount() ?>
- <div class="block-title">
- <strong><span><?php echo __('My Cart') ?></span></strong>
- </div>
- <div class="block-content">
- <?php if ($_cartQty > 0): ?>
- <div class="summary">
- <?php if ($_cartQty == 1): ?>
- <p class="amount"><?php echo __('There is <a href="%1">1 item</a> in your cart.', $this->getUrl('checkout/cart')) ?></p>
- <?php else: ?>
- <p class="amount"><?php echo __('There are <a href="%1">%2 items</a> in your cart.', $this->getUrl('checkout/cart'), $_cartQty) ?></p>
- <?php endif ?>
- <p class="subtotal">
- <?php if ($this->canApplyMsrp()): ?>
- <span
- class="map-cart-sidebar-total"><?php echo __('You will see the order total before you submit the order.'); ?></span>
- <?php else: ?>
- <span
- class="label"><?php echo __('Cart Subtotal:') ?></span> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getSubtotal()) ?>
- <?php if ($_subtotalInclTax = $this->getSubtotalInclTax()): ?>
- <br/>
- (<?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_subtotalInclTax) ?> <?php echo $this->helper('Magento\Tax\Helper\Data')->getIncExcText(true) ?>
- )
- <?php endif; ?>
- <?php endif; ?>
- </p>
- </div>
- <?php endif ?>
- <?php if ($_cartQty && $this->isPossibleOnepageCheckout()): ?>
- <div class="actions">
- <?php echo $this->getChildHtml('extra_actions') ?>
- <button id="sidebar-btn-checkout" type="button" title="<?php echo __('Checkout') ?>" class="button">
- <span><span><?php echo __('Checkout') ?></span></span></button>
- </div>
- <?php endif ?>
- <?php $_items = $this->getRecentItems() ?>
- <?php if (count($_items)): ?>
- <p class="block-subtitle"><?php echo __('Recently added item(s)') ?></p>
- <ol id="cart-sidebar" class="mini-products-list">
- <?php foreach ($_items as $_item): ?>
- <?php echo $this->getItemHtml($_item) ?>
- <?php endforeach; ?>
- </ol>
- <script type="text/javascript">
- (function($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_Checkout::js/sidebar.js') ?>", function() {
- $('#cart-sidebar').sidebar({
- checkoutUrl: '<?php echo $this->getCheckoutUrl();?>',
- checkoutButton: '#sidebar-btn-checkout',
- removeButton: '#cart-sidebar a.btn-remove',
- confirmMessage: '<?php echo __('Are you sure you want to remove this item from the shopping cart?') ?>'
- });
- });
- })(jQuery);
- </script>
- <?php else: ?>
- <p class="empty"><?php echo __('You have no items in your shopping cart.') ?></p>
- <?php endif ?>
- </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/cart/sidebar/default.phtml b/app/design/frontend/magento_backup/Magento_Checkout/cart/sidebar/default.phtml
deleted file mode 100644
index ca93d77ee32..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/cart/sidebar/default.phtml
+++ /dev/null
@@ -1,145 +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
- $_item = $this->getItem();
- $isVisibleProduct = $_item->getProduct()->isVisibleInSiteVisibility();
- $canApplyMsrp = $this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($_item->getProduct(), \Magento\Catalog\Model\Product\Attribute\Source\Msrp\Type::TYPE_BEFORE_ORDER_CONFIRM);
-?>
-<li class="item">
- <?php if ($this->hasProductUrl()): ?>
- <a href="<?php echo $this->getProductUrl()?>" title="<?php echo $this->escapeHtml($this->getProductName()) ?>" class="product-image"><img src="<?php echo $this->getProductThumbnailSidebarUrl() ?>" width="<?php echo $this->getThumbnailSidebarSize()?>" height="<?php echo $this->getThumbnailSidebarSize()?>" alt="<?php echo $this->escapeHtml($this->getProductName()) ?>" /></a>
- <?php else: ?>
- <span class="product-image"><img src="<?php echo $this->getProductThumbnailSidebarUrl() ?>" width="<?php echo $this->getThumbnailSidebarSize()?>" height="<?php echo $this->getThumbnailSidebarSize()?>" alt="<?php echo $this->escapeHtml($this->getProductName()) ?>" /></span>
- <?php endif; ?>
- <div class="product-details">
- <a href="<?php echo $this->getDeleteUrl() ?>" title="<?php echo __('Remove This Item') ?>" class="btn-remove"><?php echo __('Remove This Item') ?></a>
- <?php if ($isVisibleProduct): ?>
- <a href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo __('Edit item') ?>" class="btn-edit"><?php echo __('Edit item')?></a>
- <?php endif ?>
- <p class="product-name"><?php if ($this->hasProductUrl()): ?><a href="<?php echo $this->getProductUrl() ?>"><?php endif; ?><?php echo $this->escapeHtml($this->getProductName()) ?><?php if ($this->hasProductUrl()): ?></a><?php endif; ?></p>
- <strong><?php echo $this->getQty() ?></strong> x
-
- <?php if ($canApplyMsrp): ?>
-
- <span class="map-cart-sidebar-item"><?php echo __('See price before order confirmation.'); ?></span>
-
- <?php else: ?>
-
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <?php echo __('Excl. Tax'); ?>:
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
- <br />
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales')): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales')): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales')): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales')): ?>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
- <?php endif; ?>
- <?php endif; ?>
- <?php endif; ?>
-
-
-
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <br /><?php echo __('Incl. Tax'); ?>:
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales')): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
- <br />
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales')): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales')): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales')): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales')): ?>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
- <?php endif; ?>
- <?php endif; ?>
- <?php endif; ?>
-
- <?php endif; //Can apply MSRP ?>
-
- <?php if ($_options = $this->getOptionList()):?>
- <div class="truncated" data-mage-init="{truncateOptions:[]}">
- <div class="truncated_full_value">
- <dl class="item-options">
- <?php foreach ($_options as $_option) : ?>
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
- <dd>
- <?php if (is_array($_option['value'])): ?>
- <?php echo nl2br(implode("\n", $_option['value'])) ?>
- <?php else: ?>
- <?php echo $_option['value'] ?>
- <?php endif; ?>
- </dd>
- <?php endforeach; ?>
- </dl>
- </div>
- <a href="#" onclick="return false;" class="details"><?php echo __('Details') ?></a>
- </div>
- <?php endif; ?>
- </div>
-</li>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/cart/totals.phtml b/app/design/frontend/magento_backup/Magento_Checkout/cart/totals.phtml
deleted file mode 100644
index 53a0e844767..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/cart/totals.phtml
+++ /dev/null
@@ -1,48 +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
-/**
- * Shopping cart totals template
- *
- * @see \Magento\Checkout\Block\Cart\Totals
- * @var $this \Magento\Checkout\Block\Cart\Totals
- */
-?>
-<?php if ($this->canApplyMsrp()): ?>
- <div class="cart-msrp-totals"><?php echo __('You will see the order total before you submit the order.'); ?></div>
-<?php else: ?>
- <table id="shopping-cart-totals-table">
- <col />
- <col width="1" />
- <tfoot>
- <?php echo $this->renderTotals('footer'); ?>
- </tfoot>
- <tbody>
- <?php echo $this->renderTotals(); ?>
- </tbody>
- </table>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/cvv.gif b/app/design/frontend/magento_backup/Magento_Checkout/cvv.gif
deleted file mode 100644
index 6d6e9f2907839d58c27ec8de8644f30fc8b4467c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 18112
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
ML>B6>DFFchI}ozYJOBUy
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/accordion.js b/app/design/frontend/magento_backup/Magento_Checkout/js/accordion.js
deleted file mode 100644
index e595f089b73..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/accordion.js
+++ /dev/null
@@ -1,58 +0,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.
- *
- * @category mage checkout
- * @package accordion
- * @copyright Copyright (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 browser:true*/
-(function($) {
- 'use strict';
- // mage.accordion base functionality
- $.widget('mage.accordion', $.ui.accordion, {
- options: {
- heightStyle: 'content',
- animate: false,
- beforeActivate: function(e, ui) {
- // Make sure sections below current are not clickable and sections above are clickable
- var newPanelParent = $(ui.newPanel).parent();
- if (!newPanelParent.hasClass('allow')) {
- return false;
- }
- newPanelParent.addClass('active allow').prevAll().addClass('allow');
- newPanelParent.nextAll().removeClass('allow');
- $(ui.oldPanel).parent().removeClass('active');
- }
- },
-
- /**
- * Accordion creation
- * @protected
- */
- _create: function() {
- // Custom to enable section
- this.element.on('enableSection', function(event, data) {
- $(data.selector).addClass('allow').find('h2').trigger('click');
- });
- this._super();
- $(this.options.activeSelector).addClass('allow active').find('h2').trigger('click');
- }
- });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/components.phtml b/app/design/frontend/magento_backup/Magento_Checkout/js/components.phtml
deleted file mode 100644
index fb4954de06b..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/components.phtml
+++ /dev/null
@@ -1,40 +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)
- */
-?>
-<script type="text/javascript">
- (function($) {
- "use strict";
- /**
- * Declaration of resources needed for defined components
- */
- $.mage.component({
- paymentAuthentication: [
- '<?php echo $this->getViewFileUrl('Magento_Checkout::js/payment-authentication.js') ?>'
- ]
- });
- })(jQuery);
-</script>
-<?php echo $this->getChildHtml() ?>
\ No newline at end of file
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/discount-codes.js b/app/design/frontend/magento_backup/Magento_Checkout/js/discount-codes.js
deleted file mode 100644
index 73fdcc71420..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/discount-codes.js
+++ /dev/null
@@ -1,47 +0,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.
- *
- * @category checkout coupon discount codes
- * @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 ($) {
- $.widget('mage.discountCode', {
- options: {
- },
- _create: function () {
- this.couponCode = $(this.options.couponCodeSelector);
- this.removeCoupon = $(this.options.removeCouponSelector);
-
- $(this.options.applyButton).on('click', $.proxy(function () {
- this.couponCode.attr('data-validate', '{required:true}');
- this.removeCoupon.attr('value', '0');
- $(this.element).validation().submit();
- }, this));
-
- $(this.options.cancelButton).on('click', $.proxy(function () {
- this.couponCode.removeAttr('data-validate');
- this.removeCoupon.attr('value', '1');
- this.element.submit();
- }, this));
- }
- });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/multi-shipping.js b/app/design/frontend/magento_backup/Magento_Checkout/js/multi-shipping.js
deleted file mode 100644
index 279f7f8687d..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/multi-shipping.js
+++ /dev/null
@@ -1,63 +0,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.
- *
- * @category checkout multi-shipping addresses
- * @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.multiShipping', {
- options: {
- addNewAddressBtn: 'button[data-role="add-new-address"]', // Add a new multishipping address.
- addNewAddressFlag: '#add_new_address_flag', // Hidden input field with value 0 or 1.
- canContinueBtn: 'button[data-role="can-continue"]', // Continue (update quantity or go to shipping).
- canContinueFlag: '#can_continue_flag' // Hidden input field with value 0 or 1.
- },
-
- /**
- * Bind event handlers to click events for corresponding buttons.
- * @private
- */
- _create: function() {
- $(this.options.addNewAddressBtn).on('click', $.proxy(this._addNewAddress, this));
- $(this.options.canContinueBtn).on('click', $.proxy(this._canContinue, this));
- },
-
- /**
- * Add a new address. Set the hidden input field and submit the form. Then enter a new shipping address.
- * @private
- */
- _addNewAddress: function() {
- $(this.options.addNewAddressFlag).val(1);
- this.element.submit();
- },
-
- /**
- * Can the user continue to the next step? The data-flag attribute holds either 0 (no) or 1 (yes).
- * @private
- * @param event {Event} - Click event on the corresponding button.
- */
- _canContinue: function(event) {
- $(this.options.canContinueFlag).val(parseInt($(event.currentTarget).data('flag'), 10));
- }
- });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/opcheckout.js b/app/design/frontend/magento_backup/Magento_Checkout/js/opcheckout.js
deleted file mode 100644
index b9e20dd2b43..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/opcheckout.js
+++ /dev/null
@@ -1,518 +0,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.
- *
- * @category one page checkout first step
- * @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($, window) {
- 'use strict';
- // Base widget, handle ajax events and first section(Checkout Method) in one page checkout accordion
- $.widget('mage.opcheckout', {
- options: {
- checkout: {
- loginGuestSelector: '#login\\:guest',
- loginRegisterSelector: '#login\\:register',
- loginFormSelector: '#login-form',
- continueSelector: '#onepage-guest-register-button',
- registerCustomerPasswordSelector: '#register-customer-password',
- suggestRegistration: false
- },
- sectionSelectorPrefix: '#opc-',
- billingSection: 'billing',
- ajaxLoaderPlaceButton: false,
- updateSelectorPrefix: '#checkout-',
- updateSelectorSuffix: '-load',
- backSelector: '.back-link',
- minBalance: 0.0001
- },
-
- _create: function() {
- var _this = this;
- this.checkoutPrice = this.options.quoteBaseGrandTotal;
- if (this.options.checkout.suggestRegistration) {
- $(this.options.checkout.loginGuestSelector).prop('checked', false);
- $(this.options.checkout.loginRegisterSelector).prop('checked', true);
- }
- this.element
- .on('click', this.options.checkout.continueSelector, function() {
- $.proxy(_this._continue($(this)), _this);
- })
- .on('gotoSection', function(event, section) {
- $.proxy(_this._ajaxUpdateProgress(section), _this);
- _this.element.trigger('enableSection', {selector: _this.options.sectionSelectorPrefix + section});
- })
- .on('ajaxError', $.proxy(this._ajaxError, this))
- .on('showAjaxLoader', $.proxy(this._ajaxSend, this))
- .on('hideAjaxLoader', $.proxy(this._ajaxComplete, this))
- .on('click', this.options.backSelector, function() {
- _this.element.trigger('enableSection', {selector: '#' + _this.element.find('.active').prev().attr('id')});
- })
- .on('click', '[data-action="login-form-submit"]', function() {
- $(_this.options.checkout.loginFormSelector).submit();
- });
- $(this.options.checkoutProgressContainer).on('click', '[data-goto-section]', $.proxy(function(e) {
- var gotoSection = $(e.target).data('goto-section');
- this._ajaxUpdateProgress(gotoSection);
- this.element.trigger('enableSection', {selector: _this.options.sectionSelectorPrefix + gotoSection});
- return false;
- }, this));
- },
-
- /**
- * Callback function for before ajax send event(global)
- * @private
- */
- _ajaxSend: function() {
- var loader = this.element.find('.section.active .please-wait').show();
- if (this.options.ajaxLoaderPlaceButton) {
- loader.siblings('.button').hide();
- }
- },
-
- /**
- * Callback function for ajax complete event(global)
- * @private
- */
- _ajaxComplete: function() {
- this.element.find('.please-wait').hide();
- if (this.options.ajaxLoaderPlaceButton) {
- this.element.find('.button').show();
- }
- },
-
- /**
- * ajax error for all onepage checkout ajax calls
- * @private
- */
- _ajaxError: function() {
- window.location.href = this.options.failureUrl;
- },
-
- /**
- * callback function when continue button is clicked
- * @private
- * @param elem - continue button
- * @return {Boolean}
- */
- _continue: function(elem) {
- var json = elem.data('checkout');
- if (json.isGuestCheckoutAllowed) {
- if ($(this.options.checkout.loginGuestSelector).is(':checked')) {
- this._ajaxContinue(this.options.checkout.saveUrl, {method:'guest'}, this.options.billingSection);
- this.element.find(this.options.checkout.registerCustomerPasswordSelector).hide();
- } else if ($(this.options.checkout.loginRegisterSelector).is(':checked')) {
- this._ajaxContinue(this.options.checkout.saveUrl, {method:'register'}, this.options.billingSection);
- this.element.find(this.options.checkout.registerCustomerPasswordSelector).show();
- } else {
- alert($.mage.__('Please choose to register or to checkout as a guest.'));
- return false;
- }
- }
- this.element.trigger('login');
- },
-
- /**
- * Ajax call to save checkout info to backend and enable next section in accordion
- * @private
- * @param url - ajax url
- * @param data - post data for ajax call
- * @param gotoSection - the section needs to show after ajax call
- * @param successCallback - custom callback function in ajax success
- */
- _ajaxContinue: function(url, data, gotoSection, successCallback) {
- $.ajax({
- url: url,
- type: 'post',
- context: this,
- data: data,
- dataType: 'json',
- beforeSend: this._ajaxSend,
- complete: this._ajaxComplete,
- success: function(response) {
- if (successCallback) {
- successCallback.call(this, response);
- }
- if ($.type(response) === 'object' && !$.isEmptyObject(response)) {
- if (response.error) {
- var msg = response.message || response.error_messages;
- if (msg) {
- if ($.type(msg) === 'array') {
- msg = msg.join("\n");
- }
- $(this.options.countrySelector).trigger('change');
- alert($.mage.__(msg));
- } else {
- alert($.mage.__(response.error));
- }
- return;
- }
- if (response.redirect) {
- $.mage.redirect(response.redirect);
- return false;
- }
- else if (response.success) {
- $.mage.redirect(this.options.review.successUrl);
- return false;
- }
- if (response.update_section) {
- if (response.update_section.name === 'payment-method' && response.update_section.html.indexOf('data-checkout-price')) {
- this.element.find(this.options.payment.form).find('[data-checkout-price]').remove();
- }
- $(this.options.updateSelectorPrefix + response.update_section.name + this.options.updateSelectorSuffix)
- .html($(response.update_section.html)).trigger('contentUpdated');
- }
- if (response.duplicateBillingInfo) {
- $(this.options.shipping.copyBillingSelector).prop('checked', true).trigger('click');
- $(this.options.shipping.addressDropdownSelector).val($(this.options.billing.addressDropdownSelector).val()).change();
- }
- if (response.goto_section) {
- this.element.trigger('gotoSection', response.goto_section);
- }
- } else {
- this.element.trigger('gotoSection', gotoSection);
- }
- }
- });
- },
-
- /**
- * Update progress sidebar content
- * @private
- * @param toStep
- */
- _ajaxUpdateProgress: function(toStep) {
- if (toStep) {
- $.ajax({
- url: this.options.progressUrl,
- type: 'get',
- async: false,
- cache: false,
- context: this,
- data: toStep ? {toStep: toStep} : null,
- success: function(response) {
- $(this.options.checkoutProgressContainer).html(response);
- }
- });
- }
- }
- });
-
- // Extension for mage.opcheckout - second section(Billing Information) in one page checkout accordion
- $.widget('mage.opcheckout', $.mage.opcheckout, {
- options: {
- billing: {
- addressDropdownSelector: '#billing-address-select',
- newAddressFormSelector: '#billing-new-address-form',
- continueSelector: '#billing-buttons-container .button',
- form: '#co-billing-form'
- }
- },
-
- _create: function() {
- this._super();
- this.element
- .on('change', this.options.billing.addressDropdownSelector, $.proxy(function(e) {
- this.element.find(this.options.billing.newAddressFormSelector).toggle(!$(e.target).val());
- }, this))
- .on('click', this.options.billing.continueSelector, $.proxy(function() {
- if ($(this.options.billing.form).validation && $(this.options.billing.form).validation('isValid')) {
- this._billingSave();
- }
- }, this))
- .find(this.options.billing.form).validation();
- } ,
-
- _billingSave: function() {
- this._ajaxContinue(this.options.billing.saveUrl, $(this.options.billing.form).serialize(), false, function() {
- //Trigger indicating billing save. eg. GiftMessage listens to this to inject gift options
- this.element.trigger('billingSave');
- });
- }
- });
-
- // Extension for mage.opcheckout - third section(Shipping Information) in one page checkout accordion
- $.widget('mage.opcheckout', $.mage.opcheckout, {
- options: {
- shipping: {
- form: '#co-shipping-form',
- addressDropdownSelector: '#shipping-address-select',
- newAddressFormSelector: '#shipping-new-address-form',
- copyBillingSelector: '#shipping\\:same_as_billing',
- countrySelector: '#shipping\\:country_id',
- continueSelector:'#shipping-buttons-container .button'
- }
- },
-
- _create: function() {
- this._super();
- this.element
- .on('change', this.options.shipping.addressDropdownSelector, $.proxy(function(e) {
- $(this.options.shipping.newAddressFormSelector).toggle(!$(e.target).val());
- }, this))
- .on('input propertychange', this.options.shipping.form + ' :input[name]', $.proxy(function() {
- $(this.options.shipping.copyBillingSelector).prop('checked', false);
- }, this))
- .on('click', this.options.shipping.copyBillingSelector, $.proxy(function(e) {
- if ($(e.target).is(':checked')) {
- this._billingToShipping();
- }
- }, this))
- .on('click', this.options.shipping.continueSelector, $.proxy(function() {
- if ($(this.options.shipping.form).validation && $(this.options.shipping.form).validation('isValid')) {
- this._ajaxContinue(this.options.shipping.saveUrl, $(this.options.shipping.form).serialize(), false, function() {
- //Trigger indicating shipping save. eg. GiftMessage listens to this to inject gift options
- this.element.trigger('shippingSave');
- });
- }
- }, this))
- .find(this.options.shipping.form).validation();
- },
-
- /**
- * Copy billing address info to shipping address
- * @private
- */
- _billingToShipping: function() {
- $(':input[name]', this.options.billing.form).each($.proxy(function(key, value) {
- var fieldObj = $(value.id.replace('billing:', '#shipping\\:'));
- fieldObj.val($(value).val());
- if (fieldObj.is("select")) {
- fieldObj.trigger('change');
- }
- }, this));
- $(this.options.shipping.copyBillingSelector).prop('checked', true);
- }
- });
-
- // Extension for mage.opcheckout - fourth section(Shipping Method) in one page checkout accordion
- $.widget('mage.opcheckout', $.mage.opcheckout, {
- options: {
- shippingMethod: {
- continueSelector: '#shipping-method-buttons-container .button',
- form: '#co-shipping-method-form'
- }
- },
-
- _create: function() {
- this._super();
- var _this = this;
- this.element
- .on('click', this.options.shippingMethod.continueSelector, $.proxy(function() {
- if (this._validateShippingMethod()&&
- $(this.options.shippingMethod.form).validation &&
- $(this.options.shippingMethod.form).validation('isValid')) {
- this._ajaxContinue(this.options.shippingMethod.saveUrl, $(this.options.shippingMethod.form).serialize());
- }
- }, this))
- .on('click', 'input[name="shipping_method"]', function() {
- var selectedPrice = _this.shippingCodePrice[$(this).val()] || 0,
- oldPrice = _this.shippingCodePrice[_this.currentShippingMethod] || 0;
- _this.checkoutPrice = _this.checkoutPrice - oldPrice + selectedPrice;
- _this.currentShippingMethod = $(this).val();
- })
- .on('contentUpdated', $.proxy(function() {
- this.currentShippingMethod = this.element.find('input[name="shipping_method"]:checked').val();
- this.shippingCodePrice = this.element.find('[data-shipping-code-price]').data('shipping-code-price');
- }, this))
- .find(this.options.shippingMethod.form).validation();
- },
-
- /**
- * Make sure at least one shipping method is selected
- * @return {Boolean}
- * @private
- */
- _validateShippingMethod: function() {
- var methods = this.element.find('[name="shipping_method"]');
- if (methods.length === 0) {
- alert($.mage.__('We are not able to ship to the selected shipping address. Please choose another address or edit the current address.'));
- return false;
- }
- if (methods.filter(':checked').length) {
- return true;
- }
- alert($.mage.__('Please specify a shipping method.'));
- return false;
- }
- });
-
- // Extension for mage.opcheckout - fifth section(Payment Information) in one page checkout accordion
- $.widget('mage.opcheckout', $.mage.opcheckout, {
- options: {
- payment: {
- continueSelector: '#payment-buttons-container .button',
- form: '#co-payment-form',
- methodsContainer: '#checkout-payment-method-load',
- freeInput: {
- tmpl: '<input id="hidden-free" type="hidden" name="payment[method]" value="free">',
- selector: '#hidden-free'
- }
- }
- },
-
- _create: function() {
- this._super();
- this.element
- .on('click', this.options.payment.continueSelector, $.proxy(function() {
- if (this._validatePaymentMethod() &&
- $(this.options.payment.form).validation &&
- $(this.options.payment.form).validation('isValid')) {
- this._ajaxContinue(this.options.payment.saveUrl, $(this.options.payment.form).serialize());
- }
- }, this))
- .on('updateCheckoutPrice', $.proxy(function(event, data) {
- if (data.price) {
- this.checkoutPrice += data.price;
- }
- if (data.totalPrice) {
- data.totalPrice = this.checkoutPrice;
- }
- if (this.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('contentUpdated', this.options.payment.form, $.proxy(function() {
- $(this.options.payment.form).find('dd [name^="payment["]').prop('disabled', true);
- var checkoutPrice = this.element.find(this.options.payment.form).find('[data-checkout-price]').data('checkout-price');
- if ($.isNumeric(checkoutPrice)) {
- this.checkoutPrice = checkoutPrice;
- }
- if (this.checkoutPrice < this.options.minBalance) {
- this._disablePaymentMethods();
- } else {
- this._enablePaymentMethods();
- }
- }, this))
- .on('click', this.options.payment.form + ' dt input:radio', $.proxy(this._paymentMethodHandler, this))
- .find(this.options.payment.form).validation({
- errorPlacement: function(error, element) {
- if (element.attr('data-validate') && element.attr('data-validate').indexOf('validate-cc-ukss') >= 0) {
- element.parents('form').find('[data-validation-msg="validate-cc-ukss"]').html(error);
- } else {
- element.after(error);
- }
- }
- });
- },
-
- /**
- * Display payment details when payment method radio button is checked
- * @private
- * @param e
- */
- _paymentMethodHandler: function(e) {
- var _this = $(e.target),
- parentsDl = _this.closest('dl');
- parentsDl.find('dt input:radio').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);
- },
-
- /**
- * make sure one payment method is selected
- * @private
- * @return {Boolean}
- */
- _validatePaymentMethod: function() {
- var methods = this.element.find('[name^="payment["]');
- if (methods.length === 0) {
- alert($.mage.__("We can't complete your order because you don't have a payment method available."));
- return false;
- }
- if (this.checkoutPrice < this.options.minBalance) {
- return true;
- } else if (methods.filter('input:radio:checked').length) {
- return true;
- }
- alert($.mage.__('Please specify payment method.'));
- return false;
- },
-
- /**
- * Disable and enable payment methods
- * @private
- */
- _disablePaymentMethods: function() {
- var paymentForm = $(this.options.payment.form);
- paymentForm.find('input[name="payment[method]"]').prop('disabled', true);
- paymentForm.find(this.options.payment.methodsContainer).hide().find('[name^="payment["]').prop('disabled', true);
- paymentForm.find('input[id^="use"][name^="payment[use"]:not(:checked)').prop('disabled', true).parent().hide();
- paymentForm.find(this.options.payment.freeInput.selector).remove();
- $.tmpl(this.options.payment.freeInput.tmpl).appendTo(paymentForm);
- },
-
- /**
- * Enable and enable payment methods
- * @private
- */
- _enablePaymentMethods: function() {
- var paymentForm = $(this.options.payment.form);
- paymentForm.find('input[name="payment[method]"]').prop('disabled', false);
- paymentForm.find('input[name="payment[method]"]:checked').trigger('click');
- paymentForm.find(this.options.payment.methodsContainer).show();
- paymentForm.find('input[id^="use"][name^="payment[use"]:not(:checked)').prop('disabled', false).parent().show();
- paymentForm.find(this.options.payment.freeInput.selector).remove();
- }
- });
-
- // Extension for mage.opcheckout - last section(Order Review) in one page checkout accordion
- $.widget('mage.opcheckout', $.mage.opcheckout, {
- options: {
- review: {
- continueSelector: '#review-buttons-container .button',
- container: '#opc-review',
- agreementFormSelector:'#checkout-agreements',
- submitContainer: '#checkout-review-submit'
- }
- },
-
- _create: function() {
- this._super();
- this.element
- .on('click', this.options.review.continueSelector, $.proxy(this._saveOrder, this))
- .on('saveOrder', this.options.review.container, $.proxy(this._saveOrder, this))
- .on('contentUpdated', this.options.review.container, $.proxy(function() {
- var paypalIframe = this.element.find(this.options.review.container)
- .find('[data-container="paypal-iframe"]');
- if (paypalIframe.length) {
- paypalIframe.show();
- $(this.options.review.submitContainer).hide();
- }
- }, this));
- },
-
- _saveOrder: function() {
- if ($(this.options.payment.form).validation &&
- $(this.options.payment.form).validation('isValid')) {
- this._ajaxContinue(
- this.options.review.saveUrl,
- $(this.options.payment.form).serialize() + '&' + $(this.options.review.agreementFormSelector).serialize());
- }
- }
- });
-})(jQuery, window);
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/overview.js b/app/design/frontend/magento_backup/Magento_Checkout/js/overview.js
deleted file mode 100644
index e2f53ed1d13..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/overview.js
+++ /dev/null
@@ -1,61 +0,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.
- *
- * @category checkout multi-shipping review order overview
- * @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*/
-/*global alert*/
-(function($) {
- "use strict";
- $.widget('mage.orderOverview', {
- options: {
- opacity: 0.5, // CSS opacity for the 'Place Order' button when it's clicked and then disabled.
- pleaseWaitLoader: 'span.please-wait', // 'Submitting order information...' Ajax loader.
- placeOrderSubmit: 'button[type="submit"]', // The 'Place Order' button.
- agreements: '#checkout-agreements' // Container for all of the checkout billing agreements.
- },
-
- /**
- * Bind a submit handler to the form.
- * @private
- */
- _create: function() {
- this.element.on('submit', $.proxy(this._showLoader, this));
- },
-
- /**
- * Verify that all agreements and terms/conditions are checked. Show the Ajax loader. Disable
- * the submit button (i.e. Place Order).
- * @return {Boolean}
- * @private
- */
- _showLoader: function() {
- if ($(this.options.agreements).find('input[type="checkbox"]:not(:checked)').length > 0) {
- alert($.mage.__('Please agree to all Terms and Conditions before placing the orders.'));
- return false;
- }
- this.element.find(this.options.pleaseWaitLoader).show().end()
- .find(this.options.placeOrderSubmit).prop('disabled', true).css('opacity', this.options.opacity);
- return true;
- }
- });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/payment-authentication.js b/app/design/frontend/magento_backup/Magento_Checkout/js/payment-authentication.js
deleted file mode 100644
index 04f406adca6..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/payment-authentication.js
+++ /dev/null
@@ -1,49 +0,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.
- *
- * @category Magento
- * @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 jquery:true*/
-(function ($) {
- "use strict";
- $.widget('mage.paymentAuthentication', {
- options : {
- bodySelector: '[data-container="body"]'
- },
-
- _create: function () {
- // add a trigger on the body for payment authentication state changes
- this.element.closest(this.options.bodySelector).on("paymentAuthentication", $.proxy(this._paymentmentAthenticationTrigger, this));
- },
-
- /**
- * This method processes the paymentAuthentication actions.
- */
- _paymentmentAthenticationTrigger: function (event, data) {
- if (data.state === 'start') {
- this.element.hide();
- } else {
- this.element.show();
- }
- }
- });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/payment.js b/app/design/frontend/magento_backup/Magento_Checkout/js/payment.js
deleted file mode 100644
index fbc1983892d..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/payment.js
+++ /dev/null
@@ -1,133 +0,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.
- *
- * @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('.items').hide().find('[name^="payment["]').prop('disabled', true);
- element.prop('checked', true).parent().nextUntil('dt').find('.items').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_Checkout/js/region-updater.js b/app/design/frontend/magento_backup/Magento_Checkout/js/region-updater.js
deleted file mode 100644
index 4be2fa30b5d..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/region-updater.js
+++ /dev/null
@@ -1,177 +0,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.
- *
- * @category frontend Checkout region-updater
- * @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 expr:true*/
-(function($) {
- $.widget('mage.regionUpdater', {
- options: {
- regionTemplate: '<option value="${value}" title="${title}" {{if isSelected}}selected="selected"{{/if}}>${title}</option>',
- isRegionRequired: true,
- isZipRequired: true,
- isCountryRequired: true
- },
-
- _create: function() {
- this._updateRegion(this.element.find('option:selected').val());
- this.element.on('change', $.proxy(function(e) {
- this._updateRegion($(e.target).val());
- }, this));
- if (this.isCountryRequired) {
- this.element.addClass('required-entry');
- }
- $(this.options.regionListId).on('change', $.proxy(function(e) {
- this.setOption = false;
- this.currentRegionOption = $(e.target).val();
- }, this));
- $(this.options.regionInputId).on('focusout', $.proxy(function() {
- this.setOption = true;
- }, this));
- },
-
- /**
- * Remove options from dropdown list
- * @param {object} selectElement - jQuery object for dropdown list
- * @private
- */
- _removeSelectOptions: function(selectElement) {
- selectElement.find('option').each(function(index) {
- if (index) {
- $(this).remove();
- }
- });
- },
-
- /**
- * Render dropdown list
- * @param {object} selectElement - jQuery object for dropdown list
- * @param {string} key - region code
- * @param {object} value - region object
- * @private
- */
- _renderSelectOption: function(selectElement, key, value) {
- selectElement.append($.proxy(function() {
- $.template('regionTemplate', this.options.regionTemplate);
- if (this.options.defaultRegion === key) {
- return $.tmpl('regionTemplate', {value: key, title: value.name, isSelected: true});
- } else {
- return $.tmpl('regionTemplate', {value: key, title: value.name});
- }
- }, this));
- },
-
- /**
- * Takes clearError callback function as first option
- * If no form is passed as option, look up the closest form and call clearError method.
- * @private
- */
- _clearError: function() {
- if (this.options.clearError && typeof(this.options.clearError) === "function") {
- this.options.clearError.call(this);
- } else {
- if (!this.options.form) {
- this.options.form = this.element.closest('form').length ? $(this.element.closest('form')[0]) : null;
- }
- this.options.form && this.options.form.data('validation') && this.options.form.validation('clearError',
- this.options.regionListId, this.options.regionInputId, this.options.postcodeId);
- }
- },
- /**
- * Update dropdown list based on the country selected
- * @param {string} country - 2 uppercase letter for country code
- * @private
- */
- _updateRegion: function(country) {
- // Clear validation error messages
- var regionList = $(this.options.regionListId),
- regionInput = $(this.options.regionInputId),
- postcode = $(this.options.postcodeId),
- requiredLabel = regionList.parent().siblings('label').children('em');
- this._clearError();
- this._checkRegionRequired(country);
- // Populate state/province dropdown list if available or use input box
- if (this.options.regionJson[country]) {
- this._removeSelectOptions(regionList);
- $.each(this.options.regionJson[country], $.proxy(function(key, value) {
- this._renderSelectOption(regionList, key, value);
- }, this));
- if (this.currentRegionOption) {
- regionList.val(this.currentRegionOption);
- }
- if (this.setOption) {
- regionList.find("option").filter(function() {
- return this.text === regionInput.val();
- }).attr('selected', true);
- }
- if (this.options.isRegionRequired) {
- regionList.addClass('required-entry').removeAttr('disabled');
- requiredLabel.show();
- } else {
- regionList.removeClass('required-entry validate-select').removeAttr('data-validate');
- requiredLabel.hide();
- if (!this.options.optionalRegionAllowed) {
- regionList.attr('disabled', 'disabled');
- }
- }
- regionList.show();
- regionInput.hide();
- } else {
- if (this.options.isRegionRequired) {
- regionInput.addClass('required-entry').removeAttr('disabled');
- requiredLabel.show();
- } else {
- if (!this.options.optionalRegionAllowed) {
- regionInput.attr('disabled', 'disabled');
- }
- }
- regionList.removeClass('required-entry').hide();
- regionInput.show();
- requiredLabel.hide();
- }
- // If country is in optionalzip list, make postcode input not required
- if (this.options.isZipRequired) {
- $.inArray(country, this.options.countriesWithOptionalZip) >= 0 ?
- postcode.removeClass('required-entry').parent().siblings('label').children('em').hide() :
- postcode.addClass('required-entry').parent().siblings('label').children('em').show();
- }
- // Add defaultvalue attribute to state/province select element
- regionList.attr('defaultvalue', this.options.defaultRegion);
- },
-
- /**
- * Check if the selected country has a mandatory region selection
- *
- * @param {string} country Code of the country - 2 uppercase letter for country code
- * @private
- */
- _checkRegionRequired: function(country) {
- this.options.isRegionRequired = false;
- var self = this;
- $.each(this.options.regionJson.config.regions_required, function(index, elem){
- if (elem == country) {
- self.options.isRegionRequired = true;
- }
- });
- }
- });
-})(jQuery);
\ No newline at end of file
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/shopping-cart.js b/app/design/frontend/magento_backup/Magento_Checkout/js/shopping-cart.js
deleted file mode 100644
index 1e6baf52647..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/shopping-cart.js
+++ /dev/null
@@ -1,41 +0,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.
- *
- * @category mage checkout shopping cart
- * @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($) {
- $.widget('mage.shoppingCart', {
- _create: function() {
- if ($(this.options.updateCartActionContainer).length > 0) { /* <!--[if lt IE 8]> Only */
- $(this.options.emptyCartButton).on('click', $.proxy(function() {
- $(this.options.emptyCartButton).attr('name', 'update_cart_action_temp');
- $(this.options.updateCartActionContainer)
- .attr('name', 'update_cart_action').attr('value', 'empty_cart');
- }, this));
- }
- $(this.options.continueShoppingButton).on('click', $.proxy(function() {
- location.href = this.options.continueShoppingUrl;
- }, this));
- }
- });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/js/sidebar.js b/app/design/frontend/magento_backup/Magento_Checkout/js/sidebar.js
deleted file mode 100644
index 825b4bb73c0..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/js/sidebar.js
+++ /dev/null
@@ -1,44 +0,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.
- *
- * @category mage side bar
- * @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 confirm:true*/
-(function ($) {
- $.widget('mage.sidebar', {
- options: {
- checkoutUrl: '',
- checkoutButton: '',
- removeButton: '',
- confirmMessage: ''
- },
- _create: function() {
- $(this.options.checkoutButton).on('click', $.proxy(function() {
- location.href = this.options.checkoutUrl;
- }, this));
- $(this.options.removeButton).on('click', $.proxy(function() {
- return confirm(this.options.confirmMessage);
- }, this));
- }
- });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure.xml
deleted file mode 100644
index edb922b5c54..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_configure.xml
+++ /dev/null
@@ -1,41 +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="catalog_product_view"/>
- <referenceBlock name="product.info">
- <block class="Magento\Checkout\Block\Cart\Item\Configure" name="checkout.cart.item.configure.block"/>
- </referenceBlock>
- <referenceBlock name="product.info.addtocart">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">Magento_Checkout::cart/item/configure/updatecart.phtml</argument>
- </action>
- </referenceBlock>
- <referenceBlock name="product.info.addtocart.additional">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">Magento_Checkout::cart/item/configure/updatecart.phtml</argument>
- </action>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_index.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_index.xml
deleted file mode 100644
index 72685dcf904..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_cart_index.xml
+++ /dev/null
@@ -1,56 +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="root">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">1column.phtml</argument>
- </action>
- </referenceBlock>
- <referenceContainer name="content">
- <block class="Magento\Checkout\Block\Cart" name="checkout.cart" template="cart.phtml">
- <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="simple" template="cart/item/default.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="cart/item/default.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="cart/item/default.phtml"/>
- <container name="checkout.cart.empty.widget" as="checkout_cart_empty_widget" label="Empty Shopping Cart Content Before"/>
- <container name="checkout.cart.top_methods" as="top_methods" label="Payment Methods Before Checkout Button">
- <block class="Magento\Checkout\Block\Onepage\Link" name="checkout.cart.methods.onepage.top" template="onepage/link.phtml"/>
- </container>
- <container name="checkout.cart.form.before" as="form_before" label="Shopping Cart Form Before"/>
- <container name="checkout.cart.methods" as="methods" label="Payment Methods After Checkout Button">
- <block class="Magento\Checkout\Block\Onepage\Link" name="checkout.cart.methods.onepage.bottom" template="onepage/link.phtml"/>
- <block class="Magento\Checkout\Block\Multishipping\Link" name="checkout.cart.methods.multishipping" template="multishipping/link.phtml"/>
- </container>
- <container name="checkout.cart.extra" label="Shopping Cart Extra Contents">
- <container name="checkout.cart.widget" as="checkout_cart_widget" before="-" label="Shopping Cart Items After"/>
- <block class="Magento\Checkout\Block\Cart\Coupon" name="checkout.cart.coupon" as="coupon" template="cart/coupon.phtml"/>
- </container>
- <block class="Magento\Checkout\Block\Cart\Shipping" name="checkout.cart.shipping" as="shipping" template="cart/shipping.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Crosssell" name="checkout.cart.crosssell" as="crosssell" template="cart/crosssell.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Totals" name="checkout.cart.totals" as="totals" template="cart/totals.phtml"/>
- </block>
- </referenceContainer>
- <container name="additional.product.info" label="Additional Product Info"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping.xml
deleted file mode 100644
index 6992a9165dc..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping.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)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" label="Multishipping Checkout" design_abstraction="custom">
- <referenceBlock name="root">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">1column.phtml</argument>
- </action>
- </referenceBlock>
- <referenceContainer name="content">
- <block class="Magento\Checkout\Block\Multishipping\State" name="checkout_state" template="multishipping/state.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editaddress.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editaddress.xml
deleted file mode 100644
index 01155fca00b..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editaddress.xml
+++ /dev/null
@@ -1,29 +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="checkout_multishipping"/>
- <update handle="checkout_multishipping_customer_address"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editbilling.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editbilling.xml
deleted file mode 100644
index 01155fca00b..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editbilling.xml
+++ /dev/null
@@ -1,29 +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="checkout_multishipping"/>
- <update handle="checkout_multishipping_customer_address"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editshipping.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editshipping.xml
deleted file mode 100644
index 01155fca00b..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_editshipping.xml
+++ /dev/null
@@ -1,29 +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="checkout_multishipping"/>
- <update handle="checkout_multishipping_customer_address"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_newbilling.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_newbilling.xml
deleted file mode 100644
index 01155fca00b..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_newbilling.xml
+++ /dev/null
@@ -1,29 +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="checkout_multishipping"/>
- <update handle="checkout_multishipping_customer_address"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_newshipping.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_newshipping.xml
deleted file mode 100644
index 01155fca00b..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_newshipping.xml
+++ /dev/null
@@ -1,29 +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="checkout_multishipping"/>
- <update handle="checkout_multishipping_customer_address"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_select.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_select.xml
deleted file mode 100644
index 8476c3644e2..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_select.xml
+++ /dev/null
@@ -1,31 +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="Multishipping Checkout Shipping Address Selection" design_abstraction="custom">
- <update handle="checkout_multishipping"/>
- <referenceContainer name="content">
- <block class="Magento\Checkout\Block\Multishipping\Address\Select" name="checkout_address_select" template="multishipping/address/select.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_selectbilling.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_selectbilling.xml
deleted file mode 100644
index edbe6ce92e8..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_address_selectbilling.xml
+++ /dev/null
@@ -1,31 +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="checkout_multishipping"/>
- <referenceContainer name="content">
- <block class="Magento\Checkout\Block\Multishipping\Address\Select" name="checkout_address_select" template="multishipping/address/select.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_addresses.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_addresses.xml
deleted file mode 100644
index cb8f206e735..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_addresses.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)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <update handle="checkout_multishipping"/>
- <referenceContainer name="content">
- <block class="Magento\Checkout\Block\Multishipping\Addresses" name="checkout_addresses" template="multishipping/addresses.phtml">
- <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="multishipping/item/default.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="multishipping/item/default.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="multishipping/item/default.phtml"/>
- </block>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_billing.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_billing.xml
deleted file mode 100644
index 727670fe7b5..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_billing.xml
+++ /dev/null
@@ -1,36 +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="checkout_multishipping"/>
- <referenceContainer name="content">
- <block class="Magento\Checkout\Block\Multishipping\Billing" name="checkout_billing" template="multishipping/billing.phtml">
- <action method="setMethodFormTemplate">
- <argument name="method" xsi:type="string">purchaseorder</argument>
- <argument name="template" xsi:type="string">Magento_Payment::form/purchaseorder.phtml</argument>
- </action>
- </block>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_customer_address.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_customer_address.xml
deleted file mode 100644
index 8e46496c74a..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_customer_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" label="Multishipping Checkout Customer Address Edit Form" design_abstraction="custom">
- <referenceContainer name="content">
- <block class="Magento\Customer\Block\Address\Edit" name="customer_address_edit" template="address/edit.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_login.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_login.xml
deleted file mode 100644
index db128f00b8c..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_login.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">
- <update handle="customer_account_login"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_overview.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_overview.xml
deleted file mode 100644
index 6fae4733fab..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_overview.xml
+++ /dev/null
@@ -1,46 +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="checkout_multishipping"/>
- <referenceContainer name="content">
- <block class="Magento\Checkout\Block\Multishipping\Overview" name="checkout_overview" template="multishipping/overview.phtml">
- <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="multishipping/item/default.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="multishipping/item/default.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="multishipping/item/default.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="row-grouped" template="multishipping/overview/item.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="row-configurable" template="multishipping/overview/item.phtml"/>
- <block class="Magento\Checkout\Block\Multishipping\Payment\Info" name="payment_info">
- <action method="setInfoTemplate">
- <argument name="method" xsi:type="string"/>
- <argument name="template" xsi:type="string"/>
- </action>
- </block>
- <block class="Magento\Checkout\Block\Agreements" name="checkout.multishipping.agreements" as="agreements" template="multishipping/agreements.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Totals" name="totals"/>
- <container name="checkout.multishipping.overview.items.after" as="items_after" label="Overview Items After"/>
- </block>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_register.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_register.xml
deleted file mode 100644
index a3a49fd46d2..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_register.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">
- <update handle="customer_account_create"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_shipping.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_shipping.xml
deleted file mode 100644
index 09e49208bc0..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_shipping.xml
+++ /dev/null
@@ -1,40 +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="checkout_multishipping"/>
- <referenceContainer name="content">
- <block class="Magento\Checkout\Block\Multishipping\Shipping" name="checkout_shipping" template="multishipping/shipping.phtml">
- <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="multishipping/item/default.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="multishipping/item/default.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="multishipping/item/default.phtml"/>
- <block class="Magento\Checkout\Block\Multishipping\Billing\Items" name="checkout_billing_items" template="multishipping/billing/items.phtml">
- <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="default" template="multishipping/item/default.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="multishipping/item/default.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="multishipping/item/default.phtml"/>
- </block>
- </block>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_success.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_success.xml
deleted file mode 100644
index 6e453eef56b..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_multishipping_success.xml
+++ /dev/null
@@ -1,31 +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="checkout_multishipping"/>
- <referenceContainer name="content">
- <block class="Magento\Checkout\Block\Multishipping\Success" name="checkout_success" template="multishipping/success.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_additional.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_additional.xml
deleted file mode 100644
index 7784b3f5619..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_additional.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">
- <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/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_failure.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_failure.xml
deleted file mode 100644
index fa508817825..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_failure.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)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="root">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">2columns-right.phtml</argument>
- </action>
- </referenceBlock>
- <referenceContainer name="content">
- <block class="Magento\Checkout\Block\Onepage\Failure" name="checkout.failure" template="onepage/failure.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_index.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_index.xml
deleted file mode 100644
index ff432355736..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_index.xml
+++ /dev/null
@@ -1,61 +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="root">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">2columns-right.phtml</argument>
- </action>
- </referenceBlock>
- <referenceContainer name="right">
- <container name="checkout.progress.wrapper" label="Checkout Progress Wrapper" htmlTag="div" htmlId="checkout-progress-wrapper">
- <block class="Magento\Checkout\Block\Onepage\Progress" name="checkout.progress" before="-" template="onepage/progress.phtml"/>
- </container>
- </referenceContainer>
- <referenceContainer name="content">
- <block class="Magento\Checkout\Block\Onepage" name="checkout.onepage" template="onepage.phtml">
- <block class="Magento\Checkout\Block\Onepage\Login" name="checkout.onepage.login" as="login" template="onepage/login.phtml">
- <container name="checkout.onepage.login.before" as="login_before" label="Login/Registration Before" htmlTag="div"/>
- </block>
- <block class="Magento\Checkout\Block\Onepage\Billing" name="checkout.onepage.billing" as="billing" template="onepage/billing.phtml"/>
- <block class="Magento\Checkout\Block\Onepage\Shipping" name="checkout.onepage.shipping" as="shipping" template="onepage/shipping.phtml"/>
- <block class="Magento\Checkout\Block\Onepage\Shipping\Method" name="checkout.onepage.shipping_method" as="shipping_method" template="onepage/shipping_method.phtml">
- <block class="Magento\Checkout\Block\Onepage\Shipping\Method\Available" name="checkout.onepage.shipping_method.available" as="available" template="onepage/shipping_method/available.phtml"/>
- <block class="Magento\Checkout\Block\Onepage\Shipping\Method\Additional" name="checkout.onepage.shipping_method.additional" as="additional" template="onepage/shipping_method/additional.phtml"/>
- </block>
- <block class="Magento\Checkout\Block\Onepage\Payment" name="checkout.onepage.payment" as="payment" template="onepage/payment.phtml">
- <block class="Magento\Checkout\Block\Onepage\Payment\Methods" name="checkout.payment.methods" as="methods" template="onepage/payment/methods.phtml">
- <action method="setMethodFormTemplate">
- <argument name="method" xsi:type="string">purchaseorder</argument>
- <argument name="template" xsi:type="string">Magento_Payment::form/purchaseorder.phtml</argument>
- </action>
- </block>
- <block class="Magento\View\Block\Template" name="checkout.onepage.payment.additional" as="additional"/>
- <block class="Magento\View\Block\Template" name="checkout.onepage.payment.methods_additional" as="methods_additional"/>
- </block>
- <block class="Magento\Checkout\Block\Onepage\Review" name="checkout.onepage.review" as="review" template="onepage/review.phtml"/>
- </block>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_paymentmethod.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_paymentmethod.xml
deleted file mode 100644
index 25a577d24d1..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_paymentmethod.xml
+++ /dev/null
@@ -1,33 +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\Checkout\Block\Onepage\Payment\Methods" name="payment_method" output="1" template="onepage/payment/methods.phtml">
- <action method="setMethodFormTemplate">
- <argument name="method" xsi:type="string">purchaseorder</argument>
- <argument name="template" xsi:type="string">Magento_Payment::form/purchaseorder.phtml</argument>
- </action>
- </block>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_progress.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_progress.xml
deleted file mode 100644
index 80228f5a508..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_progress.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)
- */
--->
-<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/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_review.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_review.xml
deleted file mode 100644
index 04bf6de1345..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_review.xml
+++ /dev/null
@@ -1,37 +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\Checkout\Block\Onepage\Review\Info" name="order_review" output="1" template="onepage/review/info.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="checkout.onepage.review.info.totals" as="totals" template="onepage/review/totals.phtml"/>
- <container name="checkout.onepage.review.info.items.before" as="items_before" label="Items Before"/>
- <container name="checkout.onepage.review.info.items.after" as="items_after" label="Items After"/>
- <block class="Magento\Checkout\Block\Agreements" name="checkout.onepage.agreements" as="agreements" template="onepage/agreements.phtml"/>
- <block class="Magento\View\Block\Template" name="checkout.onepage.review.button" as="button" template="Magento_Checkout::onepage/review/button.phtml"/>
- </block>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_shippingmethod.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_shippingmethod.xml
deleted file mode 100644
index 01ea8488482..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_shippingmethod.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\Checkout\Block\Onepage\Shipping\Method\Available" name="shipping_method" output="1" template="onepage/shipping_method/available.phtml"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_success.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_success.xml
deleted file mode 100644
index ac8dc93f7f6..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/checkout_onepage_success.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)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="root">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">2columns-right.phtml</argument>
- </action>
- </referenceBlock>
- <referenceContainer name="content">
- <block class="Magento\Checkout\Block\Onepage\Success" name="checkout.success" template="success.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/default.xml b/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/default.xml
deleted file mode 100644
index 942683120c6..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/layout/override/base/default.xml
+++ /dev/null
@@ -1,46 +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.components">
- <block class="Magento\Page\Block\Js\Components" name="checkout_page_head_components" template="Magento_Checkout::js/components.phtml"/>
- </referenceBlock>
- <referenceBlock name="top.links">
- <block class="Magento\Checkout\Block\Cart\Link" name="my-cart-link"/>
- <block class="Magento\Checkout\Block\Link" name="onepage-checkout-link" after="my-cart-link">
- <arguments>
- <argument name="label" xsi:type="string">Checkout</argument>
- </arguments>
- </block>
- </referenceBlock>
- <referenceContainer name="right">
- <block class="Magento\Checkout\Block\Cart\Sidebar" name="cart_sidebar" template="cart/sidebar.phtml" before="-">
- <block class="Magento\Checkout\Block\Cart\Item\Renderer" as="simple" template="cart/sidebar/default.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Grouped" as="grouped" template="cart/sidebar/default.phtml"/>
- <block class="Magento\Checkout\Block\Cart\Item\Renderer\Configurable" as="configurable" template="cart/sidebar/default.phtml"/>
- <container name="cart_sidebar.extra_actions" as="extra_actions" label="My Cart Extra Actions"/>
- </block>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/address/select.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/address/select.phtml
deleted file mode 100644
index 4dea9b79df9..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/address/select.phtml
+++ /dev/null
@@ -1,58 +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)
- */
-?>
-<div class="multiple-checkout">
- <div class="page-title title-buttons">
- <h1><?php echo __('Change Billing Address') ?></h1>
- <button type="button" title="<?php echo __('Add New Address') ?>" class="button" onclick="setLocation('<?php echo $this->getAddNewUrl() ?>')"><span><span><?php echo __('Add New Address') ?></span></span></button>
- </div>
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
- <?php $_index=0 ?>
- <?php foreach ($this->getAddressCollection() as $_address): ?>
- <?php if($_index%3==0): ?><div class="col3-set"><?php endif; ?>
- <div class="col-<?php echo ($_index%3+1) ?>">
- <p class="actions">
- <a href="<?php echo $this->getEditAddressUrl($_address) ?>"><?php echo __('Edit Address') ?></a> <span class="separator">|</span>
- <a href="<?php echo $this->getSetAddressUrl($_address) ?>"><strong><?php echo __('Select Address') ?></strong></a>
- </p>
- <address>
- <?php echo $_address->format('html') ?>
- </address>
- <?php if($this->isAddressDefaultBilling($_address)): ?>
- <strong><?php echo __('Default Billing') ?></strong>
- <?php endif; ?>
- <?php if($this->isAddressDefaultShipping($_address)): ?>
- <br /><strong><?php echo __('Default Shipping') ?></strong>
- <?php endif; ?>
- </div>
- <?php $_index++ ?>
- <?php if($_index && $_index%3==0): ?></div><?php endif; ?>
- <?php endforeach; ?>
- <?php if(!$_index || $_index%3!=0): ?></div><?php endif; ?>
- <div class="buttons-set">
- <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo __('Back to Billing Information') ?></a></p>
- </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/addresses.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/addresses.phtml
deleted file mode 100644
index 2b55e1349e1..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/addresses.phtml
+++ /dev/null
@@ -1,93 +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
-/**
- * Ship to multiple address template
- *
- * @see \Magento\Checkout\Block\Multishipping\Addresses
- */
-?>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<form id="checkout_multishipping_form" action="<?php echo $this->getPostActionUrl() ?>" method="post">
- <div class="multiple-checkout">
- <div class="page-title title-buttons">
- <h1><?php echo __('Ship to Multiple Addresses') ?></h1>
- <button type="button" title="<?php echo __('Enter a New Address') ?>" class="button" data-role="add-new-address"><span><span><?php echo __('Enter a New Address') ?></span></span></button>
- </div>
- <input type="hidden" name="continue" value="0" id="can_continue_flag" />
- <input type="hidden" name="new_address" value="0" id="add_new_address_flag" />
- <h2><?php echo __('Please select a shipping address for applicable items.') ?></h2>
- <table class="data-table" id="multiship-addresses-table">
- <col />
- <col width="1" />
- <col width="1" />
- <col width="1" />
- <thead>
- <tr>
- <th><?php echo __('Product') ?></th>
- <th class="a-center"><?php echo __('Qty') ?></th>
- <th><?php echo __('Send To') ?></th>
- <th> </th>
- </tr>
- </thead>
- <tfoot>
- <tr>
- <td colspan="100" class="a-right"><button type="submit" title="<?php echo __('Update Qty & Addresses') ?>" class="button" data-role="can-continue" data-flag="0"><span><span><?php echo __('Update Qty & Addresses') ?></span></span></button></td>
- </tr>
- </tfoot>
- <tbody>
- <?php foreach ($this->getItems() as $_index => $_item): ?>
- <?php if ($_item->getQuoteItem()) :?>
- <tr>
- <td><?php echo $this->getItemHtml($_item->getQuoteItem())?></td>
- <td><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}"/></td>
- <td><?php if ($_item->getProduct()->getIsVirtual()): echo __('Shipping selection is not applicable.'); else: echo $this->getAddressesHtmlSelect($_item, $_index); endif; ?></td>
- <td class="a-center"><a href="<?php echo $this->getItemDeleteUrl($_item) ?>" title="<?php echo __('Remove Item') ?>" class="btn-remove2"><?php echo __('Remove Item') ?></a></td>
- </tr>
- <?php endif; ?>
- <?php endforeach; ?>
- </tbody>
- </table>
- <script type="text/javascript">jQuery('#multiship-addresses-table').decorate('table')</script>
- <div class="buttons-set">
- <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo __('Back to Shopping Cart') ?></a></p>
- <button type="submit" title="<?php echo __('Continue to Shipping Information') ?>" class="button<?php if ($this->isContinueDisabled()):?> disabled<?php endif; ?>" data-role="can-continue" data-flag="1"<?php if ($this->isContinueDisabled()):?> disabled="disabled"<?php endif; ?>><span><span><?php echo __('Continue to Shipping Information') ?></span></span></button>
- </div>
- </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_Checkout::js/multi-shipping.js') ?>",
- function() {
- jQuery('#checkout_multishipping_form').multiShipping().validation();
- }
- );
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/agreements.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/agreements.phtml
deleted file mode 100644
index 153ce90330d..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/agreements.phtml
+++ /dev/null
@@ -1,49 +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
-/**
- * @see \Magento\Checkout\Block\Agreements
- */
-?>
-
-<?php if (!$this->getAgreements()) return; ?>
-<ol id="checkout-agreements" class="checkout-agreements">
-<?php foreach ($this->getAgreements() as $_a): ?>
- <li>
- <div class="agreement-content"<?php echo ($_a->getContentHeight() ? ' style="height:' . $_a->getContentHeight() . '"' : '')?>>
- <?php if ($_a->getIsHtml()):?>
- <?php echo $_a->getContent() ?>
- <?php else:?>
- <?php echo nl2br($this->escapeHtml($_a->getContent())) ?>
- <?php endif; ?>
- </div>
- <p class="agree">
- <input type="checkbox" id="agreement-<?php echo $_a->getId()?>" name="agreement[<?php echo $_a->getId()?>]" value="1" title="<?php echo $this->escapeHtml($_a->getCheckboxText()) ?>" class="checkbox" /><label for="agreement-<?php echo $_a->getId()?>"><?php echo $_a->getIsHtml() ? $_a->getCheckboxText() : $this->escapeHtml($_a->getCheckboxText()) ?></label>
- </p>
- </li>
-<?php endforeach ?>
-</ol>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/billing.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/billing.phtml
deleted file mode 100644
index faa48086693..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/billing.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)
- */
-?>
-<?php
-/**
- * Multishipping checkout billing information
- *
- * @see \Magento\Checkout\Block\Multishipping\Billing
- */
-?>
-<div class="multiple-checkout">
- <div class="page-title">
- <h1><?php echo __('Billing Information') ?></h1>
- </div>
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
- <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="multishipping-billing-form">
- <div class="col2-set">
- <div class="col-1 col-narrow">
- <div class="box">
- <div class="box-title">
- <h2><?php echo __('Billing Address') ?> <span class="separator">|</span> <a href="<?php echo $this->getSelectAddressUrl() ?>"><?php echo __('Change') ?></a></h2>
- </div>
- <div class="box-content">
- <?php $_address=$this->getAddress() ?>
- <address><?php echo $_address->format('html') ?></address>
- </div>
- </div>
- </div>
- <div class="col-2 col-wide">
- <div class="box">
- <div class="box-title">
- <h2><?php echo __('Payment Method') ?></h2>
- </div>
- <div class="box-content">
- <!-- Payment methods forms list -->
- <dl class="sp-methods">
- <?php
- $_methods = $this->getMethods();
- $_methodsCount = count($_methods);
- ?>
- <?php foreach ($_methods as $_method): $_code = $_method->getCode() ?>
- <dt>
- <?php if ($_methodsCount > 1): ?>
- <input type="radio" id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" name="payment[method]" title="<?php echo $this->escapeHtml($_method->getTitle()) ?>" <?php if($this->getSelectedMethodCode()==$_code): ?> checked="checked"<?php endif; ?> class="radio" />
- <?php else :?>
- <span class="no-display"><input type="radio" id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" name="payment[method]" checked="checked" class="radio" /></span>
- <?php endif;?>
- <label for="p_method_<?php echo $_code ?>"><?php echo $this->escapeHtml($_method->getTitle()) ?></label>
- </dt>
- <?php if($html = $this->getChildHtml('payment.method.'.$_code)) : ?>
- <dd>
- <?php echo $html; ?>
- </dd>
- <?php endif; ?>
- <?php endforeach; ?>
- </dl>
- <?php echo $this->getChildHtml('checkout_billing_items') ?>
- </div>
- </div>
- </div>
- </div>
- <div class="buttons-set">
- <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo __('Back to Shipping Information') ?></a></p>
- <button id="payment-continue" type="submit" title="<?php echo __('Continue to Review Your Order') ?>" class="button"><span><span><?php echo __('Continue to Review Your Order') ?></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_Checkout::js/payment.js') ?>",
- function() {
- jQuery('#multishipping-billing-form').payment({
- checkoutPrice: <?php echo (float)$this->getQuoteBaseGrandTotal(); ?>
- }).validation({
- errorPlacement: function(error, element) {
- if (element.attr('data-validate') && element.attr('data-validate').indexOf('validate-cc-ukss') >= 0) {
- element.parents('form').find('[data-validation-msg="validate-cc-ukss"]').html(error);
- } else {
- element.after(error);
- }
- }
- });
- });
- </script>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/billing/items.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/billing/items.phtml
deleted file mode 100644
index 96d7e0a4e99..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/billing/items.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
- * @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->getQuote()->hasVirtualItems()): ?>
- <div class="col2-set">
- <h2 class="legend"><?php echo __('Other Items in Your Order') ?></h2>
- <div class="col-1 col-narrow"></div>
- <div class="col-2 col-wide">
- <h3><?php echo __('Items') ?> <span class="separator">|</span> <a href="<?php echo $this->getVirtualProductEditUrl() ?>"><?php echo __('Edit Items') ?></a></h3>
- <table class="data-table" id="unavailable-shipping-table">
- <col />
- <col width="1" />
- <thead>
- <tr>
- <th><?php echo __('Product Name') ?></th>
- <th class="a-center"><?php echo __('Qty') ?></th>
- </tr>
- </thead>
- <tbody>
- <?php foreach ($this->getVirtualQuoteItems() as $_item): ?>
- <tr>
- <td><?php echo $this->getItemHtml($_item) ?></td>
- <td class="a-center"><?php echo $_item->getQty() ?></td>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
- <script type="text/javascript">(function($) {$('#unavailable-shipping-table').decorate('table')})(jQuery)</script>
- </div>
- </div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/item/default.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/item/default.phtml
deleted file mode 100644
index 9f29bfc9734..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/item/default.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
- * @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)
- */
-?>
-<h3 class="product-name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></h3>
-<?php if ($_options = $this->getOptionList()):?>
-<dl class="item-options">
- <?php foreach ($_options as $_option) : ?>
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
- <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 endforeach; ?>
-</dl>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/link.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/link.phtml
deleted file mode 100644
index e141179eb76..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/link.phtml
+++ /dev/null
@@ -1,27 +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)
- */
-?>
-<a href="<?php echo $this->getCheckoutUrl()?>" title="<?php echo __('Checkout with Multiple Addresses');?>"><?php echo __('Checkout with Multiple Addresses');?></a>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/overview.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/overview.phtml
deleted file mode 100644
index 73b2f58a5c0..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/overview.phtml
+++ /dev/null
@@ -1,217 +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\Checkout\Block\Multishipping\Overview */ ?>
-<div class="multiple-checkout">
- <div class="page-title">
- <h1><?php echo __('Review Order') ?></h1>
- </div>
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
- <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="review-order-form">
- <div class="col2-set">
- <h2 class="legend"><?php echo __('Billing Information') ?></h2>
- <div class="col-1">
- <div class="box">
- <?php $_address=$this->getBillingAddress() ?>
- <div class="box-title">
- <h3><?php echo __('Billing Address') ?> <span class="separator">|</span> <a href="<?php echo $this->getEditBillingAddressUrl($_address) ?>"><?php echo __('Change') ?></a></h3>
- </div>
- <div class="box-content">
- <address>
- <?php echo $_address->format('html') ?>
- </address>
- </div>
- </div>
- </div>
- <div class="col-2">
- <div class="box">
- <div class="box-title">
- <h3><?php echo __('Payment Method') ?> <span class="separator">|</span> <a href="<?php echo $this->getEditBillingUrl() ?>"><?php echo __('Change') ?></a></h3>
- </div>
- <div class="box-content">
- <input type="hidden" name="payment[cc_number]" value="<?php echo $this->escapeHtml($this->getPayment()->getCcNumber())?>" />
- <input type="hidden" name="payment[cc_cid]" value="<?php echo $this->escapeHtml($this->getPayment()->getCcCid())?>" />
- <?php echo $this->getPaymentHtml() ?>
- </div>
- </div>
- </div>
- </div>
- <?php $mergedCells = ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 2 : 1); ?>
- <div class="col2-set">
- <h2 class="legend"><?php echo __('Shipping Information') ?></h2>
- <?php foreach ($this->getShippingAddresses() as $_index => $_address): ?>
- <h3 class="legend"><?php echo __('Address %1 of %2', ($_index+1), $this->getShippingAddressCount()) ?></h3>
- <div class="col-1 col-narrow">
- <div class="box">
- <div class="box-title">
- <h4><?php echo __('Shipping To') ?> <span class="separator">|</span> <a href="<?php echo $this->getEditShippingAddressUrl($_address) ?>"><?php echo __('Change') ?></a></h4>
- </div>
- <div class="box-content">
- <address>
- <?php echo $_address->format('html') ?>
- </address>
- </div>
- </div>
- <div class="box">
- <div class="box-title">
- <h4><?php echo __('Shipping Method') ?> <span class="separator">|</span> <a href="<?php echo $this->getEditShippingUrl() ?>"><?php echo __('Change') ?></a></h4>
- </div>
- <div class="box-content">
- <?php if($_rate=$this->getShippingAddressRate($_address)): ?>
- <p>
- <?php echo $this->escapeHtml($_rate->getCarrierTitle()) ?> - <?php echo $this->escapeHtml($_rate->getMethodTitle()) ?>
- <?php $_excl = $this->getShippingPriceExclTax($_address); ?>
- <?php $_incl = $this->getShippingPriceInclTax($_address); ?>
- <?php echo $_excl; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
- (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
- <?php endif; ?>
- </p>
- <?php endif; ?>
- </div>
- </div>
- </div>
- <div class="col-2 col-wide">
- <h4><?php echo __('Items') ?> <span class="separator">|</span> <a href="<?php echo $this->getAddressesEditUrl() ?>"><?php echo __('Edit Items') ?></a></h4>
- <table class="data-table" id="overview-table-<?php echo $_address->getId() ?>">
- <col />
- <col width="1" />
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <col width="1" />
- <?php endif; ?>
- <col width="1" />
- <col width="1" />
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <col width="1" />
- <?php endif; ?>
- <thead>
- <tr>
- <th rowspan="<?php echo $mergedCells; ?>"><?php echo __('Product Name') ?></th>
- <th colspan="<?php echo $mergedCells; ?>" class="a-center"><?php echo __('Price') ?></th>
- <th rowspan="<?php echo $mergedCells; ?>"><?php echo __('Qty') ?></th>
- <th colspan="<?php echo $mergedCells; ?>" class="a-center"><?php echo __('Subtotal') ?></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; ?>
- </thead>
- <tfoot>
- <?php echo $this->renderTotals($this->getShippingAddressTotals($_address)); ?>
- </tfoot>
- <tbody>
- <?php foreach ($this->getShippingAddressItems($_address) as $_item): ?>
- <?php echo $this->getRowItemHtml($_item); ?>
- <?php endforeach; ?>
- </tbody>
- </table>
- <script type="text/javascript">jQuery('#overview-table-<?php echo $_address->getId() ?>').decorate('table')</script>
- </div>
- <?php if($this->getShippingAddressCount()!=$_index+1): ?>
- <div class="divider"></div>
- <?php endif; ?>
- <?php endforeach; ?>
- </div>
- <?php if ($this->getQuote()->hasVirtualItems()): ?>
- <div class="col2-set">
- <h2 class="legend"><?php echo __('Other Items in Your Order') ?></h2>
- <div class="col-1 col-narrow"></div>
- <div class="col-2 col-wide">
- <h3><?php echo __('Items') ?> <span class="separator">|</span> <a href="<?php echo $this->getVirtualProductEditUrl() ?>"><?php echo __('Edit Items') ?></a></h3>
- <?php $mergedCells = ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 2 : 1); ?>
- <table class="data-table" id="virtual-overview-table">
- <col />
- <col width="1" />
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <col width="1" />
- <?php endif; ?>
- <col width="1" />
- <col width="1" />
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <col width="70" />
- <?php endif; ?>
- <thead>
- <tr>
- <th rowspan="<?php echo $mergedCells; ?>"><?php echo __('Product Name') ?></th>
- <th colspan="<?php echo $mergedCells; ?>" class="a-center"><?php echo __('Price') ?></th>
- <th rowspan="<?php echo $mergedCells; ?>"><?php echo __('Qty') ?></th>
- <th colspan="<?php echo $mergedCells; ?>" class="a-center"><?php echo __('Subtotal') ?></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; ?>
- </thead>
- <tfoot>
- <?php echo $this->renderTotals($this->getBillinAddressTotals()); ?>
- </tfoot>
- <tbody>
- <?php foreach ($this->getVirtualItems() as $_item): ?>
- <?php echo $this->getRowItemHtml($_item); ?>
- <?php endforeach; ?>
- </tbody>
- </table>
- <script type="text/javascript">jQuery('#virtual-overview-table').decorate('table')</script>
- </div>
- </div>
- <?php endif; ?>
-
- <?php echo $this->getChildHtml('items_after'); ?>
-
- <div id="checkout-review-submit" data-mage-init="{paymentAuthentication:{}}">
- <?php echo $this->getChildHtml('agreements') ?>
- <div class="place-order">
- <div class="grand-total">
- <div class="inner">
- <big><?php echo __('Grand Total:') ?> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getTotal()) ?></big>
- <div id="review-buttons-container">
- <button type="submit" title="<?php echo __('Place Order') ?>" class="button btn-checkout" id="review-button"><span><span><?php echo __('Place Order') ?></span></span></button>
- </div>
- </div>
- </div>
- <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>
- </div>
- <div class="buttons-set">
- <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo __('Back to Billing Information') ?></a></p>
- </div>
- </form>
- <script type="text/javascript">
- head.js("<?php echo $this->getViewFileUrl('Magento_Checkout::js/overview.js')?>", function() {
- jQuery('#review-order-form').orderOverview();
- });
- </script>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/overview/item.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/overview/item.phtml
deleted file mode 100644
index bc68ca43f9e..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/overview/item.phtml
+++ /dev/null
@@ -1,238 +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
-/**
- * Quote Item row html
- *
- * @see \Magento\Checkout\Block\Cart\Item\Renderer
- */
-?>
-<?php $_item = $this->getItem() ?>
-<tr>
- <td><?php echo $this->getRenderedBlock()->getItemHtml($_item) ?></td>
-
- <!--- Excluding Tax -->
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td class="a-right">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <div class="cart-price">
- <?php endif; ?>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
- <?php endif; ?>
-
- </div>
-
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display: none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
- <!--- // Excluding Tax -->
-
- <!--- Including Tax -->
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <div class="cart-price">
- <?php endif; ?>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
- <?php endif; ?>
-
- </div>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display: none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
-
- </td>
- <?php endif; ?>
- <!--- // Including Tax -->
-
- <td class="a-center"><?php echo $_item->getQty()*1 ?></td>
-
- <!--- Excluding Tax Subtotal -->
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td class="a-right">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <div class="cart-price">
- <?php endif; ?>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
- <?php endif; ?>
-
- </div>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display: none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
- <!--- //Excluding Tax Subtotal -->
-
- <!--- Including Tax Subtotal -->
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <div class="cart-price">
- <?php endif; ?>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
- <?php endif; ?>
-
- </div>
-
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display: none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
- <!--- //Including Tax Subtotal -->
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/shipping.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/shipping.phtml
deleted file mode 100644
index 50bd5ae841c..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/shipping.phtml
+++ /dev/null
@@ -1,130 +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
-/**
- * Multishipping checkout shipping template
- *
- * @see \Magento\Checkout\Block\Multishipping\Shipping
- * @var $this \Magento\Checkout\Block\Multishipping\Shipping
- */
-?>
-<div class="multiple-checkout">
- <div class="page-title">
- <h1><?php echo __('Select Shipping Method') ?></h1>
- </div>
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
- <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="shipping_method_form">
- <?php foreach ($this->getAddresses() as $_index => $_address): ?>
- <div class="col2-set">
- <h2 class="legend"><?php echo __('Address %1 of %2', ($_index+1), $this->getAddressCount()) ?></h2>
- <div class="col-1 col-narrow">
- <div class="box">
- <div class="box-title">
- <h3><?php echo __('Shipping To') ?> <span class="separator">|</span> <a href="<?php echo $this->getAddressEditUrl($_address) ?>"><?php echo __('Change') ?></a></h3>
- </div>
- <div class="box-content">
- <address><?php echo $_address->format('html') ?></address>
- </div>
- </div>
- <div class="box box-sp-methods">
- <div class="pointer"></div>
- <div class="box-title">
- <h3><?php echo __('Shipping Method') ?></h3>
- </div>
- <div class="box-content">
- <?php if (!($_shippingRateGroups = $this->getShippingRates($_address))): ?>
- <p><?php echo __('Sorry, no quotes are available for this order.') ?></p>
- <?php else: ?>
- <dl class="sp-methods">
- <?php $_sole = count($_shippingRateGroups) == 1; foreach ($_shippingRateGroups as $code => $_rates): ?>
- <dt><?php echo $this->escapeHtml($this->getCarrierName($code)) ?></dt>
- <dd>
- <ul>
- <?php $_sole = $_sole && count($_rates) == 1; foreach ($_rates as $_rate): ?>
- <li<?php if ($_rate->getErrorMessage()) echo ' class="error-msg"' ?>>
- <?php if ($_rate->getErrorMessage()): ?>
- <?php echo $this->escapeHtml($_rate->getCarrierTitle()) ?>: <?php echo $this->escapeHtml($_rate->getErrorMessage()) ?>
- <?php else: ?>
- <?php if ($_sole) : ?>
- <span class="no-display"><input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $this->escapeHtml($_rate->getCode()) ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>" checked="checked"/></span>
- <?php else: ?>
- <input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod($_address)) echo ' checked="checked"' ?> class="radio" />
- <?php endif; ?>
- <label for="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>"><?php echo $this->escapeHtml($_rate->getMethodTitle()) ?>
- <?php $_excl = $this->getShippingPrice($_address, $_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?>
- <?php $_incl = $this->getShippingPrice($_address, $_rate->getPrice(), true); ?>
- <?php echo $_excl; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
- (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
- <?php endif; ?>
- </label>
- <?php endif ?>
- </li>
- <?php endforeach; ?>
- </ul>
- </dd>
- <?php endforeach; ?>
- </dl>
- <?php endif; ?>
- </div>
- </div>
- </div>
- <div class="col-2 col-wide">
- <?php echo $this->helper('Magento\GiftMessage\Helper\Message')->getInline('multishipping_adress_checkbox', $_address); ?>
- <h3><?php echo __('Items') ?> <span class="separator">|</span> <a href="<?php echo $this->getItemsEditUrl($_address) ?>"><?php echo __('Edit Items') ?></a></h3>
- <table class="data-table" id="shipping-table-<?php echo $_address->getId() ?>">
- <col />
- <col width="1" />
- <thead>
- <tr>
- <th><?php echo __('Product Name') ?></th>
- <th class="a-center"><?php echo __('Qty') ?></th>
- </tr>
- </thead>
- <tbody>
- <?php foreach ($this->getAddressItems($_address) as $_item): ?>
- <tr>
- <td>
- <?php echo $this->getItemHtml($_item->getQuoteItem()) ?>
- </td>
- <td class="a-center"><?php echo $_item->getQty() ?></td>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
- <script type="text/javascript">(function($) {$('#shipping-table-<?php echo $_address->getId()?>').decorate('table')})(jQuery)</script>
- <?php echo $this->helper('Magento\GiftMessage\Helper\Message')->getInline('multishipping_address', $_address); ?>
- </div>
- </div>
- <?php endforeach; ?>
- <?php echo $this->getChildHtml('checkout_billing_items') ?>
- <div class="buttons-set">
- <p class="back-link"><a href="<?php echo $this->getBackUrl() ?>"><small>« </small><?php echo __('Back to Select Addresses') ?></a></p>
- <button type="submit" title="<?php echo __('Continue to Billing Information') ?>" class="button"><span><span><?php echo __('Continue to Billing Information') ?></span></span></button>
- </div>
- </form>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/state.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/state.phtml
deleted file mode 100644
index 660d5fe126c..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/state.phtml
+++ /dev/null
@@ -1,39 +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
-/**
- * Mustishipping state
- *
- * @see \Magento\Checkout\Block\Multishipping\State
- */
-?>
-<ul class="checkout-progress" id="checkout-progress-state">
-<?php foreach ($this->getSteps() as $_step): ?>
- <li title="<?php echo $_step->getLabel() ?>"<?php if($_step->getIsActive()): ?> class="active"<?php endif; ?>><span><?php echo $_step->getLabel() ?></span></li>
-<?php endforeach; ?>
-</ul>
-<script type="text/javascript">(function($) {$('#checkout-progress-state li').decorate('generic', ['first','last'])})(jQuery)</script>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/success.phtml b/app/design/frontend/magento_backup/Magento_Checkout/multishipping/success.phtml
deleted file mode 100644
index d666ec7ca0a..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/multishipping/success.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
- * @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="multiple-checkout">
- <div class="page-title">
- <h1><?php echo __('Order Success') ?></h1>
- </div>
- <h2 class="sub-title"><?php echo __('Thank you for your purchase!') ?></h2>
- <p><?php echo __('Thanks for your order. We\'ll send you emails with order details and tracking information.') ?></p>
- <?php if($_orderIds = $this->getOrderIds()): ?>
- <p>
- <?php $flag = false ?>
- <?php echo __('Your order number is ') ?>
- <?php foreach ($_orderIds as $orderId=>$incrementId): ?>
- <?php if ($flag): ?>
- <?php echo ', ' ?>
- <?php endif; ?>
- <?php $flag = true ?>
- <a href="<?php echo $this->getViewOrderUrl($orderId) ?>"><?php echo $incrementId ?></a>
- <?php endforeach; ?>
- </p>
- <?php endif; ?>
- <?php echo $this->getChildHtml() ?>
- <div class="buttons-set">
- <button type="button" title="<?php echo __('Continue Shopping') ?>" class="button" onclick="window.location = '<?php echo $this->getContinueUrl() ?>';"><span><span><?php echo __('Continue Shopping') ?></span></span></button>
- </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage.phtml
deleted file mode 100644
index 1ee814f2e63..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage.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
-$_paymentBlock = $this->getLayout()->getBlock('checkout.onepage.payment');
-$_registerParam = $this->getRequest()->getParam('register');
-?>
-<div class="page-title">
- <h1><?php echo __('Checkout') ?></h1>
-</div>
-<ol class="opc" id="checkoutSteps">
-<?php $i=0; foreach($this->getSteps() as $_stepId => $_stepInfo): ?>
-<?php if (!$this->getChildBlock($_stepId) || !$this->getChildBlock($_stepId)->isShow()): continue; endif; $i++ ?>
- <li id="opc-<?php echo $_stepId ?>" class="section<?php echo !empty($_stepInfo['allow'])?' allow':'' ?><?php echo !empty($_stepInfo['complete'])?' saved':'' ?>">
- <div class="step-title">
- <span class="number"><?php echo $i ?></span>
- <h2><?php echo $_stepInfo['label'] ?></h2>
- <a href="#"><?php echo __('Edit') ?></a>
- </div>
- <div id="checkout-step-<?php echo $_stepId ?>" class="step a-item" style="display:none;">
- <?php echo $this->getChildHtml($_stepId) ?>
- </div>
- </li>
-<?php endforeach ?>
-</ol>
-<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')?>",
- "<?php echo $this->getViewFileUrl('Magento_Checkout::js/opcheckout.js') ?>",
- "<?php echo $this->getViewFileUrl('Magento_Checkout::js/accordion.js') ?>",
- function() {
- $('#checkoutSteps')
- .accordion({
- activeSelector: '#opc-<?php echo $this->getActiveStep() ?>'
- })
- .opcheckout({
- quoteBaseGrandTotal: <?php echo (float)$_paymentBlock->getQuoteBaseGrandTotal() ?>,
- progressUrl: '<?php echo $this->getUrl('checkout/onepage/progress') ?>',
- reviewUrl: '<?php echo $this->getUrl('checkout/onepage/review') ?>',
- failureUrl: '<?php echo $this->getUrl('checkout/cart') ?>',
- getAddressUrl: '<?php echo $this->getUrl('checkout/onepage/getAddress') ?>address/',
- checkoutAgreements: '#checkout-agreements',
- checkoutProgressContainer: '#checkout-progress-wrapper',
- ajaxLoaderPlaceButton: true,
- checkout: {
- suggestRegistration: <?php echo ($_registerParam || $_registerParam === '') ? 'true' : 'false' ?>,
- saveUrl: '<?php echo $this->getUrl('checkout/onepage/saveMethod') ?>'
- },
- billing: {
- saveUrl: '<?php echo $this->getUrl('checkout/onepage/saveBilling') ?>'
- },
- shipping: {
- saveUrl: '<?php echo $this->getUrl('checkout/onepage/saveShipping') ?>'
- },
- shippingMethod: {
- saveUrl: "<?php echo $this->getUrl('checkout/onepage/saveShippingMethod') ?>"
- },
- payment: {
- <?php if ($_paymentBlock->getChildBlock('methods')->getSelectedMethodCode()): ?>
- defaultPaymentMethod: "<?php echo $_paymentBlock->getChildBlock('methods')->getSelectedMethodCode() ?>",
- <?php endif ?>
- saveUrl: '<?php echo $this->getUrl('checkout/onepage/savePayment') ?>'
- },
- review: {
- saveUrl: '<?php echo $this->getUrl('checkout/onepage/saveOrder') ?>',
- successUrl: '<?php echo $this->getUrl('checkout/onepage/success') ?>'
- }
- });
- });
- })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/accordion.js b/app/design/frontend/magento_backup/Magento_Checkout/onepage/accordion.js
deleted file mode 100644
index 3f12f8f0730..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/accordion.js
+++ /dev/null
@@ -1,112 +0,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.
- *
- * @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)
- */
-Accordion = Class.create();
-Accordion.prototype = {
- initialize: function(elem, clickableEntity, checkAllow) {
- this.container = $(elem);
- this.checkAllow = checkAllow || false;
- this.disallowAccessToNextSections = false;
- this.sections = $$('#' + elem + ' .section');
- this.currentSection = false;
- var headers = $$('#' + elem + ' .section ' + clickableEntity);
- headers.each(function(header) {
- Event.observe(header,'click',this.sectionClicked.bindAsEventListener(this));
- }.bind(this));
- },
-
- sectionClicked: function(event) {
- this.openSection($(Event.element(event)).up('.section'));
- Event.stop(event);
- },
-
- openSection: function(section) {
- var section = $(section);
-
- // Check allow
- if (this.checkAllow && !Element.hasClassName(section, 'allow')){
- return;
- }
-
- if(section.id != this.currentSection) {
- this.closeExistingSection();
- this.currentSection = section.id;
- $(this.currentSection).addClassName('active');
- var contents = Element.select(section, '.a-item');
- contents[0].show();
- //Effect.SlideDown(contents[0], {duration:.2});
-
- if (this.disallowAccessToNextSections) {
- var pastCurrentSection = false;
- for (var i=0; i<this.sections.length; i++) {
- if (pastCurrentSection) {
- Element.removeClassName(this.sections[i], 'allow')
- }
- if (this.sections[i].id==section.id) {
- pastCurrentSection = true;
- }
- }
- }
- }
- },
-
- closeSection: function(section) {
- $(section).removeClassName('active');
- var contents = Element.select(section, '.a-item');
- contents[0].hide();
- //Effect.SlideUp(contents[0]);
- },
-
- openNextSection: function(setAllow){
- for (section in this.sections) {
- var nextIndex = parseInt(section)+1;
- if (this.sections[section].id == this.currentSection && this.sections[nextIndex]){
- if (setAllow) {
- Element.addClassName(this.sections[nextIndex], 'allow')
- }
- this.openSection(this.sections[nextIndex]);
- return;
- }
- }
- },
-
- openPrevSection: function(setAllow){
- for (section in this.sections) {
- var prevIndex = parseInt(section)-1;
- if (this.sections[section].id == this.currentSection && this.sections[prevIndex]){
- if (setAllow) {
- Element.addClassName(this.sections[prevIndex], 'allow')
- }
- this.openSection(this.sections[prevIndex]);
- return;
- }
- }
- },
-
- closeExistingSection: function() {
- if(this.currentSection) {
- this.closeSection(this.currentSection);
- }
- }
-};
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/agreements.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/agreements.phtml
deleted file mode 100644
index 72256eb7c3c..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/agreements.phtml
+++ /dev/null
@@ -1,51 +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
-/**
- * @see \Magento\Checkout\Block\Agreements
- */
-?>
-
-<?php if (!$this->getAgreements()) return; ?>
-<form action="" id="checkout-agreements" onsubmit="return false;">
-<ol class="checkout-agreements">
-<?php foreach ($this->getAgreements() as $_a): ?>
- <li>
- <div class="agreement-content"<?php echo ($_a->getContentHeight() ? ' style="height:' . $_a->getContentHeight() . '"' : '')?>>
- <?php if ($_a->getIsHtml()):?>
- <?php echo $_a->getContent() ?>
- <?php else:?>
- <?php echo nl2br($this->escapeHtml($_a->getContent())) ?>
- <?php endif; ?>
- </div>
- <p class="agree">
- <input type="checkbox" id="agreement-<?php echo $_a->getId()?>" name="agreement[<?php echo $_a->getId()?>]" value="1" title="<?php echo $this->escapeHtml($_a->getCheckboxText()) ?>" class="checkbox" /><label for="agreement-<?php echo $_a->getId()?>"><?php echo $_a->getIsHtml() ? $_a->getCheckboxText() : $this->escapeHtml($_a->getCheckboxText()) ?></label>
- </p>
- </li>
-<?php endforeach ?>
-</ol>
-</form>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/billing.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/billing.phtml
deleted file mode 100644
index 35d3e9389cb..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/billing.phtml
+++ /dev/null
@@ -1,218 +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\Checkout\Block\Onepage\Billing */ ?>
-<form id="co-billing-form" action="">
-<fieldset>
- <ul class="form-list">
- <?php if ($this->customerHasAddresses()): ?>
- <li class="wide">
- <label for="billing-address-select"><?php echo __('Select a billing address from your address book or enter a new address.') ?></label>
- <div class="input-box">
- <?php echo $this->getAddressesHtmlSelect('billing') ?>
- </div>
- </li>
- <?php endif; ?>
- <li id="billing-new-address-form"<?php if ($this->customerHasAddresses()): ?> style="display:none;"<?php endif; ?>>
- <fieldset>
- <input type="hidden" name="billing[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="billing: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('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?></li>
- <li class="fields">
- <div class="field">
- <label for="billing:company"><?php echo __('Company') ?></label>
- <div class="input-box">
- <input type="text" id="billing:company" name="billing[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()): ?>
- <div class="field">
- <label for="billing:email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
- <div class="input-box">
- <input type="text" name="billing[email]" id="billing:email" value="<?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?>" title="<?php echo __('Email Address') ?>" class="input-text" data-validate="{required:true, 'validate-email':true}"/>
- </div>
- </div>
- <?php endif; ?>
- </li>
- <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
- <li class="wide">
- <label for="billing:street1" class="required"><em>*</em><?php echo __('Address') ?></label>
- <div class="input-box">
- <input type="text" title="<?php echo __('Street Address') ?>" name="billing[street][]" id="billing: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="wide">
- <div class="input-box">
- <input type="text" title="<?php echo __('Street Address %1', $_i) ?>" name="billing[street][]" id="billing: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="billing:vat_id"><?php echo __('VAT Number') ?></label>
- <div class="input-box">
- <input type="text" id="billing:vat_id" name="billing[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="billing:city" class="required"><em>*</em><?php echo __('City') ?></label>
- <div class="input-box">
- <input type="text" title="<?php echo __('City') ?>" name="billing[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="billing:city" />
- </div>
- </div>
- <div class="field">
- <label for="billing:region_id" class="required"><em>*</em><?php echo __('State/Province') ?></label>
- <div class="input-box">
- <select id="billing:region_id" name="billing[region_id]" title="<?php echo __('State/Province') ?>" class="validate-select" style="display:none;" <?php if ($this->getConfig('general/region/display_all') === 0) { ?>disabled="disabled"<?php } ?>>
- <option value=""><?php echo __('Please select region, state or province') ?></option>
- </select>
- <input type="text" id="billing:region" name="billing[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;" <?php if ($this->getConfig('general/region/display_all') === 0) { ?>disabled="disabled"<?php } ?>/>
- </div>
- </div>
- </li>
- <li class="fields">
- <div class="field">
- <label for="billing: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="billing[postcode]" id="billing:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" data-validate="{'validate-zip-international':true}"/>
- </div>
- </div>
- <div class="field">
- <label for="billing:country_id" class="required"><em>*</em><?php echo __('Country') ?></label>
- <div class="input-box">
- <?php echo $this->getCountryHtmlSelect('billing') ?>
- </div>
- </div>
- </li>
- <li class="fields">
- <div class="field">
- <label for="billing:telephone" class="required"><em>*</em><?php echo __('Telephone') ?></label>
- <div class="input-box">
- <input type="text" name="billing[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="billing:telephone" />
- </div>
- </div>
- <div class="field">
- <label for="billing:fax"><?php echo __('Fax') ?></label>
- <div class="input-box">
- <input type="text" name="billing[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="billing:fax" />
- </div>
- </div>
- </li>
- <?php if(!$this->isCustomerLoggedIn()): ?>
-
- <?php $_dob = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob') ?>
- <?php $_gender = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Gender') ?>
- <?php if ($_dob->isEnabled() || $_gender->isEnabled()): ?>
- <li class="fields">
- <?php if ($_dob->isEnabled()): ?>
- <div class="field">
- <?php echo $_dob->setDate($this->getQuote()->getCustomerDob())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
- </div>
- <?php endif; ?>
- <?php if ($_gender->isEnabled()): ?>
- <div class="field">
- <?php echo $_gender->setGender($this->getQuote()->getCustomerGender())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
- </div>
- <?php endif ?>
- </li>
- <?php endif ?>
-
- <?php $_taxvat = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Taxvat') ?>
- <?php if ($_taxvat->isEnabled()): ?>
- <li>
- <?php echo $_taxvat->setTaxvat($this->getQuote()->getCustomerTaxvat())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
- </li>
- <?php endif ?>
-
- <li class="fields" id="register-customer-password">
- <div class="field">
- <label for="billing:customer_password" class="required"><em>*</em><?php echo __('Password') ?></label>
- <div class="input-box">
- <input type="password" name="billing[customer_password]" id="billing:customer_password" title="<?php echo __('Password') ?>" class="input-text" data-validate="{required:true, 'validate-password':true}"/>
- </div>
- </div>
- <div class="field">
- <label for="billing:confirm_password" class="required"><em>*</em><?php echo __('Confirm Password') ?></label>
- <div class="input-box">
- <input type="password" name="billing[confirm_password]" title="<?php echo __('Confirm Password') ?>" id="billing:confirm_password" class="input-text" data-validate="{required:true, 'validate-cpassword':true}"/>
- </div>
- </div>
- </li>
- <?php endif; ?>
- <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
- <li class="control">
- <input type="checkbox" name="billing[save_in_address_book]" value="1" title="<?php echo __('Save in address book') ?>" id="billing:save_in_address_book" <?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="billing:save_in_address_book"><?php echo __('Save in address book') ?></label>
- </li>
- <?php else:?>
- <li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
- <?php endif; ?>
- <?php echo $this->getChildHtml('form.additional.info'); ?>
- </ul>
- </fieldset>
- </li>
- <?php /* Extensions placeholder */ ?>
- <?php echo $this->getChildHtml('checkout.onepage.billing.extra')?>
- <?php if ($this->canShip()): ?>
- <li class="control">
- <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_yes" value="1"<?php if ($this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo __('Ship to this address') ?>" class="radio" /><label for="billing:use_for_shipping_yes"><?php echo __('Ship to this address') ?></label></li>
- <li class="control">
- <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_no" value="0"<?php if (!$this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo __('Ship to different address') ?>" class="radio" /><label for="billing:use_for_shipping_no"><?php echo __('Ship to different address') ?></label>
- </li>
- <?php endif; ?>
- </ul>
- <?php if (!$this->canShip()): ?>
- <input type="hidden" name="billing[use_for_shipping]" value="1" />
- <?php endif; ?>
- <div class="buttons-set" id="billing-buttons-container">
- <p class="required"><?php echo __('* Required Fields') ?></p>
- <button type="button" title="<?php echo __('Continue') ?>" class="button"><span><span><?php echo __('Continue') ?></span></span></button>
- <span class="please-wait" id="billing-please-wait" style="display:none;">
- <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo __('Loading next step...') ?>" title="<?php echo __('Loading next step...') ?>" class="v-middle" /> <?php echo __('Loading next step...') ?>
- </span>
- </div>
-</fieldset>
-</form>
-<script type="text/javascript">
- (function($) {
- head.js(
- "<?php echo $this->getViewFileUrl('Magento_Checkout::js/region-updater.js') ?>",
- function() {
- $('#billing\\:country_id').regionUpdater({
- optionalRegionAllowed: <?php echo ($this->getConfig('general/region/display_all')? 'true' : 'false'); ?>,
- regionListId: '#billing\\:region_id',
- regionInputId: '#billing\\:region',
- postcodeId: '#billing\\: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_backup/Magento_Checkout/onepage/failure.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/failure.phtml
deleted file mode 100644
index dfccd26f471..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/failure.phtml
+++ /dev/null
@@ -1,32 +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)
- */
-?>
-<div class="page-title">
- <h1><?php echo __('Something went wrong while processing your payment.') ?></h1>
-</div>
-<?php if ($this->getRealOrderId()) : ?><p><?php echo __('Order #') . $this->getRealOrderId() ?></p><?php endif ?>
-<?php if ($error = $this->getErrorMessage()) : ?><p><?php echo $error ?></p><?php endif ?>
-<p><?php echo __('Click <a href="%1">here</a> to continue shopping.', $this->getContinueShoppingUrl()) ?></p>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/link.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/link.phtml
deleted file mode 100644
index e8cd3bda3e0..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/link.phtml
+++ /dev/null
@@ -1,29 +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 if ($this->isPossibleOnepageCheckout()):?>
- <button type="button" title="<?php echo __('Proceed to Checkout') ?>" class="button btn-proceed-checkout btn-checkout<?php if ($this->isDisabled()):?> no-checkout<?php endif; ?>"<?php if ($this->isDisabled()):?> disabled="disabled"<?php endif; ?> onclick="window.location='<?php echo $this->getCheckoutUrl() ?>';"><span><span><?php echo __('Proceed to Checkout') ?></span></span></button>
-<?php endif?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/login.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/login.phtml
deleted file mode 100644
index db2cb53047d..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/login.phtml
+++ /dev/null
@@ -1,120 +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 /* Extensions placeholder */ ?>
-<?php echo $this->getChildHtml('checkout.onepage.login.extra')?>
-<div class="col2-set">
- <?php echo $this->getChildHtml('login_before')?>
- <div class="col-1">
- <h3><?php if( $this->isAllowedGuestCheckout() ): ?><?php echo __('Checkout as a Guest or Register') ?><?php else: ?><?php echo __('Register to Create an Account') ?><?php endif; ?></h3>
- <?php if( $this->isAllowedGuestCheckout() ): ?>
- <p><?php echo __('Sign up with us to save time on your next checkout:') ?></p>
- <?php else: ?>
- <p><strong><?php echo __('Register and save time!') ?></strong><br />
- <?php echo __('Sign up with us to save time on your next checkout:') ?></p>
- <ul>
- <li><?php echo __('Fast and easy check out') ?></li>
- <li><?php echo __('Get easy access to your order history and status.') ?></li>
- </ul>
- <?php endif; ?>
- <?php if( $this->isAllowedGuestCheckout() ): ?>
- <ul class="form-list">
- <?php if( $this->isAllowedGuestCheckout() ): ?>
- <li class="control">
- <input type="radio" name="checkout_method" id="login:guest" value="guest"<?php if($this->getQuote()->getCheckoutMethod()==\Magento\Checkout\Model\Type\Onepage::METHOD_GUEST): ?> checked="checked"<?php endif; ?> class="radio" /><label for="login:guest"><?php echo __('Checkout as Guest') ?></label>
- </li>
- <?php endif; ?>
- <li class="control">
- <input type="radio" name="checkout_method" id="login:register" value="register"<?php if($this->getQuote()->getCheckoutMethod()==\Magento\Checkout\Model\Type\Onepage::METHOD_REGISTER || !$this->isAllowedGuestCheckout()): ?> checked="checked"<?php endif ?> class="radio" /><label for="login:register"><?php echo __('Register') ?></label>
- </li>
- </ul>
- <h4><?php echo __('Register and save time!') ?></h4>
- <p><?php echo __('Sign up with us to save time on your next checkout:') ?></p>
- <ul class="ul">
- <li><?php echo __('Fast and easy check out') ?></li>
- <li><?php echo __('Get easy access to your order history and status.') ?></li>
- </ul>
- <?php else: ?>
- <input type="hidden" name="checkout_method" id="login:register" value="register" checked="checked" />
- <?php endif; ?>
- </div>
- <div class="col-2">
- <h3><?php echo __('Login') ?></h3>
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
- <form id="login-form" action="<?php echo $this->getPostAction() ?>" method="post">
- <fieldset>
- <h4><?php echo __('Already registered?') ?></h4>
- <p><?php echo __('Please log in below:') ?></p>
- <ul class="form-list">
- <li>
- <label for="login-email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
- <div class="input-box">
- <input type="text" class="input-text" id="login-email" name="login[username]" data-validate="{required:true, 'validate-email':true}" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" />
- </div>
- </li>
- <li>
- <label for="login-password" class="required"><em>*</em><?php echo __('Password') ?></label>
- <div class="input-box">
- <input type="password" class="input-text" id="login-password" name="login[password]" data-validate="{required:true}"/>
- </div>
- </li>
- <?php echo $this->getChildHtml('login.form.additional.info'); ?>
- </ul>
- </fieldset>
- </form>
- </div>
-</div>
-<div class="col2-set">
- <div class="col-1">
- <div class="buttons-set">
- <p class="required"> </p>
- <button type="button" class="button" data-checkout='{"isGuestCheckoutAllowed":true}'><span><span><?php echo ($this->isAllowedGuestCheckout() ? __('Continue') : __('Register')) ?></span></span></button>
- <span class="please-wait" style="display:none;">
- <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="" class="v-middle" /> <?php echo __('Loading next step...') ?>
- </span>
- </div>
- </div>
- <div class="col-2">
- <div class="buttons-set">
- <p class="required"><?php echo __('* Required Fields') ?></p>
- <a href="<?php echo $this->getUrl('customer/account/forgotpassword') ?>" class="f-left"><?php echo __('Forgot your password?') ?></a>
- <button type="submit" class="button" data-action='login-form-submit'><span><span><?php echo __('Login') ?></span></span></button>
- </div>
- </div>
-</div>
-<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() {
- $('#login-form').validation();
- }
- )}
- )(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/payment.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/payment.phtml
deleted file mode 100644
index 4a11e6f8b6c..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/payment.phtml
+++ /dev/null
@@ -1,39 +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)
- */
-?>
-<form action="" id="co-payment-form">
- <fieldset>
- <?php echo $this->getChildHtml('methods') ?>
- </fieldset>
-</form>
-<div class="buttons-set" id="payment-buttons-container">
- <p class="required"><?php echo __('* Required Fields') ?></p>
- <p class="back-link"><a href="#"><small>« </small><?php echo __('Back') ?></a></p>
- <button type="button" class="button"><span><span><?php echo __('Continue') ?></span></span></button>
- <span class="please-wait" id="payment-please-wait" style="display:none;">
- <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo __('Loading next step...') ?>" title="<?php echo __('Loading next step...') ?>" class="v-middle" /> <?php echo __('Loading next step...') ?>
- </span>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/payment/methods.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/payment/methods.phtml
deleted file mode 100644
index 914206cc665..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/payment/methods.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
- * @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
-/**
- * One page checkout payment methods
- *
- * @see \Magento\Checkout\Block\Onepage\Payment\Methods
- */
-?>
-<dl class="sp-methods" id="checkout-payment-method-load">
-<?php
- $methods = $this->getMethods();
- $oneMethod = count($methods) <= 1;
-?>
-<?php if (empty($methods)): ?>
- <dt>
- <?php echo __('No Payment Methods') ?>
- </dt>
-<?php else:
- foreach ($methods as $_method):
- $_code = $_method->getCode();
-?>
- <dt>
- <?php if(!$oneMethod): ?>
- <input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" title="<?php echo $this->escapeHtml($_method->getTitle()) ?>" <?php if($this->getSelectedMethodCode()==$_code): ?> checked="checked"<?php endif; ?> class="radio" />
- <?php else: ?>
- <span class="no-display"><input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" checked="checked" class="radio" /></span>
- <?php $oneMethod = $_code; ?>
- <?php endif; ?>
- <label for="p_method_<?php echo $_code ?>"><?php echo $this->escapeHtml($this->getMethodTitle($_method)) ?> <?php echo $this->getMethodLabelAfterHtml($_method) ?></label>
- </dt>
- <?php if ($html = $this->getPaymentMethodFormHtml($_method)): ?>
- <dd>
- <?php echo $html; ?>
- </dd>
- <?php endif; ?>
-<?php endforeach;
- endif;
-?>
-</dl>
-<div class="no-display" data-checkout-price="<?php echo (float)$this->getQuote()->getBaseGrandTotal(); ?>" />
-<?php echo $this->getChildChildHtml('additional'); ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/progress.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/progress.phtml
deleted file mode 100644
index c68bcf8d449..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/progress.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)
- */
-/* @var $this \Magento\Checkout\Block\Onepage\Progress */
-?>
-<div class="block block-progress opc-block-progress">
- <div class="block-title">
- <strong><span><?php echo __('Your Checkout Progress') ?></span></strong>
- </div>
- <div class="block-content">
- <dl>
- <?php if ($this->getCheckout()->getStepData('billing', 'is_show')): ?>
- <?php if ($this->isStepComplete('billing')): ?>
- <dt class="complete">
- <?php echo __('Billing Address') ?> <span class="separator">|</span>
- <a href="#billing" data-goto-section="billing"><?php echo __('Change') ?></a>
- </dt>
- <dd class="complete">
- <address><?php echo $this->getBilling()->format('html') ?></address>
- </dd>
- <?php else: ?>
- <dt>
- <?php echo __('Billing Address') ?>
- </dt>
- <?php endif; ?>
- <?php endif; ?>
-
- <?php if ($this->getCheckout()->getStepData('shipping', 'is_show')): ?>
- <?php if ($this->isStepComplete('shipping')): ?>
- <dt class="complete">
- <?php echo __('Shipping Address') ?> <span class="separator">|</span>
- <a href="#payment" data-goto-section="shipping"><?php echo __('Change') ?></a>
- </dt>
- <dd class="complete">
- <address><?php echo $this->getShipping()->format('html') ?></address>
- </dd>
- <?php else: ?>
- <dt>
- <?php echo __('Shipping Address') ?>
- </dt>
- <?php endif; ?>
- <?php endif; ?>
-
- <?php if ($this->getCheckout()->getStepData('shipping_method', 'is_show')): ?>
- <?php if ($this->isStepComplete('shipping_method')): ?>
- <dt class="complete">
- <?php echo __('Shipping Method') ?> <span class="separator">|</span>
- <a href="#shipping_method" data-goto-section="shipping_method"><?php echo __('Change') ?></a>
- </dt>
- <dd class="complete">
- <?php if ($this->getShippingMethod()): ?>
- <?php echo $this->escapeHtml($this->getShippingDescription()) ?>
-
- <?php $_excl = $this->getShippingPriceExclTax(); ?>
- <?php $_incl = $this->getShippingPriceInclTax(); ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
- <?php echo $_incl; ?>
- <?php else: ?>
- <?php echo $_excl; ?>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
- (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
- <?php endif; ?>
-
- <?php else: ?>
- <?php echo __('Shipping method has not been selected yet') ?>
- <?php endif; ?>
- </dd>
- <?php else: ?>
- <dt>
- <?php echo __('Shipping Method') ?>
- </dt>
- <?php endif; ?>
- <?php endif; ?>
-
- <?php if ($this->getCheckout()->getStepData('payment', 'is_show')): ?>
- <?php if ($this->isStepComplete('payment')): ?>
- <dt class="complete">
- <?php echo __('Payment Method') ?> <span class="separator">|</span>
- <a href="#payment" data-goto-section="payment"><?php echo __('Change') ?></a>
- </dt>
- <dd class="complete">
- <?php echo $this->getPaymentHtml() ?>
- </dd>
- <?php else: ?>
- <dt>
- <?php echo __('Payment Method') ?>
- </dt>
- <?php endif; ?>
- <?php endif; ?>
- </dl>
- </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/review.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/review.phtml
deleted file mode 100644
index 8b82981faf5..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/review.phtml
+++ /dev/null
@@ -1,29 +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)
- */
-?>
-<div class="order-review" id="checkout-review-load">
- <?php echo $this->getChildHtml('info') ?>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/button.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/button.phtml
deleted file mode 100644
index 82172d3fe29..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/button.phtml
+++ /dev/null
@@ -1,27 +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)
- */
-?>
-<button data-role="review-save" type="submit" title="<?php echo __('Place Order') ?>" class="button btn-checkout"><span><span><?php echo __('Place Order') ?></span></span></button>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/info.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/info.phtml
deleted file mode 100644
index 48f12caf1e4..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/info.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
- * @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->getChildHtml('items_before'); ?>
-<div id="checkout-review-table-wrapper" data-mage-init="{paymentAuthentication:{}}">
- <table class="data-table" id="checkout-review-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 ?>"><?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="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>
- <?php echo $this->getChildHtml('totals'); ?>
- <tbody>
- <?php foreach($this->getItems() as $_item): ?>
- <?php echo $this->getItemHtml($_item)?>
- <?php endforeach ?>
- </tbody>
- </table>
-</div>
-<?php echo $this->getChildHtml('items_after'); ?>
-<script type="text/javascript">jQuery('#checkout-review-table').decorate('table')</script>
-<div id="checkout-review-submit" data-mage-init="{paymentAuthentication:{}}">
- <?php echo $this->getChildHtml('agreements') ?>
- <div class="buttons-set" id="review-buttons-container">
- <p class="f-left"><?php echo __('Forgot an Item?') ?> <a href="<?php echo $this->getUrl('checkout/cart') ?>"><?php echo __('Edit Your Cart') ?></a></p>
- <?php echo $this->getChildHtml('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>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/item.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/item.phtml
deleted file mode 100644
index e3ea7b940b3..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/item.phtml
+++ /dev/null
@@ -1,239 +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 $_item = $this->getItem()?>
-<tr>
- <td><h3 class="product-name"><?php echo $this->escapeHtml($this->getProductName()) ?></h3>
- <?php if ($_options = $this->getOptionList()):?>
- <dl class="item-options">
- <?php foreach ($_options as $_option) : ?>
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
- <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 endforeach; ?>
- </dl>
- <?php endif;?>
- <?php if ($addtInfoBlock = $this->getProductAdditionalInformationBlock()):?>
- <?php echo $addtInfoBlock->setItem($_item)->toHtml() ?>
- <?php endif;?>
- </td>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td class="a-right">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <span class="cart-price">
- <?php endif; ?>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
- <?php endif; ?>
-
- </span>
-
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <span class="cart-price">
- <?php endif; ?>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
- <?php endif; ?>
-
- </span>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
- <td class="a-center"><?php echo $_item->getQty() ?></td>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td class="a-right">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <span class="cart-price">
- <?php endif; ?>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
- <?php endif; ?>
-
- </span>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <span class="cart-price">
- <?php endif; ?>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
- <?php endif; ?>
-
- </span>
-
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/totals.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/totals.phtml
deleted file mode 100644
index 9479a681acc..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/review/totals.phtml
+++ /dev/null
@@ -1,47 +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)
- */
-
-/**
- * @see \Magento\Checkout\Block\Cart\Totals
- */
-?>
-<?php if ($this->getTotals()): ?>
-<tfoot>
- <?php $_colspan = $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 5 : 3; ?>
- <?php echo $this->renderTotals(null, $_colspan); ?>
- <?php echo $this->renderTotals('footer', $_colspan); ?>
- <?php if ($this->needDisplayBaseGrandtotal()):?>
- <tr>
- <td class="a-right" colspan="<?php echo $_colspan; ?>">
- <small><?php echo __('Your credit card will be charged for') ?></small>
- </td>
- <td class="a-right">
- <small><?php echo $this->displayBaseGrandtotal() ?></small>
- </td>
- </tr>
- <?php endif?>
-</tfoot>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping.phtml
deleted file mode 100644
index 05f7c7fbcdc..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping.phtml
+++ /dev/null
@@ -1,164 +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\Checkout\Block\Onepage\Shipping */ ?>
-<form action="" id="co-shipping-form">
- <ul class="form-list">
- <?php if ($this->customerHasAddresses()): ?>
- <li class="wide">
- <label for="shipping-address-select"><?php echo __('Select a shipping address from your address book or enter a new address.') ?></label>
- <div class="input-box">
- <?php echo $this->getAddressesHtmlSelect('shipping') ?>
- </div>
- </li>
- <?php endif ?>
- <li id="shipping-new-address-form"<?php if ($this->customerHasAddresses()): ?> style="display:none;"<?php endif ?>>
- <fieldset>
- <input type="hidden" name="shipping[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="shipping:address_id" />
- <ul>
- <li class="fields"><?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($this->getAddress())->setFieldIdFormat('shipping:%s')->setFieldNameFormat('shipping[%s]')->toHtml() ?></li>
- <li class="fields">
- <div class="fields">
- <label for="shipping:company"><?php echo __('Company') ?></label>
- <div class="input-box">
- <input type="text" id="shipping:company" name="shipping[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>
- </li>
- <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
- <li class="wide">
- <label for="shipping:street1" class="required"><em>*</em><?php echo __('Address') ?></label>
- <div class="input-box">
- <input type="text" title="<?php echo __('Street Address') ?>" name="shipping[street][]" id="shipping: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="wide">
- <div class="input-box">
- <input type="text" title="<?php echo __('Street Address %1', $_i) ?>" name="shipping[street][]" id="shipping: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="billing:vat_id"><?php echo __('VAT Number'); ?></label>
- <div class="input-box">
- <input type="text" id="shipping:vat_id" name="shipping[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="shipping:city" class="required"><em>*</em><?php echo __('City') ?></label>
- <div class="input-box">
- <input type="text" title="<?php echo __('City') ?>" name="shipping[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="shipping:city" />
- </div>
- </div>
- <div class="field">
- <label for="shipping:region" class="required"><em>*</em><?php echo __('State/Province') ?></label>
- <div class="input-box">
- <select id="shipping:region_id" name="shipping[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="shipping:region" name="shipping[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="shipping: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="shipping[postcode]" id="shipping: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="shipping:country_id" class="required"><em>*</em><?php echo __('Country') ?></label>
- <div class="input-box">
- <?php echo $this->getCountryHtmlSelect('shipping') ?>
- </div>
- </div>
- </li>
- <li class="fields">
- <div class="field">
- <label for="shipping:telephone" class="required"><em>*</em><?php echo __('Telephone') ?></label>
- <div class="input-box">
- <input type="text" name="shipping[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="shipping:telephone" />
- </div>
- </div>
- <div class="field">
- <label for="shipping:fax"><?php echo __('Fax') ?></label>
- <div class="input-box">
- <input type="text" name="shipping[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="shipping:fax" />
- </div>
- </div>
- </li>
- <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
- <li class="control">
- <input type="checkbox" name="shipping[save_in_address_book]" value="1" title="<?php echo __('Save in address book') ?>" id="shipping:save_in_address_book" <?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="shipping:save_in_address_book"><?php echo __('Save in address book') ?></label></li>
- <?php else:?>
- <li class="no-display"><input type="hidden" name="shipping[save_in_address_book]" value="1" /></li>
- <?php endif;?>
- </ul>
- </fieldset>
- </li>
- <li class="control">
- <input type="checkbox" name="shipping[same_as_billing]" id="shipping:same_as_billing" value="1"<?php if($this->getAddress()->getSameAsBilling()): ?> checked="checked"<?php endif; ?> title="<?php echo __('Use Billing Address') ?>" class="checkbox" /><label for="shipping:same_as_billing"><?php echo __('Use Billing Address') ?></label>
- </li>
- </ul>
- <div class="buttons-set" id="shipping-buttons-container">
- <p class="required"><?php echo __('* Required Fields') ?></p>
- <p class="back-link"><a href="#"><small>« </small><?php echo __('Back') ?></a></p>
- <button type="button" class="button" title="<?php echo __('Continue') ?>"><span><span><?php echo __('Continue') ?></span></span></button>
- <span id="shipping-please-wait" class="please-wait" style="display:none;">
- <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo __('Loading next step...') ?>" title="<?php echo __('Loading next step...') ?>" class="v-middle" /> <?php echo __('Loading next step...') ?>
- </span>
- </div>
-</form>
-<script type="text/javascript">
- (function($) {
- head.js(
- "<?php echo $this->getViewFileUrl('Magento_Checkout::js/region-updater.js') ?>",
- function() {
- $('#shipping\\:country_id').regionUpdater({
- optionalRegionAllowed: <?php echo ($this->getConfig('general/region/display_all') ? 'true' : 'false'); ?>,
- regionListId: '#shipping\\:region_id',
- regionInputId: '#shipping\\:region',
- postcodeId: '#shipping\\: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) ?>,
- clearError: function() {
- var selectorArr = ['#shipping\\:region_id', '#shipping\\:region', '#shipping\\:postcode'];
- for (var i = 0; i < selectorArr.length; i++) {
- $(selectorArr[i]).removeClass('validation-failed').next("div.validation-advice").remove();
- }
- }
- });
- });
- })(jQuery);
-</script>
-
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method.phtml
deleted file mode 100644
index ac7166ee1b1..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method.phtml
+++ /dev/null
@@ -1,41 +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)
- */
-?>
-<form id="co-shipping-method-form" action="">
- <div id="checkout-shipping-method-load">
- <?php echo $this->getChildHtml('available') ?>
- </div>
- <div id="onepage-checkout-shipping-method-additional-load">
- <?php echo $this->getChildHtml('additional') ?>
- </div>
- <div class="buttons-set" id="shipping-method-buttons-container">
- <p class="back-link"><a href="#"><small>« </small><?php echo __('Back') ?></a></p>
- <button type="button" class="button"><span><span><?php echo __('Continue') ?></span></span></button>
- <span id="shipping-method-please-wait" class="please-wait" style="display:none;">
- <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo __('Loading next step...') ?>" title="<?php echo __('Loading next step...') ?>" class="v-middle" /> <?php echo __('Loading next step...') ?>
- </span>
- </div>
-</form>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method/additional.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method/additional.phtml
deleted file mode 100644
index 9a816287728..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method/additional.phtml
+++ /dev/null
@@ -1,29 +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 if (!$this->getQuote()->isVirtual()): ?>
- <?php echo $this->helper('Magento\GiftMessage\Helper\Message')->getInline('onepage_checkout', $this->getQuote(), $this->getDontDisplayContainer()) ?>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method/available.phtml b/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method/available.phtml
deleted file mode 100644
index 8fa017be225..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/onepage/shipping_method/available.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
- * @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\Checkout\Block\Onepage\Shipping\Method\Available */ ?>
-<?php $_shippingRateGroups = $this->getShippingRates(); ?>
-<?php if (!$_shippingRateGroups): ?>
- <p><?php echo __('Sorry, no quotes are available for this order.') ?></p>
-<?php else: ?>
- <dl class="sp-methods">
- <?php $shippingCodePrice = array(); ?>
- <?php $_sole = count($_shippingRateGroups) == 1; foreach ($_shippingRateGroups as $code => $_rates): ?>
- <dt><?php echo $this->escapeHtml($this->getCarrierName($code)) ?></dt>
- <dd>
- <ul>
- <?php $_sole = $_sole && count($_rates) == 1; foreach ($_rates as $_rate): ?>
- <?php $shippingCodePrice[] = '"'.$_rate->getCode().'":'.(float)$_rate->getPrice(); ?>
- <li>
- <?php if ($_rate->getErrorMessage()): ?>
- <ul class="messages"><li class="error-msg"><ul><li><?php echo $this->escapeHtml($_rate->getErrorMessage()) ?></li></ul></li></ul>
- <?php else: ?>
- <?php if ($_sole) : ?>
- <span class="no-display"><input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>" checked="checked" /></span>
- <?php else: ?>
- <input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$this->getAddressShippingMethod()) echo ' checked="checked"' ?> class="radio"/>
- <?php endif; ?>
- <label for="s_method_<?php echo $_rate->getCode() ?>"><?php echo $this->escapeHtml($_rate->getMethodTitle()) ?>
- <?php $_excl = $this->getShippingPrice($_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?>
- <?php $_incl = $this->getShippingPrice($_rate->getPrice(), true); ?>
- <?php echo $_excl; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
- (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
- <?php endif; ?>
- </label>
- <?php endif ?>
- </li>
- <?php endforeach; ?>
- </ul>
- </dd>
- <?php endforeach; ?>
- </dl>
- <div class="no-display" data-shipping-code-price='{<?php echo implode(",",$shippingCodePrice); ?>}'></div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/success.phtml b/app/design/frontend/magento_backup/Magento_Checkout/success.phtml
deleted file mode 100644
index 169c4d693f3..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/success.phtml
+++ /dev/null
@@ -1,64 +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)
- */
-?>
-<div class="page-title">
- <h1><?php echo __('We received your order.') ?></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 __('We\'ll send you a confirmation email with order details and tracking information.') ?></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="buttons-set">
- <button type="button" class="button" 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_backup/Magento_Checkout/total/default.phtml b/app/design/frontend/magento_backup/Magento_Checkout/total/default.phtml
deleted file mode 100644
index d34e1906d40..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/total/default.phtml
+++ /dev/null
@@ -1,38 +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)
- */
-?>
-<tr>
- <th colspan="<?php echo $this->getColspan(); ?>" style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right">
- <?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?><strong><?php endif; ?>
- <?php echo $this->escapeHtml($this->getTotal()->getTitle()); ?>
- <?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?></strong><?php endif; ?>
- </th>
- <td style="<?php echo $this->getTotal()->getStyle() ?>" class="a-right">
- <?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?><strong><?php endif; ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getTotal()->getValue()) ?>
- <?php if ($this->getRenderingArea() == $this->getTotal()->getArea()): ?></strong><?php endif; ?>
- </td>
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/total/nominal.phtml b/app/design/frontend/magento_backup/Magento_Checkout/total/nominal.phtml
deleted file mode 100644
index 58537f0ac3f..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/total/nominal.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)
- */
-?>
-<?php
-/**
- * @see \Magento\Checkout\Block\Total\Nominal
- */
-?>
-<tr>
- <th colspan="<?php echo $this->getColspan() + 1; ?>" style="<?php echo $this->getTotalStyle() ?>" class="a-right">
- <?php echo sprintf(($this->getRenderingArea() == $this->getTotalArea()) ? '<strong>%s</strong>' : '%s', $this->escapeHtml($this->getTotalTitle())) ?>
- </th>
-</tr>
-<?php foreach ($this->getTotalItems() as $i => $item): ?>
-<?php foreach ($this->getTotalItemDetails($item) as $j => $row):?>
-<tr class="summary-details <?php echo "summary-details-nominal-{$i}" . (0 == $j ? ' summary-details-first' : '') . ($this->getItemDetailsRowIsCompounded($row) ? '' : ' summary-details-excluded')?>" style="display:none;">
- <td colspan="<?php echo $this->getColspan(); ?>" style="<?php echo $this->getTotalStyle() ?>" class="a-right">
- <?php echo $this->escapeHtml($this->getItemDetailsRowLabel($row)) ?>
- </td>
- <td class="a-right">
- <?php echo $this->formatPrice($this->getItemDetailsRowAmount($row)) ?>
- </td>
-</tr>
-<?php endforeach; ?>
-<tr class="summary-total" onclick="expandDetails(this, '<?php echo ".summary-details-nominal-{$i}"?>')">
- <td colspan="<?php echo $this->getColspan(); ?>" style="<?php echo $this->getTotalStyle() ?>">
- <div class="summary-collapse"><?php echo $this->escapeHtml($this->getItemName($item)); ?></div>
- </td>
- <td class="a-right">
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getItemRowTotal($item)) ?>
- </td>
-</tr>
-<?php endforeach; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Checkout/total/tax.phtml b/app/design/frontend/magento_backup/Magento_Checkout/total/tax.phtml
deleted file mode 100644
index 998107b44ca..00000000000
--- a/app/design/frontend/magento_backup/Magento_Checkout/total/tax.phtml
+++ /dev/null
@@ -1,68 +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 global $taxIter; $taxIter++; ?>
-<?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() && $this->getTotal()->getValue()!=0): ?>
-<?php $isTop = 1; ?>
- <?php foreach ($this->getTotal()->getFullInfo() as $info): ?>
- <?php if (isset($info['hidden']) && $info['hidden']) continue; ?>
- <?php $percent = $info['percent']; ?>
- <?php $amount = $info['amount']; ?>
- <?php $rates = $info['rates']; ?>
- <?php $isFirst = 1; ?>
-
- <?php foreach ($rates as $rate): ?>
- <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
- <td class="a-right" style="<?php echo $this->getTotal()->getStyle() ?>" colspan="<?php echo $this->getColspan(); ?>">
- <?php echo $this->escapeHtml($rate['title']); ?>
- <?php if (!is_null($rate['percent'])): ?>
- (<?php echo (float)$rate['percent']; ?>%)
- <?php endif; ?>
- <br />
- </td>
- <?php if ($isFirst): ?>
- <td rowspan="<?php echo count($rates); ?>" class="a-right" style="<?php echo $this->getTotal()->getStyle() ?>">
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($amount); ?>
- </td>
- <?php endif; ?>
- </tr>
- <?php $isFirst = 0; ?>
- <?php $isTop = 0; ?>
- <?php endforeach; ?>
- <?php endforeach; ?>
-<?php endif;?>
-<tr<?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() && $this->getTotal()->getValue()!=0): ?> class="summary-total" onclick="expandDetails(this, '.summary-details-<?php echo $taxIter;?>')"<?php endif; ?>>
- <td class="a-right" colspan="<?php echo $this->getColspan(); ?>" style="<?php echo $this->getTotal()->getStyle() ?>">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
- <div class="summary-collapse"><?php echo $this->getTotal()->getTitle() ?></div>
- <?php else: ?>
- <?php echo $this->getTotal()->getTitle() ?>
- <?php endif;?>
- </td>
- <td class="a-right" style="<?php echo $this->getTotal()->getStyle() ?>">
- <strong><?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getTotal()->getValue()) ?></strong>
- </td>
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Cms/content_heading.phtml b/app/design/frontend/magento_backup/Magento_Cms/content_heading.phtml
deleted file mode 100644
index 4bb4b239282..00000000000
--- a/app/design/frontend/magento_backup/Magento_Cms/content_heading.phtml
+++ /dev/null
@@ -1,31 +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 if($_heading = $this->getContentHeading()): ?>
- <div class="page-title">
- <h1><?php echo $_heading; ?></h1>
- </div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Cms/images/i_widget-link.gif b/app/design/frontend/magento_backup/Magento_Cms/images/i_widget-link.gif
deleted file mode 100644
index 16fc968deb5ea628fc160d01fd872fa44d36481b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 57
zcmZ?wbhEHb<YwSxXkcJCQ)vGG|9{1wEDRu^10p~&3`_zo{hSLW?p*U;?-%+w*I*SB
GgEauHoe!x1
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
deleted file mode 100644
index d5b7d2f834c..00000000000
--- a/app/design/frontend/magento_backup/Magento_Cms/layout/override/default.xml
+++ /dev/null
@@ -1,45 +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\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_backup/Magento_Cms/layout/override/print.xml b/app/design/frontend/magento_backup/Magento_Cms/layout/override/print.xml
deleted file mode 100644
index ba0a322322b..00000000000
--- a/app/design/frontend/magento_backup/Magento_Cms/layout/override/print.xml
+++ /dev/null
@@ -1,34 +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\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_backup/Magento_Cms/widget/static_block/default.phtml b/app/design/frontend/magento_backup/Magento_Cms/widget/static_block/default.phtml
deleted file mode 100644
index 77b50f85a70..00000000000
--- a/app/design/frontend/magento_backup/Magento_Cms/widget/static_block/default.phtml
+++ /dev/null
@@ -1,27 +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)
- */
-?>
-<div class="widget widget-static-block"><?php echo $this->getText(); ?></div>
diff --git a/app/design/frontend/magento_backup/Magento_Cms/widgets.css b/app/design/frontend/magento_backup/Magento_Cms/widgets.css
deleted file mode 100644
index 40f66253d64..00000000000
--- a/app/design/frontend/magento_backup/Magento_Cms/widgets.css
+++ /dev/null
@@ -1,37 +0,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.
- *
- * @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)
- */
-
-/* Widget: CMS Static Block */
-.widget-static-block {}
-.sidebar .widget-static-block { display:block; margin:0 0 15px; }
-
-/* Widget: CMS Page Link */
-.widget-cms-link-inline { display:inline; }
-
-.col-main .widget-cms-link { display:block; text-align:right; margin:7px 0; }
-.col-main .widget-cms-link a { background:url(images/i_widget-link.gif) 100% 4px no-repeat; padding-right:15px; }
-
-.sidebar .widget-cms-link { display:block; margin:0 0 15px; padding:0 10px; }
-.sidebar .widget-cms-link a { background:url(images/i_widget-link.gif) 100% 4px no-repeat; padding:0 15px 0 0; }
diff --git a/app/design/frontend/magento_backup/Magento_Contacts/form.phtml b/app/design/frontend/magento_backup/Magento_Contacts/form.phtml
deleted file mode 100644
index 91f06ee1dd6..00000000000
--- a/app/design/frontend/magento_backup/Magento_Contacts/form.phtml
+++ /dev/null
@@ -1,79 +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)
- */
-?>
-<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
deleted file mode 100644
index 7d863f949741ff83fd8373a77c0d95a3d95e441f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
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-
diff --git a/app/design/frontend/magento_backup/Magento_Core/prototype/magento.css b/app/design/frontend/magento_backup/Magento_Core/prototype/magento.css
deleted file mode 100644
index 11a5aa8ba79..00000000000
--- a/app/design/frontend/magento_backup/Magento_Core/prototype/magento.css
+++ /dev/null
@@ -1,94 +0,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.
- *
- * @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/design/frontend/magento_backup/Magento_Core/prototype/magento/btn_bg.gif b/app/design/frontend/magento_backup/Magento_Core/prototype/magento/btn_bg.gif
deleted file mode 100644
index 32d6ca84f3f541bf3a7bf29d9eb67b7f0b403d27..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 148
zcmZ?wbhEHbWMmLwIKsg2y+Y{kBAc%{Y~M=xe>6yauMzvV!s%-f_wUKNKid_*=5zj;
zZThQU^GCDnzg4b(=2`xpZuqlX_5T|8e@pEdhyaQ|S-`4vKqSac23ElZPb7jr=m;Eg
P@pKkBP@v(&!C(ylupKNW
diff --git a/app/design/frontend/magento_backup/Magento_Core/prototype/magento/content_bg.gif b/app/design/frontend/magento_backup/Magento_Core/prototype/magento/content_bg.gif
deleted file mode 100644
index 2a8c1375eb0bd58b04aab652e041237c8674f385..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 283
zcmZ?wbhEHbWMqh9xXQrr>({R@U%veK@#E8{Pd|VDynp}x{{8#+?c4YI_3LNPo}D;x
z;>nXIH*enj{{8#Wqel-NI`rnvn~xtqzI*rX>({RzK76=(_3G)<r!QZ=eDL7G<HwIb
zc<|u%?c3L{U%z(k+NDdEPM$pZ=+UEZ-@d(l`}Y0&_pe^PI&$R5^XJd^?%n(J>C^M)
z&p&?r_{NPJckkZ4aN)wabLZ~eyZ7?t%QI)rFc1wCf3kqp>VQa)pBUII4qQIiP&q|L
z^5}7);-yjZyq6x1G&EZi?#LXZ8^9^t)6&qPqU@Doz`>%nu+70if#KbcJ$2{bGdD3<
F0|4G=osR$j
diff --git a/app/design/frontend/magento_backup/Magento_Core/prototype/magento/top_bg.gif b/app/design/frontend/magento_backup/Magento_Core/prototype/magento/top_bg.gif
deleted file mode 100644
index c9a37315deca7bf581033ad28aeeb2713a4d6e33..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 154
zcmZ?wbhEHbWMq(GIKsdXUsjvh*p*b-m|WEyky{c|R2f}Rk=5Lt(a_<anBf(j=n)y`
z9h)4KniHN~<Qf{4THBgh(-N9lkY3;J9v<r(pBh(E6O~_<SY98Hoar1K5t5$AfCLnO
ovVeIyAQEIJ1FQH0K?PwEUM9AP)<VI)EvAt{hNqltqc|9>0e;9W8~^|S
diff --git a/app/design/frontend/magento_backup/Magento_Core/prototype/magento/window_close.png b/app/design/frontend/magento_backup/Magento_Core/prototype/magento/window_close.png
deleted file mode 100644
index 6e2b6dfb1d098287e6f7f87f1d2acefcd4a074ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 872
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<w6XvX4FBupZPXzdc
zxN?b0rR3zL=H|zxWh7)|CFkUFOGsCPft8h2QBjedtzASyvYoB1ot>SdqZ1HjW@eO?
zmHGSodwF@exw#b<6{V!40NKI8!FE8^wszIkRXmb1K&ga;c(0H!ODn6G=;+AA<nZwD
z`1DLyH`nsAGN287QnJpz{<(R%W#wgletv;bF+eRq!;6Xvfd)E(L0MTjP(g5Tkb;&D
zP)kluPHIXD(Dss&Qg45MSN}jGTYF6-6L)VPO(WCumoAr=l?R4Jc=`Iq#m1}Z8-|62
z0iBePnx<!N0dx}3g(3<{AyLte&d!FGR;qdiE}mZM`bOt3T?z^f@$&XkF)#`V3j=yp
zSV76j+c!EUMp@s`z}hw|CkN;ZpdWpLLj%Jjy!`yHUcUhp^YZlz4GoJ<PW2875m#0d
zRaB{}u6FYFNlZ(>e)FbJXvF!8m(p``qY{%fjLrN*!$Kn>tz6vBUA!b9BY)%8?bOVy
z(CC<;h)AGcgCnEdJv?;Gt#01FBde+77al1jrw9xp3nv!`FJDV%S9?z%w}2q`z+gdH
z1>dkperY*gDH#z3<&fBTVR@yuEzO64aco`^<Ohmt5O^CX&HR}m>VVL?ORG<29y`FF
z%zq$i7Xz~*gR~-pA_E)GE(V57p-T*V5AXf6PH1U@mgy8=nqlPdba4!+xTSimwW!%a
z#Ni@)OT}F%Fnu>qV3LDk&i8Wf+s4J|dKXL_1yojE44JT`#w1{hQ((vn>w7VmmM+uC
z(zp;_TK@C-o@wdb-!IOex2*lztvL(c{+_RUBaG|m&FkiFfhiJhBE9<TKQG)UI{x{g
zzNGxK<8GT5EO_7i_{_Tsn|Ef#cV0?`*dI;eY(M_MphBqg#t)^CckbubF6=)4`{{(Q
z2A`@}Qqv`rTb7xByC-lcL+(@Cuf-CxnJf|xU3^idZj$n5M~vTm1rEFA6XxW!Pg>T_
zT4wh1^|ZUPZ&;U_eJ^sIq!O0*dX+Qxf}C@6Hu|qwKhNi8d-baa{ktN*+8Hfa6@L0Z
YGuOs21*KYrPoS{$boFyt=akR{0Lf8D(*OVf
diff --git a/app/design/frontend/magento_backup/Magento_Core/translate_inline.phtml b/app/design/frontend/magento_backup/Magento_Core/translate_inline.phtml
deleted file mode 100644
index 3675b14f271..00000000000
--- a/app/design/frontend/magento_backup/Magento_Core/translate_inline.phtml
+++ /dev/null
@@ -1,72 +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.
- *
- * @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_Customer/account/dashboard.phtml b/app/design/frontend/magento_backup/Magento_Customer/account/dashboard.phtml
deleted file mode 100644
index 71bdc537d38..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/account/dashboard.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
- * @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="dashboard">
- <div class="page-title">
- <h1><?php echo __('My Dashboard') ?></h1>
- </div>
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
- <?php echo $this->getChildHtml('hello') ?>
- <?php echo $this->getChildHtml('top') ?>
- <div class="box-account box-info">
- <div class="box-head">
- <h2><?php echo __('Account Information') ?></h2>
- </div>
- <?php /* Extensions placeholder */ ?>
- <?php echo $this->getChildHtml('customer.account.dashboard.extra') ?>
- <?php echo $this->getChildHtml('info') ?>
- <?php echo $this->getChildHtml('address') ?>
- </div>
- <?php echo $this->getChildHtml('info1') ?>
- <?php echo $this->getChildHtml('info2') ?>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/address.phtml b/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/address.phtml
deleted file mode 100644
index c43dbb709ed..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/address.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
- * @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="col2-set">
- <div class="box">
- <div class="box-title">
- <h3><?php echo __('Address Book') ?></h3>
- <a href="<?php echo $this->getAddressBookUrl() ?>"><?php echo __('Manage Addresses') ?></a>
- </div>
- <div class="box-content">
- <div class="col-1">
- <h4><?php echo __('Default Billing Address') ?></h4>
- <address>
- <?php echo $this->getPrimaryBillingAddressHtml() ?><br />
- <a href="<?php echo $this->getPrimaryBillingAddressEditUrl() ?>"><?php echo __('Edit Address') ?></a>
- </address>
- </div>
- <div class="col-2">
- <h4><?php echo __('Default Shipping Address') ?></h4>
- <address>
- <?php echo $this->getPrimaryShippingAddressHtml() ?><br />
- <a href="<?php echo $this->getPrimaryShippingAddressEditUrl() ?>"><?php echo __('Edit Address') ?></a>
- </address>
- </div>
- </div>
- </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/hello.phtml b/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/hello.phtml
deleted file mode 100644
index ac1e45a25aa..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/hello.phtml
+++ /dev/null
@@ -1,30 +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)
- */
-?>
-<div class="welcome-msg">
- <p class="hello"><strong><?php echo __('Hello, %1!', $this->escapeHtml($this->getCustomerName())) ?></strong></p>
- <p><?php echo __('From your dashboard you can review recent account activity and edit your account information.') ?></p>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/info.phtml b/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/info.phtml
deleted file mode 100644
index 919b2556f1d..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/info.phtml
+++ /dev/null
@@ -1,64 +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)
- */
-?>
-<div class="col2-set">
- <div class="col-1">
- <div class="box">
- <div class="box-title">
- <h3><?php echo __('Contact Information') ?></h3>
- <a href="<?php echo $this->getUrl('customer/account/edit') ?>"><?php echo __('Edit') ?></a>
- </div>
- <div class="box-content">
- <p>
- <?php echo $this->escapeHtml($this->getCustomer()->getName()) ?><br />
- <?php echo $this->escapeHtml($this->getCustomer()->getEmail()) ?><br />
- <a href="<?php echo $this->getChangePasswordUrl() ?>"><?php echo __('Change Password') ?></a>
- </p>
- </div>
- </div>
- </div>
- <?php if( $this->isNewsletterEnabled() ): ?>
- <div class="col-2">
- <div class="box">
- <div class="box-title">
- <h3><?php echo __('Newsletters') ?></h3>
- <a href="<?php echo $this->getUrl('newsletter/manage') ?>"><?php echo __('Edit') ?></a>
- </div>
- <div class="box-content">
- <p>
- <?php if( $this->getIsSubscribed() ): ?>
- <?php echo __("You subscribe to 'General Subscription'.") ?>
- <?php else: ?>
- <?php echo __('You do not subscribe to a newsletter.') ?>
- <?php endif; ?>
- </p>
- </div>
- </div>
- <?php /* Extensions placeholder */ ?>
- <?php echo $this->getChildHtml('customer.account.dashboard.info.extra')?>
- </div>
- <?php endif; ?>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/newsletter.phtml b/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/newsletter.phtml
deleted file mode 100644
index acbb68584c9..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/account/dashboard/newsletter.phtml
+++ /dev/null
@@ -1,31 +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)
- */
-?>
-<div class="col-2">
- <h4><?php echo __('Newsletters') ?></h4>
- <a href="<?php echo $this->getUrl('newsletter/manage') ?>"><?php echo __('Edit Newsletters') ?></a>
- <p><?php echo __('You subscribe to our newsletter.') ?></p>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/account/link/back.phtml b/app/design/frontend/magento_backup/Magento_Customer/account/link/back.phtml
deleted file mode 100644
index 5dd122210dc..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/account/link/back.phtml
+++ /dev/null
@@ -1,29 +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)
- */
-?>
-<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_Customer/account/navigation.phtml b/app/design/frontend/magento_backup/Magento_Customer/account/navigation.phtml
deleted file mode 100644
index 9fe95fd9470..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/account/navigation.phtml
+++ /dev/null
@@ -1,36 +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.
- *
- * @copyright Copyright (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\Links */
-?>
-<?php /** @var $this \Magento\Customer\Block\Account\Navigation */ ?>
-<div class="block block-account">
- <div class="block-title">
- <strong><span><?php echo __('My Account'); ?></span></strong>
- </div>
- <div class="block-content">
- <ul>
- <?php echo $this->getChildHtml();?>
- </ul>
- </div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/address.js b/app/design/frontend/magento_backup/Magento_Customer/address.js
deleted file mode 100644
index 5e63a788204..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/address.js
+++ /dev/null
@@ -1,73 +0,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.
- *
- * @category mage customer view
- * @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 confirm:true*/
-(function($, window) {
- "use strict";
- $.widget('mage.address', {
- /**
- * Options common to all instances of this widget.
- * @type {Object}
- */
- options: {
- deleteConfirmMessage: $.mage.__('Are you sure you want to delete this address?')
- },
-
- /**
- * Bind event handlers for adding and deleting addresses.
- * @private
- */
- _create: function() {
- $(this.options.addAddress).on('click', $.proxy(this._addAddress, this));
- $(this.options.deleteAddress).on('click', $.proxy(this._deleteAddress, this));
- },
-
- /**
- * Add a new address.
- * @private
- */
- _addAddress: function() {
- window.location = this.options.addAddressLocation;
- },
-
- /**
- * Delete the address whose id is specified in a data attribute after confirmation from the user.
- * @private
- * @param {Event}
- * @return {Boolean}
- */
- _deleteAddress: function(e) {
- if (confirm(this.options.deleteConfirmMessage)) {
- if (typeof $(e.target).parent().data('address') !== 'undefined') {
- window.location = this.options.deleteUrlPrefix + $(e.target).parent().data('address');
- }
- else {
- window.location = this.options.deleteUrlPrefix + $(e.target).data('address');
- }
- }
- return false;
- }
- });
-})(jQuery, window);
diff --git a/app/design/frontend/magento_backup/Magento_Customer/address.phtml b/app/design/frontend/magento_backup/Magento_Customer/address.phtml
deleted file mode 100644
index 9587b2ff326..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/address.phtml
+++ /dev/null
@@ -1,96 +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 customer address
- * @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)
- */
-?>
-<div class="page-title">
- <h1><?php echo __('Address Books') ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<table width="100%">
- <tr>
- <td style="width:50%;"><h3>Default</h3>
- <table width="100%">
- <?php if(!empty($primaryAddresses)): ?>
- <?php foreach($primaryAddresses as $_address): ?>
- <tr>
- <td>
- <address>
- <?php echo $_address->format('html') ?>
- </address>
- <p>
- <strong><a href="<?php echo $this->getUrl('customer/address/form', array('address'=>$_address->getAddressId())) ?>" class="red-link"><?php echo __('Edit Address') ?></a></strong>
- </p>
- </td>
- </tr>
- <?php endforeach; ?>
- <?php else: ?>
- <tr>
- <td>
- <p><?php echo __('You have no default entries in your address book.') ?></p>
- </td>
- </tr>
- <?php endif ?>
- </table>
- </td>
- <td style="width:50%;"><h3><?php echo __('Additional Address Entries') ?></h3>
- <table width="100%">
- <?php if(!empty($alternativeAddresses)): ?>
- <?php foreach($alternativeAddresses as $_address): ?>
- <tr>
- <td>
- <address>
- <?php echo $_address->format('html') ?>
- </address>
- <p>
- <strong><a href="<?php echo $this->getUrl('customer/address/form', array('address'=>$_address->getAddressId())) ?>" class="red-link"><?php echo __('Edit Address') ?></a></strong><span class="separator"> | </span><strong><a href="#" role="delete-address" data-address="<?php echo $_address->getAddressId() ?>" class="red-link"><?php echo __('Delete Address') ?></a></strong>
- </p>
- </td>
- </tr>
- <?php endforeach; ?>
- <?php else: ?>
- <tr>
- <td>
- <p><?php echo __('You have no additional entries in your address book.') ?></p>
- </td>
- </tr>
- <?php endif ?>
- </table>
- </td>
- </tr>
-</table>
-<div class="buttons-set">
- <p class="back-link"><a href="<?php echo $this->getUrl('customer/account/') ?>"><small>« </small><?php echo __('Back') ?></a></p>
- <button type="button" class="button" role="add-address"><span><span><?php echo __('New Address') ?></span></span></button>
-</div>
-<script type="text/javascript">
- head.js("<?php echo $this->getViewFileUrl('Magento_Customer::address.js') ?>", function() {
- jQuery('div.page-title').address({
- deleteAddress: "p a[role='delete-address']",
- deleteUrlPrefix: "<?php echo $this->getUrl('customer/address/delete') ?>address/",
- addAddress: "div.buttons-set button[role='add-address']",
- addAddressLocation: "<?php echo $this->getUrl('customer/address/form') ?>"
- });
- });
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/address/book.phtml b/app/design/frontend/magento_backup/Magento_Customer/address/book.phtml
deleted file mode 100644
index b119c1ce8ec..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/address/book.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 customer address book
- * @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)
- */
-?>
-<?php
-/**
- * Temlate for \Magento\Customer\Block\Address\Book block
- * @var $this \Magento\Customer\Block\Address\Book
- */
-?>
-<div class="page-title title-buttons">
- <h1><?php echo __('Address Book') ?></h1>
- <button type="button" role="add-address" title="<?php echo __('Add New Address') ?>" class="button"><span><span><?php echo __('Add New Address') ?></span></span></button>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<div class="col2-set addresses-list">
- <div class="col-1 addresses-primary">
- <h2><?php echo __('Default Addresses') ?></h2>
- <ol>
- <?php if($_pAddsses = $this->getDefaultBilling()): ?>
- <li class="item">
- <h3><?php echo __('Default Billing Address') ?></h3>
- <address>
- <?php echo $this->getAddressHtml($this->getAddressById($_pAddsses)) ?>
- </address>
- <p><a href="<?php echo $this->getAddressEditUrl($this->getAddressById($_pAddsses)) ?>"><?php echo __('Change Billing Address') ?></a></p>
- </li>
- <?php else: ?>
- <li class="item">
- <h3><?php echo __('Default Billing Address') ?></h3>
- <?php echo __('You have no default billing address in your address book.') ?>
- </li>
- <?php endif ?>
-
- <?php if($_pAddsses = $this->getDefaultShipping()): ?>
- <li class="item">
- <h3><?php echo __('Default Shipping Address') ?></h3>
- <address>
- <?php echo $this->getAddressHtml($this->getAddressById($_pAddsses)) ?>
- </address>
- <p><a href="<?php echo $this->getAddressEditUrl($this->getAddressById($_pAddsses)) ?>"><?php echo __('Change Shipping Address') ?></a></p>
- </li>
- <?php else: ?>
- <li class="item empty">
- <h3><?php echo __('Default Shipping Address') ?></h3>
- <p><?php echo __('You have no default shipping address in your address book.') ?></p>
- </li>
- <?php endif ?>
- </ol>
- </div>
- <div class="col-2 addresses-additional">
- <h2><?php echo __('Additional Address Entries') ?></h2>
- <ol>
- <?php if($_pAddsses = $this->getAdditionalAddresses()): ?>
- <?php foreach($_pAddsses as $_address): ?>
- <li class="item">
- <address>
- <?php echo $this->getAddressHtml($_address) ?>
- </address>
- <p><a href="<?php echo $this->getUrl('customer/address/edit', array('id'=>$_address->getId())) ?>"><?php echo __('Edit Address') ?></a> <span class="separator">|</span> <a href="#" class="link-remove" role="delete-address" data-address="<?php echo $_address->getId() ?>"><?php echo __('Delete Address') ?></a></p>
- </li>
- <?php endforeach; ?>
- <?php else: ?>
- <li class="item empty">
- <p><?php echo __('You have no more address entries in your address book.') ?></p>
- </li>
- <?php endif ?>
- </ol>
- </div>
-</div>
-<div class="buttons-set">
- <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>« </small><?php echo __('Back') ?></a></p>
-</div>
-<script type="text/javascript">
- head.js("<?php echo $this->getViewFileUrl('Magento_Customer::address.js');?>", function() {
- jQuery('div.page-title').address({
- deleteAddress: "li.item a[role='delete-address']",
- deleteUrlPrefix: '<?php echo $this->getDeleteUrl() ?>id/',
- addAddress: "div.title-buttons button[role='add-address']",
- addAddressLocation: '<?php echo $this->getAddAddressUrl() ?>'
- });
- });
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/address/edit.phtml b/app/design/frontend/magento_backup/Magento_Customer/address/edit.phtml
deleted file mode 100644
index c74bf1efc29..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/address/edit.phtml
+++ /dev/null
@@ -1,176 +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
-/**
- * Edit customer address template
- *
- * @var $this \Magento\Customer\Block\Address\Edit
- */
-?>
-<?php if($this->getTitle()): ?>
-<div class="page-title">
- <h1><?php echo $this->getTitle() ?></h1>
-</div>
-<?php endif; ?>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<form action="<?php echo $this->getSaveUrl() ?>" method="post" id="form-validate">
- <div class="fieldset">
- <?php echo $this->getBlockHtml('formkey')?>
- <input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
- <input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
- <h2 class="legend"><?php echo __('Contact Information') ?></h2>
- <ul class="form-list">
- <li class="fields">
- <?php echo $this->getNameBlockHtml() ?>
- </li>
- <li class="wide">
- <label for="company"><?php echo __('Company') ?></label>
- <div class="input-box">
- <input type="text" name="company" id="company" title="<?php echo __('Company') ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getCompany()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>" />
- </div>
- </li>
- <li class="fields">
- <div class="field">
- <label for="telephone" class="required"><em>*</em><?php echo __('Telephone') ?></label>
- <div class="input-box">
- <input type="text" name="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="telephone" />
- </div>
- </div>
- <div class="field">
- <label for="fax"><?php echo __('Fax') ?></label>
- <div class="input-box">
- <input type="text" name="fax" id="fax" title="<?php echo __('Fax') ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getFax()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>" />
- </div>
- </div>
- </li>
- </ul>
- </div>
- <div class="fieldset">
- <h2 class="legend"><?php echo __('Address') ?></h2>
- <ul class="form-list">
- <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
- <li class="wide">
- <label for="street_1" class="required"><em>*</em><?php echo __('Street Address') ?></label>
- <div class="input-box">
- <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" title="<?php echo __('Street Address') ?>" id="street_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="wide">
- <div class="input-box">
- <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" title="<?php echo __('Street Address %1', $_i) ?>" id="street_<?php echo $_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="vat_id"><?php echo __('VAT Number') ?></label>
- <div class="input-box">
- <input type="text" name="vat_id" value="<?php echo $this->escapeHtml($this->getAddress()->getVatId()) ?>" title="<?php echo __('VAT Number') ?>" id="vat_id" 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="city" class="required"><em>*</em><?php echo __('City') ?></label>
- <div class="input-box">
- <input type="text" name="city" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" title="<?php echo __('City') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="city" />
- </div>
- </div>
- <div class="field">
- <label for="region_id" class="required"><em>*</em><?php echo __('State/Province') ?></label>
- <div class="input-box">
- <select id="region_id" name="region_id" title="<?php echo __('State/Province') ?>" class="validate-select" style="display:none;" <?php if ($this->getConfigNode('general/region/display_all') === 0) { ?>disabled="disabled"<?php } ?>>
- <option value=""><?php echo __('Please select region, state or province') ?></option>
- </select>
- <input type="text" id="region" name="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') ?>" <?php if ($this->getConfigNode('general/region/display_all') === 0) { ?>disabled="disabled"<?php } ?>/>
- </div>
- </div>
- </li>
- <li class="fields">
- <div class="field">
- <label for="zip" class="required"><em>*</em><?php echo __('Zip/Postal Code') ?></label>
- <div class="input-box">
- <input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" title="<?php echo __('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" />
- </div>
- </div>
- <div class="field">
- <label for="country" class="required"><em>*</em><?php echo __('Country') ?></label>
- <div class="input-box">
- <?php echo $this->getCountryHtmlSelect() ?>
- </div>
- </div>
- </li>
- <li<?php if($this->canSetAsDefaultBilling()) echo ' class="control"' ?>>
- <?php if($this->isDefaultBilling()): ?>
- <strong><?php echo __('Default Billing Address') ?></strong>
- <?php elseif($this->canSetAsDefaultBilling()): ?>
- <input type="checkbox" id="primary_billing" name="default_billing" value="1" title="<?php echo __('Use this as my default billing address.') ?>" class="checkbox" /><label for="primary_billing"><?php echo __('Use as my default billing address') ?></label>
- <?php else: ?>
- <input type="hidden" name="default_billing" value="1" />
- <?php endif; ?>
- </li>
- <li<?php if($this->canSetAsDefaultShipping()) echo ' class="control"' ?>>
- <?php if($this->isDefaultShipping()): ?>
- <strong><?php echo __('Default Shipping Address') ?></strong>
- <?php elseif($this->canSetAsDefaultShipping()): ?>
- <input type="checkbox" id="primary_shipping" name="default_shipping" value="1" title="<?php echo __('Use this as my default shipping address.') ?>" class="checkbox" /><label for="primary_shipping"><?php echo __('Use as my default shipping address') ?></label>
- <?php else: ?>
- <input type="hidden" name="default_shipping" value="1" />
- <?php endif; ?>
- </li>
- </ul>
- </div>
- <div class="buttons-set">
- <p class="required"><?php echo __('* Required Fields') ?></p>
- <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>« </small><?php echo __('Back') ?></a></p>
- <button type="submit" title="<?php echo __('Save Address') ?>" class="button"><span><span><?php echo __('Save Address') ?></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') ?>",
- "<?php echo $this->getViewFileUrl('Magento_Checkout::js/region-updater.js') ?>",
- function() {
- $('#country').regionUpdater({
- optionalRegionAllowed: <?php echo ($this->getConfig('general/region/display_all')? 'true' : 'false'); ?>,
- regionListId: '#region_id',
- regionInputId: '#region',
- postcodeId: '#zip',
- form: $('#form-validate').validation(),
- 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_backup/Magento_Customer/balance.phtml b/app/design/frontend/magento_backup/Magento_Customer/balance.phtml
deleted file mode 100644
index 2fa29d65b4c..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/balance.phtml
+++ /dev/null
@@ -1,31 +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 echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<?php echo __('Your account balance is: %1', $customer->getStoreBalance()) ?>
-<div class="buttons-set">
- <p class="back-link"><a href="<?php echo $this->getUrl('customer/account') ?>"><small>« </small><?php echo __('Back') ?></a></p>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/form/address.phtml b/app/design/frontend/magento_backup/Magento_Customer/form/address.phtml
deleted file mode 100644
index 9bcabcd4004..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/form/address.phtml
+++ /dev/null
@@ -1,154 +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)
- */
-?>
-
-<div class="page-title">
- <h1><?php if($data->getAddressId()): ?><?php echo __('Edit Address Entry') ?><?php else: ?><?php echo __('New Address Entry') ?><?php endif ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<form action="<?php echo $action ?>" method="post" id="form-validate">
- <div class="fieldset">
- <input type="hidden" name="address_id" value="<?php echo $data->getAddressId() ?>" />
- <input type="hidden" name="customer_id" id="address_id" value="<?php echo $data->getCustomerId() ?>" />
- <h2 class="legend"><?php echo __('Personal Information') ?></h2>
- <ul class="form-list">
- <li class="fields">
- <?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($data)->toHtml() ?>
- </li>
- <li>
- <label for="company"><?php echo __('Company') ?></label>
- <div class="input-box">
- <input type="text" name="company" id="company" title="<?php echo __('Company') ?>" value="<?php echo $this->escapeHtml($data->getCompany()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>" />
- </div>
- </li>
- </ul>
- </div>
- <div class="fieldset">
- <h2 class="legend"><?php echo __('Address') ?></h2>
- <ul class="form-list">
- <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
- <li class="wide">
- <label for="street_1" class="required"><em>*</em><?php echo __('Street Address') ?></label>
- <div class="input-box">
- <input type="text" name="street[]" value="<?php echo $this->escapeHtml($data->getStreet(1)) ?>" title="<?php echo __('Street Address') ?>" id="street_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="wide">
- <div class="input-box">
- <input type="text" name="street[]" value="<?php echo $this->escapeHtml($data->getStreet($_i)) ?>" title="<?php echo __('Street Address %1', $_i) ?>" id="street_<?php echo $_i ?>" class="input-text <?php echo $_streetValidationClass ?>" />
- </div>
- </li>
- <?php endfor; ?>
- <li class="fields">
- <div class="field">
- <label for="city" class="required"><em>*</em><?php echo __('City') ?></label>
- <div class="input-box">
- <input type="text" name="city" value="<?php echo $this->escapeHtml($data->getCity()) ?>" title="<?php echo __('City') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="city" />
- </div>
- </div>
- <div class="field">
- <label for="region_id" class="required"><em>*</em><?php echo __('State/Province') ?></label>
- <div class="input-box">
- <select id="region_id" name="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="region" name="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="zip" class="required"><em>*</em><?php echo __('Zip/Postal Code') ?></label>
- <div class="input-box">
- <input type="text" name="postcode" value="<?php echo $this->escapeHtml($data->getPostcode()) ?>" title="<?php echo __('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" />
- </div>
- </div>
- <div class="field">
- <label for="country" class="required"><em>*</em><?php echo __('Country') ?></label>
- <div class="input-box">
- <select name="country_id" id="country" title="<?php echo __('Country') ?>" class="validate-select">
- <?php echo $countries->toHtmlOptions($data->getCountryId()) ?>
- </select>
- </div>
- </div>
- </li>
- <li class="fields">
- <div class="field">
- <label for="telephone" class="required"><em>*</em><?php echo __('Telephone') ?></label>
- <div class="input-box">
- <input type="text" name="telephone" value="<?php echo $this->escapeHtml($data->getTelephone()) ?>" title="<?php echo __('Telephone') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>" id="telephone" >
- </div>
- </div>
- <div class="field">
- <label for="fax"><?php echo __('Fax') ?></label>
- <div class="input-box">
- <input type="text" name="fax" value="<?php echo $this->escapeHtml($data->getFax()) ?>" title="<?php echo __('Fax') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>" id="fax" />
- </div>
- </div>
- </li>
- <?php foreach ($primaryTypes as $code=>$type): ?>
- <li<?php if (!$address->isPrimary($type['address_type_id'])) echo ' class="control"' ?>>
- <?php if ($address->isPrimary($type['address_type_id'])): ?>
- <strong><?php echo __("This is my default %1 address.", ucfirst($type['name'])) ?></strong>
- <?php else: ?>
- <input type="checkbox" id="primary_<?php echo $code ?>" name="primary_types[]" value="<?php echo $type['address_type_id'] ?>" class="checkbox" /><label for="primary_<?php echo $code ?>"><?php echo __("Use this as my default %1 address.", ucfirst($type['name'])) ?></label>
- <?php endif ?>
- </li>
- <?php endforeach ?>
- </ul>
- </div>
- <div class="buttons-set">
- <p class="required"><?php echo __('* Required Fields') ?></p>
- <p class="back-link"><a href="<?php echo $this->getUrl('customer/address/') ?>"><small>« </small><?php echo __('Back') ?></a></p>
- <button type="submit" class="button" title="<?php echo __('Save Address') ?>"><span><span><?php echo __('Save Address') ?></span></span></button>
- </div>
-</form>
-<script type="text/javascript">
-//<![CDATA[
-(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') ?>",
- "<?php echo $this->getViewFileUrl('Magento_Checkout::js/region-updater.js') ?>",
- function() {
- $('#country').regionUpdater({
- optionalRegionAllowed: <?php echo ($this->getConfig('general/region/display_all') ? 'true' : 'false'); ?>,
- regionListId: '#region_id',
- regionInputId: '#region',
- postcodeId: '#zip',
- form: $('#form-validate').validation(),
- 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_backup/Magento_Customer/form/changepassword.phtml b/app/design/frontend/magento_backup/Magento_Customer/form/changepassword.phtml
deleted file mode 100644
index 1e4ff4df641..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/form/changepassword.phtml
+++ /dev/null
@@ -1,103 +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)
- */
-?>
-<div class="page-title">
- <h1><?php echo __('Change Account Password') ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<form action="<?php echo $action ?>" method="post" id="form-validate">
-<div class="fieldset">
- <h2 class="legend"><?php echo __('Change Account Password') ?></h2>
- <ul class="form-list">
- <li>
- <label for="current_password" class="required"><em>*</em><?php echo __('Current Password') ?></label>
- <div class="input-box">
- <input type="password" title="<?php echo __('Current Password') ?>" class="input-text" name="current_password" id="current_password" />
- </div>
- </li>
- <li class="fields">
- <div class="field">
- <label for="password" class="required"><em>*</em><?php echo __('New Password') ?></label>
- <div class="input-box">
- <input type="password" title="<?php echo __('New Password') ?>" class="input-text" name="password" id="password" />
- </div>
- </div>
- <div class="field">
- <label for="confirmation" class="required"><em>*</em><?php echo __('Confirm New Password') ?></label>
- <div class="input-box">
- <input type="password" title="<?php echo __('Confirm New Password') ?>" class="input-text" name="confirmation" id="confirmation" />
- </div>
- </div>
- </li>
- </ul>
-</div>
-<div class="buttons-set">
- <p class="required"><?php echo __('* Required Fields') ?></p>
- <p class="back-link"><a href="<?php echo $this->getUrl('customer/account') ?>"><small>« </small><?php echo __('Back') ?></a></p>
- <button type="submit" title="<?php echo __('Save Password') ?>" class="button"><span><span><?php echo __('Save Password') ?></span></span></button>
-</div>
-</form>
-<script type="text/javascript">
-//<![CDATA[
-(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') ?>",
- "<?php echo $this->getViewFileUrl('Magento_Customer::set-password.js') ?>",
- <?php if ($_dob->isEnabled()): ?>
- "<?php echo $this->getViewFileUrl('mage/validation/dob-rule.js') ?>",
- <?php endif ?>
- function() {
- $('#change-password').setPassword({
- currentPasswordId: '#current-password',
- passwordId: '#password',
- confirmationId: '#confirmation',
- passwordContainer: 'div.fieldset',
- showOnDefault: <?php echo $this->getCustomer()->getChangePassword() ? 'true' : 'false' ?>
- });
- $('#form-validate').validation({
- <?php if ($_dob->isEnabled()): ?>
- errorPlacement: function(error, element) {
- if (element.prop('id') === 'dob') {
- var dobElement = $('.customer-dob'),
- errorClass = error.prop('class');
- error.insertAfter(element.parent());
- dobElement.find('.validate-custom').addClass(errorClass)
- .after('<div class="' + errorClass + '"></div>');
- }
- else {
- error.insertAfter(element);
- }
- },
- ignore: ':hidden:not(#dob)'
- <?php endif ?>
- });
- });
-})(jQuery);
-//]]>
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/form/confirmation.phtml b/app/design/frontend/magento_backup/Magento_Customer/form/confirmation.phtml
deleted file mode 100644
index 415eecd38d1..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/form/confirmation.phtml
+++ /dev/null
@@ -1,61 +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)
- */
-?>
-<div class="page-title">
- <h1><?php echo __('Send confirmation link') ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<form action="" method="post" id="form-validate">
- <div class="fieldset">
- <h2 class="legend"><?php echo __('Retrieve your confirmation link here') ?></h2>
- <p><?php echo __('Please enter your email below and we\'ll send you confirmation link for it.') ?></p>
- <ul class="form-list">
- <li>
- <label for="email_address" class="required"><em>*</em><?php echo __('Email Address') ?></label>
- <div class="input-box">
- <input type="text" name="email" id="email_address" title="<?php echo __('Email Address') ?>" class="input-text" value="<?php echo $this->escapeHtml($this->getEmail()) ?>" data-validate="{required:true, 'validate-email':true}"/>
- </div>
- </li>
- </ul>
- </div>
- <div class="buttons-set">
- <p class="required"><?php echo __('* Required Fields') ?></p>
- <p class="back-link"><a href="<?php echo $this->helper('Magento\Customer\Helper\Data')->getLoginUrl() ?>"><small>« </small><?php echo __('Back to Login') ?></a></p>
- <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() {
- $('#form-validate').validation();
- });
- })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/form/edit.phtml b/app/design/frontend/magento_backup/Magento_Customer/form/edit.phtml
deleted file mode 100644
index 211c497882b..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/form/edit.phtml
+++ /dev/null
@@ -1,131 +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)
- */
-?>
-<div class="page-title">
- <h1><?php echo __('Edit Account Information') ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<form action="<?php echo $this->getUrl('customer/account/editPost') ?>" method="post" id="form-validate">
- <div class="fieldset">
- <?php echo $this->getBlockHtml('formkey')?>
- <h2 class="legend"><?php echo __('Account Information') ?></h2>
- <ul class="form-list">
- <li class="fields">
- <?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($this->getCustomer())->toHtml() ?>
- </li>
- <li>
- <label for="email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
- <div class="input-box">
- <input type="text" name="email" id="email" value="<?php echo $this->escapeHtml($this->getCustomer()->getEmail()) ?>" title="<?php echo __('Email Address') ?>" class="input-text" data-validate="{required:true, 'validate-email':true}"/>
- </div>
- </li>
- <?php $_dob = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob') ?>
- <?php if ($_dob->isEnabled()): ?>
- <li><?php echo $_dob->setDate($this->getCustomer()->getDob())->toHtml() ?></li>
- <?php endif ?>
- <?php $_taxvat = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Taxvat') ?>
- <?php if ($_taxvat->isEnabled()): ?>
- <li><?php echo $_taxvat->setTaxvat($this->getCustomer()->getTaxvat())->toHtml() ?></li>
- <?php endif ?>
- <?php $_gender = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Gender') ?>
- <?php if ($_gender->isEnabled()): ?>
- <li><?php echo $_gender->setGender($this->getCustomer()->getGender())->toHtml() ?></li>
- <?php endif ?>
- <li class="control">
- <input type="checkbox" name="change_password" id="change-password" value="1" title="<?php echo __('Change Password') ?>"<?php if($this->getCustomer()->getChangePassword()==1): ?> checked="checked"<?php endif; ?> class="checkbox" /><label for="change-password"><?php echo __('Change Password') ?></label>
- </li>
- </ul>
- </div>
- <div class="fieldset" style="display:none;">
- <h2 class="legend"><?php echo __('Change Password') ?></h2>
- <ul class="form-list">
- <li>
- <label for="current-password" class="required"><em>*</em><?php echo __('Current Password') ?></label>
- <div class="input-box">
- <input type="password" title="<?php echo __('Current Password') ?>" class="input-text" name="current_password" id="current-password" />
- </div>
- </li>
- <li class="fields">
- <div class="field">
- <label for="password" class="required"><em>*</em><?php echo __('New Password') ?></label>
- <div class="input-box">
- <input type="password" title="<?php echo __('New Password') ?>" class="input-text" name="password" id="password" />
- </div>
- </div>
- <div class="field">
- <label for="confirmation" class="required"><em>*</em><?php echo __('Confirm New Password') ?></label>
- <div class="input-box">
- <input type="password" title="<?php echo __('Confirm New Password') ?>" class="input-text" name="confirmation" id="confirmation" />
- </div>
- </div>
- </li>
- </ul>
- </div>
- <div class="buttons-set">
- <p class="required"><?php echo __('* Required Fields') ?></p>
- <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>« </small><?php echo __('Back') ?></a></p>
- <button type="submit" title="<?php echo __('Save') ?>" class="button"><span><span><?php echo __('Save') ?></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') ?>",
- "<?php echo $this->getViewFileUrl('Magento_Customer::set-password.js') ?>",
- <?php if ($_dob->isEnabled()): ?>
- "<?php echo $this->getViewFileUrl('mage/validation/dob-rule.js') ?>",
- <?php endif ?>
- function() {
- $('#change-password').setPassword({
- currentPasswordId: '#current-password',
- passwordId: '#password',
- confirmationId: '#confirmation',
- passwordContainer: 'div.fieldset',
- showOnDefault: <?php echo $this->getCustomer()->getChangePassword() ? 'true' : 'false' ?>
- });
- $('#form-validate').validation({
- <?php if ($_dob->isEnabled()): ?>
- errorPlacement: function(error, element) {
- if (element.prop('id') === 'dob') {
- var dobElement = $('.customer-dob'),
- errorClass = error.prop('class');
- error.insertAfter(element.parent());
- dobElement.find('.validate-custom').addClass(errorClass)
- .after('<div class="' + errorClass + '"></div>');
- }
- else {
- error.insertAfter(element);
- }
- },
- ignore: ':hidden:not(#dob)'
- <?php endif ?>
- });
- });
- })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/form/forgotpassword.phtml b/app/design/frontend/magento_backup/Magento_Customer/form/forgotpassword.phtml
deleted file mode 100644
index c59d80ba863..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/form/forgotpassword.phtml
+++ /dev/null
@@ -1,62 +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)
- */
-?>
-<div class="page-title">
- <h1><?php echo __('Forgot Your Password?') ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<form action="<?php echo $this->getUrl('*/*/forgotpasswordpost') ?>" method="post" id="form-validate">
- <div class="fieldset">
- <h2 class="legend"><?php echo __('Retrieve your password here') ?></h2>
- <p><?php echo __("Please enter your email address. We'll send a link to reset your password.") ?></p>
- <ul class="form-list">
- <li>
- <label for="email_address" class="required"><em>*</em><?php echo __('Email Address') ?></label>
- <div class="input-box">
- <input type="text" name="email" alt="email" id="email_address" class="input-text" value="<?php echo $this->escapeHtml($this->getEmailValue()) ?>" data-validate="{required:true, 'validate-email':true}" />
- </div>
- </li>
- <?php echo $this->getChildHtml('form.additional.info'); ?>
- </ul>
- </div>
- <div class="buttons-set">
- <p class="required"><?php echo __('* Required Fields') ?></p>
- <p class="back-link"><a href="<?php echo $this->helper('Magento\Customer\Helper\Data')->getLoginUrl() ?>"><small>« </small><?php echo __('Back to Login') ?></a></p>
- <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() {
- $('#form-validate').validation();
- });
- })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/form/login.phtml b/app/design/frontend/magento_backup/Magento_Customer/form/login.phtml
deleted file mode 100644
index fa3b3e4e670..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/form/login.phtml
+++ /dev/null
@@ -1,99 +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
-/**
- * Customer login form template
- *
- * @see \Magento\Customer\Block\Form\Login
- */
-?>
-<div class="account-login">
- <div class="page-title">
- <h1><?php echo __('Login or Create an Account') ?></h1>
- </div>
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
- <?php /* Extensions placeholder */ ?>
- <?php echo $this->getChildHtml('customer.form.login.extra')?>
- <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
- <div class="col2-set">
- <div class="col-1 new-users">
- <div class="content">
- <h2><?php echo __('New Customers') ?></h2>
- <p><?php echo __('With your own account, you can check out faster, store multiple shipping addesses, see your shopping activity and more.') ?></p>
- </div>
- </div>
- <div class="col-2 registered-users">
- <div class="content">
- <h2><?php echo __('Registered Customers') ?></h2>
- <p><?php echo __('If you have an account with us, please log in.') ?></p>
- <ul class="form-list">
- <li>
- <label for="email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
- <div class="input-box">
- <input type="text" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" id="email" class="input-text" title="<?php echo __('Email Address') ?>" data-validate="{required:true, 'validate-email':true}" />
- </div>
- </li>
- <li>
- <label for="pass" class="required"><em>*</em><?php echo __('Password') ?></label>
- <div class="input-box">
- <input type="password" name="login[password]" class="input-text" id="pass" title="<?php echo __('Password') ?>" data-validate="{required:true, 'validate-password':true}" />
- </div>
- </li>
- <?php echo $this->getChildHtml('form.additional.info'); ?>
- </ul>
- <p class="required"><?php echo __('* Required Fields') ?></p>
- </div>
- </div>
- </div>
- <div class="col2-set">
- <div class="col-1 new-users">
- <div class="buttons-set">
- <button type="button" title="<?php echo __('Create an Account') ?>" class="button"><span><span><?php echo __('Create an Account') ?></span></span></button>
- </div>
- </div>
- <div class="col-2 registered-users">
- <div class="buttons-set">
- <a href="<?php echo $this->getForgotPasswordUrl() ?>" class="f-left"><?php echo __('Forgot Your Password?') ?></a>
- <button type="submit" class="button" title="<?php echo __('Login') ?>" name="send" id="send2"><span><span><?php echo __('Login') ?></span></span></button>
- </div>
- </div>
- </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() {
- $('#login-form .new-users button').on('click', function() {window.location='<?php echo $this->getCreateAccountUrl() ?>';});
- $('#login-form').validation();
- });
- })(jQuery);
- </script>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/form/mini.login.phtml b/app/design/frontend/magento_backup/Magento_Customer/form/mini.login.phtml
deleted file mode 100644
index be42c0ce0c8..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/form/mini.login.phtml
+++ /dev/null
@@ -1,40 +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)
- */
-?>
-<div class="block block-login">
- <div class="block-title">
- <strong><span><?php echo __('Login') ?></span></strong>
- </div>
- <form action="<?php echo $this->getPostActionUrl() ?>" method="post">
- <div class="block-content">
- <label for="mini-login"><?php echo __('Email:') ?></label><input type="text" name="login[username]" id="mini-login" class="input-text" />
- <label for="mini-password"><?php echo __('Password:') ?></label><input type="password" name="login[password]" id="mini-password" class="input-text" />
- <div class="actions">
- <button type="submit" class="button"><span><span><?php echo __('Login') ?></span></span></button>
- </div>
- </div>
- </form>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/form/newsletter.phtml b/app/design/frontend/magento_backup/Magento_Customer/form/newsletter.phtml
deleted file mode 100644
index 0c51597d8a3..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/form/newsletter.phtml
+++ /dev/null
@@ -1,48 +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)
- */
-?>
-<div class="page-title">
- <h1><?php echo __('Newsletter Subscription') ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<?php echo $this->getChildHtml('form_before')?>
-<form action="<?php echo $this->getAction() ?>" method="post" id="form-validate">
- <div class="fieldset">
- <?php echo $this->getBlockHtml('formkey')?>
- <h2 class="legend"><?php echo __('Newsletter Subscription') ?></h2>
- <ul class="form-list">
- <li class="control"><input type="checkbox" name="is_subscribed" id="subscription" value="1" title="<?php echo __('General Subscription') ?>"<?php if($this->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox" /><label for="subscription"><?php echo __('General Subscription') ?></label></li>
- <?php /* Extensions placeholder */ ?>
- <?php echo $this->getChildHtml('customer.form.newsletter.extra')?>
- </ul>
- </div>
- <div class="buttons-set">
- <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>« </small><?php echo __('Back') ?></a></p>
- <button type="submit" title="<?php echo __('Save') ?>" class="button"><span><span><?php echo __('Save') ?></span></span></button>
- </div>
-</form>
-<?php /* Extensions placeholder */ ?>
-<?php echo $this->getChildHtml('customer.form.newsletter.extra2')?>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/form/register.phtml b/app/design/frontend/magento_backup/Magento_Customer/form/register.phtml
deleted file mode 100644
index 3b5e2c03ae2..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/form/register.phtml
+++ /dev/null
@@ -1,222 +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
-/**
- * Create account form template
- *
- * @var $this \Magento\Customer\Block\Form\Register
- */
-?>
-<div class="account-create">
- <div class="page-title">
- <h1><?php echo __('Create an Account') ?></h1>
- </div>
- <?php echo $this->getChildHtml('form_fields_before')?>
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
- <?php /* Extensions placeholder */ ?>
- <?php echo $this->getChildHtml('customer.form.register.extra')?>
- <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="form-validate">
- <div class="fieldset">
- <input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
- <input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
- <h2 class="legend"><?php echo __('Personal Information') ?></h2>
- <ul class="form-list">
- <li class="fields">
- <?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($this->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
- </li>
- <li>
- <label for="email_address" class="required"><em>*</em><?php echo __('Email Address') ?></label>
- <div class="input-box">
- <input type="text" name="email" id="email_address" value="<?php echo $this->escapeHtml($this->getFormData()->getEmail()) ?>" title="<?php echo __('Email Address') ?>" class="input-text" data-validate="{required:true, 'validate-email':true}" />
- </div>
- </li>
- <?php if ($this->isNewsletterEnabled()): ?>
- <li class="control">
- <div class="input-box">
- <input type="checkbox" name="is_subscribed" title="<?php echo __('Sign Up for Newsletter') ?>" value="1" id="is_subscribed"<?php if($this->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox" />
- </div>
- <label for="is_subscribed"><?php echo __('Sign Up for Newsletter') ?></label>
- <?php /* Extensions placeholder */ ?>
- <?php echo $this->getChildHtml('customer.form.register.newsletter')?>
- </li>
- <?php endif ?>
- <?php $_dob = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob') ?>
- <?php if ($_dob->isEnabled()): ?>
- <li><?php echo $_dob->setDate($this->getFormData()->getDob())->toHtml() ?></li>
- <?php endif ?>
- <?php $_taxvat = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Taxvat') ?>
- <?php if ($_taxvat->isEnabled()): ?>
- <li><?php echo $_taxvat->setTaxvat($this->getFormData()->getTaxvat())->toHtml() ?></li>
- <?php endif ?>
- <?php $_gender = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Gender') ?>
- <?php if ($_gender->isEnabled()): ?>
- <li><?php echo $_gender->setGender($this->getFormData()->getGender())->toHtml() ?></li>
- <?php endif ?>
- </ul>
- </div>
- <?php if($this->getShowAddressFields()): ?>
- <div class="fieldset">
- <input type="hidden" name="create_address" value="1" />
- <h2 class="legend"><?php echo __('Address Information') ?></h2>
- <ul class="form-list">
- <li class="fields">
- <div class="field">
- <label for="company"><?php echo __('Company') ?></label>
- <div class="input-box">
- <input type="text" name="company" id="company" value="<?php echo $this->escapeHtml($this->getFormData()->getCompany()) ?>" title="<?php echo __('Company') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>" />
- </div>
- </div>
- <div class="field">
- <label for="telephone" class="required"><em>*</em><?php echo __('Telephone') ?></label>
- <div class="input-box">
- <input type="text" name="telephone" id="telephone" value="<?php echo $this->escapeHtml($this->getFormData()->getTelephone()) ?>" title="<?php echo __('Telephone') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>" />
- </div>
- </div>
- </li>
- <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
- <li class="wide">
- <label for="street_1" class="required"><em>*</em><?php echo __('Street Address') ?></label>
- <div class="input-box">
- <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet(1)) ?>" title="<?php echo __('Street Address') ?>" id="street_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="wide">
- <div class="input-box">
- <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet($_i)) ?>" title="<?php echo __('Street Address %1', $_i) ?>" id="street_<?php echo $_i ?>" class="input-text <?php echo $_streetValidationClass ?>" />
- </div>
- </li>
- <?php endfor; ?>
- <li class="fields">
- <div class="field">
- <label for="city" class="required"><em>*</em><?php echo __('City') ?></label>
- <div class="input-box">
- <input type="text" name="city" value="<?php echo $this->escapeHtml($this->getFormData()->getCity()) ?>" title="<?php echo __('City') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="city" />
- </div>
- </div>
- <div class="field">
- <label for="region_id" class="required"><em>*</em><?php echo __('State/Province') ?></label>
- <div class="input-box">
- <select id="region_id" name="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="region" name="region" value="<?php echo $this->escapeHtml($this->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="zip" class="required"><em>*</em><?php echo __('Zip/Postal Code') ?></label>
- <div class="input-box">
- <input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getFormData()->getPostcode()) ?>" title="<?php echo __('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" />
- </div>
- </div>
- <div class="field">
- <label for="country" class="required"><em>*</em><?php echo __('Country') ?></label>
- <div class="input-box">
- <?php echo $this->getCountryHtmlSelect() ?>
- </div>
- </div>
- </li>
- </ul>
- <input type="hidden" name="default_billing" value="1" />
- <input type="hidden" name="default_shipping" value="1" />
- </div>
- <?php endif; ?>
- <div class="fieldset">
- <h2 class="legend"><?php echo __('Login Information') ?></h2>
- <ul class="form-list">
- <li class="fields">
- <div class="field">
- <label for="password" class="required"><em>*</em><?php echo __('Password') ?></label>
- <div class="input-box">
- <input type="password" name="password" id="password" title="<?php echo __('Password') ?>" class="input-text" data-validate="{required:true, 'validate-password':true}" />
- </div>
- </div>
- <div class="field">
- <label for="confirmation" class="required"><em>*</em><?php echo __('Confirm Password') ?></label>
- <div class="input-box">
- <input type="password" name="confirmation" title="<?php echo __('Confirm Password') ?>" id="confirmation" class="input-text" data-validate="{required:true, equalTo:'#password'}" />
- </div>
- </div>
- </li>
- <?php echo $this->getChildHtml('form.additional.info'); ?>
- </ul>
- </div>
- <div class="buttons-set">
- <p class="required"><?php echo __('* Required Fields') ?></p>
- <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="back-link"><small>« </small><?php echo __('Back') ?></a></p>
- <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') ?>",
- "<?php echo $this->getViewFileUrl('Magento_Checkout::js/region-updater.js') ?>",
- <?php if ($_dob->isEnabled()): ?>
- "<?php echo $this->getViewFileUrl('mage/validation/dob-rule.js') ?>",
- <?php endif ?>
- function() {
- var dataForm = $('#form-validate').validation({
- <?php if ($_dob->isEnabled()): ?>
- errorPlacement: function(error, element) {
- if (element.prop('id') === 'dob') {
- var dobElement = $('.customer-dob'),
- errorClass = error.prop('class');
- error.insertAfter(element.parent());
- dobElement.find('.validate-custom').addClass(errorClass)
- .after('<div class="' + errorClass + '"></div>');
- }
- else {
- error.insertAfter(element);
- }
- },
- ignore: ':hidden:not(#dob)'
- <?php endif ?>
- });
- <?php if($this->getShowAddressFields()): ?>
- $('#country').regionUpdater({
- optionalRegionAllowed: <?php echo ($this->getConfig('general/region/display_all')? 'true' : 'false'); ?>,
- regionListId: '#region_id',
- regionInputId: '#region',
- postcodeId: '#zip',
- form: dataForm,
- 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) ?>
- });
- <?php endif; ?>
- });
- })(jQuery);
- </script>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/form/resetforgottenpassword.phtml b/app/design/frontend/magento_backup/Magento_Customer/form/resetforgottenpassword.phtml
deleted file mode 100644
index 470eafe25a2..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/form/resetforgottenpassword.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
- * @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 __('Create a new password'); ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml(); ?>
-<form action="<?php echo $this->getUrl('*/*/resetpasswordpost', array('_query' => array('id' => $this->getCustomerId(), 'token' => $this->getResetPasswordLinkToken()))); ?>" method="post" id="form-validate">
- <div class="fieldset" style="margin-top: 70px;">
- <ul class="form-list">
- <li class="fields">
- <div class="field">
- <label for="password" class="required"><em>*</em><?php echo __('New Password'); ?></label>
- <div class="input-box">
- <input type="password" class="input-text" name="password" id="password" data-validate="{required:true, 'validate-password':true}"/>
- </div>
- </div>
- <div class="field">
- <label for="confirmation" class="required"><em>*</em><?php echo __('Confirm New Password'); ?></label>
- <div class="input-box">
- <input type="password" class="input-text" name="confirmation" id="confirmation" data-validate="{required:true,equalTo:'#password'}"/>
- </div>
- </div>
- </li>
- </ul>
- </div>
- <div class="buttons-set">
- <p class="required"><?php echo __('* Required Fields'); ?></p>
- <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() {
- $('#form-validate').validation();
- });
- })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/js/checkout-balance.js b/app/design/frontend/magento_backup/Magento_Customer/js/checkout-balance.js
deleted file mode 100644
index b95e8ce5013..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/js/checkout-balance.js
+++ /dev/null
@@ -1,52 +0,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.
- *
- * @package EE_Checkout_Balance
- * @copyright Copyright (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.checkoutBalance', {
- /**
- * Initialize store credit events
- * @private
- */
- _create: function() {
- this.eventData = {
- price: this.options.balance,
- totalPrice: 0
- };
- this.element.on('change', $.proxy(function(e) {
- if ($(e.target).is(':checked')) {
- this.eventData.price = -1 * this.options.balance;
- } else {
- if (this.options.amountSubstracted) {
- this.eventData.price = this.options.usedAmount;
- this.options.amountSubstracted = false;
- } else {
- this.eventData.price = this.options.balance;
- }
- }
- this.element.trigger('updateCheckoutPrice', this.eventData);
- }, this));
- }
- });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account.xml
deleted file mode 100644
index 7fa2bdb7b59..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account.xml
+++ /dev/null
@@ -1,60 +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="Customer My Account (All Pages)" type="page">
- <referenceBlock name="root">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">2columns-left.phtml</argument>
- </action>
- </referenceBlock>
- <referenceContainer name="content">
- <container name="my.account.wrapper" label="My Account Wrapper" htmlTag="div" htmlClass="my-account"/>
- </referenceContainer>
- <referenceContainer name="left">
- <block class="Magento\Page\Block\Links" name="customer_account_navigation" before="-" template="Magento_Customer::account/navigation.phtml">
- <block class="Magento\Page\Block\Link\Current" name="customer-account-navigation-account-link">
- <arguments>
- <argument name="label" xsi:type="string">Account Dashboard</argument>
- <argument name="path" xsi:type="string">customer/account</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Link\Current" name="customer-account-navigation-account-edit-link">
- <arguments>
- <argument name="label" xsi:type="string">Account Information</argument>
- <argument name="path" xsi:type="string">customer/account/edit</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Link\Current" name="customer-account-navigation-address-link">
- <arguments>
- <argument name="label" xsi:type="string">Address Book</argument>
- <argument name="path" xsi:type="string">customer/address</argument>
- </arguments>
- </block>
- </block>
- <block class="Magento\Catalog\Block\Product\Compare\Sidebar" name="catalog.compare.sidebar" template="product/compare/sidebar.phtml"/>
- </referenceContainer>
- <move element="cart_sidebar" destination="left" before="catalog.compare.sidebar"/>
- <remove name="tags_popular"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_confirmation.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_confirmation.xml
deleted file mode 100644
index 11665c9f4d3..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_confirmation.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" label="Customer Account Confirmation" type="page">
- <referenceBlock name="root">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">1column.phtml</argument>
- </action>
- <action method="setHeaderTitle">
- <argument translate="true" name="title" xsi:type="string">Send confirmation link</argument>
- </action>
- </referenceBlock>
- <referenceContainer name="content">
- <block class="Magento\View\Block\Template" name="accountConfirmation" template="Magento_Customer::form/confirmation.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_create.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_create.xml
deleted file mode 100644
index 0ef9e4c454e..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_create.xml
+++ /dev/null
@@ -1,37 +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="root">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">1column.phtml</argument>
- </action>
- </referenceBlock>
- <referenceContainer name="content">
- <block class="Magento\Customer\Block\Form\Register" name="customer_form_register" template="form/register.phtml">
- <container name="customer.form.register.fields.before" as="form_fields_before" label="Form Fields Before" htmlTag="div" htmlClass="customer-form-before"/>
- </block>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_createpassword.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_createpassword.xml
deleted file mode 100644
index e0ac7ce426e..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_createpassword.xml
+++ /dev/null
@@ -1,43 +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="Reset a Password" type="page">
- <referenceBlock name="head">
- <action method="setTitle">
- <argument translate="true" name="title" xsi:type="string">Reset a Password</argument>
- </action>
- </referenceBlock>
- <referenceBlock name="root">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">1column.phtml</argument>
- </action>
- <action method="setHeaderTitle">
- <argument translate="true" name="title" xsi:type="string">Reset a Password</argument>
- </action>
- </referenceBlock>
- <referenceContainer name="content">
- <block class="Magento\Customer\Block\Account\Resetpassword" name="resetPassword" template="form/resetforgottenpassword.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_edit.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_edit.xml
deleted file mode 100644
index 0afcc479a77..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_edit.xml
+++ /dev/null
@@ -1,36 +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="customer_account"/>
- <referenceBlock name="root">
- <action method="setHeaderTitle">
- <argument translate="true" name="title" xsi:type="string">Edit Account Info</argument>
- </action>
- </referenceBlock>
- <referenceContainer name="my.account.wrapper">
- <block class="Magento\Customer\Block\Form\Edit" name="customer_edit" template="form/edit.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_forgotpassword.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_forgotpassword.xml
deleted file mode 100644
index 7edcb2693b7..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_forgotpassword.xml
+++ /dev/null
@@ -1,43 +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">
- <action method="setTitle">
- <argument translate="true" name="title" xsi:type="string">Forgot Your Password</argument>
- </action>
- </referenceBlock>
- <referenceBlock name="root">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">1column.phtml</argument>
- </action>
- <action method="setHeaderTitle">
- <argument translate="true" name="title" xsi:type="string">Password forgotten</argument>
- </action>
- </referenceBlock>
- <referenceContainer name="content">
- <block class="Magento\Customer\Block\Account\Forgotpassword" name="forgotPassword" template="form/forgotpassword.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_index.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_index.xml
deleted file mode 100644
index e817f42626a..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_index.xml
+++ /dev/null
@@ -1,42 +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="Customer My Account Dashboard" type="page">
- <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\Customer\Block\Account\Dashboard" name="customer_account_dashboard" template="account/dashboard.phtml">
- <block class="Magento\Customer\Block\Account\Dashboard\Hello" name="customer_account_dashboard_hello" as="hello" template="account/dashboard/hello.phtml"/>
- <block class="Magento\View\Block\Template" name="customer_account_dashboard_top" as="top"/>
- <block class="Magento\Customer\Block\Account\Dashboard\Info" name="customer_account_dashboard_info" as="info" template="account/dashboard/info.phtml"/>
- <block class="Magento\Customer\Block\Account\Dashboard\Newsletter" name="customer_account_dashboard_newsletter" as="newsletter" template="account/dashboard/newsletter.phtml"/>
- <block class="Magento\Customer\Block\Account\Dashboard\Address" name="customer_account_dashboard_address" as="address" template="account/dashboard/address.phtml"/>
- </block>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_login.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_login.xml
deleted file mode 100644
index 79c1494f7cc..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_login.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)
- */
--->
-<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>
- </action>
- </referenceBlock>
- <referenceContainer name="content">
- <block class="Magento\Customer\Block\Form\Login" name="customer_form_login" template="form/login.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_logoutsuccess.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_logoutsuccess.xml
deleted file mode 100644
index f92de06af03..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_account_logoutsuccess.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)
- */
--->
-<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>
- </action>
- </referenceBlock>
- <referenceContainer name="content">
- <block class="Magento\View\Block\Template" name="customer_logout" template="Magento_Customer::logout.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_address_form.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_address_form.xml
deleted file mode 100644
index 25b2a9eab90..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_address_form.xml
+++ /dev/null
@@ -1,31 +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="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"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_address_index.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_address_index.xml
deleted file mode 100644
index a5e18be8422..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/customer_address_index.xml
+++ /dev/null
@@ -1,31 +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="customer_account"/>
- <referenceContainer name="my.account.wrapper">
- <block class="Magento\Customer\Block\Address\Book" name="address_book" template="address/book.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/default.xml b/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/default.xml
deleted file mode 100644
index 716f6953c98..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/layout/override/base/default.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)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="top.links">
- <block class="Magento\Customer\Block\Account\Link" name="my-account-link">
- <arguments>
- <argument name="label" xsi:type="string">My Account</argument>
- </arguments>
- </block>
- <block class="Magento\Customer\Block\Account\AuthorizationLink" name="authorization-link" after="onepage-checkout-link"/>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/logout.phtml b/app/design/frontend/magento_backup/Magento_Customer/logout.phtml
deleted file mode 100644
index 5cdd57b3d0c..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/logout.phtml
+++ /dev/null
@@ -1,35 +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)
- */
-?>
-<div class="page-title">
- <h1><?php echo __('You are now logged out') ?></h1>
-</div>
-<p><?php echo __('You have logged out and will be redirected to our homepage in 5 seconds.') ?></p>
-<script type="text/javascript">
- (function($){
- $($.mage.redirect("<?php echo $this->getUrl() ?>","assign",5000));
- })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/set-password.js b/app/design/frontend/magento_backup/Magento_Customer/set-password.js
deleted file mode 100644
index 8f4404c5ac1..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/set-password.js
+++ /dev/null
@@ -1,58 +0,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.
- *
- * @category mage customer view
- * @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 expr:true*/
-(function ($) {
- $.widget('mage.setPassword', {
- _create: function() {
- this.element.on('change', $.proxy(function(event) {
- $(event.target).is(':checked') ? this._showPassword() : this._hidePassword();
- }, this));
- this.options.showOnDefault && this._showPassword();
- },
-
- /**
- * Hide password input fields
- * @private
- */
- _hidePassword: function() {
- $(this.options.currentPasswordId).removeAttr('data-validate')
- .parents(this.options.passwordContainer).hide();
- $(this.options.passwordId).removeAttr('data-validate');
- $(this.options.confirmationId).removeAttr('data-validate');
- },
-
- /**
- * Show password input fields
- * @private
- */
- _showPassword: function() {
- $(this.options.currentPasswordId).attr('data-validate', '{required:true}')
- .parents(this.options.passwordContainer).show();
- $(this.options.passwordId).attr('data-validate', "{required:true, 'validate-password':true}");
- $(this.options.confirmationId).attr('data-validate',
- '{required:true, equalTo:"' + this.options.passwordId + '"}');
- }
- });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Customer/widget/dob.phtml b/app/design/frontend/magento_backup/Magento_Customer/widget/dob.phtml
deleted file mode 100644
index 3ace2f5a707..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/widget/dob.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
- * @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)
- */
-
-/**
-USAGE:
-
-Simple:
-
-<?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob')
- ->setDate($this->getCustomer()->getDob())
- ->toHtml() ?>
-
-For checkout/onepage/billing.phtml:
-
-<?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob')
- ->setDate($this->getCustomer()->getDob())
- ->setFieldIdFormat('billing:%s')
- ->setFieldNameFormat('billing[%s]')
- ->toHtml() ?>
-
-NOTE: Regarding styles - if we leave it this way, we'll move it to boxes.css
- Alternatively we could calculate widths automatically using block input parameters.
-*/
-
-/**
- * @see \Magento\Customer\Block\Widget\Dob
- */
-?>
-<label for="<?php echo $this->getFieldId('month')?>"<?php if ($this->isRequired()) echo ' class="required"' ?>><?php if ($this->isRequired()) echo '<em>*</em>' ?><?php echo __('Date of Birth') ?></label>
-<div class="input-box customer-dob">
-<?php
- $this->setDateInput('d',
- '<div class="dob-day">
- <input type="text" id="' . $this->getFieldId('day') . '" name="' . $this->getFieldName('day') . '" value="' . $this->getDay() . '" title="' . __('Day') . '" class="input-text validate-custom" ' . $this->getFieldParams() . ' />
- <label for="' . $this->getFieldId('day') . '">' . __('Day (DD)') . '</label>
- </div>'
- );
-
- $this->setDateInput('m',
- '<div class="dob-month">
- <input type="text" id="' . $this->getFieldId('month') . '" name="' . $this->getFieldName('month') . '" value="' . $this->getMonth() . '" title="' . __('Month') . '" class="input-text validate-custom" ' . $this->getFieldParams() . ' />
- <label for="' . $this->getFieldId('month') . '">' . __('Month (MM)') . '</label>
- </div>'
- );
-
- $this->setDateInput('y',
- '<div class="dob-year">
- <input type="text" id="' . $this->getFieldId('year') . '" name="' . $this->getFieldName('year') . '" value="' . $this->getYear() . '" title="' . __('Year') . '" class="input-text validate-custom" ' . $this->getFieldParams() . ' />
- <label for="' . $this->getFieldId('year') . '">' . __('Year (YYYY)') . '</label>
- </div>'
- );
-?>
- <?php echo $this->getSortedDateInputs() ?>
- <div class="dob-full" style="display:none;">
- <input type="hidden" id="<?php echo $this->getFieldId('dob')?>" name="<?php echo $this->getFieldName('dob')?>" data-validate="{'validate-dob': ['.dob-day', '.dob-month', '.dob-year', <?php echo $this->isRequired() ? 'true' : 'false' ?>]}"/>
- </div>
-
- <div class="validation-advice" style="display:none;"></div>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/widget/gender.phtml b/app/design/frontend/magento_backup/Magento_Customer/widget/gender.phtml
deleted file mode 100644
index 9ea8f5f6d42..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/widget/gender.phtml
+++ /dev/null
@@ -1,36 +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)
- */
-?>
-<label for="<?php echo $this->getFieldId('gender')?>"<?php if ($this->isRequired()) echo ' class="required"' ?>><?php if ($this->isRequired()) echo '<em>*</em>' ?><?php echo __('Gender') ?></label>
-<div class="input-box">
- <select id="<?php echo $this->getFieldId('gender')?>" name="<?php echo $this->getFieldName('gender')?>" title="<?php echo __('Gender') ?>"<?php if ($this->isRequired()):?> class="validate-select" data-validate="{required:true}"<?php endif; ?> <?php echo $this->getFieldParams() ?>>
- <?php $options = $this->getGenderOptions(); ?>
- <?php $value = $this->getGender();?>
- <?php foreach ($options as $option):?>
- <option value="<?php echo $option['value'] ?>"<?php if ($option['value'] == $value) echo ' selected="selected"' ?>><?php echo $option['label'] ?></option>
- <?php endforeach;?>
- </select>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/widget/name.phtml b/app/design/frontend/magento_backup/Magento_Customer/widget/name.phtml
deleted file mode 100644
index a96c443bb39..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/widget/name.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
- * @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)
- */
-
-/**
-USAGE:
-
-Simple:
-
-<?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')
- ->setObject($this->getAddress())
- ->toHtml() ?>
-
-For checkout/onepage/shipping.phtml:
-
-<?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')
- ->setObject($this->getAddress())
- ->setFieldIdFormat('shipping:%s')
- ->setFieldNameFormat('shipping[%s]')
- ->setFieldParams('onchange="shipping.setSameAsBilling(false);"')
- ->toHtml() ?>
-*/
-/* @var $this \Magento\Customer\Block\Widget\Name */
-?>
-<div class="<?php echo $this->getContainerClassName()?>">
-<?php if ($this->showPrefix()): ?>
- <div class="field name-prefix">
- <label for="<?php echo $this->getFieldId('prefix')?>"<?php if ($this->isPrefixRequired()) echo ' class="required"' ?>><?php if ($this->isPrefixRequired()) echo '<em>*</em>' ?><?php echo $this->getStoreLabel('prefix') ?></label>
- <div class="input-box">
- <?php if ($this->getPrefixOptions() === false): ?>
- <input type="text" id="<?php echo $this->getFieldId('prefix')?>" name="<?php echo $this->getFieldName('prefix')?>" value="<?php echo $this->escapeHtml($this->getObject()->getPrefix()) ?>" title="<?php echo $this->getStoreLabel('prefix') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('prefix') ?>" <?php echo $this->getFieldParams() ?> <?php if ($this->isPrefixRequired()) echo ' data-validate="{required:true}"' ?> />
- <?php else: ?>
- <select id="<?php echo $this->getFieldId('prefix')?>" name="<?php echo $this->getFieldName('prefix')?>" title="<?php echo $this->getStoreLabel('prefix') ?>" class="<?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('prefix') ?>" <?php echo $this->getFieldParams() ?> <?php if ($this->isPrefixRequired()) echo ' data-validate="{required:true}"' ?> >
- <?php foreach ($this->getPrefixOptions() as $_option): ?>
- <option value="<?php echo $_option?>"<?php if ($this->getObject()->getPrefix()==$_option):?> selected="selected"<?php endif; ?>><?php echo __($_option)?></option>
- <?php endforeach; ?>
- </select>
- <?php endif; ?>
- </div>
- </div>
-<?php endif; ?>
- <div class="field name-firstname">
- <label for="<?php echo $this->getFieldId('firstname')?>" class="required"><em>*</em><?php echo $this->getStoreLabel('firstname') ?></label>
- <div class="input-box">
- <input type="text" id="<?php echo $this->getFieldId('firstname')?>" name="<?php echo $this->getFieldName('firstname')?>" value="<?php echo $this->escapeHtml($this->getObject()->getFirstname()) ?>" title="<?php echo $this->getStoreLabel('firstname') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('firstname') ?>" <?php echo $this->getFieldParams() ?> <?php if ($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('firstname') == 'required-entry') echo ' data-validate="{required:true}"' ?> />
- </div>
- </div>
-<?php if ($this->showMiddlename()): ?>
-<?php $isMiddlenameRequired = $this->isMiddlenameRequired(); ?>
- <div class="field name-middlename">
- <label for="<?php echo $this->getFieldId('middlename')?>"<?php echo $isMiddlenameRequired ? ' class="required"' : '' ?>><?php echo $isMiddlenameRequired ? '<em>*</em>' : '' ?><?php echo $this->getStoreLabel('middlename') ?></label>
- <div class="input-box">
- <input type="text" id="<?php echo $this->getFieldId('middlename')?>" name="<?php echo $this->getFieldName('middlename')?>" value="<?php echo $this->escapeHtml($this->getObject()->getMiddlename()) ?>" title="<?php echo $this->getStoreLabel('middlename') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('middlename') ?>" <?php echo $this->getFieldParams() ?> <?php echo $isMiddlenameRequired ? ' data-validate="{required:true}"' : '' ?> />
- </div>
- </div>
-<?php endif; ?>
- <div class="field name-lastname">
- <label for="<?php echo $this->getFieldId('lastname')?>" class="required"><em>*</em><?php echo $this->getStoreLabel('lastname') ?></label>
- <div class="input-box">
- <input type="text" id="<?php echo $this->getFieldId('lastname')?>" name="<?php echo $this->getFieldName('lastname')?>" value="<?php echo $this->escapeHtml($this->getObject()->getLastname()) ?>" title="<?php echo $this->getStoreLabel('lastname') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('lastname') ?>" <?php echo $this->getFieldParams() ?> <?php if ($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('lastname') == 'required-entry') echo ' data-validate="{required:true}"' ?> />
- </div>
- </div>
-<?php if ($this->showSuffix()): ?>
- <div class="field name-suffix">
- <label for="<?php echo $this->getFieldId('suffix')?>"<?php if ($this->isSuffixRequired()) echo ' class="required"' ?>><?php if ($this->isSuffixRequired()) echo '<em>*</em>' ?><?php echo $this->getStoreLabel('suffix') ?></label>
- <div class="input-box">
- <?php if ($this->getSuffixOptions() === false): ?>
- <input type="text" id="<?php echo $this->getFieldId('suffix')?>" name="<?php echo $this->getFieldName('suffix')?>" value="<?php echo $this->escapeHtml($this->getObject()->getSuffix()) ?>" title="<?php echo $this->getStoreLabel('suffix') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('suffix') ?>" <?php echo $this->getFieldParams() ?> <?php if ($this->isSuffixRequired()) echo ' data-validate="{required:true}"' ?> />
- <?php else: ?>
- <select id="<?php echo $this->getFieldId('suffix')?>" name="<?php echo $this->getFieldName('suffix')?>" title="<?php echo $this->getStoreLabel('suffix') ?>" class="<?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('suffix') ?>" <?php echo $this->getFieldParams() ?> <?php if ($this->isSuffixRequired()) echo ' data-validate="{required:true}"' ?>>
- <?php foreach ($this->getSuffixOptions() as $_option): ?>
- <option value="<?php echo $_option?>"<?php if ($this->getObject()->getSuffix()==$_option):?> selected="selected"<?php endif; ?>><?php echo __($_option)?></option>
- <?php endforeach; ?>
- </select>
- <?php endif; ?>
- </div>
- </div>
-<?php endif; ?>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Customer/widget/taxvat.phtml b/app/design/frontend/magento_backup/Magento_Customer/widget/taxvat.phtml
deleted file mode 100644
index 94af916168c..00000000000
--- a/app/design/frontend/magento_backup/Magento_Customer/widget/taxvat.phtml
+++ /dev/null
@@ -1,30 +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)
- */
-?>
-<label for="<?php echo $this->getFieldId('taxvat')?>"<?php if ($this->isRequired()) echo ' class="required"' ?>><?php if ($this->isRequired()) echo '<em>*</em>' ?><?php echo __('Tax/VAT number') ?></label>
-<div class="input-box">
- <input type="text" id="<?php echo $this->getFieldId('taxvat')?>" name="<?php echo $this->getFieldName('taxvat')?>" value="<?php echo $this->escapeHtml($this->getTaxvat()) ?>" title="<?php echo __('Tax/VAT number') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('taxvat') ?>" <?php echo $this->getFieldParams() ?> <?php if ($this->isRequired()) echo ' data-validate="{required:true}"' ?> />
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Directory/currency.phtml b/app/design/frontend/magento_backup/Magento_Directory/currency.phtml
deleted file mode 100644
index 93bda8e1fe4..00000000000
--- a/app/design/frontend/magento_backup/Magento_Directory/currency.phtml
+++ /dev/null
@@ -1,49 +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
-/**
- * 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
deleted file mode 100644
index 8fa890d6df2..00000000000
--- a/app/design/frontend/magento_backup/Magento_Directory/currency/switch.phtml
+++ /dev/null
@@ -1,31 +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)
- */
-?>
-<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/design/frontend/magento_backup/Magento_Directory/js/optional_zip_countries.phtml b/app/design/frontend/magento_backup/Magento_Directory/js/optional_zip_countries.phtml
deleted file mode 100644
index 357a8e3afa6..00000000000
--- a/app/design/frontend/magento_backup/Magento_Directory/js/optional_zip_countries.phtml
+++ /dev/null
@@ -1,34 +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
-/**
- * JS block for including Countries with Optional Zip
- *
- * @see \Magento\View\Block\Template
- */
-?>
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
deleted file mode 100644
index 9d64de3d1e7..00000000000
--- a/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalog_category_view.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="left">
- <block class="Magento\Directory\Block\Currency" name="currency" before="catalog.leftnav" template="currency.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_advanced_index.xml b/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_advanced_index.xml
deleted file mode 100644
index b0d82dc10a0..00000000000
--- a/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_advanced_index.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="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
deleted file mode 100644
index 7ea5d0eb50c..00000000000
--- a/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_advanced_result.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="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
deleted file mode 100644
index 4c71dc1b48a..00000000000
--- a/app/design/frontend/magento_backup/Magento_Directory/layout/override/catalogsearch_result_index.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="left">
- <block class="Magento\Directory\Block\Currency" name="currency" before="-" template="currency.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_GiftMessage/gift-options.js b/app/design/frontend/magento_backup/Magento_GiftMessage/gift-options.js
deleted file mode 100644
index 6f9b6cc2316..00000000000
--- a/app/design/frontend/magento_backup/Magento_GiftMessage/gift-options.js
+++ /dev/null
@@ -1,95 +0,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.
- *
- * @category gift message options toggle
- * @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.giftOptions', {
- options: {
- mageError: 'mage-error',
- noDisplay: 'no-display',
- requiredEntry: 'required-entry'
- },
-
- /**
- * Initial toggle of the various gift options after widget instantiation.
- * @private
- */
- _init: function() {
- this._toggleVisibility();
- },
-
- /**
- * Bind a click handler to the widget's context element.
- * @private
- */
- _create: function() {
- this.element.on('click', $.proxy(this._toggleVisibility, this));
- $(this.element.data('selector').id).find('.giftmessage-area')
- .on('change', $.proxy(this._toggleRequired, this));
- },
-
- /**
- * Toggle the visibility of the widget's context element's selector(s).
- * @private
- * @param event {Object} - Click event. Target is a checkbox.
- */
- _toggleVisibility: function(event) {
- var checkbox = event ? $(event.target) : this.element,
- container = $(checkbox.data('selector').id);
- if (checkbox.is(':checked')) {
- container.show()
- .find('.giftmessage-area:not(:visible)').each(function(x, element) {
- if ($(element).val().length > 0) {
- $(element).change();
- container.find('a').click();
- }
- });
- } else {
- var _this = this;
- container.hide()
- .find('.input-text:not(.giftmessage-area)').each(function(x, element) {
- $(element).val(element.defaultValue).removeClass(_this.options.mageError)
- .next('div.' + _this.options.mageError).remove();
- }).end()
- .find('.giftmessage-area').val('').change().end()
- .find('.select').val('').change().end()
- .find('.checkbox:checked').prop('checked', false).click().prop('checked', false).end()
- .find('.price-box').addClass(this.options.noDisplay).end();
- }
- },
-
- /**
- * Make the From and To input fields required if a gift message has been written.
- * @private
- * @param event {Object} - Change event. Target is a textarea.
- */
- _toggleRequired: function(event) {
- var textArea = $(event.target),
- length = textArea.val().length;
- textArea.closest('li').prev('.fields')
- .find('.input-text').toggleClass(this.options.requiredEntry, length > 0);
- }
- });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_GiftMessage/inline.phtml b/app/design/frontend/magento_backup/Magento_GiftMessage/inline.phtml
deleted file mode 100644
index b581f23b0ff..00000000000
--- a/app/design/frontend/magento_backup/Magento_GiftMessage/inline.phtml
+++ /dev/null
@@ -1,252 +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 if ($this->isMessagesAvailable() || $this->isItemsAvailable()): ?>
-<?php switch ($this->getType()): ?>
-<?php case 'onepage_checkout': ?>
- <div class="gift-messages">
- <h3><?php echo __('Does your order include gift items?'); ?></h3>
- <p>
- <input type="checkbox" name="allow_gift_messages" id="allow_gift_messages" value="1" data-selector='{"id":"#allow-gift-message-container"}'<?php if($this->getItemsHasMesssages() || $this->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
- <label for="allow_gift_messages"><?php echo __('Add gift options.') ?></label>
- </p>
- </div>
- <div class="gift-messages-form" id="allow-gift-message-container">
- <div class="inner-box">
- <?php if ($this->isMessagesAvailable()): ?>
- <h4><?php echo __('Gift Options for the Entire Order'); ?></h4>
- <p>
- <input type="checkbox" name="allow_gift_messages_for_order" id="allow_gift_messages_for_order" value="1" data-selector='{"id":"#allow-gift-messages-for-order-container"}'<?php if($this->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
- <label for="allow_gift_messages_for_order"><?php echo __('Add gift options for the Entire Order') ?></label>
- </p>
- <div class="allow-gift-messages-for-order-container" id="allow-gift-messages-for-order-container" style="display:none">
- <p><?php echo __('You can leave this box empty if you don\'t want to add a gift message for the whole order.') ?></p>
- <input type="hidden" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][type]" value="quote" />
- <ul class="form-list">
- <li class="fields">
- <div class="field">
- <label for="gift-message-whole-from"><?php echo __('From') ?></label>
- <div class="input-box">
- <input type="text" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][from]" id="gift-message-whole-from" title="<?php echo __('From') ?>" value="<?php echo $this->getEscaped($this->getMessage()->getSender(), $this->getDefaultFrom()) ?>" class="input-text" />
- </div>
- </div>
- <div class="field">
- <label for="gift-message-whole-to"><?php echo __('To') ?></label>
- <div class="input-box">
- <input type="text" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][to]" id="gift-message-whole-to" title="<?php echo __('To') ?>" value="<?php echo $this->getEscaped($this->getMessage()->getRecipient(), $this->getDefaultTo()) ?>" class="input-text" />
- </div>
- </div>
- </li>
- <li class="wide">
- <label for="gift-message-whole-message"><?php echo __('Message') ?></label>
- <div class="input-box">
- <textarea id="gift-message-whole-message" class="input-text giftmessage-area" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][message]" title="<?php echo __('Message') ?>" rows="5" cols="10"><?php echo $this->getEscaped($this->getMessage()->getMessage()) ?></textarea>
- </div>
- </li>
- </ul>
- </div>
- <?php endif; ?>
- <?php if($this->isItemsAvailable()): ?>
- <h4><?php echo __('Gift Options for Individual Items'); ?></h4>
- <p>
- <input type="checkbox" name="allow_gift_messages_for_items" id="allow_gift_messages_for_items" value="1" data-selector='{"id":"#allow-gift-messages-for-items-container"}'<?php if($this->getItemsHasMesssages()): ?> checked="checked"<?php endif; ?> class="checkbox" />
- <label for="allow_gift_messages_for_items"><?php echo __('Add gift options for Individual Items') ?></label>
- </p>
- <div id="allow-gift-messages-for-items-container">
- <p><?php echo __('You can leave this box empty if you don\'t want to add a gift message to this item.') ?></p>
- <ol>
- <?php foreach($this->getItems() as $_index=>$_item): ?>
- <?php $_product=$_item->getProduct() ?>
- <li class="item">
- <div class="product-img-box">
- <p class="product-image">
- <img src="<?php echo $this->getThumbnailUrl($_product) ?>" width="<?php echo $this->getThumbnailSize()?>" height="<?php echo $this->getThumbnailSize()?>" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>" />
- </p>
- <p class="number"><?php echo __('Item %1 of %2', $_index+1, $this->countItems()) ?></p>
- </div>
- <div class="details">
- <div class="f-fix">
- <h5 class="product-name"><?php echo $this->escapeHtml($_product->getName()) ?></h5>
- <input type="hidden" name="giftmessage[<?php echo $_item->getId() ?>][type]" value="quote_item" />
- <ul class="form-list">
- <li class="fields">
- <div class="field">
- <label for="gift-message-<?php echo $_item->getId() ?>-from"><?php echo __('From') ?></label>
- <div class="input-box">
- <input type="text" name="giftmessage[<?php echo $_item->getId() ?>][from]" id="gift-message-<?php echo $_item->getId() ?>-from" title="<?php echo __('From') ?>" value="<?php echo $this->getEscaped($this->getMessage($_item)->getSender(), $this->getDefaultFrom()) ?>" class="input-text" />
- </div>
- </div>
- <div class="field">
- <label for="gift-message-<?php echo $_item->getId() ?>-to"><?php echo __('To') ?></label>
- <div class="input-box">
- <input type="text" name="giftmessage[<?php echo $_item->getId() ?>][to]" id="gift-message-<?php echo $_item->getId() ?>-to" title="<?php echo __('To') ?>" value="<?php echo $this->getEscaped($this->getMessage($_item)->getRecipient(), $this->getDefaultTo()) ?>" class="input-text" />
- </div>
- </div>
- </li>
- <li class="wide">
- <label for="gift-message-<?php echo $_item->getId() ?>-message"><?php echo __('Message') ?></label>
- <div class="input-box">
- <textarea id="gift-message-<?php echo $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[<?php echo $_item->getId() ?>][message]" title="<?php echo __('Message') ?>" rows="5" cols="40"><?php echo $this->getEscaped($this->getMessage($_item)->getMessage()) ?></textarea>
- </div>
- </li>
- </ul>
- </div>
- </div>
- </li>
- <?php endforeach; ?>
- </ol>
- </div>
- <?php endif; ?>
- </div>
- </div>
- <script type="text/javascript">
- head.js("<?php echo $this->getViewFileUrl('Magento_GiftMessage::gift-options.js')?>", function() {
- jQuery('#allow_gift_messages')
- .add('#allow_gift_messages_for_order')
- .add('#allow_gift_messages_for_items').giftOptions();
- });
- </script>
-<?php break; ?>
-<?php case 'multishipping_adress_checkbox': ?>
-
-<?php break; ?>
-<?php case 'multishipping_address': ?>
- <div class="gift-messages">
- <h3><?php echo __('Does your order include gift items?'); ?></h3>
- <p>
- <input type="checkbox" name="allow_gift_messages_<?php echo $this->getEntity()->getId() ?>" id="allow_gift_messages_<?php echo $this->getEntity()->getId() ?>" value="1" data-selector='{"id":"#allow-gift-message-container-<?php echo $this->getEntity()->getId() ?>"}'<?php if($this->getItemsHasMesssages() || $this->getEntityHasMessage()): ?> checked="checked"<?php endif ?> class="checkbox" />
- <label for="allow_gift_messages_<?php echo $this->getEntity()->getId() ?>"><?php echo __('Add gift options') ?></label>
- </p>
- </div>
- <div class="gift-messages-form" id="allow-gift-message-container-<?php echo $this->getEntity()->getId() ?>">
- <div class="inner-box">
- <?php if ($this->isMessagesAvailable()): ?>
- <h4><?php echo __('Gift Options for this address'); ?></h4>
- <p>
- <input type="checkbox" name="allow_gift_messages_for_order_<?php echo $this->getEntity()->getId() ?>" id="allow_gift_messages_for_order_<?php echo $this->getEntity()->getId() ?>" value="1" data-selector='{"id":"#allow-gift-messages-for-order-container-<?php echo $this->getEntity()->getId() ?>"}'<?php if($this->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
- <label for="allow_gift_messages_for_order"><?php echo __('Add gift options for the Entire Order') ?></label>
- </p>
- <div id="allow-gift-messages-for-order-container-<?php echo $this->getEntity()->getId() ?>">
- <p><?php echo __('You can leave this box empty if you don\'t want to add a gift message for this address.') ?></p>
- <input type="hidden" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][type]" value="quote_address" />
- <ul class="form-list">
- <li class="fields">
- <div class="field">
- <label for="gift-message-<?php echo $this->getEntity()->getId() ?>-from"><?php echo __('From') ?></label>
- <div class="input-box">
- <input type="text" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][from]" id="gift-message-<?php echo $this->getEntity()->getId() ?>-from" title="<?php echo __('From') ?>" value="<?php echo $this->getEscaped($this->getMessage()->getSender(), $this->getDefaultFrom()) ?>" class="input-text" />
- </div>
- </div>
- <div class="field">
- <label for="gift-message-<?php echo $this->getEntity()->getId() ?>-to"><?php echo __('To') ?></label>
- <div class="input-box">
- <input type="text" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][to]" id="gift-message-<?php echo $this->getEntity()->getId() ?>-to" title="<?php echo __('To') ?>" value="<?php echo $this->getEscaped($this->getMessage()->getRecipient(), $this->getDefaultTo()) ?>" class="input-text" />
- </div>
- </div>
- </li>
- <li class="wide">
- <label for="gift-message-<?php echo $this->getEntity()->getId() ?>-message"><?php echo __('Message') ?></label>
- <div class="input-box">
- <textarea id="gift-message-<?php echo $this->getEntity()->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[<?php echo $this->getEntity()->getId() ?>][message]" title="<?php echo __('Message') ?>" rows="5" cols="40"><?php echo $this->getEscaped($this->getMessage()->getMessage()) ?></textarea>
- </div>
- </li>
- </ul>
- </div>
- <?php endif; ?>
- <?php if($this->isItemsAvailable()): ?>
- <h4><?php echo __('Gift Options for Individual Items'); ?></h4>
- <p>
- <input type="checkbox" name="allow_gift_messages_for_items_<?php echo $this->getEntity()->getId() ?>" id="allow_gift_messages_for_items_<?php echo $this->getEntity()->getId() ?>" value="1" data-selector='{"id":"#allow-gift-messages-for-items-container-<?php echo $this->getEntity()->getId() ?>"}'<?php if($this->getItemsHasMesssages()): ?> checked="checked"<?php endif; ?> class="checkbox" />
- <label for="allow_gift_messages_for_items_<?php echo $this->getEntity()->getId() ?>"><?php echo __('Add gift options for Individual Items') ?></label>
- </p>
- <div id="allow-gift-messages-for-items-container-<?php echo $this->getEntity()->getId() ?>">
- <p><?php echo __('You can leave this box empty if you don\'t want to add a gift message to this item.') ?></p>
- <ol>
- <?php foreach($this->getItems() as $_index=>$_item): ?>
- <?php $_product=$_item->getProduct() ?>
- <li class="item">
- <div class="product-img-box">
- <p class="product-image"><img src="<?php echo $this->getThumbnailUrl($_product) ?>" width="<?php echo $this->getThumbnailSize()?>" height="<?php echo $this->getThumbnailSize()?>" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>" /></p>
- <p class="number"><?php echo __('Item %1 of %2', $_index+1, $this->countItems()) ?></p>
- </div>
- <div class="details">
- <div class="f-fix">
- <input type="hidden" name="giftmessage[<?php echo $_item->getId() ?>][type]" value="quote_address_item" />
- <input type="hidden" name="giftmessage[<?php echo $_item->getId() ?>][address]" value="<?php echo $this->getEntity()->getId()?>" />
- <h5 class="product-name"><?php echo $this->escapeHtml($_product->getName()) ?></h5>
- <ul class="form-list">
- <li class="fields">
- <div class="field">
- <label for="gift-message-<?php echo $_item->getId() ?>-from"><?php echo __('From') ?></label>
- <div class="input-box">
- <input type="text" name="giftmessage[<?php echo $_item->getId() ?>][from]" id="gift-message-<?php echo $_item->getId() ?>-from" title="<?php echo __('From') ?>" value="<?php echo $this->getEscaped($this->getMessage($_item)->getSender(), $this->getDefaultFrom()) ?>" class="input-text" />
- </div>
- </div>
- <div class="field">
- <label for="gift-message-<?php echo $_item->getId() ?>-to"><?php echo __('To') ?></label>
- <div class="input-box">
- <input type="text" name="giftmessage[<?php echo $_item->getId() ?>][to]" id="gift-message-<?php echo $_item->getId() ?>-to" title="<?php echo __('To') ?>" value="<?php echo $this->getEscaped($this->getMessage($_item)->getRecipient(), $this->getDefaultTo()) ?>" class="input-text" />
- </div>
- </div>
- </li>
- <li class="wide">
- <label for="gift-message-<?php echo $_item->getId() ?>-message"><?php echo __('Message') ?></label>
- <div class="input-box">
- <textarea id="gift-message-<?php echo $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[<?php echo $_item->getId() ?>][message]" title="<?php echo __('Message') ?>" rows="5" cols="10"><?php echo $this->getEscaped($this->getMessage($_item)->getMessage()) ?></textarea>
- </div>
- </li>
- </ul>
- </div>
- </div>
- </li>
- <?php endforeach; ?>
- </ol>
- </div>
- <?php endif; ?>
- </div>
- </div>
- <script type="text/javascript">
- (function($) {
- $(function() {
- head.js("<?php echo $this->getViewFileUrl('Magento_GiftMessage::gift-options.js')?>", function() {
- $('#allow_gift_messages_<?php echo $this->getEntity()->getId() ?>')
- .add('#allow_gift_messages_for_order_<?php echo $this->getEntity()->getId() ?>')
- .add('#allow_gift_messages_for_items_<?php echo $this->getEntity()->getId() ?>').giftOptions();
- });
- });
- })(jQuery);
- </script>
- <?php break; ?>
-<?php endswitch ?>
-<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("#shipping_method_form").validation();
- });
-</script>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_GoogleCheckout/layout/override/checkout_cart_index.xml b/app/design/frontend/magento_backup/Magento_GoogleCheckout/layout/override/checkout_cart_index.xml
deleted file mode 100644
index 12efb313611..00000000000
--- a/app/design/frontend/magento_backup/Magento_GoogleCheckout/layout/override/checkout_cart_index.xml
+++ /dev/null
@@ -1,33 +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="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>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_GoogleCheckout/link.phtml b/app/design/frontend/magento_backup/Magento_GoogleCheckout/link.phtml
deleted file mode 100644
index 694917f1788..00000000000
--- a/app/design/frontend/magento_backup/Magento_GoogleCheckout/link.phtml
+++ /dev/null
@@ -1,37 +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 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_backup/Magento_Newsletter/layout/override/base/customer_account.xml b/app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/customer_account.xml
deleted file mode 100644
index 11f782c7416..00000000000
--- a/app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/customer_account.xml
+++ /dev/null
@@ -1,36 +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="customer_account_navigation">
- <block class="Magento\Page\Block\Link\Current" name="customer-account-navigation-newsletter-subscriptions-link">
- <arguments>
- <argument name="path" xsi:type="string">newsletter/manage</argument>
- <argument name="label" xsi:type="string">Newsletter Subscriptions</argument>
- </arguments>
- </block>
- </referenceBlock>
- <remove name="newsletter_subscription"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/default.xml b/app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/default.xml
deleted file mode 100644
index 67b7a5379dd..00000000000
--- a/app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/default.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="left">
- <block class="Magento\Newsletter\Block\Subscribe" name="newsletter_subscription" template="subscribe.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/newsletter_manage_index.xml b/app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/newsletter_manage_index.xml
deleted file mode 100644
index 13c77ee6f03..00000000000
--- a/app/design/frontend/magento_backup/Magento_Newsletter/layout/override/base/newsletter_manage_index.xml
+++ /dev/null
@@ -1,33 +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="customer_account"/>
- <referenceContainer name="my.account.wrapper">
- <block class="Magento\Customer\Block\Newsletter" name="customer_newsletter">
- <container name="customer.newsletter.form.before" as="form_before" label="Newsletter Subscription Form Before"/>
- </block>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Newsletter/newsletter.js b/app/design/frontend/magento_backup/Magento_Newsletter/newsletter.js
deleted file mode 100644
index dd738941884..00000000000
--- a/app/design/frontend/magento_backup/Magento_Newsletter/newsletter.js
+++ /dev/null
@@ -1,47 +0,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.
- *
- * @category frontend newsletter
- * @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 ($) {
- $.widget('mage.newsletter', {
- options: {
- errorClass: 'mage-error'
- },
- _create: function() {
- $(this.options.formSelector)
- .validation({errorClass: this.options.errorClass});
- this.element.on('click', $.proxy(function(e) {
- if ($(e.target).val() === this.options.placeholder) {
- $(e.target).val('');
- }
- }, this)).on('focusout', $.proxy(function(e) {
- setTimeout($.proxy(function() {
- if ($.trim($(e.target).val()) === '') {
- $(e.target).val(this.options.placeholder);
- }
- }, this), 100);
- }, this));
- }
- });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Newsletter/subscribe.phtml b/app/design/frontend/magento_backup/Magento_Newsletter/subscribe.phtml
deleted file mode 100644
index b58a97130dd..00000000000
--- a/app/design/frontend/magento_backup/Magento_Newsletter/subscribe.phtml
+++ /dev/null
@@ -1,64 +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)
- */
-?>
-<div class="block block-subscribe">
- <div class="block-title">
- <strong><span><?php echo __('Newsletter') ?></span></strong>
- </div>
- <form action="<?php echo $this->getFormActionUrl() ?>" method="post" id="newsletter-validate-detail">
- <div class="block-content">
- <div class="form-subscribe-header">
- <label for="newsletter"><?php echo __('Sign Up for Our Newsletter:') ?></label>
- </div>
- <div class="input-box">
- <input type="text" name="email" id="newsletter"
- title="<?php echo __('Sign up for our newsletter') ?>"
- value="<?php echo __('Enter your email address') ?>"
- class="input-text" data-validate="{required:true, 'validate-email':true}"/>
- </div>
- <div class="actions">
- <button type="submit" title="<?php echo __('Subscribe') ?>" class="button">
- <span><span><?php echo __('Subscribe') ?></span></span></button>
- </div>
- </div>
- </form>
- <script type="text/javascript">
- //<![CDATA[
- (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')?>",
- "<?php echo $this->getViewFileUrl('Magento_Newsletter::newsletter.js')?>", function() {
- $('#newsletter').newsletter({
- formSelector: '#newsletter-validate-detail',
- placeholder: '<?php echo __('Enter your email address') ?>'
- });
- });
- })(jQuery);
- //]]>
- </script>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Page/1column.phtml b/app/design/frontend/magento_backup/Magento_Page/1column.phtml
deleted file mode 100644
index 19f3a76a483..00000000000
--- a/app/design/frontend/magento_backup/Magento_Page/1column.phtml
+++ /dev/null
@@ -1,58 +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
-/**
- * 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 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>
- </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-left.phtml b/app/design/frontend/magento_backup/Magento_Page/2columns-left.phtml
deleted file mode 100644
index 9047209145d..00000000000
--- a/app/design/frontend/magento_backup/Magento_Page/2columns-left.phtml
+++ /dev/null
@@ -1,59 +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
-/**
- * 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
deleted file mode 100644
index ea929a0ebbc..00000000000
--- a/app/design/frontend/magento_backup/Magento_Page/2columns-right.phtml
+++ /dev/null
@@ -1,59 +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
-/**
- * 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
deleted file mode 100644
index ad11e60846e..00000000000
--- a/app/design/frontend/magento_backup/Magento_Page/3columns.phtml
+++ /dev/null
@@ -1,62 +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
-/**
- * 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_backup/Magento_Page/empty.phtml b/app/design/frontend/magento_backup/Magento_Page/empty.phtml
deleted file mode 100644
index 112112b6795..00000000000
--- a/app/design/frontend/magento_backup/Magento_Page/empty.phtml
+++ /dev/null
@@ -1,46 +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
-/**
- * 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 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>
-</body>
-</html>
diff --git a/app/design/frontend/magento_backup/Magento_Page/html/breadcrumbs.phtml b/app/design/frontend/magento_backup/Magento_Page/html/breadcrumbs.phtml
deleted file mode 100644
index b1e9df03aa7..00000000000
--- a/app/design/frontend/magento_backup/Magento_Page/html/breadcrumbs.phtml
+++ /dev/null
@@ -1,46 +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 if($crumbs && is_array($crumbs)): ?>
-<div class="breadcrumbs">
- <ul>
- <?php foreach($crumbs as $_crumbName=>$_crumbInfo): ?>
- <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']): ?>
- <strong><?php echo $this->escapeHtml($_crumbInfo['label']) ?></strong>
- <?php else: ?>
- <?php echo $this->escapeHtml($_crumbInfo['label']) ?>
- <?php endif; ?>
- <?php if(!$_crumbInfo['last']): ?>
- <span>/ </span>
- <?php endif; ?>
- </li>
- <?php endforeach; ?>
- </ul>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Page/html/head.phtml b/app/design/frontend/magento_backup/Magento_Page/html/head.phtml
deleted file mode 100644
index d14d1bbde6e..00000000000
--- a/app/design/frontend/magento_backup/Magento_Page/html/head.phtml
+++ /dev/null
@@ -1,40 +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\Page\Block\Html\Head */
-?>
-<meta http-equiv="Content-Type" content="<?php echo $this->getContentType() ?>"/>
-<title><?php echo $this->getTitle() ?></title>
-<meta name="description" content="<?php echo $this->escapeHtml($this->getDescription())?>"/>
-<meta name="keywords" content="<?php echo $this->escapeHtml($this->getKeywords())?>"/>
-<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() ?>
-<?php echo $this->helper('Magento\Core\Helper\Js')->getTranslatorScript() ?>
diff --git a/app/design/frontend/magento_backup/Magento_Page/html/header.phtml b/app/design/frontend/magento_backup/Magento_Page/html/header.phtml
deleted file mode 100644
index ec10346c9f4..00000000000
--- a/app/design/frontend/magento_backup/Magento_Page/html/header.phtml
+++ /dev/null
@@ -1,46 +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 \Magento\Page\Block\Html\Header $this
- */
-?>
-<div class="header-container">
- <div class="header">
- <?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>
- <?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>
- <?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') ?>
diff --git a/app/design/frontend/magento_backup/Magento_Page/html/notices.phtml b/app/design/frontend/magento_backup/Magento_Page/html/notices.phtml
deleted file mode 100644
index 0df537f82bd..00000000000
--- a/app/design/frontend/magento_backup/Magento_Page/html/notices.phtml
+++ /dev/null
@@ -1,72 +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\Page\Block\Html\Notices
- */
-?>
-<?php if ($this->displayNoscriptNotice()): ?>
- <noscript>
- <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 __('To use this website you must first enable JavaScript in your browser.'); ?>
- </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>
-<?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">
- <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>
- </div>
- <script type="text/javascript">
- // <![CDATA[
- (function($) {
- head.js("<?php echo $this->getViewFileUrl('mage/cookies.js')?>",
- "<?php echo $this->getViewFileUrl('Magento_Page::js/notices.js')?>", function() {
- $('#notice-cookie-block').cookieBlock({
- cookieAllowButtonSelector: '#btn-cookie-allow',
- cookieName: '<?php echo \Magento\Core\Helper\Cookie::IS_USER_ALLOWED_SAVE_COOKIE ?>',
- cookieValue: '<?php echo $this->helper('Magento\Core\Helper\Cookie')->getAcceptedSaveCookiesWebsiteIds() ?>',
- cookieLifetime: <?php echo $this->helper('Magento\Core\Helper\Cookie')->getCookieRestrictionLifetime()?>,
- noCookiesUrl: '<?php echo $this->getUrl('cms/index/noCookies') ?>'
- });
- });
- })(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
deleted file mode 100644
index 41e7c480ac8..00000000000
--- a/app/design/frontend/magento_backup/Magento_Page/html/pager.phtml
+++ /dev/null
@@ -1,124 +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
-/**
- * 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_backup/Magento_Page/html/topmenu.phtml b/app/design/frontend/magento_backup/Magento_Page/html/topmenu.phtml
deleted file mode 100644
index c14eeceb25d..00000000000
--- a/app/design/frontend/magento_backup/Magento_Page/html/topmenu.phtml
+++ /dev/null
@@ -1,48 +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 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)
- */
-?>
-<?php
-/**
- * Top menu for store
- *
- * @see \Magento\Page\Block\Html\Topmenu
- */
-?>
-<?php $_menu = $this->getHtml('level-top') ?>
-<?php if ($_menu): ?>
-<div class="nav-container">
- <ul id="nav">
- <?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 ?>
diff --git a/app/design/frontend/magento_backup/Magento_Page/js/menu.js b/app/design/frontend/magento_backup/Magento_Page/js/menu.js
deleted file mode 100644
index 1daabdcb485..00000000000
--- a/app/design/frontend/magento_backup/Magento_Page/js/menu.js
+++ /dev/null
@@ -1,71 +0,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.
- *
- * @category frontend home menu
- * @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 ($) {
- $.widget('mage.menu', {
- options: {
- showDelay: 100,
- hideDelay: 100
- },
-
- _create: function() {
- this.element.hover($.proxy(function () {
- $(this.element).addClass('over');
- this._show(this.element.children('ul'));
- }, this), $.proxy(function () {
- $(this.element).removeClass('over');
- this._hide(this.element.children('ul'));
- }, this));
- },
-
- /**
- * Show sub menu by adding shown-sub class
- * @private
- * @param subElement
- */
- _show: function(subElement) {
- if (subElement.data('hideTimeId')) {
- clearTimeout(subElement.data('hideTimeId'));
- }
- subElement.data('showTimeId', setTimeout(function () {
- subElement.addClass('shown-sub');
- }), this.options.showDelay);
- },
-
- /**
- * Hide sub menu by removing shown-sub class
- * @private
- * @param subElement
- */
- _hide: function(subElement) {
- if (subElement.data('showTimeId')) {
- clearTimeout(subElement.data('showTimeId'));
- }
- subElement.data('hideTimeId', setTimeout(function () {
- subElement.removeClass('shown-sub');
- }), this.options.hideDelay);
- }
- });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Page/js/popup-menu.js b/app/design/frontend/magento_backup/Magento_Page/js/popup-menu.js
deleted file mode 100644
index a4cd598fb33..00000000000
--- a/app/design/frontend/magento_backup/Magento_Page/js/popup-menu.js
+++ /dev/null
@@ -1,141 +0,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.
- *
- * @category popup-menu
- * @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($) {
- $.widget('mage.popUpMenu', {
- options: {
- eventClass: 'faded', // Class applied to popUpMenu with mouseleave/mouseenter events.
- fadeDuration: 'slow', // Duration for the fade effect when popUpMenu is shown/hidden.
- hideOnClick: true, // Hides the popUpMenu when click anywhere in the document body.
- menu: '', // Selector for the popUpMenu (e.g. <ul>).
- onMouseEnter: null, // Function called when mouseenter event is triggered on popUpMenu.
- onMouseLeave: null, // Function called when mouseleave event is triggered on popUpMenu.
- openedClass: 'list-opened', // Class applied to switcher when popUpMenu is shown/hidden.
- switcher: 'span.switcher', // Selector for the popUpMenu switcher.
- timeoutDuration: 2000 // Duration before popUpMenu is hidden after mouseleave event.
- },
-
- /**
- * Add click event to the switcher. Add blur, mouseenter/mouseleave events to the
- * containing element.
- * @private
- */
- _create: function() {
- this.switcher = this.element.find(this.options.switcher)
- .on('click', $.proxy(this._toggleMenu, this));
- var eventMap = {
- mouseenter: $.proxy(this.options.onMouseEnter, this),
- mouseleave: $.proxy(this.options.onMouseLeave, this)
- };
- if (this.options.hideOnClick) {
- eventMap.blur = $.proxy(this._hide, this);
- }
- this.element.on(eventMap);
- $(this.options.menu).find('a').on('click', $.proxy(this._hide, this));
- },
-
- /**
- * Custom method for defining options during instantiation. User-provided options
- * override the options returned by this method which override the default options.
- * @private
- * @return {Object} Object containing options for mouseenter/mouseleave events.
- */
- _getCreateOptions: function() {
- return {onMouseEnter: this._onMouseEnter, onMouseLeave: this._onMouseLeave};
- },
-
- /**
- * Hide the popup menu using a fade effect.
- * @private
- */
- _hide: function(){
- $(this.options.menu).fadeOut(this.options.fadeDuration, $.proxy(this._stopTimer, this));
- this.switcher.removeClass(this.options.openedClass);
- },
-
- /**
- * Show the popup menu using a fade effect and put focus on the containing element for
- * the blur event.
- * @private
- */
- _show: function() {
- $(this.options.menu)
- .removeClass(this.options.eventClass).fadeIn(this.options.fadeDuration);
- this.switcher.addClass(this.options.openedClass);
- if (this.options.hideOnClick) {
- this.element.focus();
- }
- },
-
- /**
- * Stop (clear) the timeout.
- * @private
- */
- _stopTimer: function() {
- clearTimeout(this.timer);
- },
-
- /**
- * Determines whether the popup menu is open (show) or closed (hide).
- * @private
- * @return boolean Returns true if open, false otherwise.
- */
- _isOpened: function() {
- return this.switcher.hasClass(this.options.openedClass);
- },
-
- /**
- * Mouseleave event on the popup menu. Add faded class and set appropriate timeout.
- * @private
- */
- _onMouseLeave: function() {
- if (this._isOpened()) {
- $(this.options.menu).addClass(this.options.eventClass);
- this._stopTimer();
- this.timer = setTimeout($.proxy(this._hide, this), this.options.timeoutDuration);
- }
- },
-
- /**
- * Mouseenter event on the popup menu. Reset the timer and remove the faded class.
- * @private
- */
- _onMouseEnter: function() {
- if (this._isOpened()) {
- this._stopTimer();
- $(this.options.menu).removeClass(this.options.eventClass);
- }
- },
-
- /**
- * Toggle the state of the popup menu. Open it (show) or close it (hide).
- * @private
- * @return {*}
- */
- _toggleMenu: function() {
- return this[this._isOpened() ? '_hide' : '_show']();
- }
- });
-})(jQuery);
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
deleted file mode 100644
index 201d183f164..00000000000
--- a/app/design/frontend/magento_backup/Magento_Page/js/row-builder.js
+++ /dev/null
@@ -1,222 +0,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.
- *
- * @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_backup/Magento_Page/link/current.phtml b/app/design/frontend/magento_backup/Magento_Page/link/current.phtml
deleted file mode 100644
index 7ad6578648c..00000000000
--- a/app/design/frontend/magento_backup/Magento_Page/link/current.phtml
+++ /dev/null
@@ -1,40 +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.
- *
- * @copyright Copyright (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\Link\Current
- */
-?>
-<?php if ($this->isCurrent()):?>
-<li class="current">
- <strong><?php echo $this->escapeHtml(__($this->getLabel()))?></strong>
-</li>
-<?php else:?>
-<li>
- <a href="<?php echo $this->escapeHtml($this->getHref())?>"
- <?php if ($title = $this->getTitle()):?> title="<?php echo $this->escapeHtml(__($title))?>"<?php endif;?>
- >
- <?php echo $this->escapeHtml(__($this->getLabel()))?>
- </a>
-</li>
-<?php endif;?>
diff --git a/app/design/frontend/magento_backup/Magento_Page/popup.phtml b/app/design/frontend/magento_backup/Magento_Page/popup.phtml
deleted file mode 100644
index 5d23527f833..00000000000
--- a/app/design/frontend/magento_backup/Magento_Page/popup.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
- * @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 class="page-popup<?php echo $this->getBodyClass()?$this->getBodyClass() : ''?>">
-<div>
- <?php echo $this->getChildHtml('after_body_start') ?>
- <?php echo $this->getChildHtml('content') ?>
- <?php echo $this->getChildHtml('before_body_end') ?>
-</div>
-<?php echo $this->getAbsoluteFooter() ?>
-</body>
-</html>
diff --git a/app/design/frontend/magento_backup/Magento_Page/print.phtml b/app/design/frontend/magento_backup/Magento_Page/print.phtml
deleted file mode 100644
index bc05952d3d1..00000000000
--- a/app/design/frontend/magento_backup/Magento_Page/print.phtml
+++ /dev/null
@@ -1,53 +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
-/**
- * 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 class="page-print<?php echo $this->getBodyClass()?$this->getBodyClass():'' ?>">
-<?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="" />
- <?php if ($this->getPrintLogoText()):?>
- <address><?php echo nl2br($this->escapeHtml($this->getPrintLogoText())) ?></address>
- <?php endif;?>
- </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>
- <?php echo $this->getAbsoluteFooter() ?>
-</div>
-</body>
-</html>
diff --git a/app/design/frontend/magento_backup/Magento_Page/switch/languages.phtml b/app/design/frontend/magento_backup/Magento_Page/switch/languages.phtml
deleted file mode 100644
index 95e60198fd5..00000000000
--- a/app/design/frontend/magento_backup/Magento_Page/switch/languages.phtml
+++ /dev/null
@@ -1,44 +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
-/**
- * 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_backup/Magento_Page/switch/stores.phtml b/app/design/frontend/magento_backup/Magento_Page/switch/stores.phtml
deleted file mode 100644
index f6c35103437..00000000000
--- a/app/design/frontend/magento_backup/Magento_Page/switch/stores.phtml
+++ /dev/null
@@ -1,47 +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
-/**
- * Store switcher template
- *
- * @see \Magento\Core\Block\Store\Switcher
- */
-?>
-<?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;*/ ?>
- <?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; ?>
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
deleted file mode 100644
index 8093dce4eb2..00000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/catalog/product/view/profile/options.phtml
+++ /dev/null
@@ -1,41 +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
-/**
- * @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
deleted file mode 100644
index 1c41afb6785..00000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/catalog/product/view/profile/schedule.phtml
+++ /dev/null
@@ -1,39 +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
-/**
- * @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
deleted file mode 100644
index 4fc0b878e43..00000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/cc-type.js
+++ /dev/null
@@ -1,52 +0,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.
- *
- * @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
deleted file mode 100644
index 11e895dc221..00000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/form/banktransfer.phtml
+++ /dev/null
@@ -1,35 +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 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
deleted file mode 100644
index f6581f70ae5..00000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/form/cashondelivery.phtml
+++ /dev/null
@@ -1,39 +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 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
deleted file mode 100644
index 39f14f5862f..00000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/form/cc.phtml
+++ /dev/null
@@ -1,134 +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 $_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
deleted file mode 100644
index c93732d4564..00000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/form/ccsave.phtml
+++ /dev/null
@@ -1,131 +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 $_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
deleted file mode 100644
index 1e98b9826fc..00000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/form/checkmo.phtml
+++ /dev/null
@@ -1,44 +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 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
deleted file mode 100644
index f5fc7ae1b00..00000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/form/purchaseorder.phtml
+++ /dev/null
@@ -1,34 +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)
- */
-?>
-<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
deleted file mode 100644
index 3021359b08a..00000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/info/checkmo.phtml
+++ /dev/null
@@ -1,38 +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)
- */
-?>
-<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
deleted file mode 100644
index aa4e7d58fa4..00000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/info/default.phtml
+++ /dev/null
@@ -1,49 +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
-/**
- * @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
deleted file mode 100644
index 5e66f337d24..00000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/info/instructions.phtml
+++ /dev/null
@@ -1,41 +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 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
deleted file mode 100644
index 22502d154a3..00000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/info/purchaseorder.phtml
+++ /dev/null
@@ -1,28 +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)
- */
-?>
-<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
deleted file mode 100644
index 7155d46d979..00000000000
--- a/app/design/frontend/magento_backup/Magento_Payment/layout/override/catalog_product_view.xml
+++ /dev/null
@@ -1,37 +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="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
deleted file mode 100644
index d02d0dc97ea..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/express/review.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)
- */
-/** @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
deleted file mode 100644
index 6f282dd71c3..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/express/review/address.phtml
+++ /dev/null
@@ -1,155 +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 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_backup/Magento_Paypal/express/review/details.phtml b/app/design/frontend/magento_backup/Magento_Paypal/express/review/details.phtml
deleted file mode 100644
index f6da6571d36..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/express/review/details.phtml
+++ /dev/null
@@ -1,64 +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)
- */
-
-/**
- * @see \Magento\Paypal\Block\Express\Review\Details
- */
-?>
-<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 ?>"><?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="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>
-<?php echo $this->getChildHtml('totals'); ?>
- <tbody>
- <?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/design/frontend/magento_backup/Magento_Paypal/express/review/shipping/method.phtml b/app/design/frontend/magento_backup/Magento_Paypal/express/review/shipping/method.phtml
deleted file mode 100644
index f98d878c6ff..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/express/review/shipping/method.phtml
+++ /dev/null
@@ -1,53 +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 */
-?>
-<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_backup/Magento_Paypal/express/shortcut.phtml b/app/design/frontend/magento_backup/Magento_Paypal/express/shortcut.phtml
deleted file mode 100644
index 8db827ddaa7..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/express/shortcut.phtml
+++ /dev/null
@@ -1,68 +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\Paypal\Block\Express\Shortcut
- */
-?>
-<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 endif; ?>
-
- <?php
- $confirmationUrl = $this->getConfirmationUrl();
- $isInCatalogProduct = $this->getIsInCatalogProduct();
- endif; ?>
- <script type="text/javascript">
- (function($) {
- head.js(
- "<?php echo $this->getViewFileUrl('Magento_Paypal::js/paypal-checkout.js') ?>",
- function() {
- $('.paypal-logo').paypalCheckout({
- confirmMessage: "<?php echo $this->escapeJsQuote($this->getConfirmationMessage())?>",
- confirmUrl: "<?php echo !empty($confirmationUrl) ? $confirmationUrl : false ?>",
- isCatalogProduct: "<?php echo !empty($isInCatalogProduct) ? $isInCatalogProduct : false ?>",
- paypalCheckoutSelector: '#pp-checkout-url',
- productAddToCartForm: '#product_addtocart_form'
- });
- });
- })(jQuery);
- </script>
-</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
deleted file mode 100644
index e67b386db86..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/hss/form.phtml
+++ /dev/null
@@ -1,46 +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)
- */
-
-/**
- * @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
deleted file mode 100644
index 7c3aa2dfe57..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/hss/iframe.phtml
+++ /dev/null
@@ -1,31 +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)
- */
-
-?>
-<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
deleted file mode 100644
index 7fffe8e2647..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/hss/info.phtml
+++ /dev/null
@@ -1,35 +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)
- */
-
-/**
- * @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
deleted file mode 100644
index 9a0408fe524..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/hss/js.phtml
+++ /dev/null
@@ -1,32 +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)
- */
-
-/**
- * @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
deleted file mode 100644
index 1816db2ed47..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/hss/redirect.phtml
+++ /dev/null
@@ -1,62 +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)
- */
-
-/**
- * @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
deleted file mode 100644
index c8781fc4fa7..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/hss/review/button.phtml
+++ /dev/null
@@ -1,27 +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)
- */
-?>
-<button type="submit" data-role="review-save" title="<?php echo __('Continue') ?>" class="button btn-checkout"><span><?php echo __('Continue') ?></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
deleted file mode 100644
index c04d8b80e48..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/js/paypal-checkout.js
+++ /dev/null
@@ -1,50 +0,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.
- *
- * @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_backup/Magento_Paypal/layout/override/SHORTCUT_popup.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/SHORTCUT_popup.xml
deleted file mode 100644
index 9b50d93483b..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/SHORTCUT_popup.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">
- <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>
-</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
deleted file mode 100644
index d44e594ae0f..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/catalog_category_view.xml
+++ /dev/null
@@ -1,31 +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="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_backup/Magento_Paypal/layout/override/checkout_cart_index.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_cart_index.xml
deleted file mode 100644
index 4b92177880b..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_cart_index.xml
+++ /dev/null
@@ -1,42 +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="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="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_backup/Magento_Paypal/layout/override/checkout_onepage_review.xml b/app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_onepage_review.xml
deleted file mode 100644
index 3ba25aeacbd..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_onepage_review.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="checkout.onepage.review.info.items.after">
- <block class="Magento\Paypal\Block\Iframe" name="paypal.iframe"/>
- </referenceContainer>
- <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
deleted file mode 100644
index aa84f501748..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/checkout_onepage_success.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">
- <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
deleted file mode 100644
index 7e227409019..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/cms_index_index.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="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
deleted file mode 100644
index efdf4a64b8e..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_express_review.xml
+++ /dev/null
@@ -1,47 +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="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
deleted file mode 100644
index f340c628704..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_express_review_details.xml
+++ /dev/null
@@ -1,33 +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\Paypal\Block\Express\Review\Details" output="1" name="root" 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
deleted file mode 100644
index 41cc25c05eb..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_hostedpro_cancel.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\Paypal\Block\Hosted\Pro\Iframe" name="hosted.pro.iframe" output="1" template="hss/redirect.phtml"/>
-</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
deleted file mode 100644
index 679ab1fc539..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_cancelpayment.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\Paypal\Block\Payflow\Link\Iframe" name="payflow.link.iframe" output="1" template="payflowlink/redirect.phtml"/>
-</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
deleted file mode 100644
index 5bd6aff888a..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_form.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\Paypal\Block\Payflow\Link\Iframe" name="payflow.link.iframe" output="1" template="payflowlink/form.phtml"/>
-</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
deleted file mode 100644
index 679ab1fc539..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflow_returnurl.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\Paypal\Block\Payflow\Link\Iframe" name="payflow.link.iframe" output="1" template="payflowlink/redirect.phtml"/>
-</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
deleted file mode 100644
index 5cced7b711b..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_cancelpayment.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\Paypal\Block\Payflow\Advanced\Iframe" name="payflow.advanced.iframe" output="1" template="payflowadvanced/redirect.phtml"/>
-</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
deleted file mode 100644
index 0a7d40e6e39..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_form.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\Paypal\Block\Payflow\Advanced\Iframe" name="payflow.advanced.iframe" output="1" template="payflowadvanced/form.phtml"/>
-</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
deleted file mode 100644
index 5cced7b711b..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_payflowadvanced_returnurl.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\Paypal\Block\Payflow\Advanced\Iframe" name="payflow.advanced.iframe" output="1" template="payflowadvanced/redirect.phtml"/>
-</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
deleted file mode 100644
index e0e8e47f62a..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/paypal_standard_redirect.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\Paypal\Block\Standard\Redirect" output="1" name="standard.redirect"/>
-</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
deleted file mode 100644
index aa84f501748..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/tag_customer_view.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">
- <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
deleted file mode 100644
index aa84f501748..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/tag_product_list.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">
- <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
deleted file mode 100644
index aa84f501748..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/layout/override/wishlist_index_index.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">
- <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
deleted file mode 100644
index 9b1446f7baf..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/order-review.js
+++ /dev/null
@@ -1,305 +0,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.
- *
- * @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
deleted file mode 100644
index 8980cad2e42..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/partner/logo.phtml
+++ /dev/null
@@ -1,34 +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
-/**
- * @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
deleted file mode 100644
index e458fcf9c59..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/form.phtml
+++ /dev/null
@@ -1,46 +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\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
deleted file mode 100644
index 800b4f167a0..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/iframe.phtml
+++ /dev/null
@@ -1,31 +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\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
deleted file mode 100644
index e281cce7906..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/info.phtml
+++ /dev/null
@@ -1,35 +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\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
deleted file mode 100644
index caf7a3ea339..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/payflowadvanced/redirect.phtml
+++ /dev/null
@@ -1,67 +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\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
deleted file mode 100644
index e67b386db86..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/form.phtml
+++ /dev/null
@@ -1,46 +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)
- */
-
-/**
- * @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
deleted file mode 100644
index 81294e08878..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/iframe.phtml
+++ /dev/null
@@ -1,31 +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\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
deleted file mode 100644
index 39cd781e790..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/info.phtml
+++ /dev/null
@@ -1,35 +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\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
deleted file mode 100644
index 72c0ea59bbd..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/payflowlink/redirect.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
- * @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
deleted file mode 100644
index 9206539044d..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/payment/mark.phtml
+++ /dev/null
@@ -1,36 +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
-/**
- * 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
deleted file mode 100644
index 56556be6084..00000000000
--- a/app/design/frontend/magento_backup/Magento_Paypal/payment/redirect.phtml
+++ /dev/null
@@ -1,41 +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
-/**
- * @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
deleted file mode 100644
index 2b97afa0f9f..00000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/express/review.phtml
+++ /dev/null
@@ -1,148 +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 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
deleted file mode 100644
index 2dfff90ee1e..00000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/SHORTCUT_uk_popup.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">
- <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
deleted file mode 100644
index d9099840a64..00000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_category_view.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">
- <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
deleted file mode 100644
index d9099840a64..00000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_product_compare_index.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">
- <update handle="SHORTCUT_uk_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_product_view.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_product_view.xml
deleted file mode 100644
index 1246781afc3..00000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalog_product_view.xml
+++ /dev/null
@@ -1,37 +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="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>
- </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
deleted file mode 100644
index d9099840a64..00000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalogsearch_advanced_result.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">
- <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
deleted file mode 100644
index d9099840a64..00000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/catalogsearch_result_index.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">
- <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
deleted file mode 100644
index c856db24932..00000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_cart_index.xml
+++ /dev/null
@@ -1,42 +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="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
deleted file mode 100644
index d9099840a64..00000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_onepage_failure.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">
- <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
deleted file mode 100644
index d9099840a64..00000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/checkout_onepage_success.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">
- <update handle="SHORTCUT_uk_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/default.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/default.xml
deleted file mode 100644
index 8ccbb0f0f28..00000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/default.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="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_backup/Magento_PaypalUk/layput/override/paypal_express_review_details.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypal_express_review_details.xml
deleted file mode 100644
index 2ac04b323fb..00000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypal_express_review_details.xml
+++ /dev/null
@@ -1,33 +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\Paypal\Block\Express\Review\Details" name="root" output="1" 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_PaypalUk/layput/override/paypaluk_express_review.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypaluk_express_review.xml
deleted file mode 100644
index 8f74e4d8dde..00000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/paypaluk_express_review.xml
+++ /dev/null
@@ -1,46 +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="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/review_product_list.xml b/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/review_product_list.xml
deleted file mode 100644
index d9099840a64..00000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/review_product_list.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">
- <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
deleted file mode 100644
index d9099840a64..00000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/tag_customer_view.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">
- <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
deleted file mode 100644
index d9099840a64..00000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/tag_product_list.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">
- <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
deleted file mode 100644
index d9099840a64..00000000000
--- a/app/design/frontend/magento_backup/Magento_PaypalUk/layput/override/wishlist_index_index.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">
- <update handle="SHORTCUT_uk_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Persistent/checkout/onepage/billing.phtml b/app/design/frontend/magento_backup/Magento_Persistent/checkout/onepage/billing.phtml
deleted file mode 100644
index e3ce2c762ac..00000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/checkout/onepage/billing.phtml
+++ /dev/null
@@ -1,215 +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 \Magento\Checkout\Block\Onepage\Billing $this */
-?>
-<form id="co-billing-form" action="">
-<fieldset>
- <ul class="form-list">
- <?php if ($this->customerHasAddresses()): ?>
- <li class="wide">
- <label for="billing-address-select"><?php echo __('Select a billing address from your address book or enter a new address.') ?></label>
- <div class="input-box">
- <?php echo $this->getAddressesHtmlSelect('billing') ?>
- </div>
- </li>
- <?php endif; ?>
- <li id="billing-new-address-form"<?php if ($this->customerHasAddresses()): ?> style="display:none;"<?php endif; ?>>
- <fieldset>
- <input type="hidden" name="billing[address_id]" value="<?php echo $this->getAddress()->getId() ?>" id="billing: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('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?></li>
- <li class="fields">
- <div class="field">
- <label for="billing:company"><?php echo __('Company') ?></label>
- <div class="input-box">
- <input type="text" id="billing:company" name="billing[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()): ?>
- <div class="field">
- <label for="billing:email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
- <div class="input-box">
- <input type="text" name="billing[email]" id="billing:email" value="<?php echo $this->escapeHtml($this->getAddress()->getEmail()) ?>" title="<?php echo __('Email Address') ?>" class="input-text" data-validate="{required:true, 'validate-email':true}" />
- </div>
- </div>
- <?php endif; ?>
- </li>
- <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
- <li class="wide">
- <label for="billing:street1" class="required"><em>*</em><?php echo __('Address') ?></label>
- <div class="input-box">
- <input type="text" title="<?php echo __('Street Address') ?>" name="billing[street][]" id="billing: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="wide">
- <div class="input-box">
- <input type="text" title="<?php echo __('Street Address %1', $_i) ?>" name="billing[street][]" id="billing: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="billing:vat_id"><?php echo __('VAT Number') ?></label>
- <div class="input-box">
- <input type="text" id="billing:vat_id" name="billing[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="billing:city" class="required"><em>*</em><?php echo __('City') ?></label>
- <div class="input-box">
- <input type="text" title="<?php echo __('City') ?>" name="billing[city]" value="<?php echo $this->escapeHtml($this->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="billing:city" />
- </div>
- </div>
- <div class="field">
- <label for="billing:region_id" class="required"><em>*</em><?php echo __('State/Province') ?></label>
- <div class="input-box">
- <select id="billing:region_id" name="billing[region_id]" title="<?php echo __('State/Province') ?>" style="display:none;" data-validate="{'validate-select':true}">
- <option value=""><?php echo __('Please select a region, state or province.') ?></option>
- </select>
- <input type="text" id="billing:region" name="billing[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="billing: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="billing[postcode]" id="billing:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" data-validate="{'validate-zip-international':true}"/>
- </div>
- </div>
- <div class="field">
- <label for="billing:country_id" class="required"><em>*</em><?php echo __('Country') ?></label>
- <div class="input-box">
- <?php echo $this->getCountryHtmlSelect('billing') ?>
- </div>
- </div>
- </li>
- <li class="fields">
- <div class="field">
- <label for="billing:telephone" class="required"><em>*</em><?php echo __('Telephone') ?></label>
- <div class="input-box">
- <input type="text" name="billing[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="billing:telephone" />
- </div>
- </div>
- <div class="field">
- <label for="billing:fax"><?php echo __('Fax') ?></label>
- <div class="input-box">
- <input type="text" name="billing[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="billing:fax" />
- </div>
- </div>
- </li>
- <?php if(!$this->isCustomerLoggedIn()): ?>
-
- <?php $_dob = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob') ?>
- <?php $_gender = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Gender') ?>
- <?php if ($_dob->isEnabled() || $_gender->isEnabled()): ?>
- <li class="fields">
- <?php if ($_dob->isEnabled()): ?>
- <div class="field">
- <?php echo $_dob->setDate($this->getQuote()->getCustomerDob())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
- </div>
- <?php endif; ?>
- <?php if ($_gender->isEnabled()): ?>
- <div class="field">
- <?php echo $_gender->setGender($this->getQuote()->getCustomerGender())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
- </div>
- <?php endif ?>
- </li>
- <?php endif ?>
-
- <?php if ($this->isTaxvatEnabled()):?>
- <li><?php echo $this->getTaxvatHtml() ?></li>
- <?php endif; ?>
-
- <li class="fields" id="register-customer-password">
- <div class="field">
- <label for="billing:customer_password" class="required"><em>*</em><?php echo __('Password') ?></label>
- <div class="input-box">
- <input type="password" name="billing[customer_password]" id="billing:customer_password" title="<?php echo __('Password') ?>" class="input-text" data-validate="{required:true, 'validate-password':true}"/>
- </div>
- </div>
- <div class="field">
- <label for="billing:confirm_password" class="required"><em>*</em><?php echo __('Confirm Password') ?></label>
- <div class="input-box">
- <input type="password" name="billing[confirm_password]" title="<?php echo __('Confirm Password') ?>" id="billing:confirm_password" class="input-text" data-validate="{required:true, 'validate-cpassword':true}" />
- </div>
- </div>
- </li>
- <?php echo $this->getChildHtml('persistent.remember.me'); ?>
- <?php endif; ?>
- <?php if ($this->isCustomerLoggedIn() && $this->customerHasAddresses()):?>
- <li class="control">
- <input type="checkbox" name="billing[save_in_address_book]" value="1" title="<?php echo __('Save in address book') ?>" id="billing:save_in_address_book" <?php if ($this->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" /><label for="billing:save_in_address_book"><?php echo __('Save in address book') ?></label>
- </li>
- <?php else:?>
- <li class="no-display"><input type="hidden" name="billing[save_in_address_book]" value="1" /></li>
- <?php endif; ?>
- <?php echo $this->getChildHtml('form.additional.info'); ?>
- </ul>
- <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
- </fieldset>
- </li>
- <?php if ($this->canShip()): ?>
- <li class="control">
- <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_yes" value="1"<?php if ($this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo __('Ship to this address') ?>" class="radio" /><label for="billing:use_for_shipping_yes"><?php echo __('Ship to this address') ?></label></li>
- <li class="control">
- <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_no" value="0"<?php if (!$this->isUseBillingAddressForShipping()) {?> checked="checked"<?php }?> title="<?php echo __('Ship to different address') ?>" class="radio" /><label for="billing:use_for_shipping_no"><?php echo __('Ship to different address') ?></label>
- </li>
- <?php endif; ?>
- </ul>
- <?php if (!$this->canShip()): ?>
- <input type="hidden" name="billing[use_for_shipping]" value="1" />
- <?php endif; ?>
- <div class="buttons-set" id="billing-buttons-container">
- <p class="required"><?php echo __('* Required Fields') ?></p>
- <button type="button" title="<?php echo __('Continue') ?>" class="button"><span><span><?php echo __('Continue') ?></span></span></button>
- <span class="please-wait" id="billing-please-wait" style="display:none;">
- <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="<?php echo __('Loading next step...') ?>" title="<?php echo __('Loading next step...') ?>" class="v-middle" /> <?php echo __('Loading next step...') ?>
- </span>
- </div>
-</fieldset>
-</form>
-<script type="text/javascript">
- (function($) {
- head.js(
- "<?php echo $this->getViewFileUrl('Magento_Checkout::js/region-updater.js') ?>",
- function() {
- $('#billing\\:country_id').regionUpdater({
- optionalRegionAllowed: <?php echo ($this->getConfig('general/region/display_all') ? 'true' : 'false'); ?>,
- regionListId: '#billing\\:region_id',
- regionInputId: '#billing\\:region',
- postcodeId: '#billing\\: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_backup/Magento_Persistent/checkout/onepage/login.phtml b/app/design/frontend/magento_backup/Magento_Persistent/checkout/onepage/login.phtml
deleted file mode 100644
index 816011751fa..00000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/checkout/onepage/login.phtml
+++ /dev/null
@@ -1,136 +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
-/**
- * Customer onepage checkout login form template
- *
- * @see app/code/Magento/Checkout/view/frontend/onepage/login.phtml
- */
-/** @var $this \Magento\Checkout\Block\Onepage\Login */
-?>
-<div class="col2-set">
- <?php echo $this->getChildHtml('login_before')?>
- <div class="col-1">
- <h3><?php if( $this->isAllowedGuestCheckout() ): ?><?php echo __('Checkout as a Guest or Register') ?><?php else: ?><?php echo __('Register to Create an Account') ?><?php endif; ?></h3>
- <?php if( $this->isAllowedGuestCheckout() ): ?>
- <p><?php echo __('Sign up with us to save time on your next checkout:') ?></p>
- <?php else: ?>
- <p><strong><?php echo __('Register and save time!') ?></strong><br />
- <?php echo __('Sign up with us to save time on your next checkout:') ?></p>
- <ul>
- <li><?php echo __('Fast and easy check out') ?></li>
- <li><?php echo __('Get easy access to your order history and status.') ?></li>
- </ul>
- <?php endif; ?>
- <?php if( $this->isAllowedGuestCheckout() ): ?>
- <ul class="form-list">
- <?php if( $this->isAllowedGuestCheckout() ): ?>
- <li class="control">
- <input type="radio" name="checkout_method" id="login:guest" value="guest"<?php if($this->getQuote()->getCheckoutMethod()==\Magento\Checkout\Model\Type\Onepage::METHOD_GUEST): ?> checked="checked"<?php endif; ?> class="radio" /><label for="login:guest"><?php echo __('Checkout as Guest') ?></label>
- </li>
- <?php endif; ?>
- <li class="control">
- <input type="radio" name="checkout_method" id="login:register" value="register"<?php if($this->getQuote()->getCheckoutMethod()==\Magento\Checkout\Model\Type\Onepage::METHOD_REGISTER || !$this->isAllowedGuestCheckout()): ?> checked="checked"<?php endif ?> class="radio" /><label for="login:register"><?php echo __('Register') ?></label>
- </li>
- </ul>
- <h4><?php echo __('Register and save time!') ?></h4>
- <p><?php echo __('Sign up with us to save time on your next checkout:') ?></p>
- <ul class="ul">
- <li><?php echo __('Fast and easy check out') ?></li>
- <li><?php echo __('Get easy access to your order history and status.') ?></li>
- </ul>
- <?php else: ?>
- <input type="hidden" name="checkout_method" id="login:register" value="register" checked="checked" />
- <?php endif; ?>
- </div>
- <div class="col-2">
- <h3><?php echo __('Login') ?></h3>
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
- <form id="login-form" action="<?php echo $this->getPostAction() ?>" method="post">
- <fieldset>
- <h4><?php echo __('Already registered?') ?></h4>
- <p><?php echo __('Please log in below:') ?></p>
- <ul class="form-list">
- <li>
- <label for="login-email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
- <div class="input-box">
- <input type="text" class="input-text" id="login-email" name="login[username]" data-validate="{required:true, 'validate-email':true}" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" />
- </div>
- </li>
- <li>
- <label for="login-password" class="required"><em>*</em><?php echo __('Password') ?></label>
- <div class="input-box">
- <input type="password" class="input-text" id="login-password" name="login[password]" data-validate="{required:true}"/>
- </div>
- </li>
- <?php echo $this->getChildHtml('login.form.additional.info'); ?>
- <?php echo $this->getChildHtml('persistent.remember.me'); ?>
- </ul>
- <input name="context" type="hidden" value="checkout" />
- </fieldset>
- </form>
- </div>
-</div>
-<div class="col2-set">
- <div class="col-1">
- <div class="buttons-set">
- <p class="required"> </p>
- <?php if ($this->isAllowedGuestCheckout()): ?>
- <button id="onepage-guest-register-button" type="button" class="button" data-checkout='{"isGuestCheckoutAllowed":true}'><span><span><?php echo __('Continue') ?></span></span></button>
- <?php elseif ($this->helper('Magento\Checkout\Helper\Data')->isCustomerMustBeLogged()): ?>
- <button id="onepage-guest-register-button" type="button" class="button" data-checkout='{"isGuestCheckoutAllowed":false, "registrationUrl":"<?php echo $this->helper('Magento\Checkout\Helper\Url')->getRegistrationUrl();?>"}'><span><span><?php echo __('Register') ?></span></span></button>
- <?php else: ?>
- <form action="<?php echo $this->getUrl('persistent/index/saveMethod'); ?>">
- <button id="onepage-guest-register-button" type="submit" class="button"><span><span><?php echo __('Register') ?></span></span></button>
- </form>
- <?php endif; ?>
- <span class="please-wait" style="display:none;">
- <img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="" class="v-middle" /> <?php echo __('Loading next step...') ?>
- </span>
- </div>
- </div>
- <div class="col-2">
- <div class="buttons-set">
- <p class="required"><?php echo __('* Required Fields') ?></p>
- <a href="<?php echo $this->getUrl('customer/account/forgotpassword') ?>" class="f-left"><?php echo __('Forgot your password?') ?></a>
- <button type="submit" class="button" data-action='login-form-submit'><span><span><?php echo __('Login') ?></span></span></button>
- </div>
- </div>
-</div>
-<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() {
- $('#login-form').validation();
- }
- )}
- )(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Persistent/customer/form/login.phtml b/app/design/frontend/magento_backup/Magento_Persistent/customer/form/login.phtml
deleted file mode 100644
index b1fa1238995..00000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/customer/form/login.phtml
+++ /dev/null
@@ -1,103 +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
-/**
- * Customer login form template
- *
- * @see app/code/Magento/Customer/view/frontend/form/login.phtml
- */
-/** @var $this \Magento\Customer\Block\Form\Login */
-?>
-<div class="account-login">
- <div class="page-title">
- <h1><?php echo __('Log in or create an account.') ?></h1>
- </div>
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
- <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="login-form">
- <div class="col2-set">
- <div class="col-1 new-users">
- <div class="content">
- <h2><?php echo __('New Customers') ?></h2>
- <p><?php echo __('With your own account, you can check out faster, store multiple shipping addesses, see your shopping activity and more.') ?></p>
- </div>
- </div>
- <div class="col-2 registered-users">
- <div class="content">
- <h2><?php echo __('Registered Customers') ?></h2>
- <p><?php echo __('If you have an account with us, please log in.') ?></p>
- <ul class="form-list">
- <li>
- <label for="email" class="required"><em>*</em><?php echo __('Email Address') ?></label>
- <div class="input-box">
- <input type="text" name="login[username]" value="<?php echo $this->escapeHtml($this->getUsername()) ?>" id="email" class="input-text" title="<?php echo __('Email Address') ?>" data-validate="{required:true, 'validate-email':true}" />
- </div>
- </li>
- <li>
- <label for="pass" class="required"><em>*</em><?php echo __('Password') ?></label>
- <div class="input-box">
- <input type="password" name="login[password]" class="input-text" id="pass" title="<?php echo __('Password') ?>" data-validate="{required:true, 'validate-password':true}" />
- </div>
- </li>
- <?php echo $this->getChildHtml('form.additional.info'); ?>
- <?php echo $this->getChildHtml('persistent.remember.me'); ?>
- </ul>
- <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
- <p class="required"><?php echo __('* Required Fields') ?></p>
- </div>
- </div>
- </div>
- <div class="col2-set">
- <div class="col-1 new-users">
- <div class="buttons-set">
- <button type="button" title="<?php echo __('Create an Account') ?>" class="button"><span><span><?php echo __('Create an Account') ?></span></span></button>
- </div>
- </div>
- <div class="col-2 registered-users">
- <div class="buttons-set">
- <a href="<?php echo $this->getForgotPasswordUrl() ?>" class="f-left"><?php echo __('Forgot Your Password?') ?></a>
- <button type="submit" class="button" title="<?php echo __('Login') ?>" name="send" id="send2"><span><span><?php echo __('Login') ?></span></span></button>
- </div>
- </div>
- </div>
- <?php if ($this->helper('Magento\Checkout\Helper\Data')->isContextCheckout()): ?>
- <input name="context" type="hidden" value="checkout" />
- <?php endif; ?>
- </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() {
- $('#login-form').validation().find('div.new-users button')
- .on('click', function() {window.location='<?php echo $this->helper('Magento\Persistent\Helper\Data')->getCreateAccountUrl($this->getCreateAccountUrl()) ?>';});
- });
- })(jQuery);
- </script>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Persistent/customer/form/register.phtml b/app/design/frontend/magento_backup/Magento_Persistent/customer/form/register.phtml
deleted file mode 100644
index 642e7a74eb1..00000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/customer/form/register.phtml
+++ /dev/null
@@ -1,223 +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
-/**
- * Create account form template
- *
- * @see app/code/Magento/Customer/view/frontend/form/register.phtml
- */
-/** @var $this \Magento\Customer\Block\Form\Register */
-?>
-<div class="account-create">
- <div class="page-title">
- <h1><?php echo __('Create an Account') ?></h1>
- </div>
- <?php echo $this->getChildHtml('form_fields_before')?>
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
- <form action="<?php echo $this->getPostActionUrl() ?>" method="post" id="form-validate">
- <div class="fieldset">
- <input type="hidden" name="success_url" value="<?php echo $this->getSuccessUrl() ?>" />
- <input type="hidden" name="error_url" value="<?php echo $this->getErrorUrl() ?>" />
- <h2 class="legend"><?php echo __('Personal Information') ?></h2>
- <ul class="form-list">
- <li class="fields">
- <?php echo $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($this->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
- </li>
- <li>
- <label for="email_address" class="required"><em>*</em><?php echo __('Email Address') ?></label>
- <div class="input-box">
- <input type="text" name="email" id="email_address" value="<?php echo $this->escapeHtml($this->getFormData()->getEmail()) ?>" title="<?php echo __('Email Address') ?>" class="input-text" data-validate="{required:true, 'validate-email':true}" />
- </div>
- </li>
- <?php if ($this->isNewsletterEnabled()): ?>
- <li class="control">
- <div class="input-box">
- <input type="checkbox" name="is_subscribed" title="<?php echo __('Sign Up for Newsletter') ?>" value="1" id="is_subscribed"<?php if($this->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox" />
- </div>
- <label for="is_subscribed"><?php echo __('Sign Up for Newsletter') ?></label>
- </li>
- <?php endif ?>
- <?php $_dob = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob') ?>
- <?php if ($_dob->isEnabled()): ?>
- <li><?php echo $_dob->setDate($this->getFormData()->getDob())->toHtml() ?></li>
- <?php endif ?>
- <?php $_taxvat = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Taxvat') ?>
- <?php if ($_taxvat->isEnabled()): ?>
- <li><?php echo $_taxvat->setTaxvat($this->getFormData()->getTaxvat())->toHtml() ?></li>
- <?php endif ?>
- <?php $_gender = $this->getLayout()->createBlock('Magento\Customer\Block\Widget\Gender') ?>
- <?php if ($_gender->isEnabled()): ?>
- <li><?php echo $_gender->setGender($this->getFormData()->getGender())->toHtml() ?></li>
- <?php endif ?>
- </ul>
- </div>
- <?php if($this->getShowAddressFields()): ?>
- <div class="fieldset">
- <input type="hidden" name="create_address" value="1" />
- <h2 class="legend"><?php echo __('Address Information') ?></h2>
- <ul class="form-list">
- <li class="fields">
- <div class="field">
- <label for="company"><?php echo __('Company') ?></label>
- <div class="input-box">
- <input type="text" name="company" id="company" value="<?php echo $this->escapeHtml($this->getFormData()->getCompany()) ?>" title="<?php echo __('Company') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>" />
- </div>
- </div>
- <div class="field">
- <label for="telephone" class="required"><em>*</em><?php echo __('Telephone') ?></label>
- <div class="input-box">
- <input type="text" name="telephone" id="telephone" value="<?php echo $this->escapeHtml($this->getFormData()->getTelephone()) ?>" title="<?php echo __('Telephone') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>" />
- </div>
- </div>
- </li>
- <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
- <li class="wide">
- <label for="street_1" class="required"><em>*</em><?php echo __('Street Address') ?></label>
- <div class="input-box">
- <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet(1)) ?>" title="<?php echo __('Street Address') ?>" id="street_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="wide">
- <div class="input-box">
- <input type="text" name="street[]" value="<?php echo $this->escapeHtml($this->getFormData()->getStreet($_i)) ?>" title="<?php echo __('Street Address %1', $_i) ?>" id="street_<?php echo $_i ?>" class="input-text <?php echo $_streetValidationClass ?>" />
- </div>
- </li>
- <?php endfor; ?>
- <li class="fields">
- <div class="field">
- <label for="city" class="required"><em>*</em><?php echo __('City') ?></label>
- <div class="input-box">
- <input type="text" name="city" value="<?php echo $this->escapeHtml($this->getFormData()->getCity()) ?>" title="<?php echo __('City') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="city" />
- </div>
- </div>
- <div class="field">
- <label for="region_id" class="required"><em>*</em><?php echo __('State/Province') ?></label>
- <div class="input-box">
- <select id="region_id" name="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="region" name="region" value="<?php echo $this->escapeHtml($this->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="zip" class="required"><em>*</em><?php echo __('Zip/Postal Code') ?></label>
- <div class="input-box">
- <input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getFormData()->getPostcode()) ?>" title="<?php echo __('Zip/Postal Code') ?>" id="zip" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" />
- </div>
- </div>
- <div class="field">
- <label for="country" class="required"><em>*</em><?php echo __('Country') ?></label>
- <div class="input-box">
- <?php echo $this->getCountryHtmlSelect() ?>
- </div>
- </div>
- </li>
- </ul>
- <input type="hidden" name="default_billing" value="1" />
- <input type="hidden" name="default_shipping" value="1" />
- </div>
- <?php endif; ?>
- <div class="fieldset">
- <h2 class="legend"><?php echo __('Login Information') ?></h2>
- <ul class="form-list">
- <li class="fields">
- <div class="field">
- <label for="password" class="required"><em>*</em><?php echo __('Password') ?></label>
- <div class="input-box">
- <input type="password" name="password" id="password" title="<?php echo __('Password') ?>" class="input-text" data-validate="{required:true, 'validate-password':true}"/>
- </div>
- </div>
- <div class="field">
- <label for="confirmation" class="required"><em>*</em><?php echo __('Confirm Password') ?></label>
- <div class="input-box">
- <input type="password" name="confirmation" title="<?php echo __('Confirm Password') ?>" id="confirmation" class="input-text" data-validate="{required:true, equalTo:'#password'}"/>
- </div>
- </div>
- </li>
- <?php echo $this->getChildHtml('form.additional.info'); ?>
- <?php echo $this->getChildHtml('persistent.remember.me'); ?>
- </ul>
- <?php echo $this->getChildHtml('persistent.remember.me.tooltip'); ?>
- </div>
- <div class="buttons-set">
- <p class="required"><?php echo __('* Required Fields') ?></p>
- <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>" class="back-link"><small>« </small><?php echo __('Back') ?></a></p>
- <button type="submit" title="<?php echo __('Submit') ?>" class="button"><span><span><?php echo __('Submit') ?></span></span></button>
- </div>
- <?php if ($this->helper('Magento\Checkout\Helper\Data')->isContextCheckout()): ?>
- <input name="context" type="hidden" value="checkout" />
- <?php endif; ?>
- </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') ?>",
- "<?php echo $this->getViewFileUrl('Magento_Checkout::js/region-updater.js') ?>",
- <?php if ($_dob->isEnabled()): ?>
- "<?php echo $this->getViewFileUrl('mage/validation/dob-rule.js') ?>",
- <?php endif ?>
- function() {
- var dataForm = $('#form-validate').validation({
- <?php if ($_dob->isEnabled()): ?>
- errorPlacement: function(error, element) {
- if (element.prop('id') === 'dob') {
- var dobElement = $('.customer-dob'),
- errorClass = error.prop('class');
- error.insertAfter(element.parent());
- dobElement.find('.validate-custom').addClass(errorClass)
- .after('<div class="' + errorClass + '"></div>');
- }
- else {
- error.insertAfter(element);
- }
- },
- ignore: ':hidden:not(#dob)'
- <?php endif ?>
- });
- <?php if($this->getShowAddressFields()): ?>
- $('#country').regionUpdater({
- optionalRegionAllowed: <?php echo ($this->getConfig('general/region/display_all')? 'true' : 'false'); ?>,
- regionListId: '#region_id',
- regionInputId: '#region',
- postcodeId: '#zip',
- form: dataForm,
- regionJson: <?php echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
- defaultRegion: "<?php echo $this->getFormData()->getRegionId() ?>",
- countriesWithOptionalZip: <?php echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
- });
- <?php endif; ?>
- });
- })(jQuery);
- </script>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Persistent/layout/override/checkout_onepage_index.xml b/app/design/frontend/magento_backup/Magento_Persistent/layout/override/checkout_onepage_index.xml
deleted file mode 100644
index 9fddb3a4ddb..00000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/layout/override/checkout_onepage_index.xml
+++ /dev/null
@@ -1,40 +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="checkout.onepage.login">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">Magento_Persistent::checkout/onepage/login.phtml</argument>
- </action>
- block class="Magento\Persistent\Block\Form\Remember" name="checkout.onepage.login.persistent.remember.me" as="persistent.remember.me" template="remember_me.phtml"/>
- </referenceBlock>
- <referenceBlock name="checkout.onepage.billing">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">Magento_Persistent::checkout/onepage/billing.phtml</argument>
- </action>
- <block class="Magento\Persistent\Block\Form\Remember" name="checkout.onepage.billing.persistent.remember.me" as="persistent.remember.me" template="remember_me.phtml"/>
- <block class="Magento\View\Block\Template" name="checkout.onepage.billing.persistent.remember.me.tooltip" as="persistent.remember.me.tooltip" template="Magento_Persistent::remember_me_tooltip.phtml"/>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Persistent/layout/override/customer_account_create.xml b/app/design/frontend/magento_backup/Magento_Persistent/layout/override/customer_account_create.xml
deleted file mode 100644
index d6684926c37..00000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/layout/override/customer_account_create.xml
+++ /dev/null
@@ -1,34 +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="customer_form_register">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">Magento_Persistent::customer/form/register.phtml</argument>
- </action>
- <block class="Magento\Persistent\Block\Form\Remember" name="customer_form_register.persistent.remember.me" as="persistent.remember.me" template="remember_me.phtml"/>
- <block class="Magento\View\Block\Template" name="customer_form_register.persistent.remember.me.tooltip" as="persistent.remember.me.tooltip" template="Magento_Persistent::remember_me_tooltip.phtml"/>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Persistent/layout/override/customer_account_login.xml b/app/design/frontend/magento_backup/Magento_Persistent/layout/override/customer_account_login.xml
deleted file mode 100644
index d840de5dc3a..00000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/layout/override/customer_account_login.xml
+++ /dev/null
@@ -1,34 +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="customer_form_login">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">Magento_Persistent::customer/form/login.phtml</argument>
- </action>
- <block class="Magento\Persistent\Block\Form\Remember" name="customer_form_login.persistent.remember.me" as="persistent.remember.me" template="remember_me.phtml"/>
- <block class="Magento\View\Block\Template" name="customer_form_login.persistent.remember.me.tooltip" as="persistent.remember.me.tooltip" template="Magento_Persistent::remember_me_tooltip.phtml"/>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Persistent/remember-me-popup.js b/app/design/frontend/magento_backup/Magento_Persistent/remember-me-popup.js
deleted file mode 100644
index 2e04ae6ee6c..00000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/remember-me-popup.js
+++ /dev/null
@@ -1,106 +0,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.
- *
- * @category frontend Persistent remember me popup
- * @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 ($) {
- $.widget('mage.rememberMePopup', {
- options: {
- closeBtn: '.btn-close',
- windowOverlayTemplate: '<div class="window-overlay"></div>',
- popupBlockTemplate: '<div class="popup-block block popup-remember-tip active">' +
- '<div class="block-title">' +
- '<strong>${title}</strong>' +
- '<div class="btn-close"></div>' +
- '</div>' +
- '<div class="block-content">' +
- '<p>${content}</p>' +
- '<div class="buttons-set">' +
- '<button class="button btn-close" type="button">' +
- '<span>' +
- '<span>Close</span>' +
- '</span>' +
- '</button>' +
- '</div>' +
- '</div>' +
- '</div>'
- },
-
- _create: function() {
- this._renderWindowOverLay();
- this._renderPopupBlock();
- $('body').append(this.windowOverlay.hide());
- $('body').append(this.popupBlock.hide());
- this.element.find('a').on('click', $.proxy(this._showPopUp, this));
- },
-
- /**
- * Add windowOverlay block to body
- * If windowOverlay is not an option, use default template
- * @private
- */
- _renderWindowOverLay: function() {
- if (this.options.windowOverlay) {
- this.windowOverlay = $(this.options.windowOverlay);
- } else {
- $.template('windowOverlayTemplate', this.options.windowOverlayTemplate);
- this.windowOverlay = $.tmpl('windowOverlayTemplate').hide();
- }
- this.windowOverlay.height($('body').height());
- },
-
- /**
- * Add popupBlock to body
- * If popupBlock is not an option, use default template
- * @private
- */
- _renderPopupBlock: function() {
- if (this.options.popupBlock) {
- this.popupBlock = $(this.options.popupBlock);
- } else {
- $.template('popupBlockTemplate', this.options.popupBlockTemplate);
- this.popupBlock = $.tmpl('popupBlockTemplate',
- {title: this.options.title, content: this.options.content});
- }
- this.popupBlock.find(this.options.closeBtn).on('click', $.proxy(this._hidePopUp, this));
- },
-
- /**
- * show windowOverlay and popupBlock
- * @private
- */
- _showPopUp: function() {
- this.windowOverlay.show();
- this.popupBlock.show();
- },
-
- /**
- * hide windowOverlay and popupBlock
- * @private
- */
- _hidePopUp: function() {
- this.windowOverlay.hide();
- this.popupBlock.hide();
- }
- });
-})(jQuery);
\ No newline at end of file
diff --git a/app/design/frontend/magento_backup/Magento_Persistent/remember_me.phtml b/app/design/frontend/magento_backup/Magento_Persistent/remember_me.phtml
deleted file mode 100644
index ec0bfa722f7..00000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/remember_me.phtml
+++ /dev/null
@@ -1,41 +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
-/**
- * Customer "Remember Me" template
- *
- * @var $this \Magento\Persistent\Block\Form\Remember
- */
-?>
-<li id="remember-me-box" class="control">
- <?php $rememberMeId = 'remember_me' . $this->helper('Magento\Core\Helper\Data')->getRandomString(10); ?>
- <div class="input-box">
- <input type="checkbox" name="persistent_remember_me" class="checkbox" id="<?php echo $rememberMeId; ?>"<?php if ($this->isRememberMeChecked()): ?> checked="checked"<?php endif; ?> title="<?php echo __('Remember Me') ?>" />
- </div>
- <label for="<?php echo $rememberMeId; ?>"><?php echo __('Remember Me') ?></label>
- <a class="link-tip" href="#"><?php echo __('What\'s this?') ?></a>
-</li>
diff --git a/app/design/frontend/magento_backup/Magento_Persistent/remember_me_tooltip.phtml b/app/design/frontend/magento_backup/Magento_Persistent/remember_me_tooltip.phtml
deleted file mode 100644
index 08cf4d99568..00000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/remember_me_tooltip.phtml
+++ /dev/null
@@ -1,59 +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
-/**
- * "Remember Me" popup template (when click on "What's this?")
- *
- */
-/** @var $this \Magento\View\Block\Template */
-?>
-<div id="window-overlay" class="window-overlay" style="display:none;"></div>
-<div id="remember-me-popup" class="remember-me-popup" style="display:none;">
- <div class="remember-me-popup-head">
- <h3>What's this?</h3>
- <a href="#" class="remember-me-popup-close" title="<?php echo __('Close') ?>"><?php echo __('Close') ?></a>
- </div>
- <div class="remember-me-popup-body">
- <p>Checking "Remember Me" will let you access your shopping cart on this computer when you are logged out</p>
- <div class="remember-me-popup-close-button a-right">
- <a href="#" class="remember-me-popup-close button" title="<?php echo __('Close') ?>"><span><?php echo __('Close') ?></span></a>
- </div>
- </div>
-</div>
-<script type="text/javascript">
- (function($) {
- head.js(
- "<?php echo $this->getViewFileUrl('Magento_Persistent::remember-me-popup.js') ?>",
- function() {
- $('#remember-me-box').rememberMePopup({
- windowOverlay: '#window-overlay',
- popupBlock: '#remember-me-popup',
- closeBtn: '.remember-me-popup-close'
- });
- });
- })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Persistent/splitbutton.js b/app/design/frontend/magento_backup/Magento_Persistent/splitbutton.js
deleted file mode 100644
index ef7b137e3dc..00000000000
--- a/app/design/frontend/magento_backup/Magento_Persistent/splitbutton.js
+++ /dev/null
@@ -1,74 +0,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.
- *
- * @category Magento
- * @package Magento_Persistent
- * @copyright Copyright (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($, undefined) {
- "use strict";
- $.widget('mage.splitButton', {
- /**
- * options with default values
- */
- options: {
- splitButton: '.split-button',
- arrowButton: '.change',
- activeClass: 'active'
- },
-
- /**
- * Initialize split button events
- * @private
- */
- _create: function() {
- $(document).on('click', this.options.splitButton + ' > ' + this.options.arrowButton, $.proxy(this._toggleDropDown, this));
- $(document).on('click', $.proxy(this._hideDropDown, this));
- },
-
- /**
- * Toggle css class for the split button to hide or show drop down menu
- * Saves current state of the target. Closes all open drop downs and then
- * depending on the stored state the target drop down is toggled.
- * @private
- * @param {Object} e
- */
- _toggleDropDown: function(e) {
- var state = $(e.target).closest(this.options.splitButton).hasClass(this.options.activeClass);
- this._hideDropDown();
- if (state) {
- this._hideDropDown();
- } else {
- $(e.target).closest(this.options.splitButton).addClass(this.options.activeClass);
- }
- return false;
- },
-
- /**
- * Hide all the drop down menus when clicked any where on the page
- * @private
- */
- _hideDropDown: function() {
- $(document).find(this.options.splitButton).removeClass(this.options.activeClass);
- }
- });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_ProductAlert/email/price.phtml b/app/design/frontend/magento_backup/Magento_ProductAlert/email/price.phtml
deleted file mode 100644
index 58a16bc4fa2..00000000000
--- a/app/design/frontend/magento_backup/Magento_ProductAlert/email/price.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
- * @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 ($_products = $this->getProducts()): ?>
-<p><?php echo __('You are receiving this notification because you subscribed to receive alerts when the prices for the following products changed:') ?></p>
-<table>
-<?php foreach ($_products as $_product): ?>
- <tr>
- <td><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>"><img src="<?php echo $_product->getThumbnailUrl() ?>" border="0" align="left" height="75" width="75" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" /></a></td>
- <td>
- <p><a href="<?php echo $_product->getProductUrl() ?>"><strong><?php echo $this->escapeHtml($_product->getName()) ?></strong></a></p>
- <?php if ($shortDescription = $this->escapeHtml($_product->getShortDescription())): ?>
- <p><small><?php echo $shortDescription ?></small></p>
- <?php endif; ?>
- <p><?php if ($_product->getPrice() != $_product->getFinalPrice()): ?>
- <?php echo __('Regular Price:') ?> <strong style="text-decoration:line-through;"><?php echo $this->helper('Magento\Core\Helper\Data')->currency($_product->getPrice()) ?></strong><br />
- <strong><?php echo __('Special price:') ?> <span style="color:#FF0000;"><?php echo $this->helper('Magento\Core\Helper\Data')->currency($_product->getFinalPrice()) ?></span></strong>
- <?php else: ?>
- <strong><?php echo __('Price:') ?></strong> <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_product->getPrice()) ?>
- <?php endif; ?></p>
- <p><small><a href="<?php echo $this->getProductUnsubscribeUrl($_product->getId()) ?>"><?php echo __('Click here not to receive alerts for this product.') ?></a></small></p>
- </td>
- </tr>
-<?php endforeach; ?>
-</table>
-<p><a href="<?php echo $this->getUnsubscribeUrl() ?>"><?php echo __('Unsubscribe from all price alerts') ?></a></p>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_ProductAlert/email/stock.phtml b/app/design/frontend/magento_backup/Magento_ProductAlert/email/stock.phtml
deleted file mode 100644
index c84f26c0420..00000000000
--- a/app/design/frontend/magento_backup/Magento_ProductAlert/email/stock.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
- * @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 ($_products = $this->getProducts()): ?>
-<p><?php echo __('You are receiving this notification because you subscribed to receive alerts when the following products are back in stock:') ?></p>
-<table>
-<?php foreach ($_products as $_product): ?>
- <tr>
- <td><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->escapeHtml($_product->getName()) ?>"><img src="<?php echo $this->getThumbnailUrl($_product) ?>" width="<?php echo $this->getThumbnailSize()?>" height="<?php echo $this->getThumbnailSize()?>" border="0" align="left" alt="<?php echo $this->escapeHtml($_product->getName()) ?>" /></a></td>
- <td>
- <p><a href="<?php echo $_product->getProductUrl() ?>"><strong><?php echo $this->escapeHtml($_product->getName()) ?></strong></a></p>
- <?php if ($shortDescription = $this->escapeHtml($_product->getShortDescription())): ?>
- <p><small><?php echo $shortDescription ?></small></p>
- <?php endif; ?>
- <p><?php if ($_product->getPrice() != $_product->getFinalPrice()): ?>
- <?php echo __('Regular Price:') ?> <strong style="text-decoration:line-through;"><?php echo $this->helper('Magento\Core\Helper\Data')->currency($_product->getPrice()) ?></strong><br />
- <strong><?php echo __('Special price:') ?> <span style="color:#FF0000;"><?php echo $this->helper('Magento\Core\Helper\Data')->currency($_product->getFinalPrice()) ?></span></strong>
- <?php else: ?>
- <strong><?php echo __('Price:') ?></strong> <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_product->getPrice()) ?>
- <?php endif; ?></p>
- <p><small><a href="<?php echo $this->getProductUnsubscribeUrl($_product->getId()) ?>"><?php echo __('Click here not to receive alerts for this product.') ?></a></small></p>
- </td>
- </tr>
-<?php endforeach; ?>
-</table>
-<p><a href="<?php echo $this->getUnsubscribeUrl() ?>"><?php echo __('Unsubscribe from all stock alerts') ?></a></p>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_ProductAlert/layout/override/catalog_product_view.xml b/app/design/frontend/magento_backup/Magento_ProductAlert/layout/override/catalog_product_view.xml
deleted file mode 100644
index b51304a8eb8..00000000000
--- a/app/design/frontend/magento_backup/Magento_ProductAlert/layout/override/catalog_product_view.xml
+++ /dev/null
@@ -1,49 +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">
- <referenceBlock name="product.info">
- <referenceContainer name="alert.urls">
- <block class="Magento\ProductAlert\Block\Product\View\Price" name="productalert.price" as="productalert_price" template="product/view.phtml">
- <action method="setHtmlClass">
- <argument name="value" xsi:type="string">alert-price link-price-alert</argument>
- </action>
- <action method="setSignupLabel">
- <argument translate="true" name="value" xsi:type="string">Sign up for price alert</argument>
- </action>
- </block>
- <block class="Magento\ProductAlert\Block\Product\View\Stock" name="productalert.stock" as="productalert_stock" template="product/view.phtml">
- <action method="setHtmlClass">
- <argument name="value" xsi:type="string">alert-stock link-stock-alert</argument>
- </action>
- <action method="setSignupLabel">
- <argument translate="true" name="value" xsi:type="string">Sign up to be notified when this product is back in stock.</argument>
- </action>
- </block>
- </referenceContainer>
- </referenceBlock>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_ProductAlert/product/view.phtml b/app/design/frontend/magento_backup/Magento_ProductAlert/product/view.phtml
deleted file mode 100644
index e4dc918d78b..00000000000
--- a/app/design/frontend/magento_backup/Magento_ProductAlert/product/view.phtml
+++ /dev/null
@@ -1,30 +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\ProductAlert\Block\Product\View */?>
-<p class="<?php echo $this->getHtmlClass() ?>">
- <a href="<?php echo $this->escapeHtml($this->getSignupUrl()) ?>" title="<?php echo $this->escapeHtml(__($this->getSignupLabel())); ?>"><?php echo $this->escapeHtml(__($this->getSignupLabel())); ?></a>
-</p>
diff --git a/app/design/frontend/magento_backup/Magento_Rating/detailed.phtml b/app/design/frontend/magento_backup/Magento_Rating/detailed.phtml
deleted file mode 100644
index dab3092a662..00000000000
--- a/app/design/frontend/magento_backup/Magento_Rating/detailed.phtml
+++ /dev/null
@@ -1,46 +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 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
deleted file mode 100644
index 9550332092f..00000000000
--- a/app/design/frontend/magento_backup/Magento_Review/customer/list.phtml
+++ /dev/null
@@ -1,64 +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 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
deleted file mode 100644
index 89d647e1389..00000000000
--- a/app/design/frontend/magento_backup/Magento_Review/customer/recent.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
- * @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
deleted file mode 100644
index fb5ff833437..00000000000
--- a/app/design/frontend/magento_backup/Magento_Review/customer/view.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
- * @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
deleted file mode 100644
index b100e03a94c..00000000000
--- a/app/design/frontend/magento_backup/Magento_Review/form.phtml
+++ /dev/null
@@ -1,118 +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)
- */
-?>
-<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
deleted file mode 100644
index 8df9aa10d6e..00000000000
--- a/app/design/frontend/magento_backup/Magento_Review/helper/summary.phtml
+++ /dev/null
@@ -1,42 +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 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
deleted file mode 100644
index 9c36b10f00f..00000000000
--- a/app/design/frontend/magento_backup/Magento_Review/helper/summary_short.phtml
+++ /dev/null
@@ -1,38 +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 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_backup/Magento_Review/layout/override/review_product_view.xml b/app/design/frontend/magento_backup/Magento_Review/layout/override/review_product_view.xml
deleted file mode 100644
index a2a84f9f112..00000000000
--- a/app/design/frontend/magento_backup/Magento_Review/layout/override/review_product_view.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)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="root">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">2columns-right.phtml</argument>
- </action>
- </referenceBlock>
- <referenceContainer name="content">
- <block class="Magento\Review\Block\View" name="review_view"/>
- </referenceContainer>
-</layout>
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
deleted file mode 100644
index dda634ca062..00000000000
--- a/app/design/frontend/magento_backup/Magento_Review/product/view/list.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
- * @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_backup/Magento_Review/view.phtml b/app/design/frontend/magento_backup/Magento_Review/view.phtml
deleted file mode 100644
index 01fa89847fe..00000000000
--- a/app/design/frontend/magento_backup/Magento_Review/view.phtml
+++ /dev/null
@@ -1,72 +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 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()); ?>" height="125" width="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 __('Product 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>
- </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>
- </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>
- </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Rss/list.phtml b/app/design/frontend/magento_backup/Magento_Rss/list.phtml
deleted file mode 100644
index 9d5ffcb1ad8..00000000000
--- a/app/design/frontend/magento_backup/Magento_Rss/list.phtml
+++ /dev/null
@@ -1,68 +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
- $_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
deleted file mode 100644
index 65ac7e0519d..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/billing/agreement/view.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
- * @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
deleted file mode 100644
index 96eae811fce..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/billing/agreements.phtml
+++ /dev/null
@@ -1,99 +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\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
deleted file mode 100644
index 04b959d9046..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/email/creditmemo/items.phtml
+++ /dev/null
@@ -1,51 +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 $_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
deleted file mode 100644
index 7d524105278..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/email/invoice/items.phtml
+++ /dev/null
@@ -1,51 +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 $_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
deleted file mode 100644
index a065eb81f28..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/email/items.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
- * @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
deleted file mode 100644
index 9830ad8e2b0..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/email/items/creditmemo/default.phtml
+++ /dev/null
@@ -1,124 +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 $_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
deleted file mode 100644
index 9830ad8e2b0..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/email/items/invoice/default.phtml
+++ /dev/null
@@ -1,124 +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 $_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
deleted file mode 100644
index e756d28ce81..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/email/items/order/default.phtml
+++ /dev/null
@@ -1,140 +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\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
deleted file mode 100644
index 976391afcf9..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/email/items/shipment/default.phtml
+++ /dev/null
@@ -1,47 +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 $_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
deleted file mode 100644
index cd07aee2258..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/email/shipment/items.phtml
+++ /dev/null
@@ -1,47 +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 $_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
deleted file mode 100644
index f27a6fa3aff..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/email/shipment/track.phtml
+++ /dev/null
@@ -1,46 +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 $_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
deleted file mode 100644
index 9c464b246d1..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/gift-message.js
+++ /dev/null
@@ -1,74 +0,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.
- *
- * @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
deleted file mode 100644
index 95208cfceba..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/guest/form.phtml
+++ /dev/null
@@ -1,85 +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 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
deleted file mode 100644
index 4a86287bbdf..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/checkout_onepage_index.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">
- <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
deleted file mode 100644
index 75eef0fe596..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/customer_account.xml
+++ /dev/null
@@ -1,50 +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="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
deleted file mode 100644
index 086f4708782..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_billing_agreement_index.xml
+++ /dev/null
@@ -1,36 +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="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
deleted file mode 100644
index 0b65274f462..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_billing_agreement_view.xml
+++ /dev/null
@@ -1,36 +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="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
deleted file mode 100644
index 7ea035f98da..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_creditmemo_items.xml
+++ /dev/null
@@ -1,41 +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="Email Creditmemo Items List" design_abstraction="custom">
- <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
deleted file mode 100644
index 4e00ef875dc..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_invoice_items.xml
+++ /dev/null
@@ -1,41 +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="Email Invoice Items List" design_abstraction="custom">
- <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
deleted file mode 100644
index af7fc72ac54..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_items.xml
+++ /dev/null
@@ -1,45 +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="Email Order Items List" design_abstraction="custom">
- <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
deleted file mode 100644
index 4832ea1604f..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_email_order_shipment_items.xml
+++ /dev/null
@@ -1,31 +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="Email Shipment Items List" design_abstraction="custom">
- <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
deleted file mode 100644
index c50c9379fff..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_creditmemo.xml
+++ /dev/null
@@ -1,54 +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="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
deleted file mode 100644
index 8d41209b100..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_form.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)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <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
deleted file mode 100644
index e4ccd347f32..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_invoice.xml
+++ /dev/null
@@ -1,54 +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="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_backup/Magento_Sales/layout/override/sales_guest_print.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_print.xml
deleted file mode 100644
index d7fc7d72bf8..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_print.xml
+++ /dev/null
@@ -1,46 +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\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>
- <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>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printcreditmemo.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printcreditmemo.xml
deleted file mode 100644
index b5ec83caafc..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printcreditmemo.xml
+++ /dev/null
@@ -1,42 +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\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_printinvoice.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printinvoice.xml
deleted file mode 100644
index 66526bbbd78..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printinvoice.xml
+++ /dev/null
@@ -1,42 +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\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
deleted file mode 100644
index 89fe6aa71f0..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_printshipment.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\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
deleted file mode 100644
index fb11d85006e..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_reorder.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)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <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
deleted file mode 100644
index 0fb69339a3e..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_shipment.xml
+++ /dev/null
@@ -1,44 +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="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_backup/Magento_Sales/layout/override/sales_guest_view.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_view.xml
deleted file mode 100644
index 1b244284c3b..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_guest_view.xml
+++ /dev/null
@@ -1,53 +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="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\View" name="sales.order.view" after="sales.order.info">
- <block class="Magento\Sales\Block\Order\Items" name="order_items" template="order/items.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>
- <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
- </block>
- </block>
- </block>
- </referenceContainer>
- <update handle="sales_order_guest_info_links"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_creditmemo.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_creditmemo.xml
deleted file mode 100644
index 33570010113..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_creditmemo.xml
+++ /dev/null
@@ -1,51 +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="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\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_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_order_guest_info_links.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_guest_info_links.xml
deleted file mode 100644
index d01be782ea8..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_guest_info_links.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="sales.order.info">
- <block class="Magento\Page\Block\Links" as="links" name="sales.order.info.links">
- <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>
- <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/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/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/guest/creditmemo</argument>
- <argument name="label" xsi:type="string">Refunds</argument>
- </arguments>
- </block>
- </block>
- </referenceBlock>
-</layout>
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
deleted file mode 100644
index 7cef22b6c45..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_history.xml
+++ /dev/null
@@ -1,34 +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="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_backup/Magento_Sales/layout/override/sales_order_invoice.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_invoice.xml
deleted file mode 100644
index cdac844a115..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_invoice.xml
+++ /dev/null
@@ -1,51 +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="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\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_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_order_printcreditmemo.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printcreditmemo.xml
deleted file mode 100644
index 4621652be32..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printcreditmemo.xml
+++ /dev/null
@@ -1,43 +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\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>
- <container name="additional.product.info" label="Additional Product Info"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printinvoice.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printinvoice.xml
deleted file mode 100644
index f6b60f60528..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printinvoice.xml
+++ /dev/null
@@ -1,43 +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\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>
- <container name="additional.product.info" label="Additional Product Info"/>
-</layout>
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
deleted file mode 100644
index 4804aed2ab7..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_printshipment.xml
+++ /dev/null
@@ -1,33 +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\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_shipment.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_shipment.xml
deleted file mode 100644
index e3d20d51e69..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_shipment.xml
+++ /dev/null
@@ -1,41 +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="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_backup/Magento_Sales/layout/override/sales_order_view.xml b/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_view.xml
deleted file mode 100644
index aa583d3e525..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_order_view.xml
+++ /dev/null
@@ -1,50 +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="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\View" name="sales.order.view" after="sales.order.info">
- <block class="Magento\Sales\Block\Order\Items" name="order_items" template="order/items.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>
- <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
- </block>
- </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_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
deleted file mode 100644
index fa41d0ee611..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_index.xml
+++ /dev/null
@@ -1,45 +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="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
deleted file mode 100644
index 2b51b67e6a3..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_orders.xml
+++ /dev/null
@@ -1,50 +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="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
deleted file mode 100644
index d9775f02ef3..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_view.xml
+++ /dev/null
@@ -1,87 +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="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
deleted file mode 100644
index dae17f6f570..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/layout/override/sales_recurring_profile_view__tabs.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">
- <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\View\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\View\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\View\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\View\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_backup/Magento_Sales/order/comments.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/comments.phtml
deleted file mode 100644
index fcf34f53ce6..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/comments.phtml
+++ /dev/null
@@ -1,43 +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\Comments
- * @see \Magento\Sales\Block\Order\Comments
- */
-?>
-<?php if ($this->hasComments()):?>
- <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><?php echo $this->formatDate($_commentItem->getCreatedAtStoreDate(), 'medium', true) ?></dt>
- <dd><?php echo $this->escapeHtml($_commentItem->getComment()) ?></dd>
- <?php endforeach; ?>
- </dl>
- </div>
-<?php endif;?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo.phtml
deleted file mode 100644
index 3b8c8c263ad..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo.phtml
+++ /dev/null
@@ -1,32 +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)
- */
-?>
-<div class="order-items order-details">
- <?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>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items.phtml
deleted file mode 100644
index 004e32fa503..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items.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
- * @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>
-<?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" />
- <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>
- </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 echo $this->getCommentsHtml($_creditmemo)?>
-<?php endforeach; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items/renderer/default.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items/renderer/default.phtml
deleted file mode 100644
index d771a7efa8b..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/creditmemo/items/renderer/default.phtml
+++ /dev/null
@@ -1,302 +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 $_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->prepareSku($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()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?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()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
- </span>
- <?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">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- </span>
- <?php endif; ?>
- </td>
- <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()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
- </span>
- <?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">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <?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()->getWeeeTaxAppliedRowAmount()); ?>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
- </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">
- <?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
deleted file mode 100644
index 125c387f26f..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/history.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
- * @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
deleted file mode 100644
index 46a06098ebd..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/info.phtml
+++ /dev/null
@@ -1,92 +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\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
deleted file mode 100644
index da314fcbd1b..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/info/buttons.phtml
+++ /dev/null
@@ -1,38 +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() ?>
-<?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_backup/Magento_Sales/order/invoice.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/invoice.phtml
deleted file mode 100644
index bef92be0054..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/invoice.phtml
+++ /dev/null
@@ -1,32 +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)
- */
-?>
-<div class="order-items order-details">
- <?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>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/invoice/items.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/invoice/items.phtml
deleted file mode 100644
index dc4c5000e89..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/invoice/items.phtml
+++ /dev/null
@@ -1,61 +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() ?>
-<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): ?>
-<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><?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->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-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_backup/Magento_Sales/order/invoice/items/renderer/default.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/invoice/items/renderer/default.phtml
deleted file mode 100644
index 45313d94633..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/invoice/items/renderer/default.phtml
+++ /dev/null
@@ -1,299 +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 $_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->prepareSku($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()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?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()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
- </span>
- <?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">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- </span>
- <?php endif; ?>
- </td>
- <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()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
- </span>
- <?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">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <?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()->getWeeeTaxAppliedRowAmount()); ?>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
- </span>
- <?php endif; ?>
- <?php endif; ?>
-
-
-
- </span>
- <?php endif; ?>
- </td>
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/items.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/items.phtml
deleted file mode 100644
index d7511c2d2a3..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/items.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
- * @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" />
- <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 $_index = 0; ?>
- <?php $_count = $_items->count(); ?>
- <?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;">
- <?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>
- </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();
- });
- </script>
-<?php endif ?>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/items/renderer/default.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/items/renderer/default.phtml
deleted file mode 100644
index 8b96cbcb9fe..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/items/renderer/default.phtml
+++ /dev/null
@@ -1,323 +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 $_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>
- <?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 nl2br($this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) )) ?>
- </dd>
- <?php endif; ?>
- <?php endforeach; ?>
- </dl>
- <?php endif; ?>
- <?php $addtInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
- <?php if ($addtInfoBlock) :?>
- <?php echo $addtInfoBlock->setItem($_item)->toHtml(); ?>
- <?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>
- <?php endif; ?>
- </td>
- <td><?php echo $this->prepareSku($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()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?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()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
- </span>
- <?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">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- </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 />
- <?php endif; ?>
- <?php if ($this->getItem()->getQtyShipped() > 0): ?>
- <?php echo __('Shipped'); ?>: <strong><?php echo $this->getItem()->getQtyShipped()*1 ?></strong><br />
- <?php endif; ?>
- <?php if ($this->getItem()->getQtyCanceled() > 0): ?>
- <?php echo __('Canceled'); ?>: <strong><?php echo $this->getItem()->getQtyCanceled()*1 ?></strong><br />
- <?php endif; ?>
- <?php if ($this->getItem()->getQtyRefunded() > 0): ?>
- <?php echo __('Refunded'); ?>: <strong><?php echo $this->getItem()->getQtyRefunded()*1 ?></strong><br />
- <?php endif; ?>
- </span>
- </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()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
- </span>
- <?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">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <?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()->getWeeeTaxAppliedRowAmount()); ?>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
- </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()): ?>
- <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; ?>
- -->
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/order/print.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/print.phtml
deleted file mode 100644
index 41323417d0f..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/print.phtml
+++ /dev/null
@@ -1,85 +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() ?>
-<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
deleted file mode 100644
index ceba0157c74..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/print/creditmemo.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() ?>
-<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
deleted file mode 100644
index 58817c4e8b4..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/print/invoice.phtml
+++ /dev/null
@@ -1,94 +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() ?>
-<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
deleted file mode 100644
index b42a54d939e..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/print/shipment.phtml
+++ /dev/null
@@ -1,97 +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\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
deleted file mode 100644
index 4fb37abf552..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/recent.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
- * @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_backup/Magento_Sales/order/shipment.phtml b/app/design/frontend/magento_backup/Magento_Sales/order/shipment.phtml
deleted file mode 100644
index b6237c8c2f4..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/shipment.phtml
+++ /dev/null
@@ -1,32 +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)
- */
-?>
-<div class="order-items order-details">
- <?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>
-</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
deleted file mode 100644
index 2f9c3b96527..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/shipment/items.phtml
+++ /dev/null
@@ -1,89 +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() ?>
-<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
deleted file mode 100644
index 3ac8fc628ed..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/shipment/items/renderer/default.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
- * @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
deleted file mode 100644
index ff3477323e1..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/totals.phtml
+++ /dev/null
@@ -1,52 +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\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
deleted file mode 100644
index bc3cf4e0dae..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/trackinginfo.phtml
+++ /dev/null
@@ -1,67 +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)
- */
-?>
-<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
deleted file mode 100644
index 6022448f69e..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/order/view.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
- * @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
deleted file mode 100644
index 79af9c4a932..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/orders-returns.js
+++ /dev/null
@@ -1,50 +0,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.
- *
- * @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
deleted file mode 100644
index 5d2129cde3a..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/payment/form/billing/agreement.phtml
+++ /dev/null
@@ -1,41 +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\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
deleted file mode 100644
index 29dc6a233eb..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/recurring/grid.phtml
+++ /dev/null
@@ -1,80 +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\View\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
deleted file mode 100644
index ebd21c420e7..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/recurring/profile/view.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
- * @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
deleted file mode 100644
index bbdb4e6455c..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/recurring/profile/view/info.phtml
+++ /dev/null
@@ -1,47 +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\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_backup/Magento_Sales/recurring/profiles.phtml b/app/design/frontend/magento_backup/Magento_Sales/recurring/profiles.phtml
deleted file mode 100644
index 3d5101fcfbb..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/recurring/profiles.phtml
+++ /dev/null
@@ -1,41 +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\Recurring\Profiles */ ?>
-<div class="page-title">
- <h1><?php echo __('Recurring Billing Profiles') ?></h1>
-</div>
-
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-
-<div class="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>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Sales/reorder/sidebar.phtml b/app/design/frontend/magento_backup/Magento_Sales/reorder/sidebar.phtml
deleted file mode 100644
index 14f0a84ac2a..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/reorder/sidebar.phtml
+++ /dev/null
@@ -1,83 +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
-/**
- * Last order sidebar
- *
- * @see \Magento\Sale\Block\Reorder\Sidebar
- */
-?>
-<?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>
- <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">
- <?php if ($this->isItemAvailableForReorder($_item)): ?>
- <?php $_showAddButtonFlag = true ?>
- <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>
- </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>
- <?php endif; ?>
- <a href="<?php echo $this->getUrl('customer/account') ?>"><?php echo __('View All'); ?></a>
- </div>
- </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
deleted file mode 100644
index 50d6134f034..00000000000
--- a/app/design/frontend/magento_backup/Magento_Sales/widget/guest/form.phtml
+++ /dev/null
@@ -1,87 +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\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_backup/Magento_Shipping/layout/base/shipping_tracking_popup.xml b/app/design/frontend/magento_backup/Magento_Shipping/layout/base/shipping_tracking_popup.xml
deleted file mode 100644
index 75df863046a..00000000000
--- a/app/design/frontend/magento_backup/Magento_Shipping/layout/base/shipping_tracking_popup.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)
- */
--->
-<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>
- </action>
- </referenceBlock>
- <referenceContainer name="content">
- <block class="Magento\Shipping\Block\Tracking\Popup" name="shipping.tracking.popup" template="tracking/popup.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Shipping/tracking/popup.phtml b/app/design/frontend/magento_backup/Magento_Shipping/tracking/popup.phtml
deleted file mode 100644
index 66b76bc2434..00000000000
--- a/app/design/frontend/magento_backup/Magento_Shipping/tracking/popup.phtml
+++ /dev/null
@@ -1,177 +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\Shipping\Block\Tracking\Popup */ ?>
-<?php $_results = $this->getTrackingInfo(); ?>
-<div class="page-title title-buttons">
- <h1><?php echo __('Tracking Information'); ?></h1>
- <button class="button" onclick="window.close(); window.opener.focus();"><span><span><?php echo __('Close Window') ?></span></span></button>
-</div>
-<?php if(sizeof($_results)>0): ?>
-<?php foreach($_results as $shipid => $_result): ?>
- <?php if($shipid): ?>
- <h2 class="sub-title"><?php echo __('Shipment #').$shipid; ?></h2>
- <?php endif; ?>
- <?php if(sizeof($_result)>0): ?>
- <?php $rowCount = sizeof($_result); $counter = 1; ?>
- <?php $_id = 0; foreach($_result as $track): ?>
- <table class="tracking-table-popup data-table" id="tracking-table-popup-<?php echo $_id ?>">
- <col width="15%" />
- <col />
- <tbody>
- <?php if(is_object($track)): ?>
- <tr>
- <th class="label"><?php echo __('Tracking Number:'); ?></th>
- <td class="value"><?php echo $this->escapeHtml($track->getTracking()); ?></td>
- </tr>
- <?php if ($track->getCarrierTitle()): ?>
- <tr>
- <th class="label"><?php echo __('Carrier:'); ?></th>
- <td class="value"><?php echo $this->escapeHtml($track->getCarrierTitle()); ?></td>
- </tr>
- <?php endif; ?>
- <?php if($track->getErrorMessage()): ?>
- <tr>
- <th class="label"><?php echo __('Error:'); ?></th>
- <td class="error"><?php echo __('Tracking information is not available. Please '); if ($this->getContactUsEnabled()) : ?><a href="<?php echo $this->getContactUs() ?>" title="<?php echo __('contact us') ?>" onclick="this.target='_blank'"><?php echo __('contact us') ?></a><?php echo __(' for more information or '); endif; echo __('email us at '); ?><a href="mailto:<?php echo $this->getStoreSupportEmail() ?>"><?php echo $this->getStoreSupportEmail() ?></a></td>
- </tr>
- <?php elseif($track->getTrackSummary()): ?>
- <tr>
- <th class="label"><?php echo __('Info:'); ?></th>
- <td class="value"><?php echo $track->getTrackSummary(); ?></td>
- </tr>
- <?php elseif($track->getUrl()): ?>
- <tr>
- <th class="label"><?php echo __('Track:'); ?></th>
- <td class="value"><a href="<?php echo $this->escapeHtml($track->getUrl()); ?>" onclick="this.target='_blank'"><?php echo $this->escapeHtml($track->getUrl()); ?></a></td>
- </tr>
- <?php else: ?>
- <?php if ($track->getStatus()): ?>
- <tr>
- <th class="label"><?php echo __('Status:'); ?></th>
- <td class="value"><?php echo $track->getStatus(); ?></td>
- </tr>
- <?php endif; ?>
-
- <?php if ($track->getDeliverydate()): ?>
- <tr>
- <th class="label"><?php echo __('Delivered on:'); ?></th>
- <td class="value"><?php echo $this->formatDeliveryDateTime($track->getDeliverydate(),$track->getDeliverytime()); ?></td>
- </tr>
- <?php endif; ?>
-
- <?php if ($track->getSignedby()): ?>
- <tr>
- <th class="label"><?php echo __('Signed by:'); ?></th>
- <td class="value"><?php echo $track->getSignedby(); ?></td>
- </tr>
- <?php endif; ?>
-
- <?php if ($track->getDeliveryLocation()): ?>
- <tr>
- <th class="label"><?php echo __('Delivered to:'); ?></th>
- <td class="value"><?php echo $track->getDeliveryLocation(); ?></td>
- </tr>
- <?php endif; ?>
-
- <?php if ($track->getShippedDate()): ?>
- <tr>
- <th class="label"><?php echo __('Shipped or billed on:'); ?></th>
- <td class="value"><?php echo $track->getShippedDate(); ?></td>
- </tr>
- <?php endif; ?>
-
- <?php if ($track->getService()): ?>
- <tr>
- <th class="label"><?php echo __('Service Type:'); ?></th>
- <td class="value"><?php echo $track->getService(); ?></td>
- </tr>
- <?php endif; ?>
-
- <?php if ($track->getWeight()): ?>
- <tr>
- <th class="label"><?php echo __('Weight:'); ?></th>
- <td class="value"><?php echo $track->getWeight(); ?></td>
- </tr>
- <?php endif; ?>
- <?php endif; ?>
- <?php elseif(isset($track['title']) && isset($track['number']) && $track['number']): ?>
- <!--if the tracking is custom value-->
- <tr>
- <th class="label"><?php echo ($track['title'] ? $this->escapeHtml($track['title']) : __('N/A')); ?>:</th>
- <td class="value"><?php echo (isset($track['number']) ? $this->escapeHtml($track['number']) : ''); ?></td>
- </tr>
- <?php endif; ?>
- </tbody>
- </table>
- <script type="text/javascript">(function($) {$('#tracking-table-popup-<?php echo $_id++ ?>').decorate('table')})(jQuery)</script>
- <?php if (is_object($track) && sizeof($track->getProgressdetail())>0): ?>
- <br />
- <table class="data-table" id="track-history-table-<?php echo $track->getTracking(); ?>">
- <col />
- <col width="1" />
- <col width="1" />
- <col />
- <thead>
- <tr>
- <th><?php echo __('Location') ?></th>
- <th><?php echo __('Date') ?></th>
- <th><?php echo __('Local Time') ?></th>
- <th><?php echo __('Description') ?></th>
- </tr>
- </thead>
- <tbody>
- <?php foreach($track->getProgressdetail() as $_detail): ?>
- <?php $_detailDate = (isset($_detail['deliverydate']) ? $this->formatDeliveryDate($_detail['deliverydate']) : '') ?>
- <?php $_detailTime = (isset($_detail['deliverytime']) ? $this->formatDeliveryTime($_detail['deliverytime'], $_detail['deliverydate']) : '') ?>
- <tr>
- <td><?php echo (isset($_detail['deliverylocation']) ? $_detail['deliverylocation'] : ''); ?></td>
- <td><span class="nobr"><?php echo $_detailDate ?></span></td>
- <td><span class="nobr"><?php echo $_detailTime ?></span></td>
- <td><?php echo (isset($_detail['activity']) ? $_detail['activity'] : '') ?></td>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
- <script type="text/javascript">(function($) {$('#track-history-table-<?php echo $track->getTracking(); ?>').decorate('table')})(jQuery)</script>
- <?php endif; ?>
- <div class="divider"></div>
- <?php if($counter!=$rowCount): ?>
- <?php endif; ?>
- <?php $counter++; ?>
- <!--end for each tracking information-->
- <?php endforeach; ?>
- <?php else: ?>
- <p><?php echo __('There is no tracking available for this shipment.'); ?></p>
- <?php endif; ?>
-
-<?php endforeach; ?>
-<?php else: ?>
- <p><?php echo __('There is no tracking available.'); ?></p>
-<?php endif; ?>
-<div class="buttons-set">
- <button type="button" title="<?php echo __('Close Window') ?>" class="button" onclick="window.close(); window.opener.focus();"><span><span><?php echo __('Close Window') ?></span></span></button>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Tax/checkout/discount.phtml b/app/design/frontend/magento_backup/Magento_Tax/checkout/discount.phtml
deleted file mode 100644
index 1752f851ad7..00000000000
--- a/app/design/frontend/magento_backup/Magento_Tax/checkout/discount.phtml
+++ /dev/null
@@ -1,25 +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)
- */
diff --git a/app/design/frontend/magento_backup/Magento_Tax/checkout/grandtotal.phtml b/app/design/frontend/magento_backup/Magento_Tax/checkout/grandtotal.phtml
deleted file mode 100644
index 4880152304d..00000000000
--- a/app/design/frontend/magento_backup/Magento_Tax/checkout/grandtotal.phtml
+++ /dev/null
@@ -1,58 +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\Tax\Block\Checkout\Grandtotal
- * @see \Magento\Tax\Block\Checkout\Grandtotal
- */
-?>
-<?php if ($this->includeTax() && $this->getTotalExclTax()>=0):?>
-<tr>
- <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
- <strong><?php echo __('Grand Total Excl. Tax')?></strong>
- </td>
- <td style="<?php echo $this->getStyle() ?>" class="a-right">
- <strong><?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getTotalExclTax()) ?></strong>
- </td>
-</tr>
-<?php echo $this->renderTotals('taxes', $this->getColspan()); ?>
-<tr>
- <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
- <strong><?php echo __('Grand Total Incl. Tax')?></strong>
- </td>
- <td style="<?php echo $this->getStyle() ?>" class="a-right">
- <strong><?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getTotal()->getValue()) ?></strong>
- </td>
-</tr>
-<?php else:?>
-<tr>
- <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
- <strong><?php echo $this->getTotal()->getTitle() ?></strong>
- </td>
- <td style="<?php echo $this->getStyle() ?>" class="a-right">
- <strong><?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getTotal()->getValue()) ?></strong>
- </td>
-</tr>
-<?php endif;?>
diff --git a/app/design/frontend/magento_backup/Magento_Tax/checkout/shipping.phtml b/app/design/frontend/magento_backup/Magento_Tax/checkout/shipping.phtml
deleted file mode 100644
index 9ca9c4e6adb..00000000000
--- a/app/design/frontend/magento_backup/Magento_Tax/checkout/shipping.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
- * @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\Tax\Block\Checkout\Shipping
- * @see \Magento\Tax\Block\Checkout\Shipping
- */
-?>
-<?php if ($this->displayBoth()):?>
-<tr>
- <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
- <?php echo $this->getExcludeTaxLabel() ?>
- </td>
- <td style="<?php echo $this->getStyle() ?>" class="a-right">
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getShippingExcludeTax()) ?>
- </td>
-</tr>
-<tr>
- <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
- <?php echo $this->getIncludeTaxLabel() ?>
- </td>
- <td style="<?php echo $this->getStyle() ?>" class="a-right">
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getShippingIncludeTax()) ?>
- </td>
-</tr>
-<?php elseif($this->displayIncludeTax()) : ?>
-<tr>
- <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
- <?php echo $this->getTotal()->getTitle() ?>
- </td>
- <td style="<?php echo $this->getStyle() ?>" class="a-right">
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getShippingIncludeTax()) ?>
- </td>
-</tr>
-<?php else:?>
-<tr>
- <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
- <?php echo $this->escapeHtml($this->getTotal()->getTitle()) ?>
- </td>
- <td style="<?php echo $this->getStyle() ?>" class="a-right">
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getShippingExcludeTax()) ?>
- </td>
-</tr>
-<?php endif;?>
diff --git a/app/design/frontend/magento_backup/Magento_Tax/checkout/subtotal.phtml b/app/design/frontend/magento_backup/Magento_Tax/checkout/subtotal.phtml
deleted file mode 100644
index bebb5a10887..00000000000
--- a/app/design/frontend/magento_backup/Magento_Tax/checkout/subtotal.phtml
+++ /dev/null
@@ -1,57 +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\Tax\Block\Checkout\Subtotal
- * @see \Magento\Tax\Block\Checkout\Subtotal
- */
-?>
-<?php if ($this->displayBoth()):?>
-<tr>
- <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
- <?php echo __('Subtotal (Excl. Tax)') ?>
- </td>
- <td style="<?php echo $this->getStyle() ?>" class="a-right">
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getTotal()->getValueExclTax()) ?>
- </td>
-</tr>
-<tr>
- <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
- <?php echo __('Subtotal (Incl. Tax)') ?>
- </td>
- <td style="<?php echo $this->getStyle() ?>" class="a-right">
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getTotal()->getValueInclTax()) ?>
- </td>
-</tr>
-<?php else : ?>
-<tr>
- <td style="<?php echo $this->getStyle() ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
- <?php echo $this->getTotal()->getTitle() ?>
- </td>
- <td style="<?php echo $this->getStyle() ?>" class="a-right">
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($this->getTotal()->getValue()) ?>
- </td>
-</tr>
-<?php endif;?>
diff --git a/app/design/frontend/magento_backup/Magento_Tax/checkout/tax.phtml b/app/design/frontend/magento_backup/Magento_Tax/checkout/tax.phtml
deleted file mode 100644
index c00c8d788d3..00000000000
--- a/app/design/frontend/magento_backup/Magento_Tax/checkout/tax.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
- * @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\Tax\Block\Checkout\Tax
- * @see \Magento\Tax\Block\Checkout\Tax
- */
-?>
-<?php
- $_value = $this->getTotal()->getValue();
- $_style = $this->getTotal()->getStyle();
-?>
-<?php global $taxIter; $taxIter++; ?>
-<?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() && $_value!=0): ?>
-<?php $isTop = 1; ?>
- <?php foreach ($this->getTotal()->getFullInfo() as $info): ?>
- <?php if (isset($info['hidden']) && $info['hidden']) continue; ?>
- <?php $percent = $info['percent']; ?>
- <?php $amount = $info['amount']; ?>
- <?php $rates = $info['rates']; ?>
- <?php $isFirst = 1; ?>
-
- <?php foreach ($rates as $rate): ?>
- <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
- <td class="a-right" style="<?php echo $_style ?>" colspan="<?php echo $this->getColspan(); ?>">
- <?php echo $this->escapeHtml($rate['title']); ?>
- <?php if (!is_null($rate['percent'])): ?>
- (<?php echo (float)$rate['percent']; ?>%)
- <?php endif; ?>
- <br />
- </td>
- <?php if ($isFirst): ?>
- <td style="<?php echo $_style ?>" class="a-right" rowspan="<?php echo count($rates); ?>">
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($amount); ?>
- </td>
- <?php endif; ?>
- </tr>
- <?php $isFirst = 0; ?>
- <?php $isTop = 0; ?>
- <?php endforeach; ?>
- <?php endforeach; ?>
-<?php endif;?>
-<tr <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() && $_value!=0): ?> class="summary-total" onclick="expandDetails(this, '.summary-details-<?php echo $taxIter;?>')"<?php endif; ?>>
- <td style="<?php echo $_style ?>" class="a-right" colspan="<?php echo $this->getColspan(); ?>">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
- <div class="summary-collapse"><?php echo $this->getTotal()->getTitle() ?></div>
- <?php else: ?>
- <?php echo $this->getTotal()->getTitle() ?>
- <?php endif;?>
- </td>
- <td style="<?php echo $_style ?>" class="a-right"><?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_value) ?></td>
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Tax/order/tax.phtml b/app/design/frontend/magento_backup/Magento_Tax/order/tax.phtml
deleted file mode 100644
index e18c5909885..00000000000
--- a/app/design/frontend/magento_backup/Magento_Tax/order/tax.phtml
+++ /dev/null
@@ -1,81 +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();
- $_source = $this->getSource();
- $_fullInfo = $_order->getFullTaxInfo();
- global $taxIter; $taxIter++;
-?>
-<?php ?>
-
-<?php if ($this->displayFullSummary()): ?>
-<?php $isTop = 1; ?>
- <?php if ($_fullInfo) foreach ($_fullInfo as $info): ?>
- <?php if (isset($info['hidden']) && $info['hidden']) continue; ?>
- <?php
- $percent = $info['percent'];
- $amount = $info['amount'];
- $rates = $info['rates'];
- $isFirst = 1;
- ?>
- <?php foreach ($rates as $rate): ?>
- <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>"<?php if (!$this->getIsPlaneMode()):?> style="display:none;"<?php endif;?>>
- <td <?php echo $this->getLabelProperties()?>>
- <?php echo $this->escapeHtml($rate['title']); ?>
- <?php if (!is_null($rate['percent'])): ?>
- (<?php echo (float)$rate['percent']; ?>%)
- <?php endif; ?>
- <br />
- </td>
- <?php if ($isFirst): ?>
- <td <?php echo $this->getValueProperties()?> rowspan="<?php echo count($rates); ?>">
- <?php echo $_order->formatPrice($amount); ?>
- </td>
- <?php endif; ?>
- </tr>
- <?php $isFirst = 0; ?>
- <?php $isTop = 0; ?>
- <?php endforeach; ?>
- <?php endforeach; ?>
-<?php endif;?>
-
-<?php if ($this->displayFullSummary() && $_fullInfo && !$this->getIsPlaneMode()): ?>
-<tr class="summary-total" onclick="expandDetails(this, '.summary-details-<?php echo $taxIter;?>')">
-<?php elseif ($this->displayFullSummary() && $_fullInfo && $this->getIsPlaneMode()): ?>
-<tr class="show-details">
-<?php else: ?>
-<tr>
-<?php endif; ?>
- <td <?php echo $this->getLabelProperties()?>>
- <?php if ($this->displayFullSummary()): ?>
- <div class="summary-collapse"><?php echo __('Tax'); ?></div>
- <?php else: ?>
- <?php echo __('Tax'); ?>
- <?php endif;?>
- </td>
- <td <?php echo $this->getValueProperties()?>><?php echo $_order->formatPrice($_source->getTaxAmount()) ?></td>
-</tr>
diff --git a/app/design/frontend/magento_backup/Magento_Weee/layout/override/default.xml b/app/design/frontend/magento_backup/Magento_Weee/layout/override/default.xml
deleted file mode 100644
index 26fdf1e9b57..00000000000
--- a/app/design/frontend/magento_backup/Magento_Weee/layout/override/default.xml
+++ /dev/null
@@ -1,34 +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-weee-tax-toggle-js">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Weee::tax-toggle.js</argument>
- </arguments>
- </block>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Weee/tax-toggle.js b/app/design/frontend/magento_backup/Magento_Weee/tax-toggle.js
deleted file mode 100644
index 211b1975841..00000000000
--- a/app/design/frontend/magento_backup/Magento_Weee/tax-toggle.js
+++ /dev/null
@@ -1,37 +0,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.
- *
- * @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
deleted file mode 100644
index d58625467f0..00000000000
--- a/app/design/frontend/magento_backup/Magento_Widget/layout/override/default.xml
+++ /dev/null
@@ -1,34 +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\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_backup/Magento_Widget/layout/override/print.xml b/app/design/frontend/magento_backup/Magento_Widget/layout/override/print.xml
deleted file mode 100644
index ba0a322322b..00000000000
--- a/app/design/frontend/magento_backup/Magento_Widget/layout/override/print.xml
+++ /dev/null
@@ -1,34 +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\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_backup/Magento_Widget/widgets.css b/app/design/frontend/magento_backup/Magento_Widget/widgets.css
deleted file mode 100644
index 26912674134..00000000000
--- a/app/design/frontend/magento_backup/Magento_Widget/widgets.css
+++ /dev/null
@@ -1,32 +0,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.
- *
- * @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)
- */
-
-.widget { display:inline; }
-.widget .widget-title { clear:both; padding:15px 0 0; margin:0 0 7px; }
-.widget .widget-title h2 { font-size:15px; font-weight:bold; color:#e25203; }
-
-/* Widgets: Links Common Styles */
-.top-container .widget a { padding:0 0 0 7px; }
-.bottom-container .widget a { padding:0 3px; }
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/button/share.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/button/share.phtml
deleted file mode 100644
index 08efe39a154..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/button/share.phtml
+++ /dev/null
@@ -1,31 +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\Wishlist\Block\Customer\Wishlist\Button */
-?>
-<?php if($this->getWishlist()->getItemsCount() && $this->getWishlist()->getShared() < $this->getConfig()->getSharingEmailLimit()): ?>
- <button type="submit" name="save_and_share" title="<?php echo __('Share Wish List') ?>" class="button btn-share"><span><span><?php echo __('Share Wish List') ?></span></span></button>
-<?php endif;?>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/button/tocart.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/button/tocart.phtml
deleted file mode 100644
index 57bd7abb51e..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/button/tocart.phtml
+++ /dev/null
@@ -1,30 +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 if($this->getWishlist()->getItemsCount() && $this->getWishlist()->isSalable()): ?>
- <button type="button" title="<?php echo __('Add All to Cart') ?>" class="button btn-add"><span><span><?php echo __('Add All to Cart') ?></span></span></button>
-<?php endif;?>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/button/update.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/button/update.phtml
deleted file mode 100644
index 8cca098f602..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/button/update.phtml
+++ /dev/null
@@ -1,30 +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 if($this->getWishlist()->getItemsCount()): ?>
- <button type="submit" name="do" title="<?php echo __('Update Wish List') ?>" class="button btn-update"><span><span><?php echo __('Update Wish List') ?></span></span></button>
-<?php endif;?>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/email/items.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/email/items.phtml
deleted file mode 100644
index 4b3d8c79abe..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/email/items.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\Wishlist\Block\Share\Email\Items */
-?>
-<?php $l = $this->getWishlistItemsCount() ?>
-<div style="border:1px solid #E0E0E0; padding:15px; background:#F9F9F9;">
-<table cellspacing="0" cellpadding="0" border="0" width="650">
- <tr>
- <?php $i = 0; foreach ($this->getWishlistItems() as $item): $i++ ?>
- <?php /* @var $item \Magento\Wishlist\Model\Item */ ?>
- <?php /* @var $_product \Magento\Catalog\Model\Product */ ?>
- <?php $_product = $item->getProduct(); ?>
- <td width="32%">
- <p align="center" style="font-size:12px;"><a href="<?php echo $this->getProductUrl($_product) ?>"><img src="<?php echo $this->getSmallImageUrl($_product); ?>" width="<?php echo $this->getSmallImageSize()?>" height="<?php echo $this->getSmallImageSize()?>" style="border:1px solid #ccc;" alt="" /></a></p>
- <p align="center" style="font-size:12px;"><a href="<?php echo $this->getProductUrl($_product) ?>" style="color:#203548;"><strong><?php echo $this->escapeHtml($_product->getName()) ?></strong></a></p>
- <?php if($this->hasDescription($item)): ?><p align="center" style="font-size:12px;"><?php echo __('Comment') ?>:<br /><?php echo $this->getEscapedDescription($item) ?></p><?php endif; ?>
- <p align="center" style="font-size:12px;"><a href="<?php echo $this->getProductUrl($_product) ?>" style="color:#1E7EC8;"><?php echo __('View Product') ?></a> <small>
- <?php if ($_product->getIsSalable()): ?>|</small> <a href="<?php echo $this->getAddToCartUrl($_product) ?>" style="color:#1E7EC8;"><strong><?php echo __('Add to Cart') ?></strong></a><?php endif;?>
- </p></td>
- <?php if ($i%3!=0): ?>
- <td width="2%"></td>
- <?php else: ?>
- </tr>
- <tr>
- <td colspan="5"> </td>
- </tr>
- <?php if ($i<$l): ?>
- <tr>
- <?php endif ?>
- <?php endif ?>
- <?php endforeach ?>
-</table>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/email/rss.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/email/rss.phtml
deleted file mode 100644
index 35ca825cc58..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/email/rss.phtml
+++ /dev/null
@@ -1,31 +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)
- */
-?>
-<p style="font-size:12px; line-height:16px; margin:0 0 16px;">
- <?php echo __("RSS link to %1's wishlist",$this->helper('Magento\Wishlist\Helper\Data')->getCustomerName()) ?>
- <br />
- <a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getRssUrl($this->getWishlistId()); ?>"><?php echo $this->helper('Magento\Wishlist\Helper\Data')->getRssUrl($this->getWishlistId()); ?></a>
-</p>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/item/column/cart.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/item/column/cart.phtml
deleted file mode 100644
index fca13010561..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/item/column/cart.phtml
+++ /dev/null
@@ -1,59 +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\Wishlist\Block\Customer\Wishlist\Item\Column\Cart */
-/* @var \Magento\Wishlist\Model\Item $item */
-$item = $this->getItem();
-$product = $item->getProduct();
-$options = $this->getChildBlock('customer.wishlist.item.options')
- ->setItem($item)
- ->getConfiguredOptions();
-?>
-<div class="cart-cell">
- <?php echo $this->getPriceHtml($product, empty($options));?>
- <div class="add-to-cart-alt">
- <?php if ($item->canHaveQty() && $item->getProduct()->isVisibleInSiteVisibility()): ?>
- <input type="text" class="input-text qty" data-validate="{required:true,'validate-greater-than-zero':true}" name="qty[<?php echo $item->getId() ?>]"
- value="<?php echo $this->getAddToCartQty($item) * 1 ?>"/>
- <?php endif; ?>
- <?php if ($product->isSaleable()): ?>
- <button type="button" title="<?php echo __('Add to Cart') ?>" data-item-id="<?php echo $item->getId()?>" class="button btn-cart"><span><span><?php echo __('Add to Cart') ?></span></span></button>
- <?php else: ?>
- <?php if ($product->getIsSalable()): ?>
- <p class="availability in-stock"><span><?php echo __('In stock') ?></span></p>
- <?php else: ?>
- <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <?php endif; ?>
- </div>
- <?php foreach ($this->getChildNames() as $childName): ?>
- <?php echo $this->getLayout()->renderElement($childName, false); ?>
- <?php endforeach;?>
- <?php if ($product->isVisibleInSiteVisibility()): ?>
- <p><a class="link-edit" href="<?php echo $this->getItemConfigureUrl($item) ?>"><?php echo __('Edit') ?></a>
- </p>
- <?php endif ?>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/item/column/image.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/item/column/image.phtml
deleted file mode 100644
index b501eb0d40b..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/item/column/image.phtml
+++ /dev/null
@@ -1,33 +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 \Magento\Wishlist\Model\Item $item */
-$item = $this->getItem();
-$product = $item->getProduct();
-?>
-<a class="product-image" href="<?php echo $this->getProductUrl($item) ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>">
- <img src="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($product, 'small_image')->resize(113, 113); ?>" width="113" height="113" alt="<?php echo $this->escapeHtml($product->getName()) ?>" />
-</a>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/item/column/info.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/item/column/info.phtml
deleted file mode 100644
index 30c2d1b749d..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/item/column/info.phtml
+++ /dev/null
@@ -1,41 +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 \Magento\Wishlist\Model\Item $item */
-$item = $this->getItem();
-$product = $item->getProduct();
-?>
-<h3 class="product-name"><a href="<?php echo $this->getProductUrl($item) ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>"><?php echo $this->escapeHtml($product->getName()) ?></a></h3>
-<div class="description std"><div class="inner"><?php echo $this->escapeHtml($this->stripTags($product->getShortDescription()));?></div></div>
-<textarea name="description[<?php echo $item->getWishlistItemId() ?>]" rows="3" cols="5" title="<?php echo __('Comment') ?>"><?php echo ($this->escapeHtml($item->getDescription())) ?></textarea>
-<?php $children = $this->getChildNames(); ?>
-<?php if ($children): ?>
- <div class="item-manage">
- <?php foreach($children as $childName):?>
- <?php echo $this->getLayout()->renderElement($childName, false);?>
- <?php endforeach;?>
- </div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/item/column/remove.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/item/column/remove.phtml
deleted file mode 100644
index 9ffc7c89a1f..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/item/column/remove.phtml
+++ /dev/null
@@ -1,29 +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)
- */
-
-?>
-<a href="<?php echo $this->getItemRemoveUrl($this->getItem()); ?>" title="<?php echo __('Remove Item') ?>"
- class="btn-remove btn-remove2"><?php echo __('Remove item');?></a>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/item/configure/addto.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/item/configure/addto.phtml
deleted file mode 100644
index 62648935ae2..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/item/configure/addto.phtml
+++ /dev/null
@@ -1,39 +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 $_wishlistItem = $this->getWishlistItem(); ?>
-<?php $_wishlistSubmitUrl = $this->helper('Magento\Wishlist\Helper\Data')->getUpdateUrl($_wishlistItem); ?>
-<ul class="add-to-links" data-role="add-to-links">
-<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
- <li><a href="<?php echo $_wishlistSubmitUrl ?>" class="link-compare"><?php echo __('Update Wish List') ?></a></li>
-<?php endif; ?>
-<?php $_product = $this->getProduct(); ?>
-<?php $_compareUrl = $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddUrl($_product); ?>
-<?php if ($_compareUrl) : ?>
- <li><span class="separator">|</span> <a href="<?php echo $_compareUrl ?>" class="link-compare"><?php echo __('Add to Compare') ?></a></li>
-<?php endif; ?>
-</ul>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/item/list.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/item/list.phtml
deleted file mode 100644
index bf5a7dc7ccb..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/item/list.phtml
+++ /dev/null
@@ -1,57 +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
- $columns = $this->getColumns();
-?>
-<table class="data-table" id="wishlist-table">
- <thead>
- <tr>
- <?php foreach ($columns as $column): ?>
- <th><?php echo $column->getTitle();?></th>
- <?php endforeach; ?>
- </tr>
- </thead>
- <tbody>
- <?php if (count($this->getItems())): ?>
- <?php foreach ($this->getItems() as $item): ?>
- <tr id="item_<?php echo $item->getId();?>">
- <?php foreach ($columns as $column): ?>
- <td><?php $column->setItem($item); echo $column->toHtml($item);?></td>
- <?php endforeach; ?>
- </tr>
- <?php endforeach ?>
- <?php else: ?>
- <td colspan="<?php echo count($columns);?>" class="wishlist-empty"><?php echo __('This Wish List has no Items');?></td>
- <?php endif; ?>
- </tbody>
-</table>
-<?php foreach ($columns as $column): ?>
- <?php echo $column->getAdditionalHtml();?>
-<?php endforeach; ?>
-<script type="text/javascript">
- jQuery('#wishlist-table').decorate('table');
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/js/add-to-wishlist.js b/app/design/frontend/magento_backup/Magento_Wishlist/js/add-to-wishlist.js
deleted file mode 100644
index 1c90f128567..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/js/add-to-wishlist.js
+++ /dev/null
@@ -1,50 +0,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)
- */
-/*jshint browser:true jquery:true*/
-(function ($) {
- $.widget('mage.addToWishlist', {
- options: {
- bundleInfo: '[id^=bundle-option-]',
- configurableInfo: '.super-attribute-select',
- groupedInfo: '#super-product-table input',
- downloadableInfo: '.options-list input',
- customOptionsInfo: '.product-custom-option'
- },
- _create: function () {
- this.addToWishlist();
- },
- addToWishlist: function () {
- this._on({
- 'click [data-action="add-to-wishlist"]': function (event) {
- var url = $(event.target).closest('a').attr('href'),
- productInfo = this.options[this.options.productType + 'Info'],
- additionalData = $(this.options.customOptionsInfo).serialize();
- if (productInfo !== undefined) {
- additionalData += $(productInfo).serialize();
- }
- $(event.target).closest('a').attr('href', url + (url.indexOf('?') == -1 ? '?' : '&') + additionalData);
- }
- });
- }
- });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/js/search.js b/app/design/frontend/magento_backup/Magento_Wishlist/js/search.js
deleted file mode 100644
index b7d812993a0..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/js/search.js
+++ /dev/null
@@ -1,57 +0,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.
- *
- * @category frontend wishlist search
- * @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.wishlistSearch', {
-
- /**
- * Bind handlers to events
- */
- _create: function() {
- this.element.on('change', $.proxy(this._toggleForm, this));
- },
-
- /**
- * Toggle Form
- * @private
- */
- _toggleForm: function() {
- switch (this.element.val()) {
- case 'name':
- $(this.options.emailFormSelector).hide();
- $(this.options.nameFormSelector).show();
- break;
- case 'email':
- $(this.options.nameFormSelector).hide();
- $(this.options.emailFormSelector).show();
- break;
- default:
- $(this.options.emailFormSelector).add(this.options.nameFormSelector).hide();
- }
- }
- });
-})(jQuery);
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/customer_account.xml b/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/customer_account.xml
deleted file mode 100644
index 7d7127d1ab0..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/customer_account.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)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="customer_account_navigation">
- <block class="Magento\Page\Block\Link\Current" ifconfig="wishlist/general/active" name="customer-account-navigation-wish-list-link">
- <arguments>
- <argument name="path" xsi:type="string">wishlist</argument>
- <argument name="label" xsi:type="string">My Wish List</argument>
- </arguments>
- </block>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/default.xml b/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/default.xml
deleted file mode 100644
index 38984fd8806..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/default.xml
+++ /dev/null
@@ -1,33 +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="top.links">
- <block class="Magento\Wishlist\Block\Link" name="wish-list-link" after="my-account-link"/>
- </referenceBlock>
- <referenceContainer name="right">
- <block class="Magento\Wishlist\Block\Customer\Sidebar" name="wishlist_sidebar" as="wishlist" after="cart_sidebar" template="sidebar.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure.xml b/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure.xml
deleted file mode 100644
index 417ae117e71..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure.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">
- <referenceBlock name="product.info">
- <block class="Magento\Wishlist\Block\Item\Configure" name="product.info.addto" as="addto" template="item/configure/addto.phtml"/>
- </referenceBlock>
- <referenceBlock name="product.info.options.wrapper.bottom">
- <action method="unsetChild">
- <argument name="name" xsi:type="string">product.info.addto.additional</argument>
- </action>
- <action method="append">
- <argument name="element" xsi:type="string">product.info.addto.additional</argument>
- </action>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_bundle.xml b/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_bundle.xml
deleted file mode 100644
index 83752c4c834..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_bundle.xml
+++ /dev/null
@@ -1,73 +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-bundle-bundle-js">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Bundle::bundle.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-bundle-js-product-summary-js">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Bundle::js/product-summary.js</argument>
- </arguments>
- </block>
- </referenceBlock>
- <referenceBlock name="product.info">
- <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle" as="product_type_data" template="catalog/product/view/type/bundle.phtml">
- <action method="addPriceBlockType">
- <argument name="type" xsi:type="string">bundle</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\Price</argument>
- <argument name="template" xsi:type="string">catalog/product/price.phtml</argument>
- </action>
- <block class="Magento\Bundle\Block\Catalog\Product\Price" name="bundle.prices" as="bundle_prices" template="catalog/product/view/price.phtml">
- <action method="setMAPTemplate">
- <argument name="tmpl" xsi:type="string">Magento_Catalog::product/price_msrp_item.phtml</argument>
- </action>
- </block>
- </block>
- </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="-">
- <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">
- <remove name="product.tierprices"/>
- <block class="Magento\Bundle\Block\Catalog\Product\View" name="bundle.tierprices" as="tierprices" before="-" template="Magento_Bundle::catalog/product/view/tierprices.phtml"/>
- <block class="Magento\CatalogInventory\Block\Qtyincrements" name="product.info.qtyincrements" before="-" template="qtyincrements.phtml"/>
- </referenceBlock>
- <referenceBlock name="product.clone_prices">
- <action method="addPriceBlockType">
- <argument name="type" xsi:type="string">bundle</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\Price</argument>
- <argument name="template" xsi:type="string">catalog/product/view/price.phtml</argument>
- </action>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_configurable.xml b/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_configurable.xml
deleted file mode 100644
index 2bad362d01d..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_configurable.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)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <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"/>
- </block>
- </referenceBlock>
- <referenceBlock name="product.info.options.wrapper">
- <block class="Magento\Catalog\Block\Product\View\Type\Configurable" name="product.info.options.configurable" as="options_configurable" before="-" template="product/view/type/options/configurable.phtml"/>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_grouped.xml b/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_grouped.xml
deleted file mode 100644
index c596eec47d5..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_grouped.xml
+++ /dev/null
@@ -1,33 +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="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"/>
- </block>
- <block class="Magento\Catalog\Block\Product\View\Type\Grouped" name="product.info.grouped.grid" as="product_type_data_grid" template="product/view/type/grouped.phtml"/>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_simple.xml b/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_simple.xml
deleted file mode 100644
index 23daddbc2fc..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_configure_type_simple.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" label="Configure Wishlist Item (Simple)" type="page">
- <update handle="catalog_product_view_type_simple"/>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_index.xml b/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_index.xml
deleted file mode 100644
index 83fe9d8cc4f..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_index.xml
+++ /dev/null
@@ -1,55 +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="customer_account"/>
- <referenceContainer name="my.account.wrapper">
- <block class="Magento\Wishlist\Block\Customer\Wishlist" name="customer.wishlist" template="view.phtml">
- <action method="setTitle">
- <argument translate="true" name="title" xsi:type="string">My Wish List</argument>
- </action>
- <block class="Magento\Wishlist\Block\Customer\Wishlist\Items" name="customer.wishlist.items" as="items" template="item/list.phtml">
- <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Image" name="customer.wishlist.item.image" template="item/column/image.phtml"/>
- <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Comment" name="customer.wishlist.item.info" template="item/column/info.phtml">
- <action method="setTitle">
- <argument translate="true" name="title" xsi:type="string">Product Details and Comment</argument>
- </action>
- </block>
- <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Cart" name="customer.wishlist.item.cart" template="item/column/cart.phtml">
- <action method="setTitle">
- <argument translate="true" name="title" xsi:type="string">Add to Cart</argument>
- </action>
- <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Options" name="customer.wishlist.item.options"/>
- </block>
- <block class="Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Remove" name="customer.wishlist.item.remove" template="item/column/remove.phtml"/>
- </block>
- <container name="customer.wishlist.buttons" as="control_buttons" label="Wishlist Control Buttons">
- <block class="Magento\Wishlist\Block\Customer\Wishlist\Button" name="customer.wishlist.button.share" template="button/share.phtml"/>
- <block class="Magento\Wishlist\Block\Customer\Wishlist\Button" name="customer.wishlist.button.toCart" template="button/tocart.phtml"/>
- <block class="Magento\Wishlist\Block\Customer\Wishlist\Button" name="customer.wishlist.button.update" template="button/update.phtml"/>
- </container>
- </block>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_share.xml b/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_share.xml
deleted file mode 100644
index a5d2536a2a9..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_index_share.xml
+++ /dev/null
@@ -1,31 +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="Customer My Account Wish List Sharing Form" type="page">
- <update handle="customer_account"/>
- <referenceContainer name="my.account.wrapper">
- <block class="Magento\Wishlist\Block\Customer\Sharing" name="wishlist.sharing" template="sharing.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_shared_index.xml b/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_shared_index.xml
deleted file mode 100644
index 5514a660d28..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/layout/override/base/wishlist_shared_index.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\Wishlist\Block\Share\Wishlist" name="customer.wishlist" template="shared.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/options_list.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/options_list.phtml
deleted file mode 100644
index 680c0e6079f..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/options_list.phtml
+++ /dev/null
@@ -1,51 +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\Wishlist\Block\Customer\Wishlist\Item\Options */
-?>
-
-<?php $options = $this->getOptionList(); ?>
-<?php if ($options): ?>
-<div class="truncated" data-mage-init="{truncateOptions:[]}">
- <div class="truncated_full_value">
- <div class="item-options">
- <p><?php echo __('Options Details'); ?></p>
- <dl>
- <?php foreach ($options as $option): ?>
- <dt><?php echo $this->escapeHtml($option['label']) ?></dt>
- <dd>
- <?php if (is_array($option['value'])): ?>
- <?php echo nl2br(implode("\n", $option['value'])) ?>
- <?php else: ?>
- <?php echo $option['value'] ?>
- <?php endif; ?>
- </dd>
- <?php endforeach; ?>
- </dl>
- </div>
- </div>
- <a href="#" onclick="return false;" class="details"><?php echo __('View Details') ?></a>
-</div>
-<?php endif ?>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/render/item/price.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/render/item/price.phtml
deleted file mode 100644
index 7f21d63b3f8..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/render/item/price.phtml
+++ /dev/null
@@ -1,39 +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\Wishlist\Block\Customer\Wishlist_Render_Item_Price */
-?>
-
-<?php echo $this->getCleanProductPriceHtml(); ?>
-
-<?php /* @var $product \Magento\Catalog\Model\Product */ ?>
-<?php $product = $this->getProduct(); ?>
-<?php $finalPrice = $product->getFinalPrice(1); ?>
-<?php if ($product->canConfigure()): ?>
- <p class="configured-price">
- <span class="price-label"><?php echo __('Configured Price:') ?></span>
- <span class="price"><?php echo $this->helper('Magento\Core\Helper\Data')->currency($finalPrice, true, false); ?></span>
- </p>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/render/item/price_msrp_item.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/render/item/price_msrp_item.phtml
deleted file mode 100644
index 760bdecc9fe..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/render/item/price_msrp_item.phtml
+++ /dev/null
@@ -1,88 +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
-/**
- * Template for displaying product price at product view page, gift registry and wishlist
- *
- * @var $this \Magento\Catalog\Block\Product\Price
- */
-?>
-<?php
- /** @var $_coreHelper \Magento\Core\Helper\Data */
- $_coreHelper = $this->helper('Magento\Core\Helper\Data');
- /** @var $_catalogHelper \Magento\Catalog\Helper\Data */
- $_catalogHelper = $this->helper('Magento\Catalog\Helper\Data');
-
- /** @var $_product \Magento\Catalog\Model\Product */
- $_product = $this->getProduct();
- $_id = $_product->getId();
- $_msrpPrice = '';
-?>
- <div class="price-box map-info">
- <?php $_price = $this->helper('Magento\Tax\Helper\Data')->getPrice($_product, $_product->getMsrp()) ?>
- <?php if($_product->getMsrp()): ?>
- <?php $_msrpPrice = $_coreHelper->currency($_product->getMsrp(),true,true) ?>
- <span class="old-price" ><?php echo $_msrpPrice ?></span>
- <?php endif; ?>
- <?php if ($_catalogHelper->isShowPriceOnGesture($_product)): ?>
- <?php $priceElementId = 'product-price-' . $_id . $this->getIdSuffix(); ?>
- <span id="<?php echo $priceElementId ?>" style="display:none"></span>
- <?php $popupId = 'msrp-popup-' . $_id . $this->getRandomString(20); ?>
- <a href="#" id="<?php echo($popupId);?>"><?php echo __('Click for price'); ?></a>
- <?php else: ?>
- <span class="msrp-price-hide-message">
- <?php echo $_catalogHelper->getMsrpPriceMessage($_product) ?>
- </span>
- <?php endif; ?>
- <?php $helpLinkId = 'msrp-help-' . $_id . $this->getRandomString(20); ?>
- <a href="#" id="<?php echo($helpLinkId);?>"><?php echo __("What's this?"); ?></a>
- </div>
- <script type="text/javascript">
- (function ($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/msrp.js') ?>",
- function () {
- <?php if ($this->helper('Magento\Catalog\Helper\Data')->isShowPriceOnGesture($_product)): ?>
- $('#<?php echo($popupId);?>').addToCart({
- cartForm: "#wishlist-view-form",
- popupId: "#<?php echo($popupId);?>",
- productName: '<?php echo $_product->getName() ?>',
- realPrice: '<?php echo $this->getRealPriceJs($_product) ?>',
- msrpPrice: '<?php echo $_msrpPrice ?>',
- priceElementId: '<?php echo $priceElementId ?>',
- closeButtonId: '#map-popup-close',
- popupCartButtonId: "#map-popup-button"
- });
- <?php endif; ?>
- $("#<?php echo($helpLinkId);?>").addToCart({
- helpLinkId: "#<?php echo($helpLinkId);?>",
- productName: '<?php echo $_product->getName() ?>'
- });
- });
- })(jQuery);
- </script>
-
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/render/item/price_msrp_rss.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/render/item/price_msrp_rss.phtml
deleted file mode 100644
index 010547daeb9..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/render/item/price_msrp_rss.phtml
+++ /dev/null
@@ -1,38 +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
-/**
- * Template for displaying wishlist item price at rss feeds pages
- *
- * @var $this \Magento\Catalog\Block\Product\Price
- */
-?>
-<div class="price-box map-info">
- <?php if ($this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($this->getProduct())): ?>
- <a href="<?php echo $this->getProduct()->getProductUrl() ?>"><?php echo __('Click for price'); ?></a>
- <?php endif; ?>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/shared.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/shared.phtml
deleted file mode 100644
index 4b8bde4e6c0..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/shared.phtml
+++ /dev/null
@@ -1,85 +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\Wishlist\Block\Share\Wishlist */
-?>
-<div class="my-wishlist">
- <div class="page-title">
- <h1><?php echo $this->escapeHtml($this->getHeader()) ?></h1>
- </div>
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
- <?php if ($this->hasWishlistItems()): ?>
- <form action="<?php echo $this->getUrl('*/*/update') ?>" method="post">
- <fieldset>
- <table class="data-table" id="wishlist-table">
- <col width="1" />
- <col />
- <col width="1" />
- <thead>
- <tr>
- <th><?php echo __('Product') ?></th>
- <th><?php echo __('Comment') ?></th>
- <th> </th>
- </tr>
- </thead>
- <tbody>
- <?php foreach($this->getWishlistItems() as $item): ?>
- <?php
- $product = $item->getProduct();
- $isVisibleProduct = $product->isVisibleInSiteVisibility();
- ?>
- <tr>
- <td>
- <a class="product-image" href="<?php echo $this->getProductUrl($item) ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>"><img src="<?php echo $this->getImageUrl($product); ?>" width="<?php echo $this->getImageSize()?>" height="<?php echo $this->getImageSize()?>" alt="<?php echo $this->escapeHtml($item->getName()) ?>" /></a>
- <h2 class="product-name"><a href="<?php echo $this->getProductUrl($item) ?>"><?php echo $this->escapeHtml($product->getName()) ?></a></h2>
- <?php echo $this->getPriceHtml($product) ?>
- <?php echo $this->getDetailsHtml($item) ?>
- </td>
- <td><?php echo $this->getEscapedDescription($item) ?></td>
- <td class="a-center">
- <?php if ($product->isSaleable()): ?>
- <?php if ($isVisibleProduct): ?>
- <button type="button" title="<?php echo __('Add to Cart') ?>" onclick="setLocation('<?php echo $this->getSharedItemAddToCartUrl($item) ?>')" class="button btn-cart"><span><span><?php echo __('Add to Cart') ?></span></span></button>
- <?php endif ?>
- <?php endif; ?>
- <p><a href="<?php echo $this->getAddToWishlistUrl($item) ?>" onclick="setLocation(this.href); return false;" class="link-wishlist" data-action="add-to-wishlist"><?php echo __('Add to Wishlist') ?></a></p>
- </td>
- </tr>
- <?php endforeach ?>
- </tbody>
- </table>
- <script type="text/javascript">(function($) {$('#wishlist-table').decorate('table')})(jQuery)</script>
- </fieldset>
- <div class="buttons-set">
- <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>« </small><?php echo __('Back') ?></a></p>
- <?php if($this->isSaleable()):?>
- <button type="button" title="<?php echo __('Add All to Cart') ?>" onclick="setLocation('<?php echo $this->getUrl('*/*/allcart', array('_current'=>true)) ?>')" class="button"><span><span><?php echo __('Add All to Cart') ?></span></span></button>
- <?php endif;?>
- </div>
- </form>
- <?php else: ?>
- <p><?php echo __('Wish List is empty now.') ?></p>
- <?php endif ?>
-</div>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/sharing.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/sharing.phtml
deleted file mode 100644
index c421eff7339..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/sharing.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
- * @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\Wishlist\Block\Customer\Sharing */
-?>
-<div class="page-title">
- <h1><?php echo __('Share Your Wish List') ?></h1>
-</div>
-<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-<form action="<?php echo $this->getSendUrl() ?>" id="form-validate" method="post">
- <div class="fieldset">
- <?php echo $this->getBlockHtml('formkey')?>
- <h2 class="legend"><?php echo __('Sharing Information') ?></h2>
- <ul class="form-list">
- <li class="wide">
- <label for="email_address" class="required"><em>*</em><?php echo __('Email addresses, separated by commas (max %1 addresses)', $this->getEmailSharingLimit()); ?></label>
- <div class="input-box">
- <textarea name="emails" cols="60" rows="5" id="email_address" data-validate="{required:true,'validate-emails':true}"><?php echo $this->getEnteredData('emails') ?></textarea>
- </div>
- </li>
- <li class="wide">
- <label for="message"><?php echo __('Message') ?></label>
- <div class="input-box">
- <textarea id="message" name="message" cols="60" rows="5" class="validate-length maximum-length-<?php echo $this->getTextSharingLimit();?>"><?php echo $this->getEnteredData('message') ?></textarea>
- </div>
- </li>
- <?php if($this->helper('Magento\Wishlist\Helper\Data')->isRssAllow()): ?>
- <li class="control">
- <div class="input-box">
- <input type="checkbox" name="rss_url" id="rss_url" value="1" title="<?php echo __('Check this checkbox if you want to add a link to an rss feed to your wishlist.') ?>" class="checkbox" />
- </div>
- <label for="rss_url"><?php echo __('Check this checkbox if you want to add a link to an rss feed to your wishlist.') ?></label>
- </li>
- <?php endif; ?>
- </ul>
- </div>
- <div class="buttons-set form-buttons">
- <p class="required"><?php echo __('* Required Fields') ?></p>
- <p class="back-link"><a href="<?php echo $this->getBackUrl(); ?>"><small>« </small><?php echo __('Back')?></a></p>
- <button type="submit" title="<?php echo __('Share Wish List') ?>" class="button"><span><span><?php echo __('Share Wish List') ?></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() {
- $('#form-validate').validation();
- })
- })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/sidebar.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/sidebar.phtml
deleted file mode 100644
index 2e84cde15ee..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/sidebar.phtml
+++ /dev/null
@@ -1,61 +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\Wishlist\Block\Customer\Sidebar */
-?>
-<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-<div class="block block-wishlist">
- <div class="block-title">
- <strong><span><?php echo $this->getTitle(); ?></span></strong>
- </div>
- <div class="block-content">
- <p class="block-subtitle"><?php echo __('Last Added Items') ?></p>
- <?php if ($this->hasWishlistItems()): ?>
- <ol class="mini-products-list" id="wishlist-sidebar">
- <?php foreach ($this->getWishlistItems() as $_item): ?>
- <?php $product = $_item->getProduct(); ?>
- <li class="item">
- <a href="<?php echo $this->getProductUrl($_item) ?>" title="<?php echo $this->escapeHtml($product->getName()) ?>" class="product-image"><img src="<?php echo $this->getThumbnailSidebarUrl($product); ?>" width="<?php echo $this->getThumbnailSidebarSize()?>" height="<?php echo $this->getThumbnailSidebarSize()?>" alt="<?php echo $this->escapeHtml($_item->getName()) ?>" /></a>
- <div class="product-details">
- <a href="<?php echo $this->getItemRemoveUrl($_item) ?>" title="<?php echo __('Remove This Item') ?>" onclick="return confirm('<?php echo __('Are you sure you would like to remove this item from the wishlist?') ?>');" class="btn-remove"><?php echo __('Remove This Item') ?></a>
- <p class="product-name"><a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->escapeHtml($product->getName()) ?></a></p>
- <?php echo $this->getPriceHtml($product, false, '-wishlist') ?>
- <?php if ($product->isSaleable() && $product->isVisibleInSiteVisibility()): ?>
- <a href="<?php echo $this->getItemAddToCartUrl($_item) ?>" class="link-cart"><?php echo __('Add to Cart') ?></a>
- <?php endif; ?>
- </div>
- </li>
- <?php endforeach; ?>
- </ol>
- <script type="text/javascript">(function($) {$('#wishlist-sidebar').decorate('list', false)})(jQuery)</script>
- <div class="actions">
- <a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getListUrl() ?>"><?php echo __('Go to Wish List') ?></a>
- </div>
- <?php else: ?>
- <p class="empty"><?php echo __('You have no items in your wishlist.') ?></p>
- <?php endif ?>
- </div>
-</div>
-<?php endif ?>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/view.phtml b/app/design/frontend/magento_backup/Magento_Wishlist/view.phtml
deleted file mode 100644
index ca2f8f10112..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/view.phtml
+++ /dev/null
@@ -1,85 +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\Wishlist\Block\Customer\Wishlist */
-?>
-<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
- <div class="my-wishlist">
- <div class="page-title title-buttons">
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isRssAllow() && $this->hasWishlistItems()): ?>
- <a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getRssUrl($this->getWishlistInstance()->getId()); ?>" class="link-rss"><?php echo __('RSS Feed') ?></a>
- <?php endif; ?>
- <h1><?php echo $this->getTitle(); ?></h1>
- </div>
- <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
-
- <form id="wishlist-view-form" action="<?php echo $this->getUrl('*/*/update', array('wishlist_id' => $this->getWishlistInstance()->getId())) ?>" method="post">
- <?php echo $this->getChildHtml('top'); ?>
- <fieldset>
- <?php if ($this->hasWishlistItems()): ?>
- <?php echo $this->getBlockHtml('formkey');?>
- <?php $this->getChildBlock('items')->setItems($this->getWishlistItems()); ?>
- <?php echo $this->getChildHtml('items');?>
- <?php else: ?>
- <p class="wishlist-empty"><?php echo __('You have no items in your wish list.') ?></p>
- <?php endif ?>
- <div class="buttons-set buttons-set2">
- <?php echo $this->getChildHtml('control_buttons');?>
- </div>
- </fieldset>
- </form>
- <script id="form-tmpl" type="text/x-jQuery-tmpl">
- <form id="wishlist-hidden-form" method="post" action="${url}" class="no-display">
- {{if itemId}}<input name="item_id" value="${itemId}"/>{{/if}}
- {{if wishlistId}}<input name="wishlist_id" value="${wishlistId}"/>{{/if}}
- {{if qty}}<input name="qty" value="${qty}"/>{{/if}}
- {{if item}}<input name="item" value="${item}"/>{{/if}}
- {{if entity}}<input name="entity" value="${entity}"/>{{/if}}
- </form>
- </script>
- <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')?>",
- "<?php echo $this->getViewFileUrl('Magento_Persistent::splitbutton.js') ?>",
- "<?php echo $this->getViewFileUrl('Magento_Wishlist::wishlist.js')?>", function() {
- $('#wishlist-view-form').wishlist({
- addToCartUrl: '<?php echo $this->getItemAddToCartUrl('%item%');?>' ,
- confirmRemoveMessage: '<?php echo __('Are you sure you want to remove this product from your wish list?') ?>',
- addAllToCartUrl : '<?php echo $this->getUrl('*/*/allcart', array('wishlist_id' => $this->getWishlistInstance()->getId())) ?>',
- commentString : '<?php echo $this->helper('Magento\Wishlist\Helper\Data')->defaultCommentString()?>'
- });
- $('body').splitButton();
- });
- })(jQuery);
- </script>
- </div>
- <?php echo $this->getChildHtml('bottom'); ?>
- <div class="buttons-set">
- <p class="back-link"><a href="<?php echo $this->escapeUrl($this->getBackUrl()) ?>"><small>« </small><?php echo __('Back') ?></a></p>
- </div>
-<?php endif ?>
diff --git a/app/design/frontend/magento_backup/Magento_Wishlist/wishlist.js b/app/design/frontend/magento_backup/Magento_Wishlist/wishlist.js
deleted file mode 100644
index 757fc80231c..00000000000
--- a/app/design/frontend/magento_backup/Magento_Wishlist/wishlist.js
+++ /dev/null
@@ -1,208 +0,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.
- *
- * @category frontend product msrp
- * @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 sub:true*/
-/*global alert*/
-(function($, window) {
- "use strict";
- $.widget('mage.wishlist', {
- options: {
- dataAttribute: 'item-id',
- nameFormat: 'qty[{0}]',
- btnRemoveSelector: '.btn-remove',
- qtySelector: '.qty',
- addToCartSelector: '.btn-cart',
- addAllToCartSelector: '.btn-add',
- commentInputType: 'textarea',
- infoList: false
- },
-
- /**
- * Bind handlers to events.
- */
- _create: function() {
- var _this = this;
- if (!this.options.infoList) {
- this.element
- .on('click', this.options.addToCartSelector, function() {
- $.proxy(_this._addItemsToCart($(this)), _this);
- })
- .on('addToCart', function(event, context) {
- $.proxy(_this._addItemsToCart($(context).parents('.cart-cell').find(_this.options.addToCartSelector)), _this);
- })
- .on('click', this.options.btnRemoveSelector, $.proxy(this._confirmRemoveWishlistItem, this))
- .on('click', this.options.addAllToCartSelector, $.proxy(this._addAllWItemsToCart, this))
- .on('focusin focusout', this.options.commentInputType, $.proxy(this._focusComment, this));
- }
- },
-
- /**
- * Validate and Redirect.
- * @private
- * @param {string} url
- */
- _validateAndRedirect: function(url) {
- if (this.element.validation({
- errorPlacement: function(error, element) {
- error.insertAfter(element.next());
- }
- }).valid()) {
- this.element.prop('action', url);
- window.location.href = url;
- }
- },
-
- /**
- * Add wish list items to cart.
- * @private
- * @param {jQuery object} elem - clicked 'add to cart' button
- */
- _addItemsToCart: function(elem) {
- if (elem.data(this.options.dataAttribute)) {
- var itemId = elem.data(this.options.dataAttribute),
- url = this.options.addToCartUrl.replace('%item%', itemId),
- inputName = $.validator.format(this.options.nameFormat, itemId),
- inputValue = elem.parent().find('[name="' + inputName + '"]').val(),
- separator = (url.indexOf('?') >= 0) ? '&' : '?';
- url += separator + inputName + '=' + encodeURIComponent(inputValue);
- this._validateAndRedirect(url);
- return;
- }
-
- },
-
- /**
- * Confirmation window for removing wish list item.
- * @private
- */
- _confirmRemoveWishlistItem: function() {
- return window.confirm(this.options.confirmRemoveMessage);
- },
-
- /**
- * Add all wish list items to cart
- * @private
- */
- _addAllWItemsToCart: function() {
- var url = this.options.addAllToCartUrl,
- separator = (url.indexOf('?') >= 0) ? '&' : '?';
- this.element.find(this.options.qtySelector).each(function(index, element) {
- url += separator + $(element).prop('name') + '=' + encodeURIComponent($(element).val());
- separator = '&';
- });
- this._validateAndRedirect(url);
- },
-
- /**
- * Toggle comment string.
- * @private
- * @param {event} e
- */
- _focusComment: function(e) {
- var commentInput = e.currentTarget;
- if (commentInput.value === '' || commentInput.value === this.options.commentString) {
- commentInput.value = commentInput.value === this.options.commentString ?
- '' : this.options.commentString;
- }
- }
- });
-
- // Extension for mage.wishlist - Select All checkbox
- $.widget('mage.wishlist', $.mage.wishlist, {
- options: {
- selectAllCheckbox: '#select-all',
- parentContainer: '#wishlist-table'
- },
-
- _create: function() {
- this._super();
- var selectAllCheckboxParent = $(this.options.selectAllCheckbox).parents(this.options.parentContainer),
- checkboxCount = selectAllCheckboxParent.find('input:checkbox:not(' + this.options.selectAllCheckbox + ')').length;
- // If Select all checkbox is checked, check all item checkboxes, if unchecked, uncheck all item checkboxes
- $(this.options.selectAllCheckbox).on('click', function() {
- selectAllCheckboxParent.find('input:checkbox').attr('checked', $(this).is(':checked'));
- });
- // If all item checkboxes are checked, check select all checkbox,
- // if not all item checkboxes are checked, uncheck select all checkbox
- selectAllCheckboxParent.on('click', 'input:checkbox:not(' + this.options.selectAllCheckbox + ')', $.proxy(function() {
- var checkedCount = selectAllCheckboxParent.find('input:checkbox:checked:not(' + this.options.selectAllCheckbox + ')').length;
- $(this.options.selectAllCheckbox).attr('checked', checkboxCount === checkedCount);
- }, this));
- }
- });
- // Extension for mage.wishlist info add to cart
- $.widget('mage.wishlist', $.mage.wishlist, {
- _create: function() {
- this._super();
- if (this.options.infoList) {
- this.element.on('addToCart', $.proxy(function(event, context) {
- this.element.find('input:checkbox').attr('checked', false);
- $(context).closest('tr').find('input:checkbox').attr('checked', true);
- this.element.submit();
- }, this));
- this._checkBoxValidate();
- }
- },
-
- /**
- * validate checkbox selection.
- * @private
- */
- _checkBoxValidate: function() {
- this.element.validation({
- submitHandler: $.proxy(function(form) {
- if ($(form).find('input:checkbox:checked').length) {
- form.submit();
- } else {
- alert(this.options.checkBoxValidationMessage);
- }
- }, this)
- });
- }
- });
-
- // Extension for mage.wishlist - Add Wishlist item to Gift Registry
- $.widget('mage.wishlist', $.mage.wishlist, {
- options: {
- formTmplSelector: '#form-tmpl',
- formTmplId: '#wishlist-hidden-form'
- },
-
- _create: function() {
- this._super();
- var _this = this;
- this.element.on('click', '[data-wishlist-to-giftregistry]', function() {
- var json = $(this).data('wishlist-to-giftregistry'),
- tmplJson = {
- item: json['itemId'],
- entity: json['entity'],
- url: json['url']
- };
- $(_this.options.formTmplSelector).tmpl(tmplJson).appendTo('body');
- $(_this.options.formTmplId).submit();
- });
- }
- });
-})(jQuery, window);
diff --git a/app/design/frontend/magento_backup/css/print.css b/app/design/frontend/magento_backup/css/print.css
deleted file mode 100644
index 557b9cc0143..00000000000
--- a/app/design/frontend/magento_backup/css/print.css
+++ /dev/null
@@ -1,37 +0,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)
- */
-
-* { 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
deleted file mode 100644
index 3c9b11dae2719b47bf95d41e69136f1e56ce2904..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 11420
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
O?Eh-yznc!fn))Aia{h_{
diff --git a/app/design/frontend/magento_backup/theme.xml b/app/design/frontend/magento_backup/theme.xml
deleted file mode 100644
index 8109c440bc4..00000000000
--- a/app/design/frontend/magento_backup/theme.xml
+++ /dev/null
@@ -1,33 +0,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.
- *
- * @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/Magento_Catalog/images/slider_btn_zoom_in.gif b/app/design/frontend/magento_blank/Magento_Catalog/images/slider_btn_zoom_in.gif
deleted file mode 100644
index 5a8d72e2a4223419617fc3ab7e949b26eceaa2b1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 443
zcmZ?wbhEHb6k!lzxT?kQ=g*%tD;Gb!cjM^c{c~4tdHL+o*;7YezIe8B*@6|D_pV;C
z=-TD8JGQR>`sMSs&1-Mpy#C<sjhD|Ky?*&@?W!f)x2${p>e=5vf4+YGeErI~2lsB=
zx^eB!&C4G@y#4;|>%V`0fB*iqZuPQfPwu~b{`lM1&xa50eg5ppxzk7Q-?`=%Tl60c
z7$^gZKUo+V7_=C4K*oUl#K3mLVQN8zM1ugwg$D*XeBLVUiN#jAJbXbXHEURW)IC-N
za5(xcJ8(FXOUF;pZ}H{K0;T1y3Dzo&s><?moSbs<%0d|`{ygeR$_$#C8XA)rl$F#)
zYU-F|<R?v@I!RuJNv&H;L0VB+ZsC-La^i~83R(<YeX^WW_U&Vloyo<pbNAl;2M(zp
zS+!=}hQ*q4%3HT<&7FU7;nL+RReSrzCT-Ldo1xBAb0a~tQI3VBO<A<dH&>#ss6<?5
pX4UJKj2R4Shi4cuUGRxG%-SWQ6~+^A;m}ggiOQbS3OJb<tO1d=x(fgR
diff --git a/app/design/frontend/magento_blank/Magento_Catalog/images/slider_btn_zoom_out.gif b/app/design/frontend/magento_blank/Magento_Catalog/images/slider_btn_zoom_out.gif
deleted file mode 100644
index feffd3247c851e282eb701f9a825fc506c5bdd96..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 432
zcmZ?wbhEHb6k!lzxT?kQ=g*%tD;Gb!cjM)YXD^>UI(zEK%4G|V9^Sut#iDDM&)&Xy
zecR@>U%!0bv3335KYzAwS+{o8lCNJszkL2^#pb;a?%sI)^4Z*#TVB6<_Tb))TQ{y<
zzjE%*&C4G@y#4;|>%V`0fB*iqZuPQfPwu~b{`lM1&xa50eg5ppxzk78VvFwIx%M9n
z7$^gZKUo+V7_=C4K*oUl#K3meVQPVeMFS7pg+zlKKJO*2iOo*AT--q?HA7f@G`u<-
zI06HfH5`iMQV9^^TYNdOKxKtXg0)Jcwz9mOrly>{vS@~iKd*+8GDFKGO$KEp4gQ)s
zCK>t3ljUWY)Vj44q!pE$=eNiSDoQJ8F>v(B3ajtjwNp%XItRm+Z98`F+Pj}&*@{(b
z)+%q<q&0i)S<Quum#X&m^R3~VromftDM7q(b(^wymv63AUr~vm%=D_qPLcu%63MAd
d83NY|8kJhRrZVwwDaZ_Z;xS1zrip>U8URP^wQK+Y
diff --git a/app/design/frontend/magento_blank/theme.xml b/app/design/frontend/magento_blank/theme.xml
index ec930d7cab0..1fdcf0f5031 100644
--- a/app/design/frontend/magento_blank/theme.xml
+++ b/app/design/frontend/magento_blank/theme.xml
@@ -27,7 +27,6 @@
<theme>
<title>Magento Blank</title>
<version>2.0.0.0</version>
- <parent>magento_demo</parent>
<media>
<preview_image>media/preview_image.jpg</preview_image>
</media>
diff --git a/app/design/frontend/magento_blank/view.xml b/app/design/frontend/magento_blank/view.xml
new file mode 100644
index 00000000000..bdad3bdb43e
--- /dev/null
+++ b/app/design/frontend/magento_blank/view.xml
@@ -0,0 +1,298 @@
+<?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.
+ *
+ * @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)
+ */
+-->
+<view>
+ <vars module="Magento_Catalog">
+ <var name="product_small_image_sidebar_size">100</var> <!-- Override for small product image -->
+ <var name="product_base_image_size">275</var> <!-- Override for base product image -->
+ <var name="product_base_image_icon_size">48</var> <!-- Base product image icon size -->
+
+ <var name="product_list_image_size">166</var> <!-- New Product image size used in product list -->
+ <var name="product_zoom_image_size">370</var> <!-- New Product image size used for zooming -->
+
+ <var name="product_image_white_borders">0</var>
+
+ <var name="review_page_product_image:type">small_image</var>
+ <var name="review_page_product_image:width">285</var>
+ <var name="review_page_product_image:ratio">1</var>
+ <var name="review_page_product_image:height">285</var>
+
+ <var name="customer_account_product_review_page:type">image</var>
+ <var name="customer_account_product_review_page:width">285</var>
+ <var name="customer_account_product_review_page:ratio">1</var>
+ <var name="customer_account_product_review_page:height">285</var>
+
+ <var name="category_page_list:type">small_image</var>
+ <var name="category_page_list:width">180</var>
+ <var name="category_page_list:ratio">1</var>
+ <var name="category_page_list:height">230</var>
+
+ <var name="category_page_grid:type">small_image</var>
+ <var name="category_page_grid:width">180</var>
+ <var name="category_page_grid:ratio">1</var>
+ <var name="category_page_grid:height">230</var>
+
+ <var name="product_comparison_list:type">small_image</var>
+ <var name="product_comparison_list:width">140</var>
+ <var name="product_comparison_list:ratio">1</var>
+ <var name="product_comparison_list:height">140</var>
+
+ <var name="related_products_list:type">small_image</var>
+ <var name="related_products_list:width">140</var>
+ <var name="related_products_list:ratio">1</var>
+ <var name="related_products_list:height">140</var>
+
+ <var name="upsell_products_list:type">small_image</var>
+ <var name="upsell_products_list:width">140</var>
+ <var name="upsell_products_list:ratio">1</var>
+ <var name="upsell_products_list:height">140</var>
+
+ <var name="product_page_main_image:type">image</var>
+ <var name="product_page_main_image:width">400</var>
+ <var name="product_page_main_image:ratio">1</var>
+ <var name="product_page_main_image:height">495</var>
+
+ <var name="product_page_main_image_default:type">image</var>
+ <var name="product_page_main_image_default:width">400</var>
+ <var name="product_page_main_image_default:ratio">1</var>
+ <var name="product_page_main_image_default:height">495</var>
+
+ <var name="product_page_more_views:type">thumbnail</var>
+ <var name="product_page_more_views:width">90</var>
+ <var name="product_page_more_views:ratio">1</var>
+ <var name="product_page_more_views:height">90</var>
+
+ <var name="side_column_widget_product_thumbnail:type">thumbnail</var>
+ <var name="side_column_widget_product_thumbnail:width">50</var>
+ <var name="side_column_widget_product_thumbnail:ratio">1</var>
+ <var name="side_column_widget_product_thumbnail:height">50</var>
+
+ <var name="new_products_content_widget_list:type">small_image</var>
+ <var name="new_products_content_widget_list:width">166</var>
+ <var name="new_products_content_widget_list:ratio">1</var>
+ <var name="new_products_content_widget_list:height">166</var>
+
+ <var name="new_products_content_widget_grid:type">small_image</var>
+ <var name="new_products_content_widget_grid:width">166</var>
+ <var name="new_products_content_widget_grid:ratio">1</var>
+ <var name="new_products_content_widget_grid:height">166</var>
+
+ <var name="recently_compared_products_images_names_widget:type">thumbnail</var>
+ <var name="recently_compared_products_images_names_widget:width">50</var>
+ <var name="recently_compared_products_images_names_widget:ratio">1</var>
+ <var name="recently_compared_products_images_names_widget:height">50</var>
+
+ <var name="recently_viewed_products_images_names_widget:type">small_image</var>
+ <var name="recently_viewed_products_images_names_widget:width">50</var>
+ <var name="recently_viewed_products_images_names_widget:ratio">1</var>
+ <var name="recently_viewed_products_images_names_widget:height">50</var>
+
+ <var name="recently_compared_products_images_only_widget:type">thumbnail</var>
+ <var name="recently_compared_products_images_only_widget:width">76</var>
+ <var name="recently_compared_products_images_only_widget:ratio">1</var>
+ <var name="recently_compared_products_images_only_widget:height">76</var>
+
+ <var name="recently_viewed_products_images_only_widget:type">small_image</var>
+ <var name="recently_viewed_products_images_only_widget:width">76</var>
+ <var name="recently_viewed_products_images_only_widget:ratio">1</var>
+ <var name="recently_viewed_products_images_only_widget:height">76</var>
+
+ <var name="bundled_product_customization_page:type">thumbnail</var>
+ <var name="bundled_product_customization_page:width">140</var>
+ <var name="bundled_product_customization_page:ratio">1</var>
+ <var name="bundled_product_customization_page:height">140</var>
+
+ <var name="recently_compared_products_grid_content_widget:type">small_image</var>
+ <var name="recently_compared_products_grid_content_widget:width">135</var>
+ <var name="recently_compared_products_grid_content_widget:ratio">1</var>
+ <var name="recently_compared_products_grid_content_widget:height">135</var>
+
+ <var name="recently_compared_products_list_content_widget:type">small_image</var>
+ <var name="recently_compared_products_list_content_widget:width">166</var>
+ <var name="recently_compared_products_list_content_widget:ratio">1</var>
+ <var name="recently_compared_products_list_content_widget:height">166</var>
+
+ <var name="recently_viewed_products_grid_content_widget:type">small_image</var>
+ <var name="recently_viewed_products_grid_content_widget:width">135</var>
+ <var name="recently_viewed_products_grid_content_widget:ratio">1</var>
+ <var name="recently_viewed_products_grid_content_widget:height">135</var>
+
+ <var name="recently_viewed_products_list_content_widget:type">small_image</var>
+ <var name="recently_viewed_products_list_content_widget:width">166</var>
+ <var name="recently_viewed_products_list_content_widget:ratio">1</var>
+ <var name="recently_viewed_products_list_content_widget:height">166</var>
+
+ <var name="customer_shared_wishlist:type">small_image</var>
+ <var name="customer_shared_wishlist:width">113</var>
+ <var name="customer_shared_wishlist:ratio">1</var>
+ <var name="customer_shared_wishlist:height">113</var>
+
+ <var name="wishlist_thumbnail:type">small_image</var>
+ <var name="wishlist_thumbnail:width">113</var>
+ <var name="wishlist_thumbnail:ratio">1</var>
+ <var name="wishlist_thumbnail:height">113</var>
+
+ <var name="wishlist_sidebar_block:type">thumbnail</var>
+ <var name="wishlist_sidebar_block:width">50</var>
+ <var name="wishlist_sidebar_block:ratio">1</var>
+ <var name="wishlist_sidebar_block:height">50</var>
+
+ <var name="shared_wishlist_email:type">small_image</var>
+ <var name="shared_wishlist_email:width">135</var>
+ <var name="shared_wishlist_email:ratio">1</var>
+ <var name="shared_wishlist_email:height">135</var>
+
+ <var name="customer_account_my_tags_tag_view:type">small_image</var>
+ <var name="customer_account_my_tags_tag_view:width">100</var>
+ <var name="customer_account_my_tags_tag_view:ratio">1</var>
+ <var name="customer_account_my_tags_tag_view:height">100</var>
+
+ <var name="cart_cross_sell_products:type">thumbnail</var>
+ <var name="cart_cross_sell_products:width">140</var>
+ <var name="cart_cross_sell_products:ratio">1</var>
+ <var name="cart_cross_sell_products:height">140</var>
+
+ <var name="gift_messages_checkout_thumbnail:type">thumbnail</var>
+ <var name="gift_messages_checkout_thumbnail:width">75</var>
+ <var name="gift_messages_checkout_thumbnail:ratio">1</var>
+ <var name="gift_messages_checkout_thumbnail:height">75</var>
+
+ <var name="gift_messages_checkout_small_image:type">small_image</var>
+ <var name="gift_messages_checkout_small_image:width">75</var>
+ <var name="gift_messages_checkout_small_image:ratio">1</var>
+ <var name="gift_messages_checkout_small_image:height">75</var>
+
+ <var name="mini_cart_product_thumbnail:type">thumbnail</var>
+ <var name="mini_cart_product_thumbnail:width">78</var>
+ <var name="mini_cart_product_thumbnail:ratio">1</var>
+ <var name="mini_cart_product_thumbnail:height">78</var>
+
+ <var name="new_products_images_only_widget:type">small_image</var>
+ <var name="new_products_images_only_widget:width">78</var>
+ <var name="new_products_images_only_widget:ratio">1</var>
+ <var name="new_products_images_only_widget:height">78</var>
+
+ <var name="cart_page_product_thumbnail:type">thumbnail</var>
+ <var name="cart_page_product_thumbnail:width">80</var>
+ <var name="cart_page_product_thumbnail:ratio">1</var>
+ <var name="cart_page_product_thumbnail:height">80</var>
+
+ <var name="product_stock_alert_email_product_image:type">small_image</var>
+ <var name="product_stock_alert_email_product_image:width">76</var>
+ <var name="product_stock_alert_email_product_image:ratio">1</var>
+ <var name="product_stock_alert_email_product_image:height">76</var>
+ </vars>
+ <vars module="Magento_Bundle">
+ <var name="product_summary_image_size">58</var> <!-- New Product image size used for summary block-->
+ </vars>
+ <vars module="Magento_DesignEditor">
+ <var name="store-name:font-picker">"marvel"</var>
+ <var name="store-name:color-picker">#837d75</var>
+ <var name="store-name:logo-uploader"></var>
+ <var name="header-background:color-picker">#d6d7d2</var>
+ <var name="header-background:image-uploader">header-bg.jpg</var>
+ <var name="header-background:tile">repeat</var>
+
+ <var name="menu-background">#f8f8f8</var>
+ <var name="menu-stroke">#c2c2c2</var>
+ <var name="menu-links">#675f55</var>
+ <var name="menu-links-hover">#f47a1f</var>
+
+ <var name="header-links">#837d75</var>
+ <var name="header-links-hover">#675f55</var>
+ <var name="header-scroll-bar-background">#ffffff</var>
+ <var name="header-scroll-bar-handle">#e5e5e5</var>
+ <var name="search-field">#ffffff</var>
+ <var name="search-field-text">#675f55</var>
+ <var name="search-field-stroke">#c2c2c2</var>
+
+ <var name="page-background:color-picker">#ffffff</var>
+ <var name="page-background:image-uploader"></var>
+ <var name="page-background:tile">no-repeat</var>
+
+ <var name="form-background">#f8f8f8</var>
+ <var name="form-stroke">#c2c2c2</var>
+ <var name="form2-background">#e5e5e5</var>
+ <var name="form2-stroke">#c2c2c2</var>
+
+ <var name="form-field-stroke">#c2c2c2</var>
+ <var name="form-field-stroke-clicked">#999999</var>
+ <var name="image-stroke-keylines">#e5e5e5</var>
+ <var name="scroll-bar-background">#f8f8f8</var>
+ <var name="scroll-bar-handle">#c2c2c2</var>
+
+ <var name="radio-checkbox-icon">#675f55</var>
+ <var name="radio-checkbox-background">#e5e5e5</var>
+ <var name="radio-checkbox-stroke">#999999</var>
+
+ <var name="button-background">#f47a1f</var>
+ <var name="button-text">#ffffff</var>
+ <var name="button-hover">#ff953b</var>
+ <var name="icons">#c2c2c2</var>
+ <var name="icons-hover">#999999</var>
+ <var name="icons2">#837d75</var>
+
+ <var name="accents">#55c2e6</var>
+ <var name="size-swatches">#f8f8f8</var>
+ <var name="size-swatches-unavailable">#e5e5e5</var>
+ <var name="size-swatches-hover">#675f55</var>
+
+ <var name="tooltip-text">#675f55</var>
+ <var name="tooltip-box">#ffffff</var>
+ <var name="tooltip-stroke">#c2c2c2</var>
+ <var name="tooltip2-text">#ffffff</var>
+ <var name="tooltip2-box">#000000</var>
+ <var name="tooltip2-stroke">#c2c2c2</var>
+
+ <var name="error-box">#ff3200</var>
+ <var name="error-icon">#ffffff</var>
+ <var name="success-box">#d3edd5</var>
+ <var name="success-icon">#ffffff</var>
+ <var name="notice-box">#ffedb8</var>
+ <var name="notice-icon">#ffffff</var>
+
+ <var name="banner-text:font-picker">"marvel", Arial, sans-serif</var>
+ <var name="banner-text:color-picker">#675f55</var>
+ <var name="page-headings:font-picker">"sourcesanspro", Arial, sans-serif</var>
+ <var name="page-headings:color-picker">#675f55</var>
+ <var name="menu:font-picker">"sourcesanspro", Arial, sans-serif</var>
+ <var name="menu:color-picker">#675f55</var>
+
+ <var name="body-text:font-picker">"sourcesanspro", Arial, sans-serif</var>
+ <var name="body-text:color-picker">#675f55</var>
+
+ <var name="buttons:font-picker">"sourcesanspro", Arial, sans-serif</var>
+ <var name="buttons:color-picker">#ffffff</var>
+
+ <var name="text-links">#675f55</var>
+ <var name="text-links-hover">#f47a1f</var>
+ <var name="text-links-active">#f47a1f</var>
+ <var name="text-links-product">#675f55</var>
+ <var name="small-links">#675f55</var>
+ <var name="small-links-hover">#c2c2c2</var>
+ </vars>
+</view>
diff --git a/app/design/frontend/magento_demo/Magento_Page/layout/default.xml b/app/design/frontend/magento_demo/Magento_Page/layout/default.xml
deleted file mode 100644
index 029d5a1b469..00000000000
--- a/app/design/frontend/magento_demo/Magento_Page/layout/default.xml
+++ /dev/null
@@ -1,51 +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\Css" name="css-styles-css">
- <arguments>
- <argument name="file" xsi:type="string">css/styles.css</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Css" name="css-styles-ie-css">
- <arguments>
- <argument name="file" xsi:type="string">css/styles-ie.css</argument>
- <argument name="properties" xsi:type="array">
- <item name="attributes" xsi:type="string"/>
- <item name="ie_condition" xsi:type="string">lt IE 8</item>
- </argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Css" name="css-print-css">
- <arguments>
- <argument name="file" xsi:type="string">css/print.css</argument>
- <argument name="properties" xsi:type="array">
- <item name="attributes" xsi:type="string">media="print"</item>
- </argument>
- </arguments>
- </block>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_demo/Magento_Page/layout/print.xml b/app/design/frontend/magento_demo/Magento_Page/layout/print.xml
deleted file mode 100644
index 029d5a1b469..00000000000
--- a/app/design/frontend/magento_demo/Magento_Page/layout/print.xml
+++ /dev/null
@@ -1,51 +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\Css" name="css-styles-css">
- <arguments>
- <argument name="file" xsi:type="string">css/styles.css</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Css" name="css-styles-ie-css">
- <arguments>
- <argument name="file" xsi:type="string">css/styles-ie.css</argument>
- <argument name="properties" xsi:type="array">
- <item name="attributes" xsi:type="string"/>
- <item name="ie_condition" xsi:type="string">lt IE 8</item>
- </argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Css" name="css-print-css">
- <arguments>
- <argument name="file" xsi:type="string">css/print.css</argument>
- <argument name="properties" xsi:type="array">
- <item name="attributes" xsi:type="string">media="print"</item>
- </argument>
- </arguments>
- </block>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_demo/css/print.css b/app/design/frontend/magento_demo/css/print.css
deleted file mode 100644
index 4910319f702..00000000000
--- a/app/design/frontend/magento_demo/css/print.css
+++ /dev/null
@@ -1,39 +0,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)
- */
-
-* { background:none !important; text-align:left !important; }
-html { margin:0 !important; padding:0 !important; }
-body { background:#fff !important; font-size:9pt !important; padding:0 !important; margin:10px !important; }
-a { color:#2976c9 !important; }
-th,td { color:#2f2f2f !important; border-color:#ccc !important; }
-
-.header-container,
-.nav-container,
-.footer-container,
-.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_demo/css/styles-ie.css b/app/design/frontend/magento_demo/css/styles-ie.css
deleted file mode 100644
index 6c4a3efe0e4..00000000000
--- a/app/design/frontend/magento_demo/css/styles-ie.css
+++ /dev/null
@@ -1,146 +0,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.
- *
- * @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)
- */
-
-/* IE 6 only */
-* html .validation-advice { height:13px; }
-* html .error-msg,
-* html .success-msg,
-* html .note-msg,
-* html .notice-msg { height:24px; }
-* html .main { height:400px; }
-* html .account-login .content { height:240px; }
-.block li.item,
-.opc li.section { vertical-align:top; }
-* html .window-overlay { background:#ccc; filter:alpha(opacity=50); }
-
-/* Doubled Margin Fixes */
-.product-view .product-img-box .more-views li,
-.product-view .box-tags .form-add .input-box,
-.sp-methods select.month { display:inline; }
-
-/********** < Navigation styles */
-#nav li,
-#nav li a { zoom:1; }
-#nav li { vertical-align:top; }
-/********** < Navigation styles */
-
-select { margin-bottom:1px; }
-input.radio { width:13px; height:13px; }
-input.checkbox { width:13px; height:13px; }
-button.button { height:21px; }
-button.button span { position:relative; }
-button.btn-checkout { height:40px; }
-#opc-review .sp-methods .input-box { float:left; }
-.form-list label { position:relative; z-index:0; }
-.form-list label.required em { position:absolute; top:0; right:-8px; }
-
-table { scrollbar-face-color:expression(runtimeStyle.scrollbarFaceColor = '#fff', cellSpacing = 0); }
-
-.product-view .product-img-box .zoom.disabled { filter:alpha(opacity=30); }
-
-.gift-messages-form { position:relative; zoom:1; }
-
-.tool-tip .btn-close a { margin:0; }
-
-.product-view .box-tags .product-tags li,
-.footer li { padding:0 4px 0 7px; }
-
-.product-options dd .time-picker select { margin:0; padding:0; }
-
-/* Clearer */
-.clearer { display:block; clear:both; font-size:0; line-height:0; height:0; overflow:hidden; }
-
-/* Clears and hasLayout fixes */
-.header-container,
-.header-container .top-container,
-.header,
-.header .quick-access,
-#nav,
-.main,
-.footer,
-.footer-container .bottom-container,
-.col-main,
-.col2-set,
-.col3-set,
-.col3-layout .product-options-bottom .price-box,
-.col4-set,
-.messages li,
-.search-autocomplete li,
-.block,
-.block .block-content,
-.block .actions,
-.block li.item,
-.block-layered-nav .currently li,
-.block-account .block-content li a,
-.mini-products-list .product-details,
-.page-title,
-.rss-title h1,
-.products-grid,
-.products-list li.item,
-.box-account .box-head,
-.dashboard .box .box-title,
-.box-reviews li.item,
-.box-tags li.item,
-.pager,
-.sorter,
-.ratings,
-.add-to-box,
-.add-to-cart,
-.product-essential,
-.product-collateral,
-.product-view .product-img-box .more-views ul,
-.product-view .box-tags .form-add,
-.product-view .product-shop .short-description,
-.product-view .box-description,
-.product-options .options-list li,
-.product-options,
-.product-options-bottom,
-.truncated,
-.truncated .truncated_full_value,
-.product-review,
-.cart,
-.cart-collaterals,
-.cart .crosssell li.item,
-.cart .discount,
-.opc .step-title,
-.opc .step,
-.multiple-checkout,
-.sp-methods,
-.checkout-progress,
-.multiple-checkout .place-order,
-.form-list li,
-.form-list .field,
-.group-select li,
-.buttons-set,
-.page-print .print-head,
-.cart-tax-total,
-.advanced-search-summary,
-.advanced-search-summary p,
-.gift-messages-form .item,
-.send-friend .form-list li p,
-.centinel .authentication { zoom:1; }
-
-/* Hover Fix */
-iframe.hover-fix { position:absolute; left:-1px; top:-1px; z-index:-1; background:transparent; filter:progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0); }
diff --git a/app/design/frontend/magento_demo/css/styles.css b/app/design/frontend/magento_demo/css/styles.css
deleted file mode 100644
index 637be01922d..00000000000
--- a/app/design/frontend/magento_demo/css/styles.css
+++ /dev/null
@@ -1,1765 +0,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.
- *
- * @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)
- */
-
-/* Reset ================================================================================= */
-* { margin:0; padding:0; }
-
-body { background:#496778 url(../images/bkg_body.gif) 50% 0 repeat-y; font:12px/1.55 Arial, Helvetica, sans-serif; color:#2f2f2f; text-align:center; }
-
-img { border:0; vertical-align:top; }
-
-a,.l { color:#1e7ec8; text-decoration:underline; }
-a:hover { text-decoration:none; }
-:focus { outline:0; }
-
-/* Headings */
-h1,h2,h3,
-h4,h5,h6 { margin:0 0 5px; line-height:1.35; color:#0a263c; }
-h1 { font-size:20px; font-weight:normal; }
-h2 { font-size:18px; font-weight:normal; }
-h3 { font-size:16px; font-weight:bold; }
-h4 { font-size:14px; font-weight:bold; }
-h5 { font-size:12px; font-weight:bold; }
-h6 { font-size:11px; font-weight:bold; }
-
-/* Forms */
-form { display:inline; }
-fieldset { border:0; }
-legend { display:none; }
-
-/* Table */
-table { border:0; /*border-collapse:collapse;*/ border-spacing:0; empty-cells:show; font-size:100%; }
-caption,th,td { vertical-align:top; text-align:left; font-weight:normal; }
-
-/* Content */
-p { margin:0 0 10px; }
-strong { font-weight:bold; }
-address { font-style:normal; line-height:1.35; }
-cite { font-style:normal; }
-q,
-blockquote { quotes:none; }
-q:before,
-q:after { content:''; }
-small,big { font-size:1em; }
-/*sup { font-size:1em; vertical-align:top; }*/
-
-/* Lists */
-ul,ol { list-style:none; }
-
-/* Tools */
-.hidden { display:block !important; border:0 !important; margin:0 !important; padding:0 !important; font-size:0 !important; line-height:0 !important; width:0 !important; height:0 !important; overflow:hidden !important; }
-.nobr { white-space:nowrap !important; }
-.wrap { white-space:normal !important; }
-.a-left { text-align:left !important; }
-.a-center { text-align:center !important; }
-.a-right { text-align:right !important; }
-.v-top { vertical-align:top; }
-.v-middle { vertical-align:middle; }
-.f-left,
-.left { float:left !important; }
-.f-right,
-.right { float:right !important; }
-.f-none { float:none !important; }
-.f-fix { float:left; width:100%; }
-.no-display { display:none; }
-.no-margin { margin:0 !important; }
-.no-padding { padding:0 !important; }
-.no-bg { background:none !important; }
-.clear { clear: both; }
-/* ======================================================================================= */
-
-
-/* Layout ================================================================================ */
-.wrapper { min-width:954px; }
-.page {}
-.page-print { background:#fff; padding:25px 30px; text-align:left; }
-.page-empty { background:#fff; padding:20px; text-align:left; }
-.page-popup { background:#fff; padding:25px 30px; text-align:left; }
-.main-container { background:#fbfaf6 url(../images/bkg_main1.gif) 50% 0 no-repeat; }
-.main { width:900px; margin:0 auto; min-height:400px; padding:25px 25px 80px; background:#fffffe url(../images/bkg_main2.gif) 0 0 no-repeat; text-align:left; }
-
-/* Base Columns */
-.col-left { float:left; width:195px; padding:0 0 1px; }
-.col-main { float:left; width:685px; padding:0 0 1px; }
-.col-right { float:right; width:195px; padding:0 0 1px; }
-
-/* 1 Column Layout */
-.col1-layout .col-main { float:none; width:auto; }
-
-/* 2 Columns Layout */
-.col2-left-layout .col-main { float:right; }
-.col2-right-layout .col-main {}
-
-/* 3 Columns Layout */
-.col3-layout .col-main { width:475px; margin-left:17px; }
-.col3-layout .col-wrapper { float:left; width:687px; }
-.col3-layout .col-wrapper .col-main { float:right; }
-
-/* Content Columns */
-.col2-set .col-1 { float:left; width:48.5%; }
-.col2-set .col-2 { float:right; width:48.5%; }
-.col2-set .col-narrow { width:32%; }
-.col2-set .col-wide { width:65%; }
-
-.col3-set .col-1 { float:left; width:32%; }
-.col3-set .col-2 { float:left; width:32%; margin-left:2%; }
-.col3-set .col-3 { float:right; width:32%; }
-
-.col4-set .col-1 { float:left; width:23.5%; }
-.col4-set .col-2 { float:left; width:23.5%; margin:0 2%; }
-.col4-set .col-3 { float:left; width:23.5%; }
-.col4-set .col-4 { float:right; width:23.5%; }
-
-/* ======================================================================================= */
-
-
-/* Global Styles ========================================================================= */
-/* Form Elements */
-input,select,textarea,button { font:12px/15px Arial, Helvetica, sans-serif; vertical-align:middle; color:#2f2f2f; }
-input.input-text,select,textarea { background:#fff; border:1px solid #b6b6b6; }
-input.input-text,textarea { padding:2px; }
-select { padding:1px; }
-select option { padding-right:10px; }
-select.multiselect option { border-bottom:1px solid #b6b6b6; padding:2px 5px; }
-select.multiselect option:last-child { border-bottom:0; }
-textarea { overflow:auto; }
-input.radio { margin-right:3px; }
-input.checkbox { margin-right:3px; }
-input.qty { width:2.5em !important; }
-button.button::-moz-focus-inner { padding:0; border:0; } /* FF Fix */
-button.button { -webkit-border-fit:lines; } /* <- Safari & Google Chrome Fix */
-button.button { overflow:visible; width:auto; border:0; padding:0; margin:0; background:transparent; cursor:pointer; }
-button.button span { display:block; height:19px; border:1px solid #de5400; background:#f18200; padding:0 8px; font:bold 12px/19px Arial, Helvetica, sans-serif; text-align:center; white-space:nowrap; color:#fff; }
-button.button span span { border:0; padding:0; }
-button.disabled span { border-color:#bbb !important; background:#bbb !important; }
-
-button.btn-checkout span { height:40px; border:0; background:url(../images/btn_checkout.gif) 0 0 no-repeat; padding:0 0 0 9px; font:bold 15px/40px Arial, Helvetica, sans-serif; color:#fff; }
-button.btn-checkout span span { background-position:100% 0; padding:0 25px 0 16px; }
-button.btn-checkout.no-checkout span { background-position:0 100%; color:#b8baba; }
-button.btn-checkout.no-checkout span span { background-position:100% 100%; }
-
-p.control input.checkbox,
-p.control input.radio { margin-right:6px; }
-/* Form Highlight */
-input.input-text:focus,select:focus,textarea:focus { background-color:#edf7fd; }
-/*.highlight { background:#efefef; }*/
-
-/* Form lists */
-/* Grouped fields */
-/*.form-list { width:535px; margin:0 auto; overflow:hidden; }*/
-.form-list li { margin:0 0 8px; }
-.form-list label { float:left; color:#666; font-weight:bold; position:relative; z-index:0; }
-.form-list label.required {}
-.form-list label.required em { float:right; font-style:normal; color:#eb340a; position:absolute; top:0; right:-8px; }
-.form-list li.control label { float:none; }
-.form-list li.control input.radio,
-.form-list li.control input.checkbox { margin-right:6px; }
-.form-list li.control .input-box { clear:none; display:inline; width:auto; }
-/*.form-list li.fields { margin-right:-15px; }*/
-.form-list .input-box { display:block; clear:both; width:260px; }
-.form-list .field { float:left; width:275px; }
-.form-list input.input-text { width:254px; }
-.form-list textarea { width:254px; height:10em; }
-.form-list select { width:260px; }
-.form-list li.wide .input-box { width:535px; }
-.form-list li.wide input.input-text { width:529px; }
-.form-list li.wide textarea { width:529px; }
-.form-list li.wide select { width:535px; }
-.form-list li.additional-row { border-top:1px solid #ccc; margin-top:10px; padding-top:7px; }
-.form-list li.additional-row .btn-remove { float:right; margin:5px 0 0; }
-.form-list .input-range input.input-text { width:74px; }
-
-.form-list-narrow li { margin-bottom:0; }
-.form-list-narrow li .input-box { margin-bottom:6px; }
-.form-list-narrow li.wide .input-box { width:260px; }
-.form-list-narrow li.wide input.input-text,
-.form-list-narrow li.wide textarea { width:254px }
-.form-list-narrow li.wide select { width:260px; }
-
-/* Customer */
-.form-list .customer-name-prefix .input-box,
-.form-list .customer-name-suffix .input-box,
-.form-list .customer-name-prefix-suffix .input-box,
-.form-list .customer-name-prefix-middlename .input-box,
-.form-list .customer-name-middlename-suffix .input-box,
-.form-list .customer-name-prefix-middlename-suffix .input-box { width:auto; }
-
-.form-list .name-prefix { width:65px; }
-.form-list .name-prefix select { width:55px; }
-.form-list .name-prefix input.input-text { width:49px; }
-
-.form-list .name-suffix { width:65px; }
-.form-list .name-suffix select { width:55px; }
-.form-list .name-suffix input.input-text { width:49px; }
-
-.form-list .name-middlename { width:70px; }
-.form-list .name-middlename input.input-text { width:49px; }
-
-.form-list .customer-name-prefix-middlename-suffix .name-firstname,
-.form-list .customer-name-prefix-middlename .name-firstname { width:140px; }
-.form-list .customer-name-prefix-middlename-suffix .name-firstname input.input-text,
-.form-list .customer-name-prefix-middlename .name-firstname input.input-text { width:124px; }
-.form-list .customer-name-prefix-middlename-suffix .name-lastname { width:205px; }
-.form-list .customer-name-prefix-middlename-suffix .name-lastname input.input-text { width:189px; }
-
-.form-list .customer-name-prefix-suffix .name-firstname { width:210px; }
-.form-list .customer-name-prefix-suffix .name-lastname { width:205px; }
-.form-list .customer-name-prefix-suffix .name-firstname input.input-text,
-.form-list .customer-name-prefix-suffix .name-lastname input.input-text { width:189px; }
-
-.form-list .customer-name-prefix-suffix .name-firstname { width:210px; }
-.form-list .customer-name-prefix-suffix .name-lastname { width:205px; }
-.form-list .customer-name-prefix-suffix .name-firstname input.input-text,
-.form-list .customer-name-prefix-suffix .name-lastname input.input-text { width:189px; }
-
-.form-list .customer-name-prefix .name-firstname,
-.form-list .customer-name-middlename .name-firstname { width:210px; }
-
-.form-list .customer-name-suffix .name-lastname,
-.form-list .customer-name-middlename .name-firstname,
-.form-list .customer-name-middlename-suffix .name-firstname,
-.form-list .customer-name-middlename-suffix .name-lastname { width:205px; }
-
-.form-list .customer-name-prefix .name-firstname input.input-text,
-.form-list .customer-name-suffix .name-lastname input.input-text,
-.form-list .customer-name-middlename .name-firstname input.input-text,
-.form-list .customer-name-middlename-suffix .name-firstname input.input-text,
-.form-list .customer-name-middlename-suffix .name-lastname input.input-text { width:189px; }
-
-.form-list .customer-dob .dob-month,
-.form-list .customer-dob .dob-day,
-.form-list .customer-dob .dob-year { float:left; width:85px; }
-.form-list .customer-dob input.input-text { display:block; width:74px; }
-.form-list .customer-dob label { font-size:10px; font-weight:normal; color:#888; }
-.form-list .customer-dob .dob-day,
-.form-list .customer-dob .dob-month { width:60px; }
-.form-list .customer-dob .dob-day input.input-text,
-.form-list .customer-dob .dob-month input.input-text { width:46px; }
-.form-list .customer-dob .dob-year { width:140px; }
-.form-list .customer-dob .dob-year input.input-text { width:134px; }
-
-/* Independent fields */
-/*.form-list li { margin:0 0 8px; }
-.form-list li.fields { margin:0; }
-.form-list .field { display:block; margin:0 0 8px; }
-.form-list li.control {}
-.form-list label { float:left; width:150px; padding:2px 10px 0 0; text-align:right; }
-.form-list label.required { font-weight:bold; }
-.form-list label.required em { font-variant:normal; color:#eb340a; margin-right:3px; }
-.form-list .input-box { float:left; width:260px; }
-.form-list input.input-text,
-.form-list textarea { width:254px; }
-.form-list select { width:260px; }
-.form-list li.additional-row { border-top:1px solid #ddd; margin-top:10px; }
-.form-list li.additional-row .btn-remove { float:right; margin:5px 5px 0 0; }
-.form-list .input-range input.input-text { width:96px; }*/
-/* Customer */
-/*.form-list .customer-dob .dob-month,
-.form-list .customer-dob .dob-day,
-.form-list .customer-dob .dob-year { float:left; width:85px; }
-.form-list .customer-dob input.input-text { display:block; width:74px; }
-.form-list .customer-dob label { font-size:11px; font-weight:normal; color:#777; text-align:left; }
-.form-list .customer-dob .dob-day,
-.form-list .customer-dob .dob-month { width:60px; }
-.form-list .customer-dob .dob-day input.input-text,
-.form-list .customer-dob .dob-month input.input-text { width:46px; }
-.form-list .customer-dob .dob-year { width:140px; }
-.form-list .customer-dob .dob-year input.input-text { width:134px; }*/
-
-.buttons-set { clear:both; margin:4em 0 0; padding:8px 0 0; border-top:1px solid #e4e4e4; text-align:right; }
-.buttons-set p.required { margin:0 0 10px; }
-.buttons-set .back-link { float:left; margin:0; }
-.buttons-set button.button { float:right; margin-left:5px; }
-
-.buttons-set-order { margin:10px 0 0; }
-.buttons-set-order .please-wait { padding:12px 7px 0 0; }
-
-.fieldset { border:1px solid #bbafa0; background:#fbfaf6; padding:22px 25px 12px 33px; margin:28px 0; }
-.fieldset .legend { float:left; font-weight:bold; font-size:13px; border:1px solid #f19900; background:#f9f3e3; color:#e76200; margin:-33px 0 0 -10px; padding:0 8px; position:relative; }
-
-/* Form Validation */
-.validation-advice { clear:both; min-height:13px; margin:3px 0 0; padding-left:17px; font-size:11px; font-weight:bold; line-height:13px; background:url(../images/validation_advice_bg.gif) 2px 0 no-repeat; color:#eb340a; }
-.validation-failed { border:1px dashed #eb340a !important; background:#faebe7 !important; }
-.validation-passed {}
-p.required { font-size:11px; text-align:right; color:#EB340A; }
-/* Expiration date and CVV number validation fix */
-.v-fix { float:left; }
-.v-fix .validation-advice { display:block; width:12em; margin-right:-12em; position:relative; }
-
-/* Global Messages */
-.success { color:#3d6611; font-weight:bold; }
-.error { color:#df280a; font-weight:bold; }
-.notice { color:#e26703; }
-
-.messages,
-.messages ul { list-style:none !important; margin:0 !important; padding:0 !important; }
-.messages { width:100%; overflow:hidden; }
-.messages li { margin:0 0 10px !important; }
-.messages li li { margin:0 0 3px !important; }
-.error-msg,
-.success-msg,
-.note-msg,
-.notice-msg { border-style:solid !important; border-width:1px !important; background-position:10px 9px !important; background-repeat:no-repeat !important; min-height:24px !important; padding:8px 8px 8px 32px !important; font-size:11px !important; font-weight:bold !important; }
-.error-msg { border-color:#f16048; background-color:#faebe7; background-image:url(../images/i_msg-error.gif); color:#df280a; }
-.success-msg { border-color:#446423; background-color:#eff5ea; background-image:url(../images/i_msg-success.gif); color:#3d6611; }
-.note-msg,
-.notice-msg { border-color:#fcd344; background-color:#fafaec; background-image:url(../images/i_msg-note.gif); color:#3d6611; }
-
-/* BreadCrumbs */
-.breadcrumbs { font-size:11px; line-height:1.25; margin:0 0 13px; }
-.breadcrumbs li { display:inline; }
-.breadcrumbs li strong { font-weight:bold; }
-
-/* Page Heading */
-.page-title { width:100%; overflow:hidden; border-bottom:1px solid #ccc; margin:0 0 25px; }
-.page-title h1,
-.page-title h2 { margin:0; font-size:20px; color:#0a263c; }
-.page-title .separator { margin:0 3px; }
-.page-title .link-rss { float:right; margin:7px 0 0; }
-.title-buttons { text-align:right; }
-.title-buttons h1,
-.title-buttons h2,
-.title-buttons h3,
-.title-buttons h4,
-.title-buttons h5,
-.title-buttons h6 { float:left; }
-
-.subtitle,
-.sub-title { clear:both; padding:15px 0 0; font-size:15px; font-weight:bold; margin:0 0 6px; color:#e25203; }
-
-/* Pager */
-.pager { font-size:11px; background:#fff url(../images/bkg_toolbar.gif) 0 100% repeat-x; padding:4px 8px; border-top:1px solid #e2e2e2; text-align:center; }
-.pager .amount { float:left; margin:0; }
-.pager .limiter { float:right; }
-.pager .limiter label { vertical-align:middle; }
-.pager .limiter select { padding:0; margin:0 0 1px; vertical-align:middle; }
-.pager .pages { margin:0 140px; }
-.pager .pages ol { display:inline; }
-.pager .pages li { display:inline; margin:0 2px; }
-.pager .pages .current {}
-
-/* Sorter */
-.sorter { font-size:11px; background:#fff url(../images/bkg_toolbar.gif) 0 100% repeat-x; padding:3px 8px; border-top:1px solid #e2e2e2; }
-.sorter .view-mode { float:left; margin:0; }
-.sorter .sort-by { float:right; padding-right:36px; }
-.sorter .sort-by label { vertical-align:middle; }
-.sorter .sort-by select { padding:0; margin:0 0 1px; vertical-align:middle; }
-.sorter .link-feed {}
-
-/* Toolbar */
-.toolbar {}
-.toolbar .pager { padding:3px 8px; border-bottom:1px solid #fff; }
-.toolbar .sorter { border-bottom:1px solid #fff; }
-.toolbar-bottom {}
-
-/* Data Table */
-.data-table { width:100%; border:1px solid #bebcb7; }
-.data-table .odd { background:#f8f7f5 }
-.data-table .even { background:#eeeded; }
-/*.data-table tr.odd:hover,
-.data-table tr.even:hover { background:#ebf1f6; }*/
-.data-table td.last,
-.data-table th.last { border-right:0; }
-.data-table tr.last th,
-.data-table tr.last td { border-bottom:0 !important; }
-.data-table th { padding:3px 8px; font-weight:bold; }
-.data-table td { padding:3px 8px; }
-
-.data-table thead th { font-weight:bold; border-right:1px solid #c2d3e0; padding:2px 8px; color:#0a263c; white-space:nowrap; vertical-align:middle; }
-.data-table thead th.wrap { white-space:normal; }
-.data-table thead th a,
-.data-table thead th a:hover { color:#fff; }
-.data-table thead th { background:url(../images/bkg_th.gif) repeat-x 0 100% #d9e5ee; }
-.data-table thead th .tax-flag { font-size:11px; white-space:nowrap; }
-
-.data-table tfoot { border-bottom:1px solid #d9dde3; }
-.data-table tfoot tr.first td { background:url(../images/bkg_tfoot.gif) 0 0 repeat-x; }
-.data-table tfoot tr { background-color:#dee5e8 !important; }
-.data-table tfoot td { padding-top:1px; padding-bottom:1px; border-bottom:0; border-right:1px solid #d9dde3; }
-.data-table tfoot strong { font-size:16px; }
-
-.data-table tbody th,
-.data-table tbody td { border-bottom:1px solid #d9dde3; border-right:1px solid #d9dde3; }
-/* Bundle products tables */
-.data-table tbody.odd tr { background:#f8f7f5 !important; }
-.data-table tbody.even tr { background:#f6f6f6 !important; }
-.data-table tbody.odd tr td,
-.data-table tbody.even tr td { border-bottom:0; }
-.data-table tbody.odd tr.border td,
-.data-table tbody.even tr.border td { border-bottom:1px solid #d9dde3; }
-
-.data-table tbody td .option-label { font-weight:bold; font-style:italic; }
-.data-table tbody td .option-value { padding-left:10px; }
-
-/* Generic Info Box */
-.info-box { background:#fff url(../images/bkg_block-title.gif) 0 0 repeat-x; border:1px solid #d0cbc1; padding:12px 15px; margin:0 0 15px; }
-.info-box h2 { font-weight:bold; font-size:13px; }
-
-.info-table th { font-weight:bold; padding:2px 15px 2px 0; }
-.info-table td { padding:2px 0; }
-
-/* Shopping cart total summary row expandable to details */
-tr.summary-total { cursor:pointer; }
-tr.summary-total td {}
-tr.summary-total .summary-collapse { float:right; text-align:right; padding-left:20px; background:url(../images/bkg_collapse.gif) 0 5px no-repeat; cursor:pointer; }
-tr.show-details .summary-collapse { background-position:0 -52px; }
-tr.show-details td {}
-tr.summary-details td { font-size:11px; background-color:#dae1e4; color:#626465; }
-tr.summary-details-first td { border-top:1px solid #d2d8db; }
-tr.summary-details-excluded { font-style:italic; }
-
-/* Shopping cart tax info */
-.cart-tax-info { display:block; }
-.cart-tax-info,
-.cart-tax-info .cart-price { padding-right:20px; }
-.cart-tax-total { display:block; padding-right:20px; background:url(../images/bkg_collapse.gif) 100% 5px no-repeat; cursor:pointer; }
-.cart-tax-info .price,
-.cart-tax-total .price { display:inline !important; font-weight:normal !important; }
-.cart-tax-total-expanded { background-position:100% -52px; }
-
-/* Class: std - styles for admin-controlled content */
-.std .subtitle { padding:0; }
-.std ol.ol { list-style:decimal outside; padding-left:1.5em; }
-.std ul.disc { list-style:disc outside; padding-left:18px; margin:0 0 10px; }
-.std dl dt { font-weight:bold; }
-.std dl dd { margin:0 0 10px; }
-.std ul,
-.std ol,
-.std dl,
-.std p,
-.std address,
-.std blockquote { margin:0 0 1em; padding:0; }
-.std ul { list-style:disc outside; padding-left:1.5em; }
-.std ol { list-style:decimal outside; padding-left:1.5em; }
-.std ul ul { list-style-type:circle; }
-.std ul ul,
-.std ol ol,
-.std ul ol,
-.std ol ul { margin:.5em 0; }
-.std dt { font-weight:bold; }
-.std dd { padding:0 0 0 1.5em; }
-.std blockquote { font-style:italic; padding:0 0 0 1.5em; }
-.std address { font-style:normal; }
-.std b,
-.std strong { font-weight:bold; }
-.std i,
-.std em { font-style:italic; }
-
-/* Misc */
-.links li { display:inline; }
-.links li.first { padding-left:0 !important; }
-.links li.last { background:none !important; padding-right:0 !important; }
-
-.link-cart { color:#dc6809 !important; font-weight:bold; }
-.link-wishlist { color:#dc6809 !important; font-weight:bold; }
-.link-reorder { font-weight:bold; color:#dc6809 !important; }
-.link-compare { font-weight:bold; }
-.link-print { /*background:url(../images/i_print.gif) 0 2px no-repeat; padding:2px 0 2px 25px;*/ font-weight:bold; color:#dc6809; }
-.link-rss { background:url(../images/i_rss.gif) 0 2px no-repeat; padding-left:18px; line-height:14px; white-space:nowrap; }
-.btn-remove { display:block; width:11px; height:11px; font-size:0; line-height:0; background:url(../images/btn_remove.gif) 0 0 no-repeat; text-indent:-999em; overflow:hidden; }
-.btn-previous { display:block; width:11px; height:11px; font-size:0; line-height:0; background:url(../images/btn_previous.gif) 0 0 no-repeat; text-indent:-999em; overflow:hidden; }
-.btn-remove2 { display:block; width:16px; height:16px; font-size:0; line-height:0; background:url(../images/btn_trash.gif) 0 0 no-repeat; text-indent:-999em; overflow:hidden; }
-.btn-edit { display:block; width:11px; height:11px; font-size:0; line-height:0; background:url(../images/btn_edit.gif) 0 0 no-repeat; text-indent:-999em; overflow:hidden; }
-
-.cards-list dt { margin:5px 0 0; }
-.cards-list .offset { padding:2px 0 2px 20px; }
-
-.separator { margin:0 3px; }
-
-.divider { clear:both; display:block; font-size:0; line-height:0; height:1px; margin:10px 0; background:url(../images/bkg_divider1.gif) 0 50% repeat-x; text-indent:-999em; overflow:hidden; }
-
-/* Global site notices */
-.global-site-notice { border:1px solid #cfcfcf; border-width:0 0 1px; background:#ffff90; font-size:12px; line-height:1.25; text-align:center; color:#2f2f2f; }
-.global-site-notice .notice-inner { width:860px; margin:0 auto; padding:12px 0 12px 80px; background:url(../images/i_notice.gif) 20px 25px no-repeat; text-align:left; }
-.global-site-notice .notice-inner p { margin:0; border:1px dotted #cccc73; padding:10px; }
-.global-site-notice .notice-inner .actions { padding-top:10px; }
-
-/* Cookie Notice */
-.notice-cookie { }
-
-/* Noscript Notice */
-.noscript {}
-
-/* Demo Notice */
-.demo-notice { margin:0; padding:6px 10px; background:#d75f07; font-size:12px; line-height:1.15; border:0; text-align:center; color:#fff; }
-.demo-notice .notice-inner { width:auto; padding:0; background:none; text-align:center; }
-.demo-notice .notice-inner p { padding:0; border:0; }
-
-/* ======================================================================================= */
-
-
-/* Header ================================================================================ */
-.logo { float:left; }
-.header-container { border-top:5px solid #0d2131; border-bottom:1px solid #415966; background:url(../images/bkg_header.jpg) 50% 0 repeat; }
-.header { width:930px; margin:0 auto; padding:10px; text-align:right; position:relative; z-index:10; }
-.header .logo { float:left; margin:3px 0 10px 12px; text-decoration:none !important; }
-.header .logo strong { position:absolute; top:-999em; left:-999em; width:0; height:0; font-size:0; line-height:0; text-indent:-999em; overflow:hidden; }
-.header h1.logo { margin:0; }
-.header .quick-access { float:right; width:600px; padding:28px 10px 0 0; }
-.header .welcome-msg { margin:0; color:#fff; text-align:right; }
-.header .welcome-msg a { color:#ebbc58; }
-.header .form-search { position:absolute; top:0; right:29px; width:315px; height:30px; background:url(../images/bkg_form-search.gif) 0 0 no-repeat; padding:1px 0 0 16px; }
-.header .form-search label { float:left; width:24px; height:21px; text-align:left; text-indent:-999em; overflow:hidden; }
-.header .form-search input.input-text { float:left; border-color:#5c7989; width:209px; margin-right:4px; }
-.header .form-search button.button { float:left; }
-.header .form-search button.button span { border:0; height:21px; background:url(../images/btn_search.gif) 0 0 no-repeat; padding:0 0 0 3px; font:bold 11px/21px Tahoma, Verdana, Arial, sans-serif; }
-.header .form-search button.button span span { background-position:100% 0; padding:0 6px 0 3px; }
-.header .form-search .search-autocomplete { z-index:999; left:40px !important; top:22px !important; }
-.header .form-search .search-autocomplete ul { border:1px solid #5c7989; background-color:#f9f5f0; }
-.header .form-search .search-autocomplete li { text-align:left; border-bottom:1px solid #f4eee7; padding:2px 8px 1px 8px; cursor:pointer; }
-.header .form-search .search-autocomplete li .amount { float:right; font-weight:bold; }
-.header .form-search .search-autocomplete li.odd { background-color:#fffefb; }
-.header .form-search .search-autocomplete li.selected { background-color:#f7e8dd; }
-.header .form-language { clear:both; padding:5px 0 0; text-align:right; }
-.header .form-language label { font-weight:bold; padding-right:5px; color:#a7c6dd; vertical-align:middle; }
-.header .form-language select { padding:0; }
-.header .form-language select.flags option { background-position:4px 50%; background-repeat:no-repeat; padding-left:25px; }
-.header .links { float:right; margin:0 0 6px; }
-.header .links li { float:left; font-size:11px; background:url(../images/bkg_pipe1.gif) 100% 60% no-repeat; padding:0 8px 0 7px; }
-.header .links a { color:#ebbc58; }
-.header-container .top-container { clear:both; padding:5px 10px 0 12px; text-align:right; }
-.header-container .top-container a { font-size:11px; color:#ebbc58; }
-
-/********** < Navigation */
-.nav-container { background:#0a263d url(../images/bkg_nav0.jpg) 50% 0 repeat-y; }
-#nav { width:918px; margin:0 auto; padding:0 16px; font-size:13px; }
-
-/* All Levels */ /* Style consistent throughout all nav levels */
-#nav li { position:relative; text-align:left; }
-#nav li.over { z-index:998; }
-#nav a,
-#nav a:hover { display:block; line-height:1.3em; text-decoration:none; }
-#nav span { display:block; cursor:pointer; white-space:nowrap; }
-#nav li ul span {white-space:normal; }
-#nav ul li.parent a { background:url(../images/bkg_nav2.gif) 100% 100% no-repeat; }
-#nav ul li.parent li a { background-image:none; }
-
-/* 0 Level */
-#nav li { float:left; }
-#nav li.active a { color:#d96708; }
-#nav a { float:left; padding:5px 12px 6px 8px; color:#a7c6dd; font-weight:bold; }
-#nav li.over a,
-#nav a:hover { color:#d96708; }
-
-/* 1st Level */
-#nav ul li,
-#nav ul li.active { float:none; margin:0; padding-bottom:1px; background:#ecf3f6 url(../images/bkg_nav1.gif) 0 100% repeat-x; }
-#nav ul li.last { background:#ecf3f6; padding-bottom:0; }
-
-#nav ul a,
-#nav ul a:hover { float:none; padding:0; background:none; }
-#nav ul li a { font-weight:normal !important; }
-
-/* 2nd Level */
-#nav ul,
-#nav div { position:absolute; width:15em; top:27px; left:-10000px; border:1px solid #899ba5; }
-#nav div ul { position:static; width:auto; border:none; }
-
-/* 3rd+ Level */
-#nav ul ul,
-#nav ul div { top:5px; }
-
-#nav ul li a { background:#ecf3f6; }
-#nav ul li a:hover { background:#d5e4eb; }
-#nav ul li a,
-#nav ul li a:hover { color:#2f2f2f !important; }
-#nav ul span,
-#nav ul li.last li span { padding:3px 15px 4px 15px; }
-
-/* Show menu */
-#nav li ul.shown-sub,
-#nav li div.shown-sub { left:0; z-index:999; }
-#nav li .shown-sub ul.shown-sub,
-#nav li .shown-sub li div.shown-sub { left:100px; }
-/********** Navigation > */
-/* ======================================================================================= */
-
-
-/* Sidebar =============================================================================== */
-.block { border:1px solid #c4c1bc; margin:0 0 15px; }
-.block .block-title { background:url(../images/bkg_block-title.gif) 0 0 repeat-x; border-bottom:1px solid #ddd; padding:2px 9px; }
-.block .block-title strong { display:block; font:bold 12px/16px Arial, Helvetica, sans-serif; min-height:16px; padding:1px 0 1px; text-transform:uppercase; color:#e26703; }
-.block .block-title strong span {}
-.block .block-title a { text-decoration:none !important; }
-.block .block-subtitle { margin:0; padding:5px 9px; font-size:1em; font-weight:bold; color:#0a263c; }
-.block .block-content { background:#f8f7f5; }
-.block .block-content li.item { padding:7px 9px; }
-.block .block-content .product-name { color:#1e7ec8; }
-.block .btn-remove,
-.block .btn-edit { float:right; margin:1px 0 2px 5px; }
-.block .actions { background:#dee5e8 url(../images/bkg_block-actions.gif) 0 0 repeat-x; padding:6px 9px; text-align:right; }
-.block .actions a { float:left; }
-.block .actions button.button { float:right; }
-.block .empty { margin:0; padding:5px 9px; }
-
-.block li.odd { background-color:#f4f3f3; }
-.block li.even { background-color:#fafafa; }
-
-/* Mini Blocks */
-.block-cart,
-.block-wishlist,
-.block-subscribe,
-.block-compare,
-.block-reorder,
-.block-viewed,
-.block-compared,
-.block-related,
-.block-tags,
-.block-login { font-size:11px; line-height:1.25; }
-.block-cart .block-title strong,
-.block-wishlist .block-title strong,
-.block-subscribe .block-title strong,
-.block-compare .block-title strong,
-.block-reorder .block-title strong,
-.block-viewed .block-title strong,
-.block-compared .block-title strong,
-.block-related .block-title strong,
-.block-tags .block-title strong,
-.block-login .block-title strong { background-position:0 0; background-repeat:no-repeat; padding-left:21px; }
-
-/* Mini Products List */
-.mini-products-list .product-image { float:left; width:50px; border:1px solid #a9a9a9; }
-.mini-products-list .product-details { margin-left:60px; }
-.block-cart .mini-products-list .product-details .product-name,
-.block-cart .mini-products-list .product-details .nobr small { word-wrap:break-word; }
-.block-cart .mini-products-list .product-details .nobr { white-space:normal !important; }
-
-/* Block: Account */
-.block-account { border-color:#bbb; }
-.block-account .block-title { background:#fc9d36 url(../images/bkg_block-title-account.gif) 0 100% repeat-x; border:0; padding:3px 10px; }
-.block-account .block-title strong { font-size:13px; color:#fff; }
-.block-account .block-content { background:#fbfaf6; padding:7px 10px 7px; }
-.block-account .block-content li a { display:block; border-bottom:1px solid #ddd; padding:3px 0; color:#5f5d5c; text-decoration:none !important; }
-.block-account .block-content li a:hover { color:#ea7900; }
-.block-account .block-content li.last a { border-bottom:0; }
-.block-account .block-content li.current { border-bottom:1px solid #ddd; padding:3px 0; color:#ea7900; }
-.block-account .block-content li.current.last { border-bottom:0; }
-
-/* Block: Currency Switcher */
-.block-currency { border:0; background:url(../images/bkg_block-currency.gif) 0 0 no-repeat; padding:7px 12px 10px; height:51px; }
-.block-currency .block-title { background:none; border:0; padding:0; margin:0 0 5px; }
-.block-currency .block-title strong { font:bold 13px/21px Arial, Helvetica, sans-serif; background:url(../images/i_block-currency.gif) 0 50% no-repeat; padding:0 0 0 21px; text-transform:none; color:#fff; }
-.block-currency .block-content { background:none; padding:0; }
-.block-currency .block-content select { width:100%; padding:0; }
-
-/* Block: Layered Navigation */
-.block-layered-nav { border:0; }
-.block-layered-nav .block-title { border:0; padding:0; height:24px; background:url(../images/bkg_block-layered-title.gif) 0 0 no-repeat; text-indent:-999em; overflow:hidden; }
-.block-layered-nav .block-subtitle { line-height:1.35; background:#d5e8ff url(../images/bkg_block-layered1.gif) 0 50% repeat; padding:3px 9px; border:1px solid #b9ccdd; border-width:1px 0; text-transform:uppercase; color:#1f5070; }
-.block-layered-nav .block-content { border:1px solid #a0b3c3; background:#e7f1f4; }
-.block-layered-nav dt { background:url(../images/bkg_block-layered-dt.gif) 9px 11px no-repeat; padding:7px 10px 0 25px; font-weight:bold; text-transform:uppercase; }
-.block-layered-nav dd { padding:0 12px 12px; background:url(../images/bkg_block-layered-dd.gif) 0 100% repeat-x; }
-.block-layered-nav dd.last { background:none; }
-.block-layered-nav .currently li { background:#fff url(../images/bkg_block-layered-li.gif) 0 100% repeat-x; padding:6px 24px 6px 10px; position:relative; z-index:1; line-height:1.5; }
-.block-layered-nav .currently .label { font-weight:bold; padding-left:15px; background:url(../images/bkg_block-layered-label.gif) 0 4px no-repeat; text-transform:uppercase; display:inline-block; vertical-align:top; }
-.block-layered-nav .currently .value { display:inline-block; vertical-align:top; }
-.block-layered-nav .currently .btn-previous,
-.block-layered-nav .currently .btn-remove { position:absolute; right:4px; top:9px; margin:0; }
-.block-layered-nav .currently .btn-previous { right:17px; }
-.block-layered-nav .actions { font-size:11px; padding:4px 5px 4px 9px; background:#cad6e4; border:1px solid #dee5e8; border-width:1px 0; text-align:right; }
-.block-layered-nav .actions a { float:none; }
-
-/* Block: Cart */
-.block-cart .block-title { /*border-bottom:0;*/ }
-.block-cart .block-title strong { background-image:url(../images/i_block-cart.gif); }
-.block-cart .summary { background:#fff; padding:2px 8px 8px; margin:-1px 0 0; position:relative; z-index:1; }
-.block-cart .amount { margin:0; }
-.block-cart .amount a { font-weight:bold; }
-.block-cart .subtotal { margin:5px 0 0; padding:2px 0; background:#fbebd9; text-align:center; }
-.block-cart .subtotal .price { font-weight:bold; }
-.block-cart .actions { border-bottom:1px solid #c2c2c2; }
-.block-cart .actions .paypal-logo { float:left; width:100%; margin:3px 0 0; text-align:right; }
-.block-cart .actions .paypal-logo .paypal-or { clear:both; display:block; padding:0 55px 8px 0; }
-
-/* Block: Wishlist */
-.block-wishlist .block-title strong { background-image:url(../images/i_block-wishlist.gif); }
-.block-wishlist .actions { text-align:right; }
-.block-wishlist .actions a { float:none; }
-
-/* Block: Related */
-.block-related .block-title strong { background-image:url(../images/i_block-related.gif); background-position:0 1px; }
-.block-related input.checkbox { float:left; }
-.block-related .product { margin-left:20px; }
-
-/* Block: Compare Products */
-.block-compare .block-title strong { background-image:url(../images/i_block-list.gif); background-position:0 1px; }
-.block-compare button.button span { border-color:#406a83; background:#618499; }
-.page-popup .link-print { background:url(../images/i_print.gif) 0 2px no-repeat; padding:2px 0 2px 25px; font-weight:bold; color:#1e7ec8; }
-.compare-table { border:0; }
-.compare-table thead tr.first th,
-.compare-table thead tr.first td { border:0; background:none; padding:0; font-size:0; line-height:0; }
-.compare-table .btn-remove { float:right; background-image:url(../images/btn_remove2.gif); width:72px; height:15px; }
-.compare-table tbody th { background:#d9e5ee url(../images/bkg_th-v.gif) 100% 0 repeat-y; }
-.compare-table tbody th,
-.compare-table tbody td { padding:10px; border:0; border-top:1px solid #ccc; border-left:1px solid #ccc; }
-.compare-table tbody td.last { border-right:1px solid #ccc; }
-.compare-table tbody tr.last th,
-.compare-table tbody tr.last td { border-bottom:1px solid #ccc !important; }
-.compare-table tr.add-to-row td { background:#fffada; text-align:center; }
-.compare-table tr.first td { text-align:center; }
-.compare-table tr.first td .product-name { font-size:13px; font-weight:bold; margin:0 0 5px; color:#203548; }
-.compare-table tr.first td .product-name a { color:#203548; }
-.compare-table tr.first td .ratings { width:69px; margin:0 auto; }
-.compare-table tr.first td p,
-.compare-table tr.add-to-row td p { margin:0; }
-
-/* Block: Recently Viewed */
-.block-viewed .block-title strong { background-image:url(../images/i_block-viewed.gif); }
-
-/* Block: Recently Compared */
-.block-compared .block-title strong { background-image:url(../images/i_block-list.gif); background-position:0 1px; }
-
-/* Block: Tags */
-.block-tags .block-title strong { background-image:url(../images/i_block-tags.gif); }
-.block-tags .block-content .tags-list { background:none; border:0; font-size:12px; }
-.block-tags .block-content a { color:#1b2d3b; }
-.block-tags .actions { text-align:right; }
-.block-tags .actions a { float:none; }
-
-/* Block: Subscribe */
-.block-subscribe .block-content { padding:5px 10px; }
-.block-subscribe .block-title strong { background-image:url(../images/i_block-subscribe.gif); }
-.block-subscribe label { font-weight:bold; color:#666; }
-.block-subscribe input.input-text { display:block; width:167px; margin:3px 0; }
-.block-subscribe .actions { background:none; padding:0; margin:3px 0 0; text-align:left; }
-.block-subscribe .actions button.button { float:none; }
-.block-subscribe .actions button.button span { border-color:#406a83; background:#618499; }
-
-/* Block: Reorder */
-.block-reorder .block-title strong { background-image:url(../images/i_block-list.gif); }
-.block-reorder input.checkbox { float:left; margin:2px -20px 0 0; }
-.block-reorder .product-name { margin-left:20px; }
-.block-reorder .validation-advice { margin:3px 9px 7px; }
-
-/* Block: Banner */
-.block-banner { border:0; }
-.block-banner .block-content { padding:0; text-align:center; }
-
-/* Block: Login */
-.block-login .block-title strong { background-image:url(../images/i_ma-info.gif); }
-.block-login .block-content { padding:5px 10px; }
-.block-login label { font-weight:bold; color:#666; }
-.block-login input.input-text { display:block; width:167px; margin:3px 0; }
-.block-login .actions { background:none; padding:0; margin:3px 0 0; }
-.block-login .actions button.button span { border-color:#406a83; background:#618499; }
-
-/* Paypal */
-.sidebar .paypal-logo { display:block; margin:10px 0; text-align:center; }
-.sidebar .paypal-logo a { float:none; }
-/* ======================================================================================= */
-
-
-/* Category Page ========================================================================= */
-.category-title { border:0; margin:0 0 7px; }
-.category-image { width:100%; overflow:hidden; margin:0 0 10px; text-align:center; }
-.category-image img {}
-.category-description { margin:0 0 10px; }
-.category-products {}
-
-/* View Type: Grid */
-.products-grid { border-bottom:1px solid #d9ddd3; background:url(../images/bkg_grid.gif) 0 0 repeat; position:relative; }
-.products-grid.last { border-bottom:0; }
-.products-grid li.item { float:left; width:138px; padding:12px 10px 80px; }
-.products-grid .product-image { display:block; width:135px; height:135px; margin:0 0 10px; }
-.products-grid .product-name { /*min-height:2.7em;*/ margin:0 0 5px; font-weight:bold; font-size:13px; color:#203548; }
-.products-grid .product-name a { color:#203548; }
-.products-grid .price-box { margin:5px 0; }
-.products-grid .availability { line-height:21px; }
-.products-grid .actions { position:absolute; bottom:12px; }
-.col2-left-layout .products-grid,
-.col2-right-layout .products-grid { width:632px; margin:0 auto; }
-.col1-layout .products-grid { width:790px; margin:0 auto; }
-
-/* View Type: List */
-.products-list li.item { border-bottom:1px solid #d9ddd3; padding:12px 10px; }
-.products-list li.item.last { border-bottom:0; }
-.products-list .product-image { float:left; width:135px; height:135px; margin:0 0 10px; }
-.products-list .product-shop { margin-left:150px; }
-.products-list .product-name { margin:0 0 5px; font-weight:bold; font-size:13px; color:#203548; }
-.products-list .product-name a { color:#203548; }
-.products-list .price-box { float:left; margin:3px 13px 5px 0; }
-.products-list .availability { float:left; margin:3px 0 0; }
-.products-list .desc { clear:both; padding:6px 0 0; margin:0 0 15px; line-height:1.35; }
-.products-list .desc .link-learn { font-size:11px; }
-.products-list .add-to-links { clear:both; }
-.products-list .add-to-links li { display:inline; }
-.products-list .add-to-links .separator { display:inline; margin:0 2px; }
-/* ======================================================================================= */
-
-
-/* Product View ========================================================================== */
-/* Rating */
-.no-rating { margin:0; }
-
-.ratings { font-size:11px; line-height:1.25; margin:7px 0; }
-.ratings strong { float:left; margin:1px 3px 0 0; }
-.ratings .rating-links { margin:0; }
-.ratings .rating-links .separator { margin:0 2px; }
-.ratings dt {}
-.ratings dd {}
-.rating-box { width:69px; height:13px; font-size:0; line-height:0; background:url(../images/bkg_rating.gif) 0 0 repeat-x; text-indent:-999em; overflow:hidden; }
-.rating-box .rating { float:left; height:13px; background:url(../images/bkg_rating.gif) 0 100% repeat-x; }
-.ratings .rating-box { float:left; margin-right:3px; }
-.ratings .amount {}
-
-.ratings-table th,
-.ratings-table td { font-size:11px; line-height:1.15; padding:3px 0; }
-.ratings-table th { font-weight:bold; padding-right:8px; }
-
-/* Availability */
-.availability { margin:0; }
-.availability span { font-weight:bold; }
-.availability.in-stock span {}
-.availability.out-of-stock span { color:#d83820; }
-
-.availability-only { margin:10px 0 7px; line-height:16px; background:url(../images/i_availability_only.gif) 0 50% no-repeat; padding-left:15px; }
-.availability-only span,
-.availability-only a { border-bottom:1px dashed #751d02; color:#000; }
-.availability-only a { background:url(../images/i_availability_only_arrow.gif) 100% 0 no-repeat; cursor:pointer; padding-right:15px; text-decoration:none; }
-.availability-only .expanded { background-position:100% -15px; }
-.availability-only strong { color:#be2c00; }
-
-.availability-only-details { margin:0 0 7px; }
-.availability-only-details th { background:#d2d6d9; font-size:10px; padding:0 8px; }
-.availability-only-details td { background:#ebf0f3; border-bottom:1px solid #fff; font-size:11px; padding:2px 8px 1px; }
-.availability-only-details tr.odd td.last { color:#d95e00; font-weight:bold; }
-
-.product-view .product-shop .availability { font-size:11px; }
-.product-view .product-shop .availability span { font-weight:normal; }
-
-/* Email to a Friend */
-.email-friend { margin:0; }
-
-/* Alerts */
-.alert-price { margin:0; font-size:11px; }
-.alert-stock { margin:0; font-size:11px; }
-
-/********** < Product Prices */
-.price { white-space:nowrap !important; }
-
-.price-box { margin:5px 0; }
-.price-box .price { font-weight:bold; color:#c76200; }
-
-/* Regular price */
-.regular-price { color:#c76200; }
-.regular-price .price { font-weight:bold; font-size:13px; color:#c76200; }
-.block .regular-price,
-.block .regular-price .price { color:#2f2f2f; }
-
-/* Old price */
-.old-price { margin:0; }
-.old-price .price-label { white-space:nowrap; color:#999; }
-.old-price .price { font-weight:bold; color:#c76200; text-decoration:line-through; }
-
-/* Special price */
-.special-price { margin:0; padding:3px 0; }
-.special-price .price-label { font-size:13px; font-weight:bold; white-space:nowrap; color:#cd5033; }
-.special-price .price { font-size:13px; font-weight:bold; color:#c76200; }
-
-/* Minimal price (as low as) */
-.minimal-price { margin:0; }
-.minimal-price .price-label { font-weight:bold; white-space:nowrap; }
-
-.minimal-price-link { display:block; }
-.minimal-price-link .label {color:#1e7ec8;}
-.minimal-price-link .price { font-weight:normal; color:#1e7ec8; }
-
-/* Excluding tax */
-.price-excluding-tax { display:block; color:#999; }
-.price-excluding-tax .label { white-space:nowrap; color:#999; }
-.price-excluding-tax .price { font-size:13px; font-weight:normal; color:#c76200; }
-
-/* Including tax */
-.price-including-tax { display:block; color:#999; }
-.price-including-tax .label { white-space:nowrap; color:#999; }
-.price-including-tax .price { font-size:13px; font-weight:bold; color:#c76200; }
-
-/* Configured price */
-.configured-price { margin:0; }
-.configured-price .price-label { font-weight:bold; white-space:nowrap; }
-.configured-price .price { font-weight:bold; }
-
-/* FPT */
-.weee { display:block; font-size:11px; color:#444; }
-.weee .price { font-size:11px; font-weight:normal; }
-
-/* Excl tax (for order tables) */
-.price-excl-tax { display:block; }
-.price-excl-tax .label { display:block; white-space:nowrap; }
-.price-excl-tax .price { display:block; }
-
-/* Incl tax (for order tables) */
-.price-incl-tax { display:block; }
-.price-incl-tax .label { display:block; white-space:nowrap; }
-.price-incl-tax .price { display:block; font-weight:bold; }
-
-/* Price range */
-.price-from { margin:0; }
-.price-from .price-label { font-weight:bold; white-space:nowrap; }
-
-.price-to { margin:0; }
-.price-to .price-label { font-weight:bold; white-space:nowrap; }
-
-/* Price notice next to the options */
-.price-notice { padding-left:10px; color:#999; }
-.price-notice .price { font-weight:bold; color:#2f2f2f; }
-
-/* Price as configured */
-.price-as-configured { margin:0; }
-.price-as-configured .price-label { font-weight:bold; white-space:nowrap; }
-
-.price-box-bundle { padding:0 0 10px 0; }
-.price-box-bundle .price-box { margin:0 !important; padding:0 !important; }
-.price-box-bundle .price { color:#555; }
-/********** Product Prices > */
-
-/* Tier Prices */
-.product-pricing,
-.tier-prices { margin:10px 0; padding:10px; background-color:#f4f7f7; border:1px solid #dadddd; color:#424242; }
-.tier-prices li { line-height:1.4; background:url(../images/i_tier.gif) no-repeat 0 3px; padding:2px 0 2px 10px; }
-.tier-prices .benefit { font-style:italic; font-weight:bold; color:#2f2f2f; }
-.tier-prices .price { font-weight:bold; color:#2f2f2f; }
-
-.tier-prices-grouped li { padding:2px 0; color:#e26703; }
-.tier-prices-grouped li .price { font-weight:bold; }
-
-/* Add to Links */
-.add-to-links { font-size:11px; margin:5px 0 0; }
-.add-to-links .separator { display:none; }
-
-/* Add to Cart */
-.add-to-cart label { float:left; margin-right:5px; font-weight:bold; color:#666; }
-.add-to-cart .qty { float:left; margin-right:5px; }
-.add-to-cart button.button { float:left; }
-.add-to-cart .paypal-logo { clear:left; margin:0; text-align:right; }
-.add-to-cart .paypal-logo .paypal-or { clear:both; display:block; margin:5px 60px 5px 0; }
-.product-view .add-to-cart .paypal-logo { margin:0; }
-
-/* Add to Links + Add to Cart */
-.add-to-box { margin:10px 0; }
-.add-to-box .add-to-cart { float:left; }
-.add-to-box .or { float:left; font-weight:bold; margin:0 7px; color:#666; }
-.add-to-box .add-to-links { float:left; margin:0; font-size:12px !important; line-height:1.25 !important; text-align:left !important; }
-.add-to-box .add-to-links li { display:block !important; }
-.add-to-box .add-to-links li .separator { display:none !important; }
-
-
-.product-view { border:1px solid #c4c6c8; }
-
-.product-essential { padding:25px; background:#fff url(../images/bkg_product-view.gif) 100% 0 no-repeat; }
-.product-essential h2 { font:bold 13px/1.35 Arial, Helvetica, sans-serif; }
-
-.product-collateral { background:#faf7ee url(../images/bkg_product_collateral.gif) 0 0 repeat-x; padding:25px; }
-.product-collateral h2 { font-weight:bold; font-size:15px; color:#e26703; border-bottom:1px solid #e5dcc3; padding:0 0 1px; margin:0 0 15px; }
-.product-collateral .box-collateral { margin:0 0 25px; }
-
-/* Product Images */
-.product-view .product-img-box { float:left; width:267px; }
-.col3-layout .product-view .product-img-box { float:none; margin:0 auto; }
-.product-view .product-img-box .product-image { margin:0 0 13px; }
-.product-view .product-img-box .product-image-zoom { position:relative; width:265px; height:265px; overflow:hidden; z-index:9; }
-.product-view .product-img-box .product-image-zoom img { position:absolute; left:0; top:0; cursor:move; }
-.product-view .product-img-box .zoom-notice { font-size:11px; margin:0 0 5px; text-align:center; }
-.product-view .product-img-box .zoom { position:relative; z-index:9; height:18px; margin:0 auto 13px; padding:0 28px; background:url(../images/slider_bg.gif) 50% 50% no-repeat; cursor:pointer; }
-.product-view .product-img-box .zoom.disabled { -moz-opacity:.3; -webkit-opacity:.3; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";/*IE8*/ opacity:.3; }
-.product-view .product-img-box .zoom #track { position:relative; height:18px; }
-.product-view .product-img-box .zoom #handle { position:absolute; left:0; top:-1px; width:9px; height:22px; background:url(../images/magnifier_handle.gif) 0 0 no-repeat; }
-.product-view .product-img-box .zoom .btn-zoom-out { position:absolute; left:2px; top:0; }
-.product-view .product-img-box .zoom .btn-zoom-in { position:absolute; right:2px; top:0; }
-.product-view .product-img-box .more-views h2 { font-size:11px; border-bottom:1px solid #ccc; margin:0 0 8px; text-transform:uppercase; }
-.product-view .product-img-box .more-views ul { margin-left:-9px }
-.product-view .product-img-box .more-views li { float:left; margin:0 0 8px 9px; }
-.product-view .product-img-box .more-views li a { float:left; width:56px; height:56px; border:2px solid #ddd; overflow:hidden; }
-
-.product-image-popup { margin:0 auto; }
-.product-image-popup .buttons-set { float:right; clear:none; border:0; margin:0; padding:0; }
-.product-image-popup .nav { font-weight:bold; margin:0 100px; text-align:center; }
-.product-image-popup .image { display:block; margin:10px 0; }
-.product-image-popup .image-label { font-size:13px; font-weight:bold; margin:0 0 10px; color:#2f2f2f; }
-
-/* Product Shop */
-.product-view .product-shop { float:right; width:330px; }
-.col1-layout .product-view .product-shop { float:right; width:545px; }
-.col3-layout .product-view .product-shop { float:none; width:auto; }
-.product-view .product-shop .product-name { margin:0 0 5px; }
-.product-view .product-shop .product-name h1 { margin:0; font:bold 15px/1.35 Arial, Helvetica, sans-serif; }
-.product-view .product-shop .availability { margin:10px 0; }
-.product-view .product-shop .short-description { margin:10px 0; background:url(../images/bkg_divider1.gif) 0 0 repeat-x; padding:10px 0 0; }
-.product-view .product-shop .price-box { margin:10px 0; }
-.product-view .product-shop .add-to-links { margin:0; }
-.product-view .product-shop .add-to-links { font-size:12px; text-align:right; }
-.product-view .product-shop .add-to-links li,
-.product-view .product-shop .add-to-links li .separator { display:inline; }
-.product-view .product-shop .add-to-links a { color:#1E7EC8 !important; font-weight:normal !important; }
-
-/* Product Options */
-.product-options { margin:20px 0 0; padding:10px 15px 20px; position:relative; background-color:#f6f6f6; border:1px solid #e4e4e4; }
-.product-options dt { padding:10px 0 0; font-weight:normal; }
-.product-options dt label { font-weight:bold; color:#2f2f2f; }
-.product-options dt label.required em { color:#eb340a; margin-left:5px; }
-.product-options dd .qty-holder { display:block; padding:10px 0 0; }
-.product-options dd .qty-holder label { vertical-align:middle; }
-.product-options dt .qty-disabled { background:none; border:0; padding:3px; color:#2f2f2f; }
-.product-options dd { padding:5px 10px 15px; margin:0 0 5px; border-bottom:1px solid #e4e4e4; }
-.product-options dl.last dd.last { border-bottom:0; padding-bottom:5px; margin-bottom:0; }
-.product-options dd input.input-text { width:98%; }
-.product-options dd input.datetime-picker { width:150px; }
-.product-options dd .time-picker { display:-moz-inline-box; display:inline-block; padding:2px 0; vertical-align:middle; }
-.product-options dd textarea { width:98%; height:8em; }
-.product-options dd select { width:99%; }
-.product-options dd .multiselect option { border-bottom:1px dotted #d9e5ee; padding:2px 4px; }
-.product-options ul.options-list { margin-right:5px; }
-.product-options ul.options-list li { line-height:1.5; padding:2px 0; }
-.product-options ul.options-list input.radio { float:left; margin-top:3px; }
-.product-options ul.options-list input.checkbox { float:left; margin-top:3px; }
-.product-options ul.options-list .label { display:block; margin-left:18px; }
-.product-options ul.options-list label { font-weight:normal; }
-.product-options ul.validation-failed { padding:0 7px; }
-.product-options p.note { margin:0; font-size:11px; }
-.product-options p.required { position:absolute; right:20px; top:20px; }
-
-.product-options-bottom { background-color:#fffada; padding:15px 20px; border:1px solid #e4e4e4; border-top:0; }
-.product-options-bottom .product-pricing,
-.product-options-bottom .tier-prices { margin:0; padding:0 0 10px; border:0; background:0; color:#e26703; }
-.product-options-bottom .tier-prices li { background:0; padding:2px 0; }
-.product-options-bottom .tier-prices .price,
-.product-options-bottom .tier-prices .benefit { color:#e26703; }
-.product-options-bottom .price-box { float:left; margin:0; padding:0; }
-.product-options-bottom .add-to-links { clear:both; padding:5px 0 0; text-align:right; }
-.col3-layout .product-options-bottom .price-box { float:none; padding:0 0 5px; }
-.product-options-bottom .price-label { float:left; padding-right:5px; }
-.product-options-bottom .price-tax { float:left; }
-.product-options-bottom .add-to-cart { float:right; }
-.product-shop .product-options-bottom { margin:0 0 10px; }
-.product-shop .product-options-bottom .price-box { float:none; margin:0 0 5px; }
-.product-shop .product-options-bottom .price-label { float:none; padding-right:0; }
-.product-shop .product-options-bottom .price-tax { float:none; }
-.product-shop .product-options-bottom .add-to-cart-box { clear:both; float:left; padding-top:12px; }
-.product-shop .product-options-bottom .add-to-links { clear:both; padding:5px 0 0; text-align:right; }
-
-/* Grouped Product */
-.product-view .grouped-items-table .price-box { margin:0; padding:0; }
-
-/* Block: Description */
-.product-view .box-description {}
-
-/* Block: Additional */
-.product-view .box-additional .data-table th,
-.product-view .box-additional .data-table td { line-height:1.25; }
-
-/* Block: Upsell */
-.product-view .box-up-sell h2 { border-bottom:0; padding:0; margin:0 0 8px; }
-.product-view .box-up-sell .products-grid { width:100%; border:1px solid #e5dcc3; }
-.product-view .box-up-sell .products-grid td { width:25%; background:#f6f2e7; border-right:1px solid #e5dcc3; border-bottom:1px solid #e5dcc3; padding:15px 10px 12px; line-height:1.6em; }
-.product-view .box-up-sell .products-grid tr.last td { border-bottom:0; }
-.product-view .box-up-sell .products-grid td.last { border-right:0; }
-.product-view .box-up-sell .products-grid td img { border:1px solid #e5dcc3; }
-.product-view .box-up-sell .products-grid .product-image { text-align:center; }
-.product-view .box-up-sell .products-grid td.empty { border-right:0; background:#f1ecdb; }
-.product-view .box-up-sell .products-grid .ratings .rating-box { float:none; display:block; margin:0 0 3px; }
-
-/* Block: Tags */
-.product-view .box-tags { margin:0; }
-.product-view .box-tags h3 { font-size:13px; }
-.product-view .box-tags .product-tags { display:block; margin:0 0 15px; }
-.product-view .box-tags .product-tags li { display:inline; background:url(../images/bkg_pipe3.gif) 100% 4px no-repeat; padding:0 7px 0 4px; }
-.product-view .box-tags .product-tags li.first { padding-left:0; }
-.product-view .box-tags .product-tags li.last { background:none; padding-right:0; }
-.product-view .box-tags .form-add label { display:block; font-size:13px; font-weight:bold; margin:0 0 5px; color:#0a263c;}
-.product-view .box-tags .form-add .input-box { float:left; width:305px; margin:0 5px 0 0; background:url(../images/i_tag_add.gif) 0 2px no-repeat; padding:0 0 0 23px; }
-.product-view .box-tags .form-add input.input-text { width:299px; }
-.product-view .box-tags .form-add button.button span { border-color:#406a83; background:#618499; }
-.product-view .box-tags .note { margin:3px 0 0; padding:0 0 0 23px; font-size:11px; }
-
-/* Block: Reviews */
-.product-view .box-reviews dl { margin:15px 0; }
-.product-view .box-reviews dt a,
-.product-view .box-reviews dt span { font-weight:bold; }
-.product-view .box-reviews dd { margin:0 0 15px; }
-.product-view .box-reviews dd small { font-style:italic; }
-.product-view .box-reviews .form-add { margin:15px 0 0; }
-.product-view .box-reviews .form-add h3 { font-size:13px; font-weight:normal; }
-.product-view .box-reviews .form-add h3 span { font-weight:bold; }
-.product-view .box-reviews .form-add h4 { font-size:12px; }
-.product-view .box-reviews .form-add .data-table td { text-align:center; }
-.product-view .box-reviews .form-add .form-list { margin:15px 0 0; }
-.product-view .box-reviews .form-add .form-list .input-box { width:360px; }
-.product-view .box-reviews .form-add .form-list input.input-text,
-.product-view .box-reviews .form-add .form-list textarea { width:354px; }
-
-/* Send a Friend */
-.send-friend .form-list { width:615px; overflow:hidden; }
-.send-friend .form-list li { margin-right:-15px; }
-.send-friend .form-list li p { margin:0 15px 0 0; }
-.send-friend .form-list .field { width:315px; }
-.send-friend .form-list .input-box { width:300px; }
-.send-friend .form-list input.input-text,
-.send-friend .form-list textarea { width:294px; }
-.send-friend .form-list li.wide .input-box { width:612px; }
-.send-friend .form-list li.wide textarea { width:609px; }
-.send-friend .buttons-set .limit { float:right; margin:0 7px 0 0; font-size:11px; line-height:21px; }
-/* ======================================================================================= */
-
-
-/* Content Styles ================================================================= */
-.product-name { margin:0; font-size:1em; font-weight:normal; }
-.product-name a { color:#1e7ec8; }
-
-/* Product Tags */
-.tags-list { display:block; font-size:13px; border:1px solid #c1c4bc; background:#f8f7f5; padding:10px; }
-.tags-list li { display:inline !important; margin:0 4px 0 0; }
-.tags-list li a { color:#1b2d3b; }
-
-/* Advanced Search */
-.advanced-search .form-list label { width:160px; padding-right:10px; }
-.advanced-search .form-list .input-box,
-.advanced-search .form-list .input-range { float:left; clear:none; }
-.advanced-search-amount { margin:0 0 10px; }
-.advanced-search-summary { margin:10px 0; border:1px solid #e9d7c9; background:#fff6f1; padding:10px; }
-.advanced-search-summary ul { float:left; width:49%; }
-.advanced-search-summary strong { color:#E17C24; padding-left:15px; background:url(../images/i_search_criteria.gif) 0 3px no-repeat; }
-.advanced-search-summary p { clear:both; font-weight:bold; margin:0; }
-
-/* CMS Home Page */
-.cms-home .subtitle {}
-.cms-index-index .subtitle {}
-
-/* RSS */
-.rss-title h1 { background:url(../images/i_rss-big.png) 0 4px no-repeat; padding-left:27px; }
-.rss-table .link-rss { display:block; line-height:1.55; background-position:0 4px; }
-/* ======================================================================================= */
-
-
-/* Shopping Cart ========================================================================= */
-.cart .page-title { border-bottom:0; margin:0 0 12px; }
-.cart .page-title h1 { margin:10px 0 0; }
-
-/* Checkout Types */
-.cart .page-title .checkout-types li { margin:0 0 5px; }
-.cart .title-buttons .checkout-types { float:right; }
-.cart .title-buttons .checkout-types li { float:left; margin:0 0 5px 5px; }
-.cart .checkout-types .paypal-or { margin:0 8px; line-height:2.3; }
-.cart .totals .checkout-types .paypal-or { clear:both; display:block; padding:8px 55px 0 0; line-height:1.0; font-size:11px; }
-
-/* Shopping Cart Table */
-.cart-table th { padding:2px 10px; }
-.cart-table td { padding:10px; }
-.cart-table .product-name { font-weight:bold; margin:0 0 5px; color:#2f2f2f; }
-.cart-table .item-msg { margin:5px 0; font-size:11px; font-weight:bold; color:#df280a; }
-.cart-table tfoot td { padding:5px 10px; }
-.cart-table .btn-continue { float:left; }
-.cart-table .btn-empty span,
-.cart-table .btn-continue span,
-.cart-table .btn-update span { border-color:#406a83; background:#618499; }
-.cart-table .btn-update,
-.cart-table .btn-empty { float:right; }
-.cart-table .btn-update { margin-left:10px; }
-
-/* Shopping Cart Collateral boxes */
-.cart .cart-collaterals { padding:25px 0 0; }
-.cart .cart-collaterals .col2-set { float:left; width:605px; }
-.cart .cart-collaterals .col2-set .col-2 { width:294px; }
-
-.cart .crosssell { border:1px solid #cec3b6; background:#fafaec; padding:12px 15px; }
-.cart .crosssell h2 { font-size:13px; font-weight:bold; }
-.cart .crosssell .product-image { float:left; width:75px; height:75px; border:1px solid #d0cdc9; }
-.cart .crosssell .product-details { margin-left:90px; }
-.cart .crosssell .product-name { font-weight:bold; }
-.cart .crosssell li.item { margin:12px 0; }
-.cart .crosssell .link-compare { font-weight:normal; }
-
-/* Discount Codes & Estimate Shipping and Tax Boxes */
-.cart .discount,
-.cart .shipping { border:1px solid #d0cbc1; background:#fff url(../images/bkg_block-title.gif) 0 0 repeat-x; padding:12px 15px; margin:0 0 18px; }
-.cart .discount h2,
-.cart .shipping h2 { background-position:0 0; background-repeat:no-repeat; font:bold 13px/16px Arial, Helvetica, sans-serif; padding:0 0 0 21px; color:#e26703; text-transform:uppercase; }
-.cart .discount button span,
-.cart .shipping button span { border-color:#406a83; background:#618499; }
-.cart .discount .buttons-set,
-.cart .shipping .buttons-set { margin:10px 0 0; border:0; padding:0; text-align:left; }
-.cart .discount .buttons-set button.button,
-.cart .shipping .buttons-set button.button { float:none; margin-left:0; }
-
-.cart .discount h2 { background-image:url(../images/i_discount.gif); }
-.cart .discount .input-box { margin:8px 0 0; width:260px; }
-.cart .discount input.input-text { width:254px; }
-
-.cart .shipping h2 { background-image:url(../images/i_shipping.gif); }
-.cart .shipping .sp-methods { margin:10px 0 0; padding:5px 0 0; background:url(../images/bkg_divider1.gif) 0 0 repeat-x; }
-
-/* Shopping Cart Totals */
-.cart .totals { float:right; width:268px; background:#dee5e8; border:1px solid #bebcb7; }
-.cart .totals table { width:100%; margin:7px 0; }
-.cart .totals td { padding:1px 15px 1px 7px; }
-.cart .totals tr.last td {}
-.cart .totals tfoot th { padding:5px 15px 5px 7px; }
-.cart .totals tfoot td { padding-top:5px; padding-bottom:5px; }
-.cart .totals tfoot th strong,
-.cart .totals tfoot td strong { font-size:15px; }
-.cart .totals .checkout-types { font-size:13px; padding:8px 15px 15px; text-align:right; }
-.cart .totals .checkout-types li { clear:both; margin:10px 0; }
-
-/* Options Tool Tip */
-.item-options dt { font-weight:bold; font-style:italic; }
-.item-options dd { padding-left:10px; margin:0 0 6px; }
-.truncated { cursor:help; }
-.truncated a.dots { cursor:help; }
-.truncated a.details { cursor:help; }
-.truncated .truncated_full_value { position:relative; z-index:999; }
-.truncated .truncated_full_value .item-options { position:absolute; top:-99999em; left:-99999em; z-index:999; width:250px; padding:8px; border:1px solid #ddd; background-color:#f6f6f6; }
-.truncated .truncated_full_value .item-options > p { font-weight:bold; text-transform:uppercase; }
-.truncated .show .item-options { top:-20px; left:50%; }
-.col-left .truncated .show .item-options { left:15px; top:7px; }
-.col-right .truncated .show .item-options { left:-240px; top:7px; }
-/* ======================================================================================= */
-
-
-/* Checkout ============================================================================== */
-/********** < Common Checkout Styles */
-/* Shipping and Payment methods */
-.sp-methods { margin:0 0 8px; }
-.sp-methods dt { margin:13px 0 5px; font-weight:bold; }
-.sp-methods dd {}
-.sp-methods dd li { margin:5px 0; position: relative;}
-.sp-methods label { font-weight:bold; color:#666; }
-.sp-methods .price { font-weight:bold; }
-.sp-methods .form-list { padding-left:20px; }
-.sp-methods .form-list li { margin:0 0 8px; }
-.sp-methods select.month { width:154px; margin-right:10px; }
-.sp-methods select.year { width:96px; }
-.sp-methods input.cvv { width:3em !important; }
-
-.sp-methods .checkmo-list li { margin:0 0 5px; }
-.sp-methods .checkmo-list label { width:135px; padding-right:10px; text-align:right; }
-.sp-methods .checkmo-list address { float:left; }
-
-.sp-methods .centinel-logos a { margin-right:3px; }
-.sp-methods .centinel-logos img { vertical-align:middle; }
-
-.sp-methods .release-amounts { margin:0.5em 0; }
-.sp-methods .release-amounts button { float:left; margin:5px 10px 0 0; }
-
-.please-wait { float:right; }
-.please-wait img { vertical-align:middle; }
-.cvv-what-is-this { font-size:11px; cursor:help; margin-left:10px; }
-
-/* Tooltip */
-.tool-tip { border:1px solid #7BA7C9; background:#EAF6FF; padding:15px 20px; position:absolute; z-index:9999; }
-.tool-tip .btn-close { margin:-9px -14px 0; text-align:right; }
-.tool-tip .btn-close a { display:block; margin:0 0 0 auto; width:15px; height:15px; background:url(../images/btn_window_close.gif) 100% 0 no-repeat; text-align:left; text-indent:-999em; overflow:hidden; }
-.tool-tip .tool-tip-content { padding:5px; }
-
-/* Gift Messages */
-.gift-messages h3 { font-size:12px; font-weight:bold; color:#e87403; }
-.gift-messages p.control { color:#8e8d8b; }
-.gift-messages-form { position:relative; }
-.gift-messages-form label { float:none !important; position:static !important; }
-.gift-messages-form h4 { font-size:12px; font-weight:bold; color:#e87403; }
-.gift-messages-form .whole-order { margin:0 0 25px; }
-.gift-messages-form .item { margin:0 0 10px; }
-.gift-messages-form .item .product-img-box { float:left; width:75px; }
-.gift-messages-form .item .product-image { margin:0 0 7px; }
-.gift-messages-form .item .number { margin:0; font-weight:bold; text-align:center; color:#8a8987; }
-.gift-messages-form .item .details { margin-left:90px; }
-.gift-messages-form .item .details .product-name { font-size:13px; font-weight:bold; margin:0 0 10px; }
-.gift-messages-form .item .details .form-list .field { width:255px; }
-.gift-messages-form .item .details .form-list .input-box { width:240px; }
-.gift-messages-form .item .details .form-list input.input-text { width:234px; }
-.gift-messages-form .item .details .form-list li.wide .input-box { width:500px; }
-.gift-messages-form .item .details .form-list li.wide textarea { width:494px; }
-
-.gift-message-link { font-size:11px; background:url(../images/bkg_collapse-gm.gif) 100% 6px no-repeat; padding-right:7px; }
-.gift-message-link.expanded { background-position:100% -40px; }
-.gift-message-row { background:#f2efe9; }
-.gift-message-row .btn-close { float:right; width:16px; height:16px; background:url(../images/btn_gm-close.gif) 0 0 no-repeat; font-size:0; line-height:0; text-indent:-999em; overflow:hidden; }
-
-/* Checkout Agreements */
-.checkout-agreements li { margin:30px 0; }
-.checkout-agreements .agreement-content { overflow:auto; height:12em; padding:10px; background-color:#fbfaf6; border:1px solid #bbb6a5; }
-.checkout-agreements .agree { margin:0; padding:10px 0 10px 11px; }
-.checkout-agreements .agree input.checkbox { margin-right:6px; }
-.checkout-agreements .agree label { font-weight:bold; color:#666; }
-
-.opc .checkout-agreements { border:1px solid #d9dde3; border-width:0 1px; padding:5px 30px; }
-.opc .checkout-agreements li { margin:20px 0 0; }
-.opc .checkout-agreements .agreement-content { background-color:#fff; border-color:#e4e4e4; padding:5px; }
-.opc .checkout-agreements .agree { padding-left:6px; }
-
-/* Centinel */
-.centinel {}
-.centinel .authentication { border:1px solid #ddd; background:#fff; }
-.centinel .authentication iframe { width:99%; height:400px; background:transparent !important; margin:0 !important; padding:0 !important; border:0 !important; }
-
-.opc .centinel { border:1px solid #bbb6a5; border-width:0 1px 1px; padding:10px 30px; }
-
-/* Generic Info Set */
-.info-set { background:#fbfaf6 url(../images/bkg_checkout.gif) 0 0 repeat-x; border:1px solid #bbb6a5; margin:0 0 25px; padding:20px; }
-.info-set h2 { font-size:13px; font-weight:bold; margin:0 0 10px; }
-.info-set h3,
-.info-set h4 { font-size:13px; font-weight:bold; color:#E26703; }
-.info-set h2 a,
-.info-set h3 a,
-.info-set h4 a { font-weight:normal; }
-.info-set h2.legend { margin:-20px -20px 15px; padding:5px 10px; background:#f9f3e3; border-bottom:1px solid #bbafa0; position:relative; }
-.info-set h3.legend { margin:0 0 10px; color:#0a263c; }
-.info-set .divider { margin:0 -20px; padding:25px 0; position:relative; }
-.info-set .box { margin:0 0 15px; }
-.info-set .box h2 { color:#e26703; }
-.info-set .data-table .product-name { font-size:1em !important; font-weight:bold !important; color:#1e7ec8 !important; }
-.info-set .data-table .product-name a { font-weight:bold !important; }
-.info-set .data-table .item-options { margin:5px 0 0; }
-/********** Common Checkout Styles > */
-
-/* One Page Checkout */
-.block-progress { border:0; margin:0; }
-.block-progress .block-title { background:none; border:0; padding:0; margin:0 0 5px; }
-.block-progress .block-title strong { font-size:13px; color:#0a263c; }
-.block-progress .block-content { background:none; }
-.block-progress dt { font-size:13px; font-weight:bold; line-height:1.35; background:#eee; border:1px solid #a3aeb3; margin:0 0 6px; padding:2px 8px; color:#999; }
-.block-progress dd { background:#eee; border:1px solid #a3aeb3; border-top:0; padding:8px 13px; margin:0 0 6px; }
-.block-progress dt.complete { margin:0; background:#d0dce1; color:#5e8ab4; }
-.block-progress dd.complete {}
-.block-progress p { margin:0; }
-.block-progress .cards-list dt { background:none; border:0 none; color:inherit; font-size:12px; margin:5px 0; padding:0; }
-.block-progress .cards-list dd { border:0 none; margin:0; padding:0; }
-.block-progress .cards-list .info-table th { font-weight:normal; }
-
-.opc .buttons-set { margin-top:0; padding-top:2em; }
-.opc .buttons-set p.required { margin:0; padding:0 0 10px; }
-.opc .buttons-set .back-link small { display:none; }
-.opc .buttons-set .back-link a { background:url(../images/i_arrow-top.gif) 0 50% no-repeat; padding-left:16px; }
-.opc .buttons-set.disabled button.button { display:none; }
-.opc .buttons-set .please-wait { height:21px; line-height:21px; }
-.opc .ul { list-style:disc outside; padding-left:18px; }
-
-.opc { position:relative; }
-.opc li.section {}
-
-.opc .step-title { border-width:0 1px; border-style:solid; border-color:#fff #d9dde3 #d9dde3; background:#eee url(../images/bkg_opc-title-off.gif) 0 100% repeat-x; padding:4px 8px 6px; text-align:right; }
-.opc .step-title .number { float:left; background:#fff; border:1px solid #fff; padding:0 4px; margin:0 5px 0 0; font:bold 11px/14px arial, helvetica, sans-serif; color:#999; }
-.opc .step-title h2 { float:left; margin:0; font:bold 13px/16px Arial, Helvetica, sans-serif; color:#999; }
-.opc .step-title a { display:none; float:right; font-size:11px; line-height:16px; }
-
-.opc .allow .step-title { background:#d0dce1; border:1px solid #a3aeb3; border-bottom:0; color:#a4b3b9; cursor:pointer; }
-.opc .allow .step-title .number { background:#dbe6eb; border-color:#dbe6eb; color:#a4b3b9; }
-.opc .allow .step-title h2 { color:#a4b3b9; }
-/*.opc .allow .step-title a { display:block; }*/
-
-.opc .active .step-title { background:#f9f3e3; border:1px solid #bbafa0; padding-bottom:5px; color:#f18200; cursor:default; }
-.opc .active .step-title .number { background:#f18200; border-color:#f19900; color:#fff; }
-.opc .active .step-title h2 { color:#f18200; }
-/*.opc .active .step-title a { display:none; }*/
-
-.opc .step { border:1px solid #bbafa0; border-top:0; background:#fbfaf6 url(../images/bkg_checkout.gif) 0 0 repeat-x; padding:15px 30px; position:relative; }
-.opc .step .tool-tip { right:20px; bottom: 0; margin: 0 0 30px 0; }
-
-#opc-login .buttons-set { border-top:0; }
-#opc-login h3 { font-size:13px; border-bottom:1px solid #e4e4e4; padding-bottom:2px; text-transform:uppercase; }
-#opc-login h4 { font-size:1em; font-weight:bold; margin:0; color:#2f2f2f; }
-
-#opc-shipping_method .buttons-set { border-top:0; }
-.opc .gift-messages-form { margin:0 -30px; background:#f6f1eb; border:1px solid #e9e4de; border-width:1px 0; padding:22px 24px 22px 30px; }
-.opc .gift-messages-form .inner-box { padding:5px; height:260px; overflow:auto; }
-
-#opc-review .step { border:0; padding:0; }
-#opc-review .product-name { font-weight:bold; color:#0a263c; }
-#opc-review .item-options { margin:5px 0 0; }
-#opc-review .buttons-set { padding:20px 30px; border:1px solid #d9dde3; border-width:0 1px 1px; }
-#opc-review .buttons-set p { margin:0; line-height:40px; }
-#opc-review .buttons-set .please-wait { height:40px; line-height:40px; }
-#opc-review .authentication { margin:0 auto; width:570px; }
-#opc-review .warning-message { color:#222; font-weight:bold; text-align:center; padding:10px 10px 0; }
-
-/* Multiple Addresses Checkout */
-.checkout-progress { padding:0 90px; margin:0 0 20px; }
-.checkout-progress li { float:left; width:19%; margin:0 3px 0 0; border-top:10px solid #999; padding:2px 0 0; font-weight:bold; text-align:center; color:#abb5ba; }
-.checkout-progress li.active { border-top-color:#e96200; color:#e96200; }
-
-.multiple-checkout h2 { font-size:13px; font-weight:bold; margin:0 0 10px; }
-.multiple-checkout h3,
-.multiple-checkout h4 { font-size:13px; font-weight:bold; color:#E26703; }
-.multiple-checkout h2 a,
-.multiple-checkout h3 a,
-.multiple-checkout h4 a { font-weight:normal; }
-.multiple-checkout .data-table .product-name { font-size:1em !important; font-weight:bold !important; color:#1e7ec8 !important; }
-.multiple-checkout .data-table .product-name a { font-weight:bold !important; }
-.multiple-checkout .data-table .item-options { margin:5px 0 0; }
-
-.multiple-checkout .gift-messages { margin:15px 0 0; }
-
-.multiple-checkout .tool-tip { top:50%; margin-top:-230px; right:20px; }
-
-.multiple-checkout .col2-set,
-.multiple-checkout .col3-set { background:#fbfaf6 url(../images/bkg_checkout.gif) 0 0 repeat-x; border:1px solid #bbb6a5; margin:0 0 25px; padding:20px; }
-.multiple-checkout .col2-set h2.legend { margin:-20px -20px 15px; padding:5px 10px; background:#f9f3e3; border-bottom:1px solid #bbafa0; position:relative; }
-.multiple-checkout .col2-set h3.legend { margin:0 0 10px; color:#0a263c; }
-.multiple-checkout .col2-set .divider { margin:0 -20px; padding:25px 0; position:relative; }
-.multiple-checkout .box { margin:0 0 15px; }
-.multiple-checkout .box h2 { color:#e26703; }
-
-.multiple-checkout .place-order .please-wait { float:right; padding:27px 7px 0 0; }
-.multiple-checkout .place-order .grand-total { float:right; height:71px; font-size:1.5em; padding:0 0 0 21px; background:url(../images/bkg_grand-total.gif) 0 0 no-repeat; overflow:hidden; }
-.multiple-checkout .place-order .grand-total .inner { float:left; height:57px; padding:14px 21px 0 0; background:url(../images/bkg_grand-total.gif) 100% 0 no-repeat; }
-.multiple-checkout .place-order .grand-total .inner div { display:inline; }
-.multiple-checkout .place-order .grand-total big { display:inline; margin-right:12px; }
-.multiple-checkout .place-order .grand-total .price { color:#E26703; }
-.multiple-checkout .place-order .grand-total button.button span { font-size:16px; }
-.multiple-checkout .place-order .grand-total button.button span span { padding:0 45px 0 36px; }
-
-/* Step 1 */
-.multiple-checkout .title-buttons button.button span { border-color:#406a83; background:#618499; }
-#multiship-addresses-table td { padding:10px; }
-#multiship-addresses-table tfoot td { padding:5px 10px; }
-#multiship-addresses-table tfoot button.button span { border-color:#406a83; background:#618499; }
-
-/* Step 2 */
-.multiple-checkout .gift-messages-form .item .details .form-list { width:100%; overflow:hidden; }
-.multiple-checkout .gift-messages-form .item .details .form-list li { margin-right:-15px; }
-.multiple-checkout .gift-messages-form .item .details .form-list .field { width:230px; }
-.multiple-checkout .gift-messages-form .item .details .form-list .input-box { width:215px; }
-.multiple-checkout .gift-messages-form .item .details .form-list input.input-text { width:209px; }
-.multiple-checkout .gift-messages-form .item .details .form-list li.wide .input-box { width:445px; }
-.multiple-checkout .gift-messages-form .item .details .form-list li.wide textarea { width:439px; }
-.checkout-multishipping-shipping .box-sp-methods { border:1px solid #d9d2be; background:#f9f3e3; padding:13px; position:relative; }
-.checkout-multishipping-shipping .box-sp-methods .pointer { position:absolute; top:-20px; right:-40px; width:178px; height:41px; background:url(../images/bkg_sp-methods.gif) 0 0 no-repeat; overflow:hidden; }
-
-/* Step 3 */
-.checkout-multishipping-billing .multiple-checkout { position:relative; }
-/* ======================================================================================= */
-
-
-/* Account Login/Create Pages ============================================================ */
-.account-login .content { min-height:345px; padding:14px 21px; background:#faf7ee url(../images/bkg_login-box.gif) 0 0 repeat-x; border:1px solid #bbb6a5; border-bottom:0; }
-.account-login .content h2 { font-weight:bold; font-size:13px; margin:0 0 14px; padding:0 0 5px 23px; border-bottom:1px solid #ddd; background-position:0 1px; background-repeat:no-repeat; text-transform:uppercase; color:#e76200; }
-.account-login .new-users h2 { background-image:url(../images/i_page1.gif)}
-.account-login .registered-users h2 { background-image:url(../images/i_page2.gif); }
-.account-login .buttons-set { border:1px solid #bbb6a5; border-top:0; margin:0; padding:8px 13px; background:#dee5e8 url(../images/bkg_buttons-set1.gif) 0 0 repeat-x; }
-
-.account-create {}
-
-/* Captcha ================================================================================ */
-.captcha-note { clear:left; padding-top:5px; }
-.captcha-image { float:left; display:inline; margin:0; position:relative; width:258px; }
-.captcha-image .captcha-img { border:1px solid #b6b6b6; vertical-align:bottom; width:100%; }
-.registered-users .captcha-image { margin:0;}
-.captcha-reload { cursor:pointer; position:absolute; top:2px; right:2px;}
-.captcha-reload.refreshing { animation:rotate 1.5s infinite linear; -webkit-animation:rotate 1.5s infinite linear; -moz-animation:rotate 1.5s infinite linear; }
-
-@-webkit-keyframes rotate {
- 0% { -webkit-transform:rotate(0); }
- 0% { -webkit-transform:rotate(-360deg); }
-}
-@-moz-keyframes rotate {
- 0% { -moz-transform:rotate(0); }
- 0% { -moz-transform:rotate(-360deg); }
-}
-@keyframes rotate {
- 0% { transform:rotate(0); }
- 0% { transform:rotate(-360deg); }
-}
-
-/* Remember Me Popup ===================================================================== */
-.window-overlay { background:rgba(0, 0, 0, 0.35); position:absolute; top:0; left:0; height:100%; width:100%; z-index:990; }
-
-.remember-me label { float:none; margin:0 6px; }
-.remember-me-popup { background:#fff; border:1px solid #ccc; left:50%; top:50%; position:absolute; margin:-85px 0 0 -200px; width:400px; text-align:left; -moz-box-shadow:0 0 6px #ccc; -webkit-box-shadow:0 0 6px #ccc; -box-shadow:0 0 6px #ccc; z-index:1000; }
-.remember-me-popup h3 { background:#d9e5ee; border-bottom:1px solid #ccc; font-size:14px; padding:5px 10px; }
-.remember-me-popup .remember-me-popup-head { position:relative; }
-.remember-me-popup .remember-me-popup-head .remember-me-popup-close { background:url(../images/btn_window_close.gif) no-repeat; display:block; position:absolute; top:7px; right:7px; height:15px; width:15px; text-indent:-9999em; }
-.remember-me-popup .remember-me-popup-body { padding:10px; }
-.remember-me-popup .remember-me-popup-body a { display:inline-block; height:19px; border:1px solid #de5400; background:#f18200; padding:0 8px; font:bold 12px/19px Arial, Helvetica, sans-serif; text-align:center; text-decoration:none; white-space:nowrap; color:#fff; }
-/* Remember Me Popup ===================================================================== */
-
-
-/* My Account ============================================================================= */
-.my-account .title-buttons .link-rss { float:none; margin:0; }
-
-/********** < Dashboard */
-.dashboard .welcome-msg { margin:0 8em 1.5em 0; }
-.dashboard .welcome-msg p { margin:0; }
-.dashboard .col2-set { margin:0 0 15px; }
-
-/* General Box */
-.box-account { background:#fff url(../images/bkg_account_box.gif) 0 0 repeat-x; border:1px solid #ccc; border-color:#ccc #999 #999 #ccc; padding:15px; margin: 0 0 20px; }
-.box-account .box-head { border-bottom:1px solid #d9dde3; margin:0 0 10px; text-align:right; }
-.box-account .box-head h2 { float:left; margin:0; font-size:13px; font-weight:bold; text-transform:uppercase; background-position:0 0; background-repeat:no-repeat; padding-left:21px; color:#e65505; }
-
-.dashboard .box .box-title { background:url(../images/bkg_divider1.gif) 0 100% repeat-x; padding:0 0 2px; margin:0 0 8px; text-align:right; }
-.dashboard .box .box-title h3,
-.dashboard .box .box-title h4 { float:left; font-size:13px; font-weight:bold; margin:0; }
-
-/* Block: Recent Orders */
-.dashboard .box-recent .box-head h2 { background-image:url(../images/i_folder-table.gif); }
-
-/* Block: Account Information */
-.dashboard .box-info .box-head h2 { background-image:url(../images/i_ma-info.gif); }
-.dashboard .box-info h4 { font-size:11px; font-weight:bold; text-transform:uppercase; }
-
-/* Block: Reviews */
-.dashboard .box-reviews .box-head h2 { background-image:url(../images/i_ma-reviews.gif); }
-.dashboard .box-reviews .number { float:left; font-size:10px; font-weight:bold; line-height:1; color:#fff; margin:3px -20px 0 0; padding:2px 3px; background:#0a263c; }
-.dashboard .box-reviews .details { margin-left:20px; }
-.dashboard .box-reviews li.item { margin:0 0 7px; }
-.dashboard .box-reviews li.item.last { margin:0; }
-.dashboard .box-reviews .ratings { margin:7px 0 0; }
-
-/* Block: Tags */
-.dashboard .box-tags .box-head h2 { background-image:url(../images/i_ma-tags.gif); }
-.dashboard .box-tags .number { float:left; font-size:10px; font-weight:bold; line-height:1; color:#fff; margin:3px -20px 0 0; padding:2px 3px; background:#0a263c; }
-.dashboard .box-tags .details { margin-left:20px; }
-.dashboard .box-tags li.item { margin:0 0 7px; }
-.dashboard .box-tags li.item.last { margin:0; }
-.dashboard .box-tags .tags strong,
-.dashboard .box-tags .tags ul,
-.dashboard .box-tags .tags ul li { display:inline; }
-/********** Dashboard > */
-
-/* Address Book */
-.addresses-list h2 { font-weight:bold; font-size:13px; color:#e26703; text-transform:uppercase; }
-.addresses-list h3 { font-weight:bold; font-size:13px; }
-.addresses-list address { margin:0 0 3px; }
-.addresses-list p { margin:0; }
-.addresses-list a { font-weight:bold; }
-.addresses-list .link-remove { color:#646464; }
-.addresses-list .separator { margin:0 3px; }
-.addresses-list li.item { background:#fff url(../images/bkg_account_box.gif) 0 0 repeat-x; border:1px solid #ccc; padding:10px 13px; margin:0 0 10px; }
-.addresses-list li.empty { background:none; border:0; padding:0; }
-.addresses-list li.empty p { font-weight:bold; }
-.addresses-list .addresses-additional li.item { background:none; border:0; padding:0; }
-
-/* Order View */
-.order-info { background:#dee5e8; border:1px solid #d0cbc1; padding:4px 8px; margin:0 0 8px; }
-.order-info dt,
-.order-info dd,
-.order-info ul,
-.order-info li { display:inline; }
-.order-info .current { font-weight:bold; }
-.order-info li { margin:0 3px; }
-
-.order-date { margin:10px 0; }
-
-.order-info-box { background:#fff url(../images/bkg_block-title.gif) 0 0 repeat-x; border:1px solid #d0cbc1; padding:12px 15px; margin:0 0 15px; }
-.order-info-box h2 { font-weight:bold; font-size:13px; }
-.order-info-box .box-payment p { margin:0 0 3px; }
-.order-info-box .box-payment th { font-weight:bold; padding-right:7px; }
-
-.order-items { width:100%; overflow-x:auto; }
-.order-items h2,
-.order-items h3 { clear:none; font-weight:bold; font-size:13px; padding:0; margin:0 0 5px; color:#0a263c; }
-.order-items .product-name { font-size:1em !important; font-weight:bold !important; }
-.order-items .link-print { color:#1e7ec8; font-weight:normal; }
-.order-items .order-links { text-align:right; }
-
-.order-additional { margin:15px 0; }
-/* Order Gift Message */
-.gift-message dt strong { color:#666; }
-.gift-message dd { font-size:13px; margin:5px 0 0; }
-/* Order Comments */
-.order-about dt { font-weight:bold; }
-.order-about dd { font-size:13px; margin:0 0 7px; }
-
-.tracking-table { margin:0 0 15px; }
-.tracking-table th { font-weight:bold; white-space:nowrap; }
-
-.tracking-table-popup { width:100%; }
-.tracking-table-popup th { font-weight:bold; white-space:nowrap; }
-.tracking-table-popup th,
-.tracking-table-popup td { padding:1px 8px; }
-
-/* Order Print Pages */
-.page-print .print-head { margin:0 0 15px; }
-.page-print .print-head .logo { float:left; }
-.page-print .print-head address { float:left; margin-left:15px; }
-.page-print h1 { font-size:16px; font-weight:bold; }
-.page-print h2,
-.page-print h3 { font-size:13px; font-weight:bold; }
-.page-print h2.h2 { font-size:16px; font-weight:bold; }
-.page-print .order-date { background:url(../images/bkg_divider1.gif) 0 100% repeat-x; padding:0 0 10px; margin:0 0 10px; }
-.page-print .col2-set { margin:0 0 10px; }
-/* Price Rewrites */
-.page-print .gift-message-link { display:none; }
-.page-print .price-excl-tax,
-.page-print .price-incl-tax { display:block; white-space:nowrap; }
-.page-print .cart-price,
-.page-print .price-excl-tax .label,
-.page-print .price-incl-tax .label,
-.page-print .price-excl-tax .price,
-.page-print .price-incl-tax .price { display:inline; }
-
-/* My Wishlist */
-.my-wishlist .data-table td { padding:10px; }
-.my-wishlist .product-image { display:block; width:113px; height:113px; margin:0 0 5px; }
-.my-wishlist textarea { display:block; width:97%; height:109px; }
-.my-wishlist .buttons-set { margin-top:2em; }
-.my-wishlist .buttons-set button.button { float:none; }
-.my-wishlist .buttons-set .btn-add span,
-.my-wishlist .buttons-set .btn-share span { border-color:#406a83; background:#618499; }
-#wishlist-table .add-to-links { white-space:nowrap; }
-
-/* My Tags */
-.my-tag-edit { float:left; margin:0 0 10px; }
-.my-tag-edit .btn-remove { float:right; margin:4px 0 0 5px; }
-#my-tags-table { clear:both; }
-#my-tags-table td { padding:10px; }
-#my-tags-table .add-to-links { white-space:nowrap; }
-
-/* My Reviews */
-#my-reviews-table td { padding:10px; }
-
-.product-review .product-img-box { float:left; width:140px; }
-.product-review .product-img-box .product-image { display:block; width:125px; height:125px; }
-.product-review .product-img-box .label { font-size:11px; margin:0 0 3px; }
-.product-review .product-img-box .ratings .rating-box { float:none; display:block; margin:0 0 3px; }
-.product-review .product-details { margin-left:150px; }
-.product-review .product-name { font-size:16px; font-weight:bold; margin:0 0 10px; }
-.product-review h3 { font-size:12px; margin:0 0 3px; color:#2f2f2f; }
-.product-review .ratings-table { margin:0 0 10px; }
-.product-review dt { font-weight:bold; }
-.product-review dd { font-size:13px; margin:5px 0 0; }
-
-/* Billing Agreements */
-.billing-agreements .info-box{ margin:15px 0; }
-.billing-agreements .form-list li select { float:left; }
-.billing-agreements .form-list li button.button { float:left; margin-left:10px; }
-.billing-agreements .table-caption { font-weight:bold; font-size:13px; }
-/* ======================================================================================= */
-
-
-/* MAP Popup============================================================================== */
-.cart-msrp-totals { color:red; font-size:12px !important; font-weight:bold; margin:10px 10px 0; padding:10px; text-align:right; text-transform:uppercase;}
-.map-cart-sidebar-total { color:red; display:block; font-size:10px; font-weight:bold; text-align:left; padding:2px 5px; text-shadow:0 1px 0 #fff; }
-
-.map-popup { background:#fff; border:1px solid #aaa; margin:12px 0 0; position:absolute; -moz-box-shadow:0 0 6px #ccc; -webkit-box-shadow:0 0 6px #ccc; box-shadow:0 0 6px #ccc; text-align:left; width:300px; z-index:100; }
-.map-popup-heading { background:#d9e5ee; border-bottom:1px solid #ccc; padding:5px 30px 5px 10px; width:260px; }
-.map-popup-heading h2 { font-size:16px; margin:0; text-shadow:0 1px 0 #f6f6f6; overflow:hidden; white-space:nowrap; word-wrap:break-word; text-align:left; text-overflow:ellipsis; }
-.map-popup-arrow { background:url(../images/map_popup_arrow.gif) no-repeat; position:absolute; left:50%; top:-10px; height:10px; width:19px; }
-.map-popup-close { background:url(../images/btn_window_close.gif) no-repeat; display:block; position:absolute; top:8px; right:10px; height:15px; width:15px; text-indent:-9999em; -moz-box-shadow:0 0 3px #999; -webkit-box-shadow:0 0 3px #999; box-shadow:0 0 3px #999; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
-.map-popup-content { border-top:1px solid #eee; padding:10px; overflow:hidden; text-align:left; width:280px; }
-.map-popup-checkout { display:inline; float:right; text-align:right; }
-.map-popup-checkout span { display:block; padding-right:30px; }
-.map-popup-checkout .paypal-logo { margin:0 0 5px; }
-.map-popup-price .price-box,
-.map-popup-price .price-box .special-price { margin:0; padding:0; }
-.map-popup-price { margin:5px 0 0; }
-.map-popup-text { clear:right; margin:0 10px; padding:10px 0; text-align:left; word-wrap:break-word; }
-.map-popup-only-text { border-top:1px solid #ddd; }
-/* ======================================================================================= */
-
-
-/* Footer ================================================================================ */
-.footer-container { border-top:15px solid #b6d1e2; }
-.footer { width:930px; margin:0 auto; padding:10px 10px 50px; }
-.footer .store-switcher { display:inline; margin:0 5px 0 0; color:#fff; }
-.footer .store-switcher label { font-weight:bold; vertical-align:middle; }
-.footer .store-switcher select { padding:0; vertical-align:middle; }
-.footer a { color:#fff; text-decoration:none; }
-.footer a:hover { text-decoration:underline; }
-.footer .bugs { margin:13px 0 0; color:#ecf3f6; }
-.footer .bugs a { color:#ecf3f6; text-decoration:underline; }
-.footer .bugs a:hover { text-decoration:none; }
-.footer address { margin:0 0 20px; color:#ecf3f6; }
-.footer address a { color:#ecf3f6; text-decoration:underline; }
-.footer address a:hover { text-decoration:none; }
-.footer ul { display:inline; }
-.footer ul.links { display:block; }
-.footer li { display:inline; background:url(../images/bkg_pipe2.gif) 100% 60% no-repeat; padding:0 7px 0 4px; }
-.footer li.last { background:none !important; padding-right:0 !important; }
-.footer-container .bottom-container { margin:0 0 5px; }
-/* ======================================================================================= */
-
-/* Sample Data============================================================================ */
-.home-callout { margin-bottom:12px; }
-.home-callout img { display:block }
-.home-spot { float:left; width:470px; margin-left:20px; }
-.best-selling h3 { margin:12px 0 6px 0; color:#e25203; font-size:1.2em; }
-.best-selling table { border-top:1px solid #ccc; }
-.best-selling tr.odd { background:#eee url(../images/best_selling_tr_odd_bg.gif) 0 100% repeat-x; }
-.best-selling tr.even { background:#fff url(../images/best_selling_tr_even_bg.gif) 0 100% repeat-x; }
-.best-selling td { width:50%; border-bottom:1px solid #ccc; padding:8px 10px 8px 8px; font-size:11px; }
-.best-selling .product-img { float:left; border:2px solid #dcdcdc; }
-.best-selling .product-description { margin-left:107px; line-height:1.3em; }
-.best-selling a.product-name,
-.home-spot .best-selling a.product-name:hover { color:#203548; }
-/* ======================================================================================= */
-
-
-/* Clears ================================================================================ */
-.clearer:after,
-.header-container:after,
-.header-container .top-container:after,
-.header:after,
-.header .quick-access:after,
-#nav:after,
-.main:after,
-.footer:after,
-.footer-container .bottom-container:after,
-.col-main:after,
-.col2-set:after,
-.col3-set:after,
-.col3-layout .product-options-bottom .price-box:after,
-.col4-set:after,
-.search-autocomplete li:after,
-.block .block-content:after,
-.block .actions:after,
-.block li.item:after,
-.block-layered-nav .currently li:after,
-.page-title:after,
-.products-grid:after,
-.products-list li.item:after,
-.box-account .box-head:after,
-.dashboard .box .box-title:after,
-.box-reviews li.item:after,
-.box-tags li.item:after,
-.pager:after,
-.sorter:after,
-.ratings:after,
-.add-to-box:after,
-.add-to-cart:after,
-.product-essential:after,
-.product-collateral:after,
-.product-view .product-img-box .more-views ul:after,
-.product-view .box-tags .form-add:after,
-.product-view .product-shop .short-description:after,
-.product-view .box-description:after,
-.product-options .options-list li:after,
-.product-options-bottom:after,
-.product-review:after,
-.cart:after,
-.cart-collaterals:after,
-.cart .crosssell li.item:after,
-.opc .step-title:after,
-.checkout-progress:after,
-.multiple-checkout .place-order:after,
-.group-select li:after,
-.form-list li:after,
-.form-list .field:after,
-.buttons-set:after,
-.page-print .print-head:after,
-.advanced-search-summary:after,
-.gift-messages-form .item:after,
-.send-friend .form-list li p:after { display:block; content:"."; clear:both; font-size:0; line-height:0; height:0; overflow:hidden; }
-/* ======================================================================================= */
-
-.guest-select {width:305px !important;}
diff --git a/app/design/frontend/magento_demo/i18n/de_DE/Magento_Core/logo_email.gif b/app/design/frontend/magento_demo/i18n/de_DE/Magento_Core/logo_email.gif
deleted file mode 100644
index c6d6d5a74a064a3129cca7b790ae0f330d3cd0cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3306
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
diff --git a/app/design/frontend/magento_demo/i18n/de_DE/images/logo.gif b/app/design/frontend/magento_demo/i18n/de_DE/images/logo.gif
deleted file mode 100644
index 864917ba95948d6583bbfe131c85d42a0d729b5b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3383
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
Nuo{z?i4qYI06Y4!a=rin
diff --git a/app/design/frontend/magento_demo/i18n/de_DE/images/logo_print.gif b/app/design/frontend/magento_demo/i18n/de_DE/images/logo_print.gif
deleted file mode 100644
index c6d6d5a74a064a3129cca7b790ae0f330d3cd0cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3306
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
diff --git a/app/design/frontend/magento_demo/i18n/en_US.csv b/app/design/frontend/magento_demo/i18n/en_US.csv
deleted file mode 100644
index ab952f2ca68..00000000000
--- a/app/design/frontend/magento_demo/i18n/en_US.csv
+++ /dev/null
@@ -1 +0,0 @@
-"Keep your eyes open for our special Back to School items and save A LOT!","Keep your eyes open for our special Back to School items and save A LOT!"
diff --git a/app/design/frontend/magento_demo/i18n/fr_FR/Magento_Core/logo_email.gif b/app/design/frontend/magento_demo/i18n/fr_FR/Magento_Core/logo_email.gif
deleted file mode 100644
index abf7a9abbf615c58c924f4924710f47825bb2546..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3271
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
F06WkRLz@5q
diff --git a/app/design/frontend/magento_demo/i18n/fr_FR/images/logo.gif b/app/design/frontend/magento_demo/i18n/fr_FR/images/logo.gif
deleted file mode 100644
index 25d8d17374ee07fae20c9df253e972e2d1ad3746..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3267
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
BGg1Hm
diff --git a/app/design/frontend/magento_demo/i18n/fr_FR/images/logo_print.gif b/app/design/frontend/magento_demo/i18n/fr_FR/images/logo_print.gif
deleted file mode 100644
index abf7a9abbf615c58c924f4924710f47825bb2546..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3271
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
F06WkRLz@5q
diff --git a/app/design/frontend/magento_demo/images/best_selling_tr_even_bg.gif b/app/design/frontend/magento_demo/images/best_selling_tr_even_bg.gif
deleted file mode 100644
index 7477020bcae2587b249df5f07b7c28a6f9c02bec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 49
zcmZ?wbhEHbWMp7wn8?8J`t|GEw{QRY^^1XlLGdRGkYr%c0TCd11|}wvAO>pyiKGm1
diff --git a/app/design/frontend/magento_demo/images/best_selling_tr_odd_bg.gif b/app/design/frontend/magento_demo/images/best_selling_tr_odd_bg.gif
deleted file mode 100644
index ee3e1880d2fd7f8747b72c1bb585bf08bbcaad8c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 49
zcmZ?wbhEHbWMp7wn8?6z`}XbAr%%6p`I3QwLGdRGkYr%c0TCd11|}wvAO>pycTEf4
diff --git a/app/design/frontend/magento_demo/images/bkg_account_box.gif b/app/design/frontend/magento_demo/images/bkg_account_box.gif
deleted file mode 100644
index 2f828a44659020e79300c112d53187af245362cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 117
zcmZ?wbhEHbWMoKY*v!E2@#DuIKYo1u`t{eZU*Erf|NZ;-pFe+o{`~pv+qb`e|9<)M
z<=?-5pFVy1{Q2|$|Nj{n7!-f907(W09S{LBgMmd!z{4$bcX+0%)h`Z3wkL^l&QWVx
VA4+-7(J^^@r()gvn)mJu)&PYpKXL#7
diff --git a/app/design/frontend/magento_demo/images/bkg_block-actions.gif b/app/design/frontend/magento_demo/images/bkg_block-actions.gif
deleted file mode 100644
index 8670b13b6e5bd36a2a9c93240c44022b8d8c7700..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 63
zcmZ?wbhEHbWMp7vSj50^^upz9ckbVL{Pgsd>-V0%V1NO|pDbXe4u}M)WngCE5O(5Z
Gum%9jKoJK3
diff --git a/app/design/frontend/magento_demo/images/bkg_block-currency.gif b/app/design/frontend/magento_demo/images/bkg_block-currency.gif
deleted file mode 100644
index ea08e6402d6c67dc371a843424b71ed71ad0bedf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2697
zcmd^<jXx6z1IOnjqh?L@;9QAPgrs}A6m=iUF*6E<^Om=~%uANS>A11kybQx^OJZjB
zV#AWWrM$*$Bjq(+HShD1w_!t<=kD)#et*LE^Zowp9qcY$4(J5f0%UA}e-`uC*aC|n
zTrjTuVj%W%aQdyp$JPjZSSG{N8+A1-(>JBmFSXR`&!^#844a5-yL$vvFO+9;vE|)#
z2V}lW0{IS_`b&7$1%Hg0PfAEeg}GlUB8z$64;_Rp_ePamkIaF_<el|Sas8e0(;W=_
z0WmbA!uergU>eOTB*Qj3_ij4<=YX^uaijoDnMcwS_eVwNd{Z4`3t}kG5O`*EKKCA(
zhbX8Dz%wHYt3wEtQH3>;c^rp_g~2&&yV!zgQcZY1H-cCln#T#uX5G!L49n*dY1Q@*
zi1#tXp8ny7Sdw61Bq*B|m{DQx7YmOk!xP9snT+^!N+6zP<raR)4H2Hhjv!XK#1U>M
z7kgvMuDVCu#WOFvM|q-3T>dBuA#mK1iha{){y6%L-zm{#o_8`SD2E+@XSpUn4bNqJ
zp{Xv9iV(S#;RLo%TA61`sZ#<aIFsRrrG@2jqDegH!@?VhkAt$=&c9QlNHw-TNM9^1
zg1~`3C=APC-~RJya4s7`-~?pQL-0%=Oj!(t7hPB#nOlj-X5GP+TZU!1#OH-(v&?)_
z9pgwYNyV@@l3UV~yIIW00*+T|X>>uAXmHHbJH;LK^j=|&eJt^!Yj{*X*9S$3B34Bf
zaIHL|eR1V}>2&Wu$yT2C&N~L0c%k<8_5lC))8AHB007tk(|<|)+XO&$58zhOabc#H
zjaEHu?8E1kb>bi=Va3pAv^QCYOX2MX=EE8$p`S(C4z={&0wcFdpWfOEA=x}gP`tg~
z_k)SO>v@ga;e!=A*697mV0El_<<J6SUqKyvka_d5-}tRwV*aTL$SGIba?WUte`n?~
z$9nFE=V61DzQXz_uU|7DNwAJnL_=_bbm5b*q2@~~O6h<uypcE2nXd6j@%GG+zApHL
zV+p*ec1B3~Z^UO&)APBv)a$req=c%jtLn<}>uY|oILZqWmN>nv|N5~pc5XJHv+nre
zHuQnx&Ml2=Q~UyxJN+$9(z$`M-T5Rzx1Rdg^N26~uU^Vl#GP4t$8WrD*_KM)9i&Bf
z_GQXer-Y?9T3`RYE0->QdE46hk2g&=Pk)F2`HNFjPqW0Spo<bQ8e(TOfjQzHR+bh)
zK@yI6B#0+)dRU{$bOTb@WQGxgHJNEzFQH|5j3FTq6xDw!`_e3HD(A|UWGdHM<;*m}
zRx_NQhXR~0KWTPhe!AeM-I*EUE%)%5LeCKP49O?%L&Zs0Nv*xUCNX^WaTtR=TNGJ8
zKl>!6`^;SNgOT4t^&cIryRHS=n4c>}sTfPB7)^wvEd6w)goeL39;Rg_ap+Yfx+CT*
zC?S>ejN-V3c_tNWyuhO8!yM?$Y4aW+w|-%P!|UENUgXw|AQr0{XDb)0Th=Y@!N3{4
zUzNHvBbJ`=Pji-PMHd&Bo)6fWe61UDHQC2ws!m{(|B74u+91Z7EH_S*B9@yZ49;@%
zQtcuJ0#vi%AJ`a)Sa~I%<*dB^wzas@3ILj}wkaQmtF|!xZB#%Yi>1|0h`s4r*Ab7%
zwKv+K+_mnbv2Ybl;3r<Xf&n>lz1N7zT^E=(EUgR8drYOG3xh3ub^XEf9sO5iOVYR2
zz_S|zwpvje@1TZN8}A(lQ>14s@Gk8`w>+XYhdo29Hb;Eoziy8D<IZl41?8?ifMDyW
zTjP-pU$;KS^qiIb^<Xqg_9<bms^K$Mc@KFL;$5sK7h|-d<rC?K)$&Qa#j<>gU~kqm
z?JZBr)QBWfw`Ysvm$&DrII|rIogBS0&tg_LFGOl12^u86-tJP}X!P#a#<}X<<rdlU
z?n)c*T+1q{F&TCYd6W8WU1YKHO*&wI?(dBuk9&V_j)m5|+CmN?2OxJadf(;K<a^(@
zCCr-dJ4+2K-*;Dg&b5BK16q4^8Zuq8_x+n}<)7mMQ2{_`o1)GtN)_&}_;Wz38%7^u
zoK96XgtqVZT20j!QB^GX?cl^!v>qrxRY?PjmRKLqgO=_0;CE;?ucn#f%Rr&fPMz^p
z>?KhE_ytwzaOQ-9HHZe;!$G@F=&Yqf;j}|!e%EQswTzn>ns#DB<_Y*Dz*9uiY~a5!
zOI*wH2bF90K)Zh`TEmCgP8npz5Kf>b6l3t^N9UkDmg8$V38Hdc8NcV3owZz)vVrzk
z!hV}N8-;W@{e)I8-_CM9kASBe7&`RAyw>w6UBN#pBO%Ad`unJ$3L|?5fost^kp-_X
z_UIM3H?J4+FsF3?80h^8E+#dKD$L@0g?>Bh<Ten)9Oobk)R9tpOqI^wNKv_ZMErOF
z&$z&J=tFo(i^fEZiw(Vf(TUP0Uxt))!1=(-s^Ve^oM}1Q+aK2~eY%QgUYT=vn>a2l
zkrA)!g5U39j3DAtfI7<>2pdS%*`TUAv94(e2C$YJWe2mb9R^=hHsXnC+I=iL3&Fdb
z#Eo)2bvD!<_CCL8gKn6nsA05U4b-?%VV=!~hr$Mn#y1$3`q<9#g29rVAtu3d{tQb`
z?U42+3+hzqN)`+;EH~LVvny{gVZ)VP!<G5e4x9G_XmG+N$6uY}*#jG?E!yOUIdQy3
z1tay%!&O(Ioi;H8X!Wtp>V!UypG+|NdS|l+rOx#SI*xVdjPS0uwfpQr(A}0>&j{Jv
zU_-|b0<W!FN*_1GLinLSZtGy?)qP+BA?1D1RvpW!3gICfA8Fot!OO0S40ZfCzBi(&
zR<;jdXxsMj^UhX7n|gH&&hf8F9a$sasro)y=rem?5dc(ZJ9x<Y(}I_*d91HGu0i-|
zIZ^gftX`AQ<LI~k9nj1qL@SR7KW{b5Uae-={4wYFWoKOWTHaTaEPMGyYG(mpsq#=j
zxLEN=d7G*;FI7t<R<V+|Lvms;N+>@7z_UZUpNF*&O@JTC+m3u+!P&zn4?U509RMQ}
z&*3LEU&`N@J0sJ6J36KFQQm#h{aG4PG^M*c)^5pI%f-Q`b%9NMsPp~oT<-K~tH)jN
z<XR%rbOI6^a0JR%E^H9ZD2FPl(OK6H>1e3gU7-oX?4&2PH8SiBY(muhBxs#w2+H!~
zc7H<u^Aee8?w8%|w<vHO73d_n2HXK7Bxo(7IL|p)0Srj5qZ>NS!@PIiQ~K)|7Jc*1
tk9G#B;D^i!LYnimtsdM{@wj=%g8R#zVP4J)?teOPr_62i6chkf{{zpt|0Dna
diff --git a/app/design/frontend/magento_demo/images/bkg_block-layered-dd.gif b/app/design/frontend/magento_demo/images/bkg_block-layered-dd.gif
deleted file mode 100644
index 5168a3a24645063ac5c5714ec004c34749d56278..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 43
tcmZ?wbhEHbWM*JwXkcWhuC8WaU{L(Y!pHy=&;ha;Kr#$WOfEqT)&QMT1;hXV
diff --git a/app/design/frontend/magento_demo/images/bkg_block-layered-dt.gif b/app/design/frontend/magento_demo/images/bkg_block-layered-dt.gif
deleted file mode 100644
index 079d48b69f3451797abc9ea429d921545c11b2c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 182
zcmZ?wbhEHb<YnMuIKseCweI5Q@4sgqytDS~<JX^mRII(&u<_D_UDxIwzWeyy*Xnf_
znl@d!|NPCJr>`$PcsXUy^^5mkbZouSvgK;?=F0^u&i?=ZKV$J}2HZgLCkt3o2SkGG
zWMDN;DE3K-v^$fsHYeM4%5JZtUPm_xcwEz6Z`GOKx<aDAb777HgGRKEga5~DNrmoJ
KsgF1q8LR=JD^B77
diff --git a/app/design/frontend/magento_demo/images/bkg_block-layered-label.gif b/app/design/frontend/magento_demo/images/bkg_block-layered-label.gif
deleted file mode 100644
index 2f69c8d6481fd05f3f73662bf0317f371d1489e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 184
zcmZ?wbhEHb<YnMuIKsg2d3Vo`>$_hR@jvS@f04)e^WL%N4Vqt%&3p3j#?vbYzaC%k
z^vtG@>q?&&3q84W{^_2nU-tGty}0|y+c(b^XFktnetKxZ-`_u;SIR#5{Nw5MW6v`g
z(17Ak7O;p8hy>Zmz-p@S%_J&w8uO$%I#FAt0yu7cJ+vudcF)uQ6Jom;aR{`ipE?*3
ZeZY_HOv|S|E(Q{wX{XOxY*1vd1^}2oS8f0R
diff --git a/app/design/frontend/magento_demo/images/bkg_block-layered-li.gif b/app/design/frontend/magento_demo/images/bkg_block-layered-li.gif
deleted file mode 100644
index 326022a3c6a47a633abef8f47773df34006ee374..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 149
zcmZ?wbhEHbWMq(GIKsg2<;#}`_wV1mbLZZ@druxe{_*3-ix)3mzk2ol{rf+E{(SoQ
z@zKMF-@bkO`}gm&r%&I$ef#UzumAu5GY}0Ff3kqp>VQa)oeZo(2`YUlS5yKHGH`v8
NX>-;&sL;Y-4FFX7Jz4+&
diff --git a/app/design/frontend/magento_demo/images/bkg_block-layered-title.gif b/app/design/frontend/magento_demo/images/bkg_block-layered-title.gif
deleted file mode 100644
index bf007e10bcfd8c32bfa347f2a2d01c49e8bf0482..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1907
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
Vwvh}o?D$MkND{M+=RgGH$Ujnm9{~UW
diff --git a/app/design/frontend/magento_demo/images/bkg_block-layered1.gif b/app/design/frontend/magento_demo/images/bkg_block-layered1.gif
deleted file mode 100644
index f13567889d693a5cf779e4e1521eed98df6c414d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 43
scmZ?wbhEHbWMp7sXkcKt`0V?!yYCc#vM_*v4u}BBFfcLka4}c|00D#v4FCWD
diff --git a/app/design/frontend/magento_demo/images/bkg_block-title-account.gif b/app/design/frontend/magento_demo/images/bkg_block-title-account.gif
deleted file mode 100644
index f69cd50834949e746c80e96ff6e31d0055c8288c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 173
zcmZ?wbhEHbWMYtHIKsg2dzR6wD#l+k4L-Js{+VO?eX{!3ex;w&^*(n=ed-W@TgUOG
zPyWXgtv9u7A6kWe&o+5o!}4>Q&bvn5KXc9AHgLbLX8tx&^-GWJ`(}OyY(ViR3s_hO
zM1t&OVAXnHB6#F8LxX~hyNIDrV8paUozta?9+P;O+nJjudT5BWF1py@pf%M&frY^u
E0NhYJ1poj5
diff --git a/app/design/frontend/magento_demo/images/bkg_block-title.gif b/app/design/frontend/magento_demo/images/bkg_block-title.gif
deleted file mode 100644
index f944949b711eaa2b214b674c05c9027e3baa6366..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 96
zcmZ?wbhEHbWMmLy*v!E2?fZ{EfB*jc_3O*`?;pQ>`Tq0g-+%u;eERb1HxT^!{Po+v
ofB*jf|IYveia%MvOdSvjGJ}DIcY^F9HVvkw3D=SmINTVl0k8lrd;kCd
diff --git a/app/design/frontend/magento_demo/images/bkg_body.gif b/app/design/frontend/magento_demo/images/bkg_body.gif
deleted file mode 100644
index c5c6902182f936465fb3bdf007b705b7d9ec0a4b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 72
zcmZ?wbhEHb+`-Jq(7?c87h90nGE?y<3j+w~fC!Kb1CzW<-^$Z(`4`XGa;tmuy*<DA
W+a7sLd)B$^)v0aoxYZpP8LR;c+!^Np
diff --git a/app/design/frontend/magento_demo/images/bkg_buttons-set1.gif b/app/design/frontend/magento_demo/images/bkg_buttons-set1.gif
deleted file mode 100644
index e385e98d3bb0efc52227156cd6d34b0334dd5d10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 49
zcmZ?wbhEHbWMp7wn8?7e@5Gtw_a3d@x{HB<LGdRGkYr%c0TCd11|}wvAO>pyV+#v3
diff --git a/app/design/frontend/magento_demo/images/bkg_checkout.gif b/app/design/frontend/magento_demo/images/bkg_checkout.gif
deleted file mode 100644
index b580873fcfafc7c56dd0fc2dfeaad7b5a783641a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 149
zcmZ?wbhEHbWMmLyIKsg2``5Q`U*7!q{^8e;&p*F^{PFGm?_Xbk{rvp<=a=8VzI^@s
z`un%{-@d;6@$JLc&u_kcdHenAyPrQkF%S(Df3kqp>VQa)oeZo(3JWa!KG^WE=(;Kk
N1e(ZrB(*SD0|5LOJl+5R
diff --git a/app/design/frontend/magento_demo/images/bkg_collapse-gm.gif b/app/design/frontend/magento_demo/images/bkg_collapse-gm.gif
deleted file mode 100644
index 6e626e9543de438c81d7f9bc3c920535680df3d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 89
zcmZ?wbhEHbWMwd7Sj560U2|&IhNFosGq+uS%zy+Gf3h$#Ft9M_fW$y*8JOibR&8?Z
hp1{yH$Ncr#-TxCb`cg9It@!D|yunRmvj!)FH2@-n8K?jN
diff --git a/app/design/frontend/magento_demo/images/bkg_collapse.gif b/app/design/frontend/magento_demo/images/bkg_collapse.gif
deleted file mode 100644
index 5d21686469609c21366b9fdf80e6bc92c65279fe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 86
zcmZ?wbhEHb<YaJSXkcW}*VlJRouv4ag^_`QkwJ$62tYCpOu8;T)1}|?FP^i-kELkS
op6Wc4g^zk3w=a8jYTMPH2j2Ny|JM6lr`dDnB1PA_JxmPN04jMOr2qf`
diff --git a/app/design/frontend/magento_demo/images/bkg_divider1.gif b/app/design/frontend/magento_demo/images/bkg_divider1.gif
deleted file mode 100644
index f819157589babea159f9445dcbb6b42f6c78379a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 43
tcmZ?wbhEHbWM*JwXkcV8GBRRdU{L(Y!pHy=&;ha;Kr#$WOfEqT)&PWr1nB?(
diff --git a/app/design/frontend/magento_demo/images/bkg_form-search.gif b/app/design/frontend/magento_demo/images/bkg_form-search.gif
deleted file mode 100644
index 27d429778a54e84a31c9cd01308426d4772076ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1724
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
S-+l=1SOQAM^h04oKma=)7O}Db
diff --git a/app/design/frontend/magento_demo/images/bkg_grand-total.gif b/app/design/frontend/magento_demo/images/bkg_grand-total.gif
deleted file mode 100644
index 9143c44c66baeed3e953a240cad3e6efe072371d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 5505
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
diff --git a/app/design/frontend/magento_demo/images/bkg_grid.gif b/app/design/frontend/magento_demo/images/bkg_grid.gif
deleted file mode 100644
index decda510da065447d514eee1d3a6d8d0f4bd1f23..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 53
zcmZ?wbhEHboX^0>(7?!W^X_E^1_s5SEQ}050UaQl0VKn~#M9Hi^7LE&#dEf(1u!sJ
F0{~ii4SWCq
diff --git a/app/design/frontend/magento_demo/images/bkg_header.jpg b/app/design/frontend/magento_demo/images/bkg_header.jpg
deleted file mode 100644
index 36f3b7412d8188587cce87529f2a288c227559e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 35290
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
YfDMayy<nqnk(lK=*PBBUx&OZj09?$j5&!@I
diff --git a/app/design/frontend/magento_demo/images/bkg_login-box.gif b/app/design/frontend/magento_demo/images/bkg_login-box.gif
deleted file mode 100644
index 380b0664a660d5d260e21536fc820b705d8fdad2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 285
zcmZ?wbhEHbWMt@KxXQrr>D`0xpI>}>`{2umC*M9j|NiCWmk*DBe0lZl)3g8o|9|`Z
z;_Js}zrMfy`svyC&o94zc=GAp!|z{SeR==*=hxRizP|eT_06}>&wqV;`|<7lk8kdM
ze)sU_x3{0(-v9dX>5s3ke|~%O`Te6`-`_FN3@H9&0h_G@B0+v)V6!^llGdSF)W^ig
zz;MyRF<`=x1PLCwxo;LVItXxxxhg!+5K(GpK6-dwh~0<YKZiJOzW=eO?)>}T|LYwY
FtN~bxe@g%W
diff --git a/app/design/frontend/magento_demo/images/bkg_main1.gif b/app/design/frontend/magento_demo/images/bkg_main1.gif
deleted file mode 100644
index 65664ffa9be41fd80bf34777b734302611556c97..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 7629
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
Sugm-@9L<)D5ds1MivI_n6u}w*
diff --git a/app/design/frontend/magento_demo/images/bkg_main2.gif b/app/design/frontend/magento_demo/images/bkg_main2.gif
deleted file mode 100644
index 5a358b5e10a7ced8eb0bf2b3fd495d00761f38fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 32524
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
diff --git a/app/design/frontend/magento_demo/images/bkg_nav0.jpg b/app/design/frontend/magento_demo/images/bkg_nav0.jpg
deleted file mode 100644
index f00945e272c0b20985ced191eec7880c37dfc0ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 5089
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5JQfgu1W^p1hgF(p4Kl_BK-
zP=xXSZH5*GCOBXQvY1(bBr^*u3ka~Xv4Q~`8#_A(J3AXECl?ndCl4xMWM*b&WntxH
zW8>uI=H%w(=K}(Mey}1a#RK7?>VxzCA7BvVV6b7oz|1Jfz$D1XEXer(2tzs0*-Xrg
zKxe`MBgkQ#j9>s41Tui)Yyyl7jLa-djLb|d?2KStj2D@L1Sc|!EEEp>kf>zHqUhLI
zRJifrLn9|+p<qFXDM-c(G71GUIsU)Jzyq|DNsw8P!JgsMV)vEn^)do3EL`a9)Yi(&
zB_(2_K{Qvh#BKkDMJAfQq-lfO;hJ}0(XOn(rN8h0i2i&3rB?QAWesF+Q<2SfT>Ovv
z@BJ4|3n%f09DmKx9sP^Rfh6<UeOpOVuOc%4nj^!Ke+#buz5g%p@5O&X*H2~7Eq`@O
zfh1#yS1i4M`@?UM#>UG(UiP)S|M+`)X|c56?}&f)^X6avdwFR~-8JKn|6X4@=J9vg
z{_mH6)$b~qXzTHx;R{gka^$CZOVS@@l@u=zGX7|4WqEm}<d0c%WnNzC`Qz)?SMtiO
zPHnlnRjIPQaPZ=}RukuUuDp0|uE+T!S6)2#8`U^KfphrIe(tha6DRMi6MJi_P_BRI
z?y@C(Pk%&jxzY%hnP5HrVcz8+_M$(!x3V1G#kcPE^^iUNVSDCE=20!w3$d8V{~4l_
zt0uUoPpY4~FAGRdestedVR_Qee_=mYvdQH|ukYCQ)}(t;{n<j()&H#iZp|b<Q<J8$
zWPj>^hPn6e+CSx~HUD&P`_IMo-u^F@wU57+f50hgK$2nX#%s^F&sgop9zCDmFu>~0
zkIJsbYtIj#3E|srCzrIKbmxc9qRb#AD`fL(Y>qm-E`In-YakUXuRSaO<+CVD>CX*w
zA1xR<WC75%{_Ognx1SMOWh=9*{*Za2=$B9b=KrZ|NP6~o-)Ylbca`JkhO=#2KvMh>
zubAggaNhjmzOBb{EB@VPn|1RmWA~Ade;u+)AOC9Pt@yWKkl@?gZQE+x4lR$iQ%*45
z{K$-%PK=VRzc*jV{%*xv_uO&)ofoFR=d$fDUU2<giPYb7&G9>_D8=riq_A*FjfhEq
zQ`^K30hjE!q}&fWd;HMIlxO8ten7btU(3Oawa1;7F0yaDaOLm2c{~2S|1$OL%5^EL
z6o^kQB&n2^iT^PF-G2s`tH(S{gXPyK>E^%SB*_E@Su+umG)xGpk7Qw*{Hr<qd;L%M
z@9san<2Bcn-d~;3K$0;;D;D7Ee`~R3e_z^*fA)WU>NbDmsm<Fuar^a$|H@wfO<P%-
zbnQbyqV(C|wMuvE^q;2BTzPG>@byQ>&s=#OmI$Fe+vB_Cjf2;!$=2!Aob}r>qx8qd
z&!$$FMx}>pu=JJh`t$x?tg<?Y@{oJ|d4Hus_4;#vpESPPZ~c7|`=~I5VZ!k}{?B?)
zpjI01u5=VWdD8y-?n*)be6{j?l~7CleXo=BcBTKAG3%iH<zFT=%J>Xc@>}-Zws@vD
z*Iu{Y^GE+?=~>tE%x(Wv`dxOJwOv>S#Bj<ita$$DRM{+H@6PWZQ>}eD*QPyu{}3cl
zYjybk;VExT)P9w=?{C+<mErs4HGe%{@Rkd+UtW{@C$l_rq50)Cwtp;vrsOY=sQytj
zcUjAQzYX6%JOvuFZ*JnKF~c!zie?oPUG;z!viQH?a{sfiUewS3@~;^^UbIT>W;^U3
amj7rrU^s!teVo1Z6VyL3lL*=W-vj`~upEE@
diff --git a/app/design/frontend/magento_demo/images/bkg_nav1.gif b/app/design/frontend/magento_demo/images/bkg_nav1.gif
deleted file mode 100644
index 6ba5fda00614e156d0e941f3614c91f5b763bbf5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 43
tcmZ?wbhEHbWM*JwXkcW>t7~CkU{L(Y!pHy=&;ha;Kr#$WOfEqT)&QL#1;YRU
diff --git a/app/design/frontend/magento_demo/images/bkg_nav2.gif b/app/design/frontend/magento_demo/images/bkg_nav2.gif
deleted file mode 100644
index d7c3c13b8ed23273d50238412e3dd11826c1ca6a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 67
zcmZ?wbhEHb<YM4rn8?JCSJ!gk=G`}+zcDZ{DE?$&WME)o&;hc6vRpv6$Q1oXi4E88
UboH-FPG#zQcP{h%4-p1y0GnzRrT_o{
diff --git a/app/design/frontend/magento_demo/images/bkg_opc-title-off.gif b/app/design/frontend/magento_demo/images/bkg_opc-title-off.gif
deleted file mode 100644
index a4145c5bcc04b28b6ae1bcf93683bc9d02477f60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 49
zcmZ?wbhEHbWMp7wn8?6z=FFK}w{AUu{+xk<LGdRGkYr%c0TCd11}3JE00wIScM=R1
diff --git a/app/design/frontend/magento_demo/images/bkg_pipe1.gif b/app/design/frontend/magento_demo/images/bkg_pipe1.gif
deleted file mode 100644
index a6b386c39ce1d76f7964e89ee4f23e37e3ff6c8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 51
zcmZ?wbhEHbWMtrGn8?5|YeoN*h3#!qDi|0T6o0Y+Nd^WT5CM{BU}9<MlVD}A1^_=1
B3M&8r
diff --git a/app/design/frontend/magento_demo/images/bkg_pipe2.gif b/app/design/frontend/magento_demo/images/bkg_pipe2.gif
deleted file mode 100644
index 81d13b63be184806527c970812b7fb292dd47a5e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 51
zcmZ?wbhEHbWMtrCn8?8J;>C-XK=kq@0|SHNPZl7_z@P&nK=KSsEK~Fa0~o9Ur1T9d
diff --git a/app/design/frontend/magento_demo/images/bkg_pipe3.gif b/app/design/frontend/magento_demo/images/bkg_pipe3.gif
deleted file mode 100644
index cc5fdd51b9d0923172b0684d3e420f7f58e1b365..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 44
wcmZ?wbhEHbWMtrCXkcVemRDe4U{L(Y!pOkD$e;sc11T;B1}5f~`alM20Ea{cf&c&j
diff --git a/app/design/frontend/magento_demo/images/bkg_product-view.gif b/app/design/frontend/magento_demo/images/bkg_product-view.gif
deleted file mode 100644
index 74bd39685a1f5dc893d895fa80036efb769d19e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 10761
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
J@Ta4b|39v{7h(Va
diff --git a/app/design/frontend/magento_demo/images/bkg_product_collateral.gif b/app/design/frontend/magento_demo/images/bkg_product_collateral.gif
deleted file mode 100644
index 60719f4780c4da5e264b3760ec059f1947620bbf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 63
zcmZ?wbhEHbWMp7vSj50^_|Tq{#}9u0^7__|i?3fkV1NO|pDbXe4u}M)WngCEFjV1W
Gum%9chY;uh
diff --git a/app/design/frontend/magento_demo/images/bkg_rating.gif b/app/design/frontend/magento_demo/images/bkg_rating.gif
deleted file mode 100644
index fcebdc71af4138f7efe5b5d71ed8186e4a94ca6a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 661
zcmdUsNox~f06@PcX%d^Z)|%25qS(YPNI?p<w20V5iKF1ngF-><K?E;iMLdXv4wylV
zP87UYTzW|m3(<P;AlNEMx=`biE+(1m%Ve_5H%lh7B+>p1-}xOLyfbI*;}cifK@emR
zKt#f{U$4kwA|5LhshSXuMI(*6Qm@HEg%hg+&#`1Kn<uky&B%wRnT>uSIh#qRxJ^W+
zKUH|PuFz2;@=vU0+<a)N61gUo-W3Z}fg*+YZF;3WlTK3koK#xmSjaMTfy&ELHI<Cl
z<&q3P!}VS+Xk)$)Rfy{f>*sea(B+~?&Iz$wLgKE%uH~|6dc}|@a|-`M;WpsvKKAD*
zq{}riEyFLdD3MAgIF@05P4J=1Qo$>ULaiEYG#cQ4pik5^0f2zv-PqkHK*u<cS@c8;
z>U63mTQS!G0QR`h!EU?{vme%ssd0R$ZKO-3dFk<JpB(ghy1US}1>EM;zwi#Yv<u^y
zYOxdR!CQO!tw4<#%=b}4r~c{h;O5r$&Yw^?LPTTnL^74mWOHPmDilj)8Zs=$SA?o4
z$x5x>0O}SK;(N7>>h~X+^7~$Yb#_?J%^~plL)F&s+rSN%-2sli5dm~J&s$99B?k>H
zk9EEGE@FZASI_H?;p@IjGtLLry?3-9M-qXiXJaQvZ!XQK=Z&_(L#xn@Ju;tCeV9DG
P-2BaI958hl_2Bql_SY~4
diff --git a/app/design/frontend/magento_demo/images/bkg_sp-methods.gif b/app/design/frontend/magento_demo/images/bkg_sp-methods.gif
deleted file mode 100644
index c6908f5510100229565f61249f474deef5b06dd4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1144
zcmV-;1c&=aNk%w1VX^=z0M$JJ=!`)1)VS}keB^Kv_TI<qo?h*zZSumJ@VSfSc_I1m
z=JU&`=Ylcnl~4HR*Wzde<7x@^+QIql;qSDA=Z84&vw-J>H2CV<^wYNa>)z;zJNozV
z_T9zeX$I$lFYvgD=Y}@sfGqXczv`4t<#rwN#h~n>W&8K?`taxKl~C@ib@kS}>X=mV
zy^-*?hUS4T<Z~D4kVoWo8tINi<7^D;oLlqEtN7{K`t<DWrD^x%)8c0X`}y?%00000
z00000A^8LW002DzEC2ui0I~on000L6z#d1_*%^<>q;kn@I-k&}bV_Y@G@PDx%k6r*
z5lH32E1S>gw0g~MyWjA*e9pd9Ad#<r-=j?EfPsR8goSJq6nu(Y4-$rtkdcys5)X@)
zJCmB5oRd43i<zCHq@{14pnRgHtgWP|sd}rfw6%}0v0k&byuEU`xm>$w2MId^0&4&O
zaRCH@0=vu2I{~8zJOS0e$!oyDTEk`zI|Ts-+iBBp1nG3qXavu23IPh82$|Z}aXZ~=
z-@u70qph0&YX=7GFi>V10b>B}@hEWY01pN`7|i35Fr$Mr4=eJBhAzP~0}Kry08p-B
zu>sf!0FVbD;Q)&YC?-I81|`e?0ydv@WEc{FwgLlgmJy(^z`c;@{-p^RY+xCTI~rJQ
zCtv|g9@7Ri2*98Lk9-R#I-pqK<5dF-{G9=i;9N42Ud>Kpi69@gV`+B~*r&}Xg8^rE
z^xeVC49f%PjEd#z6@dem2N{z^d_b|+0$>LOmWqaIE~{nI8WRwWbpmF~jtXE2mYIT&
z`_3qUEZ0m)b0bCVh23~sZ-0ch!CSYkA+y}eS_^m`Je%@N02q`($KyEZGp1u%4bVU$
z0|3$mSd3kcb+T!<t@GodKx}8y3k(=@0I#<H?9O$^P<NRHklS*Noj2EW+eGINYZk$C
zAa>gEz@2w&gqMm{?TnTGPyy{2K;8oW4PcZ3$)Kf{HkJ|OPd-vLz(4@e5YXRnU@7KT
zccM`=STz$Swpe2ULO0VwBL=rXkewm$84nHg*c(9L=+Z_p$2i52LNoanQUWASB$5Kg
zY{U`(4G_r#0T>}u-G8v1SI#|ICE#Xq*7VoF4hc}_7=zYK(@~cJBo*XHP2HownGAeq
zhK8V^=1UySl`*9okSRc>S(AcSWfzim>PDpm#^HcM$IK@xq?m|0h&*Tn;8rvCxcca)
z!q}>7r>usu>#w}@sz|877AuLcd^BS0vZGXj>lS`6E3GCjfbgsqVSJFmwA>Ps!3Pkm
zaIF>?Snxm<=tkj{21V(%>+ZWoJYWF^<JMa*Y7>ND@4o!@>u;4-*&st6{}ycU!Tk<I
z01Xu&?C`@7i>Jl~B-9Y`#TaMY!!S62FoVV*hg|S5DOe!#$taJziwgRt?DESJn^8gn
zH^6N3&9ayw0t7AK?DNl}=m3KWKNo#-CMdixg3(OByu%4GB+~TMCwq{C2UKSr@&+ty
Kp!Lr|0028*Uo6A`
diff --git a/app/design/frontend/magento_demo/images/bkg_tfoot.gif b/app/design/frontend/magento_demo/images/bkg_tfoot.gif
deleted file mode 100644
index 8670b13b6e5bd36a2a9c93240c44022b8d8c7700..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 63
zcmZ?wbhEHbWMp7vSj50^^upz9ckbVL{Pgsd>-V0%V1NO|pDbXe4u}M)WngCE5O(5Z
Gum%9jKoJK3
diff --git a/app/design/frontend/magento_demo/images/bkg_th-v.gif b/app/design/frontend/magento_demo/images/bkg_th-v.gif
deleted file mode 100644
index 5a6544b9ad91ae836cca02cb2eca46eeb5c75a47..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 50
zcmZ?wbhEHbWM*Jun8?6z^Xa>jH=oYmb&i37LGdRGkYr%c0TCd11}0{glpqFc0DM{u
AA^-pY
diff --git a/app/design/frontend/magento_demo/images/bkg_th.gif b/app/design/frontend/magento_demo/images/bkg_th.gif
deleted file mode 100644
index 479a8571e0b4f4b95078105d2a932c6f7dff3110..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 43
scmZ?wbhEHbWMp7sXkcKNvhK*C%MTQPvM_*v4u}BBFfcLka4}c|0PB?qNdN!<
diff --git a/app/design/frontend/magento_demo/images/bkg_toolbar.gif b/app/design/frontend/magento_demo/images/bkg_toolbar.gif
deleted file mode 100644
index 79b2c8379270450d9de0791e8394ae9dce069278..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 149
zcmZ?wbhEHbWMq(GIKsg2|Ns9NFJ656_U+xfcYpu>{rvg!&!0cvzJ2@V&6|J!{=Itj
z>g(69fByXW^y$;fmoI<+{{7*@haW$FFc1wCf3kqp>VQa)oeZo(3JQHGP6qvgoZc55
N4mWD}3A8X+0|4b?J*EHv
diff --git a/app/design/frontend/magento_demo/images/btn_checkout.gif b/app/design/frontend/magento_demo/images/btn_checkout.gif
deleted file mode 100644
index 1b6485e2da3790b58d1ab46d8f030601dc0830c5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4842
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
I2LKoT5Bth`WB>pF
diff --git a/app/design/frontend/magento_demo/images/btn_edit.gif b/app/design/frontend/magento_demo/images/btn_edit.gif
deleted file mode 100644
index a5df1cd1ecb9f71d10d731a02800f968ff5ade21..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 88
zcmZ?wbhEHb<YwSzSj5Kgf3NZXdnx}{M_F52x2L(cS9vplf#OdVMg|5p1|1L&q}G91
lHe(l8w4;TaW5;Bv?%PwNH1Zs`6+HMkbHz%Ymenc@)&OXO8vXzP
diff --git a/app/design/frontend/magento_demo/images/btn_gm-close.gif b/app/design/frontend/magento_demo/images/btn_gm-close.gif
deleted file mode 100644
index 29e64760c3483e100426e8818303f7cd2f6c5d6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 122
zcmZ?wbhEHb6krfwSj50^?((G<Z(c82vgr7ceUI<m{{R0!0~jd&WMO1rU}ew&@jz-B
znC&BW-H~<nV4TBb+<zhI-yA28drx>zNBSJlXuW?c?W)x7WuLZ|-3wkP|Iq0WXH`%C
XCbghn5)+oX3Nl2rU)E7(WUvMRo8>Vh
diff --git a/app/design/frontend/magento_demo/images/btn_place_order.gif b/app/design/frontend/magento_demo/images/btn_place_order.gif
deleted file mode 100644
index c2b805f7ce2db159f56c73d908312bdb17ac219f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2929
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
by40sm^{QL_>R8Wu)`#(oOFa7{0RaFz*Bv9i
diff --git a/app/design/frontend/magento_demo/images/btn_previous.gif b/app/design/frontend/magento_demo/images/btn_previous.gif
deleted file mode 100644
index 90561b6864b1d3880859f6d87a1742a7f11e711f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1254
zcmZ?wbhEHb<YwSz*v!wcZr!>|moDwxx%1k!Yg@N&y?XWP!-o&IZ{L3F)~$;dFRop?
z_V(@D-QC^GmoLA6|Nj5~{}umpNB9OPxFnV&0%;rjih{)C?9>v4q}24xJX@vryZ0+8
zWTx0Eg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7*i=|m<QC+nmLw`v<mTiRTUFR9
zC8p#jrCI^mAYpwa1+bEmY+EHqkc0xrPUrlhR0UH#1Knf;GXn)PLp?)d6LWKO9R(u;
zLj!#SBYi_7T|;v#V<RgA0|h8h0@_xTl4cd;;s&(~$g@?-C@Cqh($_C9FV`zK*2^zS
z*Eh7Zv;>)9WTXpJp<7&;SCUwvn^&w1Gr=XbIJqdZpd>RtPXT0NVp4u-iLDaQr4TRV
z7Wn$Y4bCgp1A9m>IX_pwBC$Z<P|rX=Hy7kDu<GKHpj3o2u&OQ&sVqp<4@xc0FD*(=
z1u9pDX$FQJev3c~fv&OgFUkZ)N@9*nesXDUYF>$_i>(q+MlU5Z#md6W(aGG+%)-df
z)Ya9{(9qJt#M#No$;HLU+}X+4*c4_4R=rLpCWa=4W~Q!2Muvv2h8C92PL5`-&Mu}-
zZmvdVaJ`;+#U+V($*C}VGeP!3^qS(;Yvo*&npl!w6q28x14{t`8Tlpo#Toep3eLf%
z3gMY~Df#8apvZyv)g`qkvn(~mttdZN0UWwknb>SMC**60-V|~|OdseNeNfUsN-8iR
zVEO|w;RzqefoGl6JYaq)0%i=x|Ns8}`TgtXkMG~Ue);_A<A?X}-oAPL>g9{)&z?Sc
z{OI9>`}gkNxqa*AjqBI0Ub%ef;)V0)&Yn4a>g0*z$BrI3eCXhT{rmRr*}ZG$j_upF
zZrQwP<A(L?)~;E-YUPUM%a$%#ylCNq`Sa$^nLTUfjOo*+PMJJu;)MRb-k$ER&W`rB
z)|Td`#)kU3+M4RB%8K%`(vsq$!h-y~+??#J%#8H3)Rg3;#Dw^`*qG?3$cXT;(2(Gu
zzyN<gUmtHTPY-uDR~KLsaIm+twXwFcv@ka_H8C~<W=cI>9c?X54RtkD6=fww1$jAH
z8EGj=32`w|5n&-g0e(JS9&Rp94t6$H7G@?!1_s5SEI^W<L5BedKqV9di|Gf&OIfzB
zmm1IcepFE7^zj;w3p3`2SEj$-<C8moy|8uL?n9f{I-h!~vMjykByd4PN7VI^AR~h{
E0It@}F#rGn
diff --git a/app/design/frontend/magento_demo/images/btn_proceed_to_checkout.gif b/app/design/frontend/magento_demo/images/btn_proceed_to_checkout.gif
deleted file mode 100644
index 70fbef32d30932f27835a664fbd36b2e18a7cbdd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3048
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
diff --git a/app/design/frontend/magento_demo/images/btn_proceed_to_checkout_dis.gif b/app/design/frontend/magento_demo/images/btn_proceed_to_checkout_dis.gif
deleted file mode 100644
index 90782978b76c8c0210c8c805bfca4bb24b71c05a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3084
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
ZV+xsd3Nn~)ZeN@^*BJKJ4T%87{}-8K&#?di
diff --git a/app/design/frontend/magento_demo/images/btn_remove2.gif b/app/design/frontend/magento_demo/images/btn_remove2.gif
deleted file mode 100644
index 8d31b24a62aa728f4808308d3cc86dabb7e03010..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 531
zcmV+u0_^=qNk%w1VMqWE0M$AGMv2+$^7~4Q+DVGp=I{DOh}qof_Cbc&>hb&G?Dy#K
z`t9%XLWbDn?)c{J`QPgI@bvoM;^^Js=J)vd-r(lk;N|i2_3iKR-{a`y=j;9b{^aQG
z`1$(q@$~-w{@&u|{QUjt?C<jR`1<?&;N<H2{QU9u`t0!a;N<A}`up<q_WJt!@A32X
z_W0=S^Y;4u{{H{^`~Cd={`dO)^!WSm_4@Mm`q|y%DR$HU|NsC0{{R300000000000
z00000A^8LW0024wEC2ui07w82000L6K%H=yTilMwq;kn@I-kzr5L6lEuGp-0%k6r<
z+?!OGan;V~w0g~MyWeX_O)O23Z1}u>&+q&HfPE%5bVDd7G>M9dIE{^qkdcy;lr#nj
zi3tXfg*p=(GohlQjiIHZsHv)}st*SP4GjYa51}tJoe?52yuH1RyudMz!H&emIK|4t
z!o3ayI0Xeb0}j50Eg>@7+}*}F+l?~f<lyDw;OOG$?A;0gjQ|SWGITi~95DL({EaaF
z|BMA3=&v9SeF6hI;s*l(JRATJFr=em0hmTtFk-}_5l4=WA3cWLxKT?00TAH{2#`e#
z3<@hQiX`bMq)nP4Gv*w*lK_J-l_wbxXsM$E3ouBND&<0eWsU$tTY8XCVyV@uSg+i;
VU?Hp5uU>9o&;Yiq*&9Is06PU1EuH`X
diff --git a/app/design/frontend/magento_demo/images/btn_search.gif b/app/design/frontend/magento_demo/images/btn_search.gif
deleted file mode 100644
index d1e994cac00db237426a4382ceca0a1d1692fbad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 926
zcmV;P17Z9}Nk%w1Ve|nN0M#}CKy{r{gsU}cly#uROn;^@XOL=`y*hB1aGb$LdZAyA
zv}KdIS&6VFUx|IF%Xy^8D`Jd+tInLh+D&?#BV2|@V|iqJj%ARrV|tB}vC36}qm;JO
zgQ&(_hpAS8os_uMfve3aV2UhbjDDoThpfsiWQ}f^w|b<=kh0K|vC3eJtWkQHYLv5B
zgr$Y9(2K9ld7!^^oV!P3ctUfSL2{QyVs`)l000000000000000000000000000000
z00000A^8LW001@sEC2ui0Q3PB000L6KpQ4yD;kf;q;kn@I-k&}bV{vSuh^`%D(QN^
z;IMd1E}PHjw0g~MyUQtz&GK<=@A$la&+q&HOc8>EgoTEOh>41ejE#<ukdcy;iY^}(
z86XaToSmMZprM=&q@|{(sHv)}tgWuEu(7hUw6(1u85<`LqP@Pqz`=hH#Kp$P$jQpf
z%+1cv(9zP<)YZ)=8z=(<!rk8A;NIKg<mKk)=;`X~?CtLF@bU8V?I<q@2;uts{QX<_
z00RmfNU)&6g9sBUT*$DY!-o(Rz93=1fWM0vGiI#Fv7^V2AVZ2ANwTELlPFWFT*=ZT
z2@VSuXq-v2=C7DIbL!m5v!~DhpFo2O9ZIyQ(W6L(au}gNfz78-qv~l&wW`&tShH%~
z%C)Q4uVBN99ZS~h2p9|)NL|ae?US@{<I0^&x31m0c=PJr%eSxJzkv0^h!G%w+rx<4
z7GBJ_vE#>(BTJr4xw7TUm@{kMTsejb0t6C^9!(Rp>C>oFt6t5zwd>cgW6PdRyS8oE
zCRij$K)Sc@eY=ATA5Ofu@#DyoD__pMx%21Hqc3N10RVvC*s}w(&b_<$@8H9WA5Xr#
z`Sa-0t6$IF`~?*U4rrfGzf=7C`19-E&%eL_{{RLk;D7`cXyAbXs?dP|0@UZ=gLyD0
z;e-@cXyJtzW~kwY9Cqlt;fElGC?ba)v`|0+5T>YN6(_dn;)^iGDC3MY)@b96IOeG1
zjy(2wV+$IH0Ktkx7RdwzNG7S|l1w(~<daZFDdm(@R%zvxSY{ce2pV`$LIXyIDP{v?
zmTBghXr`&=nryb|=9_TFDd(JY*4btW9@H>H2x9h0Bn5y5D(Iku7Ha6Bh$gD&qKr1`
z=%bKEif9Nl$Y4VSEBL7?gcEe?>8GHED(a}DmTKy$sHUpws;su^YN;z!U_%f9J6HbL
A5dZ)H
diff --git a/app/design/frontend/magento_demo/images/btn_trash.gif b/app/design/frontend/magento_demo/images/btn_trash.gif
deleted file mode 100644
index 5c604abb2f385f9c08f76a4b76b523f926467e53..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 643
zcmZ?wbhEHb6krfwc$UtvZQHh|PoG}6aN)*{8>dg7e);m{hYuf)9Xqyh<HlvnmaSa5
za_iQu`}gm^e*Jn+PtW7Wk1t=oeD>_w7cXACef##^yLb2Q-MfGP{@uHG4<0=D`t|Fg
zqM{8OHe_UEeEs_M(4j-ScI`TO^5o8)JD)v!_WASY<HwKh*|X>4$B$pWe7Sx5_LC=1
z?%cWa=+UDyXU<HYKK;m%BlY$5t5>hyy?gie?b|P2yqKPzo|l(bQBhG>SJ&3owqU`6
zD_5?ZI(6#&`SU-2{>;wKe)a0rzJ2@B($YSC`m|-smd?)3_3PLF`0-=u(xp3g?5M1)
zeE$4-O-;@6<;y2eo?KX1xNhCLxpU`EoH((ir6oT<zrVk~y}kYF)vJ>xP1?M9^S5u`
zdV6~d3JOX}O8)-+yKv#c-@kvaSh1qCw6wLg^~8x2IXOAEZrytS{{5dne;B9)6o0ZX
zGBBhw=zz=v#R&uZgNF2`=4O5|;g-&Htq4vbH71VKu5^|pd1m!kdsTgvE?+${NufwK
zRs+5+&NMb9VG&z#(Ws_)Csr?Mmb5hCy=j~-O=-!}32}-l4m^f(^6WwBZgRXL%KQvm
zI)c{h3=HP!+7fAul4>Him|2(txINQVwY8YV8PixTcm)M?ony`^2pn{1m}<mmb;II<
zK39`w`h*1&6q2K7^7%;!%y_t<qu-cUYz{}mA|FX+(~1TG2UQmVM}M&%jSmW}4cd%B
mAr~e(A6}sBbBd?I!TGS5k&H!)p##T}Nm_gc0an5s4AuZrnjy3R
diff --git a/app/design/frontend/magento_demo/images/btn_window_close.gif b/app/design/frontend/magento_demo/images/btn_window_close.gif
deleted file mode 100644
index 18aced2020b289845d7251bbda1403aa14822648..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 226
zcmZ?wbhEHb<Y(Y#I3mPw=+L3RfB#;)cJ0=!TaO<<Ubt}K{{8zOJa};8#EG?Q*FJy#
z{QC9l|Ni|ueE9H-7cb_|pTA_ulK=nzGY}0Ff3h$#FbFZ|fOLTDWMGY7z|x!I+2y`u
zT~0|)pn`#}GK*l24Z~WahIU2vP74JasSk{W0-?v<l`kY%%@0U9w5w^YNUQt9Ri9R^
r;@3PK)2cI}H_z}=ncL&@jOM>35(HBMI8p^zblX`3l+=2<6d9}mH|kV;
diff --git a/app/design/frontend/magento_demo/images/calendar.gif b/app/design/frontend/magento_demo/images/calendar.gif
deleted file mode 100644
index d0235c7e023cab8100e0916375dabeca2f4b478c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 391
zcmV;20eJpLNk%w1VGaNe0M$PL|GIOc!SAri>6p`zceHZ<h()%|>i?-%<m~nC^7)3Y
z;oau)jk4r(v2K#K=X<2utjFp9o?ULPYQECzUyjPm+3Tsr>0OJ)|CCZyhQ|M)VXn#P
zfvVo|^!nT6@&B4xZ<^Hb^ZD!X_i2~WT8hcZ*XsX%Je$4i|D<K|_WE_9*JP8<yU^?Z
zqhz|z>hksam%8cym{)S1)<So?v&-th)9aqU?AYS)eyH95uwnnRXnM7EQiQ|w_xu0<
z{{R30A^8LW002J#EC2ui01f~S000K0z+b>-JHZ?dhC;!4JOaI_bQ)FJdZ?Br^1)yV
z1yc`n!UE0!UG8uYk6>8smK*c-R*s&<x8Fm20zM)X3@H{6h#LY85)uXrB!wG*J~TcJ
z0}?(S844XVG&?&41_TWa8zmVWAqGA>13Nx0DIpaL6gVL)ETTIT1|1b19TyJ?6FxP{
lJ`lqp2^T5}A_xcz9ycWm9U(6lG9V)>6eJlu=;<>-06XQ!y7&M9
diff --git a/app/design/frontend/magento_demo/images/fam_book_open.png b/app/design/frontend/magento_demo/images/fam_book_open.png
deleted file mode 100644
index 7d863f949741ff83fd8373a77c0d95a3d95e441f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
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-
diff --git a/app/design/frontend/magento_demo/images/free_shipping_callout.jpg b/app/design/frontend/magento_demo/images/free_shipping_callout.jpg
deleted file mode 100644
index f3b44e5b2051947d61ab0f6cd8a6f3f3ce130e53..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 14639
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[^B8RyE{G_#OL~USQ$30YCH|
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
N{Z}=64dec<{U3NFF_-`V
diff --git a/app/design/frontend/magento_demo/images/grid-cal.gif b/app/design/frontend/magento_demo/images/grid-cal.gif
deleted file mode 100644
index d0235c7e023cab8100e0916375dabeca2f4b478c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 391
zcmV;20eJpLNk%w1VGaNe0M$PL|GIOc!SAri>6p`zceHZ<h()%|>i?-%<m~nC^7)3Y
z;oau)jk4r(v2K#K=X<2utjFp9o?ULPYQECzUyjPm+3Tsr>0OJ)|CCZyhQ|M)VXn#P
zfvVo|^!nT6@&B4xZ<^Hb^ZD!X_i2~WT8hcZ*XsX%Je$4i|D<K|_WE_9*JP8<yU^?Z
zqhz|z>hksam%8cym{)S1)<So?v&-th)9aqU?AYS)eyH95uwnnRXnM7EQiQ|w_xu0<
z{{R30A^8LW002J#EC2ui01f~S000K0z+b>-JHZ?dhC;!4JOaI_bQ)FJdZ?Br^1)yV
z1yc`n!UE0!UG8uYk6>8smK*c-R*s&<x8Fm20zM)X3@H{6h#LY85)uXrB!wG*J~TcJ
z0}?(S844XVG&?&41_TWa8zmVWAqGA>13Nx0DIpaL6gVL)ETTIT1|1b19TyJ?6FxP{
lJ`lqp2^T5}A_xcz9ycWm9U(6lG9V)>6eJlu=;<>-06XQ!y7&M9
diff --git a/app/design/frontend/magento_demo/images/home_left_callout.jpg b/app/design/frontend/magento_demo/images/home_left_callout.jpg
deleted file mode 100644
index 38863421b6d47a3dc85a3ded79e8dd642f40d9d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 11802
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
V?*bkGI%fxiXF0F$yRjZ-{}&9ihHd}=
diff --git a/app/design/frontend/magento_demo/images/home_main_callout.jpg b/app/design/frontend/magento_demo/images/home_main_callout.jpg
deleted file mode 100644
index 7cb3d356caf0d951c16d72d8ee29b10e11d21ed4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 36053
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
BU7r8|
diff --git a/app/design/frontend/magento_demo/images/i_arrow-top.gif b/app/design/frontend/magento_demo/images/i_arrow-top.gif
deleted file mode 100644
index 8aefbe05e6cf56f6fc4459034290090127beb438..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 131
zcmZ?wbhEHb<YM4u*v!k|F!6lj*1PXMf3Dkd$9Kl1Z{NQ@eErd)_iXd_yQbY|@4fo4
z;P_*?x)Z;DePaLv#h)yU3_z_qARfpJ1{Q-2Czo~13Raz#caNvILW+6DqQIOJhjbb>
f3_Kp|`RZKxrp-G;I!#IDTfwnM0g_)ll^Co6b{sec
diff --git a/app/design/frontend/magento_demo/images/i_availability_only.gif b/app/design/frontend/magento_demo/images/i_availability_only.gif
deleted file mode 100644
index 1b6d8640e2ba35812c71f794220a8fed83030891..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 562
zcmZ?wbhEHb<YM4wc*el+|NsB}Hlq8jMHcCB9IzALYbCVRgtuLZxnGramxbVZBcA=X
zVw2TaH=FP+)8$;E!?DSjce}a3Y6I?4S*Cr~B73Za8x)v3m08*pnR``OW@@n2$T3Y)
zV_mGxzQvS(wLa%W73M|S?0c<*cUubWu@u~F!rP(DGF6>zx;pDx1MZE+yo+@>rm8aU
zFc;Ws&cDf+XPy@OJWaL(_7Zb6*=K9A&s1k=RA6paWL~bzQ7y+*Da+KO%sgM4V}l|0
zHZ%Sux|};L1ov19^{KF|)Z^S{F0j^+XN@6Gt0MCPE%vEuEC*~w57>%LQf1j~B|KMy
zb+#tkay_n9dYr2axVM|~t<dM%ZpOdMQfQkg-$oO@oo0Ni^ttA0vG2DNKWr~CO`UDG
zh2So8fms@C>kYY^6qskKv-Yd7^eD41P!A~ngqWrSG7=Og4D9_4u|_N`-d;?sDtat2
z+>DGOj`0bReT+<^%AC5vY)m3bz6=b4;cWV%tYHp|c?GzVI0aqg7Hhc*IfvTuMl22r
z;p10b@3uI=p4r1zQz&XNvyDljd?24Tvw^Xcx{L+CV)WuT9u7%aLw~8o9BFFoekmF}
isgmLn=4PgzK2G10#mrtLFeV*uRAwypnIXWzU=0A^m4GAw
diff --git a/app/design/frontend/magento_demo/images/i_availability_only_arrow.gif b/app/design/frontend/magento_demo/images/i_availability_only_arrow.gif
deleted file mode 100644
index 1d949264be1e3f55d162bf34e1dd2f1ac826bae9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 113
zcmZ?wbhEHb<YbUzSj5V3>DtZz|NjfAnZ5q-`SXw83^1VhlZBCift5iABmh#&z-$(=
z>&`ocQ<ke_C%*7a5>Sw+m~X-4sI^4>wV%O<GbOqA19W!k{QSD&(kfA*REt?BjxL(~
KVBQuM25SJPyee$~
diff --git a/app/design/frontend/magento_demo/images/i_block-cart.gif b/app/design/frontend/magento_demo/images/i_block-cart.gif
deleted file mode 100644
index 99bd8f296abeadc63a490f6488b90881df240f93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 604
zcmZ?wbhEHb6krfwc$UlX{rmSHKYm=ke0kQaSq~pRym#;3!Gi}+pFVx*(xv2yThE+1
z)6&xN<jIq-U%$?rIkS29)mN`xy?_7y<HwJ0-n@DG^y$i#D}Vp~ef|3NzkmP!`SWMj
zu3e8FJ$nB9`SIh&Cr_Tdbm`JXix!ovJTqs`oIQK?eE$5ozrVk0>il!(&UJ6P)ZE;B
z<j9eC@813U_wWAGH+v2q{qp6@wB<Xhs;YME*pWZ?a8b{)7cXAaZ@GTu`pvlR4cD$+
zOK4k_l$6x5`TFYBt2gdH+0f8Xzw}s6PEPKE<FnQueEat8p+kp0eE6_z*|LilFYe#J
zKPxNi<jIpy-+k-t?QLsoJ9YE<v17;1KYaiC_3ION-hBG>Y2(I?si~=rjg5~VKb|&i
zTI-Snr7KQMm@r}Q{zE74zWw&?+ni<VOG-+fJ$rWN&Ye@IPW}A(v!|zL)22=3<>mSL
z`5QKDNK8z;b?esu|Nj}t0*XIb7#SFH8FWCpL2<&szOx~>skx=Kt-YgJN20SO&cV(m
zxHnKSTEk4yzr)9g-%8Jz-$J+DJc`pG*O}8Kwpm1+NuA9l!CRC~jY&=^QYnImJxEqd
znI)Z7UW%DRl$$YyQNoQuFjbgQI9?zmoG;haGf9dyE7@I~k3*G9!6=uVK~j)GfYFpe
zMny)*kttUrMDarN*>)M`2?c>07`SGMH#ww4Fg7?cGx3^v+_<24bOEE>EQ_Cl%05!6
TVb|UmT<(~_%AL!^$Y2csF(oJV
diff --git a/app/design/frontend/magento_demo/images/i_block-currency.gif b/app/design/frontend/magento_demo/images/i_block-currency.gif
deleted file mode 100644
index 6603cc0b911a78d13ca038a26b030c18ac1d1364..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1073
zcmchW?NibR0Dym@YuQ?-ck12h)@|9=x_OtS=ZWjZ(#ti{X?ngUiU{;mU^-0=jFT6&
z1Uqn|0x|&uL{lIkV*vsRNP?h(AQC!jo6($}-L~`7w*HAd_k4doJz3YTra}=>Kosz|
zAGpv8OC}`YO~?w`5IElaZQFmgAbVI9?fmLde6{R5IE{zZ-6D*j7hWnceWmp)T>gyS
z5Ri<zW^dc((Mr2%O$;SnAS}w!D#vn2t@DWjyZVM8MYW@T_Otj_e@VR#U&&;okdkq0
z&C+#yt-21>pm4@&P|=84YjXT1f3&N1zINSJJ@;?BF<Nbt1l8^IbOok`u7&bt?4WOz
zKEFzyG<$YDNrc3Vj%iSS`(o>L`kXhX$Jl1LGqvruhFs}g=erF}qD@|zJg~B7h4Zvo
z3=Pvwm3w;xONI)Wyk@+zK0tWnmGI3xRZvhiY*Q{Nu8?m$FxramQ%TPnmbVwS{&bup
zoWU+KZ*VpFRFY)P1M1+FK8eWfmi=Ml{xbb=?%t)vX8ndadlj80@fS&5c#X4+(q{`T
z;wG&szZs`?;EYIk`yh-_jMaj57TU0jRU@--*Lw@ONGS0VTx!K@EhLk+c;p3Ku{@|J
z<Me2%kIZzeS+^$W{-=eb8|vTy%SxE^a@foM4BAw#wq)w1yI98mX26R4ffd{{;Ag7J
zCknE?D86a(?qWke$5O<5via7)F_Mw&2Wb>&+1Pry6hWI;j|Btj;0k8A6gR7~hkn8t
ztI8<s6e6^Qk7<$HVT=-Rq6w=rIbSPaTw69TOW^H94UyUQHkPgPs;h=MeW%SeqVVc+
z`wLs7nj#r-YTI~IY{rfuaZmK!A-;4+nL<ok`h8OC7uesZZ_525ALH`9j2}0&<s;8K
zrt0J#-HRQ4mAG%vs9SjTSibH=D_a`1AlE>uXy*}Sm_m^qRC-b4E0p<}3aSA3fBAGj
zA`AfhK*GE1yC;By{{ZSp_W>~W;}{4;>`SiO03eWy%(S<^#>FH?Mx`bruFumGTvzT3
z&m#Ix)j%Q*U5zKR=w}26_7#s0=N-qre-gE4s49v-*0u3;pN27yeR=*!ba;xSn{n);
z%Ji+>*&Gh^FfDdJHgk@9D5gLlEC{E!BkNNSp13T@JXhFm8W5UCyh%CYfs#!M);R=g
zO=Q%FV7=7nQ>CXlEJx|t_=%>3&{Be>BmYp}*D@r%|7Zqy{4-<BSllPTiO)f1oXOjp
zLn5Vi{grNt3-{+nUyFF?<k$L`sbNCdQGon?-Rbz*h)#NeruxHLfz@qzZ?q#*_9_9w
Z2Gan=5%3EajQv3vB;rk;0Fe%S^)JGS1VI1*
diff --git a/app/design/frontend/magento_demo/images/i_block-list.gif b/app/design/frontend/magento_demo/images/i_block-list.gif
deleted file mode 100644
index df990aba0267a24083d299711fe22497b8605c1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 600
zcmZ?wbhEHb6krfwc$UJj`@-ur$6std^J?qaR~t^e*l_aY_H(b^fBrdn%l*lxyVsp~
zkumLJ*7S=pUB~)Pw#RiJef{x!)2jO`kGzQPI+;A_+>Bi>8&=+JS@R&I?Z}LC6Ka><
ziSIqJ^y-`y$KLO~__}A)lQqX)_H2Co>cjU-55F(GJmb^1-;Z8>X*gIlZ~vRxg%>Io
z-^ibRWy8r=>rTEbnR|8ag()At{91eb)$J!A?>+xKd++PH`(D5M{Bz%>*U#R5TX*tR
z&Azf}+a9es{%XS3XYoD9Lfek5I`(qfu9vr;ek@&hJ!SH_H77o9I{j+vnHL@FAHDtb
z<I}faEr;tOyH2#Pd${)a%l<7-XYF}CdHeH^-+smQot}T-ZQY8y_nv=>?>`;Ze!ObQ
z&CX*@yDq%mb^g_q?a%jLejU_u_{O6T%MQQ%^8NRJFkqlIQ2fcl$iR@opaU`(6ekSq
zTN_fEnp;|%lwCti0~`Zw<vqm3q^z4{lV;4EHAAaOBS}U@Uy_qA%3IwkNxR7;DS5-j
zO-VdWqDhH6ckNDcX^P#EEVPkvqd<6*zn6o8jh`+nBP)x0m`{^pkY%#Yk&RCFO}++h
zOwX9u7#Uf(5+s@g+1ZjAHpZxKNRVy{WshcHV62dEC}5bu*0kxy4#Q*KYa})v_#t4T
l(#avCmUe>S@W#i?jvO&M3k*`3rs-=0FEcnYDL{e28UVCeBMbll
diff --git a/app/design/frontend/magento_demo/images/i_block-poll.gif b/app/design/frontend/magento_demo/images/i_block-poll.gif
deleted file mode 100644
index bef3d22b9c7909ec88fd9b1b339dcff38481763a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1014
zcmZ?wbhEHb6krfw_&%B8=`zU)(T>j#O!|0q+V2YspRX<cdwt#WO||!?`90p)cx_4X
zlk?k-%*gqCY}&KgKD)N>{(Sey*DD)7U0gFG-KBoQ_9siFug^1_c&;p}KPtTA-t=?j
zX}kU(c=7-0nWMgw|2|u5eRM%pXLHD|P5W2YB_>WwxW7a>V@0H6&Bf^D|BBZ?f4a^j
zWpP;Cf&bHzTuUb{m~`}iYV(QZRgSgumM<+1?L1q0^ZemO^EXecDQMl_RNqrNd(+)B
zYbHNkF1z~1-0!dMUT!tpbp7xA3pMTYPH*qa{{8D$-?{SADNiQPY<YfRNAu}|HLZnn
zPJQn?TUdEAYf`MUW8I~1Kfhg_Ygn)$x4klaN>yIR*`lbb^Ha`OhA;nbUv)NRNsLLs
z>8yzvN4KvzyKhC}_W#$G)oi@Fq_pe6(bdhfvwXrPhlFkUU%jq8cGLg<a}~!Ydw>1@
zJG%DT$(<XIFRq-G84$PO|GI|c{&Qv3r-3#)#%%fTJN<v?g1?XE1bsWvJ0r<$UVr|b
z!)rRH)OIiLxV?XQOzHN>x)b*osvKEX9>3vVU2%K-j{m8r{_BL6lx)eikKeLtQf<q%
z|81+*KHHI+zC6;g?(){dcfbGo_W%EXhEYIq2q^w!VPs&K%%B4@36v)oI4(1&bINF3
z@Seie#3rbCVuKqeg8*YsqQ`|^F84~i4;vf`6*yFwIZPrJEL(hlol8ZcLm@%%uwKfG
z7c-rfIy5o!>~N60vCy?)KI1o;my?xw`iv*B^i>G6pW#s#ZpugqTG}pR&(!{h)6&RI
zO3L$@iDKh}lv7igoMJSUo;xY=@Ud|1OcYjE(p8gNtD($vNJTcx!er9Jq)tJJYza3e
zmX?c(Vrd)pBse!d?3dN#5p*g%-p4MT%K0czDC4lWMaHWX4Uy>!`0bLm*)*0YbuTij
K<78uDum%9SkYVWn
diff --git a/app/design/frontend/magento_demo/images/i_block-related.gif b/app/design/frontend/magento_demo/images/i_block-related.gif
deleted file mode 100644
index 505c3f8ef35c2170a9680677c3cb8a1e72b092e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 560
zcmZ?wbhEHb6krfwc;?0M`Sa(mU%yV8H0k>F>+9FAU%GVZhYugNY}xYU$&)o}*2Kof
zW@Kc{n>X+N{rf+E{;aC1djJ0Y%9SfuuU`G@*RSW#pU<8>`^AeFpFVy1{{8#evu7tv
zn6P>C<|$LAtXj1yEiJ8}prF0IJuWV8@#4iZX3W^RbLZ8oSC=hYHfPS9%*@Q5o}Q$n
zq`7nF78VwM`}VD`ukY2XSId_#KXvNV`Sa(WJ$trf$&z*J)-^UZzJ2@l(4j+{Hf>5w
zOx(VG`?YJ=qNAgGdwave!nSSOHgV#_9Xob}hlh7|cDA&%Oq(`s!-fqD7cQJWeft0Z
z{}~21Q2fcl$iU#mpaXIyC{7sIdmFr(np;}iS{PYnIYio<8BCNsS@o>@7}cb;ZM=9j
z+9g=sg_xT-xZ89^O)XXV>^K#;S{c+?*bNz71V!c8TG)6T*d>Me4VV<oTf}*sRG5!(
zN;!+Q2)MC$d6>xyIodO}@-i_r30lZliMNTlKJzlx)DmdtQ)Uuj=H}Ax^O8u}@WPSd
N-u`9|Sym<nYXJAJy59f*
diff --git a/app/design/frontend/magento_demo/images/i_block-subscribe.gif b/app/design/frontend/magento_demo/images/i_block-subscribe.gif
deleted file mode 100644
index a0d25bb53601a303a26be755fef08ea991f3a685..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 606
zcmZ?wbhEHb6krfwcoxO5e*OBjYuEPn_C9_3blbLVM~@!;`0?YWO`E1po%-(GyQ^2P
zzIyfQ*RNmi-@iY8{P@<bTaO$$vVHsZzkmO(Tet4Tix+R-zCCvA*sfi>o;`c^<jIqN
z|Niy$_1(OAv%9-{!GZ-}zI<7+V#VFNcen4@dG+Sq2M-=xym)cL>4!gl{CM;B-L-4i
z&fR`GYu2pWw{Op%KY#i1<>$|zzkK=frag!E?Afz#-@ZkQ7ERrG{lbL{mo8m8eE9I{
z)vHrxpM3M?O;1nH%a<<?95}Fh_wG-hK0SK!Y|WZA^XAPvbm-9a>(>`AUc7ACvMpP-
zRIfZ=y!hOX9Xq~#`*#2S{gsEV-@0|{+_`g`H*fCWdiBGH4}bprS+Zow(v5pIZrr$G
z!-n6#fB*mgpMkzW@h1x-149&p4#-+ioG`HOZis4XZi?jNl4|K{<ztUf?d)z9V;7NE
z2nd-JDHbjf9^oJ-F4PstIxj+xpI6?QZ)q!Q1T%xXhgOgp2cvqc00XmdXrQR6m6s!j
zWK`q<W=6MgZaWQ6KSL&!C<{hgCzA+nc4J@VFlmt{7X?Wjaqe&yMJ^?2-eyblV1Jni
ze$5;gfrN&D1|~rvk%tQ&urfAv&DipTaX}NKgpt*Q=pzT18#xuHeYm0MDbOq$v981;
Qph$q3g(<>|i-o}&0Q_GI%>V!Z
diff --git a/app/design/frontend/magento_demo/images/i_block-tags.gif b/app/design/frontend/magento_demo/images/i_block-tags.gif
deleted file mode 100644
index 567598542cbc319f7cd9aa63e51ae2c93bca4887..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 594
zcmZ?wbhEHb6krfwcoxQR_Uzd&U%veM_3P%%n-3m5ICt*c_U+pbTweF+(W4uW&;9)Q
zbKACUpFVxMaN)wcckixTxpL{!rQg4QKY8+G!M>L7-@h+D&@pjy!Pl=}-@bi2Z%<?2
z#=O&~PfyxX^y0;f4I4Jh-d)$ZF8$)gi??pw`t#?{hYug->}uS5an<!lXOA8|`r_T=
zd-v|`-o5+y@#8OFzC3*R@ZP<9-@kwV^y$<7&G{cceth}<@s=%HK7amv=gyt^`<mzO
zX*hU!eeZ^x0|yRttxun@x!~HPQ*(CJ|M>A^=gyszH<d2j-}d_Bvwi#a-MDdM%C?d(
zUq8Km{rd9d%g>)b@86Vn_3G8@*RTKn^K0wYt%nXBI(hQs_n+VX{{8#^|9^&o1ByRc
z7#SGC7<52R0L2Ld`}zhyegQ>ZRtCYauI?`H(EffQ2Bw~Fflv-smVOTDDN}hv8N&F@
z1VdSL=6AEMkY*Jzu?p4FTOG#GuPowfr@$U+Zo}2h;1$ZGX(VqUc0fu0NElDBZm7Mj
zrKs?^P-dq~JQ}j0oKljvebqw!10B1JgM6MockyrzU}h8VR&g_YT2`Pj(IvjY%OK2S
qMG+H+X!BGNOM`|77aLgFmA%$DKHzZc?J=nM!C|Db->Z><!5RQuI0zX4
diff --git a/app/design/frontend/magento_demo/images/i_block-viewed.gif b/app/design/frontend/magento_demo/images/i_block-viewed.gif
deleted file mode 100644
index 567598542cbc319f7cd9aa63e51ae2c93bca4887..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 594
zcmZ?wbhEHb6krfwcoxQR_Uzd&U%veM_3P%%n-3m5ICt*c_U+pbTweF+(W4uW&;9)Q
zbKACUpFVxMaN)wcckixTxpL{!rQg4QKY8+G!M>L7-@h+D&@pjy!Pl=}-@bi2Z%<?2
z#=O&~PfyxX^y0;f4I4Jh-d)$ZF8$)gi??pw`t#?{hYug->}uS5an<!lXOA8|`r_T=
zd-v|`-o5+y@#8OFzC3*R@ZP<9-@kwV^y$<7&G{cceth}<@s=%HK7amv=gyt^`<mzO
zX*hU!eeZ^x0|yRttxun@x!~HPQ*(CJ|M>A^=gyszH<d2j-}d_Bvwi#a-MDdM%C?d(
zUq8Km{rd9d%g>)b@86Vn_3G8@*RTKn^K0wYt%nXBI(hQs_n+VX{{8#^|9^&o1ByRc
z7#SGC7<52R0L2Ld`}zhyegQ>ZRtCYauI?`H(EffQ2Bw~Fflv-smVOTDDN}hv8N&F@
z1VdSL=6AEMkY*Jzu?p4FTOG#GuPowfr@$U+Zo}2h;1$ZGX(VqUc0fu0NElDBZm7Mj
zrKs?^P-dq~JQ}j0oKljvebqw!10B1JgM6MockyrzU}h8VR&g_YT2`Pj(IvjY%OK2S
qMG+H+X!BGNOM`|77aLgFmA%$DKHzZc?J=nM!C|Db->Z><!5RQuI0zX4
diff --git a/app/design/frontend/magento_demo/images/i_block-wishlist.gif b/app/design/frontend/magento_demo/images/i_block-wishlist.gif
deleted file mode 100644
index a0b4b3fb4c4eda592cffaf852ca3df9b03b4e730..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1014
zcmZ?wbhEHb6krfw_&%TE<$CSaRTk^Z^&afAez4ziVl3~&H8wjtEuU?3d$H5w#den$
zJDl$<(|xta^W|Q<KR;gme7W=07QG*@_Wb$z_T>ic(-T#0E;f0y*XrVQwQKXWzus+G
zUMP2INAKQA4&UxIU0bKIwo?AqX7#;&`p5c}_I7KZUvBhylj?&lM(=hSyxd{-`@`wi
zS8AV~j(EMp_~!lzpYCRE?QprXL-)dTy`zhh-XC%N{9xtLg&F_;{`vds<Fiu<-)<zX
zYmMB}XtAfw;NBklo7>WFZZ<kH!|CUz+nX!ZkIgW+usrzF-Krg}D$kF)f4>}beU;Uo
zZpCwxWWGJ<IWaH%{50(kX9~}6oj5g`=hv49yLv31T|e-8tIO+Mt_$-G4o-Etv(oI*
zHq*PyO<rwwe0{zD(j>*#*SbzDFnqsN?devRTU%_d%rJO+q2l%Bx|{Qj-`%WvyiDcw
zG4~U5HIMb`ygZ-V;l=sxu+z7P6}PrTURme=WSho|4d!>}${(BVbakcK)01g0ZXJBQ
zM(5Ew+r15950<OnovUzrmEohqaZk6JzrGau<ME=$C%o6U_<lU?b#hJjsU<o;U(CI~
zM(^Xfu=N$%A74HGbhqi(*9SYgbY2~FJhdYI%ZnZN_EpWw)IB>v{odZ<U$3?u>`=e3
zO6z2=+_?$LSJ$ck|Noz16yOa3#h)yU3=H!bbU>;=d4hrCGJ`#*j7LDiJbrsFp*adH
z?bC(B`ZPp#9AX#nk9ONKbD=;GkGYV7!^@y!txjGn2U3z)*d6AwMsnDlIJk&yp|gqJ
zmW~S#CLPdZcA68oFtL}}k>^{0#{$oU1&&>hUU(>R2C(teF(_Cl1f1-4?=*XOand3u
zb<=R38v+rXKC>)staKt<9(BvI`mf^A2|Co#pq8doDD*kqr@zVZkj23#j(&}HYCjGH
zSa`Bbbt_-8C-IQ#0T)|^4iTqAZGAk>!mLF%91bzfQtSxg-XqA`y;Qc3jg5uD8UW;y
Bf06(I
diff --git a/app/design/frontend/magento_demo/images/i_discount.gif b/app/design/frontend/magento_demo/images/i_discount.gif
deleted file mode 100644
index 46d8baecbcc17c8899d6545c1779d367bee92167..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1019
zcmeH`>rYZ~0EQ2FGHWYSOuLwaf~93yCTW)$frpEk8k%j@hs>6?`p~*;u2r*E4bw`~
z)ChE%mVu=rs0cPRyDD9_O189%l1l3FBq!i-IOkXX1N{ZPpWnUP^K7qJDvH~jxe!_i
zxvC(_iPAs&K%2<<2qCoyZQlR8m|?FJO)7cB4~wT6A)6CO_1clUV!~ztoqODk2r#7s
zy%6XGu8$hpyw6z^Nuq<E$MHl%92oyQwG*#iH*z(=Gx>$6-$*`=o34(futBd@0F1Ja
zr<kCH?|HP%-jL(H0}Y&k9c6*E%{V3xqV);nXdn6E4x!mLR4)Fd3I_(MSC<G{CF3s}
zrYob|cm1dO8mQV}sxEB&!Cw4HE?&fN++Ymk$By3SdA}Q{D!BMp%amd@^+xV8W`j=I
z*iG)xIUnpkGSQer>JumLiM%?Iqb8bAZ>5bgyf%i$2FFw)(2@N5Xb5N%1HFK56@s2D
zhZ^x{qKB?59+q>QB@ED$Nx4w0D}SVrO||dDRh)?%OlRGuu_7*bag27McEdGCufo<+
zKo6)Lt=U8qf)+E~rfjlVKy{>gbqHP-=%|jiT?qoFG_pnNX%ynMyy<#mxPa@d2y`l!
zVij!nCk<A@biGx$9>nyYfQhP*FSjJl&nDW9QpPmekWAtz-I;-wuj((95LS)7f(P0q
zWaD=C3{EoW|En$*w2Ns&sz)nERXhLy^gsVJz$Rb@1XV$iGp(6VKz>$e``l1T6Klu(
zbux2+-%~RbFni;q^-_MGS$HHqNRd!9`{t|zC)1a#2%lBDIci>5Cd(II&QVB|8xCV7
zp;3!64qLO>3%Vc%9Nq2n>iz94mCyZ>zUA?2)?f5ZH3(N0aN(5FNc%hfMHTP55|e7B
zg1Y$f;Ny~&KHdJT3mx7r7Qc6H;vDE9zgEs#7NZpT$=NX9l9Cj6TE=`P;so)|_vP|?
zb}>VluXPcUoOh*5&q9%&LxRNo6>x;^W!B|FGmC9LXxNPj{MUrRKa22@_vSok>mNxN
Blg0o5
diff --git a/app/design/frontend/magento_demo/images/i_folder-table.gif b/app/design/frontend/magento_demo/images/i_folder-table.gif
deleted file mode 100644
index 625773049e9925f9ec96a3cd680f308591631d9b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1039
zcmeH``%e-90LM?W#LTU^RxN+XtgK~guB>D_v$n)COU>3=tpeN9*3&gJmv%T(6Q`mW
zTB!NJsY5d#`B;{Ul8+vymB<P46iz|B1MW_gyYfHi59s^*=kvp7`!Y^N1k;%tfsFtz
z1jL_=+Q9^hB5^g_Jg=8&79l}M%doL{jEiCpT%Cz2?%|jjvzzUzN=$Kw(B<2v;>A+f
zuH=y`*b-c2n<>^vnB)ph%$7j)AvUOj(DP<nQ<gE~g)C{#8x7q3?B1&%GwsLIMKhEW
z%X_O8H1y3QxUQdPoyxkDJ6zDNpHSmY2lC>bhTmzRoCNaaz~Y!cRC3I@WbF8C92#x1
zS_~BFtoUfM%3nPBkV4E2T;&cq5T)p+u&qY`m4_}{x|IeLSEXGm7;~7!m@?VvKzk*%
zjZ(OIWDe|4d)HfGon*9(!0}mw3!~NOB!kf9Q6#yHj@so+Ct=8I)h(Fx)Qa8uD?YVG
zHq8wZ4<pF8BxL+{ai;<O$wnt1+m-yP$x_l`L4Q0g|1hr_xCH4Ds3Wwr2TrdVC$za%
zS$-Tx0yZda6o0LkTI2=v6?7OKr{5BM$A3SbX%5FV&p2WgN0Ko&l<~WXscpWz1lK}M
z^jE#}onva-)Wz?R(x#{<Nheej(%MyoOe8zZZIyjy1asKs34KF#5HCz!A8VJh6lDyH
zm3S`Atdqdgc|mgiVH>_oQ55ih|6E|llA8+v2!Z{p#OfyinhBtLY?5iBYJym;plWCK
zAeZe5C%%m2v9{z0A11o8*0Dul(W!~v><5K)(R<I|o#419_(Tg>qwi~z@?UzoBoBby
z9^mOs5i(!znBDGNx2Roz<$BP|FCgMN7}(GDV4O*7ykb3Gz&*HGDvabch^No2t)`(W
z_rls^8@8#&Pk`aO+rxrrIk7Bml}{l**rPfprY`udcWlcc9j)Z(dNi~vjuz$5K2a37
zp3nRS`g!_4D2vk`+_UE9zWZB2T`XtMqZ^-FSmC~+?b%06V2!I+*-2)f?e&hB)7g=w
QMFHm)L}zJi7Z)Jp5BO2W3;+NC
diff --git a/app/design/frontend/magento_demo/images/i_ma-info.gif b/app/design/frontend/magento_demo/images/i_ma-info.gif
deleted file mode 100644
index 855b00aa047a15cf76e39104a3dd0f46a405cbd9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 604
zcmV-i0;By$Nk%w1VGsZi0OoxFgoK1nPEJ%*R7^}vM@L8Z)UQiROJrnZV`F3e`}d=K
zRqD*EMMXt^etuO|Rc&o;gM))#UtgG*n0k78qN1W%Sy_F3eOg*tc0LSwQaA3pg2BPT
zw6U*hYHEgthUm|<Vq#+W%$$W(BymeBS65f|_V#yocavZ&_Ry#Ayo2`7rO~&W-LQfA
z`TG9-`)_Y=gjFW($)lccLFeb^<KyG*&8PSH`CMFF&U+~BxPE+2A9_C%&w@1e(5Q$>
z4`E?pmzS4mITBl2TdS+9mSHV(J`SX$q)kmtU0q#iJ{CzyNzZ;O_4V~$US6oBqkw>b
zeLf9+O(^Qqx^_GaU_BeovzA#o9G{nx?#iZ*kB{oJczAetN=izTS|!nbDsw&z&7pLT
zV>@zka;A1c{{H?@P*AL_tfzoor>Cd;`}=!RC}%biTQw2McrQ;+Pf}7+Q85*)rJ|*!
zrL(iMxVX51P#?;8E4H?_=*6F|fmoh(OjR-v`uX_(|Nj6000000A^8LW004aeEC2ui
z01yBW000NMfPI34goTE2J5W<WSB8TeQA9o`UsO(xeHmRCB1JGsaF}Z&dSPs8R(pJo
zIx8`FU@TR2E{<nd3n)DcHF=IL7BV3P1uA1(Hib+S1`;<43Ih@W6eWXXcLM=H6+?0Y
z9v}v2X@YYIMrCh8bQ>f`7Y#pVf=gNx5DiF50}clf4|22-<V8b-EE7yT2q5MK00$}T
q2$F)Mi5ma_o(O;dfC~d29|k3u(E&jK0t6TcI6xx-rk8yJ0RTJLyZqPy
diff --git a/app/design/frontend/magento_demo/images/i_ma-reviews.gif b/app/design/frontend/magento_demo/images/i_ma-reviews.gif
deleted file mode 100644
index 4ce27ddee89ffeb7ac9c6515f8e6d8c97131e7e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 614
zcmZ{hOGuLe0D%8J)G0n@8d;WU7-gxwQ#10>LyaC58G=SRHSA$!E%9JrtAmP=Vx%H=
z=wKI-1QUfshehDQ*=8FiPF*bfH<UKSwyFEd?tSO)^6_QmoJme8QVL4pN2OqOAUZKv
zSajiVW3)19V^U;V<ntsSo#-rB7BN_{IvF$LS!E3@PMmAly_lA1>1A}97vsDdWWvMO
zB`kInN!UEJnJ_ORt}<dkJBiKBPY-EN=pMoCWeW7a2~g2FNS7Y{GDA~Dm-E3y-wY-v
zE-+3rv_xw^jbG5388st1u!B~Q2gWQkbfa5gQ$EHyA`58jqPme8H(oF=Fl;BWn3i`8
z%yOrhRp>OKv(jOpqM4{7Rv>SHd06t&-iyx2pc97+!yM8Kj3V#96O_x~9NE>p{lt)n
z*1&{|gi@v#5MA`?FpKoeGyIE@Z&bY|q>%Q0lCEO=8}JX||HQcE5<#dG;@6e+CxYKd
zO{FF@PPIo<TUWcgRK72=z9}!`uKZwDQ~mJ+YN0&5P4hT3@ud9Py%SCOTLRABh>^)s
zwjZi5I8t~xOctw_NE43kjMAK!t3%?2+Y%vAx+^(ClY8OxO+R(;hQJ(!pMSAtV@a6W
zUltsF%hxYRTBf<UIsM!Yb*jSmdeEh`E6SXnasPBd?jw({dXS-bv-ja_Nt|-HCUe_;
tV^{j~Q`(nNlGyNwif7ra$@{}QdQ_^qmf%MXWlx2e%N@tIX8K5l)IXFTXV(A#
diff --git a/app/design/frontend/magento_demo/images/i_ma-tags.gif b/app/design/frontend/magento_demo/images/i_ma-tags.gif
deleted file mode 100644
index 61ce410b32a78891bec9ec3efe6fec0011fa3809..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 594
zcmc)H*=`b10D$2`3PMdyu|<t-<C50BDpoJLsA;vL#U-Ymc>o{5H^9_1mZ5TEZKK8-
zuS~p<3l<SU0un+f!#Zpdf(Qaq)`1K#oF3Ds@PC3Y`EM`CCZ`^Yff)QDfXCzMbUKYj
zBNmILQYng}3<kruG)kw_;cc$nZtL~>Kp@a;Hp}I5y<X2`GVdaoW!X?D<n#GRFMjSp
zZ^F1#Ds9l1<G7_Q>~_1CJ!o}{%`sds7}RJqEQel&@CzU2y6A5cxm>Q-G)^QEtyXJ=
z!W$vHLhTrhMyJzhx7(H89h#=A)v8XXqqn*B09yBV@(icdY72$J*I&r*_vdoCVzH?5
zVuoSNW^*>1O(v81eBNTQSglruZO7yBV39NbMv+Lw;c(PywQjc?jYcb#ipgZM*=%pa
z7$Jl)2LH9=Z9WeG0*vn}cAo&@XT`)|-&KhK3=v9Fc?_!6V!%_8eNZIet3@L(*CY@S
zgR?`Be{qu(d>j!BOv>R+=_dlH9}JwlG%SQ?WP3?)9rBKzA3c4*dS~tj(SK?hE)0+F
zKSaTv3xWQ7^RV~e;h*Pb;N2@{mG>8~Wpj_lj-2S(vyZ%d>qd6E`{l{}rb7Pk!|eM-
l`?6?hO)@1_r2Gnja8$lEm+F<Rs-(|aqKUEZ@}~gI`~wja79#)v
diff --git a/app/design/frontend/magento_demo/images/i_msg-error.gif b/app/design/frontend/magento_demo/images/i_msg-error.gif
deleted file mode 100644
index 9db2351303341d36bef063d1ca7a926be5981aac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1013
zcmZ?wbhEHb6krfw_};+qrXc!NPUO4dn9nr{uk)gQ?_K#kJ^VvO{QI)luT9C1;)7pg
zMtrP_|6G^&W6OePsbSwbv!5n~e!F?;*U5dKR?h#tY~ruG*S<6)J?(40Gri+(ZT=xI
z!>5~9e7bV(>xRWwQi2Zq7{8fR|E;U&Q&-WsSf4L5TRyIs|Ejn8O?Um{meP-tn_kvt
zT#a{oRT}eh>9lWKmYhxWei$3{Yv;-j)0^MyTK}Lp;n&T}Z)S9UIlSZ9mX$wlU-`9X
z#moHo$7#`z6GPtAr+=I~;pfg}PYWZSPi+0MsPkfCz~`&yzBXrmTsrehPsx+?n7esl
zXW~6SUOw}#Iq!RG_EA66*PXR*Cv|>Vv+(2emWM@AZ|6^a)=}~4;I^L=E8ne}eKFDV
zOsMs-DCg%nv3Cn%zi(c0EY$Aa%<dlxJ3h?sI~-*FV{zAywwxbZm;UT2dDUL~dHu47
zbNentIJ~G&|J0EBZo$;MHTgfbE&SS;^kvzkw^a!rSImCXm~$gH?9HT(=M!3fY+d$l
z&&KbY7kp_+|NsC0uh-8RM!~>^fZ|UUMh1ok1|5(SKzV|J;}QcSr;Nvj1V?V8O*WR3
zp0x5cH>fQsbUNPH%%xrTK*Qo8&s3%~1qX#q$}Ivq%(@*j0u>ya?CYg?IEof^u{2h{
z+cKw^QLUMo<3dfLVu4Gmp?Jz67X^lfF6j!EYZD)*AMl^Sz`^n$ae40nvD$kKq6v@v
z8(7))C_GfUz&lgOmy;nf`GI4LhI0bPl_2JxYpe#!KLQ*Uc1Sb|O^f*$5bh<%YN(OH
zaXC>zUQBb@f`CiTy`2`)MIuW!K5dq>2s4<VahP$DpqbBth8L3-avr(O%FM)I4FCc!
BP(A<v
diff --git a/app/design/frontend/magento_demo/images/i_msg-note.gif b/app/design/frontend/magento_demo/images/i_msg-note.gif
deleted file mode 100644
index c9cacc27ae2553a59993d9702953dc19c53c679b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1022
zcmeH`YfDpM0DzBkkdc+9Nk~LWQPC(861$LTZQW~8P@{xdX{KRXb|K7M>hiM8YL$aT
z(;O;dSXP!|qm@owTJu^?-R3sucJ%Ce?(bXp2l@p)pPx?;Jo^p^Vzwm)AwdXHi9i;^
zjaj(y8g97y2U5iJ=Mf3drISP2;u%o7bx-Cxb84R62IQFC?(huO0%{PgIZRr5AvGot
z@LBvj!28Lm7J%yjVYGj|G~1R285B2U64;2P;R=K405!~dyMZMRPzL=#2QfQ{s<J1t
z!>o13?265d`Z(4s9xaM;yo|BExyX9Euy-k5a~IKZ$k~+S(~C%->Ga-B?w&H-oQk!a
zC$QgI?RUsJy%Wu(a}?l{@$tLMi?<7p@Xwq&YFFKBYj4MT^2-$!tY^g4*NCZKj6dDw
z8EdjMXECmx66sAyn(%Su+_yV_z${_vg^UBTbExt#Y5u_aG>og2^$tK<Z-1L+e4SqT
zvc{>&VV$FpGBB<dVBIGc32l$U2;)s_g@AQ_Wn6WnMGAZ>(*CUEq1-**PR(@tObNtP
zHg3G`Gd5pNI#pe(bZQGm@_2w4hO~n)-=nD+!upwUe*)AbZfS#1e<NM|yL8(?;Z96b
z;+sezELTa_@RVNjJTF=P;4UDBXos40_d^y1l*uYx=ou2snEHU%1Zgu(*&XJew4<1u
ze9xd=)zx)0VU^w8O4BIvpMMsJptybrQi<^9t@$UAfH5R?AuC^BCilPfWu<FNhIn19
zD0*#o5MQQT9G(-1p6EKhX4wN?VQ%obrKO?K+_2W%DoO1sZUCa%EiHZ?$yuITjufhw
zBS@p{*Bb#RM6xJ1rM~KZZ_T<?*cx}TzCg7hbG0^69VuPH%TB$}5Wim>vZw4vT~&yo
z3_0+GdnY5(sViELaF(lyxTsP@A9SNDY(_pO+>aY*3rZ~Vi&-42ARi|S6u}#Xp^t+_
vt84jz`M1Ke{7+0vgmW43?oREDL?(+d_;vQBNs0@F0a35M&Q5atImnK`#|6+T
diff --git a/app/design/frontend/magento_demo/images/i_msg-success.gif b/app/design/frontend/magento_demo/images/i_msg-success.gif
deleted file mode 100644
index 611faffbc5f4254d54bd031f87470be3b32b28cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1024
zcmZ?wbhEHb6krfw_&$$e!nyi&ca}DvE8lo}{oEUqicVzw`TKkO!}VJquB$qen|~-V
zcYFA{>kHRkU$EuYvMo24?ti=^??}?h+tYof+unV3%edNL`kB_^T`}wLEXzBRXi{&O
zzcr#@e|Yv`uj1orDI0t;4|#05vLR%XN$b(lt=Bf}d%UgkU`om16u;SyTW_zp{q)wH
zb3M17-<)-&cka3FzyJOQZqwE5S5a$Lo_}fL-g_H&-r7)iFtc!H^!A4vG%8ip>Xg-r
zRML)k%sktbwKJgfL`K|7kIgri#%!_e+tZzYEM@Jz+0)K;<ZKI@cD(u8yGsQJlb7F^
z?6E=p?f2K6N6L;p-&L|b+N96WX@QaR0wcQ~t1b7})bGeF*b({o!@X&z+ZJA%8gs~I
z@%3p1$5ZpRM)dCJsy|g=*JV|9D(mCV4`nAaYj&lS?@8ErcloU+H~Y4BfBE(4-s@Z4
zCn~nwU3K%#m08EzgBCay?TlV{ed?@J?RCfV8_pCJ9!W0Q9#gn4e)Z+qt1r!d{PAA?
z*2qn_SJduF+j@V^!*{nUPiAYBso2f1o_&2{?e?^iLy<8DtPVWc*>I}ZdZF5k(`_Xu
zGHUmwN9{9jKUvwlFL&m}?#$z!$Di-AYq6Seq&x3u^2`f8GtRUZo(y^R<#GF=qWr^&
z|NsC0@%=l)C?FI9ia%Kx85rg<=ztW0@&p6NT?SiD8IKJK2W?%AWQ$mmI2D@bsd*Y5
zQFUO@wR5?k@gs%1ftiJcL!qIecaaqH#t#e)3XL<Edg@qKJ#yh<Z4|PQ@d#MZy_BQO
z>%vdwC6f;D6>&^doYXj($z`sIYmuRcLXUB&%>$1`EKcgo({l_aC{EyHGw3{4lJ)88
ziC#C}5)Kig#Ya2cv#j=>*rd?cYM#il?#G2=Eb|2Os$@PE9cS#)XS(il^UCovt=cta
z4xCA@&0UQuNe*6(C;ex-@^ihF2rzIFu_*rZ!qI3UQ+BgXTfj-hjvy%$fo5?Y4hCxg
DT8Vgm
diff --git a/app/design/frontend/magento_demo/images/i_notice.gif b/app/design/frontend/magento_demo/images/i_notice.gif
deleted file mode 100644
index 17733eff3fa73171ffbce8254fa0b368d940b74d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 802
zcmcJM|1Z>W9LHbp<2c`rJ9KE|IG-Fg*CdBp<VNMPaxvN}cSs^%65BPCyVFtJY2GV0
zj%dSL{6PBTSesKK>(*uKkgc;TvRP8X(&pli==sC*r|09B$1~|vB0pNp0e@Hmuv+i$
zSP=ktd(*!zqKF94>#rLOH%IkoVxpw96h52LI|HIpZRm86NPteKi9}#BNhOjfv$-lc
z8AviOKOag<<0>l?x3=ovOdua0;Br|@OLBtn)D0tofL1N4tc3RVOo4zH(xIfJV38<X
z-G~|+&j|!jRRxPnXnR}r(X`9D&dj2UiiF5W=<P!zBiAA${dBskn_H-_PeP@FuP?N<
zBPJ7mt)t~-g~d|c+bfnz;W>%;d?+j19k_XV!q`~R#wKcMMXjwF#l`S_6-7lIsIO09
zFd!=nl(k4I70k||?(R#gtIG8BL$!5?!Eh7`L-~Av8V%k~p@oGi7RzPV%zq90kL{j)
z2-~Z@Pr%+<4RS@z9XKAJ7N=}bso~^h3MF%2W3$SShp`J&)1mOjXJfHfXNSF(plKbR
zG`nL4LasQdUu~zoNQTGY=#hpa*pVc;I5B;^hJ)!&Q;5&TAx61}8$N0x6WSgbML5DT
z6^h-BPcdzU+^@A84<00i)E#PSAy+e)JL8h#T$r}NS&;Wp>B_F@HSshp*C{%Buq%h@
z?ArNIXfaX(U#VsW9429Ep5tSB%*zoQY<p}pJYhh9nwr3{1PF(3a8ZxcB;eVy)%ur7
zLBz2Pd%3uw`~)#qk|S<XvsNTL;Q-yjVKxM(oQ{8Q-xK)zHf2p?E0eQ5amC@g^VzAg
zA#_C>!s*l}kJdfVwbYau!%(Q3^{<mxGk7R&o%vL)VM}^&5iLd*)}Qw}kSH$^p9faR
z-R#f;y*O2M5Z`l~HH^IYVIJ)lHhpO6{P|@P&)daa(5-)?q&p3C<W_I2%swkHuL_hb
IkO9R0132Fp3;+NC
diff --git a/app/design/frontend/magento_demo/images/i_page1.gif b/app/design/frontend/magento_demo/images/i_page1.gif
deleted file mode 100644
index 443a8ddc02d095fc273695cac7988c2a06d63d59..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 253
zcmV<Z00RF<Nk%w1VGsZi0K^{v_V)Jm_4W7n_sY!7-QVBx^78xr{qOJZ^Yin`%ggcc
z@#^a8;Ns%+^z_2R!|Uto>FMd_=H~G5@a*jD!NS7f<KyS&=fuUu?d|RO`1tzz`uX|!
z`}_OH$;tfu{Qdv`A^8LW0018VEC2ui01yBW000Gg;8zV@X_kcXt>2JwUMy!+%6426
z?8*Uo7KiQA@d!2o0Yb9y02&v<s<^2N0ELIl)0ui;-%LO;Swy(rEk|59V9>;EYz;sZ
z;6=GdvjG6`dS6u;fHEA18X6gdU2%pSiIIhmhli7aF^vfum@yjzD+~!Iq#XkcA0Yrc
Ds*H@t
diff --git a/app/design/frontend/magento_demo/images/i_page2.gif b/app/design/frontend/magento_demo/images/i_page2.gif
deleted file mode 100644
index 9cb74dbf5677fc47fd0e7a1aa9c45e1fe5c27d8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 379
zcmV->0fhcXNk%w1VGsZi0M$JJ`uh6H%*^%m_1)j!_V)JF)YSX^{rC6x^z`)e^Yh^1
z;_B+^#>U3+@$taGz{tqRy1Kf_%geO1w8O*0xVX60)z!qs#o^=Q-QC^1yu7iovA({(
zy}iA!udnd%@aE>`uCA`^?CiqA!pFzQ!NS7M&d%4@*X`}?&(F`+*4Dzq!`a!{+uPf!
zs;cSf>B`E=&CSiz)6?(o@5{@}=jZ38rKR%n@~o_^`1ttw`T6_%`^U-2{QUg=|Nj60
z00000A^8LW002DzEC2ui01yBW000J<z}_XWD;kRfLvPs&;B>sG6h}%jcRGY%+mN|<
zG?lft;~jE`L&CG*5fGNavYc~3B%M}G%G=F(P=GiB4Iv93eSbV7A{!JE8Xz|(iDZ0H
zIyeLgHkD;OB`*vU4jdT}1fG|eIXO70JSj0KFf$Ji46lBcQaU;Sz`(E=EGs4z1<6pm
ZpR0Vk5joCMIRQ%w5l7lP0SY}q06QX>)@=X)
diff --git a/app/design/frontend/magento_demo/images/i_pager-next.gif b/app/design/frontend/magento_demo/images/i_pager-next.gif
deleted file mode 100644
index 5dff444a2b9db9b4a9457264c548ec1ff5d1c9d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 155
zcmZ?wbhEHbWMg1wI3mDMzv!A?^0w?r=lp68?Ys2u`Nx0PpZ>_5a?Ut?$F$A&E<gHq
z@73?7#n%pAc^_1NL@Qy-%g_HANCApJSr{1@1Q>Kcnm~3kuu3dQa8UW8;OS`h#$kre
S=_8CAHnclg`Es^0SOWlTr!mL?
diff --git a/app/design/frontend/magento_demo/images/i_pager-prev.gif b/app/design/frontend/magento_demo/images/i_pager-prev.gif
deleted file mode 100644
index 179871aff27b60ce027548bf73cd153fb7f2165f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 155
zcmZ?wbhEHbWMg1wI3mDMzv!A?^0w?r=lp68?Ys2u`Nx0PpZ>_5a?Ut?$F$A&E<gHq
z@73?7#n%pAc^_1NL@Qy-%g_HANCApJSr{1@1Q>Kcnm~3kuu3SXIJGH=aei_*@?p;z
SZG8uY?o%K80v@+8SOWlLGcw2k
diff --git a/app/design/frontend/magento_demo/images/i_print.gif b/app/design/frontend/magento_demo/images/i_print.gif
deleted file mode 100644
index 328751770212227cc1b28efabf8475d433eee910..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1035
zcmeH`TTfB}0DupQmt1X_nzq@}fsPq&X0GLILxibm-Y_?6z2N1+c^Q^&Lh2wewM4NA
znAVnaP1BmIh11Y^0p$pS1{f?OK@HI~1&_*sgSP%dk9|Mjd-%35?N;iIL^=k*0LKEr
zU@*Wij39_qDy7ru91f>MthCu|_Cr{`?k*P3?;bd3zB^Y}SH)uSj^ntbOIcZ2$zrj7
zLr$Ger`2kCBWr54dT|}eXjF(qBE#m1)9tCLsnKnEv{qzw3p#ST`uh5gj$!H7!}0NP
z{;)}Af|V8*Xm%}bAPWl%`w+YjIgLgmZ(up2QNH7FmX(#&4H_0KZj;HRwjx`5hlB5i
zhlYlhH$A<*y>7RAYu{NY0-Kte+S=O2G&bw*F_}!>gIrNjQ8*k<VRn7lK=Sw?gTavK
z57g^Ou~@kW!F)bHt9dpvGxK)KY=J;!w4H!vxT2zBZf>rssw(@LV&dD8Mx&v3DuhBI
zjYiY!^#-dWrxldRWV?_Hi^Zm-q*%5g0)b$#oe+t{T?p>!>B(xDWipxF-QCsI)jBJp
z`{{AHJ-Mx5OiWCFfB%jhmYd-Ek89~{8I=!mx!hlNm@ZVv<#H;On$tR0(4j08f<J5y
z9*@`1&`>H|85n$@&Xr3fl8LF=$;rvFu`!iO<#0Ia>+4TXPl5mZy8@9g8U+9XfbduO
z_X)t?21K4Y8();&m7H(v!hnLvPQRcFgl3d)dt~A{pKa0<juhe>UQVm+2&A4zhuwKS
z>b*A2zj=`f6rvR5$H6$!Cw3s)BDzd{S-xcF_<F}uFoAf~+b2CCclEiXAiw#JprZI@
z=EG@Hqj&qv(@T%0+Cx&j&<PLZBe5%2N<Rb#U?S4EskH~!F(fe?4FKVzG|Ffk5W&_}
zhsBxaLsJFVe50(Z?K!38b1;4>+KWRZD=Aa=DXFh0J`DUlwQK1Gr3~B=nBOe=C)Kh1
buU^BWL$P@YaS&>nZI2EJPR7XNB7men+c1pY
diff --git a/app/design/frontend/magento_demo/images/i_rss-big.png b/app/design/frontend/magento_demo/images/i_rss-big.png
deleted file mode 100644
index 4f6d5c1ab06fe5b13065565c4857ab22163621a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 791
zcmV+y1L*vTP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!sYygZRCwB?
zRbNO`Q5^oxy_@^PCe!|CN@N5j4n@(T$OsF1^C6;o3d<4EOJbl85g6oaXwX}vJ_wPo
zAyHzfMMi=yi$Jk7m>QIurMGSO-|5_Qw!6wqTnE1G-0yzB?|i>=&)rDm0<3X^p@|`Y
z?8Y)fb8#2#aad;F>bf>xMJY%!0+`9oSvhl|Cw&1W9PXZPB+HgzlXuS+U}Xw4n{0X%
zGNN$rE<$2D++i68i28+@Q4nt-2h~<Vzs+nes5fDKl~{(%K;xubbOLf&$QGH4&tWc%
zz?dHa*diN5<)6Y(7lza{f0IZ%j&L|CnxIeLhyL#FhDix~$~6CYRfcf-K=SrME~tjI
zvknrQ+lgb-P=~LADhq!#iw;ht43CztyP{N3183!BNQL`F7wQU<j~hXwQ)>-}-$D{C
z>l}{qOYk&I!d2e~XH5&>E@1oj3W@#(XybQ82RVMY>N-Isk6o7r50KtN4$}~1ekmNm
zbMTxUfb&2rBivBOZbN<9E=+yJJhfey!Y_tm1^s;=)YqNRKR(GEhw}4q*Y`4|7wW`4
z`<}%UPvLqA1!2TKAvt;r@rNNOU58*qMuli=8QX#@T$3DXvlnwP(|@<jkUrc-Y!=Fc
zlh9`#abZqXh&}PWoKJId@xgUk)^v`X$`E`P$2gp&r#TlNxRz<Z><s7hxfjB4d(f`6
zu%>0#;a0oYRof!AVQCiHRKE~!3yQs7d}HfG%0F6$bzv2Mp0tI=;$((T88~*;@@uLr
zWe%TV*t#{Z-fHhDxQ|`u^TgA3o7ZNZfg0jSS)3jjM||+6@ca6~)}>#)nBkWKR3`YJ
zK{N_kF~e5E<{#f_cZ^LGnw@Dbp~z!De_n!S%dp2!=&~QQ0|X^m1`MbE0)~DHFaU6f
VhUubKRILC2002ovPDHLkV1i6mV<rFq
diff --git a/app/design/frontend/magento_demo/images/i_rss.gif b/app/design/frontend/magento_demo/images/i_rss.gif
deleted file mode 100644
index 6c28e66b058d542781ede26a01b7fbbe3b5c9182..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 350
zcmZ?wbhEHb<YC}pxXQrrrPBV#rU^gyE&SRR^tsgXbFS`>l`Wr(&AxVqe$F@iTw(X6
z!uE5$`}f)TKX=Xf_x<ztW%WPS_kPMy`?0S3bDsX!-k3iRuYB!}{QKnQ_k|TdmN)!;
ze&_p~!p}t}-=<}JpI7o@L*KVqxu3GMJ{K7MSk?AzM$Xrss4rCxUt0tI{rLLt{fmF^
zo_{W}_yV-z&biO!)?ZuvzBGD&sdoC(;Q6K5=S!X2|Ns9Pa0A7kEMQ3;5DD@V16#Gj
zbS8z>Ta!#Aa@AxiqmJCt=}g)XVRqZAVS!TW`nH7RVABA@OkRZ_XLweItSB=&wMk1z
zee0sVDVZFMT4rogW{m9I-ja-JTH5N`5}Yhvnq~^ZW~zK<tUAmFV*H}wW`Y7{%p%4a
aCHm}~tV%-qdOW(urbgT>I<ngx8LR>PYLm49
diff --git a/app/design/frontend/magento_demo/images/i_search_criteria.gif b/app/design/frontend/magento_demo/images/i_search_criteria.gif
deleted file mode 100644
index 54513fee177c8d5f4c94d65517b8f45f2c953005..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 268
zcmZ?wbhEHb<YwStxXJ(m|AFA{n(KRKT<<k`u)g&Ewx)Yqn!exMd~0L#i*CK!{mwTh
zx?i0Z{BT|6)6I2{>f|0ZY2WO2e7iRP#j3*3TWek~%YM14<mKj;pR05KtuOg~_vn`m
zjsI>P_<!fvkJ~4KW`ixE6`}Z(g^__lfk6jk0mx4bY?=-e3Osb0_;_0iD-t={Iz8Ef
fFF0_>Jv{JWL5NP*iL{>+YNpL`P2b7G#9$2oI?P!)
diff --git a/app/design/frontend/magento_demo/images/i_shipping.gif b/app/design/frontend/magento_demo/images/i_shipping.gif
deleted file mode 100644
index ec109220aab15a1e694d1cc49468e0def56229e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 591
zcmV-V0<ir@Nk%w1VGsZi0OouEU|?WbSy{-CTx4Wq-rn9^TwF3|s@AZ1MMXu_oNeRD
zq0P<B*0F!iqGe7zB`G>l&7fm%Z*S6?YDR&@Rzxt@vxDW&s><B&(Wq`abF{vOPRpEK
z(3oh`t9a9_b3l2yO^(YdJ5s>Z?9Z2G#n|o4lw#n+nZSrqvB%-$%%<VSoz<>)QIyUn
zH&5ESjNH76*|vh)sej0ybhERw%${H-Hcs#M|I(^)F)=ac(XAv_oSVGiqrl?VvV6MH
z>gd(7-M*64u6x|QkW4xv-oKAWgTW{`P`rdoQa~!urfb-=e{5`QRYNYsj8;=YEKofr
zRGQE~b-+r9$hUt*!q@M(fJVcMRZTl1LwmzEZLjFlvFGyt)2VgLlwsMnhbUX1@b>>v
zJ}A_!dditt;l`NWz?H6cH$i&2&!lKXe!bwslr3SUztrnzkIPIsA$+vm+PH=4*S6ur
zo4nKRzt!&P*0a6R>q30HM0d5w+U`YwzW@LK|Ns900000000000A^8LW004XdEC2ui
z01yBW000N9fP8|3goTEOgfR&cBV7VbCr48<g$Z$WS~(Ue3MwXMg&aR*YD6z^N(Vqi
zdUt0id?kCcw6tkdbUb)`0&h?(AW{=pQEeY{TVMu!RthjZD>q3EGz=LRc{Xc&8gd67
z7-$e1V`5n(J8WNkRb@ghUKI>M9b5(?c0M|M6iiM?VV*d+GQ>@Y2S!@d5QJdB5*!f<
d02tIzqM!u<0L;ipU=T(C9TABfNpfT$06R(K7nT43
diff --git a/app/design/frontend/magento_demo/images/i_tag_add.gif b/app/design/frontend/magento_demo/images/i_tag_add.gif
deleted file mode 100644
index 7cfe38581811773e47ad7ad6708d46124c20656e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 621
zcmZ?wbhEHb6krfwcvi@8_UzdQ4<77!^!MwhSKmIrzV_z#qeqX<ojYfqEjjzz|Nd2#
z-RJ+mdhzhWg$tK1U1~n_Ke$I@-u3@ao;>N_lYaX2=}Bv9zI=RXo3AkA>i<obrha_)
z?EClc9cTac?n-eiQfc3raQN`ys`V@O?c0~o;St~Ib>P5(lK#|!=?Pyxz1+2HSLeC^
z=gywFeEA{}Jb(T?t<V3>tH<x&JpJ?M&x_B$w`|^g@7}$p86`f|h8s4l|NQy$tLG0o
z&;8r``0v@XXRf~a{o=)ojn^i%o&6i$uY2Xnm7P0xUcGvC&b9w9pWQ!s^2EE>PoIDO
zUB7wV+t*JnJlnPH%AEFH2}h3}z5M#OUB2SWmoGP7o^bs5@jG|!Jbn7~^5x52=l>l#
zbm;ZVM>lWYyng-q>({SmUH#v`JL}cgzrTL{YFwSTb?eriJ*mHc|K7WI@3brbw{6?j
zy({U~ty{Yu{@rqA>WnM@|Ni~^|NsAA-`_D14HSQ}FfuR{GU$MGfZ~LK{ZxaiGoLOm
zI|EB$S9e!Let*AEM^86jJ{vn@KbuJB6yAJ>LLJMre8y1bDeTKdw55%0@=X<1bu;uE
zNhe0~Gv$Y=ZY#8n%TMyM&WPvUpPjDJW#|!{AIP64$aywD#zm~lGr&HdRYu~LR!)9w
z%7a3mD7~l8-MrQHmCdBO4V1#4Hnm7xUdAb*$R&~Msray$Unr#EfTr<7CRMgfo;^Ds
yvh*G2;m|mm=%CynV(R~(W`%}PAD@hxLdl5>j82E9xtoN1XgJ{9YSGBRU=0B6R!q<U
diff --git a/app/design/frontend/magento_demo/images/i_tier.gif b/app/design/frontend/magento_demo/images/i_tier.gif
deleted file mode 100644
index b906a4c35ab6e3fe5358026474c3eb5d1be04536..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 160
zcmZ?wbhEHbWMSZAI3mc9-?y-`cV>0}%&HkHYi6vf=$)C>JwLB+;gVHr+GZ@Qn>ahI
zV@~yi*`GhZ|McnI;+3oS9y<8@*Ea^Df#OdVMg|5!1|5(Nkev>!vI#0~+|4GOChHzE
Za9nu2VWO5$SCz!UV4L0(Jz`7@)&P0MG8O;;
diff --git a/app/design/frontend/magento_demo/images/i_type_grid.gif b/app/design/frontend/magento_demo/images/i_type_grid.gif
deleted file mode 100644
index e52118209c2cf7cb54193c2cb23565dc64ae0e73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 105
zcmZ?wbhEHb6lM@+n8?78mzlY3+qVDz|1&T!DE?#tk_-$wAOa-Mz+~0aKl9Mr^E`9>
zg0f^Yey8$PF<#+Joy_>^)HM0vc^7{ixscr^n!8Q+)a8>b7PC8+Fvl4jTzW|}$U~Tw
G!5RP>T_xxM
diff --git a/app/design/frontend/magento_demo/images/i_type_list.gif b/app/design/frontend/magento_demo/images/i_type_list.gif
deleted file mode 100644
index 680d8cbdcc6f9e6d20c2fd548f43a03e3b3c858d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 99
zcmZ?wbhEHb6lM@+n8?78mzlY3+qOrK9x*U5DE?#tk_-$wAOa-Mz+}?XKl9Mr^E`9>
zg0l3_Fg3hu4Si5C>%d&Wm3>deyLi*HR#we7k*PO6y&|^AEP*>UM|0X~CI)K&AiyGV
diff --git a/app/design/frontend/magento_demo/images/magnifier_handle.gif b/app/design/frontend/magento_demo/images/magnifier_handle.gif
deleted file mode 100644
index cab1a4728c64a13501c48ce4cc667559f0d8ef43..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 209
zcmZ?wbhEHb<YW+II3mdK>C3lIpMb=VXV0FkTD5BG)Tv9CE?u~A;iXHLjvYI8<j9f9
zlP7=q@};Ar<L;A}|NsBL^Y{gjWFQ(S{$ycfU=U=`0qFqQ$-wHD&?4hosW35#$KP7w
z)FBQ(T?6mW76I>Vmd5gb;{H_QaChPi5vAV4i;Ql?c+K^BQM~JD+}hApW~a}JF*VF$
X7SK@P=(*PH=&__|X{(YD6N5DXvuRLr
diff --git a/app/design/frontend/magento_demo/images/map_popup_arrow.gif b/app/design/frontend/magento_demo/images/map_popup_arrow.gif
deleted file mode 100644
index 43600dcc5eed5e17d2140c9ce3e921d308e57d02..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 82
zcmZ?wbhEHb6lUOJn8?g<^Xa=)t5%&jae{$?LGdRGBLf37gAS0*0FrlLQl3-aXsyVw
kxW`G?Tst`;zu9-nSJSweHWzlbO3v)kmpD--Ai`h`0PemSJpcdz
diff --git a/app/design/frontend/magento_demo/images/media/404_callout1.jpg b/app/design/frontend/magento_demo/images/media/404_callout1.jpg
deleted file mode 100644
index 6a7d7ef477959b119100c5233c0c87c34a85cc09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 17781
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
vQ9^-({^Vo_SSqEck7Zq*
zNq6}z63V0*soFnRerqc}P9IbH7b2$@zOQmJ>Z-}WOX*BuTQ%(QXBR)Q#L?)K7|U?N
zIf;(hOOcr$K0@E{8{W#jE#=+n<urY!kZoB;hQtDh#P5@9LC$Ra>^k!L^tir(!8*3)
zD^=1j1+h0k<kIuS1X<Us*UOj_&9Ni>%a@mggO9Oxc;3`J6El7yle0@TC#;b%=Cqt#
zK)qX|SsYu35$UkSX@R7{#Vu7o#rSKzoo~uq7O8XmNB!p6Xhr7vi%Bu|Dr>X2h9l{P
z^(7K&6S5(9hB%J}y^@3?>>D}%m_d`Pr!}8Nw(Y5GvEKm3N#9D_y42Rbt=JwHmHG*z
z)~wpHaeMw9Yf4hGAMHr1C1K1hmXD#AiVZaXUBO{U`>&G3m`66Ug2{`1A4WifRZgST
z5Onu_zbK)&WcJ6fQ2*dM^F+~%<_w%$3nA8_kLlVkGl3knm7^O{p~13>j;o4ctk324
z4xc}JjP&z!n5eL8Mb$4_3ZzoOIKp}bmz4jZ?@p+%$ZFs*9=RmK2-ltj_Xh%4Uny0R
zy?3Wd+wSY<<VX(qxSS_K8loTQF~djAXe>Q$H1v%4(PfRiQ5EyFy4;H7fv}_9T-UYA
zEh}p)ZN6f+nHvk~(2yz}^iP3miyX-(td`O0qyuGYbj7HeBK>q<toN@l@R*8OClEz@
z`N-7V#S()z5yJGo?3ZUeA^a{bcN>W>pl%{FYJ99(igSVvu-CHmc9|;iFS6lFHL^6}
zvCuNf*C!X5VKx#^@<U1^V5@_Wurlb{4*#ie*I1W5t0Fv$4u7%KAH4JXoMR-aR#sQM
z$9MH2(fj=kz}m^u$};^0B8)d+T5>u_k`ipnPnxa_UiodoQ9dr2oV*On8LUJ4)ySy)
zNEP&~UA~$*i&Z79*uXM}Da+o`ch0{Lnr2BnGG{9K!O;qRtS|0Rl|k*PiK$y!<wLv^
zpfYojTX*^HPT7l#%K}pJMhP!NUYw@1C6jPK!j>kOid?OY6Bz!b1I-m^oAY$^jEAQ7
zRh&JbduFY;&Bxu$vKSjjb}Y=S)CB1K{pt1B8?+i0MWG~vq$0Q>TRy{_fJ#_nkjzJt
zb5k|~Z~i6Klv+lTjS->qW#j=r>AnXjVje}o8M>QUSoBBwF(ZC?$+)St9tvs?A6EIb
zXUY?KRmVJVjVer!e=vt9)TctLb6JRqAGxJP;WeB^vbNBeo^&~r_pO)UH}~8kHmAIW
zxuy9PC!zhgx2S2~k1!w9gZ+#MtQT&}xU|r3=LeZ7X$h$CHZ!?E_ptO`em9#16y<2>
z#v(p}HBXWT&%==c0P{myUargWd&nhzje^eVn>!s+=RDXr$(kx!`;iY51ee#p3%)cH
zAI)UtzB3)LFs~ASMJ!<|qpEXur!j1zxhg$Z=NhOe1dyq!Bn$9kMcvMi4J?i(U4Y$u
zy7v}_%#ROdr+j4;Z#u0OAwYSWhoe&j0xK0cghQ>&YKl>$AnG-Rq`%r>#q6|}{#$Ji
z>i<x0_Xv-2MJ9rfhzNkDNTn+hQ989eyW{hCIcT(CaANi={|{P1M;Kz~j|<YH#IncK
zFMlWB0KCZe3C_lkL#a&T;!eH8^17CZ1$SDWr`QRK&$wZI&@hu{($o-}Z3g)>%7h;E
z@E#WDfFNl?7NRiKq@a}GnLG~{H6))@hJqExtkf=AJ|h`_yrk681FSS}&#^#%?R!5O
zt#AVq%!I48Xfl*>T8+=k){UL?l9cyxZvcE%%cdbhf59Yf2~Onk;@B;41*l9QCI1p4
z8wtCnN`AbTRL>F9)M|9*F?gVmB*QyEQ}K=$78KIIE2Juq&}Y#V)?5Nm5k@2=Ra#il
zMq`9SDx%PHSQu}0oj=9nqY7Q}=uB04nN&N)nxda0W4FMoe>GA2Gdd%BhyA_>uEVc^
zUrqyZki62eQk;@SRU_JIR-^yvnpzIqX<ls6k%Lranw?JFNdb3j^Z0|m4t7><y@&QL
z_Fdv?WqiWEiK?2pSaD<yr^LHghg#}E{={IyVuDh3D6q9~^ps|7xHWIVm*XCxSAu-o
zi}&AmP?HPAfoglQu;}9O!3o)d*y(9uxmnY06<>iEJX>?Can<^AYG?3TPiPO!2RQYi
zJIH*&7+?S5lkcoIe3tCsBezW<Y~SMLg!e3LiSLpAHtrr-q{6a{B7c+yw4>|M`T49f
zyX<t?the;1UyWmBOkcz3QmBb$A#nCeL2I%_sIH%{OBS7*PYn#gZujMzkYr(V+c%dr
z)k`PyQ-}?WpzyxNiWAGhN6Y6qoG1ecrqH+got~QeOB!7;6uIUF)^gDcc^?FM+nGoG
zl#zc3{on#H(-_<tV`BmmWdHp$UOFxaY~;B|1*Dc2=IIERENFUk^J-uo3&=EjEB?Y5
zVz(_Y*6z%MMs+35xE9fPmDqkopM)9kS2wh|%@2v@xr336>i$Q5Ui92!-1r8NN*FXX
z<p{_yNnT68tTCUh#&`~JQXDt)wDX8xG%7+KPT{_f?dIrDK*gC7p+s)G_q``EGLYsl
zb^UU^YG5U;FnoTe1Inu#L7L1^sYHyx+Q@zqK53j(>eP*jpP(8!ZyOv>jZ!gR&7iWw
zXv^=;iH@;-&@y6b)13^v*UYnaAwCV*<=6T*=g*i$e$(7}l{kgoXIrJ{LT-%7|5p=x
zsoWD+q|lV2UplWKjpb#Y0CCIo!|&w!oxL1c&2?o$KZKHd=+V!5sFt_XI157m3Cwan
zzb-`2Kw$Li9S={V*x{hv!nUe5@C)#VG`Q!>g>hQft;L7N)6#1ztp{Vo76Ojk*aW_7
zV=?r9YJX%i<rGf+?cvsal3bm*Sio*+^mE+Aua)hfHHQoG!Ft$*=2Bh)Ub#}YPi+`v
z_>$+M$}ckgTONZ>Z0Smos_g`HjC^Udi{PsC(6$-8FiJ!RK(|s3mT>BF^`ZI4L%|P#
z{s;S0sm2Xv%WRunOH#PpT}Yv*e9>T+<NTP*mY>Yn#nNlWxpJ>dmWQ!rDQOC;;$`Aq
zIL@^e>U8C!4s6<Nr;AP5w_d__^%JfUk%{9$CTiag1|P-g;%q!H%HWiSxc4_@T%soW
zSJhisVI5tx26pFBnOoM}BMd-`1SYB(2tZZ2!X@1DAiM3=^=fwEu>P6AT!G6!#!hP-
z&lyT)Y1Q`bT8(PKVt6-J_9m6pw+^zD%1H=2X@W%a^*c!}$)$4|a!|xYvU#I}BN`V2
zxjoFU&co4nHQlqF9W5D=gGps21>7_Ywp3sE<y&0RoWhi|m#+<vYyp3Nusy|J63*Tx
zgy>A1i)cW3@=W#<nP|?^w=7lur4oLS%%v&FT1~L3dc~CxRNgv#b($AE{@4m#icFSt
zWKQ^9C@^|dfYv@6vf>q{%u5f=Md)zTZWKM>_w~b{Ci^oiI)H`jm6-9R*V0<Z!m^~3
zGF}-C()i4jz}w+oj3mYRU1NP_k4rN?m>_2f2Z=Zd^iRnB6PIk(_v)zl%un^ZRSb&J
z&;{jTvYpx-+s^|=whKvVaeN4ht$9pi0*iY?FeOi*!FMDEt78LpqU~JKFI_IXt<y$P
zNH0u<g^&YaTx`T}Z1Agci5Zn)X`dZsKFj+n$!3{;VT$J|DS4J_QcNG+p*#NOXs?Ph
z0~>;|YyWwSIxWF@i*&{}NFotaAiS)|!n|k{UT8+!e^uR(DJMz%8?(PDVDOV8?FDzs
zHRf&sk{UB#39Mfs2}K<KOugy@G1=KEf0!ZbO5afrxA;Fp|D9liNvSxfSqXdwnW}<v
z&>J8#o*M_$g#vv8<ow<Z>CV#XcKojwK8*gyYq_5T(iB>Nx#QOVj6I*=408M~q7Gj5
zDTY4z^$~<Ti<qv5bdVNitrN{$cpjZ9Pwze~NX44}wlF8bYezTTa(bj5_*>d=4Z7i)
zLf6_a@T}?~Yx%&xy?8MKrVJJ*pbkQ;8vdTxr6JF7u!rxH(#)=uG$-Y)kMijakcU1`
z{}ggm<KR*DhfGE6J|dumo0$F$AbnVZc>uRk=hZz{lj33$uJfbmu5>)(CsNt!S?ifZ
zREmlL{F;FQ*y<01p$hE)-6EQCD%<4p;0{S-tSF<wlt5uva_4GomhV3gNN8&|DTT>T
zX@Q8X(%8jU2^6-2YcIKLQ%j4zLWKc{DXK+Z=rRa23^YFfL$9HMT-RJnSmEN>#Of*z
zpQKVWS);Y;S5YD}g6t|uPL}7+H%G92d2=bBUw-ksv(u9fjU{}r6B9pXuz#pM&Qnp$
z+d5Al1mS|{|4a*onBbn`Bi<gR$SrcIalxoSyz9?gmwRYjg!m_Y^UBRLVM~hzqLUH~
z{MX3qe0(!|{03M$Cd|n`84=D5Dnl<iVIs#Q3KUf<Hj1m<fg0lAfK;#5pt=m_pwk(5
zKAg{`c$36)^VT5$&8~2#>{(JrbgwG3KyS*UDqETG!@%v8b}M1OWy3K3Kl<q1oLsgO
zgDJ4)jFJ~Mf6x@NG;3J;scMnsglU<=9u_UuKc%R#d}=H@9;>S3+&r^ycO}VUlDBbo
z=7x>0t;9m{2*5%u<39cZarKi5JJv#e3bab$5u7dVij-i>FcTFEPtHL7mxnAu&oa3z
zk$k;2K?n0#$&?0E0D7$Q?2HlWLkEf#L*y1KAuDygsr{FG?T3EmD_Nl5;gh-f`+l*G
z$|ED8&)>`pW5?p!V9k%z88x&F<uH=DOb-4ndm^t>8|!Y_EAV3cn8#Q>JISosi;<%2
z3~Iti85bw7t^1-%?5wxPH-5nTN#B%FOP(`zOR<F3GVpstl`6Uck~Qc(W*!Nbs_95z
z@6pV3!tnOhJ)%&V*;P>)4n;r<C!z76j_ztuZ$Y2F6qN)}c`fYAmx;DVbPAI;>_#Y4
z`l58|qQ8n?A{hTI&OUH?j|VyEkILfi!Pe1-vu?Gl`^D6+L`YjUA^tHjn89BZyekhm
zPdg6fVZ`zoc@TTsU#@X`Mm80;s$6|j$l@ZmRGRn@T3zX)*LRRCP4*X7I<EB_#o3%K
zVmJ~D_|8TJ#*oRkR6&MkWheU&VC>4Y8`C#Hem}`FLW$3&fn_+b&QPo(yjXRFmq<AQ
z$2|DBmOm!Q^r|Mue<4}HJ~<>s_I2W&EBP&YuEU<kOwk`e_XcS7k{Mh6lUSiaEt;6v
zP+{jck?r)7YD5ud)N@;tf^M{Kof9SUo4N<qsnZjQog-mtx~C8mxBNcLqmKh@t3YW^
zErt}WKtvpQS9^E25WX>rEKP0WbT39e%G|WD>&jnU>zZ(ZbMa5xgC9i!fwf#{rpqc%
zK_|u&Ad49$&%qU&O7*#?Mw>v^7WAQWo|^pYu=a>Q$`sohK-oy7ZDPZ(#Tp#-6)ERi
zSs%u2jmPF)__nPW4J&EhA-Ra@(pGA{Nb=ZD2ZnT3#dA9OE851kKdQ*_fQergHAmRL
zKOW?tio0T_Z{GlKfTG?<w8$}49^y9uu;`psUSGLAx3{_&i141xZlX!`pMpM~ka;$(
z8@vHVdy#~Oyn1}l<NsOuz5zbefcI0nM{O?Pc?95=<*R$X8V{x7pzOh%@m3y0r`a+G
z#jy(EiX4SSnc;9$#D`IZhL1iCA2^w=YV7(pebv#QjzV#TR-3qfcAkx`=}b(DO{vl;
zKL^6TPN63Z)@BZ>0GTA)h8mKq^07AMzk95j{CtcaD7IRPgYNJ!mr=+nh^fA48Ei`H
zZa8>cb0ylovaw(E>^_fjeKOV}|LA48RZvG><G@@TX%9ST{u{<%uN3O8ce~vGT)a}X
zzyk^n|K9kr$s1JMJy#tAu`=tTD66x!*>q?<o^9VA2#K@uF>h>-g9X0NRQbVn=KBwK
z8znX@08-||(esLLN98y5fEll2igA26^-a@~jBG<&-BGP%m=>_mvAsBq50<ZSl1ar_
zrG~tMJW!q%NCTlsElCD1VZ)@c(bR3lFM$XtQny<vZ?SNl;*^_gD!^Oiyj4M@#)qx`
z6)RBaPiL&%YRa|}cQRp!;*L#y{fzk+ri{pp5e;QKunwz4v^U+xuG)IjO8fRXaL4*a
zvNa*W5k_)XeZAf=H;AlaXM42sRLu8R7z=gd<-YoQo%F9(EMx2*_*dFyHT~!&e5QwZ
zEWW4CR3rzbt(&cU)+*Zbxi?R+n2tq-U-lgGf~4FK=4?nc90tlGGxi8D_uX@|kp
zT%DXopHzjW2nQc@=8a)n&QveAtfzM{hhKbly0!LmCgN|IGkc%~Pd==KSc^JbcSk_o
z?Msy_sNd@`-2CSFmW^@UV^Qpxli#=PrM%T~&wR&a#<_;}c^50+^W!KqOkUv|si57;
zAE=Dmp`=Qi=}r}Mb{~`EZxVHr%IN&#>Nmjj_>T%A?E}%84SyBppJj<wyfcOxL6@Ok
zniIFwXVs-6?w-uGI3eQw&6(H3&gX^!&{K!6Vc|$z(1k)l9lT$;%IMCdR|Z;qF7(4v
zausNPV}BG<Q{hYlvMexbo1MJAR*ZQ61-G8htj%SiDxs+KrN-e92^h&y>4^MI7POD`
z@|6si22#6{8l3iSOG!$7atNg^(VeqeI1+%1Y;jNX{l?%J2f?pz?NF2NKbxh}m`zXu
zRw*P~NWuu=Kca5`TkyF!TUCrs{)Mt5^uB^Gb@FG=WBve~##x={y(8kO>v|Z@zbIex
z)9@X@QI414`*Cd2W}r|fcJ^>56`Uc-*yA4a3vLMafKFd;<9bs#BXR;(Y<#2iWcHR<
z`_S2oKSw7K5krO4bSBSAj~<WVnjdP0@=9}W$aWF@2u_^bY)N{A>V=2!U1Ov6C?WOC
zH^mxHy{c4K)dMes#f2=*%l0Mq&O^bE&&bK*m|SUJmbF1izlW<L`WLP64X&^fpPWO?
z3%6<I?`R5o84CF4=LdwFPq7JR;VyKSNMAKbB}ODaQ#0s;gt*FM3|3NlH~wa4;U8JS
zYf%~-Bp)|c!MreKx--iU3CCp~DPTc&&W^hQd4#0CV`h+MJ(@oZ6xyzU3U0W3(aI~f
zuLANqoc2xtc@`m5yrd=8JYA7X;Ca(aGNiAg?jinE<8%$foD>z(2SzWk(~KgMf*FfW
zau&&s{gb=a+Z=xk6lO(j3ooho?-EQOIvPY6;Q)JG=J4}xa$eHyO7{kBZ={x1FT>@b
zp#Mrc*mT{1Q6E1#@4x>s<!GJ{f?)taC}GUk_4S)$f)bIMObrFKU8fJ=zJ{$XzX57=
z+6K?M(Ncq``NOt34nit=cd&&23KKd^>RlMm^^IVhX6Z73>=k4!-vH>mC#*SFeDvR%
zT~N!|a!go1t^3Hy!a7#DmNmGv)xbr&f|hoZhZ}qkq$0G;+jM-9<*K}D9rLm-HKZHO
zgY|J-h>(z7E46<3_>ZQ35o|3B@86JHBmH*5pKdhJ@okos*2cMVo8Zvjtlt%1U_vp*
zJBM1CR1}Yqd(BxD+dLe>Ayc@A!iD|0d~>_O>tFiyPYs9WHF@gt7*~lJ-&a9j$Hi7z
zZ+sbV?BVM>ir?O>7mZ`)bo_jFwg>$G5+a?Cbubl^A0^0~E8ybuC0_P0tXFlZ0xin(
zsPnR9L5p8y$7RxzUCRgrVupfrAkExVJb)WDJd(s+BJ}ZMgVwlI!aWY99DO1b4Ty@C
zHBNP_No=txM)O2kS`Cv#53!aQ;-2%q8fy&k)Jg(<-*5e8q}G8sk$@Nh*GlXTM^Pa9
zU9Y~5{M2KVX@4Wui5&_E*#?UX$ZL=)U9-X>#o5LS6QBEee~A1WmK1YR$#(f7Gsm|0
zSQOCFO-nM-9MZcjN4%h>#_e%5-(LnzWLww4Zda?UNeT*&IlgK|+@-TmBA4PeR6GWW
zH~5=;Vi`<K3q2~Yl%Wqlrku^gYLudpbhT)XPk$#t*69IYf;+~oZwyvEsXD{k1Dbmt
zgEQmDT5DfpsC4P1aA$dM3ok`+^-m^Ss?Wi$2;K?6%gILk%GKA??uJ5#(3X^rzSgDq
zUIN>0o^(MQUPMWLHueQ+1tlv|nGA=`@psPN%jE~xrvIj8h~(0>ooz|1OO4&<?O#@%
zDQ5+31#Nuwa(#-1#>#YAGubLe{?y4*Zf}4!J>h(|HSWZ%PD&rt%pcdg+j0;dyMZ#D
zv2yPQYZ5gBOqXOwrf9*yPhk!heM5&FANJ6IOa?fOP=s`Dw98M`|MIvI%-n1f8%sXq
zEE_2-n2xgYB;0Fg&a0lGu|3TXe(8jgYNx7aU`Lm^vV`XcTx6=xsn1n#D31u$R@oSL
zW@sxAs&&sX)R6qc_EDjTN5Fjf95|9=%Gtw~2qKoNA8kj7ln8v$lz#XSP&BH^tILbj
za;@Fa9PWcYnSO&FgASh5xI0%xcmsF@{~_N%9c8-zGMMM(A6?1JYw_C(^LpKVu3-nM
z7s8~9JsAN)sj2v${s5<E{0sHRtVoWGB0v3p5e&yRS2~e$2W3@U1k@nL*Z;`{j-kWc
zD_|l!Vw;?v!evG`ol(F?w;Kbos=He-MlibM(J^grFVi8=kjgso9hUk<TFnrOWDP|p
zSnL$>I+v5LM)TfP`E!#+eP2J$_ShR35Wl*jht9m7+4-}<MzWL$;gDY%kuKXVl2bLS
zxiuy_XsLeg&GbYwk1tw(1Y!?RJAapZs$s?5Py736;Xa$BMGgsfE#cazy`e=5$0+qm
zQKzlOv~SY~t|c>EEOi^MjWGNM3+%EIli+~gR@jRV9vI?-yDV*RW);cSR*au1t>ptN
zl#d-c`vy9GEUC+oXlh&OQ7{G>DG>0dCh|YqO**YX8gdMMWjRLdd0DbIUKjVB$&)`L
zWj?#H$Pyhp_Wp*Z8;#JTr0NlGtIFFJZXaM>j7mS~)-O9XFQVf)BPIR1-|}6Y%t=_~
zO|RuPrOpA9e~jN-G3_$MtcQ=>GiGBiJVy0B&sp+4eyQiGZvXDQ)k<}kqmZ~7EkW30
zD^H1i2A3z)NIKOQIb2+q<;hXYS;7^@6_I!|(v*H|sHP^aOG3AEd$HqWDxQvY3Eo~y
z_;A3<zH8DIYBAoglrBqLfvg{dFRyswZ7gdfvBAoxCHC?OP{c{d5npPZuCGQdFKFRw
ze?+t>bgU^EoxLH;mOeZpap}Z<!k(>I0mh6#$d<rL_F65#a5v&g=ZGVBmUbS?Q)r^y
zzVMw)3`XR?22eJ9jKroM9B4olya{m_1mA8>)8dltx;Kkh<it4NPZwoP(C#I2@SBRy
z1POhxmxL2{2h@P)eE2Grd%}jyjNQvyG1^a|Brc!hfGtRvndCsV?Fq>0!~=k~5h+fK
zq{>4|&c0F>m63~9Q9~`ry*x0HKiLa4QyCA7@u#Y;%Vxl1ZmyDhn%HX6G&awJ;wX$G
z)2>^{8U9{@yYX>~>}djS)N_Q{T|hmvoAi(OERZufw{T_L^c%qWtA|&_9lG}+!m0U`
z)<8f81*$Z#K~__ZpylX!Qm{oE>&nOy*c~xmP`*<AmD`d))x|36<hQOPgS-J5%2u5V
z+ln1ca2O5}^LjrXbIGmeorhX_R_z>&QLbf~OokeP@b`aHJDhTjq_ZuMCF=&?$lVN%
zzv6bEf3W0P+7K(K<sg_WXbdr?j~!7To#>zKBuds~5(hR`XO!U>f;p*y6^a)5NnlF8
zm>4p;p@QCOqSjv*+6KN0b}R=n(ZWqgx5`48oq`VIl6uvg=1Nmpjx{PmDgA5tu&+Iu
z#@yBSIE&2V7fILr_dD7*Nz_SO(otvf<&!ICd69U>3=-C%Z0qVP2!{mXr=6`@xIcS2
z=Jvi+c+ylQxpP7og`_J?DL7C%wYx3t^Fk(FQkTm)P?H^DmT744EBvBn#9oeVmfipX
zegC8h-L^V~>vNCLHKOrX-Cjy#UScs5dU#KKaB5xQVt&bZ(&ny_>yS{^$SJ4%av^<s
zuO?X`Myl$;Z?V`St|NLaChN)Miv{|{dK9Lce3>{)z>?hy*__C@?fEz-G@u->p47u-
zMyX`y%g<b)fF_j*o^c1NR3!=jaxLq#k<D77mv=^<nGfio?;Za<XG#naL#KM6-q&ed
z7V}&-u+bPE8a)#V^SNfcGjm;1#E=aZ&xnoS3Lq;i-gM+TP&nArDV6*9+`AiZ?+j`Y
zcryIVL|o`d4C>XVUs<UQxl%SZaMH!{F%r8xAF*cZT5W0@IEBC2-Qc)Vfo>Xl`U^p7
z7Q^FmzUnb*`3|O-uE;^vZ@uhIt?z6{#n&Uksh2w5zqBVTGc!-~x+^@9`NHi^nWg20
zY~5T>G}>vm!O`MU6#B3{<ypsb_qwJ{mV=RB<hi1%_=g$YPDZQAX!a^5rWcpW{>uB!
z6bYqD?qJ2~IWlq5i|tmpP2IROh;<%X1j0ZI!C0hw17vUxFAQUVW{sE%5RFGE$BjBh
zk?q22$zK6_7(vm<Ra2k##6w2i5=7~&6iP&rE&Pg?S&L@*5KkOU?5IhVj2?AONDZkf
zn-hq3U%91Um$Fc@E>XvjFQDZnp8jAp)IX4ulPO_lwkyan<D0EKH27@eiG#?VlCht4
zDcuw~LTT^H@1Bbk{an?eOHKR9!^erpn{X}p=!ITO3v{|`0@G$h1YzY*(f%hhVzWeP
zFQW|bWTFq4(|d7R<5usnLn^F@e&;(y@S-)X;!6wZHx;e^UMCj<b#RD}sh^a|DSdmp
zDs$|PaqtPQ$n+LnMCOL_ofH?FdJb5Wa?Pp=`IyIeep#7SGpD?6Mt=`cYt)IavZ(?B
zW31l*Lw{KKdAWtBgwX4V>V17GHRhd`lns`oNscL05~j`kk5ZeG8eQqz^8Yn=qjcjW
zeoyf?`ZIHSm1`h(rKj%fRhWj*A5sGG+;!A8ddb#F0AffJ0*c0*WKk0@H4J4vNnY?x
zP7E`@_4C1u{gs+q{EAa6%bhvWR(|Od^dmz%!Kt^1q<uEYParyd$;{DB)~sk`a7b7>
zzy7{DKR~Z2rmEEH5PmV7ZwrekZY`II5q#IHy~NB4QcVE2gNuz+%}zks=V*lMUCsM>
zOmUI4D�sR5EV>)M-Omw^K_$BsJ9sj#xm2{;$6C&I_g=`NMpr+;$wl43Ci-?v)Yr
zo(2r;h`4adWLs3E-PGJ30_LUG<A0s4*Hu_Hj~_%tja+ce1PcGAgkHSonyIUH3eTSL
zMaZJ{fto=tiN?G8PB)Cpn(qw5UY55lj!vQ5J4{TGN4kdH)X)+xD-%!TSmH|-Ac$T)
zyX?t$NZ6YSnETF4z|Lj<kyE30Aia(m_^qcaKhoiPPyGrHaR5#lP6({4w8}-?*xbGS
z{7-kN&fUTM9o;7mx0J7i(_=F1M;xt#NZtS-kz?~3y$i|q%NN|-Ws+mt6Q@kiuNSZ-
znaSI>pFbL+Xh)Oky%GoQL(Gmu5w!GK_N+`f;_YAPy5se$9C#Q7My)LQWDjOh54JB_
z4qk~r!ZYyl;$63hn$?d;1SKn^pD;|@mjL*+%1d0mDuGm{<IE3|&ZaKe&5kB2ET#r?
z>AAwJ0jbMv_*eK<b=}!iYCA{~9*X>ajXk0jg$3l#v(2IlHHR@XgGU20lRtA1My;Qj
z^T|p|x4!_Aba~z}7~q&s%guB<@|Kb5M;(e|sX#>1&=B02%Dt10u;4^$V|7R-|L7aw
zp}u@7<_)l*JcZPsy<l*$F#ApHe>_20=abp>CJ&CN=kGVb;&qwU0C*uZGFl2cN+@}i
z`d?qr()GiTNfkfKjm;K906vMg)hke)jkGkdI+vG=2MB#@Kr;B<9z~4V)$j#u{H@A`
zuN`yz)%e8pHZNnM4P$GQcTY%OIEHCp5Sy}on4n(zqz~dzhSQZEl>HI*`r<K$qUI?)
zt4D=AxRmJ`danUg&KAfHtl>FV+HP=m(XIdJPP^*S_ycw5G({@v(FircmGF1e?*oGN
z%&&WS8aoMFDHgSBC>Irk%&dIOsVWcVq%$5{tC$@L+YHc0aUeVZ<?z0e=@T`ACBl+@
z5I=1Ri21r#t9%56N+pnfBH#2RHy=<LP35^&B^iLcyX7}#xD@xffwC3Rl#Nld(^A<%
zzYrBCH4uM?QZG-3^g)w#%a@pe@jXAdYuJL+f{LmcJw0Bbqc8<=TYyb28lWMUA{Sz$
z|J@#)3B|aqhs5&XPghJpXorT6Fles11<+TlqPs#V1rT%7jABP`Fh8C)?wGdpC?NL8
zZpuGB(QwV!M6xJK+eg>O--@7#mE-wQfE2B+9H%3xV5WppJ3IU&`p-Jd_JPtv^KL(<
z;L{kRJ-x^oW;N$x@KfWNV1~InJfEB7QX{B)oY&C-5~;#vKYbaqjpwUH)KGMG)~oR<
zZF(LRQ6k5*=GOPidQ&geghR3Wv9+xpk3EBDT(@G#hFhFn*{SFq@4Z2)18f}`-|4lg
zJ(}EfM){Cd9B%=b2Xq@0IcaB&a}U%Q+(?mzHQA3SVKz)g_aVdi1)*1CTxH?G3$mZ)
z^wBiIr@KEYC`6Uh=Z<@w{Aq!dzBcNO{Bun5U|>Awc0S$-U64<|6^CF7tMip}{uk1n
zehbSb&9Ogn2EiIAU`y6}C{y2gi$JcaEgY)u)g*pm(?&_M21jA7+l}oX^y}?(deY+{
zNml5wo-M-ALSZORP=$gz4*<qD*|)Mejmyw%3qeKk<W!Vso`V)r|A?MG8^vIt+DL+J
zOc^2pT|`0+QHu;o8!<;=x8&>9l1N|Ce&$Yk_`|Evt*4oN$NMRQ8GGay@Z@{XMAw3g
zp{E)c{F6^E^asPicdrUL7-foA4plb$PUZ8yziKqAef6RTH(py82f7vG{W&CKJ-IVR
zyvR~pW`bV@jSvRoUMf}Fpi9NINZpvzTB<D_&cgZs;i6D$jes8qL+Z1@P2HA6sDw6Q
zE>k;>A*c0KEeT$Z>A|oFX^9xDG<@--?Vm4=ys$SIlZ=XJcBvHJSvBP+khDXsqcp-L
z$3v(Pa#mc|UDhg*E#Ht+l_V?HvS>*>P`6*Zv-V1eJOlgm9c5f}Z8Wu!dxV@_{PvmL
zy9>V>HMcl#Wk}}$Rg{uSz*!p1;XxQMh~pwC8LhTEMa}{R(#W#PNpx51mWCCXWL>#O
z^n$(u_Lx|k%L)IxxpJK&@BS}{i&v7o&J$bevZ_OxVcc+<z`AvAD1xQhSUR+;oA^`y
zBdzI$o;lQ2M*psePGBw~&k=j!(Tf?*)LGCL61b36JVXQ_{7T^0aijmSfy3(qDqPlS
zi&nD*)4kFs0g2S6rvzu3Ta2UhM41C38a~c^6IzLOXxa}44xV@~5r5c%f?#S(;f@S6
z+7?gJh0;AeeP4o6tkPuYii1W5fxkuhbLDB}*jTg7C09YZ>mQMQ?l?CZ0R{6b%yHlJ
zfunQ7u>|O5;$Detd`4<hbLm{~oEQr;Q&Q)taCjX08hhfpL5{+9Uy<7R?Mingz?LrS
za0WND#cWJfnHH^E5Zgy+Q{F`ccdOy|Lf-&l`RSmwA_D_lRNc?VW8CH(7oo!V;tQ#V
z^IBj4J+X*%f6);}bE?aX7-2ca@^|{VZ+PKG1ed7E9+NjN)MNG#(b3KCv!k&6x7SUs
zPlAXlTrz~As1~)<=GWk)N(t(E&@kDT@RIt$71BOm)lONrS`TfBy_@P?>hiX0t^EXm
zgtXAP&S_6+_cjX8`o-2yzcCh9PI@7ixc(d>X$LknfMNaKQpl?0>%oqgx#~gf8C=bJ
zxko&_i)ehB%!UNb=6iAWnYCI9{%?Nd>O?8)Nw}~4_4{Y*L#m$`r+-BYf6t?cN1Lv8
zTy`gjAYQzZeCivTYv+KPirFgk@51xj3CwiWfx~lk$D6Z(#LD+&8uNBCyNLrt?S_(-
zaz&G<xC?%bu$6tYc{$k|zG3B=q_N+O?xUsBA;U>iU^Iy!c?-I8;MbTqxCpN@1H&%s
z=@PE^0yD#|ZTwt>na0lA-axGYLV&<RYwO3=Rvs&*^}2fg@J{|AZXCl0wNsSks0ZH2
zc*3FTbnKGU<QflA<?)_)_+hjzwNgGpLQ(;nx^%~U&V^t46!RU4M6x_|?A{fZ$3kBI
zT10OE8A`deQdU;AUfIN4EjROA#Rh^2L&ll)>;6qW5DG}qFop&qnx_s~U9l)uDNrGL
z$m^?u=o`HB-}by$u!Vl>t3q7h!QytQr~we=E7A;qz4mJUn8u$t=WW@8Z)w|JVQZim
zsr-*%WGjQ~NF5&50i<%jHifd&%waUd6k}j#sPI=eXxqe`V~E>WQbXO@C5zN9x=<b*
zCxs6|r9zt>)9}~EGz$~{;p)P``D;X24Bu?SFG9MW?>4=i;tFdr#jQMNEi{ZP;Jym-
zJD{TQ-`DSLQwfp@njL*Fo8xf~JNr2j!w@vO5i_4}ZKv-Eo$Tc1$rC&^W4j?AW0fYN
z@uaTO+ZKusm`#33I7V7UBg`z#xvz$61Tz<7ijj=s_l)1=9dFHKP~zTcl(BB;4s_0K
zA4n7A`68XL@Y1KU6)%jSr27EAEYZl}a_5FokY|de+s+ANvTeeb@Cp+exW^G?@FdZS
zEM@KsjsV*&+xSx@={9_}A1W1bMTPCp$Z<486H0A@w`(O08+cu5Fb}#xFu0Ei&$!g~
z?K!wP3WL_EwY8GE#KZ+dD2wJPOYg)H*BoKCe8utf$`DH|T*ch8;3VTnIgqY)qF*~=
zsPW_1n7L-^<BVO3AhtTmAw>(haFI|b<qhIrB9d~oSig$qpJ;)%xC&prgPWB;tan1$
zllIN)C-{j#@!4vPkS*i~W1dzG5fdZt1@OYcwDu2gyzLC1;WbX1Jr-9m*?OK$gvU5P
z%6!6@(AdkEGvnc|@uMNXFlNz-djAaX+#1e=?b&2Yo+LW^tM(A9A+WWxbB(dh&~tEW
zYBzzgBI!?}))XVq`-c`6Az}RBj(NVqu!6elEy=ECKe3_i`1a~!scn3t&HPe@g(dGw
zZyGiDXD<>?tQ(>6BVIiM?}5QL4gSr3b$G|EekSluiqoM>>miBStC=ErMz|T7{-lT`
zhhT5C%qG!)R4cFPYWCn`?VhVE#I8R3xID=JX4nt!%2!;6BaTe2&ASR}l6W?}v`pmC
z3_Mg@YL`pBi8hQ_L+*T;(^2*X60?&Yi4}M0t=JBrPK>W{B*(_D_w^3Q+T=Gdsib!F
zhNVWp@T#e8xjR?ocy#e<U(A&lIKmQM&A8shOF1(}>tKIgcad2~@hft<6=p4RF^8h3
zZp29|0-hnf+kfW{d+l}Z*c2Mpij&!m0%C$rwlLXkD)KD<OjKm7YO*yuG%uhMBn$S`
z;gbeqFs|2P;3F1soL#8#%B-d^D)Gyw943#_eNF`78hDOk=`kv9o6tof)bo|qmkhYm
zSR~q;c<rZugEEeFR&Hz;)q=PdvQ?6~ed^1q61W@*=Y%>w)S81WIB_9Xobq#}hF%TC
zii2B326(7BAo|`JvF<Uq(ye5{7VZgenv^x4mtjIdB@LNjy@jUOU4_=-I{{Tf@;2PG
zH$WvnSz7AQXI_j`Z~n59pXQw;mE_mR;emhB2`y-Q9~x{V#3XPu04mu@KKHpR&7pIi
znhB0ZX&xi!YpN`XSijK4A>1ci(}UT5Qjbv;gB8oMDwz14JY|qXk7hxpxM7LdTWcmd
zULA)5o@MaShY_fu4d~OKDKEX~TxxSm3z(o^L7Ga+u9TNrD*3h`x-Pd#^Xx-JE`d15
z6tP9#PpZTa+pd%|CI1Z-SC)dbSZk`p;m;9Sdy72SVd&>E3f~%bB=RUzt0JkBy-dCf
z4DvK+=1MD;+p3FC<jyzxo{gtGm+#t-eeAueQf%VWI;urdWy32<`rGbn&htc4bZYC0
z{A_hdxMD!iT-?PP);6Wn2+Oxty0H@e1T^^d=xwX*j&Wy8Gx$z&^U*d^?#Q_DQ`o7L
zD;!}%A);{uUw_s`Np*z8jK~wfh&MdbNk26P*S%C`l^|c8-1!UWXo7RIY&Lv+5m~P&
z15jHn7`Ot9-Sv#-;Tkkolkb#O#M)oK51sgLmpRM+@8IHpc;1FV#n|)`iQGK!7m$3n
zojmDKd!ABDhJ2BFX=Ga{6^Fj=NAD>-IfXVCjUQ>^M(NBV+CkvH6TCaSsQE2TMYzF~
zOuf?cg4AV_#m8B!$$NSVMa_R`^<~-Gf6K4V>uTcHNQAzyya9T>nRRX{EZJKlu(oC6
z;Vtj?be8{gSCCLM#jFv<O`Li;s$_2(FzqWf5C%W`P$-0rwWyyycso~@zO<M~GB8If
zj9PIBuL)_}w|Ld|+4$?*lrmX_AX!)>TAE$s!qF#aQY31g#oQ%A7TDK*VPq9E3sY}O
zM7?M*&XC4g(QU?mBZ+qwp6p69+$xFA9X>T-7fp^oRDNPgxpw9-Uf@(3`NGZjNAAlR
z+AAvk?W)MfHvrE2pC0Jc?jUGQ2JId(2>Hyg#N`}u?)EHwh%RL%`wQC^E%Rh;SNisp
z(rKT-%r^%38rjut#%FwMjB$z(s!F&6=6?cFaI|lLjCM>?$jeYv3U{wpO{vC0@n(%r
z08CYTKuakRclDLpUROdCtNwxg8-S@L-`ie>mxzM!LzSwDWY`@J`l$qNAuQvuXiK<@
zP<}O@Bvf-|KGo6q4RCC-<M$=N+CnAL>${LFoO+~a;j-$KwDIcM?d78Z(?*fJEA<V~
zg{EW9dghcq7HPI$Afr!#)canJTR?_mCms;GM4ygi7dKE=IBk;|V0hQX(!66?GO(7I
zvqi09U;UHc%jhR?dnG5kGRHpZH9G-&_W`SMp}=*m_uH0WiMR2_8s-&O**ELT{QLv1
zmW-&+4oW(yC#v_u8D|1ok|7(~mzDC()-5wk^XDSh%?n?=dY{SN3N|R7c#1oVcn1cG
z87H$>8+NRAv9yFz3flmCXo~NpZ!Qv**^0V9XEN`|cbe54ok!QjwkO}C{H!Ljzv3c&
zS9zK^28L|K!7E@|G^7G72Wgr2Af`HdYg^3@SBg!O_dpQQV~_bX98AX9Ye0+^X>kL>
zNX@`Xm{#~zq1=&GJw<AJf2OVBu;8M6llPIW#@9P3NtlMowhOX%bA83<KJM$}aJwzl
zs~UzsME14UR>ysw2Pw`1D4V4F?sz-g!fI;M)wqI2BoeIR5xc~unOE|t<pE@}R3>me
zxW_-ry+GT^nHx-4eaO+5QL(?-TUNkph5!gU-)LH47#Wj15P{NQv24@0-kOZ%<5vuk
z{1TP~+w>WpjE+1>%}lpMa<2&MDKPgz!!QSF0gn(tq++s>q`Z1(kU_8`Xo+pG%3xgz
z!(Nd&n1_%Yw%i-DDSu<ORF>lQ-a;xgQ6469w=_@$HqPUcD1yQoAug^|{_5WO?Dyul
zf<+~*7lbB}^$k#7_qYkQUBe#w-`T+bss88+7KbN!kA&rErxmrr8VT)-P%Pmw<WL!Z
z-Wp52q9z{|P<~(_CLV1yCF0BaR!YGZ=O$;wKf95dJgv}}L8@_Dl9K~I{b3yA6sz9v
z9r*pS!ZT`&3`=wtOkakpZPLM6Vs6-<JEJcf*tR;3yx$vSS|0CloBb23(MkcrNsgAH
z_aT&<YM9>&t8^f7mkA8PjK*xvVrkSs<wJ50&HB6?SuXnq(DKPZZ=|gm0QS=dYwU$k
z8m`^zqL!qbb#@+f13NQ)@k4kO)1R$d@JBY)I~8Mg_~F|My&%KW83D^;<&IAp{m(Q3
z*mo5y8@1l|2;ylQh6&Dtn#=M%tUTutB({O`QyO?lZb6PzMot<m&5DNR`?hD?Mj3AT
z>JqkdNjm%c(BrVtv<jhAxBML^oh_K;TAJMH7a#z0>;D971e5!Og>qA?1Gl(Qs8G=j
zFqGe~F(@6WVZBF(wN$Cnxl~$Vz*0h*iu9Fsxcc;@pM@$8OSL@FZ9qx+BQlNy<weKR
ztCL(wb8({8!cLR=AS8cw)Y7^TgGRkh+QYQ*q@1)5OCq(9%w(W6>Y7)UZc|G^DIm7K
znE;RNiq3t(<b|&TBkfx+wMlium>gP5YAMiGzMPKo#<rFmeZ0g5&C?qo+GGLQ;VJ~D
z-YXu<wz~uGUXP+^%|<;V%6rCrpsxctwxk}OQy(h{BY^70CRA(Ri70S|{{Z%UD7qNz
zygkR>rAN9wxI6iW{>}W_jcW=gq`QKh8!X?5gfQSlfD_)!x>QN-Myg?e@W<QStz+CH
zaH+$mG2SXW=&R&LkrCA~DV4DLerBCXLdE#;3INauAkeD@J+BpMs7GTYeb)yqxD{}5
z@m7fB5I@Aq1*8wzD_6p#K-@|EWB4kwa+EQE9<$Wkd`$;xt=bUFFg(MYU3ltIJjpcz
z@%42%Ds8=lGf~W@I)JSdq>=^S^%g%{_YFIOIP?|rKxq<RP6ckeiVIhja!LbFmha)#
zlqtXsyOl(fMx&;*=}DC>A2Na5X^8B}c)m}#eJAXp;GN`B`99(FpR$$-c@(}+xP2$=
zrGj2XFO%*cN&6{amyvxRdR$lw_E?^OMHVV+9bpD<m-5}zQiB>gX!7Iuw(yq8*Kg7Q
zTD?%4#p0lCoX>FgsXw9_Pu{{gXS1w8SKuO$`qYTp`JUnLNz(rSq`Iop^MCALPqUSF
zw|s}=u{N7$Gu%Dut<iz7>8e2d+odP}0Lq(NwCZh~&v5slmN6Q~joo(~(mDRsbN=E~
z+c}=$??TBNd!-}HE5WI*rv&`oJw3Mk>Kp#85u<G8dxyPM5w&{!6s=a_;ZNH_{{Xa|
zO}Clu9`sGN-{q-S_N6!d>L~iO!ZyxlxO>rT4XJT;uT}p5H9!8;@B2%X+j*Yh?^lsO
zr+R<EJ-?T4{VTP*<UD=JwA(qJ;qOF9`@2sA;ryK-U!Szo57s9EwsSqh-l`-FCbQHk
zzi$Nnw9or#^xHX};qO(B4Y#cI6szC0BkiO<t#+GlGu%Dt*VA7hGwS=G-Twe4?+aLH
z>NTqNC$`m5y!`(Fr~al@3qkhyvHGF%kD7<^n$|Cq?jK3}D-DA5uObprb4l|-y*;{*
z;-a%x1Q|X@#Fpg!+1CCA#GcPDa<7G|!Jj&q<<hG^>gw`WSMKNFn{mI_zEQt0RB-x-
zOlHCZ7qPaExxMXwmyJmNr7_E=FCWPoJr%>%(dzz8f6Rj1#q+mP5Qxdf35fHiBArk#
zX+1qb<fMV~Y2$8ot~XUYv`@U#r2N|CGp1GO>7{!YY=4~cjd^f7RvLJpvZ>_t8mUnH
zts_oIo8<e4(tgSw2;N06lkOi$`zc_Tk$Y(^6uzm8bvZDB_j7F^DYZCOoqbi60+1Wm
eZ7EgNZbFFN8cl0n39hahX{X}n+1pMd1^?Lze@hbp
diff --git a/app/design/frontend/magento_demo/images/media/404_callout2.jpg b/app/design/frontend/magento_demo/images/media/404_callout2.jpg
deleted file mode 100644
index c238a86799d36c92bd90312015fa2bfe496aba02..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 23222
zcmb5UbwFEB(=eJ4+=@FCcXunrf;$9<;;zApv;_(j4HjIAySqzqE$&b(SdkVjP`UK?
zJkKll`~J9hbCR<&J7><w+034q{j>6C8-S;xpsWA@A^`w4PanXaQvklakF~Qu00=+^
z003G~sB-|WjE%dMEx@Ml2?PAI4hRDv{Z|7$^+3o^zaV53<i8CC73H6Xii(DYj)sPc
zfq{vMfr0(M8xRBnp&+ARprT^nU}0e4Ji~oz&z}85^zRe)zo7qp-G4!U`T+RofCykA
z2#60r!Uuxzfqw=8Gf(n?P=LTEIsemusAx#YDCig<%qKJw=zooYP>_&OfoOOD016Ta
zgo=TJjgAb$06v-HNf`htJ^>mXJt3crB|j0mwyX}rJaGz%zGsM)z+xgaR8E(%$%i>&
z7$d3Rlh=Z<0%`t^AXEQ$q59bd>*O#<iJ~9=lPn-4(33Hc(a=GE<$2<ZPk>B^!beXi
zqixBL>KXFHH8I}`N)$RLNBph6e|D!p;CoWTt{0;`i8mPS&l&(5^dvPt2p{kgaJpFO
zYNE*%=(#uHM7KAh?Xu*1?8~(P0TW3_h)sKy(9<(h$twhZek^qO$%1jZlnV>i^mgS5
z+j)^WKRbigAsqk7BmHf)<IxdllTvX<RMW2M+8cNtSJ-;1LAYA|f*KH5=os|xD__hu
zy(J90b=Fjrra4-BiSa2=sI)NenYZin|K^wW$s>2_i5<$F!t9SH7E@0wa*x(tVSIZ0
zKZ&1i{txm0>)zk8c^Zua!~u5-b3au6BgJ3&FCUu!j~o6E9;!Q{ul~x9^uM+JAJY8~
z;wNP_5^nyj%l}XDSpG}Ae;cXizs*7TzwP)f`#;40nB)JnXwUz$=zke0obEp!`j17Q
zjP#`7KMwl;s^EWl^M6aR|1Y(VjsNd1d@@qcUl;z%EB{y>g%D_S@|%?Ga!100|cR
z(@2j;k<MS0?~}Qyq(rhOBFOLVeP^Ck^1ie_d$}<AQjrOOn3$I)^PWL920V4h9Y8$l
zfVL;_`Bfe^D+pHw$a|beikk`KpFt%8rUsif0mA{7e=opDD+%Vmo<XG+L_$1~B7X{g
zA~DbWhf9D1i0dCNPlL93*y4Xd%Xw+;e}UbCNITNZ)PlhO=CCbA0sPC%JQL{g4?S)s
z;8SoM@AH6nLGL11(bQ9)*DvKh|4sbiXg`l?g>*pL%Ub2*UHmdfvPm}BFVf4Zw6ql-
z-s=V?*oX>RFezy0qBV$=A6y{<q(`FvSYH733@n`~=EN@lqFywK7SI$jP%c>TP}i{g
zB0$JzhQ|;6;Nm%MS}aC{55QK*_rs)hk<LA<)@Z!GQ{>G0sOuBT?%!C#me3Jg2eLWP
z?;D=nYzL_2A-E~S2R#NIZ~|L}LO33Ks@s-E77R#9GL;<1Vcj~Pz!3V_8xbt{ICUNs
zIwU68I=%g&3H4BPfrGC2WI)4oBX*{Ti302B(dLk#-KY+!gjkoEjI52m^d;{M4MVv;
zy6M%e<N4@*O`!41rB+7S7$he?D@L_n`Tg-B=xUXCp7{F|z<PV<+ZZS0%haK)ay+j)
zpjU=y$+YB2U%LHE`)Op9hBSw7-&ZfSp0TQ)Pqm$6r7niH8I5h|hs-m5#tR9X;1}<s
z&w#K-Os*;fbAG*?S|E95>(UvXGeS-F%W&j8BVA2Cr$Clk9w!p@yGps@VV>Y)=WYHt
zsbS|aSI}1cVv`Ho(bWiv*~55!q@Aux#@lHy%w~pJZz7!#u>XuXcy-^WR3$CGg=r#a
zn1wWe9f4)6Y>OTJ4EFhVVW<xvoR=_r1CAn$+j1;irZhHaNV;z}&w{JLam%GAf>*wm
z94%XhyvvMafju}VoaQ!@$JeU(S{<+9T+_QIM>9CAEgD+V<@`Y!)y>*VluueIo@Y;<
z6)n<<IM%s6C)6Y(a*H3opX)gQ6TPMpABg9XU>PzNj5|Z)1e&Ay)o_ksQiF?&uw~)0
zuE-Q|3BUxx<F&O!;gug^ZtNc6sJ%{f+}$p%>01HhTQb!lHge5x`R8Ky5`#APN`~1Q
zS&wz;y>*o^EwtqD9zfDI61h%3$Ca7XAir0|>{kZ?Hz6gM8F-wb>Uu=uhY=Y{vM^dk
zs*nh)%-}UDq+nC5ojgL;*AAekFG^p}(+o%(kR~Gu=H-b9HZ9I01ms~O1@k_`0ay?L
zLmW`XU*Q1KpGKc%7FtBG8t94kX&!KEeVakmnZXFw!U}%vfc(S;(ANZnvw{Fmc&)!2
zOtGYyQNGRm9Y&wvIn%sI`!)nPX?TAtKKDy);2Nrh>&XSodoc!4#(>>$wCUl2akSv#
zU(0B95{k7g@$sp{ky3+~kMBv0^UHD`e4xuFt*cs@rYF<ZqN&Vo-<R!Ne85cNr2qj?
zB!;96U6<7inJR|phqbH?6%noI&?OA-GsxNP92t3HX}G};Ps}%y(u2-v&z~~^UySfI
zt-j-H#&0&Mckx<LWrNc8717BmNqc>dRu9fk+OhlHvIboJBF<*Q?hXzd0~cAmQgQRG
za$6+CDSe-;RnCzumtJ7a`0Anzhkt>&6=f>V4AI%&psej$*%7@Y*4Tg^8D36sI!0?D
z7Npz0!}t!pSlY!sP&A7GbM3tBP?<teuwyJ>fT2WXC{!L|n9L9rmMvLOU}w^BfPYAn
z37p8g;=TO?2z2|Qq^Z&r4*697ERh2dxuLd5G;IqRk|W~BBT<tNLNZ3Wx`(nS=g=+q
zaV_lT9qQT<$>`ju$&Cz0sY^S+iVOW=d3P<o<APV>n)u~-{1l6LQ~g=pK2$OHxJVdO
z#Z={y(b;l)ZB`}kNP^e7uge{OUGKH6t9oXMtU3FbV;hYq<Ynl(IFzam({uf>nMeQ%
zVA}DB=m$@42~ToGeOZ^otJ}6dE7;ICUA1K>G%1;CEG!t;JNm98U&LZWVD(bEM;$P7
zK1)~%?Vb}_Gts83_wf?-_xz~G$b_ktpnPZ#DjXCK-(~g?MpNb4^PK3-434cDAqeoY
zy`#E#=1X-X5dMbGPD4rbYZwFKBMGM-FXGCfRUm}hH3O<ehU$mYUy#rcP%YXK_tCF<
z?rV*<Y*Z{QDJY8AOh79_*u0V@iVSOquMDSSftn|&F)(e#SbF#>cs`B4C_28gnB_~D
z6?@Dc^>vn>0p6B)490sNaf_gJzC4kZ<rX^5315=MmK7Fq6u>OAwwm&yI#CQfPYRz#
zo5pip+P>kRumKn-r2q`r0&I_;!iQ%bcJI9wDw)^iQ$$g30)F@>q+vXr{tmPL4RN*u
zxxu{uL>f%Mgf!V})V~lb%2Nnrrons)Jx@^&yXkL$;yu1U0{zACpCa-Y)Owpud%wQi
z2>{O9d^mM2e8`CS@_SPp`1u1ESaJDcLZV|reOgo5h<l^0?IQ=1;HVuUa?#JJa#*}X
z9yYFy5UCq@Ru~TCYnf9QwX_&J4stCRXCFv+>LlmzmBgJAO7c~UIn)LvsvY7&1neL5
zKpKei)q*?Ma5u-In}nEkm08VjXF*c#kU@WszSqx0Hw)c>=_oRwZSqD-X#?v!&)GL3
zS>bJ`S@_kxVnB)}dG91{vmA}l9l45f0~8WoZZERELt@ZJoM0CKQgDpKYU`rv0j`Lg
z_wJBjmaDd!PP-7wYVTQH?7FDZcy#fo1&Vr|ax0a9N1x^>@}twSS-$getW;7eTUYf*
za%@9C?F$0B`PT_)D6n>%^b%s2HPtT$X~kPoA2XDBi4@9)&-2$tn*1OFuB%e_=eP79
zh22IKV>sm%`Qn;FVDqkdFK$2`zdty=*<JeC!>KTDAYfILSu^CvTCyLBia|VwULl`0
z3XJ#xb%QZ&<}q@B)LdLS<1-@bT=!ke#_s(H8(i?UZ3zVq<<*7s==8;YNLv+XA<y@P
zL>$Wo4}l$8GCsXn7(@SRCb;Pg4D(@#M$8?LTS3N|_*FTfjM^M2zKqC-dsfu!S3bY+
zBP^|l6;~@tMl@JZ_v_axc{uAC_G2qlG0Q!3pYvkOu(jC@NqSOc4MaX$Rp+d?YerpN
z6l3L{e`_>FYU!qNTPlBgwvlMF#9~iB<Q6n!COsrS==&3nZ0&QWa{en|6IQDlqmk8-
zn_x&aL5=24(GpOOla7lh^ux%@J6NM<{6f>?grwYkou(;7GNr2N_SFo7QmC$#WQLX6
zj*Vdzgp8S(kwch(P6<G#C3CxRz;^wT-(m0$yjs_4o4aMqqnRS({Nkg7cL+IoJ9?&t
z`E-NPSR#J}n2&X*%NRsgo~c~AHh?+)Wx?4~B8gt?QpaVD+IBsPstAov4MNG9_>F){
zT8;`eIFV2(idjC1PDhzO1U=*F%?D&DokxW7+FJ|b0~laA`?UDe!itbwK>FL&LZv1G
z{ulZ$kXG=tEd0Nsd5`jh>>e((?TwQ(4Tl7D_EpGFs+hkp*6S$M5a3*ArT0l{)7_~_
zhRj36vbwaS#`Ri1trm~j-sG33J%95;C;jzKcOx~a8?E(QHyPFD+T?M3tv=JYPUXpO
zQnvJ)vC6t%U<FM>a}&+J-V}#Qca|m+p5U$IiVXndae+(R-q;{RfuNioXT6(85{a%>
zx<-l@Ur5z&$f13vHClDGv|9L#x`!yI(;5<3s~flgB+KubAw9-jpEmYJ5!<`(C7hEf
zGn*Y-+q~a>su~}_=M(;f)9MgVqfNEJsN8fo&}SUsxJm#~-W~~>kQcJLxp+ls-zj0e
zzW*BFf|)MC`uwmj)VSvDNo0@CY?ja$a{S(lbBroILqoO-=AVT-Cu!BAIkIO6lb`&)
zr)*bQB8547oLp8Y429X)Oe>3$7hHa&EM#)oXP*}hLuQ*KiMzww6qC0v;MG&>HbdXt
z{a^0Pnjl{P<DYk*f@AA`Rs6dC1Bmaq2Gxu`TbYo%VSIOVJcAqCgj%WTmyja!Mkb}<
zx<uol&O85W1nJ`TmU5-;`v_zd8^TzdJhJmgHk{t5WS}q;vlG(m(B7)fByK4yW`sqj
z7@0h`Jf_dQy48><ou2wyWVVX;{J3igF93~phNh&a3Yrmx<KLff*&VZJD;T3iDpmgy
zBMn(J>sQ`ml<im8v6mK2qeyd_>)4R2sYnnb(ZWNK0w%qJOs74MMt++OhmF1%ZdueV
zfC$YMcoMhj)aFichLy?W+sHlj9B)UYj9f$`SWQ<%emjUr3tJnzc)cMQ#^d%aK*Dm}
zfNPfHo!qEElPT>SREloT?_$=wBbzZRMvsU;TaFCPTbdUsThTirkLH;VkNRFxn7N!*
zb=kF>9ER(nsY-)V?Ih|>q!3}5mdQK20|^JL)xh(SU}&M(`ZO;78hfi-qroMYNf|gN
zIL2lYOax?GM2ak-k)muuIdxrhR_#fTjcT_lW~`p~I7h#A$20R~S?@SzoVKQyK&t^t
zTQm4P)3meRm>77af8C`jB5!r64KD<*7ai*Y(L)y1b@3{whWjuXBIAIkyN~smCZ(O5
zTUzR_vg`%yW>`wijGlU6>sGDMqj8VmLA?kyIpKlewAA2l@5(X*3Fa_mbsk%-4bAAa
zT5=`e4$(SDF4$UjUQepPrD`dV+T*0_xDGL!K6Y=@Zi*NQ*HDg*HM`^+K)7d;6zMAf
zA=7EufJ5dxCg6vK7c!1EeX1|w(K9*|-|Jtjt$i*fmyMo+_$KR$3Y1zW3igek^1TN=
zM?(D;4%kWPb{Wk$nlRS62#ak$=zF2=CXwLs{w^06q?=t)`C$eVsVs2(b6Zg{UG-xP
zg|9hKgXq*W@L<}MUlf<zv?yxYI}SGW4HKBV457_n^6%*>a{Y=+vfKuLZ_od*6EBWC
zu9qZ6Y`QwCADunSCyE)5$2+yBMPOpDZq_XGXrL@=g`lrlU9$%jdBaQ*S|3;u1d*=5
zJavUViG#5Oj*$2+y5}i{p-oV(eM(jgZqL4`=k)JG2IT<2buAHYQh)O=%{ceMRV(E|
z{7gC>^+DY~C5x})KD)}j?@w(jwE84ko-1wE3C0ByKhzsUdW@nSjHEWam3OJ0mM@JW
z5+xUyFQ(k|!=&$M+LP&J2xwJTwKRNgV9H1O+*zc07Ve^h7pEmYBmuRu^vT|V%ShE4
zE`l1?$83pfYnnBWE<D>&=MX0?&MQC85cOXO=Ck%M4z4_Sg*9qS(ohl|&HNaP)Uz*7
zmE{_u0_l^itnsZ2Qy4heq8_sQjenR_>B>;m>e>EE5%GJazQ21g6%TsO4j$5u*)(_3
zpG$ID;Bfx^z0nO#J9Ur461}iK>+QYp_L&jmWGQ;F39S{muZ87sR7ZU~f&7CIxm!h-
z8}9Y~=l&1OM1h<1WBP><*Lp`YY`9%s$;0p7sykQwcuVV%5h)!{NFQeYE5?FSLbwV*
zwgd$+Wi<5BSFNrla=3Z%=OXRsYR7BQdroM@WUZ>>CD)5P+#ipjG)`Q~fl%e*$<bon
zuqG2YRibVQ*|*X1XUQVtP8%>^rHS-bk-n;rxGw%WY-{zM-wRs5XfU8|E{w!qAfIOC
zPQJ5K?~RjeqBCuC`UcA^fF^1YHfwEXh7qDNQTci;#Zt!Ph^Q!SjIf(#ll~?+l(4ih
zd{-H2H#z7NU%<fy{dRSqJb2sWqeF4obsi|o^gfZPCCY&F`(RGSHqwcZ*3`ExKBWc~
zmaGKm`Ds<XAG6K$kIY<+FIja1(Ch0JQBRxE{f8LDkBs7Dzti@b(#TD}N<U2fhgN55
z{x=*>%&S*B*$Vn%$m3&$;q&Z=9L0$*bHD_(A=3RJeFEr9op;Iv+znuTZT(h}@s#`C
zXMEkHCH0#xk3YiWQmb8a#7J{SW8B%r#7tX!J+@VrvR7+j><IP*q2GbRQ!GU=C=;;`
zJz`q+BaajkNZ+v0XV3XqC4c(d@MF<f5NTl*v{*OdeLRzf6Grl39yT19ToP=WBZy>^
zN6G}q5O=_ly6`U-d6A4`VM3A}vdbt$;i@zOjZB*^S|vgO%P{<ipz*|MLve89?+}Kj
zQU-A){v2U%mfeeNHu2S!JUumLW>svFSE(#j&0bg0``MVjI_+5_R%1lt+oWXVN!HT7
zZ(K0Y_)RyEF&<wYV^Lnf4L<z65vr%5ry4a|+nRov6>xk%ZO{N)#~b4FaI25RfDfH4
z>B%2BrJr<_6w~hvI@PYepxfwl`!(UG0T=5PV;55k?N#K%F*rMDp1RktQxr>M=&=>|
z-^l9uxtM-m{l2pC{D70RBIb2gsPt~bxAC`}xOuxilvxQuFs;o>vW8Qin#+{W1KnvN
zlkTuyXH!EF<mxd&GvBait6q78co3m0vz+%{oW7my4Yhungzt0pt`W9ctXu_iqk%$k
zZTV4`fYlhtopEuaPLFm1cM9M5b~M>|S~Y_7SSL-ee`4O#d+Dt)g*go(_HC8kgiznq
zmpm~&Wj*ysst8P-DU$=<THTZ_h{VNar(sOBxW}~rs;&wmTFct4r2G`%ogpn_m6l$K
zw>ojPY!IHj3_G8PO%ETbx?9$XakwlHG6BgfXl{N#yu+NqouGPYRrLq3koX5sSSl_4
zlq;jU4TX1k8_zDiq4q2Bb6tdLOmAp5wdm0E4IHheE(2o=wY_LFUgKy)N280P#HxjK
znJyr|`MtRnz{QWJ$vFW#XByeu=5$!)a1!%pl-*T^z#*B3^89&799Cdrf@Ge!2{_tI
zKUbzi9D{kI^*xP`^l|0+sq>=k7-h|o?=hCn2S?OGJEY||3)Ik_Rk6(GF*<u9bLL)(
zH(ls(Vq`3@ec%C<q`#Wl&QWVnk5(c^YC=<DY&Y~(B+HSJ(lBQ|hvP^)r_{P_&3?-y
zEpfk|yS%AMb2eFZ?omfKD5Nq(qy;r_ulKN9=qBu&^731EMtqM+&**cXc0}w*<cohT
zzU6w)<FhJ!>Vgf+-0;#bsPki$bmxTRD%cuzsP<@+biI<)YuxrCbSMu8`~h_3Td8_}
z4I8K?_}IbKZ8<->(v564yy(F|Qoxm6bRr}VB*+v3KW8^EnnYfqk{0e8#5Q=O3(TbK
z@={$I@b}(SI_l0RbXUveQ{1d^go{NYSeL07V#1Tni2A^Egoj93)zZc%=21@UWr~W9
zKJj$!V`_I^&V-UXaL0^-T`)N_H?^Xe9=fb=b5=<`KdYq7l(fZp4o_m2;Gq`c?BFhC
zK!kf~IxM{bO=Dv%Sl(!|Xpc|FDFbsyzZ^4MYb>e(&+h{_5$d5|LW8U5reG6&K0`6r
zJ1^#BcpYA|YdA}KYl2K?FukUg32lX)jD;ZrpHD8x%MJt$DZS$=FK<PD^xrgXEp`!o
zBRenJCb-sTnD5gXr`4q+8ONbF-tfI5TLTvp1t%RbmBEf=G~aWMeI6%!!Sn3xI#1E+
zn2|77v(1U%wMyKQ$*n25l7yAd1iX^ihJe2>BTQG+hIa;^daC51J@C$J8LQ%K{{HI3
zV!+7Q$HnArtw&Q#1j)n?M3H%mn=IK0<Js(z37;Hx`N7GB7GaRQ;8eGtUuv^`)vA}%
zbm@iwPt$un4Ah+~T8m3jf(X^6F~$n@7v@lyh1ggcO(qDqsj9gp)ai}5-m6SSI-Rf7
z-WOafJ0B1v<V6{ecBbvxwM90+zwWn*Wf6mKNlgytksH`%3E*BCoTrie+9dW@I5`{h
zbmU8H%H6<+4(s!w{v=gb+0>hinadt4>W!rJq-!JzKI+1HZ2VOkmHNi9HKqr{sR%Iy
zkAzdUCUek=)-lWUp+kaJ0JwdtabSV$C5}Y)CSl%H%0p`#pDF_;1BA-Sg=ew$E%AI=
zk~`7UKg0{i90`x4iQFx85;c}gNw>33l6!3>4ZRdv0JU6HEO|o~b{~}lZ}BAbvb|OA
z(tB-{;wf#qYPb2lr7e--maCoZr+MQStn@0c&5HZXF3JMOGe&^Wb@)eyvIb$VmNeAj
z%_@Qp0v}9&(wP|-Z2>)fM$1uVzELRIPL!fmM#EV(!ZhMjJFdN8yvn8Nfx^}+p6e^3
zFSi;KZdlCVcp6ggW2V?t`|6V%z0;lbZ}$;#DfV0HrCioruAi~JsO7pgo1vGiQ^<)I
zR$8ai#9&4pb%Lt=xL~3p?jR)%H4cMkB)+55;MPhW+pZcblY2MLR<jA5nJJgVjkcBJ
zqBO4tMf0Wh@k8;Y-?pt8YK980Z00Gg`rp~B4(Anzv#g{jtlxyakMf}wAEW80EXZqQ
zRx2IElye;{W!=$gk^DH@NIlyw75$S`{G^s=N7#S?#gEO)NPw!h-1cpAtc!l@Ni)95
zqVb{><Ehu{3{;QWbdoEbi+TV1cC0kDvob?csbY`)eoj6>=G4`<M&>+D;NWvS)o%Ez
zw5^SXM!^JO_Tk`gDa(-k1)ef|O#EfZSX^8@yCYSOy!-sgV$I&<dQh*B_sqBS`8aiO
z`2L_3W3GfFh6RDeSR<(neYP>#OScuhD|g()aU`n)s(as?N(^59>O`(roFa|~&0^K}
z)dIs?w?jcZ-H|cO5TTaof=jV4L<TG=UvSjJW)E<-DV?}>6|a)>S#ff@Vub372tq4S
z#{ut!jg+uh%lY9@)OjMY;o6qAbplncY2)8mlD!;(8XODr5==i<##dHdwMna&t}6V$
zd~5D`i9XUw)FDLgd!Csb)8RsSau8#VISKuZa%_EeR6rRSWLlBQmNAhC<crI)K(I*?
z7sKwoXzq!hQ`NeXdy%ZH-}l%Ds=6HPo@vPuxktRF4^U=evb|EiH!(1rzL@fipw!i^
zGATH88#Jm|xz#hPckhn<;JsR&;(M&`G8!G)k%uWHzTp!~FOl6Iut<7*SzjC=@<F}I
zm7<qm?aN)zwD7X$x(Jm+_G9I8P_5!9%%@sD@FcZWvCzeSmswrDIcF4nycOR+B!Q)`
z>^r(i5LIC5vW80)rZuH!m=BK@C&1@FyKJ%4U;S}%3yvPHjyd=l`{SK+$i%7tX|!q1
zw0)^jS+`&<{{+vF#!_R(^sl71^zur<nYL``vcY)4WB>pZfMS*%U9D1goWE@;O&;L;
zlqbxA13zet0|x$8)iTcnDLy_-H#Q1}ivJL#Pr4%6pR;|hS1f|l5U-=%5zPTF*(AsU
z9Di!QEKoL)4f0QAf#4#W->r*1#&vzbq4RD9(ha;W79VC)v$|)l5le?^kNcMA5L9Y;
zu9LoL|4NSfqHCH;P^mm2oZGzSVrw~eJ@@Fm>E-K~N@vs8X3I$ERFp_Rb*T`-D3|Jn
z4QQe(Z&i)ubfzPJ%`>T(o*a6u;UFm4R7}6T*H4f0@>fy2Yc^dbUl)q5)#D(-O5B0j
zqQxyv>@H+*IGgTbLn<?ulKX2hDjn)QlH4Y5nK~Tv=xes{aTfX1m&SFyAYP{N3+;;?
z#2P9JQK~D86KeruH&IzfncaGd1O-KQxWpreqVNq__<G6r7}#-)0yI(OpslTakpyOK
z0`H9AkC@uc68`?K(r~;<(sAY`;t!x~0HbV9IIH+l;fq?dye?l0iA<vWSk|}sN#nZJ
zORnV7Eq!;x<&lMR388TB5#FbQBEIkQ=65|S?;e@~r}gh|*=K$!KY!r&29<Je83U1f
z?`N?7T`x3#DivO8VWs`nLwd^Rl0GGHpR%^5Vn_evb^jJCpAZvIUUfiz8sPq0l59==
zTdKr>v!V?22_jj>zW~_gk^W`-gvI(hcKVd<{f8Nk@W0BEe;<e^Odjb|t~ev$srVvA
zfkb#gY?WWO#`A7%LW=X9Q>^x!M#@7$+5A-~Qm?d{8fupx{H9AYc_IR(%4IEaYP?)O
z!E?|l_10ai%gatA`W0id4#KBZv_TK{)z~t9_(gc4S)-P84G9a%@pQRb$t%_p5xrie
z=7wcqg$*a;BWlOQ)`FrM3^wA?GlSSYOx<?AyT)W;v+>!<Adi+W>2>RcZ{=!!XpKw2
z*el7`Irm+X3yBVRqH|4qe}bzeZJTe~>ZTRiTLlvZw>EuOy);y)5M~#@#8rHfq<i>!
z9-3RRQ#+5FvYZFJ9fNW${{XyW{L0wN<I>BDTuxqhyROaIPH|>`iG-0QD${JNa*epC
z4l5O(q<6d3rkG6osZaS$It%2~xO;qS9Y9La@wp-znnL)*n5!^crctCZDqtDKu%s6y
zcr;X$-t#H7tGzm=s4t$<oj8LMm?v&byPEXSZ^xO?e}g3^I-nfzGi1Ljjv%fkg25Cz
z+txCL$0#$l-mu81Hn!2x9a=A-q)#@=d<A2Qh9rBWvugj2s_amNuzTRD>PHyxOwAh6
z;QPK>+j@0V`>pt&$A|gze;%J_xxvfm-5y3uA5W&MBqC)@*r(soZ%xU7vSBvsL;fkI
zto330NNpad>=ww_#W<&*gycvrE8~TAn#Elp3U}?41=a5e+Z@j%Vm~Sgwf_ioHZPZ)
zvKp;K#LamzXcNTf^GBb%LcH@+=HF;7aI8V11v(g*Y}V&EhjvLNGVEY;cm%*X9uz##
zeIIo$Za}j8Mg!D5@~4kAgag`6dcId)+w<V(wq5`o$Q>(kuGVLCbNarV;r%p+EN1;`
zmmAkBu7m5n`86J`ZB)xK=){+73w6ln<msl(3HCv#<XsGxOO<zHUpNy7V6_V3i+WJz
zp3CW%;2p&n<ok@%@OeI(IKvG@vr|;1eoijvv))aBs-}(i!&cb*ox#vznKj+Xgn#3{
zQJJQGtNKK|XuX=8E!|JLu`B&8L`N_FtitHxMN*R!J4*_CmpA*b7srvUN|$zNbaW9|
z+yTv|F$)l9Z*WaTuB0l4nfgMiv8t~VWi=0_Lcpxyd0G=wZsKvSd^5eOxEa$LS+UxN
z07o*O@WO2bDmHJL=eQf?p`nWxNlUx4elhWc-cGUODbw)v?K<-rE+O=xejI+nS21DZ
zV?12>%D7m&xmeIQCSOEGRnb(-V;Nf~w8`{}<dUz_-*uA_q9fdox26lYT<qd+F<iU-
zrU%xvD*5O+hS(j8lGsjU{jpK4_uXms?X^(;hu0hjyP56es{uG{K7A&BlwW<Eb1+IA
z7z?UMcUbcn>jB$HWY2Lr(Nf!Q-IFKpS~zV3jc;6+nZyj*-_Cbs&61JT4gRd|PgG`9
zPaTRoDT`MrfK+M%k1LFac&s*4tCO9N=exme=Mg+MQ8cp;*lN+(lNoB3#N$lDE_>5d
z**C52ZnZ-h2}1;<hxFC>+D-DeDQ|PHn<P>hSN+M^;)&dxovIBMr)$TXHJ<x>u~Z6>
zOedNK6b3qet<?V2l^M-tUvp2qq?MOXpd>TS#0QGBj-W)t99N(Hw$n-PkW#UBxkx$?
z?O0CpvLt_Evta!@zX^wpo<@O?HX#^-fYfqH3~2Z;XkCy)1=^c*6#B!p6LUn`a#WfE
zGCoI%IwC0nsF1fU@n~GwLfUNhrIM_xT=lBQ_h0$oxo4qnhTyE+Pvy${R18|Lm1Qov
z`DSXtxhs<hCR+|_I>SF(g}1J;--3scERp9~BSTau)vTdJ`AurHz?Lc~lsulWIMHFL
zSnu%m6r=HyVK{{SuAO4xyZIjg?#-#XdO%a>sAx)VU12Q_e{!9Lj~1@DC$uwYbCw3C
zrA;6Pre#|vw@UBgkIWLby0W5Ej5$FGN^CJq6`t6KR&WJYe8dS9&1pd#3HQe*{4_1m
zWEK*iRA_H;2J5$b2MB4qnX!Ryxeki`;^ODm&v8fZPy<YslC|sH&fljsfEjnyinQrz
zw-GO?_SNoTI>DA>Srii<U)G}%Ryy2_+p9a@JDusotaVq&)ji-pmSAVRD~oFxzANPL
zj$T>RhD=o$MwiP&_BK?ELwq({#;hn;GhH6FnV4eR$QfS=$Jx!45fx_4m(tU!-Ph3)
zMd0^sYy*UiR(0i^<OoJ9cjM$s18O%5vTr9^ED>9$RV97H^D$-&IX*#E?i9KZhzjJz
zB$w1On8!CWo~q~LSpSJ|I?<bVrJoR_m^EG{1(EoL4g2cmJlHCrVAQ#Ix?n|Bv;fo8
z@x>?;PE#X2<L||!p$qL>-Bg?HKjxTKU&STwXTqH5A^6LU2EuDgnYXtE`B5>;m5H$Y
zHSss)nF@EBB)$Fpt{7IT&1uR$Cd|5JN!u&MJ7n$A+I{N5={>9m=!IJdJ5}1z5bG2D
z#dfOb^5LePyI&F0iiLbd>m^ftlP<?7;&I0vO!ClK;#T&JY=cI5^G%%eQFBv{d{H_m
zX}^s0sJWV$qZT>VSokwm9T&h`&3kP;y;@9~%<Zq;ZjtqGZ-s8=Iz`kBAdN5%G%yQ3
zLlic^jTBCN_Ke-e<gQ>w5oJ(_SqL{gy21LF&DVZizUNzn@<n|pxg~vB$v%oqO1{^u
zDEUVxt`*`=SHDw#2b(-+2KWAE$)n=r<_OT%lI0JO0$Xy^#uzAbx_~|+ktqaE?ffln
z5&dVk)4zKE?3AL~`E4y;%V6y|iBgMnBdcUu8$P(lsAffO*n;TWCk9oZ=?$)a4yh2i
zBX8}x-|IpYZ}kY24!f@zjOOFJxzS--Q}RWJ^u)<h32m``b!3hzD<9plfys$p!r7d7
zIFxHnB+^p_k0)5y1Hg@*;<dRj1DJr1^8TXm-g6y=w(eDgi)W>=WJbkQsC_^sw8*A4
zNzRWi)~)7Zu40)Z`y`FiNvQZedFk8)c>{ZTb@07udS{m$>Fc4X{nUDWcCxAz4u57x
z5cevBZLFOeeZ_CBp_9~xIJjis(cGgZzQkj=E$DlDBhePWEthiAN&W%9wxYL*3>#ee
z#jKlES;CuhtL0i<l6=1k4|b_$24<C9xdBST+Iv2eA(3lmA`|`6it%FXH?gNC4OZV*
z{J&o*e!CX}CF|N&mX!KE#+t)ws_~o&era%IQ7FHbPaWZlU1`^s6WK~p`$%g5X_{IH
zk;IjI9bP}(a+{SCZcJ=r^x@3?qW3ATf35Ew(|>oO^an7ToJaKxbNh4?KfhnZUVeL3
zW}iJ&dz7KhAFZJN4Wv?oF_A<2sAfm6wy|lR3$N8>eWd-S($1XVZC-E+L)&VK%qO)J
z^>Htb>@j;oY@O_r<ODf<;Oc~F?q_5%N&)&5SEof%J#}|8q3=?~CmW}e&kUwgq9^uU
zYuuu*^{doXW;-ev3|8QLzItKjxp%3pO%=<F<kgz>hi7;0=dA4`h*VEx-$5-c5of?)
zuysNhl1m>hd9WXj_O6tg`c&KO<gv9E#1v+d0<RW&B*>K-u=a_-nV*NciIFAl+3+hg
z!{WMyCt-S>$t{r;6=yzf(b=OyH$7iM<|K^I7B^X!#mY>QRQ7ZnZachiw&Ycnl{(d^
znehj?<*16+VW@p!ed{2CukLt?A%vIp4OGjO=PmpCV$){+fxkBibq3~)8ZR=m&az<0
z?oss&Jcb*qR&jAAq-B+QDv#`k5TRN7_1#a+LZY0`(N{fog5!Sxp{;6XjN2tTQLp<N
zlnI;Dy@<wbKqZX$Biu*9SBqPAL}J}yOo_AOO9m;Ui>_l+d#iGBYkt|)g*SLsdyNd#
zm-8nI4MM+!Oe8tL9oar$1}>srZjLm0pM|uXVUZ@3gx%e!&|U*Jxurx`qwG)RAE>{L
zi#4Ld1_0<V<C--An=CYjs;_H9f!con0@|WK{s5xhopgVEP8hhpOu`+T%%~Zp{8Nl-
ze^#P-E@~~Mr08sO2+dXSxeDRCDE&Lvr2H&9^s<lmG^Q^}tQMF07Tvz!e4&5$VZ-xx
zd*Jh)0}fFi)7)!go-exE%}^Q%S=X{N=~-&$EKe>D59Xb?(4q$ZdR@f?Q?+e8t0)yy
zc|}61JPBbdRDw9@W0Cqgz4Et9YG|i|Da`rY%wgeo@0nEEaaG0(#iUcNbyPuXD?OtC
zXR1WQ>{g|YNBlsaMfQlXlhiE3<>JAVb&d)F3hO{=lkG_}+38l8b~2bqAVeTxfG?R4
zcFT;Ej!9-YVepvx1yw%BK<%i=*>U{Zl@QiLe8+`L_!Pr@zrfmNcLkWy#(bU=7Adyl
zQ%<bJXi#t@8f<_&<gbOkbcQvdHk+}tVgKIM#|hu&V4&&hRJxh*Skx)2mq#9k2;lj7
zk)ez3ibgKGy8pIs5zBB#7_7l6giPb~^vr_1FJ_M3sFMC}JrP!KmQQP8OtdcOruUki
z3eYAE71G{tNOLU4EBKVw!P#@k;RtT5AXuxmS6Vw~X3}jl4{MAR2@?yUFZ<T{10y&j
z8IP(0l@6x+EL~?JzWsNmSPlnqG@{*2pT}NgwKTr#&VP7#<ArEessaOFsmti__4>Ta
zq@K!bwy0TcAW6&+R=0Qf1xO&@xM}!@{>1Bry0guCg*kWTtS%!ZA@9AYbrP+Dk9Nvx
z()saIMi;#2{1$4--iusdRs6--(aHnJ+=9+aC0iFf_jLC`<ym(<^M>K-L+kW4!^l?i
zgYPr;Cy*hOcSCnVp^c2QiRo{kGHSH%8Hm0L+ERqRsRpZLG&1#5c>)I<arWb!+z3bD
zlc@5|&~Dg#G=pwt_rmX?bIw~T^4l@L_J;IoYpay#npvuQVi)<^%=6EaIs5Owp#1@C
zKmYr3{LZbl8}bJb_Xl89%<~73{s(aT@~864x-6e$qiQp<7F0JMX@B+~pSIRolC+Aw
zXpek}!bhmWSR*kO@cQz1c;O{&o2?ElN40Nj%qX^&dG7pbEyo^S&8?dJ)>I)Xq^#U3
zA0NK^Q9HiHv7Mq971+-IAr#i@!+hOSJw`3pn@tk%`;=du#2IsnYI`vsPG5?Yh(skl
zOlZ5$%{-R97>GqqXfv9rz}dj{xiBeKV{mWv%lT>fT)?hTgUv|a&`3(#42uRw`o4FK
zvH1f#6J$J-o+;2F%{UP<ydn6dizafqv<%Z(?(5j)jB7zjs``AJaBZw?IUNlbwtO--
zgjWof5EZEn;N7J+-iY`e?>X|$psLoy0Z~y;y6Y;aNiE8<I&0B;-&%ULV`?+#qOMFl
z33j&g;!xV}CLV8A$EPk#A<6lLQ*-nqT?+-EMTCpQ@CVTFA(MFK8gckKkhf*HP>q@q
zQ|U3Xr`f)<k-xJN5EKpgwU$!!R@c<5Nq&6<EI?UQT<c0qc|pc6VwB1L<~tIcpYojE
zT7dHR)|bFBwR}TkY>swEN(_gI+c}VMR>M{ydzLqmIM_Rh;V`TGLu9@)so?h-iLa$1
zMQ(+LsVO&j&{&^Ek}WV2+!G0NaPasyu%2hioPhN<fBUbH|2}|&9}nn1?fTTDR(T=d
zju;*$gBs%=C42S+=v2Fnd|JNt!Y<O{vdtwvU4!3Se(NSv#JQ-i>mWOOjO6m-9HM8I
zr@!y)aGkdmK2sQJ4k~RJtU`Day!6jFCQ<w@Q6%*?-&veu@Ars1ZKL2L(12#a2b#Ai
zIV}8&P1mjTZnz?6SfMoq>#TsKGXuL5L6xhxINBvM-xO_=;?y^6L=qul!hi5E)Nr-v
zB%oT&wWKKKu>9sDMuvkqCThGzjr>FH$F$0{OUFL|hef3O8czwzVhZ+%GiC<iB0gin
z%Ii1;MT0#Lpt>#dl(k?`z*zasd?+)YnmeiRvFZ;<4WhD|$(mE9-@S2qyF|(*Yn<(_
z`Gt~$_wL*|Y(QJ0ofqOo9lq`<>_;mPe`uaFeJ89ejbKKhlSi#yZK+BS8arV7*k0r>
z_=;`pSXKD#RH_$HaMDN==FQfwglQFwX&usVP$3AeCORUCn);UG@Y|FyijBNH_5SjG
zp7*eP+cU$^j6}Y=dujGR0Gqck$LWjeMc6m-HwGh8;NFwZU*7Gg0OzgWCAs{&*v29)
z?tt#}99%WbdEvk&tYo_6x+fVJ$DyHJq1s|`(+6lLLhfULpP)h`fXVnsu(gU9hmgoy
zG5p!?W#h8wILMx+(@D;VX7b78*em4OcI#ZSIqpJ;@nOAW>+1q&#ZNtzZ`3Vr*(>6&
zW8f}X3jC`K{kSWYB>U>%h8r2M$Fv8wFYp84pgLO(J4jD2JkIs?tmxzT+47sun^ZAr
z0{f*{DG<VyY{Cr-hHE)Rx>5`;h2!F`VOQeUM=zB_nTS#b)i4>=+LbKu2a)rTh_M5O
ziJ(4|gxZ_ezialO?+n}t`|6ZaI0}o2xy^Lj10j;cYH>To6!vA$jK{Wo1;JzVQ~U*6
z;5{8`Xn`CVLP>AMla}m&szB6=q0wQ<KhTa_r?4chM(<2-c}1orAQ`$&R=>M1C0y~8
zj(^gvTH+|GmKv|6%X<#@aQ@KPmc*j*>_ZW_u%+&7P97KqVOw&EQUS>KTfvpA0k|mm
zhwJ8cuCo)dZD;#dvtrtWnkf>MeV?6gkXHgj?Z<A4ohk~tA^wZR6nDPWUD_N&cnJwM
zLygE*GY(0f)$1u0oWUWV*pa!PHYHGJNash;U~W27#3>X&=W>bIUP)}-BtqOE)q&2&
zOWijNkvK$iSXK_L#NDNM_yWpgxN9<<jM3g2S_Ax)yh;H|Kx4c!G7qUAyH*n2_=2~7
zfiWAO_1#tzu35$tXKRTJxO=k>?iSiQn%=4MM9Hd~Eg=j3Y{!%hm|B;mwoc*2qtg?$
zU|~h=16dKLYAi-2JtE?2`~nK};@xf(j$6TV!=s6@#+QYuQRadgL$~DZmAJ!gu1ibs
z%|b#Z7lEA^R^m*0E|X|!CN*s(OcXU0BwB4+Q~*8IdtLQ#<a$O;Ye-Z-D_qmcH!x1k
z?5hYV9n>o0EM>8BcEYQ27*TCzzP51Hc>ORme=tqHs-Nvz7gNuc>x+6^<P(;o4UzsL
zW$J5(|EX)Je`E-(WVm!U`?6}nd+VxIgrVUeC_0-PqNi!)q3QAcB{o9biBQ}g$Tn^<
zh>b)kE$uHY+p>r`Xrf;}XlY_>Qqtnxx%yRqD7^K+MgWw-%$Wq%X8Sg&LspC(&Kryl
zZv(^&IrO*e?seP1gqtVUA|p-hA7Y@N!|V2Klo=@dYoHa5U$%NUAOcrQ-HqPJh8rF(
z2i;2F#mHbQQION=xrgSYNe~<{ViB>H`?L?bRJ-h}e!2P3g`Da$=-5DS-W~sKrI}NO
z>EiC<1^Aqg)Gf#H*Fzz(yQ&oXkv?w)erS@qt_N$1HfuII3vhrJ&NtAnZEInT(6+UH
zr9rHcW#abuv4tU-#D2tw!>Q7F)7X=5=HX?r@T0%4M~9#LNK>xsDhmZ;KR|g6Al9au
zpu!~PxgHW)7~?z`MYSZqpvXj;!dkx3y?-xNw#lD8qMFQ*5~E+y?zHUJYFzM$G(Shp
zRc`}HYvLp`#DGX|^Se?o8=$b~K$-J`)5Ar?RA|kkt<DVFraM?Om;DNu-p;lMeDvP1
zKDOCcx@GxPW8%G|w_Um0@gqsfV+0!wQHc~$aPaJ7zd3tugvB@Xpyo4ayCVvu_vo%P
zp5JCJBU5yjK9n@v<u!eB8guugO|?&LgwdC<TD?dKLa*JRDm1F=KNO`YLV4C*uBI?h
zG$`ON6t%tSp`A|$gAi>L75c<vuwY~`VIhcy#+^VxFVl#BRA%8`&mId+`m1wgYFVR~
z8qVr46DLeuE9GTN1%yr19aH~Ti2K`la*C_}Yx7lTzoJ?u`mYYEOPqPn)f_l-7=)Wn
z9lnzV=P=<q8qKcUaM|U1C4et6t>t`>yZR7A)m_g!D?nB%UcE)H#Q`T4{RLI=H^-wf
zzW+(yD8ps#xit}mJy{edHtBZcM&A2c>gH)#5z4_1mMO<{{dB-?CoJaqxYprbHY*ko
zG{o||A=j-Y_Y+l4+Kq&KwL)LJG2diVA^C5YjIiM?{_(VFR%?B1Kch`+>ynMv59)l_
z8J!F+<;|x!;zd>~UHn-`>6_LDN$nLE=~Ic--BUDGbT$(FPNS5;Q85{)Oy9e*7i(%<
zH%jIiO#DCOw4=wgBd>;d)!s~`4XN{fkGor>%tfdWn3QvLfEDS(0vZ1R1QlNo|I9yH
zXq6*AV9uePC-p;obzkEew~8$cMGn39M9xfp;{~JYlU*8?#LYR2U7Q$o!515O%dpZC
zYcVaB4`hzjQt#AzpHN;T%_et_;yVf#4L8m%zW7q86P4q9%al$bX3tiJSaaMPAogVk
z^X{*a!2_IAHa%0t0;2jyAdQF?r3a1O_agUxoI53z8>g=$cEnpXY$qlqMKGc~%UkT<
z7`)Y?K9fp*$G2K>tl<#zZn3xL58x9VR5JVrz-06XQ2w;qQqTzYo}q~P{oP#Z6mjZB
z)A$GA@kaH+-qP`8tN#McdfWcn?K`1(EMdv})-tTG@#cushW!HuTD{hUcCOWSSD|*4
zag7DTS;lF4M8<4CkWXYBi5-ovPWTL%n7CM3|FgPnjo^8mG|L->wRsV?4cdZQVxp@q
z#d>NwqIrBOpzKHC>2ld%pDp80f%?V>87zy-8GQ=;bN7sz75x(-4QVyDTf1SUUqwo?
zhf?>FD3h*m6#UFj2MQ;a*u_P5bvmSyLq%)bXM^Gq36W>0guc>BXkq!3S%Fftt{L(o
zVb~?58_VjQEG1KCHqrNip>LG#>e;CU3B41oH*0jLKSgoc1QV&15aJ2A9G=YJ_xWYG
z*c8B3rl1v{CO>og%6r?A*dZr+Qh8?*Gmo6vv#nLU>7pG=bF;PuaMRs{eq{_>KzfQT
z>H(ME1huH=@XHIIyN@O!(OV-aOiBt#V~WYkdwgyrgrmW0N=m9UQa0+2l&hxi^-SsT
z79ugfCRk<naM)s2IHAMXET|ZWymoq%;aJtYi&iIuY$MNhwOT()N3*;kP*f3vCOI>+
z;Lb!(8CNCtDbanvRuOfhx&|?se+NFtRE3#Oc#Kon0nbM4S+lN}jII<^=pmRpv`XC>
za`;fH{0!*<JBuf$(Dt7oZ?ry!Q(Vq7LZ+;lGs}l=FWY5i&6-KM<eHF__X#cGJ8<c)
z;TJ&U!LKC+1u-T`8XL04bX?-FP8NE~4sbcaZqMt?^90enf)8S|O6^*Nw%FqLt+B|J
z4qszbJ1((&Qo8mNaW_ZnVslY&^M_u~@K$h}gwo0r>PEc9ZyP4G?2@&X4peatljIr>
z^tEEL<7mq8p=LgeMrE*b6me>J_PLG5)vH^E7T5YC+#`>dkK)Iz{@b;1O2)Y1W3_M_
zAZJodl5ds8Ske0;Lg_(80t@ZwGFDJ)cru6#Z8NU?^y08O3k)txqH`BWPlNgZ0tri_
zD-x|?YMpwtc{P>?1IeyHj(;!Y$=cJ0=RI|JFE9q3nKu=t(WO+v3F4j+?JdqCpJ3V<
z<8NCWkk7^Gv;F~Gen86l7SmEnFDvB}Nm;qHiL_i=g7Ltjb^v6HmQp%jVzy(HV_gFH
z`n~D;16b?1UZR>S-8OkB*i=;rTG`f^3DOvn3yLP?*)fR6mKZS1`0uv~z-Xs?x&*j>
zDFLd>t%EVXQb4w|!}}v2(*Brj7<aH3826K_L#-JxD=|gZ`}iqo2WrPv#9xr#kQXIP
zFZZLD^*YY8J!2km(j@^KAw=TTz^Hxah%>TY<5nJ)=7g3Iw7o*R5HUg+AD0GSBqD<a
z%ofet8qPb`<`Bc=)Qb*i<a05d#PPu-G6|t$zG3L1WFBisZv(m}S2OE<%nB2WX_&w5
zXAUk_?8RON&@%D1?bvC1@=v6%5A(%$rw>;M+d*@X)2lmn(u>oTiYIOHAzr07MjgdM
z>Wk&iG@>n;Ho1e*p3y;GO&v_6uR?z`f7P0rZc6gLob`N8QuRKOFIUx8YuBwulk@??
zkyNgOl31q3o4USyZltJCXSAOkIs{JEQ(}SW#`8&Y4D(H2CUz*aW{j9WwmBG67y$U^
zUFUV~vS}&6=B+mJ>qAa*uR+7laeT6TNsredS8U^M<lTPSl4UMuM#KXeH!X(d!bQIt
z>7xuB1;_M=)cj+ucID8ND1l}6Q4RHm=W|L--Z~6x(8G4*BD2zJk>a9zB%y>Xr$*5m
zy|3TN*#`OLpO;7z1}%acJ635H#c__Q4unQbD+|RMxc&h2-#-2UU~1uJQT|M}|6LUS
zi(DKyFU|i4u>PpH@H_8D>7j7xclT*d{>bnA^%s`Ip9eqx0ciK8QT1?>`)ZL%&rXRv
zGkZH(nzZe7oO~^zT7ys7Lp81Al19m3p|`Hyhx|S7MatZpm!4AL(}CVdmX#%Q=-dX}
zx=J)c0D27xF%o337MpZ|C$lxFWtePmPtJTG`+kOOfD?MWEgn0gc$e+GI#l>2K0!NJ
z2t7GiZ7)j3Dht;MY4sq(Si^{Ym33>nY)o0b$#cY4l1<EJS$!gBXw-5VmuM3NK$XZ4
zwm>y)31iDzW0O=jLOD%lEFwfK>BfSSo$Rt9{1}+|v5AwQbl!Cs5y-<kP@_JU&-J_f
zEPY!uk-4OjngQ<gFZnbAZgcTB#k#B*mFdO2=fPTJ7}Z!!b~SeV6SQmtjPSK2kK>v%
zAu6eCkLYtMP}nlvDC(#Ozhwul3-3fjaKfuqlB#5rH}6Mnh^?JZL#&Xj=tIEet2R4$
z(j`1VITm;yT{v*Z$?;dQO~%ey*&=zx&&VQ#ZBEDQyrLCs^a9-uh%Ub16-<XnI)9P~
z6eMV(Hoj(?$OR>?x`G%=xvu5xGl1bJDQ*j0?o-L)!KeiJ3CIp;ohDH7?4s*=Uuk8I
zbjnm8Pw@yez#<<QkAUivEP{5Y1NgKhVbZ>E&G(bowVZPh0+twl=d<V46I8+%1Ti=r
z5|2qAVpFTHBZwped84sO1F)O)vyEoFCQK9gP;J?_$IHqik4IZ~IRTIq4sAUx_Go}R
z72&iy*#e3{hpUb0w7r@7`mvN3l-He7xE0@KXuz)Gdm>$%J+m&+HYmM~(o$LxDIDk|
zZe(5h^1{S{zV#!+r!f&<Meflk8hqSIERYqao(i+7_YWe04<;0#XO_pRl-i`4Or#nb
zyGd<dOfQPaQhaej_GZNR88=7`h$7`8fkb=*_=GoQ7;l4Fk^VVw-};p_{(9xZ*Pg}n
zJ}{~kXDnFQH+3EDJVDw?--F(dQ2jXr%$>-2{?oMdQMX-asMT#)D+#yjDQehzWgQEb
zu02Cwd>KB>e7&+GPHRlHk2AK5BlNNakr{3zfVM*d!;x4o=m?vKG*t{NpxU#A9z?nz
zR#kV!kPsf4{aPiMeWUQQe~E%EKe(X=60)(g!GrxjMO=40o9*`&d(Wt?w%An_)ZWxe
z%u>{@84<Is5j&_6d)2PZi<(7C?HIL3gIZB))oQC~e|g{UAHP4(=eeHi+~@v$o^j57
z&gGV%W&G|dAt_*EB)cr%P3v>7y8$&_-eR+8W$`!FmslIYx0Tr;+!iyGJXU?S6a{5n
z6AedGxLA>`D&2&p^1!^XQ4iwVzXT!Q%-TNjoVrP4?lR_pzFM8=Z__}<7^b?WYI7#d
zo!u8_D8L_&7eefAglV?uXjmIhD_xr<9qzIwAc~JI;=n5p{?LfEbm%#r`b~3zW}ZBK
z^w`zGOy8){mfNV2WBY=Mri)_64t$45x}dVwpRMa;EEqv|u-3(8-C-6;{7Bo0J9C)!
zX|=LRW>)N<A)cYYw=$pO*|V+R!eI+;-`KRNdd%=OkA<^${&%5>P%X{y*ZIU&acHy6
zobP@OmHC4rFpU>~OxoVTT-hE#Foo|$deZ+e)MCI3K4zxRmS;ng63})N0sdOZr;j8v
z^md~!<Dr@k8UkwT4077At1cVMrR=X<i0Q@?sEtjeun=wL<Q|TPw+IkA_h1lQv06T=
z0_{2|ANc6a{!i}ixs07k0uJn1PeWfqAB2nroM$yk!j4#$bi+!`z@2=8A6*N6!~ro5
zN6)N@=+~u~WnAUPZ9^LZ7)5XNw%^8$m6~MPgb^<<nQ^RtYKQ%r1LWDF8+PdL5{T!r
zYVLAnE$Uo<PEnwE+}vx^8|`&#eSLBxV#<*B#2DJmp);)R?AsNWN*#(k96OTxq^1Id
zpeh5+!CG^m++A)5O2R2HzG3$!pd%>3SRDtTB#fU;UIwiQ#(QPp=*qYuHy5N@BYZB>
z6W$d(PD0#j1SR7970`68asKYKEwi-ent+v`8c5wUpYqsFasH&}9lA1m|5P;y8$f{)
zDxXV$WKHO5Dv>^I(bE?yLmh5{1Q=5#IS0<C$$vxNlGv0rohYbqD5;&rm$MV`Iiv6A
z?t)F}rKRK32tZWiD?pdD`_;!g@|lC&kndsBB@Bb*L7$#T%U_Lf-VA+rKAUDqVKJ%|
zZLG!_@g+>D3IaCzznOflz)4K2iYWB;V}NAoXUXXBnCJ0R^{m?yL|e$4R+8~55m{JW
ztWhW0kGq&4^nyhEb;WJ1amKf5yEk6}Unz<D*>uJ~_;IVBSCjI=9J%3i=}2o4p!1W{
z#dRW9at$((m<XJjePt=LVPd7ioIF8V{}hqh<NKN3SHbRl@_98)cPqH*ul5LajC$a5
z+dkXX#C;0Ug<oU==qZR$sHPC>?(RqA$cTQafW@nnDat5y(AnmMsxpA~;N~F<3F;C}
zF_fA5m!M165km?iDpaM8;<dilzlS(I(*`@|q*s^$*^SLc{aLA+7B=%@5%w<z?+6pt
zY6>{*^2JIU+D9HhIR3fmlJfIqs(C1W8)|EvUM>scfpyeXOejI5)LB5On~S8ndI_M_
zGu;%xd4-Vo%|{sGrUXb<AH7qa{~FVcIOJ6r)XhhF+P+Beu&L&0ohWmsN(aoUb&p__
zw(Nb2T3gOHht9jrd^rfcQ~BI=NKYiHym~AO{og#L)aJD0fl&+$QcGhkW_@ScM3YU2
zl@qNbIIFdnmR>X^!|J?VC`-=z3@$=el7Hdz#6i#A>x)^$@Vv&bL>%byWtNdlrzDNZ
z!Wg~NN?~SCMOo(qPpmY?G&NIbl_%iL!tSk+WQT%5W;$ocMH~I=)}LK-S+?yuw?+C<
zdzp3AVsumYi!=2CCnKqy;*p&es~j8)D&^IX9p46%3#=K!=ZJ64=b;ZaS54sP+hf4p
z-hS7?)fM8+$Z&_c!mxL&p$#GkIku{E`CJJ8e9*{67nlj6AXZ}TanF`;<>(IC&(}Fm
z4uv^~z^_P=32m6)s8;bV(&J(@1zW|nm`=<+zZ7jbb7_MO!o%U(;Lwz8MKp_rL{MmW
z#a?Yb@904T+}fXwMaOeZ8|A%PruE3@WZ&x3<M`>KGoelfe}xCHGzs&t31s>$DTb=-
zwb5y@H{uJucNEd=+s4-U)jNW0${Mpi%1sMVEe&^;h$pD~OI`oTG2qmA<UudR+3<ap
zbRQHNx%si4Gxdc4yglE-?lc19&L^ALGV$#|%h%bc^VqQpGW(Net#)omtgG8vLqj(g
zyC)mqLirY#A>B0~Pp?E$XB1C6ACR(T;d_;WXcxLNPS(MIGqlEe9H^@pb90fX5S2YE
zLw`c~Oz)KgH&MDmzisEH_r|IcfRIg$1k@rh#Z(BbHNxpm1vYKqZZn!;;U&05Pz*4l
z5V0>cF@<Y?9NxY3S%pgnf7CFs?aO^7XlbaYP$2FIobZ-w*28|`SpXlTBqryq+Ie3+
zu+n-zD|sBe-g4JyD{YobH_MQBR$-x~k`g9NoJi~E**>$%07j4pss*>3D~8+XUaa*k
zuYP}5Y^oxx7WS8*HEeI|_hl;G()#<YpqTH6+=uYaTUce->T2!+ZqNTm4gcr55n=b`
z1SM@j=0F<mJmMWdpQ5yazrV9JH`_&lD*snw?mVL5MnhU83PoS>4Tf?&o4)gvNPi@A
zI##;`RP~kg_ghl+Wsb;m{2R&A4Jl2b#Q?>=s$pFQ^eOS9;)NcN2zuVM(6S&v?6Rit
ziB&^B65i)zpt!pd0C)Ih;q#C5s5WLGrt42V9CY}NOc@Y@bDNxTJ_vwXU@D1YR@C}u
z6*be573_M%2}=+N>o!x2gg-4oE`rwfUWpQ!cn0%0xfXlj2ryfP6aQ5X;k+PwSK9_F
zAjZvTKTFy`r)JWOeL}?x5-`*w_2liw&<{LgHj^Chp@6YFoYbtLtt2(ki{3zT4Zdk}
zE3xRX#~b#>CH~VaQFW&BPM_6@&Cv*>OEn~Kf&v)j+>wtw(<ZBy;Mp}FtsU|<2c9yy
zjEy15LqK#SX7<|U7LEYY1lAji9_W;@28td;b!q8DS0IO2AX2r>i}?kFOFt*N7pDkc
zQM0MYXkY7no<ey<m$)MRDQ#$n06<3q&=~6qUrTH%i#C@b{0cfIFI0jO#>*)K0xa^`
z1}Z189mY`LIq(+&sXyu326d2gJMt|LwKL#y1sX(AbJcn47_ZPC_uU^c%|hmR^T|fR
z#f6GJ;Xb;P9LZUAkV3#3nn?)2c8NzZke4ORD=jgBSRBq!<Rkzcms}Y){fZfQJ6v55
zPIUZSvrwUHj}A7*b6?1I6_CsbSCn)dh~FHb22uGj>d7Dq`P{*f5ul|RE$a>~d=$Uy
zHA8uT4E;=w&XB_%{=!FOL<HV|d$|f%AljEtUw@HY&P#aXI5DgtZe<Z9A-^hX3iD$^
ztI9(_IGO^{M`*~BHP(1L$q=K8d@*yMgGdyVF!v`<h9tyIC)JYIpNzgzDj7cr+s8HK
zk272et>sQpX8kZb`~Ew-e{gL$5mnxbj~5!cW)k&l^?_kT4@Aw2jJtH5*E$tuT^F?X
zyDw%7Z3Zk&7%8|%Du12~hzdEJW=IkP=eZaMes@Y2*anG;ZAEGkW#sJq!#r%{Y7F&q
zjjlhIrPSxf{J3g2^zZQktqkbRN~XtcaWQ8oMzJD|8;NndwYJG^++U@b?Pu3%W*6J!
z`GVL#XO|cZV{|({IM2-`DG0{ajZiPB!}=oq$v7Kqs-25>K-=4vIcHXi6WbA2+fQ(g
zGe!c(AKYrY!;Au}wdRvm@*JYEKIIw!dW2b=AQK2Wh~tLiMzZUjSGEj7DX-)bY!`f=
zcP#D}4cIik*0VO8by##nC<R4kL-bKhyk>e)q@wzfp{D1kg_y^ONu!^c(_K`aKAaDw
zoX|d-OoOG?>*WCB=|R4!U<Ycy@AEs_`7SmJNwLC|Nwf4fTA_Xu;gG&fHQlA%n<l
ztr4<8Lxb(!wq{A9U90uZXPFJNBA>=)Y`WN{`--9S;L|3z(V1k~7e7wIS6o<xim;oU
z>9LIba8<oGPXQ}=LYrg1oNa&D|G}A5e3sjNNd45LO?4sAs=I0KWy-Id?2x+s8WNnn
zf}{g{$G;|L47(r!dAR>2aH_M%C+&Xr8}f97<M|mp(SlMF-wXfr$Q<2<`ZDOS&uka`
z(eU+bYp;>ff>+X_nrn$ql1IOpd;&5if=@X&5g6PtnwvYcUpHCBW`FD}V$!`U06lx&
z2&Py%Tba8<y<MO*pVTg@AUqsUe#fAluzu$oVcb*c*;VX#rs!p-^qQaA(MKzA+~j_E
zvW<-h^_#a;{@oGO!6`-WE%le!To-~I9wt^(q*V;wBcMe#ptfCn+A3SqAL`m}{(3j#
zYt1o#KMGZN#ljh--q&ki?LS}PT6;z=RA+7{`pjgBrfL%z$J+!(ZMP!_3D4X?m(Or~
z4J_wzypt#<VWGWg)*RRu70<{rOol1zs%GXr&{yH4P9U*t!=0_)(Jr<@YPrb*LhO-P
zm4R=sg%sw%g4Bi_-7iGhHV?o{OzKkFKOf+ZaBEa{h3!aV5>REWhRC4OXWtN~rrmFu
zC9F5gmSr2~BJT=P60Q<-Z_AgSn*Q!yK>um|$-iLz(lO%F*Y@{7eDU4dLq+%v<@p7b
zk1EZFu#w`4^l#WxyPr0}?9;HxC*TR_07BF+CWTk4AB7A;SfFj>r=nxIs>J}tqdS{<
z3|zUStMC#rJ`sU6hZHST;WZc*hgW1E>T6&GLMZO+z*|CuEXYC-=Md&RGEqe^A~H9(
zke`RY$zby%@=~7|sy*VMl>qW7C`FRT^Gx3vbSnn%q-&)x8%&}#eQBZWMALf;G9`U)
z?kLFXXmUkCahxDZOq9OBhdL~p*{B;u3b}HpV{Fla>Mlym*_k?^&AB$mC)Hl$kx@Pb
zJ7qrpe{bh^#-f9XQ?!!j%@Mi%-AziKgiW5St4zHx&2G*TSNNcx6wkJru$#4&B*_eU
zoi>sviXTO4ul^Bf#>4e$f4IV2ei$2f%*_<qN*L`{`B3zsx2BQ`YfT(~f&!T=K>dk$
z*_5IOd7VWQz2N|gNlFMqn9-q1)2Ty`f1G~BgJ4^{6TE7+4BcAU%#5CDftf~yL@<5~
zTQ!x-XH;2)jgT&nW?};QiDN+~A@TysLJ)+Upwy{8t0Y3Qk`)|7xMRE*m?W0548nqv
z1P+p%tt9WfM?pf2?&$tm&KUFS0VG~<An4d|Cy&y8*cARMMUl9CT+M6+%_nKV8A<>6
zI!bWuYL8OAjMNAazM3SzTnr43C)nY1rwLe^G-(SMJL+uPxMKaW#4ztU*P3glhSMct
zHSSCs;>iIkuC_vCnY#G|_;Z4(FB8f#rRa}m5qUR@kijjD-IZSG{O}x+jPtUUI?)oi
z)qlZCn5i{OlHyaL^k9_<Z%2(En%3Z_{o8fI1MLZYEQaIxeW4OXwO%&nzP|*EZ`3Kj
z*nK(~(~I|R*st!o%*0e6D$OS>jSw97J)J5YCd@)eTY5Nd9lrG(8g;;A-k0X8c9(C@
z>VzG>hy!tLX^l1~3Imwj7|#}slq>{feW^shrNU>ow}rGH`KOimr|mG{c!6qHNS)r&
zt^8Brsvp0UZ5NZ9Rvur@iwurf3yU3|U27y#)QPE++1^eDSpMv^$jCx>U0hDo7+^O`
zv6Y#AIkYW(hP0-vH&@^=_T-tO(&ixV##h0*bJ^JxjZ1Pe>hQPA909{*2(~Ova}iSz
zkjaF8gvr6)W(G4A&(O1quiqN7A=btRdQh;&n>iy3H!s9ea(tX#NFv{+1!rRua(e(^
z5T_9_T*DH9KE}Oz?_0Iy<li%;8GMjrSC;PUEp*#dn|BY&qLEX?h_9jUsAlQ>j@{o)
zJ&_Ks;`sjIn3qfa#J9%k;92vuS4XS!;8!Lh--qw*)umXk4Z3$WZLAen&mS(H@j528
zIIB+_2cF8tlD&Z+Jv;d#zPa@!#Vj;9)R`k>Sh}{EBRID;ARFtEt>egWUkf;It?BJM
z2)5__OVBOk%--Afg(*2$ub4_dasK$EuA`4v@UDk^s?%4Ine=QqXI-9OL!w1+e75lz
zyuWh>Ud-}`-IJO6)`{f^?jm`IS8{l1JGCpoETZkQZA|mz4GtLPz*LN5?~Haz`BHsQ
zXg=OMX0J0t6FYYxY}{(kbs>>C>9Q15TBwrt^!}7B$f1u!`yNfqE@f*JsT$VCV#h@#
z*mf&VEK(P=<9FvwT`NXi&`_N#N?De#Gj6694P)`u8cEuemPWv7c{o12v?qbC&x&A@
zX)UYKweg(seMI#8^`D(wG}hF%(o^T9U(-US2sqcE^^p+#FnZa>s%7mT@hzepVId6B
zWJqh`l7Kri_3q$R5F+BFMA}oc4H_^}XPP&9lF$_tZ-oE*&oS~jHA|FA<3q9HC#{xg
z2|4@U_FI>+*2R6Q+3t-PIE>xA9?Fme%wN(m(d{3-AsMXlm{jrg_`E0Vj(M-o8mC`*
zDd-$2n5acgP^xZKQ%G=AT3Dh2A<=PDP~OZQ|D#<no^v+y)ExrM-pp7Zb2hrzXtnwb
zB+TE)SScFL-y3o-ZUs@^Ze;yp_oY^qVEz#c*foeVcqy19chO`cc0>s<f@2)m4n5w#
zvP`(vK-R5Oc!M9$g*aaQccTG(>}bqs@_(cRUQs4)FWJ4gz5j#$gNLe){s;XB?}G}i
zf8x?y`3`O)jAx~Rk8Rm5im$6k6(!<n>tPh$G|9<w@v8rs6&=)-L<7y0-}nAo0v_x}
zjR(VgmH%BJWR-E5){EVjHsW8CAhuKB?5dmFm#*x;$X*Tz7vChy6<_cD>va<T$nk^o
zq~mO>2|nsO8(Dq#m**Zwg#F8-4`UO@wu`U(o|L_xE&(o47m<9z$Kv!a4T*NAU=y{t
zN6)>R|4fojm!B>8xX=H$eMOrYYyZRIX-OM{8#8AUIB4EVJnL|Ac%opt(=KEj<oV9~
zyMD7yO>0o|lmo4!B#`W(0FQQSLBPg8%~{X;HCrSrUREMF#pUGtCQ@W*?QK_dF*SE>
z4tDum+t03yUbR>U=Q)j$up8<cX^|2}d!@zmY84T(VL&xGJJkUKyTZ95-7}D}z~z}E
z%hSSsj33osf?2zJbO(!M<((~3<Yb2ssce;}vO|g*q)N*hJMN^K3tOC{hFsUypfO(a
z!Uy?Tbumczmo2BRdtbhj&%aWFrkq-lKsF{zB*PBB1|bB(O$6i%Z)JHmQ6$Bu42;cE
zcO_3b>itxig40ZS*pX?xleIdGB3y~oF{RPLdwzX%TR532Pzv)Vx{@6;G(HLKwCdP(
z-rC7_ueGZ4a0s9(JBTTwdLY8_kQY6^020d>YxIY^iB$yJ>4wkDI4DXqgOlqb+_o(X
zu+4kMErB6V{Y=U@>XqcT-`v+p;mpPM__II2PfzZCX(0QU9VYkYOWSqjxgb8Tg(jJ-
z+-~kGQ*bJ2bFWRWP?vTy1tjt4yt$qe<SzBnV0HdwU;OnJuiLeAlpMYo{{4#=HB_uL
z<z2&U>44;f>nqjRS02Hh7I9LqKkVMl3XEp73y0O*?sR)R>0NfR)9ISORqurzpf=3%
zRURr&gsRiUoif}PVKp?)U=<w}awzjx2p<xw%22S%LKWfF1D{Xd3g=H}fM%3sT1y$j
zNu=B!4=0;y=?)Dn(v3E%@_J&KE<W_PR%33Tp2EPPXF237=i@=!s_QT6OK+_PEL}Z3
zWjtAEC5jQEN;j^Lk>LeuPhMO~gK>F0lz$1r*i!dfNy_tbqU_oWtC_Ax{}LSb)~mk~
zc$+3qj%AEeA>vlOadn|?VKP3us?#yMOTmn9I^|G%`D*+o_(;KfT~bsB--lWPoWslU
zco{#bn$n3#uKz^knEQf<O~P6uen!dn*Jr}zIa=iPVnuGjzR2A_;1+(<3!!2h*5i@m
w?IHd$Am@OEyJzcn<gstawXW;b5;(#X-mRisB^0W3tk8m6DNgFrl=-{zf1i(K1poj5
diff --git a/app/design/frontend/magento_demo/images/media/best_selling_img01.jpg b/app/design/frontend/magento_demo/images/media/best_selling_img01.jpg
deleted file mode 100644
index 3d8ac72d8b42980ddfc60014108fbd975c3df5f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1817
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
diff --git a/app/design/frontend/magento_demo/images/media/best_selling_img02.jpg b/app/design/frontend/magento_demo/images/media/best_selling_img02.jpg
deleted file mode 100644
index 24118a6b4545bfb0d860ce95a8bdf37d6067c626..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3118
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
diff --git a/app/design/frontend/magento_demo/images/media/best_selling_img03.jpg b/app/design/frontend/magento_demo/images/media/best_selling_img03.jpg
deleted file mode 100644
index 2a5d8deb704c01de2e0ea1df9f622f93e851c375..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2516
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
diff --git a/app/design/frontend/magento_demo/images/media/best_selling_img04.jpg b/app/design/frontend/magento_demo/images/media/best_selling_img04.jpg
deleted file mode 100644
index b01cb1fedb06d94197aad3860442acb753f57b61..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2455
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
EA6e`#8~^|S
diff --git a/app/design/frontend/magento_demo/images/media/best_selling_img05.jpg b/app/design/frontend/magento_demo/images/media/best_selling_img05.jpg
deleted file mode 100644
index 70e5840a912cdbbfec2f45ced74384b1c2bcce67..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2799
zcmZ{mc{J4T9>>44F@`YH5Q)eznV~GdEI$y%04i6Pg%o0u$FE3}YNjIw1+wn0N=
zn8}vV2t{Sdo`@_XDN9oB^t-?NJNKS*@9R0w^ZA_5=RBYDem{Rb+i$nu0pb=W<|Y6L
z3;-Vd1#B+@NaIj<|BC<!fC2zu$uBJdqDCGhH&4Lh3BLl`9sv>n2>2KL69R)kATSsd
z0)fH=V80N63kdQNfWw6l2!s$^<WEF@A^tZY2ox$HARq#Vi=aeBL{aEp9W?UKKJs5d
z{IBr$o&QR<p8!ZW-~zZnKu7?L1VNCX?Ka>lUp5E|0r7SI8$l3X5d<m(27v$wfBy$y
z2owYp2S9uW5HOVQ;m;n3Uj~pclz^au#!jPswytP+@MTR!iI!s+A%d19l0SoQ8vuh~
ze~khm!3q!!Bb4n<*I@d-W6<qkK!h&=jD#QoLtxeF^3i;o{b&RX{6CW-?z8y(pOa6H
zQ`x8x+w8Qrebb&z!_F2_qxtua#-3JTHsyA^6LYd7XkP6>LGxpoi$t;g^pe8ofA|ot
ztzEH>%dlMKZII`6Hzsl-D(_|(944`+W~~mkdBZnb0uO?1Dn~7X(%t(mFvbE_mYlyG
zrax5BT_9@(XiQ>srxMKrkmFs7=5<r2eh{a0$@8(!_c$F<!r>hu%6+2|i>-@=x?jY-
zsubGfzaj`Sj#StWv$Dl1WussxiC?ZHom<!xWn&SKGte8~PP6+2?lkW_eo~%Y&AJun
zk^B~1@KL{ym1Qz|DE(8sPQAkC8AIRtoK1%;&MRlL%MxoN$J~!3CVb0s%!64xM95<~
z2IbyX*}U#NbQmf0J$;lUuSXe`KKcB2m0)X3otpoJGD5{e;Y(`f7?%?NiGfDn3h(9C
z)tLLdZ}&zIm&m9*3K=@D&`IIoTHPJ3uRR^PVd=MWcqpO)U7oYS3!?2#8Ju_P&*o9w
zE7x8K$1bB!E<6s_+rNo5NxjNFi8zr^3VRc7_hJd1a|zr?nsW%9>#p8#X(lBwS)81W
zEo6L?hiPIK#cYRQT5~BtEgBdhb<`AvHFM;X`t?>`#9h^UR41%YjyV|7MU!>&bNTY)
zpuH(|)NvBG+YaX7Q6*M3WL=XNKK^~(K*#@+U9rAs?N+V`mgwlE*(!#1UU#x@V5c(x
znolMEXWj#A_E>+jp;~FB9)thX>Q-)@Mo$Axw8#?lvs;wkErl&YRV54aIfbHy8?5-1
z@<>))0B(_;<!g-%QeD^lwEifqO0)XxM<qhATA9T@Q_qY-g&iu@X2cuoGW)|hb^hOD
z3{E)*U!x5*)^(rNku%+;bbaGNkP^dOO-;+m_{jpj9Ygmyg2$efR4jVD<+ngS-I1u%
z<ShO<ii;b6=+>T^x`S?f=Vl#&Rcd@e(gN4?qM`qBkBCh2qfY%+uSIl6aHfL~s#*^Q
zj*GNwS84NWo(C19F2|1fE9Xr48mh_oXZd@C{Tv>7rFF_tT2Mon=;M2;Go~V<aj`a$
zp`!L%DBgZ9*p$ih8+*{?pk1|^`Rwrnr%xX=H+o8ZVWLWR3yy52eYr+hbvWuP%pQPi
zvxr>Wr^5IrQa&3mp1oX7x$RV<t|6f(k9ovY^A%Qtenps+m%QEvaL*^m#Tv6$Q?PoZ
z4f*8w^N~r*a@jR#<vyvI&57^slx4r3r5o3iS{$Wr4$12&tcy~Adu<)MpVq~hBMcH*
zZKnR$`_BcA?YZ4B%`~b+ATK=Q3ZCinnZtlb1_IdCHR(*Z@k_$?rGtg9Qe&7#%i8})
zg#}Y2ccS*V^l5($^Da8k;n;E(?|2Jwvhi^&q{#n{D{ZDfRZo_%0#Ag^44LDM8*&1v
z)g#Gl4E1sevqdrgYXS4(Y;IRXx0RNU*5swFgl#|}OQd2xCi2c`2-9R@^-9IWC>|T<
zT}-)0?n1p?I+5P6(PRgsm5LpZQdwtkZzy;$wvzS`te^JNoMun2|H#QXfc|)bzD|9U
zCqBZ&YTjzFbIb4@_{0{!pAi-1(zj_}#B?3j_4ahP4BP#A;fYnS*!($bk|r@yJ0T5`
zX>lV01-s2yUBZQJ1I8YuhHeIia(CU;PpNFx2t_P2g*?se?lia>VXzEa=;beE;aSO^
z?WEkWtrPV7p=c!)+{RnS25kOxK^dMUm=_n#X(*&vaNV79i!qbb#o{qx>{D4nEL9y9
zaD|E`q_89yo6v!#dM+YhmI{KztsHsV(RjCY#wCV}ip}q^&3rRlUmDn8mlhkwF8`7c
zgr{dr<nrnZf$mW%3!|!}K6N$wnEB#iHTu5#b*Hwq=EbdTK-oR3!!`VzyrfdAT|_lT
zq1euu@TUJsyeG7H*7hW~^pICQFT%cNAS8(+m~wt3{g(H%rqy(a_3sXW>hEhu&3Hvu
z(|S#_dK8o7#wUdy{J85<9?e|HiS9vS7MH|mkE$puGxkzbQoMSZwF0i`M^}4awS3N8
z_<^Fm#B`fM(n^NDZkw5uocok&1=ecH&rbT)&eH2Y6;uvfQ6=1!QBg1s?*o|RT3n;w
zB**faSNBb_u5V_)`kuYdfj8wwwmOCnQSav7(6xEa_ZUA}G>vuJjCRj#eN#C1^DRjc
zTRjV>YvL1j^Su}DuQew2yex=9ZA9L#(Yi+FIcZO;MMz{MO8R9ge_)yU9ze@%7MAr-
z4<+^0_u3>U!3CEfJgnyz!4;W2-1OACeuq(z<w57WcEiU|lCN8==YXidGyYA;s(fNk
z{KdgkWqla0QeRO*cusjYViolI9dYn;`OHVxW%4#azUU+se|^~D{V2vKgm^Y%SLdl%
zif$-`lu{OFyO&z|v_ZP5`diB5Sxpa$1}Zw;ey4JNR|NnrpyO@ey?IGCPzL+>CYJdn
zMN4{(JAn5OcJY$|x=qZ-VEOsYpBGt&O^K!LE+rlIwA!s&v)S*-?UP|*LLX+`t8jT;
zxTL<!=exH7F7df#;;}YgA%jRq4wGZ?QqFCuaw|!zvUB)B{Vtgh#^RBn@(Cuh5BpB&
zP?<vKSW5RFr;=S;F0g+~FWHPIbO+}KN7hQ>L$tC+AC5gQE%<O53Bv~x1nmT6>ew!I
zJ-vhYRP!SPI@9;opY=3SEvBYFUsUP!o|*_e(I{a~?nqE$T`EiwhUv(b>jZpIJFJZV
z+DNE!MA)bu&2QJC$PP)X1_iji%JxEFs<3;QFi(!0=9yvVYP1ol%zT#w>D>6En`PtP
zxt_i8)!Jbv&qaG32pXjVWGBL!!5@`wyX|kdB&Ik->Es18k4X<!mR>c2KyD{3Jb2kv
zpMGh<FQ6^63t?YRuTLq09UFt&96DaT`E&^Ha?#~S+%gSg5w1v~G}ddpx40=b;%_@|
zodVleq!SLWl>NzA)6#6^$W9u}faW_v=8BUck3aR1C8~0D*6y`N%h7dw-bZuf0X-Gd
z&UNdJiTiQ5592h|#D)Vfip{xjZ$A@45S0XxwZFb_qL%O~I+n%|Xpvm^ZK}x7Q+-2|
zyHy)={ubAd?pMSABVD<(7lG*Ak4ERe&yX&?sVA{)8MFg0L`XB+aK^~h>{WmFlv}N6
h<cb{LrBK@|o<k#wIr2C&9OXT$+|&R6pJlW?^iQ%(<bePH
diff --git a/app/design/frontend/magento_demo/images/media/best_selling_img06.jpg b/app/design/frontend/magento_demo/images/media/best_selling_img06.jpg
deleted file mode 100644
index 8f7de3681cb6a682ef5e14a5063c1984d21a97d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4898
zcmZ9L2Qb{-`p183bwboA(MeIFM~NCi*dU1Bds%Ju?tKZOw^%_!LPQIqZdf(SvP#10
zyXqoBc9jsFoA=&3cjo{9oSE~S`F`g+&vRzZxthIN2CnOB>1Y8U5&&@ivw*9g0K=mo
zCukS|0!RS>fc%k&0G+zCucHg#-2F!ZU15Re0GQ+-{_J2fFc?fmMhXU#l97}B134u*
z#UIEiDXFNbsi`Pw{|((gT>l>+FexcHIXNvQB`qTzEgd8CKMpg)zkP=Pl<WU3|I7TJ
z!&NuHKnd6Zc3=<#K*9h5Gk~u8fFb}O0fRuGKXd*Uaw;+kO42{t|2M#-BxK|ufZ{qp
z0s@0cz@!x9q!j;zKqO!WQZj&%oR30MoypLFpAz<WmXrW9)w}whhej;p*$rP-{9~n!
zb6Ed0{*xskCH-^#|Fi=!kbwClN!1w*Vf<tcSyD{9f7kbnzjG9jUU|rTH4o5&|IEPv
zW&l(HPg{<?WlrQ9EdI?~e4O&@nm&wbnNxb&l<Vi1jSoBPhEo~vxIEz!IQ=b6&0E~W
z?_)ect=0kfJ+l;)<o;x|-Ob>!X9uO$JQ=;G!CMWu6zsC8T~<USZO)MIJ#p8twfq9D
zO1FDDvU`;(iY(8#N=0zF&&v=f0X~+e>VhmPk0O){UJ<-PQ6Xpn8fLi(f^ABBKERF6
z)c;&R(;adJ1Ur|uKF7fngfORO77DS-U=(!&m?)-xc8Ib(rgHu6(vavzHr&e>ca5=0
zv}aU!@mA64rgsZk6rMfW?^Y&b=-;XBp<##UwZ7pJ-}|6=C^T&r*|TmrS5)-ghSmr(
zG+tGHwE425>cII&!NIA;hX{?O!IJ@-&^rEf&L{8dWm=^A9z%)^sw+%u*uZw&9YIcs
zS-2IV&0eectqlKlZjQiDN<<&trWQDHz0dDUnqY&RT18v{6A^%-;-!BHEkz>y6{fXc
zvgdp8W)XH<`pzXS@0L6bHMu;C7;DUzQp)oJ*9EUDdlw)(jbVbwg-v&ZnaULBzO2y*
zQL`XZaA=MC+sSX-(=Wp6Bj%en4fJ$%s*70%CdO8obJKt5F$0nA2A0RB1zS0A?;0?j
z66{Fo()N~}kpvBe3}9NMLh;liX;B06I2G`+SG&xPlm)pCk)tooBh7><FZKF(8k%OB
z6&NXgU9K-W_yt&7N-~mE)UsXwxDmHhX#!#IjY9?$BQDNH>|5!iWdkC&?+ZVJv-f;J
z>sDE9Rn#G^n=Snjq9REqx;Q`h>(l9@<{Dgz^EJlRbu?Q$LIeEx$DveKb#6B7=v*)Y
ziQ&CHdIk6yBb4LT@_o%F3NDy#_+VqRXA+%2cAh?5GAeqdoUsNDlD~?KA2=meOlCup
zauYlG?`PDuRhG%}H)+S*7)-%>?<szAe2m2#aCd2X)GD)!n8@fse7S~blr^tC$|~U5
zoy0ISK%EvBzw(xq{#6*C8p$(B)YdFV9B(&>yE|+1vONfMaJV+VXesEM)zBvS?Ma8T
z=F3Rk_d!6laqm+3R{gmS{|~euHwg8KP2Yu?Y1MJ0t<lQTI{fI~8K_|K`U>8>yOcHj
ztfL^{zLIY8Q%>1Nr6_RVgiwXMz~aNw;uK%_s?rbq&eXMc%4F>9QN2Gk`^<#I7YXz$
zWAF6ZvhVIaiwz=fFd`xXMegl5)cGmd9xtJ@$%_`<ZRj7Se9q-PB$eQzM;H%m^rzo}
zK73WIAfefucFvp3URY<AmAiDo;r-O7H}dE0Ai_z;Adg(WYt0qFhQ}pv##7)aMQ<0~
zF3))S__SG6bt`B$CpQ|NoOq~ATsS;Z?F%j?u1aL~X1%Tkcb=~6*c|L)x$e+6odw?0
z{4hRF>T7<ZPGyLyi>9Z@HB(zZp4Rhu+!Y|TC7(5&!m}RHbTLD;sk^flY0S}RFQ1z_
zlaH&xgq!ZYVkvib3TMP9*_f#9ay_2hU(LO<>2YK29)qhTptYj=^q{sH^9{o9UO0eC
z9l*~&NopN%VK41OS--df$e-C${{_;np>)ZmD!XH5V3ce3tbF`{8QLeXW{npj7v3^Q
z<|Kt#2tL08LcTzPM3bF72WqE@I@@ZH<CCo(+ZbZ;n&d!L^U4%f8?nW-RCdI$EU&PJ
zR=pl3m@a}%a+3Sn1{HkyP&fRgV|P)Z+F2V^IvL$W-G-3-cC!m@rI{O6I&|}kwKx1p
ze%h+E?iPDh1J_igs(yu3o$0SVW~lLkbQZG=??i6pC5Lq`v{EM$BQA(sIp)@cf;;KF
z;zv`DJktm7y-iSn-_9;H^B-z`R?vbm0GG>8E#%4HWs!bUDgC5s<ho>Ku(BM3n$AAP
zODHX3AB8*Lxw&F9u^jw+9~Tq7Y8^Ya&HWcq*U^W|O-0=>J|sp*(NN9`z0He>g?1YC
z<L*In*DdB+)_uRj!>rFAhvaDTUID^l%*KOI>9{vJ9f&HgQy!5yiM0~K!JOE6BwFLI
z-#nieE{U|tjf6`HI~#3__k-anCsv$BE4I)??=mOS^w^IEniQ5^tY)WAe0;?A<QokJ
zVXw{B&(b2hBFp``F?--`nNX#se9=-~9p8PXIr)NBH4(i&GQ;x<mdIuo7v^X+O}^ap
z2sQ`sM_PW`7yUP@St_orJ)XKHSNq;tA}4KM-zuRwPbe`dK;B-j9X<mS8~aw%P9-+v
zno%9Kwuv&8X|8ITqFF4W5Emip2bxD)?+w$+mVF^IX{OQ$eF<WbLbK;X@%1k^hdvig
znXKKbny!Rj0W#}H0!bQ~O`UO(d8WfK<$aprXJK9@Elnyp#!+f?y~`Z+=nKZKWn1dJ
zto>*c_sssRFTIYL;ypnw<b!S&`s<FHqnu!krrOG1CWlqFkKi(g@}jMDT9+%V?A(kC
z97XmgTtY6OA4vj1k;T7D<B#$hZ2Ae}ejf)kn6f`N<e!s%G7zM#RHD~tFrVi&Nt`h>
z{P4M8deA2W20OA_KZy`q{CNd<wpush)RWpATwv-nHgh_A*wKknd}=agtW@JG{6LQ%
zlQvLB*z&o?Ifon*>kG{gsc&eeammA5jBp*Ax9@m_WfaJ2h?s2Nj8#0C_V(X5lR=Ev
z<(GFM?9Gu-^C^Rjk&1|gEVMQ}9%ghZW=4;!aMZh_)!K_PlaeJW)IBD!$NZ@5k+2R}
zFJ?g3)DL;TS^Kqs`(BsPFS_F!Aj)vpX~vV^(5#!ISQ&c!62cM3G}zdDC{z3(Wo8+d
zK+j{$6<)l7fPJVtsCVF9+lFmo2WbOHIt!`Ea>~_>m!sdfZGzBKUV*ck-frGLQa5Il
zqJL`zw+t#tL45B}xbteZIN$N4;d8;vu0SQOfOiAAS(rThD&;*X)03fF@ip_%^EW?@
z-%*cMH=uR$-{(v&JX{mb;D?syh9mfA^n6>fu^aWnNnfmR&U~S?jT%8vFJ^QC<vfGT
zt~V#fDN_AZ$4+39Vg2Akw?uJ{pCAhMy~z4=)2F;WCVCD%vBD8G=lf$E@q&An$>nip
zy@fp9t`4ExPni1c$4wRT=7obLILcdkOa{nKLwg!2MxDXsb?K=Qzx$<QkovnVPNBil
zM_YvC{{F8IqVfkUF$%KrtG3qS>Ovo-%S$+lJjX7g5^Xnxgdx$=9=g)EeSP;wdljzr
z5tR)Hh|7Y>iIRoQyC26q%{n{XC+$bwl1C4otP>9fJ3MAS%v4N<!Z#&}vM&=HPTc|o
z*NX2E;zen3F}H)f%to~RSl6jeAuY}A5A@}CB_qqWi<ykRFQ1Q52zg%t@cF<$Kfp_d
z(Bc@YFg74)ssn(uCJg329)g}o>@-cdVi>59$(YO)r;N$Y?hVkZ0TIIx$Dzqjydr&c
zTgS&~R`#!EOpa%d9GC1V+S{k~bzZh28uDgPR-aw@Ua^L5H+hBsd|cfuKv8bGrK7mM
zFXwJWW8rBg|6p1H5b&-MZfLC2!s7Ax^$PQA@Py<)FI`E8C>FY*A3hIJXMBw2%M_t|
zuCqICV6rRlrAcPo&p8q6{lX+rso@HE-M`Vm=E2OBeoKetJ|E*$djDnS6nJwgg#S&R
zd$F^0z-5tXj&@I&&3SRKSE}S)m09l|)oo0qc-cvYqb0laq0ELx=6O%dFLZZ53N{TF
zG1x8+!sT88v!z=T?ZbNbZX~{<JYQ>%#+Zj?m=K-j5=?y|A+PujeE}Wic*2}|f8WhF
zz|V{+f2!2wASEe;n%UWrx>!PekHao~rN?2oE=Y(|^#HE3x*9d`_bdVO(?vk#iG4x&
zHuITm?efnNaWM_8-C^{nRdLrC<W0uLC=k_D&a9et7$0+qgSZ+t`Ajc7&CRoWDPR!;
zhh(hCh2osIy<t)x^>-os`e-?l)VJ|ZS#v#oJky(|5+jZGR$(2~A##~nA6F43rRawT
z`!wHbl$&RS$zDs9P2bTDW0G{&os3X4eWMgrz(1L=QqGF@{cQEBRJejYj#1@jc?srW
zXWs*jLRwq`k)5%|@@}1Nf$jeEJ0lK?L6>aoZ;l6ThC2-*zZ8BGTwX-?O(inKWc=bR
z`DVqVfWd93c$~!xm|Wb<idWk=cSx5|b*%~$KTqxG?zr=saKm?FEixdhPawvC3l(qz
zNhpt<$KMK6wJsyCf|cipXZx<%t#x6$^HLxi!!h5@5R$vxTN@u*VqXy<48wS}vsjNp
z7j)on$e!`+yy^pb?3(WU{1tFJs!MKR6=nJ3oJ_T>HkwA?5NFFJJ+T@pdBXOxxc!rk
zsJ_|}yBT5XD*_wnb}^7S-gcIg`NY7dRZ9<R-`u}6ikxehn~f$|E%aOH3gW7tKMy)?
zN$=d1EqcpJFJ01AtG1-ex+@q#ZzG`|$DZ=|)}YXS2Q_?wN0)Iy#D=5g8>fP6((R;G
zM>W4^-wwC#ey=Pc{d!ZvQgah!tVWKX={DA=|8@lS5ejr#3ujdHfHpSB?qq*v<;jay
zH2Y%VyF@@{#$2<6sZJ;S_|%B34)7R0BYbV;$P$!m9m!EUtZ>J_Db@IWXF4J$tfRPZ
za?j(3R_{q5q0RBq3R#Mysi?dMrOHD&&7N3dEg)N2#4u0QO%6GFX4t-Sl<^6}h6`~t
zgJW}MMD#)<6lZqMnd;Ay5!hn(%c3!ZN1wP*l(^8w@IiU8Ga1`c^!vf-jvccTeV#sE
zdoKC{=Hn0?r4%%YVk-1=FPS)|Jd(>>>73cVP^??oAPl~bz<sJV){hf8sT|c#I0^ZF
z1APS?!3f?A6nzVd-FFXmrVBIioRX;qt*uY9i^hsn2u9-|`_Yj?^$)3j&pTR=H%GJ^
zSB%dp0xkb;MQxRNqRQva^*>PN)PpCadW_U6-(3L-C9}_N1|P|?YD^&lj;G&C^Ofl`
zg38Cs8Y<+E*ileqZpP2AL$pd)fMAdQeXPI<TNS8aA39fpNQ)u}&{x+Mqq2-CLjHD$
zO&{e8fhh&%Mdx08*@3%eTg)EP{e&<X?kEnf54Se<rZaMCsm9exuXh}?lz4^ULs-4u
zc^n_zH)zMq+YC*A`D}y_j`98JvZ(WQ;bN(k=a*HtfnNmYVEs3r8?R;uEc>%!i%p03
z*q)uR9nsg>es|jWa><bz;TqFCSiN}=^QtKa?B(#-nl+<84+T>W-)1r${Z-|hCrm{7
zV^eyuG-KMZfPq?mE&0MkCNhYbS&|{{hKVWo!&czbv?wBw;A5D1<i)l((<-K`p}>2{
zHdCfwSUaF6Va(@$oyiVc!bL76N2GF5;oyH{DUhzO&8Iz6B11=_ukb2;enp^FMtc*w
zqIYd8m<pbM>?Yg4alM$3fB(F_R%O#7nrF^(i^s%*nDD-Sa3jo&4h6$a8+q))rCL!d
zi$?b8#;tSHDzQie$G4MX&%&&Tt|y<hX6AQImQ6i*wyyskZeizk!Ff?I4s?}r9nN$9
zh$X3pQc8_=8|6w?@|aJ&jugLTVru@qtv?Cd?SA<>I<K@TJP_OP=KjRX=~G2E5BV^z
zn)oB`p*fdZRuLj8RxfIaT(KYh+P!Mm3;qJ$7rgOD8w;6E<ya-F-sK|RkbBiT!n!Z2
zIoOQoXmlx}Sz~0oFkigSTgmJhw;Yu8v&Q=N?MV-xt=kNDSl0ZT?vM8fS1(!(!#EVh
zEX`k0;3#XJk&s2Tsc_A~k2X3NBGFwEM-S!-_;vPaO9~pRzV*kpf)w^RqdJ~m0mw(%
z%@n?GU2DICv8INX1U+sy+Ta7<_?hz`mx_EO5j@vkZt-?GUH3`3wf6RCvL#_Gp3&*Z
zzBt|A1AjRerk*y^R3DEhK9Q3Rr#{{ib~Rmt#I($W9oJ{Nwt6F*$L@_;>8m<;zQtKD
zdaJY}!8}i&MqV=@39`yJb>Pf^HeaHNwz-JDnWfv)#%stSvU7~Khj)5ofjM81S`H2e
tp?^P);=DfE#OnHXlcGy=*)Zxy?pxoWCi@o)=V{9-J4j1o?wG5&e*s>gU>X1b
diff --git a/app/design/frontend/magento_demo/images/media/cell_phone_landing_banner1.jpg b/app/design/frontend/magento_demo/images/media/cell_phone_landing_banner1.jpg
deleted file mode 100644
index 8c123db9fc9ae06d52e470fa80d6b75be3b994bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 21259
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≶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
diff --git a/app/design/frontend/magento_demo/images/media/electronics_cellphones.jpg b/app/design/frontend/magento_demo/images/media/electronics_cellphones.jpg
deleted file mode 100644
index b92f9d05f102b6c946506b6bee20294442fb58cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 42440
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
diff --git a/app/design/frontend/magento_demo/images/media/electronics_digitalcameras.jpg b/app/design/frontend/magento_demo/images/media/electronics_digitalcameras.jpg
deleted file mode 100644
index 3c6e36e3559cb5e71efcd23468d1b11a8eb50477..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 57481
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%0Arx0K$>(C)#sx-4P{i
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
diff --git a/app/design/frontend/magento_demo/images/media/electronics_laptops.jpg b/app/design/frontend/magento_demo/images/media/electronics_laptops.jpg
deleted file mode 100644
index 602338e491e001c83673429c9d6d90179fe162b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 44643
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
diff --git a/app/design/frontend/magento_demo/images/media/furniture_callout_spot.jpg b/app/design/frontend/magento_demo/images/media/furniture_callout_spot.jpg
deleted file mode 100644
index 656cb3e1567013c1ddd5bac26d7f4002da88ac40..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 31312
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
YuaUZT(tnkXs?v^nHJjR${JZ>r0Pt(OjQ{`u
diff --git a/app/design/frontend/magento_demo/images/media/furnitures_bed_room.jpg b/app/design/frontend/magento_demo/images/media/furnitures_bed_room.jpg
deleted file mode 100644
index b9a0916edb99239326c351ff3b4866ab7dd17243..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2193
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
Vb5`ME2}i)-Wx=ZK6OqiZe*m-@%&-6e
diff --git a/app/design/frontend/magento_demo/images/media/furnitures_living_room.jpg b/app/design/frontend/magento_demo/images/media/furnitures_living_room.jpg
deleted file mode 100644
index 4850a83949ce39d7326cb807b11bdd9d1372ec66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2541
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
BW`qC$
diff --git a/app/design/frontend/magento_demo/images/media/head_electronics_cellphones.gif b/app/design/frontend/magento_demo/images/media/head_electronics_cellphones.gif
deleted file mode 100644
index 99edee24686c5faac28d096b6a5cc41b64461e6b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1039
zcmV+q1n~PuNk%w1VH^P+0M$4E{OH2@(uMV_8pVZC_O?0w?$Q4F@b$1N_{V4Y&35;}
zSpM|j``x4Z*OdI@vhJ@(#Dr1uwMgivNA|i%^{E!(pGV%IO!2iz%%q0Fg<HdeQQe?T
zz<^S~f>_+1P0OHx^tegFf>Gq*+|8wk^rj8SnRmg4UFGE9<KNleqD=C)Ny3L;<K5T8
zievSv819@4*nbJ=lnUUA3iG22zJ5~oyh#85|MaB`>hSRZ00000000000000000000
z00000A^8LW001}uEC2ui02~1w000L6K-_86q8X3Kq;kn@I-k&}bV{vSuh^`1yZWGT
zB9rG*E1S>gw0g~MyWjA*d`_?1@A$l4W$Cam8#OLBgoTEOh>41ejE#<ukdcy;l$Dm3
zn3)tcDJ2;o6q%x<q@|{(sHv)jBsCl~HLJ3-w6(UkrZoewxV^r=z`>)syu!xE$jP_F
zvC7WR(9w|0l?MR;01O0*H8uc*Ha3R>2m$8Xga9_p((Ufa)RPDX;o%9~-r(Yf-SyrA
zH`K9vN3bBSc##O$19$*nqHf=AggXTB#(@Gh?g=!=v7;=6kQ`)8bRa<hbQLA;E0j_}
zK7lm?AULETK!O7-36MK!Xr}`IL)H?Y^GNg=$VU?qA@DadWm1;;Zd6pKE?fgb0x*U%
z@Ka&|tv0$6pcjq-p{3yp6kV(AXrq)sZ4?l2V1W$*PFE7DC_tS?xiu0bRTn_24Fdqf
zIjF%vE};bmbc+0Gx8YE>n1Q)v1h-Itu!KG%$V>4s0K0Pog1&*VhJeF`CaVPaT3olQ
zhRxcYnYp*-T>~8{RC}nZzW}89nRdWibu*YzZ+tHNbmC`!`OpHm?7RD{&5Xj~G^CD!
zIdf&AKHVF=&_?HQr>iVv-P?JYd(|!Q&i^~`NsR&EP-r757twl#MMT~@=`a|ML#@rH
zk6{ih5@CNBo&w$?0?@PnKm!3ZK)?Y87=T<2O{u3>f{47gQ3Kx803&hL?Sl~mW!xj3
z0t(PGV1__uvf&~G7&npvc5TI?gitBy9)r%^AV6c`2sq)DMf#%?Sq3y0<d>EV$p~IG
zj7JCoHE?&z0cA$Q=0IhDDd#0(&S~eJZ~ceoo_sn|XP<!1Nz4Q@6l&<9h$gD&qKr1`
z=%bKED(R$@R%+>`m}aW!p%d&9!3&^<D(a}DmTKy$sHUpws;su^>Z`EED(kGY)+%ZQ
z5YX^I47~R0>#x8DE9|hu7HjOW$R?}ovdlK??6c5D>+1u#N+83v*k-Hkw%m5>?YH2D
zEAF`DmTT_0=%%YI?z-$|D}e?yQ~<-g^ww+dz4+#<@4o!@>+in+2Q2Ww1Q%@Z!3ft|
JK?p$r06U=631I*L
diff --git a/app/design/frontend/magento_demo/images/media/head_electronics_digicamera.gif b/app/design/frontend/magento_demo/images/media/head_electronics_digicamera.gif
deleted file mode 100644
index b2b0d60121ba6d1a2a47143a23ca90f86be81657..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1211
zcmV;s1VsBsNk%w1VH^P+0M$PL$=8zP>&Tn6GuPp*p}IiB(}k$NPWbxq>+sfkk{i(6
zpS;d@^7Z7l$!Xo@yP32v!qJ4PzgU{BO|8OOr@Ty_vru`F8l$&Ur@K~pkQ$b(J;>IP
zdXXA<kQvzF&zh`TfR-wjsZ@216_ctu+vC)!zEqN_ID3*JdXXP@j~c4KR-CO~m8(3O
zv@w;jC*9@QkE2F-j~T1MSk~XneUl`Tts{=9Abyz@c#;u`q#cBx8FPyguf$yc|NoS*
zCF=0;A^8LW002J#EC2ui02~1w000L6z~5^H+8K|?q;kn@I-k&}bV{vSuh^`1OAC2^
zq?4({E1S>gw0g~MyWjA*d`_?1@A$l4#Y)XSBRnlWgoTEOh>41ejE#<ukdcy;l$Dm3
zn3)ee8Zam_51FE)q@|{(sHv)jE<7STJgc&^w6(UkraTF-xV^r=z`>)syu!xE$jP_F
zvC7WR(9w|0lm-CT1<iy64%&(X1(5(f0Es*b0RajE((UfD)RO@{^z;nP1w9Uo20aIb
z1lTPaSMHF4dh`suTgY(OE^m<L#Ue2700AEY3S4BgpxJ;P5DyVNl<z<TLJAwITq!A@
zB#DJS4)8&M$3`F476{;>aHm550|<I#Ls<a8NkStH9q5tL5P<~%bQ0Q0fMNl5Jfa?I
z5LKXoSRH9Xm0Bq4f}1SUVsaS?CdwWRd?fuyFK7TCJbK)nSI<WSgm>kVGn6;5Apr;v
zVAZ#@2ZDU`6if|Tm)*RB01($xOo(m|$!bGeVjB^pA$o$#<z*0X-rd4DgANt20AtWt
zNs$glB=w_edIcIRH3^yB$J*m0^Hl)W_+SE#1ymJHeG=(MZV90tc`zJaz25_8N9jAY
zq1=cF<a_Oy&_U3*eYDpecV0n&>uLIHTD`xc>yBgxU0fr%1siNWxFvvRgQ1rXXd*QR
z9)d|plovv%We0$SfzdVpfI$9*XwE~FWS7rO1)3J#iV3Rdz-I!Cgx+e1tXI>7;F;HA
z8E{?W<Bo*bh@cM(FwnzHA|^=~iSnpuz*4w1cqAbU;3%GosF{bJ4@N>r2uug&SfOeD
zAmSF7IZl<Ol1c*D$UFl8KvzK{5wO$%3M|E5hmMtFWN=HBv*m>dTr-nQJlMtJn6Vrb
zKm$CS1*8v%Dk=bT`5?e1n{G0~mtzBHlN3;n<%i&ts0rs!d0YBrWIYBD@T#MW?grC>
z2!-R8tdZep4}Y8b*QqIgA$f>TQ}F<zBQ+^o7Fv?*<g6k#9m`X&oHCh81MCnGRBhOX
zo8+*WNI0dq=nA{o%LFyF>+ZYo#w#zp6hN>61Qg7x@4o!@>+in+2Q2Ww1Q%@Z!2(af
z!447F;PAr`M=bHg6jyBV#TaL-@x~l??D5AShb;2Q5JzCa4jAO1^2#i??DESn$1L;A
zG}mnN%{b?*^Ugf??DNkoV{q~XIuvd6(MTt)^wLZ>?ex=7M=kZ#R99{F)mUe(_0bn(
zutNnmge~^iWS4FB*=VP&_S$T>?e^Pn$1V5Vbk}Y7*cEiJg9JGA?f2h+2QK*Fgcol3
Z;fN=$_~MK=?)c-7M=tr_62uS$06XP$OS}L8
diff --git a/app/design/frontend/magento_demo/images/media/head_electronics_laptops.gif b/app/design/frontend/magento_demo/images/media/head_electronics_laptops.gif
deleted file mode 100644
index 3c57abe0a8238503b7d4974e09b62debc429a546..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 949
zcmV;m14{fyNk%w1VH^P+0M$AG&gAi(%H&j{&?$t&NSw@tz1?A{)93Q|^Z5L>*X!Er
z^?A11lEmSu(C5P5?p>b9MVicKs?lPk&1<dHSD3;ngu+{(&Sj<1K9<R4tJP<$)zIPV
zEQQ0#-RUTU!egY+E{4M=g2Kz+>L`N3BY?q7o6Sg=%qN1uOPbA4napUd)-{U7)#U6Z
zfxt0`#7CRVN}0?bcCIdlyg8D_G>yV1ezhQez-_SC|Ns9ymC5Sx@c;k-0000000000
z00000A^8LW0024wEC2ui02~1w000L6KppF{vKf!aq;kn@I-k&}bV{vSuh^`1>#~S+
z8;~h;E1S>gw0g~MyWjA*d`_?1@A$l4g9>#%FgGtbgoTEOh>41ejE#<ukdcy;l$Dm3
zn3)haB`F*#5SgN*q@|{(sHv)j7&jy~H><L<w6(UkrZ)qyxV^r=z`>)syu!xE$jP_F
zvC7WR(9w|0lm!6-(%IVEr__@GIL(&?*xcsl$=;IS;*|wB0qFAczUq<ehXU3G1cU@P
z0t7I)Mo2&c90_jp%V8iu00V^##99!bfFS_^7(k@Qv11~8knj~EfTJW11pRK{aDc!h
z!~iD4<v3_EUJh_HR}y+xQh~?+pFcr95?P4fOn5m|;;;zwKn{Zl6~c5t?tn~i3aT#6
zVO0QujX=Z76Y7ZQMFuzkB*o#AP)lquZ7RUA5p9E;I2I5>n}F+9v4GK$ZDck_fR-iI
zs#Hq|UtB^Z3oXXmY%)&(U;}H8HkgrFv;YK5p4?dG;~bF*O%_S|1~{jiV?XP>$Sl6m
zIAD{+LFhC%y*U~n1!plh(n53F$zC3ewj!(mq8B)raIWH#4Q@C<xbx(-1-TczLxAnI
z__u}^ENHoqx%*$v6M>6)%_<Jz*ALhSu#mu9(}*3g5jgW9U=aa`8Tj6U_3WY?CIA^S
zT4t(=^G{~%h}K?G4>IV|p)B!TLRuw-eP|*sAzCsbB_*Ed;w&jva^WQsZTRAis}M86
z3_SMe<BvcFDddnu7HQ;>NG7S|l1w(~<daZF>Ei?y*bo5?SZ1l^mRxq}<(FWFDdw1D
zmTBghXr`&=nrybIWdt7BAb|{Y)@kRRc;>0+o_zM{=bwNED(Iku7Ha6Bh$d>M1S8n+
zKn;*aD(R$@R%+>`m}aW!rkr-_>8GHED(a}DmMZB3C)hwi46L^5>Z`EED(kGY)@tjm
XxaO+suDtf@>#x8D>na5;1OWg$Nch#-
diff --git a/app/design/frontend/magento_demo/images/media/laptop_callout_mid1.jpg b/app/design/frontend/magento_demo/images/media/laptop_callout_mid1.jpg
deleted file mode 100644
index bee781cde3a0eb635396c6f0b86c4f976201a6d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 12145
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
AAOHXW
diff --git a/app/design/frontend/magento_demo/images/media/laptop_callout_mid2.jpg b/app/design/frontend/magento_demo/images/media/laptop_callout_mid2.jpg
deleted file mode 100644
index 31a5724081b291c3f74dfef653a1945ba1f14d37..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 10540
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
diff --git a/app/design/frontend/magento_demo/images/media/laptop_callout_mid3.jpg b/app/design/frontend/magento_demo/images/media/laptop_callout_mid3.jpg
deleted file mode 100644
index 321fa48d674335a8cf6230a54f5b7fc9ef9d68ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 11699
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
Sbil%#3N<3#Jq|2xm;VJO4T%u|
diff --git a/app/design/frontend/magento_demo/images/media/laptop_callout_spot.jpg b/app/design/frontend/magento_demo/images/media/laptop_callout_spot.jpg
deleted file mode 100644
index 7652e5392423c237b5bb11914dcca0836f3d0335..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 30482
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
Ii~r30FW%;QU;qFB
diff --git a/app/design/frontend/magento_demo/images/media/shirts_landing_banner1.jpg b/app/design/frontend/magento_demo/images/media/shirts_landing_banner1.jpg
deleted file mode 100644
index 2adc5531ef15e5de9e0b12c7c154c07f1c900890..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 27352
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
diff --git a/app/design/frontend/magento_demo/images/np_cart_thumb.gif b/app/design/frontend/magento_demo/images/np_cart_thumb.gif
deleted file mode 100644
index 53bcfa522089634aca66bbf1592ddf9d372f1e28..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1372
zcmbu6>sOKo0EgcfUS2`LK;<Yd4a?e`9wS|gR!dORm1TC?+3{2>ED@|u$F;3f9%`?G
zPEFHNPiE$@i<zA>vo&vdc~L}E1g2<;h<HQH8{R0dtoASL_u={WJYRmHheDWpqx=9r
zzz6_KOH1?f^NWj%)6>&4Gc!|DQx=QGWHQap&Q45BynFX<a&mHfe0*VH!DuwDuCA`E
ztZZy-7z~E7v9aOd;jXSOtya6fzOK{hR7$0^sj0oaUDn*(ER_!EbfcrALqkJoLxV=6
zk;!C(di|T48kI`bP+xDgTGcAm@X(M_sg$6oUaub*80hWo?d$Drk;&9*bz5tzwy#go
z-aaxiqEIO0EiKhmRjsY9eSLj$xxA~hb97{+;bXb0tEHu-v$Jz`ZOu3~rs?k9uv+zl
zgWcWT{r&y5H8pGN>+NlAeOhg!MDq6S+ZUy!x`Bb7o}Q-0#(u4K&TN)SrQI5hvZG^t
zW236F(mXp`S6i#=@2{z@o}QX&YinCrTr><0{-ajc*VWC<eKgGP-@jj8US3;U`|#ld
z@c-tq4E-1I`NU7305(?SLZVQVl>B>2s>nGl<94PnHY+<vbT>CI^WJ?Sk5_O<d;unb
zAm)#P2e~k&xQqms=J9~C%3{*<oEMoe7nOh#3GgOAn}?BdpFJiiK)5BXF6D1-jI>5n
zA&u#jXTTsnW?T#W&QqJlb=?^}ym6e1N#j?{K%|VGBqCXCV-MtqKQE>@aFX2<0gWx_
z>6ztTAFd{rf;+;<`TkrJJN;S7BU(l;K5thX0|lV+{V<)yiGGwSBobXpjsr(?eb_Ub
zIY!5PKP;S+%8%8BL$C_^g7x!Q=#v1h+tHew=&e}XRa-vI!u{T#OK=GmR<MqjrC8Cl
z?fb-lCX=6Cda$ViIaOTb1V)mtPK7kuSqgUrF{e(-?DYCeUsahUekoLc%Ra+gq8z~u
zIYBHis)>8V+q6bWh;6+1qc@9uvV*_->9Mmvbj0f?G38XnpEo{ZVQ@H^?}0+`o`jKN
zQsA{h<m=NxEB2m|YM{)5Z4Gcx-xT<WKpT59y>JsC92s!_?W|ZJNSx;@w{RH9jaH1d
znI{u0-Fb#w$1=n$nw5zGPJ*vx=uNxeTuwZJ9trHv-hG7(yi)jkV5v8MDY}|W5Z~Tb
zNxG6nhnOgWwFS(GD^|`diV~y-9Ri3)3@C_&I3XDS@CcSQH2XC_#Sh1%pO5!<r_*-c
zKm99`6=;vBZbinVo=PXMpqTA-`#GXeO2J+{6l;E({>|lNFF7q(L*`Mv=!P8-AwqKg
zA>ZLjvRy<i(&+5rV@7clT?u@OP%_7Ir94TP$k-H22B8bYBCl<kzEScodEXh5sKI;7
z&)_y^(Fu?(hm3+-rJMwuTLco~=w=qPT;0>lgJ3x24oKz|q?ST%0&*hlgeONrveD5m
zy3#L2uxx21Vvy*Pmxa(siwKCL(h)3dAC0hZzKqxhMGkQY?BJ>}Cy*VZ!9dde!(t)k
zSP7klbBqrI?LUv?G{FZ(#b`ApAdZ!cw;bq~;P3@v9M&%j33Tvw61>E1!P9Yf{hZiB
z8bd9HT_TwP+sWUv^2~{cuhGB)r%?t99e&BcfcGjGfta1WbOdk1e93m+EQ)BPVxZ#~
zXS#?Ygk7(xfAXl%Rcp=}i08t*U*S1`SH-0$*wy<QfP!Ir;*<vyC>Y}{!NWr)c2a;C
vAy64?_Fvx~_DtK>hDV1y!oz1C8y`h0ukX%J_FXYOxp#SG;&CV$5A6FFtip#0
diff --git a/app/design/frontend/magento_demo/images/np_more_img.gif b/app/design/frontend/magento_demo/images/np_more_img.gif
deleted file mode 100644
index 1c131aac80f5058be6b83ae327c4a7d2fe2b4c32..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 908
zcmV;719SXGNk%w1VMG8#0K@<Q@$vEP?d|aJ@agI4>+9?2=;)%NqU`MK?(XjI@9*d5
z=j!U};^N}-^YilZ^7Zxg^z`(&xVZNA_V@Sqr>Cc_t*y<?&9btx!otGR($d}C-MziN
z=H}+u*x1O($oTm9A^8LV00000EC2ui07L*p000I5;3tk`X`X1Ru59bRa4gSsZQppV
z?|kq7z@TvGk~AK~-2~!jHYCa0qe*Q-qBDsD!0mdG*w&=sEqfi%a0+4uI38s4RbA4y
z=buL#09KC$fPn%I6D3Q6foNfDhyr{mT8#n_g+mhnl9VirhyZCp5(%QCo-Y#)qoWN&
zp`!wQBSs?+up$xwsjEV*qLm}32>>Gv!Ji|zqPjs32+as35DCq~A`Q-jBmmCJK+MkB
z&Ir^W*3JpO+RfZQ4*~80B=7D5BM$NbeFE<eL+$VJ^5}`MCokW=e)0gm6ZnDPJA>}{
z33+g!;sFvCD<-Iy@j#yh79}prh%w{FfgL~phU`b6B>@sHTRsy3ASQu62waZq787R7
znICG##Ho{|OP?-*3Ux`e<<1`v7D!z{VyaZ7Ru|wwF!iaAs8g$2#cFkH*C7xFs2xCJ
zty*{@1h^f5C%{^UK+>*l>lW?@xo+#;MeCODTEBqT3Ra63NP`6h3Xq6Q`C?qkk?|ZT
zFraae334Z6w)_`!0nG?}MKNZYv;fn1jL{LHpmyz-A`;lHjc2xr-3kUEnLq$|Z{H*&
z6yF`7z;3$8RXA`Cy!OfHDkdP{z@0k*+1OJw7{H-`$nY+(p<mCwz5Dki3|JsxKt+QK
zlCc{wkpDw{6&9>Bn*keCpv!+B6u^N0Um`HDiew5l*q?&^1+d@;a52C@4F)g}0R|%c
zhd~7qP|yK=8xnW{1rc0OVg?^<;35U{bwFbU6?kx81TqTPLWcoRpn-o08n6ljMvl;-
ze<y0d-v<^%K#m9+NEyM98dUH>22y^20gN&%sR0E6)W@Zg8-|!-ga1W|;fO582xA5p
zd=LSNcXk=Wl3qq&rk;HIx8?^(iV$T36lBnVhY3<Zpky1&X9J%NR8U`;l4U>vibN9H
zW(0-yNoWNc<kx|L7!Da`nx2Ya<BI(W+G(h6UVx(qQbvh^t&(|Q00k!c;A0EQ6tJlX
i9)MU4eAQHdfdw8^5G%7IXviuFwb*8>?Y7y50029wMx!kN
diff --git a/app/design/frontend/magento_demo/images/np_product_main.gif b/app/design/frontend/magento_demo/images/np_product_main.gif
deleted file mode 100644
index 3d41fce4fd29fa31d5d7365864cefca63367f475..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4683
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
diff --git a/app/design/frontend/magento_demo/images/np_thumb.gif b/app/design/frontend/magento_demo/images/np_thumb.gif
deleted file mode 100644
index b56c1ea6281e1860bc57ceb6fb9c8a34bbf73bc8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1945
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
a$$B&EM8kRC!Li}?^}pD=jj^c!VEbS0&|WzJ
diff --git a/app/design/frontend/magento_demo/images/np_thumb2.gif b/app/design/frontend/magento_demo/images/np_thumb2.gif
deleted file mode 100644
index f400d153fc4afdfa98e56f9aa8ce1dc81f2b783f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1779
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
V*0P%QtY}TETGz_fwxTrz06TW)Kw<y@
diff --git a/app/design/frontend/magento_demo/images/ph_callout_left_rebel.jpg b/app/design/frontend/magento_demo/images/ph_callout_left_rebel.jpg
deleted file mode 100644
index 0a4c6d369078c0270d969aa1537d200173d03b84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 14035
zcmd6OWl$YWx9-N>Ex5Y{5;hhb0(;}`?(Xgm!8aBxxVt+9hmC7+f;$0%gkYEV`%ay6
zZrxkA?$5KPr)y?)O;=CXs?|?FYxV2$>rVhS_%rA;00tHSFnhZIuV(-pNq19QZvYGc
z9smG*ep6ilFvZLqP0Rsi-`_MauWNuX06g43@>atm!oS@}2=MR-NXUqYNQj8YsK_X9
zf{coa{*S!X7#Qg2IR6O#e+mpd0s=A;G8QT-7Ct5>=6~w{zaL(|18|T5BY*)o7#sjB
z4h$R)%<CYa{cU^*FmLiU(Ekv41VkicI9M2zHznNv-UI^+_fIP}00s^Y78V`}6%`2q
z3E{1aH$4Cc0T+=PiAxL*U)h*OC7A%(d6rweVa`=8Y%n+pLi>U4qvV2meV<E+Y6@Y#
zNx=Zhr35_>1CXfD%&m#{ZAh^HbPA6E4-5CNfxzIv!cpVGbBQ4+8wV%R;9WZBb0gNz
zisSc%Y^%_|t^&~EVBY=%4hJ9t*hr)j(|cE`r;*b9aYZG@nhuiWB3~wJlB;R@QZ`*E
z-7Q9aau&Eqd}DQAMkl17@V8Jnj^Y+Rva<dapk_H+xS5xD>mhOy`}d>o0xm_($g^_p
z=LDY+iN)ntK*fin*<VUBKAn`epZ!UMPEfG^hj+TQo`2shv{5Z|D&NGg>RVIk=4P1C
zsU#P3HS!9;ioRig3RaQ8-wZ=Ig1v$90dxZlf;dHq^3Z1f-wIyC+pQM=xv-q8tp`8F
ze8;^nh|KwLgx4F(`jIW%f}PHMEp^K+0}W|&_$S|W=2pd(zR{&Jp~6I(|8}+d72Eje
z1IUeCciv^Bssh@e$C?fGJL}+4H_3>*x2O-OpyV;S!H7zD$4s)PLc4T{<#!V=3QWUe
z{eViP`%pKXWAh@|Vx67C5UHWjwmg29txPQnD~TLV6ePxkTi+-f31Tmsu=5QB5Hoxk
zlNLp2e^Ay80zm1l5HNCiH@qyYU)J*tGRSh_t?sV?5&BR3B0@%$#bC$jFza^-E)85C
z=-d1%c86P8PTfz1ScSR+q}Tr#?k*lUS0~f1o)=RVxjS#oAIP-3P7srxm&Xf6>mlyo
z2UBr2o7<>g1c6oeVNCotD{h}CGh35197zjmy;Gh$*cDkPy?p-Mt2H=!oMZp!)y&86
z%;=n_@7lDr-z6Wjuksx?UZQRxS_^|D?&PZ4%)0RD^l!!Ycx(n{rDrao3hoqISJZC&
z>L3er%=q=A&*{o(e%f8G6*QT9ezzv@B0|%@uG@BgUdZTVR_KY6kAPz=+{6xsG<};S
z664(+yj>>wJLQ@D3eb(VTVZXOE!H*cY?!~o^=m~N32YqKvbMj?u`9j1_jwT@cm;4g
z6nF6o>yn52lC8HLqY}#{f+2YTWlY>S_QEpj`F(e{AJ9LFd!MEZY)srV3=bW@b@;Ph
z$0?TmHh_yB8uF{SsC}}11&}-|9_F(iq}}B<)z{M+W2d{eOXE+drKA&v6*=qZ0#10D
z0Thit41QfxvL}asX&x+PkVfkr7QA}}jO}<~5hY|mmY};7Je;llzT|g^+Z!t~Y$NM`
zK+45Hh{0&@N&^|aWWvO;n0$C-U-c(m-i*vIU9lRK`gYrj&u*b2Tmw5MonG8aV>cD)
zly?gf?X7!v_rrMR=hc`{y)aJhW;!<d7#r098XQj)atg&*O<s`+GrcoCJ?zc>-s_7V
zou}@pc&zB*Kid4-`%JzfB8J~`MNEcjYlM}UV1pc<f1l^N<<rD^z8K;i=|0c|f3Xr%
z^i>Odg7XdhGy4j79%e%I!LO>qG`e6Yy7=6>>7&SDQA?aP+!8hS-pU+7oXde`X=6h_
zEuBxWV&LaZP$^uuYMbiWR(L|YUIr^YuCFfSllQ6WMar%?!DbVuvXT?a(3C)MD~>43
zzObU_!TrVRzJV#D(BXq7<EOjhwB4yKn)pQw6a4FtuDT*&JsJI9g@aZ|9FFE(z7ngx
z>4GEv>|A%e<@;hIduDOUG!{HPYCDrrVoc5{Cqk5H5fD+V?1zJc@2=@pWWw5{N!e*8
z6jbEB*>Z?D)Hl^L8Oa4if<QNFDeGgUOFt^azyXKzwW$4j;g$veVKcF{^PQsY++lOG
zz2%6r3^7g`vcr!8%2(>UNTtzAc+V}vo~FMYA&sUE*-N^wfW*sbq4wSVl6LmU969Vi
zOm@pu^bYy}KXTgs%3y8zjmCYKQ<2H4nm0@Mez+;<997rS&y6Zh0yb+2#o&7p$iyfg
zqGSZk7d;t?*1LS2cm;6r_fDP(`#K-KpQ(HFB}%iziWwCo5#+~G8*v!|l;P*wXfu)F
z%TG?0p~bBH_BH1Ym|6?;cJSsf<L26)<~D09X#MtCSTBNfp%_=KAOeD#0NSz5O3g7E
zuuCY$3#2WK3qBmzv#riF<YpKi7&pH(&2Yue9=JB^1UitV7IkBnoiOVlD=ATH$ak>M
z+cRG4c=@ed2KJiY>sOuI*jD=v=>I)Fz7DL|8s8bneJ1H`sZ`h5l4rljbqqAjY-s50
z#O%>9bLnJifxe54z$3^@;m7Z2YRD@}2q{9q#nP`~J!_{>M7z=)8w@7^6UH|zx*Jpk
z?mb|N#7}e;b6potmKe%P_VmQY*>4)0mGM=%#UAXtub`b3Av^Eqqti$PvyfnK78Af3
z;bY+$@FMkJ*6$QITG}7oRhDT4MB55KPn%{PcxP~Lw$&9i>*nb7-#W^W^S3f*A4oge
z-4`Rj8~dUm?sr%<hdpmpOre@7o#UjKrQbW|qM4M8MX+Yhe!Ds?2|50;`<Kjc#JTI;
z^|iX^YOj<{bK2jVKLJIisIg(_Vd%W94Zj=7L;JLmvPCU1Q&_)*TqF<Pe#-?ObQ#c$
zCD3zuJ*AIho!Eb7x}U#V)jqra_UY?+dT#vJeSa29&Vj3kezI#Xi~CaU-{7eOg2>2F
zS+1Sp(!}w778xxjmA|mjDz!y7U(WWNHATkuA6JAIoyC>r0y-3jZul-;43UO+ANgMP
z8^&F-4B!2sF^_b$wacl@%xI<OPmIIhfch)&mG&3W!;UQgWLN|oZT@nw?p*S<+lNe@
zG+I_YE1%BmW99DEXbPsrx1W@q6X;0K3+MQQ3)8Y{)Z~heuRI<fBVEn(SduuKW%V=l
zl$GaXZCV;HYkVrV{jid{xmR!df17tMPDnmc8oUCM?lxUV=KfU5nrk^LTNPLcvz9te
zbUUef>fH+tTT+q|VTd2armNFPo%f%>FjE|4y#h3k*FSZ2C3xs)lKV5d_xNzmJgue2
z#Ke7OU8C<dVZB~VxIOu1q=d26<6nD`LU*3<9Kt!%dMyQqKNC!$iT7n{cWdzA=g62z
zQBcNvi>7FtbrdBfH2d#GWw0<i0#@)|<i*V%jU2;k?>+?(3hohQ4iB1;5K5hwv*lCW
ze9MIC#2Ys-FrtfI7AlV#nU+0CTQ8fTZ8@Q1W)X8{1;awzszKK>KV?qyh}%uaGdg+J
zUv}14K3aMnoTfy3uQ$pePaMTATYR+8?TE5YL1R>=TTd31bIl4wXs^F8@uUE9=n@_y
zjJjq>Mu5nXB!b0vp0H%{-kDyPra3#gv@F;cM%lvfTlrWBz5j~db!u^>8$G|zEJ7e1
zb&`iKz2D18Bbk*D(^NOnH}-MDFV^B}R%Id0RJUGY3}a=m)i{r1TSyJ=OH0eLUX|YB
zwh@a120}JlG6Cd_@QXMqEvNh{NCu_R%xPPcw|zV(=x&F!eWNzU;0P5Hy(7QQ{4V;)
zwTWr5%KLtCH;+uU#bcG5AHDzmrE1!E)7J;>oewl}ElNSFy8e>_*)lRHDB3jZOju69
zJ2<=uQct{?=!Ea|m>;wCfTRfoOn&7G^z0u~iV#xEDh8tI7CFJ2H7zQckq<=0=d!Ho
z0}4td@W@_mcDq++C7+m%k<C-k=$R?+c5J>n&0`QSwJdex*sav2UEI4`E+&qV<*nel
zVw(TJG3s#dL}7*HPLm&-w~hIOoA-&}ck2sRUyo(#;_1tWo2TAJ;fUNZ{^tJrN_G*b
zaBc3r#HOIhIhpEs03vlnwjlv5e$&=qDkSL-f{)fG5iE?7uX9g6LRf;lY5NDtesM2C
z%F{yiz>5Ru0Q4Y3FSXyUX~AS0XMx8CL57?TZ+rKLPw9t&t9EbOWEPL*0><M%wIf|=
zJKh1(L<IFaHl5iM{)R|@?kIN#V-Uim!UmiRfv~#fDG@V?d;r`;K&>W)fN4cFZiRkY
z)NgLH7Fj{<PTq}^j|V`H<>@g82g7$08F9LjA*f^xUO{Rh5YZFFHhu%nn6ZW)9ae46
zUw_Hh9qGq*7k`j%*gSeXOEa~t`!NuZ&{?b)i;vqg1DJF+H6t&7SbTbS^~2r<!gp;s
z23f1NSh>R#q>Q!f+%@@t$xkm;c3xa$Bg6;>5b^LinGUw>R#e=8IFGmw#!@f3b8;(P
zpQU)}quwy(#^d4Y%dxoByKBKP!+#^;wtN_8Q6MKjezm-~^;u{XP%A3V3Uo<?ud*=`
zs()fsl`CYM^dccRC-%aUbiug%KlkmAYqXKgsAxJu{@iJqL|no-i@*j71&@{re7t<e
zTA6G$8+$Wau{AY_wja5S&9^NN?F-;PE0~T~K+XT@gL2uLWmBfeF_~L5!ezcSk+Rl-
z=1Ae4$qN!>{*<e0`=t6Du~{EzS))sf>loMJu35n_gQZ0Q>arO8Ifv1G&^TB_uRv<{
zRznjqrrJrby8gs;GN$<O#FTVw4j)im`?e@weMUHgWLf<l@a!vC)@4;ZByDb8To0^)
zB*vto#<^gHIi9^{r5evh-2_|AEC~SYfEWuFVEKF_5XI!86xi>~K0DZX%eU+lv<++l
ziZ8!SK=_VP7i~#(g7h~>B7y{$FK1BJC;BaPvB?ux8NssgpW}-GyHTc!Rz;;nVW$eU
z2t$Cyj{6#3Yg4)7igUVlH?gp+y9NWeP%9L00wqS3!0F^Q*^}QV-|EGe)%(U9>GIt!
z4+RJLl%rnvPIaH2kXVDWq5Zm-F5^XB7!;jvx<|V7J;To>c{?h8S)^Gy&3zLiSwtHO
ztW{7O+FC;i3TZSBvMmd!eUXHMWhv<7L;u0Ig`AL_wpn_6ldB64thV1a;^SekxG6Uf
zcQj2*PM)E$kd<Vc6sLX9rvwSkkp10hJ<RgW6E)$@v-2+ppEsafiS7zQ39k4-cj7>?
z;?LeCQ46UlEcftkx<lIprIh1F(3<`E^YVs<)w$bHVd=;{<7Rx;s(6;8dxmGaht~Gw
zp!H;beXOpLuPwd{76<Rko_F|xm`&=J5F5S#LnMYr)^;6Ub||mrqECT$4{6d+$)kO<
zrR|#in*A%Fx|^8km+62(-wuX-M7=gcD!$doURue9k&}J94!D0#pi>lCiIQZbD6>_i
z``x2D8$OKaKLsxESFY`2F^Zt+^a)NtcrS$MUC9kqf`YcC6Mto-f7q(FFoBf&5Hszt
z#K4u>9qan;mUKj3J^TUNrw9<v-uao^qQhvFi~^nzqMX-g#A63rwAf*yeta`Ms&miS
zj5uehk~|D4)ZQ*zujDcb&Q2n;dxVwjaei(PNl+%*L4ZD=9qcTSgZZ%(lHLmhq0)m%
zWRUN+I9<4vzeIOBTcyHLCaiOrG(*(1nT%DgH%j=JOB|MpB(GIhc#G@ZN)`L^aGL8~
zUjfHfU(3GY#5s4@V_`pOY(y;{*7KJdDyd>7?T0bX?Dz5Rnmgr@HTc?Xb6@+)eYCto
znPkxOZ%Q|=C%>u1j`)&ke6M44<d5bo*QSEfS#ToLhUx)rNN(pMj}_+0n3_tb-s=mj
zOGy<=N_XC8@40NMyM9ElHEa7R9uEPLAtSfcjE<RdXQ|Ss^+iVyj7`0t+w<vm$(PLH
z!lmN;Ern6cPR~L@`;wrZn5Bd}W!~PJ<4DBFm6RNrgEOK(Y;MxB+Z~hkIj?RN)X<fS
zBrWgP`>mFO*{-#PRlQYrkrzv${<L)T@AU4{-V}Jd*kx&qb#9VbXHc=ES2&c^m3QfS
zd3INLj*h4#Wn8zkox^~?nnh9E@7t^<h{_F%+&k6p#S^i-=-}`4Y){Nzhrs-k4X;-K
z<sRF-`xk3UgNcN{=Q=NTrbFNPV=1n}({=e|>@4&$wy<j!TNtQ~g}w#hl><l-0vozE
zc`1MW-21_1Qti^|a8hY~O#Y+&#KoI6VRUB=*Sp#d-035zT)QDuef~G*{UzNm;<ZBF
ztlUZhMiQ=L=*RxTH}g+Cc5Yd4C~DE!0TK1?9PM0HPxbh<+usP-Z&o(*MKTLlbSgMl
zvV0TH_Twvm1<bYco_T24m`m77o_GHASlO%}ca)RsOH@$AYssr&;YNR7cE+lLKd0MK
zqfyDKOdE+c5=bPM@z8cwd(Rva-<j%BlbF_R=qkeQrx$<;?(px*j;XZw&}h}4Jf8K?
zA5Z8>zz7HnaPab<`+HTd`d9M+cp@F#ww0sPJ<X`NO~6!1uUW?SUlb2a&%eEN6Wux7
z9dfVu))+pzsyO2M5|g<pJ(E*CS2&W1j3Sr}5c8)GK15&$Y{o<PS#D&9sWmg~H&%Rx
zvWkK6!1f$Rejq|G230hk&o0hwYwy_DLrQR)kaN`E-L1X7C#dK;Mcbgi^RH`{0COq_
zEIkw9w)+Qu5$;4@GJ3hS#>_K@wsJN-)&?KA3tAQVzJ^4pz9Nhf<Fo-f_!8ZG+8|i6
zAOPk1n`-O7eM+uQ!eQ~=h?)B;8MkCz86K9+ogM_Fx;)}Z(^DVQlr2}R01l)rpVdlZ
z@XN`4&|+8xhaKXM0_gSUK4-b1k@HkkS(*J3h&%gbANQ$k!tW7R)+jy8zPY`K?rH%5
zY>khHG^1YbQ&MjEVhV_8uPd*LM`F&R$uJ+ClH;%PM(Z4SvZa!@u58SpOQX)rm+{(5
z<w5EoeB{(1I?R|aETW#@3WrJEezwA^DXd=9It@F^N^n!Jb(G7O<%@QBd9%Qi8jMtw
zAVbVU2BGHr``ne_2F%h%`;u3H<N$9^*jCk(=?|q9W~@c{@PE-)2!O4}t<|1WafKNX
z<Cq)yrzFuKd@3faFJLvcJmgCpAGi@u(<izBnLNykkv}qT&Ey*imq`yaL4uu>+qBnG
z08bB*e(Ak0fQz%hu!J#un2k456NM7OglwS0R?<Mxu$H)R=8nq^z>e5}izrE6$_wBH
z`1xzfE>s$Xer8R3NHZTE7s*PCj%|q0HEm%KAVpwdLSHUe2QVrW2%PAOF+?_>P4rro
zzMGPXC-9d6o#VNH+Azb{N-HXvlE>T7@A$)e?gI5RAZo{u1(TqpL5SM)?E(~0`VjHY
zYF3B}morz@RAhp4zdjg`L~x2Nrrg?`=^QWzSYYpOmYJ~L&ut=fOyftco5e{7B70@W
zlL%6?nq$?fCJfU+&td5ML)~hl>XcC{w26}acMtoa-{X=;groT$s%a#(*>hx^(^Uw=
zi*7@ZX&Ts=^H2f*DlkaD0&O0vQ3ORr%7*_kyvXF4#LNW!n+p}=FP*Heh3XO2c;YVX
zP9xkip|3T2HE|TWlhUKKEi}$LA&dc_D(Wk=oDP(>LKo}ADs+>>M(V{1^(YbeHz{<X
z`K@~H3Uq9jgvi~0-EJ^6J|HC}Z8V<GcdBw&Y>YO?XML5=9D!zsOWTj}(l#i^tE6m5
z(v?eE!@g+$G`0E4soRzoQPO)N)V1brKe^oYY~6v1!*u}G;Pcj5Gn5VuSEf}y;C+_f
ztDeNP6Q0jIwlQXDkoxfo@N^_US4FE=Z|mlloqpO9HsYtiT=BJhzb*bFF@x%pei&k@
zCOM0F<w=LGc=!kbMaqJhy{wO2)gyn@OnnO<!*<(mh)Rm^ZiB9lxM>i6(8k(AUSXef
z_`D+%F{P)^FJKC!x>BSwm4B6RR5#l3_ZNE|Ujzhl=Fd&xdQ2+<Z3e~!X`E}FjV|Wb
zCqr_5(4nK4O}X+Y7NZUva;eH<jF^pUq|_?{CyehO!y1?;Q!ZkMF(zzVEokP;W#Uum
zIq+}U)*+wNZHh>_3Ag(_-8!!4u+xH7zo<hJ@#bB;0IcHSs*rV3|56l3R*b=$00#-%
z(^r7|=Srq1i;X+xEwpvA9_YDc5&g}1#(tH}Z8%=S*Htqr#^(jTQfz^sx|0fh8-oN1
zd4tA}|Bdbrc>^EMl^1W`5I%mF^eF2eQjdd4R8I+E2nH&dMkDQ^mX5n%fn93gZZRf~
z&BH8t3qUx+nv8e4kV_D_=g_3v`KG`vhHktHnlb4!_Q}ws3@K*vsO%l4)09#pyK{ji
zd!Jj8dJ;2IWz<eiTB{_suAj@=DAlWcq;G;7{(01`4}@~3)JRnIwqr~M81MY%^Ur{3
zX~fop49Hj5$|SZq#gv~zWkZ%^&2@Mv>6Xzh<*l;JbwY1Soqr}Jt?)BA>lgT2Qg(bG
z143aJ*&-kiB@VvI=<>vf5pUvnOH+{+=MU<5oLuP957-)l=G;HEK=ljQe8s?u3p%qQ
z7o-odQR~3pS4;DrvundHDnsW3y74x&k=hlBvvZz|u49Hao^(b(;lQdyjbQu!V;P1;
zvm`AN@|Enqp)wXi3;bc_!MdGvO6A=-U8#}X%6<g<o_yDQOq8#!t~27W5|hRa_U0x6
zxDK2o-u5!P^DBH=kIl?f%fH9tI_^JGiBP(<J=sn1NXZ5>pzhR|jy6CvT2X_<0|>*)
zeNr7czK8f=Hw*1~7_egrQ8EHN(y6838!F@LRBa$d0t{o4_WQ9(joid!20NG@T=Y`j
zLIv2J1jVvv(W+()r{W=yN@q~MsdD4D19+{ohTm-&4#328O8@p)_I{*(YK&v}+ZEsy
z>a-0fqiWZEGBdT7pJeLV7&5e-3~%?GrtC{x!Dq6&^U>Yk%l_j+V@^Luv}^)^p9Z@D
z`NP@vniBTjX6)8ZeBC05OZcmFP4&dF9-d^wnuLGN#1c{L7f3@?3c@kTt(BOC1@evE
zhX8s?$ee%w?a=E2P2z53{;@VDQ6&Tz6<?{t++mm7buxmZQ3uQ97;vr0S17_5i!jF+
zs@Th-PPg2znPFo0W|)#ZF#%F7R`<R>FxX4)vGfXcg_!vM>to-C{cIqYXC&pA_udWr
zRNW_uf?M4-hNkuX8!9dunOycLE>ezh$PTe_zLDDQ7ZkA68DFwi4&u$7`yN_b(MU>(
zcuB4JK9qKw^E=9)!kvVHIa@c#2M77-_z@a>zS#sk%BYvcFM%};b{z!e=G6`YMFj#d
zDrtpAiGc1uPH+kOY7o3O@7##Nd{D^v3PDW#VmJEd?VsK|iTS&B95ofn%N31JXVVR9
z4JJEWvet9}O6VJ4)(51BGE>Gb&PjP<9|z3L|D@yOX~Cf`&a(Z!Pn?-Q2Rb|8MPAmO
zsuZVn+HY+iYitc2W+0_6Wl1Xc%808W+baTq&L~k-l1H|A%Y_Bvf2Itsb8uhzw=-KG
z0Nk6Ha%Ai4Q7%`X@qGyKU1@xY$pRQ%C8&G0niD=^hK-6MC3HY+l&G`YXy3TG_cki)
z;Dzfk_>>$D?oLutC*Ey!f7p+Eu{{i|@mwr6*t<G#<?3-UEyy4stxC<u(xN}C+&d;!
zh<ZgsNfaiTbIpiqtE1xQ2fld=C4I;T9`Cur(oz7V^W~p7HKepQ&aP5D6o`Z(+;t*&
zsR&1Z>!v}89LK@a+ZD?VM|#cT;z1IRKURCr#TDv67s@@+lypiTx+js*G6C&*A2gdH
z<a)n_C!lt4)ztt_JgJURdt-UYMN)OtiS>rN7RO`lq&GoNe=}vRiQ3v3MnKy?epaWK
zhc5PIgIMUnyo}L|1A3EV%W(*2(c|0Q-cc`7dkDjQb%aT-&NSNWd24w=LBACBD;A}+
z|5gX}OZI(tU{ix%#*oD1EwiJO_70wuZyjI4UEgQ%aK1T-j)*Q+(GcLNIhbq>jIX^2
zryxL)@sOEZn-6gH45YhLU`2}&Q^^XASF-1oL7;c2I(7RNe5v}w?1^PX{aq)}a&jJ8
zJ(P4#Iod01lA6z=7ws^ne2RF%9tgN%QIY8tN4c(){8^}?sR}IdMAoyxl%Pf~WA0y5
z?D~$vBCwQK9AFQBQ$D9wIFtERuBypr*rHVrDUlnM*oza85}r(<BrbK^)D**XYvT=%
zHwV~N4`!WF71s0X621!utXo3FyqG3JK2{I*?7Z7aDWch^RM2AGCOo00F~4JHPoA8(
zShXa_^Gz=~w~m%|;{7lv@aRDZN@?=@$XebHTgBo20LDEniAZVmmtC?c{FM{k1+-Pv
zSG`J*iE6_6`&m~-L&YnBIi2WFMMMau{2~6;{vgVXziwuKzEZK&QaYSn<QHAhhIF%V
zA~fp-w|p@n*f?yR$AJt|Lp#T_5?)438~V>Nr0iQiJvh2bXUW2fF?#0Q1MIs|QQWOj
zRe0#>t$A`yCQp%5ucv9_$D<Q=xgPxVtR_Bgc|y51a8I&z`kX;vT>SfkV3lYV7$cHs
z$Ry8#+rd}LV{bGeDx5$9c?s4)OKG=5&#FLvz7gpiNM;tq@Sf)@S|-d}Fi_`Faia{h
zg!2sMouz$?^?G(A|FdMGmrvcLbGly;<ejK#nrPFOibl+eoNMz``;guHeD%$ly9LV<
zy#l&XTEnP6DehMC-ZU^J*DGoufw}{ax5G^rI~#@TVAr!KxYK-KX&OpJkdEUFYQ?LX
z`J2xjBS$8Zo7#0!FVM%O<mI4!V1sz*yi-xrPR)uE%|<~@@M2}fVrh9!!{?}R*N5cZ
zMgE7l@ijiZ?C^BD?#wY>Zl9$ZfoyGOX-#RFYMqJ?HC2B`KD57pZV62t95^QQo$G7F
z66-!$Ev&u*2sHfB#FM!0GB@9i3D+C|XC)j`wc3d}`n+hvN9|u0S%tS{Dmr-<T2_vP
zntMDf{zlcRjY-5ORj;e<(Q}k6i4-a;UCVd1q=*Wc6n_Bby6}kLA&M`2MPnUp!`F=S
z7UO{G|M75yaD;^h4EGsWYm&?oSjDqdr)TC+D95qTh7FH$l{W#e#S|@x0i{h;xTz=C
zGCehji}YqOW{s-ve+yPE8`(1}*o+xvH9C*iP$3aQVN*(KMBPyqK62*4*i4o^#hn}~
z#CCOOw0^nLg)rbz?d)xvPF{Q+gVKZ4q~}yx$kc<{%w?Ic=q2({OU{kX9*Nd^gugy-
z?Ot)lS`c)%wr3du@o4b(8k#X7+P?C?cAKqSGI=Q(1W!2$XWqztX}gr5i_{<p?Dt;m
zlo#rsRjZJ(fuwtK+>Z=s$|`vfT+CvEEGqaSeN7-h-Dqyf<3!rKEbt~fVJOg}pjcb$
z8s=yBdFR<GF=}|+)0zbMQ^+O5k5BR!e(tvLR<cWG;YaYA&$j0x9{G$~hV>(V>HLyJ
zr*5d;!mQ(;rdSNlH^4MMW$Z=1e4uHqm^o}!Mf%-G&!1L1qjB8ZX%iDL$My0nSZ#?B
zQ~)&Fm~G-0W3}2hZx0IYV63I#Qcm2>h#gcJV2^;4uWoK7J7UqqS=BR`+%mXPGWHZn
z5+1mY^r}Q6<;oapYypPW@)8&P#iRaC-Yy#>ItK;FEZ9YgG&!nvpyyDUs8zR)$&s0V
z&Yg(ju*kBOaw?#YoS~zKzXR*3l>?VPK2ZqK4sls7XMk)*pSsh>;$|c4kJ{Hi%eu)5
zWi6`#zh^@9RAA0^ncM(Dsc#V=l7WJXlV=n~kety0BfWQA-L9wC$!!g}jOygJi<wy-
zJNko2hV%5)hkWUvg-<of4qrch4#<cI=Gw0XMAnmjVY%fGPTXciAmoj`Zc4?u3{l^A
zTh78zx1DMEWf1x{7nx}@F^SG#?_y`C4a`%}pQTouSAfGOo7-^`?gU&1Su|S*1cy<M
zXxpB{;f7NE#60kxxFghgX$~RgeCu}(g3R>`w)O`NmD|vTGgp<u@`4!^0Iwrh?KCcz
zS!SW8`Le#Pes{MrgB^*zVK>W{q9K}t7s!^DEg=t4XI_Hw;70~sFX$@whK?VR+496O
zG98Vi-4qrCO1uInwrGtU^~a*4X)q5{>D#Vcaj5onbrujF2ar`pTNTp?RJ0oJmM(_D
zU)Mc~fyEs>)G!7rk@DX^$*VzrM7eXP#xnzV|46CTlON>1%q2bNtCzD?bmxLz0eTm2
z**wer54M$BBrJ_|Oz?)?{-qZSbjN6Sd~dt!1PBxHTha?ai8wSPnrTC@p0WBa^+8!%
z<cIE${Aq_0+`~p=ehoFgIO&8t2nPEj*fh}a`_(u`b8Mdxy{oVL;IEmyv3KW%A<k5#
ztXa%$3lJ1lu6{@};8Sr*X&#e?yZ%&+@Nmo;A6qW_fobc-Z8W9ZZ(h$v>e1yx{idi6
zHWg87@lO^Y1P86;pG&#~0SB%~RcGzKarYlcPrSwnqZtH3RtJZdKr@4)GTOajo;s86
z8i_8OYu~~I*(cOZlQ-%TACX6YrZP)~ExQ+&{k4B^pVgt|e<#g-J+ET2e}!(g%^8xB
z5>&*@SQ=JJj&yCaG~6w-zEm7u?;RtEeDw;D5vIw%3&lEnn*ZX7!Jd-ipJGXd$-)vT
za|X^Nw`bhOWc&J<HBYrRNgmn6ABsR4X_3yga<OP<2HZ<obtASb<|r>N)3fGX7#I~I
zx3ybhoy~f@=e`IaovI#E?BKov;4TzdbG|29x%&dU$G6%QiT5V~wXwFWI&VMJK-%HZ
z$ZWfPdCYjBlVCID6!bF{W-i<hAwDG8reTCKNjgol-Eqp|y?c2bL~CT)8qb*OLDn8C
z*~8Dq+FCboqgzZlKU)4fba(`~W+$6SX&sqmRlNWt(Ti9Cwrg4)%~jLxy5X{`^fNw9
z9w_XtbjqfzL}6bwX63e$MV)$E$xSJA`Q0ZXqqQkQn*2zhOA&61V5#m=p?k{gcj(__
z*`uPPHrCv^iizrt?FLd&Wv50!=;g9!o7Tf^#~P{h5<xpGc!)Ct#inQ&3IR#>z~Vrk
z;mY-PiZ?r)O@1zV1?Wpju+&-(=H9lP87f7hh+MHPR)Gp^-{Zq_ZU)TX`{25V1*#_e
z3-Rat68|Up3Xc1?nTPMROXzojs2awnO3+Kn(#?@^Knc}hETf@!$hi4P%Bi(DE^10K
zn>7rT8^r3AX)05z<-M*W3S)MbZhAXWhQido0awJ{dT|S#1v&K!i;_W8xWKXdclj4&
z3K)fm7|n8^WX9U;`UuxnL+-kZCMEow7mYA3ZG{c3eGmY}EgY&2;jvZBWG%(;?TH}H
zHT!Up{UMgQOhafRY=ieyn?h$g_7xyiDX_m`T6<Qp5H+}JKc!PFM;P^kluloA^E<$c
zfGG=WL?3g;^^^YyTx$=V7J3uXkgC`r@=?1=AKeQ}bpw-5n%4^D_<2U#ny|?|?oN<w
z83NbRAy^`cuztG_H0MXaGcN090UX>Fmu>RIU)rbTA;!!Zi7>a9|1yU7SsEL*b5Qn}
zsw=EqHonr2lQzUa>D^`~gF)O4Eyb)}?}*3bMR!$;{)l<zuliY(A>our+`KU6{;*W$
z;Y6jMio-Lk!ovyD^jtB+e}6cLI5MBPd{Js(E9Nz7S#$s*&}jvBY81wy*Bb1HhpUv>
zjaKSUMB!;b1-Z=c@K(;jVn>uY#sjX0B*F#V2y2!$=y#{X0;QdVS24I>AeFpkNGM>h
z5JyL5&HAG<e>D1XyI+{169*9!`#?+%<1WD&XB9y@L2|`(B1n394~ojiQZQ%WorZ?W
z)R&{YuIHTRjLp3l5q3%^v&?buI0Kt!DtW^=C<f(+p@bCzSeey%pLwV({-2N-t}T7u
z>=zVd6q!0g044x!QQ3rOQXQs=&TAp*nTLluwY0I*>_UI<;Yil&uJ7L0^jX~&*NSw>
zh*Old_f*8{u^UA|;yGSqw(uWBm;V+$L3BP03mEVcuCt@x{pz`)qH!8H6Rfj%WbR&`
z;GI2w1|6P`uS;Lfz*tI=x+!l*X{hqCl{B5Xjf2W1WF9OXD5Q>K3ZIbCopOAR|D7!@
zO6H}zS<x1<p<NEFSvSF)U(q^f8#X}{N-4WZjL>yB+-N>6seJ`xC5T7M&#w8~-_7mD
zu-_11A$WJ`f`zJXUqTU=R*}b8@Z=fJH#kI$oe-O84%ZoKr}wJ(axxMqF;B&~0!?>-
zyBK>eHNhlqo;v1xS7#Q$JeAZ0n0gS;_2S|Fv|3qn$_tW*A2YBU`R@A7>in9<MAONU
z=s2RLf=~n^lTCNDz>%?<g(D-WE~@A2*IA$sz>$e;j{V_D<0+_^uD;2WY!ryL_Gjqx
ztf6{?<@)c9lrg9A5utW|=bSaA{K+IddwK68Zk%NXc)kb3tkKWnNk%(q@rx~q(two5
z=JDCg()JG@&$4APEIkpqidF^dGrc=+Jbbdx=7fgV#cd`%srhF#Tg^utVN#-Y`n>q@
zi;1YP({sAdcQmC9rPvpWeeilTq>{6y+e3$g4h%o6>=ft&RsG8}T5H(%npSkq_yDPH
znU$QX4lb_%JW{T<jp;$@m+bzJu?C3GXmTC{%vzUmRF#iA4R*&;_1bBlYV&-{Uy?*c
zAG)rISFx&x;6LKyx8jR}#l0Y)p9nfd+^u(d>wIww-M`bn7qJp99C_W0iz(aR7fQ1_
zTe0k@KFm1II1Y@}13Q8;@+-N;gQOp)SA~CxD<qCxB)!D__kAi;uGPC>esr=|z}0dp
zvE@<9>YT`~x<M86@4Nd9?2SOe>s2D}f`TpSe#MmByDyvFa_klFTBc1oy&cg>PrB^K
z5u)pp7fKAx8cy1rcJv6cq;}kS(pj%1gvK^<A>im7Ot|+J1TpL%s4<luoFZ(tXy*
z+G{IV9g8m*I@@usos<(zhH!N;FHh*aMIR$}y0SrYkA|k39vTH!HNeeZo|gM@GpQ|k
zEjMf{toCa*VnUyPzVS2X`_8tbBP}B&JtMS)=NpYK2s5edqo*1*le|jZ9ctf-b!%(t
zcAc0b^ZC6!+O;jY=P07WCc8elf>q-?&S%|WjPn_xI#ph%H&;8=x>nZ>+6@Jg`-k_*
zoGqwYn81jnrIhveb0D~q3%yr>Pv_j4M0EF3vbd=M*rkScTv&s>loWQatS{R4F<Ps4
zyO#M@@JQL0P}G(&cLJ=<B!Nb4yMsI9y@8?_OpRW$SlmIUQL8Z;F{^gWCO68?qLfy4
zwQ~%gT1_nml4&Ka{+?7C_m`zxn_WCq9@;;;7Y}tMn-A`>btsGYP<d>ChsS#Ji*+*P
z&(j)nOA#X!c->ce!AYuok8n;jF<BiJ+<JL!OiL7N+?J%$#;h}7mq$$xMkPrR-Kl9D
z&R=|AH5XcyVDrtD0%Pwd??CZ;QpOj0lDH_x*0RlB>nV?M@2Fj;mN^P%YOn?R$1;Xz
zDS4Js8`2fj!<Xlc$4oja?W(=8Bz#EmkSbKt#phyNhm`lKq*@(Oo8vF7#v|rW!+~p_
z=<9cEocxefq0ShBhM;vxCc`4^p*f!slHt2FcT=S}dRMiN|K6=?KT2;LfmSKcV*N>k
zW%4X-u-`(%QukA%!984YVky@<qp^pMxT;31;!v=RihMI&=%Ai&GjksXNa8}oyt^;i
z{EqtICtoDSOlhV!L}-J4>$sW#DnR@r>nU%;FD$9?K0^7=!#j57b&t<#@a=h$DiL9v
zTB!6*IiT%*-9a1uy=jLHv=6Bdk#`a5d~6wTmcKDrC+$IH^uu_GV3~BXDrOMKv+);3
z!9arTRTO~_pYcgETWAippr6{l4$GLTtq?}pP3~D`?RT#~wg%FazM8elBYXC`hT>ft
zRdA~~mx|cZ34Q9th2@L>?ozUuqm!}f`TJq<!Sjwzmpn5NzOz+UyQhcWDXQhNpWK;0
zAA)|Tc){q-(mCxpOpD7yC##|%dh2*gCGX#3@BW%nnj=h`E9$rwS+_^9vYmF<{L@Ta
zjoghZmCDI|z(@&MU%~g_%rDpWMt365m@ED`Dug7)&YkO|nTtDBk#a!fu-~AR+*tpH
zx`%%2hY^u!;x|oO2zu%@SEa3;lL;S2l$?bZ0wbCHvy1H`2s%{O{Q?36nN6)mMjOgu
z;lu<aOIJ{(_L%7sA+@y1ZHwQH&g^yWNj|(lyZR@lk|D{RTn{MMOZowFC40c;svC&P
zn=>(2xKS9EbfFk~T8qbW(V%b-ucGgm6-lSaf}WXKzXB{cyjvOq=j(H?>LFjGUjgd!
z^FFlZVVEvxIc*OU9Uf#W`jGx!t`CGox&0QXIiq$i+Jd|*iY~vZ7VJiN^9tcw@)K)s
zesiy-3R@#?V|BhuTd{gFTC3EFL@TV}O;@`G%E=@dNtvJ%DwE)A%uHCF6;ZdW+EX)&
z<7NR;f{hT&Y&`N%VJLt7d!3bhPD&`0ev7Q0i^B%JZE2a1d*8QkP=0-srEO}oLS$RO
zUMr?HFAWkP1Kh0M(eBcv+%Du9=?UoU2S{^`VtS!)d1SW^#+A1fGK;P2&49o9M^>rZ
z77IaoFh)}CS-_6WUl}VIxbNM%dmh&G`m@N#xUfv|y!uttW74u<Lr$Zv-+6_=hD6ze
zpGkVCPKPpnNTAJoiV1&KJHS@rxN&z@2(AWD@XpE5K9*i;%2sohOF<TA!uEDOcU0Ht
zD<391o&Nwt=G9l=yBb0X#;e#MF2o~0XwcxAyn5iZWZ;V0G-_xc!L4B=IWy*^Dt$=_
zp0uss#y`h@^+m%}d7LwBa%Oh^V)s)vn6b_%g~^G`Eek$4K-aLo*lM$?+SBd0edQ9E
z#!Y&CsE|Y<8EY!TATbU)rxu+xshPETHovrA$)i<|Qn#F0ls&Q&7Q4pzrZ?~kP<BXM
zpS<E1_(n5sL!}b}CH>@3Evm0ihS0@`rXznWbGp!NQ<DF$#E^fdhrlXs3csag(}d-i
z1dNXS3;1~a1AP8fMEUE-&U2>7d%75o;vQ~_#W6v7f`jf9pHTjQ=+N>W3!pIKsv#ur
zzx~=j1hymbds!=gK3PG%rtT0AU(p<th=C_X3z@r+7Hw;YFaNsoQOejsSQo5AoB)B^
zMen74wRT>Xqr)4X=pc_x^zlncIId(QM-`Y>(G3=qpcbqfb4^&hgn~Og38G#4KFQFv
zB+t$oyUrjScmGXW%{7rga=K1H`sS{b3OV>5F>VvgEL7{^;3%dVAu0z<{Ki-;q|d`~
zXH_wr3~^6beOft88HMaOlH#>em$8!dE7dB0pErqALM7!#VWzTTwnwKHWjaw&vgMa8
zuc^(?<2M}L$beoSd`7c{I<!-Z8*Jy8LzUc4oY^s{i<k{mLi~y;BZ{@u$+OsX=(L+v
zw*T9t!ids6@19d$GlAx)pVj}v%zd!`E5iWL4Fi?4n%8n+8`e!Cm@QtSka2Eie9Je*
zmV(i8ptKB7yP#(tdB4%O4^b;)WoJwXZVqn|fn|YC61Yn$*P01yy}xviJmhf<&Bulf
z??SzZDD`E&n-y4nO5ERE((<pehRT8v+KJUY`&Sgj?3)2|SaBGkN@wFNMOvXjZ|8@8
z0xHslH~;SkTX42+6Pf}?^Qj3XtYe`v`u(_kzy<*%EqOR;gX^u#!vfcX8Bx!)ryoLi
zxxf&(uGWM0qwI$!Z1VkHo@vR$$-JOn><=|QjKcQtNZyW<uCx5Vt*8XY18l!VPiKk2
nZ0i2jyHW64MaKLe))}n926^{cr^o#>$uEcDP1F#@*OmVT7ii1*
diff --git a/app/design/frontend/magento_demo/images/ph_callout_left_top.gif b/app/design/frontend/magento_demo/images/ph_callout_left_top.gif
deleted file mode 100644
index 68e4df8b85092b5e69d0c3896f87deac858ed526..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 29101
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
N`>96ALJ0?)`yX~e7p?#R
diff --git a/app/design/frontend/magento_demo/images/product_zoom_overlay_magnif.gif b/app/design/frontend/magento_demo/images/product_zoom_overlay_magnif.gif
deleted file mode 100644
index 7d9bcf29b408ca07306907f9931743955cdff775..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 706
zcmZ?wbhEHb6l0KNcoxU-^XJdYmoHmdTI%cT|N8ao+_`f`Mn;B)hMP8Rdh_N@KtRC1
zfB$-WdvD#k_2I(@Q&UqXCnpmVlY<8j-nnz<%a<=7KYslB_3QQP*WbT?KYjZ2KY#vM
zSy_Gl{JF5O@aWN_78Vx!_wRrG`gK7;!P2Em6A}_yTU+PPpTB(h@^|mvMMg$Wnl!1S
zqhraEB{y!|=<e>ev9YnWwav}VwYRtb{{8#m!-o$YI#gd@-`w1spP%pV@BjDj-}w0W
zl`B_1fBxLu+<fcStvx+G-@bjTs;Vk2Elp2P&&tZ0Jb7|?dAWmw!`ruSeSCa!a&m6p
zz8xDIYhYkdQ&STd82J15Z%0SRd-v`+J3H^#v7@@WIxa45&YU?74Gkwxo?NzUS#53Y
z|NsAWb#)nN4-|j0FfuU2G3bD-0>udf`~QZxCVmxV-PjIeR>=VNrv3>6TAZ<pj6!na
zqOrVAOcVNpqNl2<%#ZVM<#3eH=3l_>7AtJApovLUgHv{aHK&B(gpPi89&T2F3Cgi*
zY=>ee7?^U$OyKqOU2u4USs=#*7Dl^U7baMW2p<w^>UjI^0y7`OA-Om2-^B@v%1jUw
zH+tf*bb|mx5F?)plM~aT$1F>DVg+(4*gQQM7?cz=6POmXOm@G$XHUY#rKi|EnAapY
z986HsU=8Mo*^%`6a2E?hMoQp=qYhkbe7iDsJUnr&nU7VBVZnn1O{`2TCM7Q&k4{^_
zC@@c9#s-rEoPypQ1y-qB*GyOL*kWNEeT`K~fLZ>=w4+TO?RPfW3#{CceY%0g#ra25
RmjHtc%fSUKM|fEntO39P5b6K`
diff --git a/app/design/frontend/magento_demo/images/slider_bg.gif b/app/design/frontend/magento_demo/images/slider_bg.gif
deleted file mode 100644
index 92b4e8c84b681122bda47df464715572f5321fd1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 68
zcmZ?wbhEHbyuiT3Fp+^_$Npnm_a3QipTfYvp!kyoNHQ?!fC!L01CwY^-^$Z(`4`XG
Ta;rO=VdroDwnr6=tPIuw;mQ_w
diff --git a/app/design/frontend/magento_demo/images/validation_advice_bg.gif b/app/design/frontend/magento_demo/images/validation_advice_bg.gif
deleted file mode 100644
index 46b1a2267ba5ad31f59a9c6cd8eaac9ee3b0f8ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 134
zcmZ?wbhEHb<YeGw*v!N5efR3Gi+Vq|<$PN`<DHe@&&Rhu1nT^HdiR|<-?uG`-<fiM
zKd|xluWt-6p!k!8k%57SK?fuNGJ}D|c!FoxGGCR*X%n1gT@mDBG-62NIhCN$kRa2&
gNv2Ie#%HfV`++0dU*7CG;(KY+91%8APZkDi0Dg`$ivR!s
diff --git a/app/design/frontend/magento_demo/media/preview_image.jpg b/app/design/frontend/magento_demo/media/preview_image.jpg
deleted file mode 100644
index 3c9b11dae2719b47bf95d41e69136f1e56ce2904..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 11420
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
O?Eh-yznc!fn))Aia{h_{
diff --git a/app/design/frontend/magento_demo/theme.xml b/app/design/frontend/magento_demo/theme.xml
deleted file mode 100644
index ef6fad5d654..00000000000
--- a/app/design/frontend/magento_demo/theme.xml
+++ /dev/null
@@ -1,34 +0,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.
- *
- * @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 Demo</title>
- <version>2.0.0.0</version>
- <parent>magento_backup</parent>
- <media>
- <preview_image>media/preview_image.jpg</preview_image>
- </media>
-</theme>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/title.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/title.phtml
deleted file mode 100644
index 63eb6350d45..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/title.phtml
+++ /dev/null
@@ -1,31 +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 $_product = $this->getProduct() ?>
-<div id="customizeTitle" class="page-title title-buttons">
- <h1><?php echo __('Customize %1', $_helper->productAttribute($_product, $_product->getName(), 'name')) ?></h1>
- <a href="#" class="bundle-slide-back"><small>‹</small> Go back to product detail</a>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle.phtml
deleted file mode 100644
index 6874d318387..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle.phtml
+++ /dev/null
@@ -1,59 +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)
- */
-
-/* @var $this \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle */
-?>
-<?php $_product = $this->getProduct() ?>
-<?php if($_product->isSaleable()): ?>
-<script type="text/javascript">
- (function ($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_Bundle::/bundle.js') ?>", function() {
- $('#product_addtocart_form').bundleOption({
- bundleConfig: <?php echo $this->getJsonConfig() ?>,
- bundleOptionQtyPrefix: "#bundle-option-",
- bundleOptionQtySuffix: "-qty-input",
- priceSelectors: {
- "product-price": "#product-price-<?php echo $_product->getId()?>",
- "bundle-price": "#bundle-price-<?php echo $_product->getId()?>",
- "price-including-tax": "#price-including-tax-<?php echo $_product->getId()?>",
- "price-excluding-tax": "#price-excluding-tax-<?php echo $_product->getId()?>"
- }
- });
- });
- })(jQuery);
-</script>
-<?php endif; ?>
-<?php if ($this->displayProductStockStatus()): ?>
- <?php if ($_product->isAvailable()): ?>
- <p class="stock available" title="<?php echo __('Availability:') ?>">
- <span><?php echo __('In stock') ?></span>
- </p>
- <?php else: ?>
- <p class="stock unavailable" title="<?php echo __('Availability:') ?>">
- <span><?php echo __('Out of stock') ?></span>
- </p>
- <?php endif; ?>
-<?php endif; ?>
-<?php echo $this->getChildHtml('bundle_prices') ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/checkbox.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/checkbox.phtml
deleted file mode 100644
index 56646524696..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/checkbox.phtml
+++ /dev/null
@@ -1,53 +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\Bundle\Block\Catalog\Product\View\Type\Bundle\Option_Checkbox */ ?>
-<?php $_option = $this->getOption() ?>
-<?php $_selections = $_option->getSelections() ?>
-<div class="field option <?php echo ($_option->getRequired()) ? ' required': ''; ?>">
- <label class="label">
- <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
- </label>
- <div class="control">
- <div class="nested options-list">
- <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
- <?php echo $this->getSelectionQtyTitlePrice($_selections[0]) ?>
- <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>"/>
- <?php else:?>
- <?php foreach($_selections as $_selection): ?>
- <div class="field choice">
- <input class="change-container-classname checkbox bundle-option-<?php echo $_option->getId() ?> product-bundle-option" id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>" type="checkbox" <?php if ($_option->getRequired()) echo 'data-validate="{\'validate-one-required-by-name\':true}"'?> name="bundle_option[<?php echo $_option->getId() ?>][]"<?php if ($this->isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?> value="<?php echo $_selection->getSelectionId() ?>"/>
- <label class="label" for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>">
- <span><?php echo $this->getSelectionQtyTitlePrice($_selection) ?></span>
- </label>
- </div>
- <?php endforeach; ?>
- <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
- <?php endif; ?>
- </div>
- </div>
-</div>
\ No newline at end of file
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/multi.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/multi.phtml
deleted file mode 100644
index 50e74d9111e..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/multi.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 /* @var $this \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option_Multi */ ?>
-<?php $_option = $this->getOption() ?>
-<?php $_selections = $_option->getSelections() ?>
-<div class="field option <?php echo ($_option->getRequired()) ? ' required': ''; ?>">
- <label class="label">
- <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
- </label>
- <div class="control">
- <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
- <?php echo $this->getSelectionQtyTitlePrice($_selections[0]) ?>
- <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>"/>
- <?php else: ?>
- <select multiple="multiple" size="5" id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>][]" class="bundle-option-<?php echo $_option->getId() ?> multiselect change-container-classname product-bundle-option" <?php if ($_option->getRequired()) echo 'data-validate={required:true}' ?>>
- <?php if(!$_option->getRequired()): ?>
- <option value=""><?php echo __('None') ?></option>
- <?php endif; ?>
- <?php foreach ($_selections as $_selection): ?>
- <option value="<?php echo $_selection->getSelectionId() ?>"<?php if ($this->isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>><?php echo $this->getSelectionQtyTitlePrice($_selection, false) ?></option>
- <?php endforeach; ?>
- </select>
- <?php endif; ?>
- </div>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/radio.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/radio.phtml
deleted file mode 100644
index 5c9b0991dba..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/radio.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)
- */
-
-?>
-
-<?php /* @var $this \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option_Radio */ ?>
-<?php $_option = $this->getOption(); ?>
-<?php $_selections = $_option->getSelections(); ?>
-<?php $_default = $_option->getDefaultSelection(); ?>
-<?php list($_defaultQty, $_canChangeQty) = $this->getDefaultValues(); ?>
-
-<div class="field option <?php echo ($_option->getRequired()) ? ' required': ''; ?>">
- <label class="label">
- <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
- </label>
- <div class="control">
- <div class="nested options-list">
- <?php if ($this->showSingle()): ?>
- <?php echo $this->getSelectionTitlePrice($_selections[0]) ?>
- <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>" />
- <?php else:?>
- <?php if (!$_option->getRequired()): ?>
- <div class="field choice">
- <input type="radio" class="radio product-bundle-option" id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>]"<?php echo ($_default && $_default->isSalable())?'':' checked="checked" ' ?> value=""/>
- <label class="label" for="bundle-option-<?php echo $_option->getId() ?>"><span><?php echo __('None') ?></span></label>
- </div>
- <?php endif; ?>
- <?php foreach ($_selections as $_selection): ?>
- <div class="field choice">
- <input type="radio" class="radio change-container-classname product-bundle-option" id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>" <?php if ($_option->getRequired()) echo 'data-validate="{\'validate-one-required-by-name\':true}"'?> name="bundle_option[<?php echo $_option->getId() ?>]"<?php if ($this->isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?> value="<?php echo $_selection->getSelectionId() ?>"/>
- <label class="label" for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>">
- <span><?php echo $this->getSelectionTitlePrice($_selection) ?></span>
- </label>
- </div>
- <?php endforeach; ?>
- <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
- <?php endif; ?>
- <div class="field qty qty-holder">
- <label class="label" for="bundle-option-<?php echo $_option->getId() ?>-qty-input">
- <span><?php echo __('Qty') ?></span>
- </label>
- <div class="control">
- <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>"/>
- </div>
- </div>
- </div>
- </div>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/select.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/select.phtml
deleted file mode 100644
index 30109f60406..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/option/select.phtml
+++ /dev/null
@@ -1,61 +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\Bundle\Block\Catalog\Product\View\Type\Bundle\Option_Select */ ?>
-<?php $_option = $this->getOption(); ?>
-<?php $_selections = $_option->getSelections(); ?>
-<?php $_default = $_option->getDefaultSelection(); ?>
-<?php list($_defaultQty, $_canChangeQty) = $this->getDefaultValues(); ?>
-
-<div class="field option <?php echo ($_option->getRequired()) ? ' required': ''; ?>">
- <label class="label">
- <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
- </label>
- <div class="control">
- <?php if ($this->showSingle()): ?>
- <?php echo $this->getSelectionTitlePrice($_selections[0]) ?>
- <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]" value="<?php echo $_selections[0]->getSelectionId() ?>"/>
- <?php else:?>
- <select id="bundle-option-<?php echo $_option->getId() ?>" name="bundle_option[<?php echo $_option->getId() ?>]" class="bundle-option-<?php echo $_option->getId() ?> bundle-option-select product-bundle-option change-container-classname" <?php if ($_option->getRequired()) echo 'data-validate = {required:true}' ?>>
- <option value=""><?php echo __('Choose a selection...') ?></option>
- <?php foreach ($_selections as $_selection): ?>
- <option value="<?php echo $_selection->getSelectionId() ?>"<?php if ($this->isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>><?php echo $this->getSelectionTitlePrice($_selection, false) ?></option>
- <?php endforeach; ?>
- </select>
- <?php endif; ?>
- <div class="nested">
- <div class="field qty qty-holder">
- <label class="label" for="bundle-option-<?php echo $_option->getId() ?>-qty-input">
- <span><?php echo __('Qty') ?></span>
- </label>
- <div class="control">
- <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?> id="bundle-option-<?php echo $_option->getId() ?>-qty-input" class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text" name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>"/>
- </div>
- </div>
- </div>
- </div>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/options.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/options.phtml
deleted file mode 100644
index d09c2cb900e..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/catalog/product/view/type/bundle/options.phtml
+++ /dev/null
@@ -1,55 +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
-$_product = $this->getProduct();
-$_helper = $this->helper('Magento\Catalog\Helper\Output');
-?>
-<?php $_options = $this->decorateArray($this->getOptions()); ?>
-<?php if ($_product->isSaleable()):?>
- <?php if (count($_options)): ?>
- <script type="text/javascript">
- (function ($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_Bundle::bundle.js') ?>", function () {
- $('#product_addtocart_form').bundleOption({'optionConfig':<?php echo $this->getJsonConfig()?>}).trigger('changeSelection');
- });
- })(jQuery);
- </script>
- <fieldset class="fieldset bundle options">
- <legend id="customizeTitle" class="legend">
- <span><?php echo __('Customize %1', $_helper->productAttribute($_product, $_product->getName(), 'name')) ?></span>
- </legend><br />
- <?php foreach ($_options as $_option): ?>
- <?php if (!$_option->getSelections()): ?>
- <?php continue; ?>
- <?php endif; ?>
- <?php echo $this->getOptionHtml($_option) ?>
- <?php endforeach; ?>
- </fieldset>
- <?php else: ?>
- <p><?php echo __('No options of this product are available.') ?></p>
- <?php endif; ?>
-<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/js/slide.js b/app/design/frontend/magento_plushe/Magento_Bundle/js/slide.js
deleted file mode 100644
index 69e8678d339..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/js/slide.js
+++ /dev/null
@@ -1,99 +0,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.
- *
- * @category frontend bundle product slide
- * @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 expr:true*/
-(function($) {
- $.widget('mage.slide', {
- options: {
- slideSpeed: 1500,
- slideSelector: '#bundle-slide',
- slideBackSelector: '.bundle-slide-back',
- bundleProductSelector: '#bundleProduct',
- bundleOptionsContainer: '#options-container',
- productViewContainer: '#productView',
- slidedown: true
-
- },
-
- _create: function() {
- if(this.options.slidedown === true) {
- $(this.options.slideSelector).on('click', $.proxy(this._show, this));
- $(this.options.slideBackSelector).on('click', $.proxy(this._hide, this));
- this.options.autostart && this._show();
- } else {
- $(this.options.slideSelector).on('click', $.proxy(this._slide, this));
- $(this.options.slideBackSelector).on('click', $.proxy(this._slideBack, this));
- this.options.autostart && this._slide();
- }
- },
-
- /**
- * slide bundleOptionsContainer over to the main view area
- * @private
- */
- _slide: function() {
- $(this.options.bundleProductSelector).css('top', '0px');
- $(this.options.bundleOptionsContainer).show();
- this.element.css('height',$(this.options.productViewContainer).height() + 'px');
- $(this.options.bundleProductSelector).css('left', '0px').animate(
- {'left': '-' + this.element.width() + 'px'},
- this.options.slideSpeed,
- $.proxy(function() {
- this.element.css('height','auto');
- $(this.options.productViewContainer).hide();
- }, this)
- );
- },
-
- /**
- * slideback productViewContainer to main view area
- * @private
- */
- _slideBack: function() {
- $(this.options.bundleProductSelector).css('top', '0px');
- $(this.options.productViewContainer).show();
- this.element.css('height', $(this.options.bundleOptionsContainer).height() + 'px');
- $(this.options.bundleProductSelector).animate(
- {'left': '0px'},
- this.options.slideSpeed,
- $.proxy(function() {
- $(this.options.bundleOptionsContainer).hide();
- this.element.css('height','auto');
- }, this)
- );
- },
- _show: function () {
- $(this.options.bundleOptionsContainer).slideDown(800);
- $('html, body').animate({
- scrollTop: $(this.options.bundleOptionsContainer).offset().top
- }, 600);
- },
- _hide: function () {
- $('html, body').animate({
- scrollTop: 0
- }, 600);
- $(this.options.bundleOptionsContainer).slideUp(function(){800});
- }
- });
-}(jQuery));
\ No newline at end of file
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/catalog_product_view_type_bundle.xml b/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/catalog_product_view_type_bundle.xml
deleted file mode 100644
index 3e1666e39a9..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/catalog_product_view_type_bundle.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">
- <referenceBlock name="head">
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-bundle-bundle-js">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Bundle::bundle.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-bundle-js-product-summary-js">
- <arguments>
- <argument name="file" xsi:type="string">Magento_Bundle::js/product-summary.js</argument>
- </arguments>
- </block>
- </referenceBlock>
- <referenceBlock name="root">
- <action method="addBodyClass">
- <argument name="value" xsi:type="string">type-bundle</argument>
- </action>
- </referenceBlock>
- <referenceBlock name="product.info">
- <block class="Magento\Bundle\Block\Catalog\Product\View" name="bundle.summary" as="form_top" template="catalog/product/view/summary.phtml">
- <block class="Magento\Bundle\Block\Catalog\Product\Price" name="bundle.prices" as="bundle_prices" template="catalog/product/view/price.phtml">
- <action method="setMAPTemplate">
- <argument name="tmpl" xsi:type="string">Magento_Catalog::product/price_msrp_item.phtml</argument>
- </action>
- </block>
- <block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart.bundle" as="addtocart" template="product/view/addtocart.phtml"/>
- <block class="Magento\Catalog\Block\Product\View" name="product.info.addto.bundle" as="addto" template="product/view/addto.phtml"/>
- </block>
- </referenceBlock>
- <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="-">
- <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">
- <remove name="product.tierprices"/>
- <block class="Magento\Bundle\Block\Catalog\Product\View" name="bundle.tierprices" as="tierprices" before="-" template="Magento_Bundle::catalog/product/view/tierprices.phtml"/>
- <block class="Magento\CatalogInventory\Block\Qtyincrements" name="product.info.qtyincrements" before="-" template="qtyincrements.phtml"/>
- <block class="Magento\Bundle\Block\Catalog\Product\View" name="bundle.back.button" as="backButton" after="-" template="catalog/product/view/backbutton.phtml"/>
- <action method="unsetChild">
- <argument name="block" xsi:type="string">product.info.addtocart</argument>
- </action>
- <action method="setHideRequiredNotice">
- <argument name="flag" xsi:type="string">1</argument>
- </action>
- <action method="unsetChild">
- <argument name="block" xsi:type="string">product.info.addto</argument>
- </action>
- </referenceBlock>
- <referenceContainer name="content">
- <container name="bundle.options.container" label="invisible" htmlTag="div" htmlClass="bundle options container" after="product.info.media"/>
- <move element="product.info" destination="bundle.options.container" before="-"/>
- </referenceContainer>
- <referenceContainer name="product.info.type">
- <block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle" name="product.info.bundle" as="product_type_data" template="catalog/product/view/type/bundle.phtml">
- <action method="addPriceBlockType">
- <argument name="type" xsi:type="string">bundle</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\Price</argument>
- <argument name="template" xsi:type="string">catalog/product/view/price.phtml</argument>
- </action>
- </block>
- <container name="product.info.bundle.extra" after="product.info.bundle" as="product_type_data_extra" label="Product Extra Info"/>
- <block class="Magento\Bundle\Block\Catalog\Product\View" name="customize.button" as="customize_button" template="catalog/product/view/customize.phtml"/>
- </referenceContainer>
- <referenceBlock name="product.clone_prices">
- <action method="addPriceBlockType">
- <argument name="type" xsi:type="string">bundle</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\Price</argument>
- <argument name="template" xsi:type="string">catalog/product/view/price.phtml</argument>
- </action>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/checkout_cart_index.xml b/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/checkout_cart_index.xml
deleted file mode 100644
index f56f9a2b65b..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/checkout_cart_index.xml
+++ /dev/null
@@ -1,37 +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="checkout.cart.form">
- <block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::cart/item/default.phtml"/>
- </referenceBlock>
- <referenceBlock name="checkout.cart.crosssell">
- <action method="addPriceBlockType">
- <argument name="type" xsi:type="string">bundle</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\Price</argument>
- <argument name="template" xsi:type="string">catalog/product/price.phtml</argument>
- </action>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/default.xml b/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/default.xml
deleted file mode 100644
index 30de3dbeb47..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/layout/override/base/default.xml
+++ /dev/null
@@ -1,44 +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="wishlist_sidebar">
- <action method="addPriceBlockType">
- <argument name="type" xsi:type="string">bundle</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\Price</argument>
- <argument name="template" xsi:type="string">catalog/product/price.phtml</argument>
- </action>
- </referenceBlock>
- <referenceBlock name="catalog_product_price_template">
- <action method="addPriceBlockType">
- <argument name="type" xsi:type="string">bundle</argument>
- <argument name="block" xsi:type="string">Magento\Bundle\Block\Catalog\Product\Price</argument>
- <argument name="template" xsi:type="string">catalog/product/price.phtml</argument>
- </action>
- </referenceBlock>
- <referenceBlock name="minicart">
- <block class="Magento\Bundle\Block\Checkout\Cart\Item\Renderer" as="bundle" template="Magento_Checkout::cart/sidebar/default.phtml"/>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/creditmemo/items/renderer.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/creditmemo/items/renderer.phtml
deleted file mode 100644
index 23199f3a6a5..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/creditmemo/items/renderer.phtml
+++ /dev/null
@@ -1,314 +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 $parentItem = $this->getItem() ?>
-
-<?php $items = $this->getChilds($parentItem) ?>
-<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
-<?php $_count = count ($items) ?>
-<?php $_index = 0 ?>
-
-<?php $_prevOptionId = '' ?>
-
-<?php foreach ($items as $_item): ?>
-
-<?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
- <?php $_showlastRow = true ?>
-<?php else: ?>
- <?php $_showlastRow = false ?>
-<?php endif; ?>
-
-<?php if ($_item->getOrderItem()->getParentItem()): ?>
- <?php $attributes = $this->getSelectionAttributes($_item) ?>
- <?php if ($_prevOptionId != $attributes['option_id']): ?>
- <tr>
- <td class="col label" colspan="7"><div class="option label"><?php echo $attributes['option_label'] ?></div></td>
- </tr>
- <?php $_prevOptionId = $attributes['option_id'] ?>
- <?php endif; ?>
-<?php endif; ?>
-<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
- <?php if (!$_item->getOrderItem()->getParentItem()): ?>
- <td class="col name">
- <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
- </td>
- <?php else: ?>
- <td><div class="option-value"><?php echo $this->getValueHtml($_item) ?></div></td>
- <?php endif; ?>
- <td class="col sku"><?php echo $this->escapeHtml($_item->getSku()) ?></td>
- <td class="col price">
- <?php if ($this->canShowPriceInfo($_item)): ?>
- <?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()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?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()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
- </span>
- <?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">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total Incl. Tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- </span>
- <?php endif; ?>
- <?php else: ?>
-
- <?php endif; ?>
- </td>
- <td class="col qty">
- <?php if ($this->canShowPriceInfo($_item)): ?>
- <?php echo $_item->getQty()*1 ?>
- <?php else: ?>
-
- <?php endif; ?>
- </td>
- <td class="col subtotal">
- <?php if ($this->canShowPriceInfo($_item)): ?>
- <?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()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
- </span>
- <?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">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php echo $this->getOrder()->formatPrice($this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item)); ?>
- <?php endif; ?>
- </span>
- <?php else: ?>
-
- <?php endif; ?>
- <?php else: ?>
-
- <?php endif; ?>
- </td>
- <td class="col discount">
- <?php if ($this->canShowPriceInfo($_item)): ?>
- <?php echo $this->getOrder()->formatPrice(-$_item->getDiscountAmount()) ?>
- <?php else: ?>
-
- <?php endif; ?>
- </td>
- <td class="col rowtotal">
- <?php if ($this->canShowPriceInfo($_item)): ?>
- <?php echo $this->getOrder()->formatPrice($_item->getRowTotal()-$_item->getDiscountAmount()+$_item->getTaxAmount()+$_item->getWeeeTaxAppliedRowAmount()) ?>
- <?php else: ?>
-
- <?php endif; ?>
- </td>
-</tr>
-<?php endforeach; ?>
-
-<?php if ($_showlastRow): ?>
-<tr>
- <td class="col options" colspan="7">
- <?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 echo $this->escapeHtml($_item->getDescription()) ?>
- <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
- <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>" data-item-id="<?php echo $parentItem->getId() ?>"><?php echo __('Gift Message') ?></a>
- <?php endif; ?>
- </td>
-</tr>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/invoice/items/renderer.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/invoice/items/renderer.phtml
deleted file mode 100644
index 49fe7219b4a..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/invoice/items/renderer.phtml
+++ /dev/null
@@ -1,330 +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 $parentItem = $this->getItem() ?>
-<?php $_order = $this->getItem()->getOrderItem()->getOrder() ?>
-
-<?php $items = $this->getChilds($parentItem) ?>
-<?php $_count = count ($items) ?>
-<?php $_index = 0 ?>
-
-<?php $_prevOptionId = '' ?>
-
-<?php foreach ($items as $_item): ?>
-
-<?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
- <?php $_showlastRow = true ?>
-<?php else: ?>
- <?php $_showlastRow = false ?>
-<?php endif; ?>
-
-<?php if ($_item->getOrderItem()->getParentItem()): ?>
- <?php $attributes = $this->getSelectionAttributes($_item) ?>
- <?php if ($_prevOptionId != $attributes['option_id']): ?>
- <tr>
- <td class="col label" colspan="5"><div class="option label"><?php echo $attributes['option_label'] ?></div></td>
- </tr>
- <?php $_prevOptionId = $attributes['option_id'] ?>
- <?php endif; ?>
-<?php endif; ?>
-<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
- <?php if (!$_item->getOrderItem()->getParentItem()): ?>
- <td class="col name">
- <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
- </td>
- <?php else: ?>
- <td class="col value"><div class="option value"><?php echo $this->getValueHtml($_item) ?></div></td>
- <?php endif; ?>
- <td class="col sku"><?php echo $this->escapeHtml($_item->getSku()) ?></td>
- <td class="col price">
- <?php if ($this->canShowPriceInfo($_item)): ?>
- <?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()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?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()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
- </span>
- <?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">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- </span>
- <?php endif; ?>
- <?php else: ?>
-
- <?php endif; ?>
- </td>
- <td class="col qty">
- <?php if ($this->canShowPriceInfo($_item)): ?>
- <?php echo $_item->getQty()*1 ?>
- <?php else: ?>
-
- <?php endif; ?>
- </td>
- <td class="col subtotal">
- <?php if ($this->canShowPriceInfo($_item)): ?>
- <?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()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
- </span>
- <?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">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <?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()->getWeeeTaxAppliedRowAmount()); ?>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
- </span>
- <?php endif; ?>
- <?php endif; ?>
-
- </span>
- <?php endif; ?>
- <?php else: ?>
-
- <?php endif; ?>
- </td>
-</tr>
-<?php endforeach; ?>
-
-<?php if ($_showlastRow): ?>
-<tr>
- <td class="col options" colspan="5">
- <?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 echo $this->escapeHtml($_item->getDescription()) ?>
- <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
- <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>" data-item-id="<?php echo $parentItem->getId() ?>"><?php echo __('Gift Message') ?></a>
- <?php endif; ?>
- </td>
-</tr>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/items/renderer.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/items/renderer.phtml
deleted file mode 100644
index 45b77530802..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/items/renderer.phtml
+++ /dev/null
@@ -1,356 +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\Bundle\Block\Sales\Order\Items\Renderer */
-?>
-<?php $parentItem = $this->getItem() ?>
-<?php $items = array_merge(array($parentItem), $parentItem->getChildrenItems()); ?>
-<?php $_count = count ($items) ?>
-<?php $_index = 0 ?>
-
-<?php $_prevOptionId = '' ?>
-
-<?php foreach ($items as $_item): ?>
-
-<?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
- <?php $_showlastRow = true ?>
-<?php else: ?>
- <?php $_showlastRow = false ?>
-<?php endif; ?>
-
-<?php if ($_item->getParentItem()): ?>
- <?php $attributes = $this->getSelectionAttributes($_item) ?>
- <?php if ($_prevOptionId != $attributes['option_id']): ?>
- <tr<?php if ($_item->getLastRow()) echo 'class="last"'; ?>>
- <td class="col label" colspan="5"><div class="option label"><?php echo $attributes['option_label'] ?></div></td>
- </tr>
- <?php $_prevOptionId = $attributes['option_id'] ?>
- <?php endif; ?>
-<?php endif; ?>
-<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
- <?php if (!$_item->getParentItem()): ?>
- <td class="col name">
- <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
- </td>
- <?php else: ?>
- <td class="col value"><div class="option value"><?php echo $this->getValueHtml($_item)?></div></td>
- <?php endif; ?>
- <td class="col sku"><?php echo $this->prepareSku($_item->getSku()) ?></td>
- <td class="col price">
- <?php if (!$_item->getParentItem()): ?>
- <?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()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?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()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
- </span>
- <?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">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- </span>
- <?php endif; ?>
- <?php else: ?>
-
- <?php endif; ?>
- </td>
- <td class="col qty">
- <?php if (($_item->getParentItem() && $this->isChildCalculated()) ||
- (!$_item->getParentItem() && !$this->isChildCalculated())): ?>
- <span class="nobr">
- <?php if ($_item->getQtyOrdered() > 0): ?>
- <?php echo __('Ordered'); ?>: <strong><?php echo $_item->getQtyOrdered()*1 ?></strong><br />
- <?php endif; ?>
- <?php if ($_item->getQtyShipped() > 0 && !$this->isShipmentSeparately()): ?>
- <?php echo __('Shipped'); ?>: <strong><?php echo $_item->getQtyShipped()*1 ?></strong><br />
- <?php endif; ?>
- <?php if ($_item->getQtyCanceled() > 0): ?>
- <?php echo __('Canceled'); ?>: <strong><?php echo $_item->getQtyCanceled()*1 ?></strong><br />
- <?php endif; ?>
- <?php if ($_item->getQtyRefunded() > 0): ?>
- <?php echo __('Refunded'); ?>: <strong><?php echo $_item->getQtyRefunded()*1 ?></strong>
- <?php endif; ?>
- </span>
- <?php elseif ($_item->getQtyShipped() > 0 && $_item->getParentItem() && $this->isShipmentSeparately()): ?>
- <span class="nobr"><?php echo __('Shipped'); ?>: <strong><?php echo $_item->getQtyShipped()*1 ?></strong></span>
- <?php else: ?>
-
- <?php endif; ?>
- </td>
- <td class="col subtotal">
- <?php if (!$_item->getParentItem()): ?>
- <?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()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
- </span>
- <?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">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <?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()->getWeeeTaxAppliedRowAmount()); ?>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total Incl. Tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
- </span>
- <?php endif; ?>
- <?php endif; ?>
-
- </span>
- <?php endif; ?>
- <?php else: ?>
-
- <?php endif; ?>
- </td>
- <!--
- <?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; ?>
- -->
-</tr>
-<?php endforeach; ?>
-<?php if ($_showlastRow): ?>
-<tr>
- <td class="col options" colspan="5">
- <?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 echo $this->escapeHtml($_item->getDescription()) ?>
- <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
- <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>" data-item-id="<?php echo $parentItem->getId()?>"><?php echo __('Gift Message') ?></a>
- <?php endif; ?>
- </td>
-</tr>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/shipment/items/renderer.phtml b/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/shipment/items/renderer.phtml
deleted file mode 100644
index b7867220326..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Bundle/sales/order/shipment/items/renderer.phtml
+++ /dev/null
@@ -1,109 +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 $parentItem = $this->getItem() ?>
-<?php $items = array_merge(array($parentItem->getOrderItem()), $parentItem->getOrderItem()->getChildrenItems()) ?>
-<?php $shipItems = $this->getChilds($parentItem) ?>
-<?php $_count = count ($items) ?>
-<?php $_index = 0 ?>
-
-<?php $_prevOptionId = '' ?>
-
-<?php foreach ($items as $_item): ?>
-
-<?php if($this->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
- <?php $_showlastRow = true ?>
-<?php else: ?>
- <?php $_showlastRow = false ?>
-<?php endif; ?>
-
-<?php if ($_item->getParentItem()): ?>
- <?php $attributes = $this->getSelectionAttributes($_item) ?>
- <?php if ($_prevOptionId != $attributes['option_id']): ?>
- <tr>
- <td colspan="3" class="col label"><div class="option label"><?php echo $attributes['option_label'] ?></div></td>
- </tr>
- <?php $_prevOptionId = $attributes['option_id'] ?>
- <?php endif; ?>
-<?php endif; ?>
-<tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?> id="order-item-row-<?php echo $_item->getId() ?>">
- <?php if (!$_item->getParentItem()): ?>
- <td class="col name">
- <strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong>
- </td>
- <?php else: ?>
- <td class="col value"><div class="option value"><?php echo $this->getValueHtml($_item) ?></div></td>
- <?php endif; ?>
- <td class="col sku"><?php echo $this->escapeHtml($_item->getSku()) ?></td>
- <td class="col price">
- <?php if (($this->isShipmentSeparately() && $_item->getParentItem()) || (!$this->isShipmentSeparately() && !$_item->getParentItem())): ?>
- <?php if (isset($shipItems[$_item->getId()])): ?>
- <?php echo $shipItems[$_item->getId()]->getQty()*1 ?>
- <?php elseif ($_item->getIsVirtual()): ?>
- <?php echo __('N/A') ?>
- <?php else: ?>
- 0
- <?php endif; ?>
- <?php else: ?>
-
- <?php endif; ?>
- </td>
-</tr>
-<?php endforeach; ?>
-
-<?php if ($_showlastRow): ?>
-<tr>
- <td class="col options" colspan="3">
- <?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 echo $this->escapeHtml($_item->getDescription()) ?>
- <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
- <a href="#" id="order-item-gift-message-link-<?php echo $parentItem->getId() ?>" class="gift-message-link" aria-controls="order-item-gift-message-<?php echo $parentItem->getId()?>" data-item-id="<?php echo $parentItem->getId() ?>"><?php echo __('Gift Message') ?></a>
- <?php endif; ?>
- </td>
-</tr>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/category/title.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/category/title.phtml
deleted file mode 100644
index ac3fc02f0b8..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/category/title.phtml
+++ /dev/null
@@ -1,42 +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
-/**
- * Category title template
- *
- * @see \Magento\Catalog\Block\Category\View
- */
-?>
-<?php
- $_helper = $this->helper('Magento\Catalog\Helper\Output');
- $_category = $this->getCurrentCategory();
-?>
-<hgroup class="page category title yyy">
- <h1 class="title"><?php echo $_helper->categoryAttribute($_category, $this->getCurrentCategory()->getName(), 'name') ?></h1>
- <?php if($this->IsRssCatalogEnable()): ?>
- <a href="<?php echo $this->getRssLink() ?>" title="<?php echo __('Subscribe to RSS Feed') ?>" class="action rss"><?php echo __('Subscribe to RSS Feed') ?></a>
- <?php endif; ?>
-</hgroup>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/category/view.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/category/view.phtml
deleted file mode 100644
index 4d40df3d1f6..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/category/view.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)
- */
-?>
-<?php
-/**
- * Category view template
- *
- * @see \Magento\Catalog\Block\Category\View
- */
-?>
-<?php
- $_helper = $this->helper('Magento\Catalog\Helper\Output');
- $_category = $this->getCurrentCategory();
- $_imgHtml = '';
- if ($_imgUrl = $_category->getImageUrl()) {
- $_imgHtml = '<p class="category-image"><img src="'.$_imgUrl.'" alt="'.$this->escapeHtml($_category->getName()).'" title="'.$this->escapeHtml($_category->getName()).'" /></p>';
- $_imgHtml = $_helper->categoryAttribute($_category, $_imgHtml, 'image');
- }
-?>
-<div class="category-view">
- <?php if($_imgUrl): ?>
- <?php echo $_imgHtml ?>
- <?php endif; ?>
-
- <?php if($_description=$this->getCurrentCategory()->getDescription()): ?>
- <div class="category description std">
- <?php echo $_helper->categoryAttribute($_category, $_description, 'description') ?>
- </div>
- <?php endif; ?>
-
- <?php if($this->isContentMode()): ?>
- <?php echo $this->getCmsBlockHtml() ?>
-
- <?php elseif($this->isMixedMode()): ?>
- <?php echo $this->getCmsBlockHtml() ?>
- <?php echo $this->getProductListHtml() ?>
-
- <?php else: ?>
- <?php echo $this->getProductListHtml() ?>
- <?php endif; ?>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/category/widget/link/link_block.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/category/widget/link/link_block.phtml
deleted file mode 100644
index f57a72063c9..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/category/widget/link/link_block.phtml
+++ /dev/null
@@ -1,26 +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="widget category link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/category/widget/link/link_inline.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/category/widget/link/link_inline.phtml
deleted file mode 100644
index 4d36857a851..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/category/widget/link/link_inline.phtml
+++ /dev/null
@@ -1,26 +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)
- */
-?>
-<span class="widget category link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/js/list.js b/app/design/frontend/magento_plushe/Magento_Catalog/js/list.js
deleted file mode 100644
index 1ed2bc05207..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/js/list.js
+++ /dev/null
@@ -1,74 +0,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.
- *
- * @category mage compare list
- * @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 ($, window) {
- $.widget('mage.compareList', {
- _create: function() {
-
- var elem = this.element,
- products = $('thead td', elem);
-
- if (products.length > this.options.productsInRow) {
- var headings = $('<table/>')
- .addClass('comparison headings data table')
- .insertBefore(elem.closest('.container'));
- elem.addClass('scroll');
-
- $('th', elem).each(function(){
- var th = $(this),
- thCopy = th.clone();
-
- th.animate({
- top: '+=0'
- }, 50, function(){
- var height;
- if ($.browser.mozilla && $.browser.version <= '11.0') {
- height = th.outerHeight();
- }
- else {
- height = th.height();
- }
- thCopy.css('height', height)
- .appendTo(headings)
- .wrap('<tr />');
- });
- });
- }
-
- $(this.options.windowPrintSelector).on('click', function(e) {
- e.preventDefault();
- window.print();
- });
-
- $.each(this.options.selectors, function(i, selector) {
- $(selector).on('click', function(e) {
- e.preventDefault();
- window.location.href = $(this).data('url');
- });
- });
-
- }
- });
-})(jQuery, window);
\ No newline at end of file
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layer/filter.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/layer/filter.phtml
deleted file mode 100644
index 4a504db5622..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layer/filter.phtml
+++ /dev/null
@@ -1,46 +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 filter items block
- *
- * @see \Magento\Catalog\Block\Layer\Filter
- */
-?>
-
-<ol class="items">
-<?php foreach ($this->getItems() as $_item): ?>
- <li class="item">
- <?php if ($_item->getCount() > 0): ?>
- <a href="<?php echo $this->escapeUrl($_item->getUrl()) ?>"><?php echo $_item->getLabel() ?></a>
- <?php else: echo $_item->getLabel() ?>
- <?php endif; ?>
- <?php if ($this->shouldDisplayProductCount()): ?>
- <span class="count"><?php echo $_item->getCount() ?></span>
- <?php endif; ?>
- </li>
-<?php endforeach ?>
-</ol>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layer/state.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/layer/state.phtml
deleted file mode 100644
index 5a896c8ce71..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layer/state.phtml
+++ /dev/null
@@ -1,61 +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
-/**
- * Category layered navigation state
- *
- * @see \Magento\Catalog\Block\Layer\State
- */
-?>
-<?php $_filters = $this->getActiveFilters() ?>
-<?php if(!empty($_filters)): ?>
-<div class="filtered">
- <strong class="subtitle"><?php echo __('Currently Shopping by:') ?></strong>
- <ol class="items">
- <?php foreach ($_filters as $_filter): ?>
- <li class="item">
- <span class="label"><?php echo __($_filter->getName()) ?>:</span>
- <span class="value"><?php echo $this->stripTags($_filter->getLabel()) ?></span>
- <?php
- $clearLinkUrl = $_filter->getClearLinkUrl();
- if ($clearLinkUrl):
- ?>
- <a class="action previous" href="<?php echo $_filter->getRemoveUrl() ?>" title="<?php echo __('Previous') ?>">
- <span><?php echo __('Previous') ?></span>
- </a>
- <a class="action remove" title="<?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>" href="<?php echo $clearLinkUrl ?>">
- <span><?php echo $this->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
- </a>
- <?php else: ?>
- <a class="action remove" href="<?php echo $_filter->getRemoveUrl() ?>" title="<?php echo __('Remove This Item') ?>">
- <span><?php echo __('Remove This Item') ?></span>
- </a>
- <?php endif; ?>
- </li>
- <?php endforeach; ?>
- </ol>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layer/view.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/layer/view.phtml
deleted file mode 100644
index 6216489ee8b..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layer/view.phtml
+++ /dev/null
@@ -1,57 +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
-/**
- * Category layered navigation
- *
- * @deprecated since 1.12.0.0
- */
-?>
-<?php if($this->canShowBlock()): ?>
-<div class="block filter">
- <div class="title">
- <strong><?php echo __('Shop By') ?></strong>
- </div>
- <div class="content">
- <?php echo $this->getStateHtml() ?>
- <?php if ($this->getLayer()->getState()->getFilters()): ?>
- <div class="actions">
- <a href="<?php echo $this->getClearUrl() ?>" class="action reset"><?php echo __('Clear All') ?></a>
- </div>
- <?php endif; ?>
- <strong class="subtitle"><?php echo __('Shopping Options') ?></strong>
- <dl class="options" id="narrow-by-list">
- <?php $_filters = $this->getFilters() ?>
- <?php foreach ($_filters as $_filter): ?>
- <?php if($_filter->getItemsCount()): ?>
- <dt><?php echo __($_filter->getName()) ?></dt>
- <dd><?php echo $_filter->getHtml() ?></dd>
- <?php endif; ?>
- <?php endforeach; ?>
- </dl>
- </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_compare_index.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_compare_index.xml
deleted file mode 100644
index b40295454ee..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_compare_index.xml
+++ /dev/null
@@ -1,33 +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="page_one_column"/>
- <referenceBlock name="page.main.title">
- <action method="setPageTitle">
- <argument translate="true" name="page_title" xsi:type="string">Compare Products</argument>
- </action>
- </referenceBlock>
-</layout>
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 f61f99f435f..1efc4fc24a7 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
@@ -24,12 +24,6 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="product.info.overview">
- <arguments>
- <argument name="at_label" xsi:type="string">none</argument>
- <argument name="title" translate="true" xsi:type="string">Overview</argument>
- </arguments>
- </referenceBlock>
<move element="product.info" destination="product.info.main" after="product.tierprices"/>
<move element="page.main.title" destination="product.info.main" before="-"/>
<!-- <remove name="product.info.sku"/> -->
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view.xml
deleted file mode 100644
index 250c1589815..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view.xml
+++ /dev/null
@@ -1,92 +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="root">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">2columns-left.phtml</argument>
- </action>
- </referenceBlock>
- <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">
- <block class="Magento\Catalog\Block\Product\ProductList\Toolbar" name="product_list_toolbar" template="product/list/toolbar.phtml">
- <block class="Magento\Page\Block\Html\Pager" name="product_list_toolbar_pager"/>
- <!-- The following code shows how to set your own pager increments -->
- <!--
- <action method="setDefaultListPerPage">
- <argument name="limit" xsi:type="string">4</argument>
- </action>
- <action method="setDefaultGridPerPage">
- <argument name="limit" xsi:type="string">3</argument>
- </action>
- <action method="addPagerLimit">
- <argument name="mode" xsi:type="string">list</argument>
- <argument name="limit" xsi:type="string">2</argument>
- </action>
- <action method="addPagerLimit">
- <argument name="mode" xsi:type="string">list</argument>
- <argument name="limit" xsi:type="string">4</argument>
- </action>
- <action method="addPagerLimit">
- <argument name="mode" xsi:type="string">list</argument>
- <argument name="limit" xsi:type="string">6</argument>
- </action>
- <action method="addPagerLimit">
- <argument name="mode" xsi:type="string">list</argument>
- <argument name="limit" xsi:type="string">8</argument>
- </action>
- <action method="addPagerLimit" translate="label">
- <argument name="mode" xsi:type="string">list</argument>
- <argument name="limit" xsi:type="string">all</argument>
- <argument name="label" xsi:type="string">All</argument>
- </action>
- <action method="addPagerLimit">
- <argument name="mode" xsi:type="string">grid</argument>
- <argument name="limit" xsi:type="string">3</argument>
- </action>
- <action method="addPagerLimit">
- <argument name="mode" xsi:type="string">grid</argument>
- <argument name="limit" xsi:type="string">6</argument>
- </action>
- <action method="addPagerLimit">
- <argument name="mode" xsi:type="string">grid</argument>
- <argument name="limit" xsi:type="string">9</argument>
- </action>
- <action method="addPagerLimit" translate="label">
- <argument name="mode" xsi:type="string">grid</argument>
- <argument name="limit" xsi:type="string">all</argument>
- <argument name="label" xsi:type="string">All</argument>
- </action>
- -->
- </block>
- <action method="setToolbarBlockName">
- <argument name="name" xsi:type="string">product_list_toolbar</argument>
- </action>
- </block>
- </block>
- </referenceContainer>
- <update handle="MAP_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view_type_default.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view_type_default.xml
deleted file mode 100644
index dabf708b519..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view_type_default.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="left">
- <block class="Magento\Catalog\Block\Navigation" name="catalog.leftnav" before="-" template="navigation/left.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view_type_layered.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view_type_layered.xml
deleted file mode 100644
index 5d2abe78c9c..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_category_view_type_layered.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="left">
- <block class="Magento\Catalog\Block\Layer\View" name="catalog.leftnav" before="-" template="layer/view.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_compare_index.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_compare_index.xml
deleted file mode 100644
index 41d6a853f6e..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_compare_index.xml
+++ /dev/null
@@ -1,31 +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\Catalog\Block\Product\Compare\ListCompare" name="catalog.compare.list" template="product/compare/list.phtml"/>
- </referenceContainer>
- <update handle="MAP_popup"/>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view.xml
deleted file mode 100644
index 30838b8f2b0..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view.xml
+++ /dev/null
@@ -1,139 +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="root">
- <action method="setTemplate">
- <argument name="template" xsi:type="string">1column.phtml</argument>
- </action>
- </referenceBlock>
- <referenceBlock name="page.main.title">
- <arguments>
- <argument name="css_class" xsi:type="string">product</argument>
- </arguments>
- </referenceBlock>
- <referenceBlock name="head">
- <block class="Magento\Page\Block\Html\Head\Script" name="mage-zoom-js">
- <arguments>
- <argument name="file" xsi:type="string">mage/zoom.js</argument>
- </arguments>
- </block>
- <block class="Magento\Page\Block\Html\Head\Css" name="mage-gallery-css">
- <arguments>
- <argument name="file" xsi:type="string">mage/gallery.css</argument>
- </arguments>
- </block>
- </referenceBlock>
- <update handle="page_calendar"/>
- <block class="Magento\Catalog\Block\Product\View" name="product.info" template="product/view/form.phtml">
- <container name="product.info.form.content" label="invisible" as="product_info_form_content">
- <block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart" as="addtocart" template="product/view/addtocart.phtml"/>
- </container>
- <block class="Magento\View\Block\Template" name="product.info.form.options" as="options_container">
- <block class="Magento\Catalog\Block\Product\View" name="product.info.options.wrapper" as="product_options_wrapper" template="product/view/options/wrapper.phtml">
- <block class="Magento\Catalog\Block\Product\View\Options" name="product.info.options" as="product_options" template="product/view/options.phtml">
- <block class="Magento\Catalog\Block\Product\View\Options\Type\DefaultType" as="default" template="product/view/options/type/default.phtml"/>
- <block class="Magento\Catalog\Block\Product\View\Options\Type\Text" as="text" template="product/view/options/type/text.phtml"/>
- <block class="Magento\Catalog\Block\Product\View\Options\Type\File" as="file" template="product/view/options/type/file.phtml"/>
- <block class="Magento\Catalog\Block\Product\View\Options\Type\Select" as="select" template="product/view/options/type/select.phtml"/>
- <block class="Magento\Catalog\Block\Product\View\Options\Type\Date" as="date" template="product/view/options/type/date.phtml"/>
- </block>
- <block class="Magento\View\Block\Html\Calendar" name="html_calendar" as="html_calendar" template="Magento_Page::js/calendar.phtml"/>
- </block>
- <block class="Magento\Catalog\Block\Product\View" name="product.info.options.wrapper.bottom" as="product_options_wrapper_bottom" template="product/view/options/wrapper/bottom.phtml">
- <block class="Magento\Catalog\Block\Product\View" name="product.info.addtocart.additional" as="product.info.addtocart" template="product/view/addtocart.phtml"/>
- <block class="Magento\Catalog\Block\Product\View" name="product.clone_prices" as="prices" template="product/view/price_clone.phtml"/>
- </block>
- </block>
- </block>
- <referenceContainer name="content">
- <container name="product.info.main" label="invisible" htmlTag="div" htmlClass="product info main" before="-">
- <block class="Magento\Catalog\Block\Product\View" name="product.price" template="product/view/price.phtml"/>
- <block class="Magento\Catalog\Block\Product\View\Description" name="product.info.sku" template="product/view/attribute.phtml">
- <arguments>
- <argument name="at_call" xsi:type="string">getSku</argument>
- <argument name="at_code" xsi:type="string">sku</argument>
- <argument name="css_class" xsi:type="string">sku</argument>
- <argument name="at_label" xsi:type="string">default</argument>
- </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" group="detailed_info">
- <arguments>
- <argument name="at_call" xsi:type="string">getShortDescription</argument>
- <argument name="at_code" xsi:type="string">short_description</argument>
- <argument name="css_class" xsi:type="string">overview</argument>
- <argument name="at_label" translate="true" xsi:type="string">Overview</argument>
- <argument name="title" translate="true" xsi:type="string">Details</argument>
- </arguments>
- </block>
- <container name="alert.urls" as="alert_urls" label="Alert Urls"/>
- <container name="product.info.type" label="invisible"/>
- <block class="Magento\Catalog\Block\Product\View" name="product.tierprices" as="tierprices" template="product/view/tierprices.phtml"/>
- <container name="product.info.extrahint" as="extrahint" label="Product View Extra Hint"/>
- <block class="Magento\Catalog\Block\Product\View" name="product.info.addto" as="addto" template="product/view/addto.phtml"/>
- <container name="product.info.social" label="Product social links container" htmlTag="div" htmlClass="social links product">
- <block class="Magento\Catalog\Block\Product\View" name="product.info.mailto" template="product/view/mailto.phtml"/>
- </container>
- </container>
- <container name="product.info.media" label="invisible" htmlTag="div" htmlClass="product media" after="product.info.main">
- <block class="Magento\Catalog\Block\Product\View\Gallery" name="product.info.media.image" template="product/view/base-image.phtml">
- <block class="Magento\Catalog\Block\Product\Image" name="product.image.main"/>
- <block class="Magento\Catalog\Block\Product\Image" name="product.image.thumbs"/>
- </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" group="detailed_info">
- <arguments>
- <argument name="at_call" xsi:type="string">getDescription</argument>
- <argument name="at_code" xsi:type="string">description</argument>
- <argument name="css_class" xsi:type="string">description</argument>
- <argument name="at_label" xsi:type="string">none</argument>
- <argument name="title" translate="true" xsi:type="string">Details</argument>
- </arguments>
- </block>
- <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>
- </block>
- </block>
- </referenceContainer>
- <referenceContainer name="content.aside">
- <block class="Magento\Catalog\Block\Product\ProductList\Related" name="catalog.product.related" template="Magento_Catalog::product/list/items.phtml">
- <arguments>
- <argument name="type" xsi:type="string">related</argument>
- </arguments>
- </block>
- <block class="Magento\Catalog\Block\Product\ProductList\Upsell" name="product.info.upsell" template="Magento_Catalog::product/list/items.phtml">
- <arguments>
- <argument name="type" xsi:type="string">upsell</argument>
- </arguments>
- </block>
- <block class="Magento\Catalog\Block\Product\View\Additional" name="product.info.additional" as="product_additional_data"/>
- </referenceContainer>
- <update handle="MAP_popup"/>
- <update handle="MAP_price_msrp_item"/>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_configurable.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_configurable.xml
deleted file mode 100644
index baf5f2d8391..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_configurable.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">
- <referenceBlock name="root">
- <action method="addBodyClass">
- <argument name="value" xsi:type="string">type-configurable</argument>
- </action>
- </referenceBlock>
- <referenceContainer name="product.info.type">
- <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" after="product.info.configurable" as="product_type_data_extra" label="Product Extra Info"/>
- </referenceContainer>
- <referenceBlock name="product.info.options.wrapper">
- <block class="Magento\Catalog\Block\Product\View\Type\Configurable" name="product.info.options.configurable" as="options_configurable" before="-" template="product/view/type/options/configurable.phtml"/>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_grouped.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_grouped.xml
deleted file mode 100644
index e86dc99138f..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_grouped.xml
+++ /dev/null
@@ -1,31 +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="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"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_simple.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_simple.xml
deleted file mode 100644
index b39d1f7329a..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_simple.xml
+++ /dev/null
@@ -1,31 +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="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"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_virtual.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_virtual.xml
deleted file mode 100644
index 3f0089174f9..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/catalog_product_view_type_virtual.xml
+++ /dev/null
@@ -1,31 +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="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"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/default.xml b/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/default.xml
deleted file mode 100644
index c22c8528c0d..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/override/base/default.xml
+++ /dev/null
@@ -1,48 +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="right">
- <block class="Magento\Catalog\Block\Product\Compare\Sidebar" name="catalog.compare.sidebar" template="product/compare/sidebar.phtml"/>
- </referenceContainer>
- <block class="Magento\Catalog\Block\Product\Price\Template" name="catalog_product_price_template"/>
- <referenceBlock name="catalog_product_price_template">
- <action method="addPriceBlockType">
- <argument name="type" xsi:type="string">msrp</argument>
- <argument name="block" xsi:type="string">Magento\Catalog\Block\Product\Price</argument>
- <argument name="template" xsi:type="string">product/price_msrp.phtml</argument>
- </action>
- <action method="addPriceBlockType">
- <argument name="type" xsi:type="string">msrp_item</argument>
- <argument name="block" xsi:type="string">Magento\Catalog\Block\Product\Price</argument>
- <argument name="template" xsi:type="string">product/price_msrp_item.phtml</argument>
- </action>
- <action method="addPriceBlockType">
- <argument name="type" xsi:type="string">msrp_noform</argument>
- <argument name="block" xsi:type="string">Magento\Catalog\Block\Product\Price</argument>
- <argument name="template" xsi:type="string">product/price_msrp_noform.phtml</argument>
- </action>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/navigation/left.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/navigation/left.phtml
deleted file mode 100644
index 200d38687e6..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/navigation/left.phtml
+++ /dev/null
@@ -1,59 +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)
- */
-
-/**
- * Category left navigation
- *
- * @see \Magento\Catalog\Block\Navigation
- */
-?>
-<?php if (!$this->getCategory()) return ?>
-<?php $_categories = $this->getCurrentChildCategories() ?>
-<?php $_count = is_array($_categories)?count($_categories):$_categories->count(); ?>
-<?php if($_count): ?>
-<div class="block filter">
- <div class="title">
- <strong><?php echo __('Shop By') ?></strong>
- </div>
- <div class="content">
- <strong class="subtitle"><?php echo __('Shopping Options') ?></strong>
- <dl class="options" id="narrow-by-list2">
- <dt><?php echo __('Category') ?></dt>
- <dd>
- <ol class="items">
- <?php foreach ($_categories as $_category): ?>
- <?php if($_category->getIsActive()): ?>
- <li class="item">
- <a href="<?php echo $this->getCategoryUrl($_category) ?>"<?php if ($this->isCategoryActive($_category)): ?> class="current"<?php endif; ?>><?php echo $this->escapeHtml($_category->getName()) ?></a>
- <span class="count"><?php echo $_category->getProductCount() ?></span>
- </li>
- <?php endif; ?>
- <?php endforeach ?>
- </ol>
- </dd>
- </dl>
- </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/compare/list.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/compare/list.phtml
deleted file mode 100644
index f959e3087b4..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/compare/list.phtml
+++ /dev/null
@@ -1,150 +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 $_total=$this->getItems()->getSize() ?>
-<?php if($_total): ?>
-<a href="#" class="action print" title="<?php echo __('Print This Page') ?>">
- <span><?php echo __('Print This Page') ?></span>
-</a>
-<?php $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image'); ?>
-<div class="comparison wrapper">
-<div class="comparison container">
- <table class="data-table data table comparison" id="product-comparison">
- <thead>
- <tr>
- <?php $_i=0 ?>
- <?php foreach($this->getItems() as $_item): ?>
- <?php if($_i++==0): ?>
- <th class="cell label remove"> </th>
- <?php endif; ?>
- <td class="cell remove product">
- <a href="<?php echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getRemoveUrl($_item) ?>" class="action delete" title="<?php echo __('Remove Product') ?>">
- <span><?php echo __('Remove Product') ?></span>
- </a>
- </td>
- <?php endforeach; ?>
- </tr>
- </thead>
- <tbody>
- <tr>
- <?php $_i = 0; ?>
- <?php $_helper = $this->helper('Magento\Catalog\Helper\Output'); ?>
- <?php foreach($this->getItems() as $_item): ?>
- <?php if($_i++==0): ?>
- <th class="cell label product"> </th>
- <?php endif; ?>
- <td class="cell product info">
- <a class="product photo" href="<?php echo $this->getProductUrl($_item) ?>" title="<?php echo $this->stripTags($_item->getName(), null, true) ?>">
- <!-- product_comparison_list -->
- <?php echo $imageBlock->init($_item, 'product_comparison_list')->toHtml() ?>
- </a>
- <strong class="product name">
- <a href="<?php echo $this->getProductUrl($_item) ?>" title="<?php echo $this->stripTags($_item->getName(), null, true) ?>">
- <?php echo $_helper->productAttribute($_item, $_item->getName(), 'name') ?>
- </a>
- </strong>
- <?php echo $this->getReviewsSummaryHtml($_item, 'short') ?>
- <?php echo $this->getPriceHtml($_item, true, '-compare-list-top') ?>
- <div class="product actions">
- <div class="primary">
- <?php if($_item->isSaleable()): ?>
- <button type="button" class="action tocart" data-url="<?php echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToCartUrl($_item) ?>">
- <span><?php echo __('Add to Cart') ?></span>
- </button>
- <?php else: ?>
- <?php if ($_item->getIsSalable()): ?>
- <p class="stock available"><span><?php echo __('In stock') ?></span></p>
- <?php else: ?>
- <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <?php endif; ?>
- </div>
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
- <div class="secondary addto links">
- <a href="<?php echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToWishlistUrl($_item) ?>" class="action towishlist" data-action="add-to-wishlist">
- <span><?php echo __('Add to Wishlist') ?></span>
- </a>
- </div>
- <?php endif; ?>
- </div>
- </td>
- <?php endforeach; ?>
- </tr>
- </tbody>
- <tbody>
- <?php foreach ($this->getAttributes() as $_attribute): ?>
- <tr>
- <?php $_i = 0 ?>
- <?php foreach($this->getItems() as $_item): ?>
- <?php if($_i++==0): ?>
- <th class="cell label">
- <span class="attribute label">
- <?php echo $_attribute->getStoreLabel() ? $_attribute->getStoreLabel() : __($_attribute->getFrontendLabel()) ?>
- </span>
- </th>
- <?php endif; ?>
- <td class="cell product attribute">
- <div class="attibute value">
- <?php switch ($_attribute->getAttributeCode()) {
- case "price": ?>
- <?php echo $this->getPriceHtml($_item, true, '-compare-list-' . $_attribute->getCode()) ?>
- <?php break;
- case "small_image": ?>
- <img src="<?php echo $this->getSmallImageUrl($_item); ?>" width="<?php echo $this->getSmallImageSize()?>" height="<?php echo $this->getSmallImageSize()?>" alt="<?php echo $this->stripTags($_item->getName(), null, true) ?>" />
- <?php break;
- default: ?>
- <?php echo $_helper->productAttribute($_item, $this->getProductAttributeValue($_item, $_attribute), $_attribute->getAttributeCode()) ?>
- <?php break;
- } ?>
- </div>
- </td>
- <?php endforeach; ?>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
-</div>
-</div>
-<?php else: ?>
- <p class="empty"><?php echo __('You have no items to compare.') ?></p>
-<?php endif; ?>
-
-<script type="text/javascript">
- (function($, window) {
- <?php if ($_total): ?>
- head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/list.js')?>", function() {
- $('#product-comparison').compareList({
- windowPrintSelector: '.action.print',
- productsInRow: 5,
- selectors: {
- productAddToCartSelector: 'button.action.tocart'
- }
- });
- });
- <?php endif; ?>
- })(jQuery, window);
-</script>
-
-
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/compare/sidebar.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/compare/sidebar.phtml
deleted file mode 100644
index 1b873ba6d41..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/compare/sidebar.phtml
+++ /dev/null
@@ -1,79 +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)
- */
-/* @var $this \Magento\Catalog\Block\Product\Compare\Sidebar */
-?>
-<?php
-$_helper = $this->helper('Magento\Catalog\Helper\Product\Compare');
-$_items = $_helper->getItemCount() > 0 ? $_helper->getItemCollection() : null;
-?>
-<div class="block compare">
- <div class="title">
- <strong>
- <span class="text"><?php echo __('Compare Products') ?></span>
- <?php if($_helper->getItemCount() > 0): ?>
- <span class="qty"><?php echo __('%1', $_helper->getItemCount()) ?></span>
- <?php endif; ?>
- </strong>
- </div>
- <div class="content">
- <?php if($_helper->getItemCount() > 0): ?>
- <ol id="compare-items" class="items compare">
- <?php foreach($_items as $_index => $_item): ?>
- <li class="item">
- <input type="hidden" class="compare-item-id" value="<?php echo $_item->getId() ?>" />
- <strong class="product name">
- <a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName(), 'name') ?></a>
- </strong>
- <a href="<?php echo $_helper->getRemoveUrl($_item) ?>" title="<?php echo __('Remove This Item') ?>" class="action delete"><span><?php echo __('Remove This Item') ?></span></a>
- </li>
- <?php endforeach; ?>
- </ol>
- <div class="actions">
- <div class="primary">
- <a href="<?php echo $_helper->getListUrl() ?>" class="action compare"><span><?php echo __('Compare') ?></span></a>
- </div>
- <div class="secondary">
- <a id='compare-clear-all' href="<?php echo $_helper->getClearListUrl() ?>" class="action clear"><span><?php echo __('Clear All') ?></span></a>
- </div>
- </div>
- <script type="text/javascript">
- (function($) {
- head.js("<?php echo $this->getViewFileUrl('jquery/jquery.popupwindow.js') ?>",
- "<?php echo $this->getViewFileUrl('mage/popup-window.js') ?>",
- "<?php echo $this->getViewFileUrl('Magento_Catalog::js/compare.js') ?>", function() {
- $('#compare-items').compareItems({
- removeConfirmMessage: '<?php echo __('Are you sure you would like to remove this item from the compare products?') ?>',
- removeSelector: '#compare-items a.action.delete',
- clearAllConfirmMessage: '<?php echo __('Are you sure you would like to remove all products from your comparison?') ?>',
- clearAllSelector: '#compare-clear-all'
- });
- });
- })(jQuery);
- </script>
- <?php else: ?>
- <p class="empty"><?php echo __('You have no items to compare.') ?></p>
- <?php endif; ?>
- </div>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/image.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/image.phtml
deleted file mode 100644
index 363f3e4b4bb..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/image.phtml
+++ /dev/null
@@ -1,31 +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\Catalog\Block\Product\Image */ ?>
-
-<img class="photo image" style="width:<?php echo $this->getProductImageView()->getWidth()?>px;
- height:<?php echo $this->getProductImageView()->getHeight()?>px;"
- src="<?php echo $this->getProductImageView()->getUrl() ?>"
- alt="<?php echo $this->stripTags($this->getProductImageView()->getLabel(), null, true) ?>"/>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/image_with_borders.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/image_with_borders.phtml
deleted file mode 100644
index 1aa7f4e151f..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/image_with_borders.phtml
+++ /dev/null
@@ -1,32 +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\Catalog\Block\Product\Image */ ?>
-
-<span class="img photo container" style="width:<?php echo $this->getProductImageView()->getWidth()?>px;
- height:<?php echo $this->getProductImageView()->getHeight()?>px; display: block; position: relative;
- overflow: hidden"><img class="photo image" style="display: block; position: absolute; top: 0; bottom: 0; left: 0; right: 0;
- margin: auto;" src="<?php echo $this->getProductImageView()->getUrl() ?>"
- alt="<?php echo $this->stripTags($this->getProductImageView()->getLabel(), null, true) ?>"/></span>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/list.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/list.phtml
deleted file mode 100644
index c5cec832a6e..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/list.phtml
+++ /dev/null
@@ -1,126 +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
-/**
- * Product list template
- *
- * @see \Magento\Catalog\Block\Product\ListProduct
- */
-?>
-<?php
-$_productCollection = $this->getLoadedProductCollection();
-$_helper = $this->helper('Magento\Catalog\Helper\Output');
-$imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
-?>
-<?php if (!$_productCollection->count()): ?>
-<p class="message note"><?php echo __('There are no products matching the selection.') ?></p>
-<?php else: ?>
-<?php echo $this->getToolbarHtml() ?>
-<?php echo $this->getAdditionalHtml() ?>
-<?php if ($this->getMode() == 'grid') {
- $viewMode ='grid';
- $image = 'category_page_grid';
- $showDescription = false;
- $rating = 'short';
-} else {
- $viewMode ='list';
- $image = 'category_page_list';
- $showDescription = true;
- $rating = 'full';
-}
-/**
-* Position for actions regarding image size changing in vde if needed
-*/
-$pos = $this->getPositioned();
-$position = '';
-if ($pos != null) {
- $position = ' style="left:' . $this->getVar("{$image}:width") . 'px;'
- .'top:' . $this->getVar("{$image}:height") . 'px;"';
-}
-?>
-<div class="products wrapper <?php echo $viewMode; ?>">
- <?php $iterator = 1; ?>
- <ol class="products list items">
- <?php foreach ($_productCollection as $_product): ?>
- <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
- <div class="product">
- <?php // Product Image ?>
- <a href="<?php echo $_product->getProductUrl() ?>" class="product photo">
- <?php echo $imageBlock->init($_product, $image)->toHtml() ?>
- </a>
- <div class="product details">
- <?php $_productNameStripped = $this->stripTags($_product->getName(), null, true); ?>
- <strong class="product name">
- <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_productNameStripped; ?>">
- <?php echo $_helper->productAttribute($_product, $_product->getName(), 'name'); ?>
- </a>
- </strong>
- <?php echo $this->getPriceHtml($_product, true) ?>
- <?php if ($_product->getRatingSummary()): ?>
- <?php echo $this->getReviewsSummaryHtml($_product,$rating) ?>
- <?php endif; ?>
- <?php if ($showDescription):?>
- <div class="product description">
- <?php echo $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
- <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_productNameStripped ?>"
- class="action more"><?php echo __('Learn More') ?></a>
- </div>
- <?php endif; ?>
- <div class="product actions"<?php echo strpos($pos, $viewMode . '-actions') ? $position : ''; ?>>
- <div class="primary"<?php echo strpos($pos, $viewMode . '-primary') ? $position: ''; ?>>
- <?php if ($_product->isSaleable()): ?>
- <button type="button" title="<?php echo __('Add to Cart') ?>" class="action tocart"
- data-mage-init="{redirectUrl: {url: '<?php echo $this->getAddToCartUrl($_product) ?>'}}">
- <span><?php echo __('Add to Cart') ?></span>
- </button>
- <?php else: ?>
- <?php if ($_product->getIsSalable()): ?>
- <p class="stock available"><span><?php echo __('In stock') ?></span></p>
- <?php else: ?>
- <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <?php endif; ?>
- </div>
- <div class="secondary"<?php echo strpos($pos, $viewMode . '-secondary') ? $position : ''; ?>>
- <a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getAddUrl($_product) ?>"
- class="action towishlist" data-action="add-to-wishlist">
- <span><?php echo __('Add to Wishlist') ?></span>
- </a>
- <a href="<?php echo $this->getAddToCompareUrl($_product) ?>" class="action tocompare">
- <span><?php echo __('Add to Compare') ?></span>
- </a>
- </div>
- </div>
- </div>
- </div>
- <?php echo ($iterator==count($_productCollection)+1) ? '</li>' : '' ?>
- <?php endforeach; ?>
- </ol>
-</div>
-<div class="toolbar bottom">
- <?php echo $this->getToolbarHtml() ?>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/list/toolbar.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/list/toolbar.phtml
deleted file mode 100644
index 4dbf3286a34..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/list/toolbar.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
- * @copyright Copyright (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
-/**
- * Product list toolbar
- *
- * @see Magento\Catalog\Block\Product\ProductList\Toolbar
- */
-?>
-<?php if ($this->getCollection()->getSize()): ?>
-<div class="toolbar">
- <?php if ($this->isExpanded()): ?>
- <div class="settings">
-
- <?php if ($this->isEnabledViewSwitcher()): ?>
- <div class="modes">
- <?php $_modes = $this->getModes(); ?>
- <?php if ($_modes && count($_modes) > 1): ?>
- <strong class="label"><?php echo __('View as') ?></strong>
- <?php foreach ($this->getModes() as $_code => $_label): ?>
- <?php if ($this->isModeActive($_code)): ?>
- <strong class="mode active <?php echo strtolower($_code); ?>" title="<?php echo $_label ?>">
- <span><?php echo $_label ?></span>
- </strong>
- <?php else: ?>
- <a class="mode <?php echo strtolower($_code); ?>" title="<?php echo $_label ?>"
- href="<?php echo $this->getModeUrl($_code) ?>">
- <span><?php echo $_label ?></span>
- </a>
- <?php endif; ?>
- <?php endforeach; ?>
- <?php endif; ?>
- </div>
- <?php endif; ?>
-
- <div class="sorter">
- <label class="label" for="sorter"><?php echo __('Sort By') ?></label>
- <select id="sorter" data-mage-init="{redirectUrl: {event:'change'}}">
- <?php foreach ($this->getAvailableOrders() as $_key => $_order): ?>
- <option
- value="<?php echo $this->getOrderUrl($_key, 'asc') ?>"<?php if ($this->isOrderCurrent($_key)): ?>
- selected="selected"<?php endif; ?>>
- <?php echo __($_order) ?>
- </option>
- <?php endforeach; ?>
- </select>
- <?php if ($this->getCurrentDirection() == 'desc'): ?>
- <a title="<?php echo __('Set Ascending Direction') ?>" href="<?php echo $this->getOrderUrl(null, 'asc') ?>" class="action sort desc">
- <span><?php echo __('Set Ascending Direction') ?></span>
- </a>
- <?php else: ?>
- <a title="<?php echo __('Set Descending Direction') ?>" href="<?php echo $this->getOrderUrl(null, 'desc') ?>" class="action sort asc">
- <span><?php echo __('Set Descending Direction') ?></span>
- </a>
- <?php endif; ?>
- </div>
-
- </div>
- <?php endif; ?>
-
- <div class="pager">
- <p class="amount">
- <?php if ($this->getLastPageNum() > 1): ?>
- <?php echo __('Items %1-%2 of %3', $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>
-
- <div class="limiter">
- <strong class="label"><?php echo __('Show') ?></strong>
- <select id="limiter" data-mage-init="{redirectUrl: {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 echo $this->getPagerHtml() ?>
- </div>
-</div>
-<?php endif ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/addto.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/addto.phtml
deleted file mode 100644
index 076fc1132f6..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/addto.phtml
+++ /dev/null
@@ -1,48 +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 $_product = $this->getProduct(); ?>
-<?php $_wishlistSubmitUrl = $this->helper('Magento\Wishlist\Helper\Data')->getAddUrl($_product); ?>
-
-<div class="product addto links" data-role="add-to-links">
-<?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
- <a href="<?php echo $_wishlistSubmitUrl ?>" class="action towishlist" data-action="add-to-wishlist"><span><?php echo __('Add to Wishlist') ?></span></a>
-<?php endif; ?>
-<?php
- $_compareUrl = $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddUrl($_product);
-?>
-<?php if($_compareUrl) : ?>
- <a href="<?php echo $_compareUrl ?>" class="action tocompare"><span><?php echo __('Add to Compare') ?></span></a>
-<?php endif; ?>
-</div>
-<script type="text/javascript">
- head.js("<?php echo $this->getViewFileUrl('Magento_Wishlist::js/add-to-wishlist.js') ?>", function () {
- jQuery('[data-role="add-to-links"]').addToWishlist(
- <?php echo $this->helper('Magento\Core\Helper\Data')->jsonEncode(array('productType' => $_product->getTypeId()))?>
- );
- });
-</script>
-
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/addtocart.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/addtocart.phtml
deleted file mode 100644
index 726d90b9c1f..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/addtocart.phtml
+++ /dev/null
@@ -1,93 +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 $_product = $this->getProduct(); ?>
-<?php $buttonTitle = __('Add to Cart'); ?>
-<?php if ($_product->isSaleable()): ?>
-<div class="box tocart">
- <?php if (!$_product->isGrouped()): ?>
- <div class="field qty">
- <label class="label" for="qty"><span><?php echo __('Qty') ?></span></label>
- <div class="control">
- <input type="text" name="qty" id="qty" maxlength="12" value="<?php echo $this->getProductDefaultQty() * 1 ?>"
- title="<?php echo __('Qty') ?>" class="input-text qty" data-validate="{required:true,digits:true}"/>
- </div>
- </div>
- <?php endif; ?>
- <div class="actions">
- <button type="submit" title="<?php echo $buttonTitle ?>" class="action primary tocart" id="product-addtocart-button">
- <span><?php echo $buttonTitle ?></span>
- </button>
- <?php echo $this->getChildHtml('', true) ?>
- </div>
-</div>
-<?php endif; ?>
-
-<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 () {
- $('#product_addtocart_form').validation({
- errorPlacement: function (error, element) {
- if (element.attr('data-validate') && element.attr('data-validate').indexOf('validate-one-checkbox-required-by-name') > 0) {
- error.appendTo('#links-advice-container');
- } else if (element.attr('data-validate')&& element.attr('data-validate').indexOf('validate-grouped-qty') > 0) {
- $('#super-product-table').siblings(this.errorElement + '.' + this.errorClass).remove();
- $('#super-product-table').after(error);
- } else if (element.is(':radio, :checkbox')) {
- element.closest('.nested').after(error);
- } else {
- element.after(error);
- }
- },
- highlight: function (element, errorClass) {
- if ($(element).attr('data-validate') && $(element).attr('data-validate').indexOf('validate-required-datetime') > 0) {
- $(element).parent().find('.datetime-picker').each(function() {
- $(this).removeClass(errorClass);
- if ($(this).val().length === 0) {
- $(this).addClass(errorClass);
- }
- });
- } else if ($(element).is(':radio, :checkbox')) {
- $(element).closest('.nested').addClass(errorClass+'-group');
- } else {
- $(element).addClass(errorClass);
- }
- },
- unhighlight: function (element, errorClass) {
- if ($(element).attr('data-validate') && $(element).attr('data-validate').indexOf('validate-required-datetime') > 0) {
- $(element).parent().find('.datetime-picker').removeClass(errorClass);
- } else if ($(element).is(':radio, :checkbox')) {
- $(element).closest('.nested').removeClass(errorClass+'-group');
- } else {
- $(element).removeClass(errorClass);
- }
- }
- });
- });
- })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/attributes.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/attributes.phtml
deleted file mode 100644
index f4a0c38483c..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/attributes.phtml
+++ /dev/null
@@ -1,47 +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)
- */
-
-/**
- * Product additional attributes template
- *
- * @see \Magento\Catalog\Block\Product\View\Attributes
- */
-?>
-<?php
- $_helper = $this->helper('Magento\Catalog\Helper\Output');
- $_product = $this->getProduct()
-?>
-<?php if($_additional = $this->getAdditionalData()): ?>
-<table class="data table product attributes" id="product-attribute-specs-table">
- <tbody>
- <?php foreach ($_additional as $_data): ?>
- <tr>
- <th class="col label"><?php echo $this->escapeHtml(__($_data['label'])) ?></th>
- <td class="col data"><?php echo $_helper->productAttribute($_product, $_data['value'], $_data['code']) ?></td>
- </tr>
- <?php endforeach; ?>
- </tbody>
-</table>
-<?php endif;?>
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
deleted file mode 100644
index e8ab0f4616b..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/base-image.phtml
+++ /dev/null
@@ -1,153 +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)
- */
-
-/**
- * Product media data template
- *
- * @see \Magento\Catalog\Block\Product\View\BaseImage
- */
-?>
-<?php
- $_product = $this->getProduct();
- $_helper = $this->helper('Magento\Catalog\Helper\Output');
-
- //list($_imgWidth, $_imgHeight) = $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image')->getOriginalSizeArray();
-
- $image = 'product_page_main_image';
-
- $_resizedWidth = $this->getVar("{$image}:width");
- $_resizedHeight = $this->getVar("{$image}:height") ?: $_resizedWidth ;
-
- $_hasImage = ($_product->getImage() && $_product->getImage() != "no_selection") ? true : false;
-
- //$_isOldDisplayMode = $this->getOldDisplayMode() || 0;
- $_isOldDisplayMode = 0;
- $whiteBorders = $this->getVar("product_image_white_borders");
-?>
-<?php //if($whiteBorders == 0): ?>
- <style scoped>
- .magento-zoom > .img > img {
- position:absolute;
- top:0; bottom:0; left:0; right:0; margin:auto; max-height: 100%; max-width: 100%;
- }
- </style>
-<?php //endif; ?>
-<div class="product photo main">
- <a class="product photo magento-zoom<?php echo (!$_hasImage) ? ' isPlaceholder' : ''; ?>"
- id="base-image" data-role="base-image-zoom"
- href="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image'); ?>" >
- <?php echo $this->getChildBlock('product.image.main')->init($_product, $image)->toHtml() ?>
- </a>
-<?php ?>
- <script type="text/javascript">
- jQuery('[data-role=base-image-zoom]').attr('rel', '<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image'); ?>');
- </script>
-
- <p class="notice"></p>
-
- <script type="text/javascript">
- jQuery(function(){
- <?php if ($_isOldDisplayMode): ?>
- jQuery('.magento-zoom').magentoZoom({
- useGallery: false,
- swapNotices: false,
- isOldMode: <?php print $_isOldDisplayMode; ?>,
- messages: {
- noticeDefault: '<?php echo $this->escapeJsQuote(__("Click on image to zoom")) ?>',
- loadingMessage: '<?php echo $this->escapeJsQuote(__("Loading...")) ?>'
- }
- });
- <?php else: ?>
- jQuery('.magento-zoom').magentoZoom({
- useLens: true,
- enlarged: {
- adjustment: 20,
- width: 500,
- height: <?php echo $_resizedHeight ?>
- },
- useGallery: true,
- swapNotices: true,
- isOldMode: <?php print $_isOldDisplayMode; ?>,
- messages: {
- noticeDefault: '<?php echo $this->escapeJsQuote(__("Click on image to zoom")) ?>',
- noticeLightBox: '<?php echo $this->escapeJsQuote(__("Click on image to view it full sized")) ?>', loadingMessage: '<?php echo $this->escapeJsQuote(__("Loading...")) ?>'
- }
- });
- <?php endif; ?>
- });
- </script>
-<?php ?>
-</div>
-
-<?php if (count($this->getGalleryImages()) > 0): ?>
-
-<?php
- $thumbWidth = $this->getVar("product_page_more_views:width");
- $thumbHeight = $this->getVar("product_page_more_views:height") ? : $thumbWidth;
-?>
-<div class="product photo thumbs">
- <strong class="title"><?php echo __('More Views') ?></strong>
- <ul class="items thumbs">
- <?php foreach ($this->getGalleryImages() as $_image): ?>
- <?php if ($_isOldDisplayMode) {
- $attributes = ' href="#" data-mage-popwin="{windowURL:'
- . $this->getGalleryUrl($_image)
- . ',windowName:\'gallery\',width:300,height:300,status:1,scrollbars:1,resizable:1}"';
- } else {
- $attributes = ' href="'
- . $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image', $_image->getFile())
- . '" rel="';
- if ($whiteBorders) {
- $attributes .= $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image', $_image->getFile())->resize($_resizedWidth,$_resizedHeight) . '"';
- } else {
- $attributes .= $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image', $_image->getFile())->constrainOnly(TRUE)->keepAspectRatio(TRUE)->keepFrame(FALSE)->resize($_resizedWidth,$_resizedHeight) . '"';
- }
- };?>
- <li class="item thumb">
- <a<?php echo $attributes; ?> class="magento-zoom" title="<?php echo $this->escapeHtml($_image->getLabel()) ?>">
- <?php if ($whiteBorders): ?>
- <span class="img" style="position:relative; z-index:1; display:block; width:<?php echo $thumbHeight;?>px; height:<?php echo $thumbHeight;?>px;">
- <img src="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'thumbnail', $_image->getFile())->resize($thumbWidth,$thumbHeight); ?>" alt="<?php echo $this->escapeHtml($_image->getLabel()) ?>" />
- </span>
- <?php else: ?>
- <span class="img" style="position:relative; z-index:1; display:block; width:<?php echo $thumbHeight;?>px; height:<?php echo $thumbHeight;?>px;">
- <img src="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'thumbnail', $_image->getFile())->constrainOnly(TRUE)->keepAspectRatio(TRUE)->keepFrame(FALSE)->resize($thumbWidth,$thumbHeight); ?>" alt="<?php echo $this->escapeHtml($_image->getLabel()) ?>" />
- </span>
- <?php endif; ?>
- </a>
- </li>
- <?php endforeach; ?>
- </ul>
-</div>
- <?php if ($_isOldDisplayMode): ?>
- <script type="text/javascript">
- (function($) {
- head.js("<?php echo $this->getViewFileUrl('jquery/jquery.popupwindow.js')?>",
- "<?php echo $this->getViewFileUrl('mage/popup-window.js')?>"
- );
- })(jQuery);
- </script>
- <?php endif; ?>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/description.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/description.phtml
deleted file mode 100644
index cd98c96ea75..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/description.phtml
+++ /dev/null
@@ -1,32 +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)
- */
-
-/**
- * Product description template
- *
- * @see \Magento\Catalog\Block\Product\View\Description
- */
-?>
-<?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($this->getProduct(), $this->getProduct()->getDescription(), 'description') ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/gallery.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/gallery.phtml
deleted file mode 100644
index 815bfc49d92..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/gallery.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
- * @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 (count($this->getGalleryImages()) > 0): ?>
-
-<?php
- $thumbWidth = $this->getVar("product_page_more_views:width");
- $thumbHeight = $this->getVar("product_page_more_views:height") ? : $thumbWidth;
-?>
-<div class="product photo thumbs">
- <strong class="title"><?php echo __('More Views') ?></strong>
- <ul class="items thumbs">
- <?php foreach ($this->getGalleryImages() as $_image): ?>
- <?php if ($_isOldDisplayMode) {
- $attributes = ' href="#" data-mage-popwin="{windowURL:'
- . $this->getGalleryUrl($_image)
- . ',windowName:\'gallery\',width:300,height:300,status:1,scrollbars:1,resizable:1}"';
- } else {
- $attributes = ' href="'
- . $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image', $_image->getFile())
- . '" rel="';
- if ($whiteBorders) {
- $attributes .= $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image', $_image->getFile())->resize($_resizedWidth,$_resizedHeight) . '"';
- } else {
- $attributes .= $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'image', $_image->getFile())->constrainOnly(TRUE)->keepAspectRatio(TRUE)->keepFrame(FALSE)->resize($_resizedWidth,$_resizedHeight) . '"';
- }
- };?>
- <li class="item thumb">
- <a<?php echo $attributes; ?> class="magento-zoom" title="<?php echo $this->escapeHtml($_image->getLabel()) ?>">
- <?php if ($whiteBorders): ?>
- <span class="img" style="position:relative; z-index:1; display:block; width:<?php echo $thumbHeight;?>px; height:<?php echo $thumbHeight;?>px;">
- <img src="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'thumbnail', $_image->getFile())->resize($thumbWidth,$thumbHeight); ?>" alt="<?php echo $this->escapeHtml($_image->getLabel()) ?>" />
- </span>
- <?php else: ?>
- <span class="img" style="position:relative; z-index:1; display:block; width:<?php echo $thumbHeight;?>px; height:<?php echo $thumbHeight;?>px;">
- <img src="<?php echo $this->helper('Magento\Catalog\Helper\Image')->init($_product, 'thumbnail', $_image->getFile())->constrainOnly(TRUE)->keepAspectRatio(TRUE)->keepFrame(FALSE)->resize($thumbWidth,$thumbHeight); ?>" alt="<?php echo $this->escapeHtml($_image->getLabel()) ?>" />
- </span>
- <?php endif; ?>
- </a>
- </li>
- <?php endforeach; ?>
- </ul>
-</div>
- <?php if ($_isOldDisplayMode): ?>
- <script type="text/javascript">
- (function($) {
- head.js("<?php echo $this->getViewFileUrl('jquery/jquery.popupwindow.js')?>",
- "<?php echo $this->getViewFileUrl('mage/popup-window.js')?>"
- );
- })(jQuery);
- </script>
- <?php endif; ?>
-<?php endif; ?>
-
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options.phtml
deleted file mode 100644
index 44339ee0148..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options.phtml
+++ /dev/null
@@ -1,43 +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)
- */
-/* @var $this \Magento\Catalog\Block\Product\View\Options */
-?>
-
-<?php $_options = $this->decorateArray($this->getOptions()) ?>
-<?php if (count($_options)):?>
- <script type="text/javascript">
- (function ($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/price-option.js') ?>", function () {
- $('#product_addtocart_form').priceOption({
- 'optionConfig':<?php echo $this->getJsonConfig()?>,
- 'controlContainer': '.field'
- }).trigger('reloadPrice');
- });
- })(jQuery);
- </script>
- <?php foreach($_options as $_option): ?>
- <?php echo $this->getOptionHtml($_option) ?>
- <?php endforeach; ?>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/js.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/js.phtml
deleted file mode 100644
index 9cafa8bb474..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/js.phtml
+++ /dev/null
@@ -1,88 +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)
- */
-?>
-<script type="text/javascript">
-//<![CDATA[
-var DateOption = Class.create({
-
- getDaysInMonth: function(month, year)
- {
- var curDate = new Date();
- if (!month) {
- month = curDate.getMonth();
- }
- if (2 == month && !year) { // leap year assumption for unknown year
- return 29;
- }
- if (!year) {
- year = curDate.getFullYear();
- }
- return 32 - new Date(year, month - 1, 32).getDate();
- },
-
- reloadMonth: function(event)
- {
- var selectEl = event.findElement();
- var idParts = selectEl.id.split("_");
- if (idParts.length != 3) {
- return false;
- }
- var optionIdPrefix = idParts[0] + "_" + idParts[1];
- var month = parseInt($(optionIdPrefix + "_month").value);
- var year = parseInt($(optionIdPrefix + "_year").value);
- var dayEl = $(optionIdPrefix + "_day");
-
- var days = this.getDaysInMonth(month, year);
-
- //remove days
- for (var i = dayEl.options.length - 1; i >= 0; i--) {
- if (dayEl.options[i].value > days) {
- dayEl.remove(dayEl.options[i].index);
- }
- }
-
- // add days
- var lastDay = parseInt(dayEl.options[dayEl.options.length-1].value);
- for (i = lastDay + 1; i <= days; i++) {
- this.addOption(dayEl, i, i);
- }
- },
-
- addOption: function(select, text, value)
- {
- var option = document.createElement('OPTION');
- option.value = value;
- option.text = text;
-
- if (select.options.add) {
- select.options.add(option);
- } else {
- select.appendChild(option);
- }
- }
-});
-dateOption = new DateOption();
-//]]>
-</script>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/date.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/date.phtml
deleted file mode 100644
index 8322a297e9c..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/date.phtml
+++ /dev/null
@@ -1,79 +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 $_option = $this->getOption() ?>
-<?php $_optionId = $_option->getId() ?>
-<?php $class = ($_option->getIsRequire()) ? ' required' : ''; ?>
-<div class="field date<?php echo $class; ?>">
- <label class="label">
- <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
- <?php echo $this->getFormatedPrice() ?>
- </label>
- <div class="control">
- <?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE_TIME
- || $_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE): ?>
-
- <?php echo $this->getDateHtml() ?>
-
- <?php if (!$this->useCalendar()): ?>
- <script type="text/javascript">
- //<![CDATA[
- (function($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/date-option.js') ?>", function() {
- $.mage.dateOption({
- datepickerFieldSelector: 'select.datetime-picker',
- monthSelector: '#options_<?php echo $_optionId ?>_month',
- yearSelector: '#options_<?php echo $_optionId ?>_year'
- });
- });
- })(jQuery);
- //]]>
- </script>
- <?php endif; ?>
-
- <?php endif; ?>
-
- <?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE_TIME
- || $_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_TIME): ?>
- <span class="time-picker"><?php echo $this->getTimeHtml() ?></span>
- <?php endif; ?>
-
- <?php if ($_option->getIsRequire()): ?>
- <input type="hidden" name="validate_datetime_<?php echo $_optionId ?>" class="validate-datetime-<?php echo $_optionId ?>" value="" data-validate="{'validate-required-datetime':<?php echo $_optionId?>}"/>
- <?php else: ?>
- <input type="hidden" name="validate_datetime_<?php echo $_optionId ?>" class="validate-datetime-<?php echo $_optionId ?>" value="" data-validate="{'validate-optional-datetime':<?php echo $_optionId?>}"/>
- <?php endif; ?>
-
- <script type="text/javascript">
- //<![CDATA[
- (function($) {
- head.js("<?php echo $this->getViewFileUrl('jquery/jquery.validate.js')?>", function() {
- $.validator.setDefaults({ignore: ':hidden:not(input[name^="validate_datetime_"])'});
- });
- })(jQuery);
- //]]>
- </script>
- </div>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/default.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/default.phtml
deleted file mode 100644
index 5bfb09586a9..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/default.phtml
+++ /dev/null
@@ -1,29 +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 $_option = $this->getOption() ?>
-<div class="field">
- <label class="label"><span><?php echo $this->escapeHtml($_option->getTitle()) ?></span></label>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/file.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/file.phtml
deleted file mode 100644
index 3d4432539ca..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/file.phtml
+++ /dev/null
@@ -1,88 +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 $_option = $this->getOption(); ?>
-<?php $_fileInfo = $this->getFileInfo(); ?>
-<?php $_fileExists = $_fileInfo->hasData(); ?>
-<?php $_fileName = 'options_' . $_option->getId() . '_file'; ?>
-<?php $_fieldNameAction = $_fileName . '_action'; ?>
-<?php $_fieldValueAction = $_fileExists ? 'save_old' : 'save_new'; ?>
-<?php $_fileNamed = $_fileName . '_name'; ?>
-<?php $class = ($_option->getIsRequire()) ? ' required' : ''; ?>
-
-
-<script type="text/javascript">
-//<![CDATA[
- (function($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/file-option.js')?>", function() {
- $('#input-box-<?php echo $_fileName ?>').fileOption({
- fileName: '<?php echo $_fileName ?>',
- fileNamed: '<?php echo $_fileNamed ?>',
- fieldNameAction: '<?php echo $_fieldNameAction ?>',
- changeFileSelector: '#change-<?php echo $_fileName ?>',
- deleteFileSelector: '#delete-<?php echo $_fileName ?>'
- });
- });
- })(jQuery);
-//]]>
-</script>
-
-<div class="field file<?php echo $class; ?>">
- <label class="label">
- <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
- <?php echo $this->getFormatedPrice() ?>
- </label>
- <?php if ($_fileExists): ?>
- <div class="control">
- <span class="<?php echo $_fileNamed ?>"><?php echo $_fileInfo->getTitle(); ?></span>
- <a href="javascript:void(0)" class="label" id="change-<?php echo $_fileName ?>" >
- <?php echo __('Change') ?>
- </a>
- <?php if (!$_option->getIsRequire()): ?>
- <input type="checkbox" id="delete-<?php echo $_fileName ?>" />
- <span class="label"><?php echo __('Delete') ?></span>
- <?php endif; ?>
- </div>
- <?php endif; ?>
- <div class="control" id="input-box-<?php echo $_fileName ?>" <?php echo $_fileExists ? 'style="display:none"' : '' ?>>
- <input type="file" name="<?php echo $_fileName; ?>" class="product-custom-option<?php echo $_option->getIsRequire() ? ' required' : '' ?>" <?php echo $_fileExists ? 'disabled="disabled"' : '' ?> />
- <input type="hidden" name="<?php echo $_fieldNameAction; ?>" value="<?php echo $_fieldValueAction; ?>" />
- <?php if ($_option->getFileExtension()): ?>
- <p class="note">
- <?php echo __('Allowed file extensions to upload')?>: <strong><?php echo $_option->getFileExtension() ?></strong>
- </p>
- <?php endif; ?>
- <?php if ($_option->getImageSizeX() > 0): ?>
- <p class="note">
- <?php echo __('Maximum image width')?>: <strong><?php echo $_option->getImageSizeX() ?> <?php echo __('px.')?></strong>
- </p>
- <?php endif; ?>
- <?php if ($_option->getImageSizeY() > 0): ?>
- <p class="note">
- <?php echo __('Maximum image height')?>: <strong><?php echo $_option->getImageSizeY() ?> <?php echo __('px.')?></strong>
- </p>
- <?php endif; ?>
- </div>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/select.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/select.phtml
deleted file mode 100644
index 765061bced1..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/select.phtml
+++ /dev/null
@@ -1,44 +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\Catalog\Block\Product\View\Options\Type\Select */ ?>
-<?php
- $_option = $this->getOption();
- $class = ($_option->getIsRequire()) ? ' required' : '';
-?>
-<div class="field<?php echo $class; ?>">
- <label class="label">
- <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
- </label>
- <div class="control">
- <?php echo $this->getValuesHtml() ?>
- <?php if ($_option->getIsRequire()): ?>
- <?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_RADIO || $_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_CHECKBOX): ?>
- <span id="options-<?php echo $_option->getId() ?>-container"></span>
- <?php endif; ?>
- <?php endif;?>
- </div>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/text.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/text.phtml
deleted file mode 100644
index 8a1d38825fc..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/type/text.phtml
+++ /dev/null
@@ -1,61 +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
- $_option = $this->getOption();
- $class = ($_option->getIsRequire()) ? ' required' : '';
-?>
-<div class="field<?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_AREA) { echo ' textarea';}?><?php echo $class ?>">
- <label class="label">
- <span><?php echo $this->escapeHtml($_option->getTitle()) ?></span>
- <?php echo $this->getFormatedPrice() ?>
- </label>
- <div class="control">
- <?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_FIELD): ?>
- <?php $_textValidate = null;
- if($_option->getIsRequire()){
- $_textValidate['required'] = true;
- }
- if($_option->getMaxCharacters()){
- $_textValidate['maxlength'] = $_option->getMaxCharacters();
- }
- ?>
- <input type="text" id="options_<?php echo $_option->getId() ?>_text" class="input-text product-custom-option" <?php if(!empty($_textValidate))echo 'data-validate='.json_encode($_textValidate) ; ?> name="options[<?php echo $_option->getId() ?>]" value="<?php echo $this->escapeHtml($this->getDefaultValue()) ?>" />
- <?php elseif ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_AREA): ?>
- <?php $_textAreaValidate = null;
- if($_option->getIsRequire()){
- $_textAreaValidate['required'] = true;
- }
- if($_option->getMaxCharacters()){
- $_textAreaValidate['maxlength'] = $_option->getMaxCharacters();
- }
- ?>
- <textarea id="options_<?php echo $_option->getId() ?>_text" class="product-custom-option" <?php if(!empty($_textAreaValidate))echo 'data-validate='.json_encode($_textAreaValidate) ; ?> name="options[<?php echo $_option->getId() ?>]" rows="5" cols="25"><?php echo $this->escapeHtml($this->getDefaultValue()) ?></textarea>
- <?php endif; ?>
- <?php if ($_option->getMaxCharacters()): ?>
- <p class="note"><?php echo __('Maximum number of characters:')?> <strong><?php echo $_option->getMaxCharacters() ?></strong></p>
- <?php endif; ?>
- </div>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/wrapper.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/wrapper.phtml
deleted file mode 100644
index f1f0c8070aa..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/wrapper.phtml
+++ /dev/null
@@ -1,36 +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
-$required = '';
-if ($this->hasRequiredOptions()) {
- $required = ' data-hasrequired="' . __('* Required Fields') . '"';
-}
-?>
-<div class="product options wrapper" id="product-options-wrapper"<?php echo $required; ?>>
- <fieldset class="fieldset">
- <?php echo $this->getChildHtml('', true);?>
- </fieldset>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/wrapper/bottom.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/wrapper/bottom.phtml
deleted file mode 100644
index 2c956095b46..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/options/wrapper/bottom.phtml
+++ /dev/null
@@ -1,28 +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="product options bottom">
- <?php echo $this->getChildHtml('', true);?>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/price_clone.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/price_clone.phtml
deleted file mode 100644
index dabb8a33bf6..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/price_clone.phtml
+++ /dev/null
@@ -1,27 +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 $_product = $this->getProduct() ?>
-<?php echo $this->getPriceHtml($_product, false, '_clone') ?>
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
deleted file mode 100644
index 17bbc40bf1d..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/tierprices.phtml
+++ /dev/null
@@ -1,219 +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\Catalog\Block\Product\View
- */
-$_product = $this->getProduct();
-$_tierPrices = $this->getTierPrices();
-$_finalPriceInclTax = $this->helper('Magento\Tax\Helper\Data')->getPrice($_product, $_product->getFinalPrice(), true);
-
-/** @var $_catalogHelper \Magento\Catalog\Helper\Data */
-$_catalogHelper = $this->helper('Magento\Catalog\Helper\Data');
-
-$_weeeTaxAmount = $this->helper('Magento\Weee\Helper\Data')->getAmountForDisplay($_product);
-if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, array(1,2,4))) {
- $_weeeTaxAttributes = $this->helper('Magento\Weee\Helper\Data')->getProductWeeeAttributesForDisplay($_product);
-}
-
-?>
-<?php if (count($_tierPrices) > 0): ?>
- <ul class="<?php echo ($this->getInGrouped() ? 'tier prices grouped items' : 'prices tier items'); ?>">
- <?php if ($this->getInGrouped()): ?>
- <?php $_tierPrices = $this->getTierPrices($_product); ?>
- <?php endif; ?>
- <?php $this->helper('Magento\Weee\Helper\Data')->processTierPrices($_product, $_tierPrices); ?>
- <?php foreach ($_tierPrices as $_index => $_price): ?>
- <li class="item">
- <?php if ($_catalogHelper->canApplyMsrp($_product)): ?>
- <?php if ($this->getInGrouped()): ?>
- <?php echo __('Buy %1 for', $_price['price_qty']) ?>:
- <?php else: ?>
- <?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 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 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
- <?php if ($_weeeTaxAttributes): ?>
- (<small>
- <?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()); ?>
- <?php endforeach; ?>
- </small>)
- <?php endif; ?>
- <?php echo __('each') ?>
- <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 4)): ?>
- <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
- <?php if ($_weeeTaxAttributes): ?>
- (<small>
- <?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()); ?>
- <?php endforeach; ?>
- </small>)
- <?php endif; ?>
- <?php echo __('each') ?>
- <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)): ?>
- <?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', $_price['formated_price_incl_weee']); ?>
- </small>)
- <?php endif; ?>
- <?php echo __('each') ?>
- <?php else: ?>
- <?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 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 for %2', $_price['price_qty'], $_price['formated_price_incl_weee']); ?>
- <?php if ($_weeeTaxAttributes): ?>
- (<small>
- <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
- <?php echo $separator; ?>
- <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
- <?php $separator = ' + '; endforeach; ?>
- </small>)
- <?php endif; ?>
- <?php echo __('each') ?>
- <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 4)): ?>
- <?php echo __('Buy %1 for %2', $_price['price_qty'], $_price['formated_price_incl_weee']); ?>
- <?php if ($_weeeTaxAttributes): ?>
- (<small>
- <?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()); ?>
- <?php $separator = ' + '; endforeach; ?>
- </small>)
- <?php endif; ?>
- <?php echo __('each') ?>
- <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)): ?>
- <?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', $_price['formated_price_incl_weee']); ?>
- </small>)
- <?php endif; ?>
- <?php echo __('each') ?>
- <?php else: ?>
- <?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 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 for %2', $_price['price_qty'], $_price['formated_price_incl_weee_only']); ?>
- <?php if ($_weeeTaxAttributes): ?>
- (<small>
- <?php $separator = ''; foreach ($_weeeTaxAttributes as $_attribute): ?>
- <?php echo $separator; ?>
- <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()); ?>
- <?php $separator = ' + '; endforeach; ?>
- </small>)
- <?php endif; ?>
- <?php echo __('each') ?>
- <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 4)): ?>
- <?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): ?>
- <?php echo $separator; ?>
- <?php echo $_attribute->getName(); ?>: <?php echo $this->helper('Magento\Core\Helper\Data')->currency($_attribute->getAmount()+$_attribute->getTaxAmount()); ?>
- <?php $separator = ' + '; endforeach; ?>
- </small>)
- <?php endif; ?>
- <?php echo __('each') ?>
- <?php elseif($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_product, 2)): ?>
- <?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', $_price['formated_price_incl_weee_only']); ?>
- </small>)
- <?php endif; ?>
- <?php echo __('each') ?>
- <?php else: ?>
- <?php echo __('Buy %1 for %2 each', $_price['price_qty'], $_price['formated_price']) ?>
- <?php endif; ?>
- <?php endif; ?>
- <?php endif; ?>
-
- <?php endif; // Can apply MSRP ?>
-
- <?php if (!$this->getInGrouped()): ?>
- <?php if(($_product->getPrice() == $_product->getFinalPrice() && $_product->getPrice() > $_price['price'])
- || ($_product->getPrice() != $_product->getFinalPrice() && $_product->getFinalPrice() > $_price['price'])): ?>
- <?php echo __('and') ?> <strong class="benefit"><?php echo __('save')?> <span class="percent tier-<?php echo $_index;?>"><?php echo $_price['savePercent']?></span>%
- <?php endif ?></strong>
- <?php endif; ?>
-
- <?php if ($_catalogHelper->isShowPriceOnGesture($_product)):?>
- <?php $popupId = 'msrp-popup-' . $_product->getId() . $this->getRandomString(20); ?>
- <?php
- $addToCartUrl = $this->getProduct()->isSalable()
- ? $this->getAddToCartUrl($_product, array('qty' => $_price['price_qty']))
- : '';
- ?>
- <a href="#" id="<?php echo($popupId);?>" data-tier-price='{addToCartUrl:"<?php echo $addToCartUrl; ?>", name:"<?php echo $_product->getName() ?>", price:<?php echo json_encode($_price['real_price_html']) ?>, msrp:"<?php echo $this->helper('Magento\Core\Helper\Data')->currency($_product->getMsrp(),true,false) ?>"<?php if (!$this->getInGrouped()): ?>, qty:"<?php echo $_price['price_qty']?>"<?php endif ?>}'><?php echo __('Click for price'); ?></a>
- <?php else: ?>
- <span class="msrp-price-hide-message">
- <?php echo $_catalogHelper->getMsrpPriceMessage($_product) ?>
- </span>
- <?php endif; ?>
- </li>
- <?php endforeach ?>
- </ul>
- <?php if ($_catalogHelper->isShowPriceOnGesture($_product)):?>
- <script type="text/javascript">
- (function($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/tier-price.js') ?>", function () {
- $('#product_addtocart_form').tierPrice({
- inputQty: '#qty'
- });
- });
- })(jQuery);
- </script>
- <?php endif;?>
-<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/default.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/default.phtml
deleted file mode 100644
index a8e728a5bf6..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/default.phtml
+++ /dev/null
@@ -1,39 +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\Catalog\Block\Product\View\AbstractView */?>
-<?php $_product = $this->getProduct() ?>
-
-<?php if ($this->displayProductStockStatus()): ?>
- <?php if ($_product->isAvailable()): ?>
- <p class="stock available" title="<?php echo __('Availability') ?>">
- <span><?php echo __('In stock') ?></span>
- </p>
- <?php else: ?>
- <p class="stock unavailable" title="<?php echo __('Availability') ?>">
- <span><?php echo __('Out of stock') ?></span>
- </p>
- <?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
deleted file mode 100644
index 5f7b68c66ef..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/grouped.phtml
+++ /dev/null
@@ -1,97 +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)
- */
-
-/**
- * Grouped product data template
- *
- * @see \Magento\Catalog\Block\Product\View\BaseImage
- * @see \Magento\Catalog\Block\Product\View\Type\Grouped
- */
-?>
-<?php $this->setPreconfiguredValue(); ?>
-<?php $_product = $this->getProduct(); ?>
-<?php $_associatedProducts = $this->getAssociatedProducts(); ?>
-<?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
-<?php if ($this->displayProductStockStatus()): ?>
- <?php if ($_product->isAvailable() && $_hasAssociatedProducts): ?>
- <p class="stock available" title="<?php echo __('Availability') ?>">
- <span><?php echo __('In stock') ?></span>
- </p>
- <?php else: ?>
- <p class="stock unavailable" title="<?php echo __('Availability') ?>">
- <span><?php echo __('Out of stock') ?></span>
- </p>
- <?php endif; ?>
-<?php endif; ?>
-
-<table class="table data grouped" id="super-product-table">
- <thead>
- <tr>
- <th class="col item"><?php echo __('Product Name') ?></th>
- <?php if ($this->getCanShowProductPrice($_product)): ?>
- <th class="col price"><?php echo __('Price') ?></th>
- <?php endif; ?>
- <?php if ($_product->isSaleable()): ?>
- <th class="col qty"><?php echo __('Qty') ?></th>
- <?php endif; ?>
- </tr>
- </thead>
- <tbody>
- <?php if ($_hasAssociatedProducts): ?>
- <?php foreach ($_associatedProducts as $_item): ?>
- <?php $_finalPriceInclTax = $this->helper('Magento\Tax\Helper\Data')->getPrice($_item, $_item->getFinalPrice(), true) ?>
- <tr>
- <td class="col item"><strong class="product name"><?php echo $this->escapeHtml($_item->getName()) ?></strong></td>
- <?php if ($this->getCanShowProductPrice($_product)): ?>
- <td class="col price">
- <?php if ($this->getCanShowProductPrice($_item)): ?>
- <?php echo $this->getPriceHtml($_item, true) ?>
- <?php echo $this->getTierPriceHtml($_item) ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
- <?php if ($_product->isSaleable()): ?>
- <td class="col qty">
- <?php if ($_item->isSaleable()) : ?>
- <div class="control qty">
- <input type="text" name="super_group[<?php echo $_item->getId() ?>]" maxlength="12" value="<?php echo $_item->getQty()*1 ?>" title="<?php echo __('Qty') ?>" class="input-text qty" data-validate="{'validate-grouped-qty':'#super-product-table'}"/>
- </div>
- <?php else: ?>
- <p class="stock unavailable" title="<?php echo __('Availability') ?>">
- <span><?php echo __('Out of stock') ?></span>
- </p>
- <?php endif; ?>
- </td>
- <?php endif; ?>
- </tr>
- <?php endforeach; ?>
- <?php else: ?>
- <tr>
- <td class="unavailable" colspan="<?php if ($_product->isSaleable()): ?>4<?php else : ?>3<?php endif; ?>"><?php echo __('No options of this product are available.') ?></td>
- </tr>
- <?php endif; ?>
- </tbody>
-</table>
-
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/options/configurable.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/options/configurable.phtml
deleted file mode 100644
index 174a4f5bd9e..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/view/type/options/configurable.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
-$_product = $this->getProduct();
-$_attributes = $this->decorateArray($this->getAllowAttributes());
-?>
-<?php if ($_product->isSaleable() && count($_attributes)):?>
- <div class="product options configure">
- <?php foreach($_attributes as $_attribute): ?>
- <div class="field required">
- <label class="label" for="attribute<?php echo $_attribute->getAttributeId() ?>">
- <span><?php echo $this->escapeHtml($_attribute->getLabel()) ?></span>
- </label>
- <div class="control">
- <select name="super_attribute[<?php echo $_attribute->getAttributeId() ?>]" data-validate="{required:true}" id="attribute<?php echo $_attribute->getAttributeId() ?>" class="super-attribute-select">
- <option><?php echo __('Choose an Option...') ?></option>
- </select>
- </div>
- </div>
- <?php endforeach; ?>
- </div>
- <script type="text/javascript">
- (function ($) {
- head.js("<?php echo $this->getViewFileUrl('jquery/jquery.parsequery.js') ?>",
- "<?php echo $this->getViewFileUrl('Magento_Catalog::js/configurable.js') ?>", function () {
- $('#product_addtocart_form').configurable({"spConfig":<?php echo $this->getJsonConfig() ?>});
- })
- })(jQuery);
- </script>
-<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/link/link_block.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/link/link_block.phtml
deleted file mode 100644
index ee234cbe027..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/link/link_block.phtml
+++ /dev/null
@@ -1,26 +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="widget product link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></div>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/link/link_inline.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/link/link_inline.phtml
deleted file mode 100644
index ef8fb3f550d..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/link/link_inline.phtml
+++ /dev/null
@@ -1,26 +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)
- */
-?>
-<span class="widget product link"><a <?php echo $this->getLinkAttributes() ?>><span><?php echo $this->escapeHtml($this->getAnchorText()) ?></span></a></span>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_default_list.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_default_list.phtml
deleted file mode 100644
index d6e0d27bd73..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_default_list.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)
- */
-?>
-<?php if (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
-<?php $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');?>
-<div class="block widget new minilist">
- <div class="title">
- <strong><?php echo __('New Products') ?></strong>
- </div>
- <div class="content">
- <?php echo $this->getPagerHtml() ?>
- <?php $suffix = $this->getNameInLayout(); ?>
- <?php $iterator = 1; ?>
- <ol class="items minilist products" id="widget-new-products-<?php echo $suffix; ?>">
- <?php foreach ($_products->getItems() as $_product): ?>
- <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
- <div class="product">
- <a class="product photo" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>">
- <?php echo $imageBlock->init($_product, 'side_column_widget_product_thumbnail')->toHtml() ?>
- </a>
- <div class="product details">
- <strong class="product name">
- <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a>
- </strong>
- <?php echo $this->getPriceHtml($_product, true, '-widget-new-'.$suffix) ?>
- <div class="product actions">
- <div class="primary">
- <?php if($_product->isSaleable()): ?>
- <a href="<?php echo $this->getAddToCartUrl($_product) ?>" class="action tocart">
- <span><?php echo __('Add to Cart') ?></span>
- </a>
- <?php else: ?>
- <?php if ($_product->getIsSalable()): ?>
- <p class="stock available" title="<?php echo __('Availability') ?>"><span><?php echo __('In stock') ?></span></p>
- <?php else: ?>
- <p class="stock unavailable" title="<?php echo __('Availability') ?>"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <?php endif; ?>
- </div>
- </div>
- </div>
- </div>
- <?php echo ($iterator==count($_products->getItems())+1) ? '</li>' : '' ?>
- <?php endforeach; ?>
- </ol>
- </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_images_list.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_images_list.phtml
deleted file mode 100644
index dcb47041578..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_images_list.phtml
+++ /dev/null
@@ -1,47 +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 (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
-<?php $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image'); ?>
-<div class="widget block new photos">
- <div class="title">
- <strong><?php echo __('New Products') ?></strong>
- </div>
- <div class="content">
- <?php echo $this->getPagerHtml() ?>
- <?php $suffix = $this->getNameInLayout(); ?>
- <ol class="items">
- <?php foreach ($_products->getItems() as $_product): ?>
- <li class="item">
- <a class="product photo" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>">
- <!-- new_products_images_only_widget -->
- <?php echo $imageBlock->init($_product, 'new_products_images_only_widget')->toHtml() ?>
- </a>
- </li>
- <?php endforeach; ?>
- </ol>
- </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_names_list.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_names_list.phtml
deleted file mode 100644
index 217c0418f16..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/column/new_names_list.phtml
+++ /dev/null
@@ -1,43 +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 (($_products = $this->getProductCollection()) && $_products->getSize()): ?>
-<div class="widget block new names">
- <div class="title">
- <strong><?php echo __('New Products') ?></strong>
- </div>
- <div class="content">
- <?php echo $this->getPagerHtml() ?>
- <?php $suffix = $this->getNameInLayout(); ?>
- <ol class="items">
- <?php foreach ($_products->getItems() as $_product): ?>
- <li class="item">
- <strong class="product name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></strong>
- </li>
- <?php endforeach; ?>
- </ol>
- </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/content/new_grid.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/content/new_grid.phtml
deleted file mode 100644
index 5eef1b00a97..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/content/new_grid.phtml
+++ /dev/null
@@ -1,120 +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 ($exist = ($this->getProductCollection() && $this->getProductCollection()->getSize())) {
- $type = 'widget-new-grid';
-
- $class = 'widget new grid';
-
- $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
- $image ='new_products_content_widget_grid';
- $title = __('New Products');
- $items = $this->getProductCollection()->getItems();
-
- $showWishlist = true;
- $showCompare = true;
- $showCart = true;
- $rating = true;
- $description = false;
-}
-?>
-
-<?php if ($exist):?>
-<div class="block <?php echo $class; ?>">
- <div class="title">
- <strong><?php echo $title; ?></strong>
- </div>
- <div class="content">
- <?php echo $this->getPagerHtml() ?>
- <?php echo '<!-- ' . $image . '-->' ?>
- <ol class="products list items <?php echo $type; ?>">
- <?php $iterator = 1; ?>
- <?php foreach($items as $_item): ?>
- <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
- <div class="product">
- <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
- <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
- </a>
-
- <div class="product details">
-
- <strong class="product name"><a title="<?php echo $this->escapeHtml($_item->getName()) ?>" href="<?php echo $this->getProductUrl($_item) ?>">
- <?php echo $this->escapeHtml($_item->getName()) ?></a>
- </strong>
-
- <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
-
- <?php if ($_item->getRatingSummary() && $rating): ?>
- <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
- <?php endif; ?>
-
- <?php if($showWishlist || $showCompare || $showCart): ?>
- <div class="product actions">
-
- <?php if($showCart): ?>
- <div class="primary">
- <?php if($_item->isSaleable()): ?>
- <button class="action tocart" data-mage-redirect="{event: 'click', url: '<?php echo $this->getAddToCartUrl($_item) ?>'}" type="button" title="<?php echo __('Add to Cart') ?>">
- <span><?php echo __('Add to Cart') ?></span>
- </button>
- <?php else: ?>
- <?php if ($_item->getIsSalable()): ?>
- <p class="stock available"><span><?php echo __('In stock') ?></span></p>
- <?php else: ?>
- <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <?php endif; ?>
- </div>
- <?php endif; ?>
-
- <?php if($showWishlist || $showCompare): ?>
- <div class="secondary addto links">
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
- <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="action towishlist" data-action="add-to-wishlist" title="<?php echo __('Add to Wishlist') ?>">
- <span><?php echo __('Add to Wishlist') ?></span>
- </a>
- <?php endif; ?>
- <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
- <a href="<?php echo $this->getAddToCompareUrl($_item) ?>" class="action tocompare" title="<?php echo __('Add to Compare') ?>">
- <span><?php echo __('Add to Compare') ?></span>
- </a>
- <?php endif; ?>
- </div>
- <?php endif; ?>
- </div>
- <?php endif; ?>
-
- </div>
- </div>
- <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
- <?php endforeach ?>
- </ol>
- <script type="text/javascript">
- head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/mage-attributes-processing.js') ?>");
- </script>
- </div>
-</div>
-<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/content/new_list.phtml b/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/content/new_list.phtml
deleted file mode 100644
index abfa60384a5..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Catalog/product/widget/new/content/new_list.phtml
+++ /dev/null
@@ -1,121 +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 ($exist = ($this->getProductCollection() && $this->getProductCollection()->getSize())) {
- $type = 'widget-new-list';
-
- $class = 'widget new list';
-
- $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
- $image ='new_products_content_widget_list';
- $title = __('New Products');
- $items = $this->getProductCollection()->getItems();
-
- $showWishlist = true;
- $showCompare = true;
- $showCart = true;
- $rating = true;
- $description = true;
-}
-?>
-
-<?php if ($exist):?>
-<div class="block <?php echo $class; ?>">
- <div class="title">
- <strong><?php echo $title; ?></strong>
- </div>
- <div class="content">
- <?php echo $this->getPagerHtml() ?>
- <?php echo '<!-- ' . $image . '-->' ?>
- <ol class="products list items <?php echo $type; ?>">
- <?php $iterator = 1; ?>
- <?php foreach($items as $_item): ?>
- <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
- <div class="product">
-
- <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
- <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
- </a>
-
- <div class="product details">
-
- <strong class="product name"><a title="<?php echo $this->escapeHtml($_item->getName()) ?>" href="<?php echo $this->getProductUrl($_item) ?>">
- <?php echo $this->escapeHtml($_item->getName()) ?></a>
- </strong>
-
- <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
-
- <?php if ($_item->getRatingSummary() && $rating): ?>
- <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
- <?php endif; ?>
-
- <?php if($showWishlist || $showCompare || $showCart): ?>
- <div class="product actions">
-
- <?php if($showCart): ?>
- <div class="primary">
- <?php if($_item->isSaleable()): ?>
- <button class="action tocart" data-mage-redirect="{event: 'click', url: '<?php echo $this->getAddToCartUrl($_item) ?>'}" type="button" title="<?php echo __('Add to Cart') ?>">
- <span><?php echo __('Add to Cart') ?></span>
- </button>
- <?php else: ?>
- <?php if ($_item->getIsSalable()): ?>
- <p class="stock available"><span><?php echo __('In stock') ?></span></p>
- <?php else: ?>
- <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <?php endif; ?>
- </div>
- <?php endif; ?>
-
- <?php if($showWishlist || $showCompare): ?>
- <div class="secondary addto links">
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
- <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="action towishlist" data-action="add-to-wishlist" title="<?php echo __('Add to Wishlist') ?>">
- <span><?php echo __('Add to Wishlist') ?></span>
- </a>
- <?php endif; ?>
- <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
- <a href="<?php echo $this->getAddToCompareUrl($_item) ?>" class="action tocompare" title="<?php echo __('Add to Compare') ?>">
- <span><?php echo __('Add to Compare') ?></span>
- </a>
- <?php endif; ?>
- </div>
- <?php endif; ?>
- </div>
- <?php endif; ?>
-
- </div>
- </div>
- <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
- <?php endforeach ?>
- </ol>
- <script type="text/javascript">
- head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/mage-attributes-processing.js') ?>");
- </script>
- </div>
-</div>
-<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_CatalogSearch/advanced/form.phtml b/app/design/frontend/magento_plushe/Magento_CatalogSearch/advanced/form.phtml
deleted file mode 100644
index 446652e8ded..00000000000
--- a/app/design/frontend/magento_plushe/Magento_CatalogSearch/advanced/form.phtml
+++ /dev/null
@@ -1,129 +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
-/**
- * Catalog advanced search form
- *
- * @see \Magento\CatalogSearch\Block\Advanced\Form
- */
-?>
-<?php $maxQueryLength= $this->helper('Magento\CatalogSearch\Helper\Data')->getMaxQueryLength();?>
-<form class="form search advanced" action="<?php echo $this->getSearchPostUrl() ?>" method="get" id="form-validate">
-<fieldset class="fieldset">
- <legend class="legend"><span><?php echo __('Search Settings') ?></span></legend><br />
- <?php foreach ($this->getSearchableAttributes() as $_attribute): ?>
- <?php $_code = $_attribute->getAttributeCode() ?>
- <div class="field <?php echo $_code ?>">
- <label class="label" for="<?php echo $_code ?>"><span><?php echo $this->getAttributeLabel($_attribute) ?></span></label>
- <div class="control">
- <?php switch($this->getAttributeInputType($_attribute)):
- case 'number': ?>
- <div class="range fields group group-2">
- <div class="field no-label">
- <div class="control">
- <input type="text" name="<?php echo $_code ?>[from]" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'from')) ?>" id="<?php echo $_code ?>" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>" class="input-text" maxlength="<?php echo $maxQueryLength;?>" data-validate="{number:true, 'less-than-equals-to':'#<?php echo $_code ?>_to'}" />
- </div>
- </div>
- <div class="field no-label">
- <div class="control">
- <input type="text" name="<?php echo $_code ?>[to]" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'to')) ?>" id="<?php echo $_code ?>_to" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>" class="input-text" maxlength="<?php echo $maxQueryLength;?>" data-validate="{number:true, 'greater-than-equals-to':'#<?php echo $_code ?>'}" />
- </div>
- </div>
- </div>
- <?php break;
- case 'price': ?>
- <div class="range price fields group group-2">
- <div class="field no-label">
- <div class="control">
- <input name="<?php echo $_code ?>[from]" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'from')) ?>" id="<?php echo $_code ?>" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>" class="input-text" type="text" maxlength="<?php echo $maxQueryLength;?>" data-validate="{number:true, 'less-than-equals-to':'#<?php echo $_code ?>_to'}" />
- </div>
- </div>
- <div class="field with-addon no-label">
- <div class="control">
- <div class="addon">
- <input name="<?php echo $_code ?>[to]" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute, 'to')) ?>" id="<?php echo $_code ?>_to" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>" class="input-text" type="text" maxlength="<?php echo $maxQueryLength;?>" data-validate="{number:true, 'greater-than-equals-to':'#<?php echo $_code ?>'}" />
- <label class="addafter" for="<?php echo $_code ?>_to"><?php echo $this->getCurrency($_attribute); ?></label>
- </div>
- </div>
- </div>
- </div>
- <?php break;
- case 'select': ?>
- <?php echo $this->getAttributeSelectElement($_attribute) ?>
- <?php break;
- case 'yesno': ?>
- <?php echo $this->getAttributeYesNoElement($_attribute) ?>
- <?php break;
- case 'date': ?>
- <div class="range dates fields group group-2">
- <div class="field date no-label">
- <div class="control">
- <?php echo $this->getDateInput($_attribute, 'from') ?>
- </div>
- </div>
- <div class="field date no-label">
- <div class="control">
- <?php echo $this->getDateInput($_attribute, 'to') ?>
- </div>
- </div>
- </div>
- <?php break;
- default: ?>
- <input type="text" name="<?php echo $_code ?>" id="<?php echo $_code ?>" value="<?php echo $this->escapeHtml($this->getAttributeValue($_attribute)) ?>" title="<?php echo $this->escapeHtml($this->getAttributeLabel($_attribute)) ?>" class="input-text <?php echo $this->getAttributeValidationClass($_attribute) ?>" maxlength="<?php echo $maxQueryLength;?>" />
- <?php endswitch; ?>
- </div>
- </div>
- <?php endforeach; ?>
-</fieldset>
-<div class="actions">
- <button type="submit" class="action search" title="<?php echo __('Search') ?>"><span><?php echo __('Search') ?></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() {
- $('#form-validate').validation({
- errorPlacement: function (error, element) {
- var parent = element.parent();
- if (parent.hasClass('range')) {
- parent.find(this.errorElement + '.' + this.errorClass).remove().end().append(error);
- } else {
- error.insertAfter(element);
- }
- },
- messages: {
- 'price[to]': {'greater-than-equals-to': 'Please enter a valid price range.'},
- 'price[from]': {'less-than-equals-to': 'Please enter a valid price range.'}
- }
- });
- });
- })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_plushe/Magento_CatalogSearch/advanced/result.phtml b/app/design/frontend/magento_plushe/Magento_CatalogSearch/advanced/result.phtml
deleted file mode 100644
index 027b889fc9b..00000000000
--- a/app/design/frontend/magento_plushe/Magento_CatalogSearch/advanced/result.phtml
+++ /dev/null
@@ -1,61 +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->getResultCount()): ?>
- <div class="search found">
- <?php echo __('<strong>%1 item(s)</strong> were found using the following search criteria', $this->getResultCount()); ?>
- </div>
-<?php else: ?>
- <div class="error-msg">
- <div>
- <?php echo __('No items were found using the following search criteria.');?> <a href="<?php echo $this->getFormUrl(); ?>"><?php echo __('Modify your search'); ?></a>
- </div>
- </div>
-<?php endif; ?>
-
-<?php $searchCriterias=$this->getSearchCriterias(); ?>
-<div class="search summary">
- <?php foreach (array('left', 'right') as $side): ?>
- <?php if(@$searchCriterias[$side]): ?>
- <ul class="items">
- <?php foreach($searchCriterias[$side] as $criteria): ?>
- <li class="item"><strong><?php echo $this->escapeHtml(__($criteria['name'])); ?>:</strong> <?php echo $this->escapeHtml($criteria['value']); ?></li>
- <?php endforeach; ?>
- </ul>
- <?php endif; ?>
- <?php endforeach; ?>
-</div>
-<?php if($this->getResultCount()): ?>
- <div class="note-msg">
- <div>
- <?php echo __("Don't see what you're looking for?"); ?>
- <a href="<?php echo $this->getFormUrl(); ?>"><?php echo __('Modify your search'); ?></a>
- </div>
- </div>
-<?php endif; ?>
-<?php if($this->getResultCount()): ?>
- <div class="search results"><?php echo $this->getProductListHtml() ?></div>
-<?php endif; ?>
-<?php $this->getSearchCriterias(); ?>
diff --git a/app/design/frontend/magento_plushe/Magento_CatalogSearch/form.mini.phtml b/app/design/frontend/magento_plushe/Magento_CatalogSearch/form.mini.phtml
deleted file mode 100644
index 40da82c16b7..00000000000
--- a/app/design/frontend/magento_plushe/Magento_CatalogSearch/form.mini.phtml
+++ /dev/null
@@ -1,88 +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\View\Block\Template */
-/** @var $helper \Magento\CatalogSearch\Helper\Data */
-$helper = $this->helper('Magento\CatalogSearch\Helper\Data');
-?>
-<div class="block search">
- <div class="title"><strong><?php echo __('Search') ?></strong></div>
- <div class="content search">
- <form class="form minisearch" id="search_mini_form" action="<?php echo $helper->getResultUrl() ?>"
- method="get">
- <div class="field search">
- <label class="label" for="search"><?php echo __('Search') ?></label>
- <div class="control">
- <input id="search" type="text" name="<?php echo $helper->getQueryParamName() ?>" value="<?php echo $helper->getEscapedQueryText() ?>" placeholder="<?php echo __('Search entire store here...') ?>" class="input-text" autocomplete="off"/>
- <div id="search_autocomplete" class="search autocomplete"></div>
- <a class="action advanced" href="<?php echo $helper->getAdvancedSearchUrl(); ?>"><?php echo __('Advanced Search'); ?></a>
- </div>
- </div>
- <div class="actions">
- <button type="submit" title="<?php echo __('Search') ?>" class="action search"><span><?php echo __('Search') ?></span></button>
- </div>
- <script type="text/javascript">
- //<![CDATA[
- (function($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_CatalogSearch::form-mini.js')?>", function() {
- $('#search').catalogSearch({
- formSelector: '#search_mini_form',
- url: '<?php echo $helper->getSuggestUrl() ?>',
- destinationSelector: '#search_autocomplete'
- //placeholder: '<?php echo __('Search entire store here...') ?>',
- });
- });
- })(jQuery);
- //]]>
- </script>
- </form>
- </div>
-</div>
-
-
-<?php /*
-<form id="search_mini_form" action="<?php echo $helper->getResultUrl() ?>"
- method="get">
- <div class="form-search">
- <label for="search"><?php echo __('Search:') ?></label><input id="search" type="text" name="<?php echo $helper->getQueryParamName() ?>" value="<?php echo $helper->getEscapedQueryText() ?>" class="input-text" autocomplete="off"/> <button type="submit" title="<?php echo __('Search') ?>" class="button"><span><span><?php echo __('Search') ?></span></span></button><a href="<?php echo $helper->getAdvancedSearchUrl(); ?>"><?php echo __('Advanced Search'); ?></a>
- <div id="search_autocomplete" class="search-autocomplete"></div>
- <script type="text/javascript">
- //<![CDATA[
- (function($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_CatalogSearch::form-mini.js')?>", function() {
- $('#search').catalogSearch({
- formSelector: '#search_mini_form',
- placeholder: '<?php echo __('Search entire store here...') ?>',
- url: '<?php echo $helper->getSuggestUrl() ?>',
- destinationSelector: '#search_autocomplete'
- });
- });
- })(jQuery);
- //]]>
- </script>
- </div>
-</form>
-*/ ?>
diff --git a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_advanced_index.xml b/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_advanced_index.xml
deleted file mode 100644
index 58a124e9c15..00000000000
--- a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_advanced_index.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">
- <update handle="page_one_column"/>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_advanced_result.xml b/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_advanced_result.xml
deleted file mode 100644
index 05344815a0a..00000000000
--- a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_advanced_result.xml
+++ /dev/null
@@ -1,33 +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="page_two_columns_left"/>
- <referenceBlock name="page.main.title">
- <action method="setPageTitle">
- <argument translate="true" name="title" xsi:type="string">Catalog Advanced Search</argument>
- </action>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_result_index.xml b/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_result_index.xml
deleted file mode 100644
index 2471560447b..00000000000
--- a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_result_index.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)
- */
--->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <referenceBlock name="search_result_list">
- <arguments>
- <!-- If position of argument is depend on image size changable in VDE:
- positions:list-secondary,grid-secondary,list-actions,grid-actions,list-primary,grid-primary
- -->
- <argument name="positioned" xsi:type="string">positions:list-secondary</argument>
- </arguments>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_term_popular.xml b/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_term_popular.xml
deleted file mode 100644
index 8f2b1e21cb7..00000000000
--- a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/catalogsearch_term_popular.xml
+++ /dev/null
@@ -1,33 +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="page_one_column"/>
- <referenceBlock name="page.main.title">
- <action method="setPageTitle">
- <argument translate="true" name="title" xsi:type="string">Popular Search Terms</argument>
- </action>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/override/base/catalogsearch_result_index.xml b/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/override/base/catalogsearch_result_index.xml
deleted file mode 100644
index 0accf0cd917..00000000000
--- a/app/design/frontend/magento_plushe/Magento_CatalogSearch/layout/override/base/catalogsearch_result_index.xml
+++ /dev/null
@@ -1,46 +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="page_two_columns_left"/>
- <referenceContainer name="left">
- <block class="Magento\CatalogSearch\Block\Layer" name="catalogsearch.leftnav" before="-" template="Magento_Catalog::layer/view.phtml"/>
- </referenceContainer>
- <referenceContainer name="content">
- <block class="Magento\CatalogSearch\Block\Result" name="search.result" template="result.phtml">
- <block class="Magento\Catalog\Block\Product\ListProduct" name="search_result_list" template="product/list.phtml">
- <block class="Magento\Catalog\Block\Product\ProductList\Toolbar" name="product_list_toolbar" template="product/list/toolbar.phtml">
- <block class="Magento\Page\Block\Html\Pager" name="product_list_toolbar_pager"/>
- </block>
- <action method="setToolbarBlockName">
- <argument name="name" xsi:type="string">product_list_toolbar</argument>
- </action>
- </block>
- <action method="setListOrders"/>
- <action method="setListModes"/>
- <action method="setListCollection"/>
- </block>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_CatalogSearch/result.phtml b/app/design/frontend/magento_plushe/Magento_CatalogSearch/result.phtml
deleted file mode 100644
index 4bf465e769e..00000000000
--- a/app/design/frontend/magento_plushe/Magento_CatalogSearch/result.phtml
+++ /dev/null
@@ -1,53 +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->getResultCount()): ?>
-<?php echo $this->getChildHtml('tagged_product_list_rss_link'); ?>
-<div class="search results">
- <?php if ($messages = $this->getNoteMessages()):?>
- <div class="note-msg">
- <div>
- <?php foreach ($messages as $message):?>
- <?php echo $message?><br />
- <?php endforeach;?>
- </div>
- </div>
- <?php endif; ?>
- <?php echo $this->getProductListHtml() ?>
-</div>
-<?php else: ?>
-
-<div class="note-msg">
- <div>
- <?php echo ($this->getNoResultText()) ? $this->getNoResultText() : __('Your search returns no results.') ?>
- <?php echo $this->getAdditionalHtml() ?>
- <?php if ($messages = $this->getNoteMessages()):?>
- <?php foreach ($messages as $message):?>
- <br /><?php echo $message?>
- <?php endforeach;?>
- <?php endif; ?>
- </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_CatalogSearch/term.phtml b/app/design/frontend/magento_plushe/Magento_CatalogSearch/term.phtml
deleted file mode 100644
index 706dff536e6..00000000000
--- a/app/design/frontend/magento_plushe/Magento_CatalogSearch/term.phtml
+++ /dev/null
@@ -1,35 +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 if( sizeof($this->getTerms()) > 0 ): ?>
- <ul class="search terms">
- <?php foreach ($this->getTerms() as $_term): ?>
- <li class="item"><a href="<?php echo $this->getSearchUrl($_term) ?>" style="font-size:<?php echo $_term->getRatio()*70+75 ?>%;"><?php echo $this->escapeHtml($_term->getName()) ?></a></li>
- <?php endforeach; ?>
- </ul>
-<?php else: ?>
- <div class="note-msg"><div><?php echo __('There are no search terms available.'); ?></div></div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/links.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/links.phtml
deleted file mode 100644
index d494ef4bb92..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/links.phtml
+++ /dev/null
@@ -1,68 +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\Downloadable\Block\Catalog\Product\Links */ ?>
-<?php $_linksPurchasedSeparately = $this->getLinksPurchasedSeparately(); ?>
-<?php if ($this->getProduct()->isSaleable() && $this->hasLinks()):?>
- <?php $_links = $this->getLinks(); ?>
- <?php $_isRequired = $this->getLinkSelectionRequired(); ?>
- <div class="field downloads<?php if ($_isRequired) echo ' required' ?>">
- <label class="label"><span><?php echo $this->getLinksTitle() ?></span></label>
- <div class="control" id="downloadable-links-list">
- <?php foreach ($_links as $_link): ?>
- <div class="field choice">
- <?php if ($_linksPurchasedSeparately): ?>
- <input type="checkbox" <?php if ($_isRequired): ?>data-validate="{'validate-one-checkbox-required-by-name':'downloadable-links-list'}" <?php endif; ?>
- name="links[]" id="links_<?php echo $_link->getId() ?>"
- value="<?php echo $_link->getId(); ?>" <?php echo $this->getLinkCheckedValue($_link); ?> />
- <?php endif; ?>
- <label class="label" for="links_<?php echo $_link->getId() ?>">
- <span><?php echo $this->escapeHtml($_link->getTitle()); ?></span>
- <?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
- <a class="sample" href="<?php echo $this->getLinkSamlpeUrl($_link) ?>" <?php echo $this->getIsOpenInNewWindow() ? 'target="_blank"' : ''; ?>><?php echo __('sample') ?></a>
- <?php endif; ?>
- <?php if ($_linksPurchasedSeparately): ?>
- <?php echo $this->getFormattedLinkPrice($_link); ?>
- <?php endif; ?>
- </label>
- </div>
- <?php endforeach; ?>
- </div>
- <?php if ($_isRequired): ?>
- <span id="links-advice-container"></span>
- <?php endif;?>
- </div>
- <script type="text/javascript">
- (function ($) {
- head.js("<?php echo $this->getViewFileUrl('Magento_Downloadable::downloadable.js') ?>", function () {
- $('#downloadable-links-list').downloadable({
- linkElement: 'input:checkbox',
- config: <?php echo $this->getJsonConfig() ?>
- });
- });
- })(jQuery);
-</script>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/samples.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/samples.phtml
deleted file mode 100644
index a130635232b..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/samples.phtml
+++ /dev/null
@@ -1,44 +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)
- */
-
-/**
- * Downloadable product links
- *
- * @see \Magento\Downloadable\Block\Catalog\Product\Samples
- */
-?>
-
-<?php if ($this->hasSamples()): ?>
- <dl class="downloadable samples">
- <dt><?php echo $this->getSamplesTitle() ?></dt>
- <?php $_samples = $this->getSamples() ?>
- <?php foreach ($_samples as $_sample): ?>
- <dd>
- <a href="<?php echo $this->getSampleUrl($_sample) ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo $this->escapeHtml($_sample->getTitle()) ?></a>
- </dd>
- <?php endforeach; ?>
- </dl>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/type.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/type.phtml
deleted file mode 100644
index 36f5df0a2cf..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/catalog/product/type.phtml
+++ /dev/null
@@ -1,41 +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)
- */
-
-/**
- * Downloadable product type
- *
- * @see \Magento\Downloadable\Block\Catalog\Product\View\Type
- */
-?>
-<?php $_product = $this->getProduct() ?>
-
-<?php if($_product->getIsSalable()): ?>
- <p class="stock available" title="<?php echo __('Availability') ?>"><span><?php echo __('In stock') ?></span></p>
-<?php else: ?>
- <p class="stock unavailable" title="<?php echo __('Availability') ?>"><span><?php echo __('Out of stock') ?></span></p>
-<?php endif; ?>
-<?php echo $this->getChildHtml('product_type_data_extra') ?>
-<?php echo $this->getPriceHtml($_product) ?>
-<?php echo $this->getChildHtml('samples') ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/cart/item/default.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/cart/item/default.phtml
deleted file mode 100644
index 3e5638117de..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/cart/item/default.phtml
+++ /dev/null
@@ -1,305 +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
-$_item = $this->getItem();
-$isVisibleProduct = $_item->getProduct()->isVisibleInSiteVisibility();
-$canApplyMsrp = $this->helper('Magento\Catalog\Helper\Data')->canApplyMsrp($_item->getProduct(), \Magento\Catalog\Model\Product\Attribute\Source\Msrp\Type::TYPE_BEFORE_ORDER_CONFIRM);
-?>
-<?php echo $this->getChildHtml('item_extra') ?>
-<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 echo $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image')->init($_item->getProduct(), 'cart_page_product_thumbnail')->toHtml(); ?>
- <?php if ($this->hasProductUrl()):?></a><?php endif;?>
- <div class="product details">
- <strong class="product name">
- <?php if ($this->hasProductUrl()):?>
- <a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a>
- <?php else: ?>
- <?php echo $this->escapeHtml($this->getProductName()) ?>
- <?php endif; ?>
- </strong>
- <?php if ($_options = $this->getOptionList()):?>
- <dl class="cart item options">
- <?php foreach ($_options as $_option) : ?>
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
- <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 endforeach; ?>
- </dl>
- <?php endif;?>
- <!-- downloadable -->
- <?php if ($links = $this->getLinks()): ?>
- <dl class="cart item options">
- <dt><?php echo $this->getLinksTitle() ?></dt>
- <?php foreach ($links as $link): ?>
- <dd><?php echo $this->escapeHtml($link->getTitle()) ?></dd>
- <?php endforeach; ?>
- </dl>
- <?php endif; ?>
- <?php echo $this->getChildHtml('item_extra'); ?>
- <!-- EOF downloadable -->
- <?php if ($messages = $this->getMessages()): ?>
- <?php foreach ($messages as $message): ?>
- <p class="cart item message <?php echo $message['type'] ?>">* <?php echo $this->escapeHtml($message['text']) ?></p>
- <?php endforeach; ?>
- <?php endif; ?>
- <?php $addInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
- <?php if ($addInfoBlock): ?>
- <?php echo $addInfoBlock->setItem($_item)->toHtml() ?>
- <?php endif;?>
- </div>
- </td>
-
- <?php if ($canApplyMsrp): ?>
- <td class="col msrp a-right"<?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?> colspan="2"<?php endif; ?>>
- <span class="cart-price">
- <span class="cart-msrp-unit"><?php echo __('See price before order confirmation.'); ?></span>
- <?php $helpLinkId = 'cart-msrp-help-' . $_item->getId(); ?>
- <a id="<?php echo $helpLinkId ?>" href="#" class="map-help-link"><?php echo __("What's this?"); ?></a>
- <script type="text/javascript">
- Catalog.Map.addHelpLink($('<?php echo $helpLinkId ?>'), "<?php echo __("What's this?") ?>");
- </script>
- </span>
- </td>
- <?php else: ?>
-
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td class="col price excl tax">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <span class="cart-price">
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
- <?php endif; ?>
-
- </span>
-
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="weee"><?php echo __('Total'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
-
- <?php endif; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td class="col price incl tax">
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <span class="cart-price">
- <?php endif; ?>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
- <?php endif; ?>
-
- </span>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="weee"><?php echo __('Total incl. tax'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
- <?php endif; ?>
- <td class="col qty">
- <div class="control qty">
- <input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $this->getQty() ?>" type="text" size="4" title="<?php echo __('Qty') ?>" class="input-text qty" maxlength="12" data-validate="{required:true,'validate-greater-than-zero':true}"/>
- </div>
- </td>
- <?php if (($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
- <td class="col subtotal excl tax">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <span class="cart-price">
- <?php endif; ?>
-
- <?php if ($canApplyMsrp): ?>
- <span class="cart-msrp-subtotal">--</span>
- <?php else: ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
- <?php endif; ?>
- <?php endif; ?>
-
- </span>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="weee"><?php echo __('Total'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
- <?php if (($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()) && !$_item->getNoSubtotal()): ?>
- <td class="col subtotal incl tax">
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <span class="cart-price">
- <?php endif; ?>
-
- <?php if ($canApplyMsrp): ?>
- <span class="cart-msrp-subtotal">--</span>
- <?php else: ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
- <?php endif; ?>
- <?php endif; ?>
-
- </span>
-
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="weee"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span>
- <?php endforeach; ?>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="weee"><?php echo __('Total incl. tax'); ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
-</tr>
-<tr class="item actions">
- <td colspan="100">
- <div class="actions">
-
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllowInCart()) : ?>
- <?php if ($isVisibleProduct): ?>
- <a href="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->getMoveFromCartUrl($_item->getId()); ?>" class="use-ajax action towishlist">
- <span><?php echo __('Move to Wishlist'); ?></span>
- </a>
- <?php endif ?>
- <?php endif ?>
-
- <?php if ($isVisibleProduct): ?>
- <a class="action edit" href="<?php echo $this->getConfigureUrl() ?>" title="<?php echo __('Edit item parameters') ?>"><span><?php echo __('Edit') ?></span></a>
- <?php endif ?>
-
- <a href="<?php echo $this->getDeleteUrl()?>" title="<?php echo __('Remove item')?>" class="action delete"><span><?php echo __('Remove item')?></span></a>
- </div>
- </td>
-</tr>
-</tbody>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/multishipping/item/default.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/multishipping/item/default.phtml
deleted file mode 100644
index ebf63dc44e1..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/multishipping/item/default.phtml
+++ /dev/null
@@ -1,57 +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="product details">
- <strong class="product name"><a href="<?php echo $this->getProductUrl() ?>"><?php echo $this->escapeHtml($this->getProductName()) ?></a></strong>
- <?php if ($_options = $this->getOptionList()): ?>
- <dl class="item options">
- <?php foreach ($_options as $_option) : ?>
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
- <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'])): ?>
- <dl class="item options">
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
- <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
- </dl>
- <?php endif; ?>
- </dd>
- <?php endforeach; ?>
- </dl>
- <?php endif; ?>
- <!-- downloadable -->
- <?php if ($links = $this->getLinks()): ?>
- <dl class="item options">
- <dt><?php echo $this->getLinksTitle() ?></dt>
- <?php foreach ($links as $link): ?>
- <dd><?php echo $this->escapeHtml($link->getTitle()); ?></dd>
- <?php endforeach; ?>
- </dl>
- <?php endif; ?>
- <!-- EOF downloadable -->
- <?php if ($addtInfoBlock = $this->getProductAdditionalInformationBlock()): ?>
- <?php echo $addtInfoBlock->setItem($this->getItem())->toHtml() ?>
- <?php endif; ?>
-</div>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/onepage/review/item.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/onepage/review/item.phtml
deleted file mode 100644
index dbd0f629fc2..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/onepage/review/item.phtml
+++ /dev/null
@@ -1,247 +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 $_item = $this->getItem()?>
-<tr>
- <td class="col item"><strong class="product name"><?php echo $this->escapeHtml($this->getProductName()) ?></strong>
- <?php if ($_options = $this->getOptionList()):?>
- <dl class="review item options">
- <?php foreach ($_options as $_option) : ?>
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
- <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 endforeach; ?>
- </dl>
- <?php endif;?>
- <?php if ($links = $this->getLinks()): ?>
- <dl class="review item options">
- <dt><?php echo $this->getLinksTitle() ?></dt>
- <?php foreach ($links as $link): ?>
- <dd><?php echo $this->escapeHtml($link->getTitle()) ?></dd>
- <?php endforeach; ?>
- </dl>
- <?php endif; ?>
- <!-- EOF downloadable -->
- <?php if ($addtInfoBlock = $this->getProductAdditionalInformationBlock()):?>
- <?php echo $addtInfoBlock->setItem($_item)->toHtml() ?>
- <?php endif;?>
- </td>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td class="col price excl tax">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <span class="cart-price">
- <?php endif; ?>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
- <?php endif; ?>
-
- </span>
-
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td class="col price incl tax">
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <span class="cart-price">
- <?php endif; ?>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
- <?php endif; ?>
-
- </span>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
- <td class="col qty"><span class="qty"><?php echo $_item->getQty() ?></span></td>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td class="col subtotal excl tax">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <span class="cart-price">
- <?php endif; ?>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
- <?php endif; ?>
-
- </span>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td class="col subtotal incl tax">
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <span class="cart-price">
- <?php endif; ?>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
- <?php endif; ?>
-
- </span>
-
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
-</tr>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/onepage/review/item_down.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/onepage/review/item_down.phtml
deleted file mode 100644
index cdbdcffdae0..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/checkout/onepage/review/item_down.phtml
+++ /dev/null
@@ -1,246 +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 $_item = $this->getItem()?>
-<tr>
- <td><h3 class="product-name"><?php echo $this->escapeHtml($this->getProductName()) ?></h3>
- <!-- item custom options -->
- <?php if ($_options = $this->getOptionList()):?>
- <dl class="item-options">
- <?php foreach ($_options as $_option) : ?>
- <?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
- <dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
- <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 endforeach; ?>
- </dl>
- <?php endif;?>
- <?php if ($links = $this->getLinks()): ?>
- <dl class="item-options">
- <dt><?php echo $this->getLinksTitle() ?></dt>
- <?php foreach ($links as $link): ?>
- <dd><?php echo $this->escapeHtml($link->getTitle()) ?></dd>
- <?php endforeach; ?>
- </dl>
- <?php endif; ?>
- <!-- EOF downloadable -->
- </td>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td class="a-right">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <div class="cart-price">
- <?php endif; ?>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
- <?php endif; ?>
-
- </div>
-
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <div class="cart-price">
- <?php endif; ?>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
- <?php endif; ?>
-
- </div>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
- <td class="a-center"><?php echo $_item->getQty() ?></td>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td class="a-right">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <div class="cart-price">
- <?php endif; ?>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
- <?php endif; ?>
-
- </div>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
- <td>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <?php else: ?>
- <div class="cart-price">
- <?php endif; ?>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
- <?php else: ?>
- <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
- <?php endif; ?>
-
- </div>
-
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-
- <div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </div>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
- <div class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $_item->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
- </div>
- <?php endif; ?>
- <?php endif; ?>
- </td>
- <?php endif; ?>
-</tr>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/customer/products/list.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/customer/products/list.phtml
deleted file mode 100644
index 7f2054f7409..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/customer/products/list.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)
- */
-?>
-<?php
-/**
- * @see \Magento\Downloadable\Block\Customer\Products\ListProducts
- */
-?>
-<?php $_items = $this->getItems(); ?>
-<div class="downloadable products toolbar">
- <?php echo $this->getChildHtml('pager'); ?>
-</div>
-<?php if(count($_items)): ?>
- <table id="my-downloadable-products-table" class="data table downloadable products">
- <thead>
- <tr>
- <th class="col id"><?php echo __('Order #') ?></th>
- <th class="col date"><?php echo __('Date') ?></th>
- <th class="col title"><?php echo __('Title') ?></th>
- <th class="col status"><?php echo __('Status') ?></th>
- <th class="col remaining"><?php echo __('Remaining Downloads') ?></th>
- </tr>
- </thead>
- <tbody>
- <?php foreach ($_items as $_item): ?>
- <tr>
- <td class="col id">
- <a href="<?php echo $this->getOrderViewUrl($_item->getPurchased()->getOrderId()) ?>" title="<?php echo __('View Order') ?>">
- <?php echo $_item->getPurchased()->getOrderIncrementId() ?>
- </a>
- </td>
- <td class="col date"><?php echo $this->formatDate($_item->getPurchased()->getCreatedAt()) ?></td>
- <td class="col title">
- <?php echo $this->escapeHtml($_item->getPurchased()->getProductName()) ?> - <a href="<?php echo $this->getDownloadUrl($_item) ?>" title="<?php echo __('Start Download') ?>" <?php echo $this->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo $this->escapeHtml($_item->getLinkTitle()) ?></a>
- </td>
- <td class="col status"><?php echo __(ucfirst($_item->getStatus())) ?></td>
- <td class="col remaining"><?php echo $this->getRemainingDownloads($_item) ?></td>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
-<?php else: ?>
- <p class="empty"><?php echo __('You have not purchased any downloadable products yet.'); ?></p>
-<?php endif; ?>
-<div class="downloadable products toolbar">
- <?php echo $this->getChildHtml('pager'); ?>
-</div>
-
-<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>
\ No newline at end of file
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/base/catalog_product_view_type_downloadable.xml b/app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/base/catalog_product_view_type_downloadable.xml
deleted file mode 100644
index a476967ac50..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/layout/override/base/catalog_product_view_type_downloadable.xml
+++ /dev/null
@@ -1,36 +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="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"/>
- <block class="Magento\CatalogInventory\Block\Stockqty\DefaultStockqty" name="product.info.downloadable.extra" as="product_type_data_extra" template="stockqty/default.phtml"/>
- </block>
- </referenceContainer>
- <referenceBlock name="product.info.options.wrapper">
- <block class="Magento\Downloadable\Block\Catalog\Product\Links" name="product.info.downloadable.options" as="type_downloadable_options" before="-" template="catalog/product/links.phtml"/>
- </referenceBlock>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml
deleted file mode 100644
index 6d2f675ae55..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/creditmemo/items/renderer/downloadable.phtml
+++ /dev/null
@@ -1,317 +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\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
-?>
-<?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>
- <?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; ?>
-
- <!-- 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(); ?>
- <?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 class="col sku"><?php echo $this->prepareSku($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()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?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()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
- </span>
- <?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">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- </span>
- <?php endif; ?>
- </td>
- <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()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
- </span>
- <?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">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <?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()->getWeeeTaxAppliedRowAmount()); ?>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
- </span>
- <?php endif; ?>
- <?php endif; ?>
-
-
-
- </span>
- <?php endif; ?>
- </td>
- <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/design/frontend/magento_plushe/Magento_Downloadable/sales/order/invoice/items/renderer/downloadable.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/invoice/items/renderer/downloadable.phtml
deleted file mode 100644
index 5df170eecb4..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/invoice/items/renderer/downloadable.phtml
+++ /dev/null
@@ -1,307 +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)
- */
-
-/** @var $this \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
-?>
-<?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>
- <?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; ?>
- <!-- 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(); ?>
- <?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 class="col sku"><?php echo $this->prepareSku($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()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?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()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
- </span>
- <?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">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- </span>
- <?php endif; ?>
- </td>
- <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()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
- </span>
- <?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">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <?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()->getWeeeTaxAppliedRowAmount()); ?>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
- </span>
- <?php endif; ?>
- <?php endif; ?>
-
- </span>
- <?php endif; ?>
- </td>
-</tr>
diff --git a/app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/items/renderer/downloadable.phtml b/app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/items/renderer/downloadable.phtml
deleted file mode 100644
index 8b0a06a9a83..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Downloadable/sales/order/items/renderer/downloadable.phtml
+++ /dev/null
@@ -1,329 +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)
- */
-
-/** @var $this \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
-?>
-<?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>
- <?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 nl2br($this->escapeHtml( (isset($_option['print_value']) ? $_option['print_value'] : $_option['value']) )) ?>
- </dd>
- <?php endif; ?>
- <?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 $addtInfoBlock = $this->getProductAdditionalInformationBlock(); ?>
- <?php if ($addtInfoBlock) :?>
- <?php echo $addtInfoBlock->setItem($_item)->toHtml(); ?>
- <?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>
- <?php endif; ?>
- </td>
- <td class="col sku"><?php echo $this->prepareSku($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()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?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()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getPrice()+$this->getItem()->getWeeeTaxAppliedAmount()+$this->getItem()->getWeeeTaxDisposition()); ?></span>
- </span>
- <?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">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#unit-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedAmount()); ?></span>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- </span>
- <?php endif; ?>
- </td>
- <td class="col qty">
- <span class="qty summary">
- <?php if ($this->getItem()->getQtyOrdered() > 0): ?>
- <?php echo __('Ordered'); ?>: <strong><?php echo $this->getItem()->getQtyOrdered()*1 ?></strong><br />
- <?php endif; ?>
- <?php if ($this->getItem()->getQtyShipped() > 0): ?>
- <?php echo __('Shipped'); ?>: <strong><?php echo $this->getItem()->getQtyShipped()*1 ?></strong><br />
- <?php endif; ?>
- <?php if ($this->getItem()->getQtyCanceled() > 0): ?>
- <?php echo __('Canceled'); ?>: <strong><?php echo $this->getItem()->getQtyCanceled()*1 ?></strong><br />
- <?php endif; ?>
- <?php if ($this->getItem()->getQtyRefunded() > 0): ?>
- <?php echo __('Refunded'); ?>: <strong><?php echo $this->getItem()->getQtyRefunded()*1 ?></strong><br />
- <?php endif; ?>
- </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()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($this->getItem()->getRowTotal()+$this->getItem()->getWeeeTaxAppliedRowAmount()+$this->getItem()->getWeeeTaxRowDisposition()); ?></span>
- </span>
- <?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">
- <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-price">
- <?php endif; ?>
- <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
- <?php if (!$this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- </span>
- <?php endif; ?>
- <?php endif; ?>
- <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($this->getItem()); ?>
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), array(1, 4), 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <?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()->getWeeeTaxAppliedRowAmount()); ?>
- <?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;">
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 1, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></small></span>
- <?php endforeach; ?>
- <?php elseif ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 4, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <small>
- <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($this->getItem()) as $tax): ?>
- <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $this->getOrder()->formatPrice($tax['row_amount_incl_tax']); ?></span>
- <?php endforeach; ?>
- </small>
- <?php endif; ?>
- </span>
-
- <?php if ($this->helper('Magento\Weee\Helper\Data')->typeOfDisplay($this->getItem(), 2, 'sales') && (float)$this->getItem()->getWeeeTaxAppliedAmount()): ?>
- <span class="cart-tax-total" data-tax-toggle='{"itemTaxId" : "#subtotal-item-tax-details<?php echo $this->getItem()->getId(); ?>"}'>
- <span class="nobr"><?php echo __('Total incl. tax'); ?>:<br /> <?php echo $this->getOrder()->formatPrice($_incl+$this->getItem()->getWeeeTaxAppliedRowAmount()); ?></span>
- </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()): ?>
- <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; ?>
- -->
-</tr>
diff --git a/app/design/frontend/magento_plushe/Magento_Reports/layout/override/base/default.xml b/app/design/frontend/magento_plushe/Magento_Reports/layout/override/base/default.xml
deleted file mode 100644
index 46e55c7076c..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Reports/layout/override/base/default.xml
+++ /dev/null
@@ -1,31 +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="right">
- <block class="Magento\Reports\Block\Product\Viewed" name="right.reports.product.viewed" template="product_viewed.phtml"/>
- <block class="Magento\Reports\Block\Product\Compared" name="right.reports.product.compared" template="product_compared.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Reports/layout/override/base/print.xml b/app/design/frontend/magento_plushe/Magento_Reports/layout/override/base/print.xml
deleted file mode 100644
index 6c60196129d..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Reports/layout/override/base/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_Reports/product_compared.phtml b/app/design/frontend/magento_plushe/Magento_Reports/product_compared.phtml
deleted file mode 100644
index 0925c4376f1..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Reports/product_compared.phtml
+++ /dev/null
@@ -1,44 +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)
- */
-/* @var $this \Magento\Reports\Block\Product\Compared */
-?>
-<?php if ($_products = $this->getRecentlyComparedProducts()): ?>
-<div class="block compared links">
- <div class="title">
- <strong><?php echo __('Recently Compared Products') ?></strong>
- </div>
- <div class="content">
- <ol class="items compared">
- <?php foreach ($_products as $_item): ?>
- <li class="item">
- <strong class="product name">
- <a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName() , 'name') ?></a>
- </strong>
- </li>
- <?php endforeach; ?>
- </ol>
- </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Reports/product_viewed.phtml b/app/design/frontend/magento_plushe/Magento_Reports/product_viewed.phtml
deleted file mode 100644
index 006415faeaa..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Reports/product_viewed.phtml
+++ /dev/null
@@ -1,44 +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)
- */
-/* @var $this \Magento\Reports\Block\Product\Viewed */
-?>
-<?php if ($_products = $this->getRecentlyViewedProducts()): ?>
-<div class="block viewed links">
- <div class="title">
- <strong><?php echo __('Recently Viewed Products') ?></strong>
- </div>
- <div class="content">
- <ol class="items viewed">
- <?php foreach ($_products as $_item): ?>
- <li class="item">
- <strong class="product name">
- <a href="<?php echo $this->getProductUrl($_item) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_item, $_item->getName(), 'name') ?></a>
- </strong>
- </li>
- <?php endforeach; ?>
- </ol>
- </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Reports/widget/compared/column/compared_default_list.phtml b/app/design/frontend/magento_plushe/Magento_Reports/widget/compared/column/compared_default_list.phtml
deleted file mode 100644
index ad0e07081a8..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Reports/widget/compared/column/compared_default_list.phtml
+++ /dev/null
@@ -1,58 +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 ($_products = $this->getRecentlyComparedProducts()): ?>
-<div class="widget widget-compared">
- <div class="block block-products">
- <div class="block-title">
- <strong><span><?php echo __('Recently Compared') ?></span></strong>
- </div>
- <div class="block-content">
- <?php $suffix = $this->getNameInLayout(); ?>
- <ol class="mini-products-list" id="widget-compared-<?php echo $suffix; ?>">
- <?php foreach ($_products as $_product): ?>
- <li class="item">
- <a class="product-image" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><img src="<?php echo $this->getThumbnailSidebarUrl($_product) ?>" width="<?php echo $this->getThumbnailSidebarSize()?>" height="<?php echo $this->getThumbnailSidebarSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
- <div class="product-details">
- <p class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>)"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></p>
- <?php echo $this->getPriceHtml($_product, true, '-widget-compared-'.$suffix) ?>
- <?php if($_product->isSaleable()): ?>
- <a href="<?php echo $this->getAddToCartUrl($_product) ?>" class="link-cart"><?php echo __('Add to Cart') ?></a>
- <?php else: ?>
- <?php if ($_product->getIsSalable()): ?>
- <p class="availability in-stock"><span><?php echo __('In stock') ?></span></p>
- <?php else: ?>
- <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <?php endif; ?>
- </div>
- </li>
- <?php endforeach; ?>
- </ol>
- <script type="text/javascript">(function($) {$('#widget-compared-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
- </div>
- </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Reports/widget/compared/content/compared_grid.phtml b/app/design/frontend/magento_plushe/Magento_Reports/widget/compared/content/compared_grid.phtml
deleted file mode 100644
index 5e5bfa290ce..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Reports/widget/compared/content/compared_grid.phtml
+++ /dev/null
@@ -1,125 +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 ($exist = $this->getRecentlyComparedProducts()) {
- $type = 'widget-compared';
- $mode = 'grid';
-
- $type = $type . '-' . $mode;
-
- $class = 'widget compared' . ' ' . $mode;
-
- $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
- $image = 'recently_compared_products_grid_content_widget';
- $title = __('Recently Compared');
- $items = $exist;
-
- $showWishlist = true;
- $showCompare = true;
- $showCart = true;
- $rating = 'short';
- $description = ($mode == 'list') ? true : false;
- }
-?>
-
-<?php if ($exist):?>
-<div class="block <?php echo $class; ?>">
- <div class="title">
- <strong><?php echo $title; ?></strong>
- </div>
- <div class="content">
- <?php echo $this->getPagerHtml() ?>
- <?php echo '<!-- ' . $image . '-->' ?>
- <ol class="products list items <?php echo $type; ?>">
- <?php $iterator = 1; ?>
- <?php foreach($items as $_item): ?>
- <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
- <div class="product">
-
- <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
- <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
- </a>
-
- <div class="product details">
-
- <strong class="product name"><a title="<?php echo $this->escapeHtml($_item->getName()) ?>" href="<?php echo $this->getProductUrl($_item) ?>">
- <?php echo $this->escapeHtml($_item->getName()) ?></a>
- </strong>
-
- <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
-
- <?php if ($_item->getRatingSummary() && $rating): ?>
- <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
- <?php endif; ?>
-
- <?php if($showWishlist || $showCompare || $showCart): ?>
- <div class="product actions">
-
- <?php if($showCart): ?>
- <div class="primary">
- <?php if($_item->isSaleable()): ?>
- <button class="action tocart" data-mage-redirect="{event: 'click', url: '<?php echo $this->getAddToCartUrl($_item) ?>'}" type="button" title="<?php echo __('Add to Cart') ?>">
- <span><?php echo __('Add to Cart') ?></span>
- </button>
- <?php else: ?>
- <?php if ($_item->getIsSalable()): ?>
- <p class="stock available"><span><?php echo __('In stock') ?></span></p>
- <?php else: ?>
- <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <?php endif; ?>
- </div>
- <?php endif; ?>
-
- <?php if($showWishlist || $showCompare): ?>
- <div class="secondary addto links">
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
- <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="action towishlist" title="<?php echo __('Add to Wishlist') ?>">
- <span><?php echo __('Add to Wishlist') ?></span>
- </a>
- <?php endif; ?>
- <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
- <a href="<?php echo $this->getAddToCompareUrl($_item) ?>" class="action tocompare" title="<?php echo __('Add to Compare') ?>">
- <span><?php echo __('Add to Compare') ?></span>
- </a>
- <?php endif; ?>
- </div>
- <?php endif; ?>
- </div>
- <?php endif; ?>
-
- </div>
- </div>
- <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
- <?php endforeach ?>
- </ol>
- <script type="text/javascript">
- head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/mage-attributes-processing.js') ?>");
- </script>
- </div>
-</div>
-<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_Reports/widget/compared/content/compared_list.phtml b/app/design/frontend/magento_plushe/Magento_Reports/widget/compared/content/compared_list.phtml
deleted file mode 100644
index a9149fb99a0..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Reports/widget/compared/content/compared_list.phtml
+++ /dev/null
@@ -1,125 +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 ($exist = $this->getRecentlyComparedProducts()) {
- $type = 'widget-compared';
- $mode = 'list';
-
- $type = $type . '-' . $mode;
-
- $class = 'widget compared' . ' ' . $mode;
-
- $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
- $image = 'recently_compared_products_list_content_widget';
- $title = __('Recently Compared');
- $items = $exist;
-
- $showWishlist = true;
- $showCompare = true;
- $showCart = true;
- $rating = 'short';
- $description = ($mode == 'list') ? true : false;
- }
-?>
-
-<?php if ($exist):?>
-<div class="block <?php echo $class; ?>">
- <div class="title">
- <strong><?php echo $title; ?></strong>
- </div>
- <div class="content">
- <?php echo $this->getPagerHtml() ?>
- <?php echo '<!-- ' . $image . '-->' ?>
- <ol class="products list items <?php echo $type; ?>">
- <?php $iterator = 1; ?>
- <?php foreach($items as $_item): ?>
- <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
- <div class="product">
-
- <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
- <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
- </a>
-
- <div class="product details">
-
- <strong class="product name"><a title="<?php echo $this->escapeHtml($_item->getName()) ?>" href="<?php echo $this->getProductUrl($_item) ?>">
- <?php echo $this->escapeHtml($_item->getName()) ?></a>
- </strong>
-
- <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
-
- <?php if ($_item->getRatingSummary() && $rating): ?>
- <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
- <?php endif; ?>
-
- <?php if($showWishlist || $showCompare || $showCart): ?>
- <div class="product actions">
-
- <?php if($showCart): ?>
- <div class="primary">
- <?php if($_item->isSaleable()): ?>
- <button class="action tocart" data-mage-redirect="{event: 'click', url: '<?php echo $this->getAddToCartUrl($_item) ?>'}" type="button" title="<?php echo __('Add to Cart') ?>">
- <span><?php echo __('Add to Cart') ?></span>
- </button>
- <?php else: ?>
- <?php if ($_item->getIsSalable()): ?>
- <p class="stock available"><span><?php echo __('In stock') ?></span></p>
- <?php else: ?>
- <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <?php endif; ?>
- </div>
- <?php endif; ?>
-
- <?php if($showWishlist || $showCompare): ?>
- <div class="secondary addto links">
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
- <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="action towishlist" title="<?php echo __('Add to Wishlist') ?>">
- <span><?php echo __('Add to Wishlist') ?></span>
- </a>
- <?php endif; ?>
- <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
- <a href="<?php echo $this->getAddToCompareUrl($_item) ?>" class="action tocompare" title="<?php echo __('Add to Compare') ?>">
- <span><?php echo __('Add to Compare') ?></span>
- </a>
- <?php endif; ?>
- </div>
- <?php endif; ?>
- </div>
- <?php endif; ?>
-
- </div>
- </div>
- <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
- <?php endforeach ?>
- </ol>
- <script type="text/javascript">
- head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/mage-attributes-processing.js') ?>");
- </script>
- </div>
-</div>
-<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/column/viewed_default_list.phtml b/app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/column/viewed_default_list.phtml
deleted file mode 100644
index c8344e639f7..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/column/viewed_default_list.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)
- */
-?>
-<?php
-/**
- * @see \Magento\Reports\Block\Product\Viewed
- */
-?>
-<?php if ($_products = $this->getRecentlyViewedProducts()): ?>
-<div class="widget widget-viewed">
- <div class="block block-products">
- <div class="block-title">
- <strong><span><?php echo __('Recently Viewed') ?></span></strong>
- </div>
- <div class="block-content">
- <?php $suffix = $this->getNameInLayout(); ?>
- <ol class="mini-products-list" id="widget-viewed-<?php echo $suffix; ?>">
- <?php foreach ($_products as $_product): ?>
- <li class="item">
- <a class="product-image" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><img src="<?php echo $this->getThumbnailSidebarUrl($_product) ?>" width="<?php echo $this->getThumbnailSidebarSize()?>" height="<?php echo $this->getThumbnailSidebarSize()?>" alt="<?php echo $this->stripTags($_product->getName(), null, true) ?>" /></a>
- <div class="product-details">
- <p class="product-name"><a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $this->stripTags($_product->getName(), null, true) ?>"><?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName() , 'name') ?></a></p>
- <?php echo $this->getPriceHtml($_product, true, '-widget-viewed-'.$suffix) ?>
- <?php if($_product->isSaleable()): ?>
- <a href="<?php echo $this->getAddToCartUrl($_product) ?>" class="link-cart"><?php echo __('Add to Cart') ?></a>
- <?php else: ?>
- <?php if ($_product->getIsSalable()): ?>
- <p class="availability in-stock"><span><?php echo __('In stock') ?></span></p>
- <?php else: ?>
- <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <?php endif; ?>
- </div>
- </li>
- <?php endforeach; ?>
- </ol>
- <script type="text/javascript">(function($) {$('#widget-viewed-<?php echo $suffix; ?>').decorate('list', false)})(jQuery)</script>
- </div>
- </div>
-</div>
-<?php endif; ?>
diff --git a/app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/content/viewed_grid.phtml b/app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/content/viewed_grid.phtml
deleted file mode 100644
index 678aba0dd82..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/content/viewed_grid.phtml
+++ /dev/null
@@ -1,129 +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
-/**
- * @see \Magento\Reports\Block\Product\Viewed
- */
-?>
-<?php
- if ($exist = $this->getRecentlyViewedProducts()) {
- $type = 'widget-viewed';
- $mode = 'grid';
-
- $type = $type . '-' . $mode;
-
- $class = 'widget viewed' . ' ' . $mode;
-
- $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
- $image = 'recently_viewed_products_grid_content_widget';
- $title = __('Recently Viewed');
- $items = $exist;
-
- $showWishlist = true;
- $showCompare = true;
- $showCart = true;
- $rating = 'short';
- $description = ($mode == 'list') ? true : false;
- }
-?>
-
-<?php if ($exist):?>
-<div class="block <?php echo $class; ?>">
- <div class="title">
- <strong><?php echo $title; ?></strong>
- </div>
- <div class="content">
- <?php echo $this->getPagerHtml() ?>
- <?php echo '<!-- ' . $image . '-->' ?>
- <ol class="products list items <?php echo $type; ?>">
- <?php $iterator = 1; ?>
- <?php foreach($items as $_item): ?>
- <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
- <div class="product">
-
- <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
- <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
- </a>
-
- <div class="product details">
-
- <strong class="product name"><a title="<?php echo $this->escapeHtml($_item->getName()) ?>" href="<?php echo $this->getProductUrl($_item) ?>">
- <?php echo $this->escapeHtml($_item->getName()) ?></a>
- </strong>
-
- <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
-
- <?php if ($_item->getRatingSummary() && $rating): ?>
- <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
- <?php endif; ?>
-
- <?php if($showWishlist || $showCompare || $showCart): ?>
- <div class="product actions">
-
- <?php if($showCart): ?>
- <div class="primary">
- <?php if($_item->isSaleable()): ?>
- <button class="action tocart" data-mage-redirect="{event: 'click', url: '<?php echo $this->getAddToCartUrl($_item) ?>'}" type="button" title="<?php echo __('Add to Cart') ?>">
- <span><?php echo __('Add to Cart') ?></span>
- </button>
- <?php else: ?>
- <?php if ($_item->getIsSalable()): ?>
- <p class="stock available"><span><?php echo __('In stock') ?></span></p>
- <?php else: ?>
- <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <?php endif; ?>
- </div>
- <?php endif; ?>
-
- <?php if($showWishlist || $showCompare): ?>
- <div class="secondary addto links">
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
- <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="action towishlist" data-action="add-to-wishlist" title="<?php echo __('Add to Wishlist') ?>">
- <span><?php echo __('Add to Wishlist') ?></span>
- </a>
- <?php endif; ?>
- <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
- <a href="<?php echo $this->getAddToCompareUrl($_item) ?>" class="action tocompare" title="<?php echo __('Add to Compare') ?>">
- <span><?php echo __('Add to Compare') ?></span>
- </a>
- <?php endif; ?>
- </div>
- <?php endif; ?>
- </div>
- <?php endif; ?>
-
- </div>
- </div>
- <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
- <?php endforeach ?>
- </ol>
- <script type="text/javascript">
- head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/mage-attributes-processing.js') ?>");
- </script>
- </div>
-</div>
-<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/content/viewed_list.phtml b/app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/content/viewed_list.phtml
deleted file mode 100644
index b30e980f338..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Reports/widget/viewed/content/viewed_list.phtml
+++ /dev/null
@@ -1,128 +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
-/**
- * @see \Magento\Reports\Block\Product\Viewed
- */
-?>
-<?php
- if ($exist = $this->getRecentlyViewedProducts()) {
- $type = 'widget-viewed';
- $mode = 'list';
-
- $type = $type . '-' . $mode;
-
- $class = 'widget viewed' . ' ' . $mode;
-
- $imageBlock = $this->getLayout()->createBlock('Magento\Catalog\Block\Product\Image');
- $image = 'recently_viewed_products_list_content_widget';
- $title = __('Recently Viewed');
- $items = $exist;
-
- $showWishlist = true;
- $showCompare = true;
- $showCart = true;
- $rating = 'short';
- $description = ($mode == 'list') ? true : false;
- }
-?>
-
-<?php if ($exist):?>
-<div class="block <?php echo $class; ?>">
- <div class="title">
- <strong><?php echo $title; ?></strong>
- </div>
- <div class="content">
- <?php echo $this->getPagerHtml() ?>
- <?php echo '<!-- ' . $image . '-->' ?>
- <ol class="products list items <?php echo $type; ?>">
- <?php $iterator = 1; ?>
- <?php foreach($items as $_item): ?>
- <?php echo ($iterator++==1) ? '<li class="item product">' : '</li><li class="item product">' ?>
- <div class="product">
- <a href="<?php echo $this->getProductUrl($_item) ?>" class="product photo">
- <?php echo $imageBlock->init($_item, $image)->toHtml() ?>
- </a>
-
- <div class="product details">
-
- <strong class="product name"><a title="<?php echo $this->escapeHtml($_item->getName()) ?>" href="<?php echo $this->getProductUrl($_item) ?>">
- <?php echo $this->escapeHtml($_item->getName()) ?></a>
- </strong>
-
- <?php echo $this->getPriceHtml($_item, true, '-' . $type) ?>
-
- <?php if ($_item->getRatingSummary() && $rating): ?>
- <?php echo $this->getReviewsSummaryHtml($_item,$rating) ?>
- <?php endif; ?>
-
- <?php if($showWishlist || $showCompare || $showCart): ?>
- <div class="product actions">
-
- <?php if($showCart): ?>
- <div class="primary">
- <?php if($_item->isSaleable()): ?>
- <button class="action tocart" data-mage-redirect="{event: 'click', url: '<?php echo $this->getAddToCartUrl($_item) ?>'}" type="button" title="<?php echo __('Add to Cart') ?>">
- <span><?php echo __('Add to Cart') ?></span>
- </button>
- <?php else: ?>
- <?php if ($_item->getIsSalable()): ?>
- <p class="stock available"><span><?php echo __('In stock') ?></span></p>
- <?php else: ?>
- <p class="stock unavailable"><span><?php echo __('Out of stock') ?></span></p>
- <?php endif; ?>
- <?php endif; ?>
- </div>
- <?php endif; ?>
-
- <?php if($showWishlist || $showCompare): ?>
- <div class="secondary addto links">
- <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
- <a href="<?php echo $this->getAddToWishlistUrl($_item) ?>" class="action towishlist" data-action="add-to-wishlist" title="<?php echo __('Add to Wishlist') ?>">
- <span><?php echo __('Add to Wishlist') ?></span>
- </a>
- <?php endif; ?>
- <?php if($this->getAddToCompareUrl($_item) && $showCompare): ?>
- <a href="<?php echo $this->getAddToCompareUrl($_item) ?>" class="action tocompare" title="<?php echo __('Add to Compare') ?>">
- <span><?php echo __('Add to Compare') ?></span>
- </a>
- <?php endif; ?>
- </div>
- <?php endif; ?>
- </div>
- <?php endif; ?>
-
- </div>
- </div>
- <?php echo ($iterator==count($items)+1) ? '</li>' : '' ?>
- <?php endforeach ?>
- </ol>
- <script type="text/javascript">
- head.js("<?php echo $this->getViewFileUrl('Magento_Catalog::js/mage-attributes-processing.js') ?>");
- </script>
- </div>
-</div>
-<?php endif;?>
diff --git a/app/design/frontend/magento_plushe/Magento_Sendfriend/layout/override/base/sendfriend_product_send.xml b/app/design/frontend/magento_plushe/Magento_Sendfriend/layout/override/base/sendfriend_product_send.xml
deleted file mode 100644
index 8fca208b2b1..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Sendfriend/layout/override/base/sendfriend_product_send.xml
+++ /dev/null
@@ -1,36 +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="page_one_column"/>
- <referenceBlock name="page.main.title">
- <action method="setPageTitle">
- <argument name="title" translate="true" xsi:type="string">Email to a Friend</argument>
- </action>
- </referenceBlock>
- <referenceContainer name="content">
- <block class="Magento\Sendfriend\Block\Send" name="sendfriend.send" template="send.phtml"/>
- </referenceContainer>
-</layout>
diff --git a/app/design/frontend/magento_plushe/Magento_Sendfriend/send.phtml b/app/design/frontend/magento_plushe/Magento_Sendfriend/send.phtml
deleted file mode 100644
index b4ee62ed58c..00000000000
--- a/app/design/frontend/magento_plushe/Magento_Sendfriend/send.phtml
+++ /dev/null
@@ -1,118 +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)
- */
-/* @var $this \Magento\Sendfriend\Block\Send */
-/**
- * Send to friend form
- *
- * @see \Magento\Sendfriend\Block\Send
- */
-?>
-<script id="add-recipient-tmpl" type="text/x-jQuery-tmpl">
- <a href="delete_email" id="btn-remove${_index_}" class="action delete" title="<?php echo $this->escapeJsQuote(__('Remove Email')) ?>"><span><?php echo $this->escapeJsQuote(__('Remove Email')) ?></span></a>
-
- <div class="field name required">
- <label for="recipients-name${_index_}" class="label"><span><?php echo __('Name:')?></span></label>
- <div class="control">
- <input name="recipients[name][${_index_}]" type="text" title="<?php echo __('Name:')?>" class="input-text" id="recipients-name${_index_}" data-validate="{required:true}"/>
- </div>
- </div>
-
- <div class="field email required">
- <label for="recipients-email${_index_}" class="label"><span><?php echo __('Email Address:') ?></span></label>
- <div class="control">
- <input name="recipients[email][${_index_}]" title="<?php echo __('Email Address:') ?>" id="recipients-email${_index_}" type="text" class="input-text" data-validate="{required:true, 'validate-email':true}"/>
- </div>
- </div>
-</script>
-
-<form action="<?php echo $this->getSendUrl() ?>" method="post" id="product-sendtofriend-form" class="form send friend" data-hasRequired="<?php echo __('* Required Fields') ?>">
- <fieldset class="fieldset sender" id="sender_options">
- <?php echo $this->getBlockHtml('formkey')?>
- <legend class="legend"><span><?php echo __('Sender:') ?></span></legend>
- <br>
- <div class="field sender required">
- <label for="sender-name" class="label"><span><?php echo __('Name:') ?></span></label>
- <div class="control">
- <input name="sender[name]" value="<?php echo $this->escapeHtml($this->getUserName()) ?>" title="<?php echo __('Name') ?>" id="sender-name" type="text" class="input-text" data-validate="{required:true}"/>
- </div>
- </div>
-
- <div class="field email required">
- <label for="sender-email" class="label"><span><?php echo __('Email:') ?></span></label>
- <div class="control">
- <input name="sender[email]" value="<?php echo $this->escapeHtml($this->getEmail()) ?>" title="<?php echo __('Email Address') ?>" id="sender-email" type="text" class="input-text" data-validate="{required:true, 'validate-email':true}"/>
- </div>
- </div>
-
- <div class="field text required">
- <label for="sender-message" class="label"><span><?php echo __('Message:') ?></span></label>
- <div class="control">
- <textarea name="sender[message]" class="input-text" id="sender-message" cols="3" rows="3" data-validate="{required:true}"><?php echo $this->escapeHtml($this->getMessage())?></textarea>
- </div>
- </div>
- </fieldset>
-
- <fieldset class="fieldset recipients" id="recipients-options">
- <?php echo $this->getBlockHtml('formkey')?>
- <legend class="legend"><span><?php echo __('Recipient:') ?></span></legend><br />
- </fieldset>
- <div class="actions">
- <div class="primary">
- <button type="submit" class="action submit"<?php if (!$this->canSend()):?> disabled="disabled"<?php endif ?>><span><?php echo __('Send Email') ?></span></button>
- <div id="max-recipient-message" style="display:none;" class="notice-msg limit">
- <?php if ($this->getMaxRecipients()): ?>
- <span><?php echo __('Maximum %1 email addresses allowed.', $this->getMaxRecipients()) ?></span>
- <?php endif; ?>
- </div>
- <?php if (1 < $this->getMaxRecipients()): ?>
- <button type="button" id="add-recipient-button" class="action add"><span><?php echo __('Add Recipient') ?></span></button>
- <?php endif; ?>
- </div>
- <div class="secondary">
- <a class="action back" href="#" role="back"><span><?php echo __('Back') ?></span></a>
- </div>
- </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')?>",
- "<?php echo $this->getViewFileUrl('Magento_Page::js/row-builder.js')?>", function() {
- $('#product-sendtofriend-form').rowBuilder({
- rowTemplate: '#add-recipient-tmpl',
- rowContainer: '#recipients-options',
- rowParentElem: '<div></div>',
- btnRemoveSelector: '.action.delete',
- maxRows: '<?php echo $this->getMaxRecipients() ?>',
- maxRowsMsg: '#max-recipient-message',
- addRowBtn: '#add-recipient-button',
- additionalRowClass: 'additional'
- }).validation();
- $('a[role="back"]').on('click', function() { history.back(); return false; });
- })
- })(jQuery);
-</script>
diff --git a/app/design/frontend/magento_plushe/css/styles.css b/app/design/frontend/magento_plushe/css/styles.css
index 164b29e1a5f..627537351d5 100644
--- a/app/design/frontend/magento_plushe/css/styles.css
+++ b/app/design/frontend/magento_plushe/css/styles.css
@@ -4807,6 +4807,31 @@ body {
.notice.global.site p {
margin: 0;
}
+/*
+ Additional Information
+-------------------------------------- */
+.data.table.additional.attributes {
+ width: 100%;
+}
+.data.table.additional.attributes th,
+.data.table.additional.attributes td {
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
+ padding: 7px 10px;
+ text-align: left;
+}
+.data.table.additional.attributes th {
+ width: 40%;
+}
+.data.table.additional.attributes td {
+ width: 60%;
+}
+.data.table.additional.attributes tr:nth-child(2n+1) th,
+.data.table.additional.attributes tr:nth-child(2n+1) td {
+ background: #f8f8f8;
+}
/*
Reviews
-------------------------------------- */
@@ -6981,7 +7006,7 @@ body {
content: '|';
display: inline-block;
text-decoration: none;
- padding: 0 8px;
+ padding: 0 3px;
}
.block.minicart .products.minilist .item .product.options.wrapper + .action.edit:hover:before {
color: #675f55;
@@ -7251,6 +7276,9 @@ body {
.block.newsletter {
text-align: left;
}
+.block.newsletter .fieldset {
+ margin: 0;
+}
.block.newsletter .title {
display: none;
}
@@ -7419,6 +7447,10 @@ body {
span.widget.link {
display: inline-block;
}
+.widget.mini.products.images .item {
+ display: inline-block;
+ margin: 0 3px;
+}
/*
Magento_Catalog
Compare
@@ -7527,7 +7559,13 @@ span.widget.link {
.data.comparison td:last-child {
border-right: 1px solid #e5e5e5;
}
+.data.comparison tbody:first-child .cell.attribute {
+ background-color: #f8f8f8;
+}
.data.comparison tr:nth-child(odd) .cell.attribute {
+ background-color: #ffffff;
+}
+.data.comparison tr:nth-child(even) .cell.attribute {
background-color: #f8f8f8;
}
.data.comparison .product.photo {
@@ -7805,27 +7843,32 @@ span.widget.link {
float: none;
display: inline-block;
}
-.block.widget.new .products.list.items.widget-new-grid .item.product {
+.block.widget.new .products.list.items.widget-new-grid .item.product,
+.block.widget.new .products.list.items.new.grid .item.product {
width: 20%;
float: none;
display: inline-block;
}
.col2-left-layout .block.widget.new .products.list.items.widget-new-grid .item.product,
-.col2-right-layout .block.widget.new .products.list.items.widget-new-grid .item.product {
+.col2-left-layout .block.widget.new .products.list.items.new.grid .item.product,
+.col2-right-layout .block.widget.new .products.list.items.widget-new-grid .item.product,
+.col2-right-layout .block.widget.new .products.list.items.new.grid .item.product {
float: left;
width: 25%;
margin-right: 0%;
float: none;
display: inline-block;
}
-.col3-layout .block.widget.new .products.list.items.widget-new-grid .item.product {
+.col3-layout .block.widget.new .products.list.items.widget-new-grid .item.product,
+.col3-layout .block.widget.new .products.list.items.new.grid .item.product {
float: left;
width: 33.33333333333333%;
margin-right: 0%;
float: none;
display: inline-block;
}
-.block.widget.new .products.list.items.widget-new-grid .item.product .product.photo {
+.block.widget.new .products.list.items.widget-new-grid .item.product .product.photo,
+.block.widget.new .products.list.items.new.grid .item.product .product.photo {
float: none;
display: block;
margin: 0 0 10px;
@@ -8319,6 +8362,9 @@ span.widget.link {
Magento_Catalog
Product List
-------------------------------------- */
+.category.image img {
+ max-width: 100%;
+}
.products.wrapper .products.list .item {
z-index: 1;
position: relative;
@@ -8482,6 +8528,18 @@ span.widget.link {
.pricing p:last-child {
margin-bottom: 0;
}
+.product.details .price-box .price-excluding-tax,
+.product.details .price-box .price-including-tax {
+ display: block;
+}
+.old-price,
+.old.price {
+ text-decoration: line-through;
+}
+.special-price,
+.special.price {
+ color: #da370a;
+}
.stock[title] {
line-height: 16px;
}
@@ -8688,6 +8746,9 @@ span.widget.link {
.product.info.main .page.title.product + .price-box {
border-bottom: 1px solid #e5e5e5;
}
+.product.info.main .col.price .price-box {
+ margin: 0;
+}
.product.info.main p {
margin: 5px 0;
}
@@ -8697,9 +8758,6 @@ span.widget.link {
.product.info.main .old-price .price {
text-decoration: line-through;
}
-.product.info.main .special-price {
- color: #da370a;
-}
.product.info.main .stock {
margin: 15px 0;
}
@@ -8989,6 +9047,16 @@ span.widget.link {
.product.photo.main .notice {
font-size: 11px;
}
+.magento-zoom > .img > img {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ margin: auto;
+ max-height: 100%;
+ max-width: 100%;
+}
.product.attibute.sku {
font-size: 12px;
}
@@ -9183,6 +9251,15 @@ span.widget.link {
margin-top: 20px;
}
}
+.availability.only.detailed {
+ display: none;
+}
+.availability.only.detailed.active {
+ display: block;
+}
+.availability.only .data.table {
+ width: 100%;
+}
/*
Magento_Bundle
Product View
@@ -9248,10 +9325,24 @@ body.type-bundle {
width: 360px;
}
.bundle.options.container .product.options.bottom {
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
float: left;
+ padding: 0 10px 20px 30px;
width: 500px;
clear: left;
}
+.bundle.options.container .prices.tier {
+ background: #e5e5e5;
+}
+.bundle.options.container .prices.tier + .price-box {
+ font-size: 16px;
+}
+.bundle.options.container .prices.tier + .price-box .price {
+ color: #da370a;
+}
.fieldset.bundle.options {
border: 0;
padding: 0;
@@ -11674,13 +11765,67 @@ img[align="right"] {
border-bottom: 1px dotted #332e29;
cursor: help;
}
-.map-popup {
+/*
+ Minimum Advertising Price
+-------------------------------------- */
+.map.popup {
background: #ffffff;
border: 1px solid #c2c2c2;
+ margin: 18px 0 0;
position: absolute;
padding: 20px;
+ width: 300px;
z-index: 10;
}
+.map.popup:before {
+ border-color: transparent transparent #ffffff transparent;
+ border-style: solid;
+ border-width: 0 15px 15px;
+ content: "";
+ height: 0;
+ left: 50%;
+ margin: 0 0 0 -7px;
+ position: absolute;
+ top: -15px;
+ width: 0;
+ z-index: 2;
+}
+.map.popup:after {
+ border-color: transparent transparent #c2c2c2 transparent;
+ border-style: solid;
+ border-width: 0 16px 16px;
+ content: "";
+ height: 0;
+ left: 50%;
+ margin: 0 0 0 -8px;
+ position: absolute;
+ top: -16px;
+ width: 0;
+ z-index: 1;
+}
+.map.popup .title {
+ margin-bottom: 20px;
+}
+.map.popup .map.msrp .old.price {
+ text-decoration: line-through;
+}
+.map.popup .form.map.checkout {
+ float: right;
+}
+.map.popup .content {
+ margin: 15px 0 0;
+}
+.map.popup .content .map.msrp > .label:after,
+.map.popup .content .map.price > .label:after {
+ content: ": ";
+}
+.map.popup .content .map.price > .label {
+ font-weight: 700;
+}
+.map.popup .price-excluding-tax,
+.map.popup .price-including-tax {
+ display: block;
+}
.mobileAction {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
@@ -11859,44 +12004,44 @@ img[align="right"] {
background: transparent;
}
.search.results .toolbar .pager,
- .category-view .toolbar .pager {
+ .category.view .toolbar .pager {
display: none;
}
.search.results .toolbar .pager .pages > ol,
- .category-view .toolbar .pager .pages > ol {
+ .category.view .toolbar .pager .pages > ol {
line-height: 33px;
}
.search.results .toolbar .pager .pages > ol a,
- .category-view .toolbar .pager .pages > ol a,
+ .category.view .toolbar .pager .pages > ol a,
.search.results .toolbar .pager .pages > ol strong,
- .category-view .toolbar .pager .pages > ol strong {
+ .category.view .toolbar .pager .pages > ol strong {
padding: 0 5px;
}
.search.results .toolbar .sorter select,
- .category-view .toolbar .sorter select,
+ .category.view .toolbar .sorter select,
.search.results .toolbar .limiter select,
- .category-view .toolbar .limiter select {
+ .category.view .toolbar .limiter select {
padding: 5px 10px 4px;
}
.search.results .toolbar .modes,
- .category-view .toolbar .modes {
+ .category.view .toolbar .modes {
float: right;
margin-right: 0;
margin-left: 0;
}
.search.results .toolbar .modes .mode span,
- .category-view .toolbar .modes .mode span {
+ .category.view .toolbar .modes .mode span {
width: 18px;
}
.search.results .toolbar .modes .mode span:after,
- .category-view .toolbar .modes .mode span:after {
+ .category.view .toolbar .modes .mode span:after {
font-size: 18px;
width: 18px;
height: 18px;
line-height: 18px;
}
.search.results .toolbar .modes .mode.grid,
- .category-view .toolbar .modes .mode.grid {
+ .category.view .toolbar .modes .mode.grid {
width: 18px;
display: block;
line-height: 0;
@@ -11907,7 +12052,7 @@ img[align="right"] {
display: inline-block;
}
.search.results .toolbar .modes .mode.grid:after,
- .category-view .toolbar .modes .mode.grid:after {
+ .category.view .toolbar .modes .mode.grid:after {
font-family: "icons";
font-size: 18px;
line-height: 18px;
@@ -11924,17 +12069,17 @@ img[align="right"] {
text-align: center;
}
.search.results .toolbar .modes .mode.grid:active,
- .category-view .toolbar .modes .mode.grid:active {
+ .category.view .toolbar .modes .mode.grid:active {
outline: 0;
}
.search.results .toolbar .modes .mode.grid:after,
- .category-view .toolbar .modes .mode.grid:after {
+ .category.view .toolbar .modes .mode.grid:after {
text-indent: 0;
display: block;
margin: 0;
}
.search.results .toolbar .modes .mode.list,
- .category-view .toolbar .modes .mode.list {
+ .category.view .toolbar .modes .mode.list {
width: 18px;
display: block;
line-height: 0;
@@ -11945,7 +12090,7 @@ img[align="right"] {
display: inline-block;
}
.search.results .toolbar .modes .mode.list:after,
- .category-view .toolbar .modes .mode.list:after {
+ .category.view .toolbar .modes .mode.list:after {
font-family: "icons";
font-size: 18px;
line-height: 18px;
@@ -11962,25 +12107,25 @@ img[align="right"] {
text-align: center;
}
.search.results .toolbar .modes .mode.list:active,
- .category-view .toolbar .modes .mode.list:active {
+ .category.view .toolbar .modes .mode.list:active {
outline: 0;
}
.search.results .toolbar .modes .mode.list:after,
- .category-view .toolbar .modes .mode.list:after {
+ .category.view .toolbar .modes .mode.list:after {
text-indent: 0;
display: block;
margin: 0;
}
.search.results .toolbar.bottom .toolbar .pager,
- .category-view .toolbar.bottom .toolbar .pager {
+ .category.view .toolbar.bottom .toolbar .pager {
display: block;
}
.search.results .toolbar.bottom .toolbar .settings,
- .category-view .toolbar.bottom .toolbar .settings {
+ .category.view .toolbar.bottom .toolbar .settings {
display: none;
}
.search.results .products.wrapper.grid .products.list .item.product,
- .category-view .products.wrapper.grid .products.list .item.product {
+ .category.view .products.wrapper.grid .products.list .item.product {
width: 50%;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
@@ -11988,39 +12133,39 @@ img[align="right"] {
box-sizing: border-box;
}
.search.results .products.wrapper.grid .products.list .item.product .secondary,
- .category-view .products.wrapper.grid .products.list .item.product .secondary {
+ .category.view .products.wrapper.grid .products.list .item.product .secondary {
background: transparent;
}
.search.results .products.wrapper.grid .products.list .item.product .secondary .action.tocompare,
- .category-view .products.wrapper.grid .products.list .item.product .secondary .action.tocompare {
+ .category.view .products.wrapper.grid .products.list .item.product .secondary .action.tocompare {
display: none;
}
.search.results .products.wrapper.list .products.list .item.product .product.photo,
- .category-view .products.wrapper.list .products.list .item.product .product.photo {
+ .category.view .products.wrapper.list .products.list .item.product .product.photo {
float: none;
}
.search.results .products.wrapper.list .products.list .item.product .product.details,
- .category-view .products.wrapper.list .products.list .item.product .product.details {
+ .category.view .products.wrapper.list .products.list .item.product .product.details {
display: block;
padding: 15px 0 0;
text-align: center;
}
.search.results .products.wrapper.list .products.list .item.product .product.details .product.name,
- .category-view .products.wrapper.list .products.list .item.product .product.details .product.name {
+ .category.view .products.wrapper.list .products.list .item.product .product.details .product.name {
font-size: 18px;
}
.search.results .products.wrapper.list .products.list .item.product .product.details .price-box,
- .category-view .products.wrapper.list .products.list .item.product .product.details .price-box {
+ .category.view .products.wrapper.list .products.list .item.product .product.details .price-box {
font-size: 16px;
}
.search.results .product.photo .img.photo.container,
- .category-view .product.photo .img.photo.container {
+ .category.view .product.photo .img.photo.container {
position: static !important;
width: auto !important;
height: auto !important;
}
.search.results .product.photo .img.photo.container img,
- .category-view .product.photo .img.photo.container img {
+ .category.view .product.photo .img.photo.container img {
position: static !important;
width: auto !important;
height: auto !important;
diff --git a/app/design/frontend/magento_plushe/less/responsive/responsive.less b/app/design/frontend/magento_plushe/less/responsive/responsive.less
index e38d75756ff..eef42ae6971 100644
--- a/app/design/frontend/magento_plushe/less/responsive/responsive.less
+++ b/app/design/frontend/magento_plushe/less/responsive/responsive.less
@@ -259,7 +259,7 @@ and (max-width : @breakPoint1) {
}
.search.results,
- .category-view {
+ .category.view {
.toolbar {
.pager {
display: none;
diff --git a/app/design/frontend/magento_plushe/less/styles.less b/app/design/frontend/magento_plushe/less/styles.less
index c50ba837fef..8d1328c59d6 100644
--- a/app/design/frontend/magento_plushe/less/styles.less
+++ b/app/design/frontend/magento_plushe/less/styles.less
@@ -553,6 +553,29 @@ body {
}
}
+/*
+ Additional Information
+-------------------------------------- */
+.data.table.additional.attributes {
+ width: 100%;
+ th,
+ td {
+ .box-sizing();
+ padding: 7px 10px;
+ text-align: left;
+ }
+ th {
+ width: 40%;
+ }
+ td {
+ width: 60%;
+ }
+ tr:nth-child(2n+1) th,
+ tr:nth-child(2n+1) td {
+ background: @primary1;
+ }
+}
+
/*
Reviews
-------------------------------------- */
@@ -2493,7 +2516,7 @@ body {
content: '|';
display: inline-block;
text-decoration: none;
- padding: 0 8px;
+ padding: 0 3px;
}
&:hover:before {
color: @primary6;
@@ -2698,6 +2721,9 @@ body {
.block.newsletter {
@fit: 45px;
text-align: left;
+ .fieldset {
+ margin: 0;
+ }
.title {
display: none;
}
@@ -2826,6 +2852,13 @@ span.widget.link {
display: inline-block;
}
+.widget.mini.products.images {
+ .item {
+ display: inline-block;
+ margin: 0 3px;
+ }
+}
+
/*
Magento_Catalog
Compare
@@ -2935,7 +2968,13 @@ span.widget.link {
td:last-child {
border-right: 1px solid @primary2;
}
+ tbody:first-child .cell.attribute {
+ background-color: @primary1;
+ }
tr:nth-child(odd) .cell.attribute {
+ background-color: @primary7;
+ }
+ tr:nth-child(even) .cell.attribute {
background-color: @primary1;
}
.product.photo {
@@ -3165,7 +3204,8 @@ span.widget.link {
}
.block.widget.new {
- .products.list.items.widget-new-grid {
+ .products.list.items.widget-new-grid,
+ .products.list.items.new.grid {
.item.product {
width: 20%;
float: none;
@@ -3608,6 +3648,12 @@ span.widget.link {
@imageHeight: 180px;
@imageWidth: 180px;
+.category.image {
+ img {
+ max-width: 100%;
+ }
+}
+
.products.wrapper .products.list {
.item {
.product.photo {
@@ -3762,6 +3808,21 @@ span.widget.link {
}
}
+.product.details .price-box .price-excluding-tax,
+.product.details .price-box .price-including-tax {
+ display: block;
+}
+
+.old-price,
+.old.price {
+ text-decoration: line-through;
+}
+
+.special-price,
+.special.price {
+ color: @secondary1;
+}
+
.stock[title] {
line-height: 16px;
span:before {
@@ -3845,6 +3906,9 @@ span.widget.link {
.page.title.product + .price-box {
border-bottom: 1px solid @primary2;
}
+ .col.price .price-box {
+ margin: 0;
+ }
p {
margin: 5px 0;
}
@@ -3857,9 +3921,6 @@ span.widget.link {
text-decoration: line-through;
}
}
- .special-price {
- color: @secondary1;
- }
.stock {
margin: 15px 0;
}
@@ -4022,6 +4083,17 @@ span.widget.link {
}
}
+.magento-zoom > .img > img {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ margin: auto;
+ max-height: 100%;
+ max-width: 100%;
+}
+
.product.attibute.sku {
font-size: @baseFontSizeMiddle;
.value {
@@ -4064,6 +4136,19 @@ and (max-width : 768px) {
}
}
+// Catalog Inventory
+.availability.only {
+ &.detailed {
+ display: none;
+ &.active {
+ display: block;
+ }
+ }
+ .data.table {
+ width: 100%;
+ }
+}
+
/*
Magento_Bundle
Product View
@@ -4131,10 +4216,22 @@ and (max-width : 768px) {
}
}
.product.options.bottom {
+ .box-sizing();
float: left;
+ padding: 0 10px 20px 30px;
width: 500px;
clear: left;
}
+
+ .prices.tier {
+ background: @primary2;
+ + .price-box {
+ font-size: @baseFontSizeBigger;
+ .price {
+ color: @secondary1;
+ }
+ }
+ }
}
.fieldset.bundle.options {
@@ -5626,13 +5723,68 @@ img[align="right"] {
}
}
-.map-popup {
+/*
+ Minimum Advertising Price
+-------------------------------------- */
+.map.popup {
background: @commonBg;
border: 1px solid @primary3;
+ margin: 18px 0 0;
position: absolute;
padding: 20px;
+ width: 300px;
z-index: 10;
+ &:before {
+ border-color: transparent transparent @primary7 transparent;
+ border-style: solid;
+ border-width: 0 15px 15px;
+ content: "";
+ height: 0;
+ left: 50%;
+ margin: 0 0 0 -7px;
+ position: absolute;
+ top: -15px;
+ width: 0;
+ z-index: 2;
+ }
+ &:after {
+ border-color: transparent transparent @primary3 transparent;
+ border-style: solid;
+ border-width: 0 16px 16px;
+ content: "";
+ height: 0;
+ left: 50%;
+ margin: 0 0 0 -8px;
+ position: absolute;
+ top: -16px;
+ width: 0;
+ z-index: 1;
+ }
+ .title {
+ margin-bottom: 20px;
+ }
+ .map.msrp .old.price {
+ text-decoration: line-through;
+ }
+ .form.map.checkout {
+ float: right;
+ }
+ .content {
+ margin: 15px 0 0;
+ .map.msrp,
+ .map.price {
+ > .label:after {
+ content: ": ";
+ }
+ }
+ .map.price > .label {
+ font-weight: 700;
+ }
+ }
+ .price-excluding-tax,
+ .price-including-tax {
+ display: block;
+ }
}
-
@import "/responsive/responsive.less";
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/AdminConfigFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/AdminConfigFixture.php
new file mode 100644
index 00000000000..34f6d3297b5
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/AdminConfigFixture.php
@@ -0,0 +1,139 @@
+<?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
+ * @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)
+ */
+
+/**
+ * Implementation of the @magentoAdminConfigFixture DocBlock annotation
+ */
+namespace Magento\TestFramework\Annotation;
+
+class AdminConfigFixture
+{
+ /**
+ * Test instance that is available between 'startTest' and 'stopTest' events
+ *
+ * @var \PHPUnit_Framework_TestCase
+ */
+ protected $_currentTest;
+
+ /**
+ * Original values for global configuration options that need to be restored
+ *
+ * @var array
+ */
+ private $_configValues = array();
+
+ /**
+ * Retrieve configuration node value
+ *
+ * @param string $configPath
+ * @return string
+ */
+ protected function _getConfigValue($configPath)
+ {
+ return \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Backend\App\ConfigInterface')
+ ->getValue($configPath);
+ }
+
+ /**
+ * Assign configuration node value
+ *
+ * @param string $configPath
+ * @param string $value
+ */
+ protected function _setConfigValue($configPath, $value)
+ {
+ \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Backend\App\ConfigInterface')
+ ->setValue($configPath, $value);
+ }
+
+ /**
+ * Assign required config values and save original ones
+ *
+ * @param \PHPUnit_Framework_TestCase $test
+ */
+ protected function _assignConfigData(\PHPUnit_Framework_TestCase $test)
+ {
+ $annotations = $test->getAnnotations();
+ if (!isset($annotations['method']['magentoAdminConfigFixture'])) {
+ return;
+ }
+ foreach ($annotations['method']['magentoAdminConfigFixture'] as $configPathAndValue) {
+ list($configPath, $requiredValue) = preg_split('/\s+/', $configPathAndValue, 2);
+
+ $originalValue = $this->_getConfigValue($configPath);
+ $this->_configValues[$configPath] = $originalValue;
+
+ $this->_setConfigValue($configPath, $requiredValue);
+ }
+ }
+
+ /**
+ * Restore original values for changed config options
+ */
+ protected function _restoreConfigData()
+ {
+ foreach ($this->_configValues as $configPath => $originalValue) {
+ $this->_setConfigValue($configPath, $originalValue);
+ }
+ $this->_configValues = array();
+ }
+
+ /**
+ * Handler for 'startTest' event
+ *
+ * @param \PHPUnit_Framework_TestCase $test
+ */
+ public function startTest(\PHPUnit_Framework_TestCase $test)
+ {
+ $this->_currentTest = $test;
+ $this->_assignConfigData($test);
+ }
+
+ /**
+ * Handler for 'endTest' event
+ *
+ * @param \PHPUnit_Framework_TestCase $test
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function endTest(\PHPUnit_Framework_TestCase $test)
+ {
+ $this->_currentTest = null;
+ $this->_restoreConfigData();
+ }
+
+ /**
+ * Reassign configuration data whenever application is reset
+ */
+ public function initStoreAfter()
+ {
+ /* process events triggered from within a test only */
+ if ($this->_currentTest) {
+ $this->_assignConfigData($this->_currentTest);
+ }
+ }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php b/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php
index 2ba88cb3371..11602b5abc2 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php
@@ -80,6 +80,7 @@ class DocBlock
))),
new \Magento\TestFramework\Annotation\AppArea($application),
new \Magento\TestFramework\Annotation\ConfigFixture(),
+ new \Magento\TestFramework\Annotation\AdminConfigFixture(),
);
}
}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Cookie.php b/dev/tests/integration/framework/Magento/TestFramework/Cookie.php
index e475842f533..bcd1d13ce01 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Cookie.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Cookie.php
@@ -88,4 +88,20 @@ class Cookie extends \Magento\Core\Model\Cookie
unset($_COOKIE[$name]);
return $this;
}
+
+ /**
+ * Is https secure request
+ *
+ * @return bool
+ */
+ public function isSecure()
+ {
+ $areaCode = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\App\State')
+ ->getAreaCode();
+ if ($areaCode == \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE) {
+ return $this->_getRequest()->isSecure();
+ } else {
+ return parent::isSecure();
+ }
+ }
}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/ObjectManagerFactory.php b/dev/tests/integration/framework/Magento/TestFramework/ObjectManagerFactory.php
index ec9ea2a26b6..c3f49d7d4f5 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/ObjectManagerFactory.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/ObjectManagerFactory.php
@@ -83,6 +83,7 @@ class ObjectManagerFactory extends \Magento\App\ObjectManagerFactory
),
'preferences' => array(
'Magento\Core\Model\Cookie' => 'Magento\TestFramework\Cookie',
+ 'Magento\Backend\Model\Cookie' => 'Magento\TestFramework\Cookie',
'Magento\App\RequestInterface' => 'Magento\TestFramework\Request',
'Magento\App\ResponseInterface' => 'Magento\TestFramework\Response',
),
diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/AdminConfigFixtureTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/AdminConfigFixtureTest.php
new file mode 100644
index 00000000000..252a9eb62c9
--- /dev/null
+++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/AdminConfigFixtureTest.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.
+ *
+ * @category Magento
+ * @package Magento
+ * @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\TestFramework\Annotation\AdminConfigFixture.
+ */
+namespace Magento\Test\Annotation;
+
+class AdminConfigFixtureTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\TestFramework\Annotation\AdminConfigFixture|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_object;
+
+ protected function setUp()
+ {
+ $this->_object = $this->getMock(
+ 'Magento\TestFramework\Annotation\AdminConfigFixture',
+ array('_getConfigValue', '_setConfigValue')
+ );
+ }
+
+ /**
+ * @magentoAdminConfigFixture any_config some_value
+ */
+ public function testConfig()
+ {
+ $this->_object
+ ->expects($this->at(0))
+ ->method('_getConfigValue')
+ ->with('any_config')
+ ->will($this->returnValue('some_value'));
+ $this->_object
+ ->expects($this->at(1))
+ ->method('_setConfigValue')
+ ->with('any_config', 'some_value');
+ $this->_object->startTest($this);
+
+ $this->_object
+ ->expects($this->once())
+ ->method('_setConfigValue')
+ ->with('any_config', 'some_value');
+ $this->_object->endTest($this);
+ }
+
+ public function testInitStoreAfterOfScope()
+ {
+ $this->_object
+ ->expects($this->never())
+ ->method('_getConfigValue');
+ $this->_object
+ ->expects($this->never())
+ ->method('_setConfigValue');
+ $this->_object->initStoreAfter();
+ }
+
+ /**
+ * @magentoAdminConfigFixture any_config some_value
+ */
+ public function testInitStoreAfter()
+ {
+ $this->_object->startTest($this);
+ $this->_object
+ ->expects($this->at(0))
+ ->method('_getConfigValue')
+ ->with('any_config')
+ ->will($this->returnValue('some_value'));
+ $this->_object
+ ->expects($this->at(1))
+ ->method('_setConfigValue')
+ ->with('any_config', 'some_value');
+ $this->_object->initStoreAfter();
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/DashboardTest.php b/dev/tests/integration/testsuite/Magento/Adminhtml/DashboardTest.php
deleted file mode 100644
index 38080f0a1c2..00000000000
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/DashboardTest.php
+++ /dev/null
@@ -1,70 +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\Adminhtml;
-
-/**
- * @magentoAppArea adminhtml
- */
-class DashboardTest extends \Magento\Backend\Utility\Controller
-{
- public function testTunnelAction()
- {
- $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);
- curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
- try {
- if (false === curl_exec($handle)) {
- $this->markTestSkipped('Third-party service is unavailable: ' . $testUrl);
- }
- curl_close($handle);
- } catch (\Exception $e) {
- curl_close($handle);
- throw $e;
- }
-
- $gaData = array(
- 'cht' => 'lc',
- 'chf' => 'bg,s,f4f4f4|c,lg,90,ffffff,0.1,ededed,0',
- 'chm' => 'B,f4d4b2,0,0,0',
- 'chco' => 'db4814',
- 'chd' => 'e:AAAAAAAAf.AAAA',
- 'chxt' => 'x,y',
- 'chxl' => '0:|10/13/12|10/14/12|10/15/12|10/16/12|10/17/12|10/18/12|10/19/12|1:|0|1|2',
- 'chs' => '587x300',
- 'chg' => '16.666666666667,50,1,0',
- );
- $gaFixture = urlencode(base64_encode(json_encode($gaData)));
-
- /** @var $helper \Magento\Backend\Helper\Dashboard\Data */
- $helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->get('Magento\Backend\Helper\Dashboard\Data');
- $hash = $helper->getChartDataHash($gaFixture);
- $this->getRequest()->setParam('ga', $gaFixture)->setParam('h', $hash);
- $this->dispatch('backend/admin/dashboard/tunnel');
- $this->assertStringStartsWith("\x89\x50\x4E\x47", $this->getResponse()->getBody()); // PNG header
- }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Authorizenet/Block/Directpost/IframeTest.php b/dev/tests/integration/testsuite/Magento/Authorizenet/Block/Directpost/IframeTest.php
index bf6181af2ff..10c8957ad99 100644
--- a/dev/tests/integration/testsuite/Magento/Authorizenet/Block/Directpost/IframeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Authorizenet/Block/Directpost/IframeTest.php
@@ -31,10 +31,10 @@ class IframeTest extends \PHPUnit_Framework_TestCase
{
/**
* @magentoAppIsolation enabled
+ * @magentoAppArea frontend
*/
public function testToHtml()
{
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\App\State')->setAreaCode('frontend');
$xssString = '</script><script>alert("XSS")</script>';
/** @var $block \Magento\Authorizenet\Block\Directpost\Iframe */
$block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Page/HeadTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Page/HeadTest.php
similarity index 88%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Page/HeadTest.php
rename to dev/tests/integration/testsuite/Magento/Backend/Block/Page/HeadTest.php
index 4dbab16ae67..b72f3652036 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Page/HeadTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Page/HeadTest.php
@@ -22,7 +22,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Page;
+namespace Magento\Backend\Block\Page;
/**
* @magentoAppArea adminhtml
@@ -32,9 +32,9 @@ class HeadTest extends \PHPUnit_Framework_TestCase
public function testConstruct()
{
$this->assertInstanceOf(
- 'Magento\Adminhtml\Block\Page\Head',
+ 'Magento\Backend\Block\Page\Head',
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
- ->createBlock('Magento\Adminhtml\Block\Page\Head')
+ ->createBlock('Magento\Backend\Block\Page\Head')
);
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Page/HeaderTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Page/HeaderTest.php
similarity index 88%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Page/HeaderTest.php
rename to dev/tests/integration/testsuite/Magento/Backend/Block/Page/HeaderTest.php
index 5100a6c818d..28f16468dc4 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Page/HeaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Page/HeaderTest.php
@@ -25,16 +25,16 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Page;
+namespace Magento\Backend\Block\Page;
/**
- * Test \Magento\Adminhtml\Block\Page\Header
+ * Test \Magento\Backend\Block\Page\Header
* @magentoAppArea adminhtml
*/
class HeaderTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Adminhtml\Block\Page\Header
+ * @var \Magento\Backend\Block\Page\Header
*/
protected $_block;
@@ -42,7 +42,7 @@ class HeaderTest extends \PHPUnit_Framework_TestCase
{
parent::setUp();
$this->_block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
- ->createBlock('Magento\Adminhtml\Block\Page\Header');
+ ->createBlock('Magento\Backend\Block\Page\Header');
}
public function testGetHomeLink()
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/System/Store/EditTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/System/Store/EditTest.php
index 323b4fcbe6b..33017d562f8 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/System/Store/EditTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/System/Store/EditTest.php
@@ -49,6 +49,9 @@ class EditTest extends \PHPUnit_Framework_TestCase
/** @var $objectManager \Magento\TestFramework\ObjectManager */
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
foreach ($registryData as $key => $value) {
+ if ($key == 'store_data') {
+ $value = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create($value);
+ }
$objectManager->get('Magento\Core\Model\Registry')->register($key, $value);
}
}
@@ -81,27 +84,24 @@ class EditTest extends \PHPUnit_Framework_TestCase
array(
array(
'store_type' => 'website',
- 'store_data' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create('Magento\Core\Model\Website')
+ 'store_data' => 'Magento\Core\Model\Website',
),
- 'Magento\Backend\Block\System\Store\Edit\Form\Website'
+ 'Magento\Backend\Block\System\Store\Edit\Form\Website',
),
array(
array(
'store_type' => 'group',
- 'store_data' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create('Magento\Core\Model\Store\Group')
+ 'store_data' => 'Magento\Core\Model\Store\Group',
),
- 'Magento\Backend\Block\System\Store\Edit\Form\Group'
+ 'Magento\Backend\Block\System\Store\Edit\Form\Group',
),
array(
array(
'store_type' => 'store',
- 'store_data' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create('Magento\Core\Model\Store')
+ 'store_data' => 'Magento\Core\Model\Store',
),
- 'Magento\Backend\Block\System\Store\Edit\Form\Store'
- )
+ 'Magento\Backend\Block\System\Store\Edit\Form\Store',
+ ),
);
}
/**
@@ -132,57 +132,51 @@ class EditTest extends \PHPUnit_Framework_TestCase
array(
array(
'store_type' => 'website',
- 'store_data' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create('Magento\Core\Model\Website'),
- 'store_action' => 'add'
+ 'store_data' => 'Magento\Core\Model\Website',
+ 'store_action' => 'add',
),
- 'New Web Site'
+ 'New Web Site',
),
array(
array(
'store_type' => 'website',
- 'store_data' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create('Magento\Core\Model\Website'),
- 'store_action' => 'edit'
+ 'store_data' => 'Magento\Core\Model\Website',
+ 'store_action' => 'edit',
),
- 'Edit Web Site'
+ 'Edit Web Site',
),
array(
array(
'store_type' => 'group',
- 'store_data' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create('Magento\Core\Model\Store\Group'),
- 'store_action' => 'add'
+ 'store_data' => 'Magento\Core\Model\Store\Group',
+ 'store_action' => 'add',
),
- 'New Store'
+ 'New Store',
),
array(
array(
'store_type' => 'group',
- 'store_data' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create('Magento\Core\Model\Store\Group'),
- 'store_action' => 'edit'
+ 'store_data' => 'Magento\Core\Model\Store\Group',
+ 'store_action' => 'edit',
),
- 'Edit Store'
+ 'Edit Store',
),
array(
array(
'store_type' => 'store',
- 'store_data' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create('Magento\Core\Model\Store'),
- 'store_action' => 'add'
+ 'store_data' => 'Magento\Core\Model\Store',
+ 'store_action' => 'add',
),
- 'New Store View'
+ 'New Store View',
),
array(
array(
'store_type' => 'store',
- 'store_data' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create('Magento\Core\Model\Store'),
- 'store_action' => 'edit'
+ 'store_data' => 'Magento\Core\Model\Store',
+ 'store_action' => 'edit',
),
- 'Edit Store View'
- )
+ 'Edit Store View',
+ ),
);
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/CacheTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
similarity index 90%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Controller/CacheTest.php
rename to dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
index bd1f9102e7b..58025f3e309 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/CacheTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
@@ -22,7 +22,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Controller;
+namespace Magento\Backend\Controller\Adminhtml;
/**
* @magentoAppArea adminhtml
@@ -30,8 +30,8 @@ namespace Magento\Adminhtml\Controller;
class CacheTest extends \Magento\Backend\Utility\Controller
{
/**
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/application_cache.php
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/non_application_cache.php
+ * @magentoDataFixture Magento/Backend/controllers/_files/cache/application_cache.php
+ * @magentoDataFixture Magento/Backend/controllers/_files/cache/non_application_cache.php
*/
public function testFlushAllAction()
{
@@ -52,8 +52,8 @@ class CacheTest extends \Magento\Backend\Utility\Controller
}
/**
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/application_cache.php
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/non_application_cache.php
+ * @magentoDataFixture Magento/Backend/controllers/_files/cache/application_cache.php
+ * @magentoDataFixture Magento/Backend/controllers/_files/cache/non_application_cache.php
*/
public function testFlushSystemAction()
{
@@ -75,7 +75,7 @@ class CacheTest extends \Magento\Backend\Utility\Controller
}
/**
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_disabled.php
+ * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_disabled.php
* @dataProvider massActionsDataProvider
* @param array $typesToEnable
*/
@@ -101,7 +101,7 @@ class CacheTest extends \Magento\Backend\Utility\Controller
}
/**
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_enabled.php
+ * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_enabled.php
* @dataProvider massActionsDataProvider
* @param array $typesToDisable
*/
@@ -127,7 +127,7 @@ class CacheTest extends \Magento\Backend\Utility\Controller
}
/**
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_invalidated.php
+ * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_invalidated.php
* @dataProvider massActionsDataProvider
* @param array $typesToRefresh
*/
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
index 3e1004c73a4..167c99b79cb 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
@@ -40,4 +40,43 @@ class DashboardTest extends \Magento\Backend\Utility\Controller
$actual = $this->getResponse()->getBody();
$this->assertContains('dashboard-diagram', $actual);
}
+
+ public function testTunnelAction()
+ {
+ $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);
+ curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
+ try {
+ if (false === curl_exec($handle)) {
+ $this->markTestSkipped('Third-party service is unavailable: ' . $testUrl);
+ }
+ curl_close($handle);
+ } catch (\Exception $e) {
+ curl_close($handle);
+ throw $e;
+ }
+
+ $gaData = array(
+ 'cht' => 'lc',
+ 'chf' => 'bg,s,f4f4f4|c,lg,90,ffffff,0.1,ededed,0',
+ 'chm' => 'B,f4d4b2,0,0,0',
+ 'chco' => 'db4814',
+ 'chd' => 'e:AAAAAAAAf.AAAA',
+ 'chxt' => 'x,y',
+ 'chxl' => '0:|10/13/12|10/14/12|10/15/12|10/16/12|10/17/12|10/18/12|10/19/12|1:|0|1|2',
+ 'chs' => '587x300',
+ 'chg' => '16.666666666667,50,1,0',
+ );
+ $gaFixture = urlencode(base64_encode(json_encode($gaData)));
+
+ /** @var $helper \Magento\Backend\Helper\Dashboard\Data */
+ $helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ ->get('Magento\Backend\Helper\Dashboard\Data');
+ $hash = $helper->getChartDataHash($gaFixture);
+ $this->getRequest()->setParam('ga', $gaFixture)->setParam('h', $hash);
+ $this->dispatch('backend/admin/dashboard/tunnel');
+ $this->assertStringStartsWith("\x89\x50\x4E\x47", $this->getResponse()->getBody()); // PNG header
+ }
}
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php
index a5d4d98a96d..4ca17fb74f4 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/IndexTest.php
@@ -29,25 +29,10 @@
namespace Magento\Backend\Controller\Adminhtml;
/**
- * Test class for \Magento\Backend\Controller\Adminhtml\Index.
- *
* @magentoAppArea adminhtml
*/
class IndexTest extends \Magento\Backend\Utility\Controller
{
- /**
- * @covers \Magento\Backend\Controller\Adminhtml\Index::globalSearchAction
- */
- public function testGlobalSearchAction()
- {
- $this->getRequest()->setParam('isAjax', 'true');
- $this->getRequest()->setPost('query', 'dummy');
- $this->dispatch('backend/admin/index/globalSearch');
-
- $actual = $this->getResponse()->getBody();
- $this->assertEquals(array(), json_decode($actual));
- }
-
/**
* Check not logged state
* @covers \Magento\Backend\Controller\Adminhtml\Index::indexAction
@@ -73,4 +58,17 @@ class IndexTest extends \Magento\Backend\Utility\Controller
$this->dispatch('backend/admin/index/index');
$this->assertRedirect();
}
+
+ /**
+ * @covers \Magento\Backend\Controller\Adminhtml\Index::globalSearchAction
+ */
+ public function testGlobalSearchAction()
+ {
+ $this->getRequest()->setParam('isAjax', 'true');
+ $this->getRequest()->setPost('query', 'dummy');
+ $this->dispatch('backend/admin/index/globalSearch');
+
+ $actual = $this->getResponse()->getBody();
+ $this->assertEquals(array(), json_decode($actual));
+ }
}
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Model/Auth/SessionTest.php b/dev/tests/integration/testsuite/Magento/Backend/Model/Auth/SessionTest.php
index 416d41d1830..423f3a579bb 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Model/Auth/SessionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Model/Auth/SessionTest.php
@@ -63,7 +63,7 @@ class SessionTest extends \PHPUnit_Framework_TestCase
/**
* Disabled form security in order to prevent exit from the app
- * @magentoConfigFixture current_store admin/security/session_lifetime 100
+ * @magentoAdminConfigFixture admin/security/session_lifetime 100
*/
public function testIsLoggedIn()
{
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Model/AuthTest.php b/dev/tests/integration/testsuite/Magento/Backend/Model/AuthTest.php
index 61dc2c70390..c10c76ae2d1 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Model/AuthTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Model/AuthTest.php
@@ -111,7 +111,7 @@ class AuthTest extends \PHPUnit_Framework_TestCase
/**
* Disabled form security in order to prevent exit from the app
- * @magentoConfigFixture current_store admin/security/session_lifetime 100
+ * @magentoAdminConfigFixture admin/security/session_lifetime 100
*/
public function testIsLoggedIn()
{
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Model/Translate/InlineTest.php b/dev/tests/integration/testsuite/Magento/Backend/Model/Translate/InlineTest.php
new file mode 100644
index 00000000000..bbfa1acd60c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Backend/Model/Translate/InlineTest.php
@@ -0,0 +1,65 @@
+<?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_Backend
+ * @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\Backend\Model\Translate;
+
+/**
+ * Test class for \Magento\Backend\Model\Translate\Inline.
+ *
+ * @magentoAppArea adminhtml
+ */
+class InlineTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Core\Model\Translate\InlineInterface
+ */
+ protected $_translate;
+
+ protected function setUp()
+ {
+ $this->_translate = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ ->create('Magento\Core\Model\Translate\InlineInterface');
+ }
+
+ /**
+ * @magentoAdminConfigFixture dev/translate_inline/active_admin 1
+ * @covers \Magento\Backend\Model\Translate\Inline::_getAjaxUrl
+ */
+ public function testAjaxUrl()
+ {
+ $body = '<html><body>some body</body></html>';
+ /** @var \Magento\Backend\Model\Url $url */
+ $url = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ ->get('Magento\UrlInterface');
+ $url->getUrl(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE . '/ajax/translate');
+ $this->_translate->processResponseBody($body, true);
+ $this->assertContains(
+ $url->getUrl(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE . '/ajax/translate'),
+ $body
+ );
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Model/UrlTest.php b/dev/tests/integration/testsuite/Magento/Backend/Model/UrlTest.php
index fb19483a94a..772567cc1c8 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Model/UrlTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Model/UrlTest.php
@@ -51,12 +51,12 @@ class UrlTest extends \PHPUnit_Framework_TestCase
*/
public function testIsSecure()
{
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
- ->getStore()->setConfig('web/secure/use_in_adminhtml', true);
+ \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Backend\App\ConfigInterface')
+ ->setValue('web/secure/use_in_adminhtml', true);
$this->assertTrue($this->_model->isSecure());
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
- ->getStore()->setConfig('web/secure/use_in_adminhtml', false);
+ \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Backend\App\ConfigInterface')
+ ->setValue('web/secure/use_in_adminhtml', false);
$this->assertFalse($this->_model->isSecure());
$this->_model->setData('secure_is_forced', true);
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_disabled.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_disabled.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_disabled.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_disabled.php
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_disabled_rollback.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_disabled_rollback.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_disabled_rollback.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_disabled_rollback.php
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_enabled.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_enabled.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_enabled.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_enabled.php
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_enabled_rollback.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_enabled_rollback.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_enabled_rollback.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_enabled_rollback.php
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_invalidated.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_invalidated.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_invalidated.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_invalidated.php
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_invalidated_rollback.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_invalidated_rollback.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/all_types_invalidated_rollback.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_invalidated_rollback.php
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/application_cache.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/application_cache.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/application_cache.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/application_cache.php
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/application_cache_rollback.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/application_cache_rollback.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/application_cache_rollback.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/application_cache_rollback.php
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/empty_storage.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/empty_storage.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/empty_storage.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/empty_storage.php
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/non_application_cache.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/non_application_cache.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/non_application_cache.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/non_application_cache.php
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/non_application_cache_rollback.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/non_application_cache_rollback.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/cache/non_application_cache_rollback.php
rename to dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/non_application_cache_rollback.php
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/ProductTest.php
index c3da0b70bd6..33d3737072f 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/ProductTest.php
@@ -73,15 +73,10 @@ class ProductTest extends \PHPUnit_Framework_TestCase
/**
* @magentoDbIsolation enabled
* @magentoAppIsolation enabled
+ * @magentoAppArea adminhtml
*/
public function testCRUD()
{
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
- ->setCurrentStore(
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->get('Magento\Core\Model\StoreManagerInterface')
- ->getStore(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
- );
$this->_model->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE)
->setAttributeSetId(4)
->setName('Bundle Product')->setSku(uniqid())->setPrice(10)
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Block/Adminhtml/Captcha/DefaultCaptchaTest.php
similarity index 56%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/TemplateTest.php
rename to dev/tests/integration/testsuite/Magento/Captcha/Block/Adminhtml/Captcha/DefaultCaptchaTest.php
index b651f0e7a48..c74a49b124e 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/TemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Captcha/Block/Adminhtml/Captcha/DefaultCaptchaTest.php
@@ -19,25 +19,34 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @package Magento_Captcha
* @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\Captcha\Block\Adminhtml\Captcha;
-namespace Magento\Adminhtml\Block;
-
-/**
- * @magentoAppArea adminhtml
- */
-class TemplateTest extends \PHPUnit_Framework_TestCase
+class DefaultCaptchaTest extends \PHPUnit_Framework_TestCase
{
- public function testConstructor()
+ /**
+ * @var \Magento\Captcha\Block\Captcha\DefaultCaptcha
+ */
+ protected $_block;
+
+ protected function setUp()
+ {
+ $this->_block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ ->get('Magento\View\LayoutInterface')
+ ->createBlock('Magento\Captcha\Block\Adminhtml\Captcha\DefaultCaptcha');
+ }
+
+ /**
+ * @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
+ * @magentoAppArea adminhtml
+ */
+ public function testGetRefreshUrl()
{
- $this->assertInstanceOf(
- 'Magento\Backend\Block\Template',
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
- ->createBlock('Magento\Adminhtml\Block\Template')
- );
+ $this->assertContains('backend/admin/refresh/refresh', $this->_block->getRefreshUrl());
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/Block/Captcha/DefaultTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Block/Captcha/DefaultTest.php
index 992efc5a942..037a04a5feb 100644
--- a/dev/tests/integration/testsuite/Magento/Captcha/Block/Captcha/DefaultTest.php
+++ b/dev/tests/integration/testsuite/Magento/Captcha/Block/Captcha/DefaultTest.php
@@ -48,24 +48,4 @@ class DefaultTest extends \PHPUnit_Framework_TestCase
{
$this->assertContains('captcha/refresh', $this->_block->getRefreshUrl());
}
-
- /**
- * @magentoDbIsolation enabled
- * @magentoAppIsolation enabled
- */
- public function testGetRefreshUrlWhenIsAdminStore()
- {
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
- ->getStore('admin')->setUrlModel(
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create('Magento\Backend\Model\Url')
- );
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
- ->setCurrentStore(
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->get('Magento\Core\Model\StoreManagerInterface')->getStore('admin')
- );
-
- $this->assertContains('backend/admin/refresh/refresh', $this->_block->getRefreshUrl());
- }
}
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php
index 0d7446806d5..1dd26258c80 100644
--- a/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php
@@ -35,9 +35,9 @@ namespace Magento\Captcha\Model;
class ObserverTest extends \Magento\TestFramework\TestCase\AbstractController
{
/**
- * @magentoConfigFixture admin_store admin/captcha/forms backend_login
- * @magentoConfigFixture admin_store admin/captcha/enable 1
- * @magentoConfigFixture admin_store admin/captcha/mode always
+ * @magentoAdminConfigFixture admin/captcha/forms backend_login
+ * @magentoAdminConfigFixture admin/captcha/enable 1
+ * @magentoAdminConfigFixture admin/captcha/mode always
*/
public function testBackendLoginActionWithInvalidCaptchaReturnsError()
{
@@ -59,10 +59,10 @@ class ObserverTest extends \Magento\TestFramework\TestCase\AbstractController
}
/**
- * @magentoConfigFixture admin_store admin/captcha/enable 1
- * @magentoConfigFixture admin_store admin/captcha/forms backend_login
- * @magentoConfigFixture admin_store admin/captcha/mode after_fail
- * @magentoConfigFixture admin_store admin/captcha/failed_attempts_login 1
+ * @magentoAdminConfigFixture admin/captcha/enable 1
+ * @magentoAdminConfigFixture admin/captcha/forms backend_login
+ * @magentoAdminConfigFixture admin/captcha/mode after_fail
+ * @magentoAdminConfigFixture admin/captcha/failed_attempts_login 1
* @magentoDbIsolation enabled
* @magentoAppIsolation enabled
*/
@@ -91,9 +91,9 @@ class ObserverTest extends \Magento\TestFramework\TestCase\AbstractController
* @magentoDbIsolation enabled
* @magentoAppIsolation enabled
* @magentoDataFixture Magento/Captcha/_files/dummy_user.php
- * @magentoConfigFixture admin_store admin/captcha/enable 1
- * @magentoConfigFixture admin_store admin/captcha/forms backend_forgotpassword
- * @magentoConfigFixture admin_store admin/captcha/mode always
+ * @magentoAdminConfigFixture admin/captcha/enable 1
+ * @magentoAdminConfigFixture admin/captcha/forms backend_forgotpassword
+ * @magentoAdminConfigFixture admin/captcha/mode always
*/
public function testCheckUserForgotPasswordBackendWhenCaptchaFailed()
{
@@ -108,9 +108,9 @@ class ObserverTest extends \Magento\TestFramework\TestCase\AbstractController
/**
* @magentoDbIsolation enabled
* @magentoAppIsolation enabled
- * @magentoConfigFixture admin_store admin/captcha/enable 1
- * @magentoConfigFixture admin_store admin/captcha/forms backend_forgotpassword
- * @magentoConfigFixture admin_store admin/captcha/mode always
+ * @magentoAdminConfigFixture admin/captcha/enable 1
+ * @magentoAdminConfigFixture admin/captcha/forms backend_forgotpassword
+ * @magentoAdminConfigFixture admin/captcha/mode always
*/
public function testCheckUnsuccessfulMessageWhenCaptchaFailed()
{
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/_files/dummy_user.php b/dev/tests/integration/testsuite/Magento/Captcha/_files/dummy_user.php
index 24cc8fa268b..673f73abc13 100644
--- a/dev/tests/integration/testsuite/Magento/Captcha/_files/dummy_user.php
+++ b/dev/tests/integration/testsuite/Magento/Captcha/_files/dummy_user.php
@@ -28,6 +28,8 @@
/**
* Create dummy user
*/
+\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\App')
+ ->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
/** @var $user \Magento\User\Model\User */
$user = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->create('Magento\User\Model\User');
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
index 2fffdd8105b..407a7b04d55 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php
@@ -42,6 +42,6 @@ class ContentTest extends \PHPUnit_Framework_TestCase
'block'
);
- $this->assertInstanceOf('Magento\Adminhtml\Block\Media\Uploader', $block->getUploader());
+ $this->assertInstanceOf('Magento\Backend\Block\Media\Uploader', $block->getUploader());
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/RelatedTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/RelatedTest.php
index 2bc79c50f9c..d823dee517a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/RelatedTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/RelatedTest.php
@@ -49,7 +49,8 @@ class RelatedTest extends \PHPUnit_Framework_TestCase
->createBlock('Magento\Catalog\Block\Product\ProductList\Related');
$block->setLayout(\Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->get('Magento\View\LayoutInterface'));
- $block->setTemplate('product/list/related.phtml');
+ $block->setTemplate('Magento_Catalog::product/list/items.phtml');
+ $block->setType('related');
$html = $block->toHtml();
$this->assertNotEmpty($html);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
index 125977e64fa..4d5d9c41f8a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
@@ -75,7 +75,7 @@ class AttributeTest extends \Magento\Backend\Utility\Controller
/**
* @magentoDataFixture Magento/Core/_files/db_translate_admin_store.php
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_enabled.php
+ * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_enabled.php
* @magentoDataFixture Magento/Catalog/controllers/_files/attribute_user_defined.php
* @magentoAppIsolation enabled
*/
@@ -86,9 +86,7 @@ class AttributeTest extends \Magento\Backend\Utility\Controller
/** @var \Magento\Core\Model\Resource\Translate\String $translateString */
$translateString = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->create('Magento\Core\Model\Resource\Translate\String');
- $translateString->saveTranslate(
- 'Fixture String', 'New Db Translation', 'en_US', \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
- );
+ $translateString->saveTranslate('Fixture String', 'New Db Translation', 'en_US');
$this->assertEquals(
'Fixture Db Translation', $this->_translate('Fixture String'), 'Translation is expected to be cached'
);
@@ -111,8 +109,6 @@ class AttributeTest extends \Magento\Backend\Utility\Controller
protected function _translate($string)
{
// emulate admin store and design
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
- ->setCurrentStore(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\DesignInterface')
->setDesignTheme(1);
/** @var \Magento\Core\Model\Translate $translate */
@@ -150,7 +146,7 @@ class AttributeTest extends \Magento\Backend\Utility\Controller
'used_for_sort_by' => '0',
'apply_to' => array('simple', 'configurable'),
'frontend_label' => array(
- \Magento\Core\Model\AppInterface::ADMIN_STORE_ID => 'Fixture String',
+ \Magento\Core\Model\Store::DEFAULT_STORE_ID => 'Fixture String',
),
);
}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
index 4ad57bdf195..799b2e0c8a2 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
@@ -120,18 +120,16 @@ class TierpriceTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(2, count($price));
}
+ /**
+ * @magentoAppArea adminhtml
+ */
public function testAfterSave()
{
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
- ->setCurrentStore(
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->get('Magento\Core\Model\StoreManagerInterface')
- ->getStore(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
- );
/** @var $product \Magento\Catalog\Model\Product */
$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->create('Magento\Catalog\Model\Product');
$product->load(1);
+ $product->unlockAttributes();
$product->setOrigData();
$product->setTierPrice(
array(
@@ -160,7 +158,7 @@ class TierpriceTest extends \PHPUnit_Framework_TestCase
->get('Magento\Core\Model\StoreManagerInterface')->setCurrentStore(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->get('Magento\Core\Model\StoreManagerInterface')
- ->getStore(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+ ->getStore(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
);
/** @var $product \Magento\Catalog\Model\Product */
$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
index f9a0dca71da..dfbe08b0d7e 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
@@ -69,15 +69,10 @@ class ProductTest extends \PHPUnit_Framework_TestCase
/**
* @magentoDbIsolation enabled
* @magentoAppIsolation enabled
+ * @magentoAppArea adminhtml
*/
public function testCRUD()
{
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
- ->setCurrentStore(
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->get('Magento\Core\Model\StoreManagerInterface')
- ->getStore(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
- );
$this->_model->setTypeId('simple')->setAttributeSetId(4)
->setName('Simple Product')->setSku(uniqid())->setPrice(10)
->setMetaTitle('meta title')->setMetaKeyword('meta keyword')->setMetaDescription('meta description')
@@ -140,6 +135,7 @@ class ProductTest extends \PHPUnit_Framework_TestCase
/**
* @magentoAppIsolation enabled
+ * @magentoAppArea adminhtml
*/
public function testDuplicate()
{
@@ -157,6 +153,9 @@ class ProductTest extends \PHPUnit_Framework_TestCase
}
}
+ /**
+ * @magentoAppArea adminhtml
+ */
public function testDuplicateSkuGeneration()
{
$this->_model->load(1);
@@ -173,7 +172,7 @@ class ProductTest extends \PHPUnit_Framework_TestCase
protected function _undo($duplicate)
{
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
- ->getStore()->setId(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+ ->getStore()->setId(\Magento\Core\Model\Store::DEFAULT_STORE_ID);
$duplicate->delete();
}
@@ -349,28 +348,29 @@ class ProductTest extends \PHPUnit_Framework_TestCase
);
}
- public function testSetOrigData()
+ /**
+ * @magentoAppArea frontend
+ */
+ public function testSetOrigDataFrontend()
{
$this->assertEmpty($this->_model->getOrigData());
$this->_model->setOrigData('key', 'value');
$this->assertEmpty($this->_model->getOrigData());
+ }
- $storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->get('Magento\Core\Model\StoreManagerInterface')->getStore()->getId();
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
- ->getStore()->setId(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
- try {
- $this->_model->setOrigData('key', 'value');
- $this->assertEquals('value', $this->_model->getOrigData('key'));
- } catch (\Exception $e) {
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
- ->getStore()->setId($storeId);
- throw $e;
- }
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
- ->getStore()->setId($storeId);
+ /**
+ * @magentoAppArea adminhtml
+ */
+ public function testSetOrigDataBackend()
+ {
+ $this->assertEmpty($this->_model->getOrigData());
+ $this->_model->setOrigData('key', 'value');
+ $this->assertEquals('value', $this->_model->getOrigData('key'));
}
+ /**
+ * @magentoAppArea frontend
+ */
public function testReset()
{
$model = $this->_model;
diff --git a/dev/tests/integration/testsuite/Magento/Centinel/CreateOrderTest.php b/dev/tests/integration/testsuite/Magento/Centinel/CreateOrderTest.php
index 4189f655d94..d0a8d85f614 100644
--- a/dev/tests/integration/testsuite/Magento/Centinel/CreateOrderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Centinel/CreateOrderTest.php
@@ -33,7 +33,7 @@ namespace Magento\Centinel;
class CreateOrderTest extends \Magento\Backend\Utility\Controller
{
/**
- * @magentoConfigFixture admin_store payment/ccsave/centinel 1
+ * @magentoConfigFixture default_store payment/ccsave/centinel 1
* @magentoDataFixture Magento/Catalog/_files/product_simple.php
*/
public function testIndexAction()
@@ -49,7 +49,11 @@ class CreateOrderTest extends \Magento\Backend\Utility\Controller
'cc_cid' => '123',
'method' => 'ccsave',
);
- $order->addProducts(array(1 => array('qty' => 1)))->getQuote()->getPayment()->addData($paymentData);
+ $quote = $order->addProducts(array(1 => array('qty' => 1)))->getQuote();
+ $defaultStoreId = $this->_objectManager->get('Magento\Core\Model\StoreManagerInterface')
+ ->getStore('default')->getId();
+ $quote->setStoreId($defaultStoreId);
+ $quote->getPayment()->addData($paymentData);
$this->dispatch('backend/sales/order_create/index');
$this->assertContains('<div class="centinel">', $this->getResponse()->getBody());
}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
index e1bb835ef3b..b40cf2950b0 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
@@ -57,7 +57,7 @@ class StorageTest extends \PHPUnit_Framework_TestCase
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\App')
->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\DesignInterface')
- ->setDesignTheme('magento_basic');
+ ->setDesignTheme('magento_backend');
/** @var $model \Magento\Cms\Model\Wysiwyg\Images\Storage */
$model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->create('Magento\Cms\Model\Wysiwyg\Images\Storage');
@@ -74,6 +74,9 @@ class StorageTest extends \PHPUnit_Framework_TestCase
}
}
+ /**
+ * @magentoAppArea adminhtml
+ */
public function testGetThumbsPath()
{
$filesystem = new \Magento\Filesystem(new \Magento\Filesystem\Adapter\Local);
diff --git a/dev/tests/integration/testsuite/Magento/Core/Helper/UrlTest.php b/dev/tests/integration/testsuite/Magento/Core/Helper/UrlTest.php
index b6593aa7be4..552e2445c9e 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Helper/UrlTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Helper/UrlTest.php
@@ -35,15 +35,10 @@ class UrlTest extends \PHPUnit_Framework_TestCase
protected $_helper = null;
protected function setUp()
- {
- $this->_helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Helper\Url');
- }
-
- public function testGetCurrentUrl()
{
$_SERVER['HTTP_HOST'] = 'example.com';
$_SERVER['REQUEST_URI'] = '/fancy_uri';
- $this->assertEquals('http://example.com/fancy_uri', $this->_helper->getCurrentUrl());
+ $this->_helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Helper\Url');
}
public function testGetCurrentBase64Url()
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/AppTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/AppTest.php
index a76f932b62d..e9c1fe7debd 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/AppTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/AppTest.php
@@ -140,8 +140,14 @@ class AppTest extends \PHPUnit_Framework_TestCase
public function testGetStores()
{
$this->assertNotEmpty($this->_mageModel->getStores());
- $this->assertNotContains(\Magento\Core\Model\App::ADMIN_STORE_ID, array_keys($this->_mageModel->getStores()));
- $this->assertContains(\Magento\Core\Model\App::ADMIN_STORE_ID, array_keys($this->_mageModel->getStores(true)));
+ $this->assertNotContains(
+ \Magento\Core\Model\Store::DEFAULT_STORE_ID,
+ array_keys($this->_mageModel->getStores())
+ );
+ $this->assertContains(
+ \Magento\Core\Model\Store::DEFAULT_STORE_ID,
+ array_keys($this->_mageModel->getStores(true))
+ );
}
public function testGetDefaultStoreView()
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/DesignTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/DesignTest.php
index 30ca12b56b1..9581464cae3 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/DesignTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/DesignTest.php
@@ -67,7 +67,7 @@ class DesignTest extends \PHPUnit_Framework_TestCase
$this->_model->setData(
array(
'store_id' => 1,
- 'design' => 'magento_demo',
+ 'design' => 'magento_blank',
/* Note: in order to load a design change it should be active within the store's time zone */
'date_from' => date('Y-m-d', strtotime('-1 day')),
'date_to' => date('Y-m-d', strtotime('+1 day')),
@@ -140,7 +140,7 @@ class DesignTest extends \PHPUnit_Framework_TestCase
$this->assertArrayHasKey('design', $cachedDesign);
$this->assertEquals($cachedDesign['design'], $design->getDesign());
- $design->setDesign('magento_demo')->save();
+ $design->setDesign('magento_blank')->save();
$design = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->create('Magento\Core\Model\Design');
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/LayoutTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/LayoutTest.php
index 4e1c95ccf30..5b2e198655f 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/LayoutTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/LayoutTest.php
@@ -83,6 +83,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
/**
* @magentoAppIsolation enabled
+ * @magentoAppArea frontend
*/
public function testDestructor()
{
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php
index a0f03563a78..64e9bc1b563 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php
@@ -59,8 +59,8 @@ class UpdateTest extends \PHPUnit_Framework_TestCase
}
/**
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_enabled.php
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/application_cache.php
+ * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_enabled.php
+ * @magentoDataFixture Magento/Backend/controllers/_files/cache/application_cache.php
* @magentoDataFixture Magento/Core/_files/layout_cache.php
*/
public function testSaveAfterClearCache()
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Store/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Store/CollectionTest.php
index 26b1911501d..9e7af0dbc56 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Store/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Store/CollectionTest.php
@@ -147,7 +147,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
*/
public function testGetAllIds()
{
- $this->assertContains(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID, $this->_collection->getAllIds());
+ $this->assertContains(\Magento\Core\Model\AppInterface::DISTRO_STORE_ID, $this->_collection->getAllIds());
}
/**
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/TransactionTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/Resource/TransactionTest.php
index 5aae59ab788..f93d3daeb1c 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/TransactionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/Resource/TransactionTest.php
@@ -40,6 +40,9 @@ class TransactionTest extends \PHPUnit_Framework_TestCase
->create('Magento\Core\Model\Resource\Transaction');
}
+ /**
+ * @magentoAppArea adminhtml
+ */
public function testSaveDelete()
{
$first = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
@@ -71,8 +74,6 @@ class TransactionTest extends \PHPUnit_Framework_TestCase
$this->assertNotEmpty($first->getId());
$this->assertNotEmpty($second->getId());
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
- ->getStore()->setId(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
$this->_model->delete();
$test = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/StoreTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/StoreTest.php
index 500aa52a910..806ec740e42 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/StoreTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/StoreTest.php
@@ -71,7 +71,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
$this->_modelParams
);
}
-
+
protected function tearDown()
{
$this->_model = null;
@@ -298,6 +298,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
/**
* @magentoAppIsolation enabled
+ * @magentoAppArea adminhtml
*/
public function testCRUD()
{
@@ -313,8 +314,6 @@ class StoreTest extends \PHPUnit_Framework_TestCase
);
/* emulate admin store */
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
- ->getStore()->setId(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
$crud = new \Magento\TestFramework\Entity($this->_model, array('name' => 'new name'));
$crud->testCrud();
}
@@ -342,8 +341,6 @@ class StoreTest extends \PHPUnit_Framework_TestCase
$this->_model->setData($data);
/* emulate admin store */
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
- ->getStore()->setId(\Magento\Core\Model\App::ADMIN_STORE_ID);
$this->_model->save();
}
@@ -368,7 +365,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
/**
* @dataProvider isUseStoreInUrlDataProvider
*/
- public function testIsUseStoreInUrl($isInstalled, $storeInUrl, $storeId, $expectedResult)
+ public function testIsUseStoreInUrl($isInstalled, $storeInUrl, $disableStoreInUrl, $expectedResult)
{
$appStateMock = $this->getMock('Magento\App\State', array(), array(), '', false, false);
$appStateMock->expects($this->any())
@@ -384,7 +381,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
$model->expects($this->any())->method('getConfig')
->with($this->stringContains(\Magento\Core\Model\Store::XML_PATH_STORE_IN_URL))
->will($this->returnValue($storeInUrl));
- $model->setStoreId($storeId);
+ $model->setDisableStoreInUrl($disableStoreInUrl);
$this->assertEquals($expectedResult, $model->isUseStoreInUrl());
}
@@ -395,10 +392,11 @@ class StoreTest extends \PHPUnit_Framework_TestCase
public function isUseStoreInUrlDataProvider()
{
return array(
- array(true, true, 1, true),
- array(false, true, 1, false),
- array(true, false, 1, false),
- array(true, true, 0, false),
+ array(true, true, null, true),
+ array(false, true, null, false),
+ array(true, false, null, false),
+ array(true, true, true, false),
+ array(true, true, false, true),
);
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Translate/InlineParserTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/Translate/InlineParserTest.php
index 69e10432dba..cd99be9555e 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Translate/InlineParserTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/Translate/InlineParserTest.php
@@ -40,7 +40,7 @@ class InlineParserTest extends \PHPUnit_Framework_TestCase
public static function setUpBeforeClass()
{
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\DesignInterface')
- ->setDesignTheme('magento_demo');
+ ->setDesignTheme('magento_blank');
}
protected function setUp()
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Translate/InlineTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/Translate/InlineTest.php
index bcbe27e1c9e..0f7974451ae 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Translate/InlineTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/Translate/InlineTest.php
@@ -43,7 +43,7 @@ class InlineTest extends \PHPUnit_Framework_TestCase
{
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\App\State')->setAreaCode('frontend');
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\DesignInterface')
- ->setDesignTheme('magento_demo');
+ ->setDesignTheme('magento_blank');
}
protected function setUp()
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/TranslateTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/TranslateTest.php
index 404cd1e8dc7..e8778a93c49 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/TranslateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/TranslateTest.php
@@ -28,7 +28,7 @@
namespace Magento\Core\Model;
/**
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_disabled.php
+ * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_disabled.php
*/
class TranslateTest extends \PHPUnit_Framework_TestCase
{
@@ -113,7 +113,9 @@ class TranslateTest extends \PHPUnit_Framework_TestCase
/**
* @magentoDataFixture Magento/Core/_files/db_translate.php
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_enabled.php
+ * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_enabled.php
+ * @covers \Magento\Backend\Model\Resource\Translate::_getStoreId
+ * @covers \Magento\Backend\Model\Resource\Translate\String::_getStoreId
*/
public function testInitCaching()
{
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/UrlTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/UrlTest.php
index a6cc866d724..df4c9d89b60 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/UrlTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/UrlTest.php
@@ -114,8 +114,6 @@ class UrlTest extends \PHPUnit_Framework_TestCase
$this->assertFalse($this->_model->isSecure());
$this->_model->setSecureIsForced(1);
$this->assertTrue(is_bool($this->_model->isSecure()));
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
- ->getStore()->setId(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
$this->assertFalse($this->_model->isSecure());
}
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Variable/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/Variable/ConfigTest.php
index 7201ce9e7be..bbe565fd5cf 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Variable/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/Variable/ConfigTest.php
@@ -27,6 +27,9 @@
namespace Magento\Core\Model\Variable;
+/**
+ * @magentoAppArea adminhtml
+ */
class ConfigTest extends \PHPUnit_Framework_TestCase
{
/**
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/View/DesignTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/View/DesignTest.php
index 6d367985a03..de3e5df9fe3 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/View/DesignTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/View/DesignTest.php
@@ -197,7 +197,7 @@ class DesignTest extends \PHPUnit_Framework_TestCase
array('theme_file.txt', array('module' => 'Magento_Catalog')),
array('Magento_Catalog::theme_file.txt', array()),
array('Magento_Catalog::theme_file_with_2_dots..txt', array()),
- array('Magento_Catalog::theme_file.txt', array('module' => 'Overriden_Module')),
+ array('Magento_Catalog::theme_file.txt', array('module' => 'Overridden_Module')),
);
}
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/WebsiteTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/WebsiteTest.php
index 6a91dcd4b8f..4dd8aedc3ad 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/WebsiteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/WebsiteTest.php
@@ -182,6 +182,7 @@ class WebsiteTest extends \PHPUnit_Framework_TestCase
/**
* @magentoAppIsolation enabled
+ * @magentoAppArea adminhtml
*/
public function testCRUD()
{
@@ -194,8 +195,6 @@ class WebsiteTest extends \PHPUnit_Framework_TestCase
);
/* emulate admin store */
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
- ->getStore()->setId(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
$crud = new \Magento\TestFramework\Entity($this->_model, array('name' => 'new name'));
$crud->testCrud();
}
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Core/layout_test_handle_sample.xml b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Core/layout_test_handle_sample.xml
index 042a16b16f6..d4c188c7bbc 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Core/layout_test_handle_sample.xml
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/test_default/Magento_Core/layout_test_handle_sample.xml
@@ -27,8 +27,8 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <block class="Magento\Adminhtml\Block\Page" name="root" output="1" template="page.phtml">
- <block class="Magento\Adminhtml\Block\Page\Head" name="head" as="head" template="page/head.phtml">
+ <block class="Magento\Backend\Block\Page" name="root" output="1" template="page.phtml">
+ <block class="Magento\Backend\Block\Page\Head" name="head" as="head" template="page/head.phtml">
<action method="setTitle">
<argument translate="true" name="title" xsi:type="string">Magento Admin</argument>
</action>
@@ -43,7 +43,7 @@
</action>
<block class="Magento\View\Block\Html\Calendar" name="head.calendar" as="calendar" template="page/js/calendar.phtml"/>
</block>
- <block class="Magento\Adminhtml\Block\Page\Header" name="header" as="header"/>
+ <block class="Magento\Backend\Block\Page\Header" name="header" as="header"/>
<block class="Magento\Backend\Block\Menu" name="menu" as="menu"/>
<block class="Magento\View\Block\Messages" name="messages" as="messages"/>
<block class="Magento\View\Block\Text" as="no_name"/>
diff --git a/dev/tests/integration/testsuite/Magento/Core/_files/db_translate_admin_store.php b/dev/tests/integration/testsuite/Magento/Core/_files/db_translate_admin_store.php
index f6cc80c1fa5..aaae82a2a8a 100644
--- a/dev/tests/integration/testsuite/Magento/Core/_files/db_translate_admin_store.php
+++ b/dev/tests/integration/testsuite/Magento/Core/_files/db_translate_admin_store.php
@@ -22,9 +22,9 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\App')
+ ->loadAreaPart(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE, \Magento\Core\Model\App\Area::PART_CONFIG);
/** @var \Magento\Core\Model\Resource\Translate\String $translateString */
$translateString = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->create('Magento\Core\Model\Resource\Translate\String');
-$translateString->saveTranslate(
- 'Fixture String', 'Fixture Db Translation', null, \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
-);
+$translateString->saveTranslate('Fixture String', 'Fixture Db Translation', null);
diff --git a/dev/tests/integration/testsuite/Magento/Cron/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Cron/Model/ObserverTest.php
index 40a6ce86a4c..69c528a8fe9 100644
--- a/dev/tests/integration/testsuite/Magento/Cron/Model/ObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cron/Model/ObserverTest.php
@@ -32,6 +32,8 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
+ \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\App')
+ ->loadAreaPart('crontab', \Magento\Core\Model\App\Area::PART_CONFIG);
$this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->create('Magento\Cron\Model\Observer');
$this->_model->dispatch('this argument is not used');
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Service/CustomerTest.php b/dev/tests/integration/testsuite/Magento/Customer/Service/CustomerTest.php
index 45d52fdca37..ec7c640e139 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Service/CustomerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Service/CustomerTest.php
@@ -59,13 +59,9 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
{
$previousStoreId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->get('Magento\Core\Model\StoreManagerInterface')->getStore();
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
- ->setCurrentStore(
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->get('Magento\Core\Model\StoreManagerInterface')
- ->getStore(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
- );
if ($this->_createdCustomer && $this->_createdCustomer->getId() > 0) {
+ \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\App')
+ ->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
$this->_createdCustomer->getAddressesCollection()->delete();
$this->_createdCustomer->delete();
}
@@ -123,7 +119,7 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
'password' => '123123q',
'default_billing' => null,
'default_shipping' => null,
- 'store_id' => \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
+ 'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID
)),
'Mandatory data' => array(array(
'firstname' => 'SomeName',
@@ -161,7 +157,7 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
'suffix' => null,
'email' => 'test' . mt_rand(1000, 9999) . '@mail.com',
'password' => '123123q',
- 'store_id' => \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
+ 'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID
), 'Magento\Validator\ValidatorException'),
'Invalid email' => array(array(
'website_id' => 0,
@@ -173,7 +169,7 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
'suffix' => null,
'email' => '111@111',
'password' => '123123q',
- 'store_id' => \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
+ 'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID
), 'Magento\Validator\ValidatorException'),
'Invalid password' => array(array(
'website_id' => 0,
@@ -185,7 +181,7 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
'suffix' => null,
'email' => 'test' . mt_rand(1000, 9999) . '@mail.com',
'password' => '123',
- 'store_id' => \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
+ 'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID
), 'Magento\Eav\Model\Entity\Attribute\Exception', 'The password must have at least 6 characters.')
);
}
@@ -364,7 +360,7 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
'email' => 'test' . mt_rand(1000, 9999) . '@mail.com',
'dob' => date('Y-m-d H:i:s'),
'gender' => 1,
- 'store_id' => \Magento\Core\Model\AppInterface::ADMIN_STORE_ID
+ 'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID
))
);
}
diff --git a/dev/tests/integration/testsuite/Magento/DesignEditor/Model/Translate/InlineVdeTest.php b/dev/tests/integration/testsuite/Magento/DesignEditor/Model/Translate/InlineVdeTest.php
index 3328b98984b..e9f49b6d4e4 100644
--- a/dev/tests/integration/testsuite/Magento/DesignEditor/Model/Translate/InlineVdeTest.php
+++ b/dev/tests/integration/testsuite/Magento/DesignEditor/Model/Translate/InlineVdeTest.php
@@ -48,7 +48,7 @@ class InlineVdeTest extends \PHPUnit_Framework_TestCase
{
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\App\State')->setAreaCode('frontend');
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\DesignInterface')
- ->setDesignTheme('magento_demo');
+ ->setDesignTheme('magento_blank');
}
protected function setUp()
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/Model/Product/TypeTest.php b/dev/tests/integration/testsuite/Magento/Downloadable/Model/Product/TypeTest.php
index dae98bf1090..84850a22b08 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/Model/Product/TypeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/Model/Product/TypeTest.php
@@ -45,14 +45,13 @@ class TypeTest extends \PHPUnit_Framework_TestCase
/**
* @magentoDataFixture Magento/Downloadable/_files/product_with_files.php
+ * @magentoAppArea adminhtml
*/
public function testDeleteTypeSpecificData()
{
$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->create('Magento\Catalog\Model\Product');
$product->load(1);
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\StoreManagerInterface')
- ->setCurrentStore(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
$product->setOrigData();
$downloadableData = array();
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/Magento_Core/layout/email_template_test_handle.xml b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/Magento_Core/layout/email_template_test_handle.xml
index a9b326af3ba..8dbddf898e9 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/Magento_Core/layout/email_template_test_handle.xml
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/_files/design/adminhtml/test_default/Magento_Core/layout/email_template_test_handle.xml
@@ -27,5 +27,5 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >
- <block class="Magento\Adminhtml\Block\Template" name="sample_email_content" template="Magento_Core::sample_email_content.phtml"/>
+ <block class="Magento\Backend\Block\Template" name="sample_email_content" template="Magento_Core::sample_email_content.phtml"/>
</layout>
diff --git a/dev/tests/integration/testsuite/Magento/Install/Model/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Install/Model/ConfigTest.php
index cc82c080b8e..1222260bdb1 100644
--- a/dev/tests/integration/testsuite/Magento/Install/Model/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Install/Model/ConfigTest.php
@@ -224,10 +224,10 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
if (count($expectedSteps) > $counter+1) {
$this->fail('Some expected steps are missing');
}
- $pathesForCheck = $model->getWritableFullPathsForCheck();
- $this->assertArrayHasKey('etc', $pathesForCheck);
- $this->assertArrayHasKey('media', $pathesForCheck);
- $this->assertArrayHasKey('lib', $pathesForCheck);
- $this->assertEquals('1', $pathesForCheck['etc']['recursive']);
+ $pathsForCheck = $model->getWritableFullPathsForCheck();
+ $this->assertArrayHasKey('etc', $pathsForCheck);
+ $this->assertArrayHasKey('media', $pathsForCheck);
+ $this->assertArrayHasKey('lib', $pathsForCheck);
+ $this->assertEquals('1', $pathsForCheck['etc']['recursive']);
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Install/Model/InstallerTest.php b/dev/tests/integration/testsuite/Magento/Install/Model/InstallerTest.php
index 6641592ae4c..1edc55f9882 100644
--- a/dev/tests/integration/testsuite/Magento/Install/Model/InstallerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Install/Model/InstallerTest.php
@@ -77,6 +77,7 @@ class InstallerTest extends \PHPUnit_Framework_TestCase
/**
* @magentoDbIsolation enabled
+ * @magentoAppArea install
*/
public function testCreateAdministrator()
{
@@ -166,7 +167,7 @@ class InstallerTest extends \PHPUnit_Framework_TestCase
/**
* @magentoAppIsolation enabled
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_disabled.php
+ * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_disabled.php
*/
public function testFinish()
{
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Newsletter/Queue/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Queue/Edit/FormTest.php
similarity index 90%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Newsletter/Queue/Edit/FormTest.php
rename to dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Queue/Edit/FormTest.php
index 4bb4a1e8eab..5dfb9682a01 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Newsletter/Queue/Edit/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/Queue/Edit/FormTest.php
@@ -25,10 +25,10 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Newsletter\Queue\Edit;
+namespace Magento\Newsletter\Block\Adminhtml\Queue\Edit;
/**
- * Test class for \Magento\Adminhtml\Block\Newsletter\Queue\Edit\Form
+ * Test class for \Magento\Newsletter\Block\Adminhtml\Queue\Edit\Form
* @magentoAppArea adminhtml
*/
class FormTest extends \PHPUnit_Framework_TestCase
@@ -45,9 +45,9 @@ class FormTest extends \PHPUnit_Framework_TestCase
->get('Magento\Config\ScopeInterface')
->setCurrentScope(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
$block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->create('Magento\Adminhtml\Block\Newsletter\Queue\Edit\Form');
+ ->create('Magento\Newsletter\Block\Adminhtml\Queue\Edit\Form');
$prepareFormMethod = new \ReflectionMethod(
- 'Magento\Adminhtml\Block\Newsletter\Queue\Edit\Form', '_prepareForm');
+ 'Magento\Newsletter\Block\Adminhtml\Queue\Edit\Form', '_prepareForm');
$prepareFormMethod->setAccessible(true);
$queue = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Newsletter\Model\Queue');
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Newsletter/SubscriberTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/SubscriberTest.php
similarity index 89%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Newsletter/SubscriberTest.php
rename to dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/SubscriberTest.php
index 15a98eea39f..5a4215b2485 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Newsletter/SubscriberTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Block/Adminhtml/SubscriberTest.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Newsletter;
+namespace Magento\Newsletter\Block\Adminhtml;
/**
* @magentoAppArea adminhtml
@@ -36,8 +36,8 @@ class SubscriberTest 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\Newsletter\Subscriber */
- $block = $layout->createBlock('Magento\Adminhtml\Block\Newsletter\Subscriber', 'block');
+ /** @var $block \Magento\Newsletter\Block\Adminhtml\Subscriber */
+ $block = $layout->createBlock('Magento\Newsletter\Block\Adminhtml\Subscriber', 'block');
/** @var $childBlock \Magento\View\Block\Template */
$childBlock = $layout->addBlock('Magento\View\Block\Template', 'grid', 'block');
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/NewsletterQueueTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php
similarity index 93%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Controller/NewsletterQueueTest.php
rename to dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php
index 89c3d5bf586..57eb3281b75 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/NewsletterQueueTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterQueueTest.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Controller;
+namespace Magento\Newsletter\Controller\Adminhtml;
/**
* @magentoAppArea adminhtml
@@ -54,7 +54,7 @@ class NewsletterQueueTest extends \Magento\Backend\Utility\Controller
}
/**
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/newsletter_sample.php
+ * @magentoDataFixture Magento/Newsletter/_files/newsletter_sample.php
* @magentoAppIsolation disabled
*/
public function testSaveActionQueueTemplateAndVerifySuccessMessage()
@@ -66,7 +66,7 @@ class NewsletterQueueTest extends \Magento\Backend\Utility\Controller
$this->getRequest()->setPost($postForQueue);
$this->_model->loadByCode('some_unique_code');
$this->getRequest()->setParam('template_id', $this->_model->getId());
- $this->dispatch('backend/admin/newsletter_queue/save');
+ $this->dispatch('backend/newsletter/queue/save');
/**
* Check that errors was generated and set to session
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/NewsletterTemplateTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php
similarity index 91%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Controller/NewsletterTemplateTest.php
rename to dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php
index fe8d41fd44a..cbe0015142a 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Controller/NewsletterTemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Controller;
+namespace Magento\Newsletter\Controller\Adminhtml;
/**
* @magentoAppArea adminhtml
@@ -68,7 +68,7 @@ class NewsletterTemplateTest extends \Magento\Backend\Utility\Controller
{
$this->_model->loadByCode('some_unique_code');
$this->getRequest()->setParam('id', $this->_model->getId());
- $this->dispatch('backend/admin/newsletter_template/save');
+ $this->dispatch('backend/newsletter/template/save');
/**
* Check that errors was generated and set to session
*/
@@ -83,13 +83,13 @@ class NewsletterTemplateTest extends \Magento\Backend\Utility\Controller
/**
* @magentoAppIsolation enabled
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/newsletter_sample.php
+ * @magentoDataFixture Magento/Newsletter/_files/newsletter_sample.php
*/
public function testSaveActionEditTemplateAndVerifySuccessMessage()
{
$this->_model->loadByCode('some_unique_code');
$this->getRequest()->setParam('id', $this->_model->getId());
- $this->dispatch('backend/admin/newsletter_template/save');
+ $this->dispatch('backend/newsletter/template/save');
/**
* Check that errors was generated and set to session
@@ -116,7 +116,7 @@ class NewsletterTemplateTest extends \Magento\Backend\Utility\Controller
'sender_name'=>'Test Sender Name',
'text'=>'Template Content');
$this->getRequest()->setPost($post);
- $this->dispatch('backend/admin/newsletter_template/save');
+ $this->dispatch('backend/newsletter/template/save');
/**
* Check that errors was generated and set to session
@@ -131,13 +131,13 @@ class NewsletterTemplateTest extends \Magento\Backend\Utility\Controller
/**
* @magentoAppIsolation enabled
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/newsletter_sample.php
+ * @magentoDataFixture Magento/Newsletter/_files/newsletter_sample.php
*/
public function testDeleteActionTemplateAndVerifySuccessMessage()
{
$this->_model->loadByCode('some_unique_code');
$this->getRequest()->setParam('id', $this->_model->getId());
- $this->dispatch('backend/admin/newsletter_template/delete');
+ $this->dispatch('backend/newsletter/template/delete');
/**
* Check that errors was generated and set to session
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/QueueTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/QueueTest.php
index 7922f12618c..0653284ae5c 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Model/QueueTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Model/QueueTest.php
@@ -51,7 +51,7 @@ class QueueTest extends \PHPUnit_Framework_TestCase
$app->loadArea(\Magento\Core\Model\App\Area::AREA_FRONTEND);
$collection = $objectManager->create('Magento\Core\Model\Resource\Theme\Collection');
- $themeId = $collection->getThemeByFullPath('frontend/magento_demo')->getId();
+ $themeId = $collection->getThemeByFullPath('frontend/magento_blank')->getId();
/** @var $storeManager \Magento\Core\Model\StoreManagerInterface */
$storeManager = $objectManager->get('Magento\Core\Model\StoreManagerInterface');
$storeManager->getStore('fixturestore')->setConfig(
@@ -65,7 +65,7 @@ class QueueTest extends \PHPUnit_Framework_TestCase
$this->stringEndsWith('/static/frontend/magento_plushe/en_US/images/logo.gif')
);
$subscriberTwo->expects($this->once())->method('setBodyHTML')->with(
- $this->stringEndsWith('/static/frontend/magento_demo/de_DE/images/logo.gif')
+ $this->stringEndsWith('/static/frontend/magento_blank/de_DE/images/logo.gif')
);
/** @var $filter \Magento\Newsletter\Model\Template\Filter */
$filter = $objectManager->get('Magento\Newsletter\Model\Template\Filter');
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php
index 0bed8ed1da3..cd86bcf71fa 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php
@@ -46,7 +46,6 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
/**
* This test expects next themes for areas:
* install/design/theme/full_name magento_basic
- * adminhtml/design/theme/full_name magento_basic
* current_store design/theme/full_name magento_iphone
* fixturestore_store design/theme/full_name magento_blank
*
@@ -57,7 +56,7 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
{
$this->markTestIncomplete('Test partially fails bc of MAGETWO-557.');
$this->_model->setTemplateText('{{view url="Magento_Page::favicon.ico"}}');
- $this->assertStringEndsWith('theme/frontend/magento_demo/en_US/Magento_Page/favicon.ico',
+ $this->assertStringEndsWith('theme/frontend/magento_blank/en_US/Magento_Page/favicon.ico',
$this->_model->getProcessedTemplate()
);
$this->_model->emulateDesign($store, $area);
@@ -73,7 +72,7 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
{
return array(
'install' => array('install', 'default', 'magento_demo'),
- 'backend' => array('adminhtml', 'admin', 'magento_basic'),
+ 'backend' => array('adminhtml', 'admin', 'magento_backend'),
'frontend' => array('frontend', 'default', 'magento_iphone'),
'frontend store' => array('frontend', 'fixturestore', 'magento_blank'),
);
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/newsletter_sample.php b/dev/tests/integration/testsuite/Magento/Newsletter/_files/newsletter_sample.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/controllers/_files/newsletter_sample.php
rename to dev/tests/integration/testsuite/Magento/Newsletter/_files/newsletter_sample.php
diff --git a/dev/tests/integration/testsuite/Magento/Object/Copy/Config/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Object/Copy/Config/ReaderTest.php
index 22482a4b2c2..23caad9aa86 100644
--- a/dev/tests/integration/testsuite/Magento/Object/Copy/Config/ReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Object/Copy/Config/ReaderTest.php
@@ -26,7 +26,7 @@
namespace Magento\Object\Copy\Config;
/**
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_disabled.php
+ * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_disabled.php
*/
class ReaderTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/integration/testsuite/Magento/Page/Block/Html/HeadTest.php b/dev/tests/integration/testsuite/Magento/Page/Block/Html/HeadTest.php
index 073c9867e53..0ce75e260b5 100644
--- a/dev/tests/integration/testsuite/Magento/Page/Block/Html/HeadTest.php
+++ b/dev/tests/integration/testsuite/Magento/Page/Block/Html/HeadTest.php
@@ -39,7 +39,7 @@ class HeadTest extends \PHPUnit_Framework_TestCase
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\App\State')
->setAreaCode('frontend');
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\DesignInterface')
- ->setDesignTheme('magento_demo');
+ ->setDesignTheme('magento_blank');
$this->_block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
->createBlock('Magento\Page\Block\Html\Head');
}
@@ -118,12 +118,12 @@ class HeadTest extends \PHPUnit_Framework_TestCase
. "\n"
. '<script type="text/javascript" src="http://localhost/pub/lib/varien/js.js"></script>' . "\n"
. '<script type="text/javascript" '
- . 'src="http://localhost/pub/static/frontend/magento_demo/en_US/Magento_Bundle/bundle.js">'
+ . 'src="http://localhost/pub/static/frontend/magento_blank/en_US/Magento_Bundle/bundle.js">'
. '</script>' . "\n"
. '<link rel="stylesheet" type="text/css" media="all"'
. ' href="http://localhost/pub/lib/tiny_mce/themes/advanced/skins/default/ui.css" />' . "\n"
. '<link rel="stylesheet" type="text/css" media="print" '
- . 'href="http://localhost/pub/static/frontend/magento_demo/en_US/css/styles.css" />'
+ . 'href="http://localhost/pub/static/frontend/magento_blank/en_US/css/styles.css" />'
. "\n"
. '<link rel="next" href="http://localhost/index.php/category.html" />' . "\n"
. '<!--[if lt IE 7]>' . "\n"
@@ -223,7 +223,7 @@ class HeadTest extends \PHPUnit_Framework_TestCase
. '<link rel="stylesheet" type="text/css" media="all"'
. ' href="http://localhost/index.php/core/index/notfound" />' . "\n"
. '<link rel="stylesheet" type="text/css" media="print"'
- . ' href="http://localhost/pub/static/frontend/magento_demo/en_US/css/styles.css" />'
+ . ' href="http://localhost/pub/static/frontend/magento_blank/en_US/css/styles.css" />'
. "\n", $this->_block->getCssJsHtml());
}
diff --git a/dev/tests/integration/testsuite/Magento/Payment/Block/InfoTest.php b/dev/tests/integration/testsuite/Magento/Payment/Block/InfoTest.php
index 0c62e072adf..ede0e33dfaa 100644
--- a/dev/tests/integration/testsuite/Magento/Payment/Block/InfoTest.php
+++ b/dev/tests/integration/testsuite/Magento/Payment/Block/InfoTest.php
@@ -32,11 +32,10 @@ class InfoTest extends \PHPUnit_Framework_TestCase
/**
* @magentoConfigFixture current_store payment/banktransfer/title Bank Method Title
* @magentoConfigFixture current_store payment/checkmo/title Checkmo Title Of The Method
+ * @magentoAppArea adminhtml
*/
public function testGetChildPdfAsArray()
{
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\App\State')
- ->setAreaCode(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
/** @var $layout \Magento\Core\Model\Layout */
$layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface');
$block = $layout->createBlock('Magento\Payment\Block\Info', 'block');
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php
index 516719a44c0..a726fadbc87 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php
@@ -32,11 +32,9 @@ class ExpressTest extends \Magento\TestFramework\TestCase\AbstractController
*/
public function testReviewAction()
{
- $this->markTestSkipped('There is a dependency that needs to be identified for this test');
$quote = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->create('Magento\Sales\Model\Quote');
$quote->load('test01', 'reserved_order_id');
- echo "Quote ID: {$quote->getId}\n";
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Checkout\Model\Session')
->setQuoteId($quote->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Filter/FormTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Filter/FormTest.php
similarity index 87%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Filter/FormTest.php
rename to dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Filter/FormTest.php
index 09b6fb1b156..b508e7fb61c 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Filter/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Filter/FormTest.php
@@ -25,10 +25,10 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Report\Filter;
+namespace Magento\Reports\Block\Adminhtml\Filter;
/**
- * Test class for \Magento\Adminhtml\Block\Report\Filter\Form
+ * Test class for \Magento\Reports\Block\Adminhtml\Filter\Form
* @magentoAppArea adminhtml
*/
class FormTest extends \PHPUnit_Framework_TestCase
@@ -42,9 +42,9 @@ class FormTest extends \PHPUnit_Framework_TestCase
->setArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE)
->setDefaultDesignTheme();
$layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Core\Model\Layout');
- $block = $layout->addBlock('Magento\Adminhtml\Block\Report\Filter\Form');
+ $block = $layout->addBlock('Magento\Reports\Block\Adminhtml\Filter\Form');
$prepareFormMethod = new \ReflectionMethod(
- 'Magento\Adminhtml\Block\Report\Filter\Form', '_prepareForm');
+ 'Magento\Reports\Block\Adminhtml\Filter\Form', '_prepareForm');
$prepareFormMethod->setAccessible(true);
$prepareFormMethod->invoke($block);
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Bestsellers/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Bestsellers/GridTest.php
similarity index 87%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Bestsellers/GridTest.php
rename to dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Bestsellers/GridTest.php
index 4472f31e9d6..a2b56db8c24 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Bestsellers/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Bestsellers/GridTest.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Report\Sales\Bestsellers;
+namespace Magento\Reports\Block\Adminhtml\Sales\Bestsellers;
/**
* @magentoAppArea adminhtml
@@ -33,7 +33,7 @@ namespace Magento\Adminhtml\Block\Report\Sales\Bestsellers;
class GridTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Adminhtml\Block\Report\Sales\Bestsellers\Grid
+ * @var \Magento\Reports\Block\Adminhtml\Sales\Bestsellers\Grid
*/
protected $_block;
@@ -41,7 +41,7 @@ class GridTest extends \PHPUnit_Framework_TestCase
{
parent::setUp();
$this->_block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
- ->createBlock('Magento\Adminhtml\Block\Report\Sales\Bestsellers\Grid');
+ ->createBlock('Magento\Reports\Block\Adminhtml\Sales\Bestsellers\Grid');
}
public function testGetResourceCollectionName()
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Coupons/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Coupons/GridTest.php
similarity index 91%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Coupons/GridTest.php
rename to dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Coupons/GridTest.php
index f7befb8871b..513db339755 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Coupons/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Coupons/GridTest.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Report\Sales\Coupons;
+namespace Magento\Reports\Block\Adminhtml\Sales\Coupons;
/**
* @magentoAppArea adminhtml
@@ -36,12 +36,12 @@ class GridTest extends \PHPUnit_Framework_TestCase
* Creates and inits block
*
* @param string|null $reportType
- * @return \Magento\Adminhtml\Block\Report\Sales\Coupons\Grid
+ * @return \Magento\Reports\Block\Adminhtml\Sales\Coupons\Grid
*/
protected function _createBlock($reportType = null)
{
$block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
- ->createBlock('Magento\Adminhtml\Block\Report\Sales\Coupons\Grid');
+ ->createBlock('Magento\Reports\Block\Adminhtml\Sales\Coupons\Grid');
$filterData = new \Magento\Object();
if ($reportType) {
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Invoiced/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Invoiced/GridTest.php
similarity index 91%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Invoiced/GridTest.php
rename to dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Invoiced/GridTest.php
index 5e39ca592de..a7ef2b3cefb 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Invoiced/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Invoiced/GridTest.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Report\Sales\Invoiced;
+namespace Magento\Reports\Block\Adminhtml\Sales\Invoiced;
/**
* @magentoAppArea adminhtml
@@ -36,12 +36,12 @@ class GridTest extends \PHPUnit_Framework_TestCase
* Creates and inits block
*
* @param string|null $reportType
- * @return \Magento\Adminhtml\Block\Report\Sales\Invoiced\Grid
+ * @return \Magento\Reports\Block\Adminhtml\Sales\Invoiced\Grid
*/
protected function _createBlock($reportType = null)
{
$block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
- ->createBlock('Magento\Adminhtml\Block\Report\Sales\Invoiced\Grid');
+ ->createBlock('Magento\Reports\Block\Adminhtml\Sales\Invoiced\Grid');
$filterData = new \Magento\Object();
if ($reportType) {
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Refunded/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Refunded/GridTest.php
similarity index 91%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Refunded/GridTest.php
rename to dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Refunded/GridTest.php
index ad6d42391ae..2f290a9c124 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Refunded/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Refunded/GridTest.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Report\Sales\Refunded;
+namespace Magento\Reports\Block\Adminhtml\Sales\Refunded;
/**
* @magentoAppArea adminhtml
@@ -36,12 +36,12 @@ class GridTest extends \PHPUnit_Framework_TestCase
* Creates and inits block
*
* @param string|null $reportType
- * @return \Magento\Adminhtml\Block\Report\Sales\Refunded\Grid
+ * @return \Magento\Reports\Block\Adminhtml\Sales\Refunded\Grid
*/
protected function _createBlock($reportType = null)
{
$block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
- ->createBlock('Magento\Adminhtml\Block\Report\Sales\Refunded\Grid');
+ ->createBlock('Magento\Reports\Block\Adminhtml\Sales\Refunded\Grid');
$filterData = new \Magento\Object();
if ($reportType) {
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Sales/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Sales/GridTest.php
similarity index 92%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Sales/GridTest.php
rename to dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Sales/GridTest.php
index e6d091edb27..0fa577c7919 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Sales/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Sales/GridTest.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Report\Sales\Sales;
+namespace Magento\Reports\Block\Adminhtml\Sales\Sales;
/**
* @magentoAppArea adminhtml
@@ -36,12 +36,12 @@ class GridTest extends \PHPUnit_Framework_TestCase
* Creates and inits block
*
* @param string|null $reportType
- * @return \Magento\Adminhtml\Block\Report\Sales\Sales\Grid
+ * @return \Magento\Reports\Block\Adminhtml\Sales\Sales\Grid
*/
protected function _createBlock($reportType = null)
{
$block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
- ->createBlock('Magento\Adminhtml\Block\Report\Sales\Sales\Grid');
+ ->createBlock('Magento\Reports\Block\Adminhtml\Sales\Sales\Grid');
$filterData = new \Magento\Object();
if ($reportType) {
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Shipping/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Shipping/GridTest.php
similarity index 91%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Shipping/GridTest.php
rename to dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Shipping/GridTest.php
index 7f1de78a63a..c41c8badf1c 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Shipping/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Shipping/GridTest.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Report\Sales\Shipping;
+namespace Magento\Reports\Block\Adminhtml\Sales\Shipping;
/**
* @magentoAppArea adminhtml
@@ -36,12 +36,12 @@ class GridTest extends \PHPUnit_Framework_TestCase
* Creates and inits block
*
* @param string|null $reportType
- * @return \Magento\Adminhtml\Block\Report\Sales\Shipping\Grid
+ * @return \Magento\Reports\Block\Adminhtml\Sales\Shipping\Grid
*/
protected function _createBlock($reportType = null)
{
$block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
- ->createBlock('Magento\Adminhtml\Block\Report\Sales\Shipping\Grid');
+ ->createBlock('Magento\Reports\Block\Adminhtml\Sales\Shipping\Grid');
$filterData = new \Magento\Object();
if ($reportType) {
diff --git a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Tax/GridTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Tax/GridTest.php
similarity index 92%
rename from dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Tax/GridTest.php
rename to dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Tax/GridTest.php
index db75c6a0635..e997e4ca9ed 100644
--- a/dev/tests/integration/testsuite/Magento/Adminhtml/Block/Report/Sales/Tax/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Sales/Tax/GridTest.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Block\Report\Sales\Tax;
+namespace Magento\Reports\Block\Adminhtml\Sales\Tax;
/**
* @magentoAppArea adminhtml
@@ -36,12 +36,12 @@ class GridTest extends \PHPUnit_Framework_TestCase
* Creates and inits block
*
* @param string|null $reportType
- * @return \Magento\Adminhtml\Block\Report\Sales\Tax\Grid
+ * @return \Magento\Reports\Block\Adminhtml\Sales\Tax\Grid
*/
protected function _createBlock($reportType = null)
{
$block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\LayoutInterface')
- ->createBlock('Magento\Adminhtml\Block\Report\Sales\Tax\Grid');
+ ->createBlock('Magento\Reports\Block\Adminhtml\Sales\Tax\Grid');
$filterData = new \Magento\Object();
if ($reportType) {
diff --git a/dev/tests/integration/testsuite/Magento/Reports/Model/Resource/Report/Product/Viewed/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Reports/Model/Resource/Report/Product/Viewed/CollectionTest.php
index 2cdcd80295e..32d2ef25633 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/Model/Resource/Report/Product/Viewed/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Model/Resource/Report/Product/Viewed/CollectionTest.php
@@ -52,7 +52,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
{
$expectedResult = array(1 => 3, 2 => 1, 21 => 2);
$actualResult = array();
- /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+ /** @var \Magento\Reports\Model\Item $reportItem */
foreach ($this->_collection->getItems() as $reportItem) {
$actualResult[$reportItem->getData('product_id')] = $reportItem->getData('views_num');
}
diff --git a/dev/tests/integration/testsuite/Magento/Rss/Controller/CatalogTest.php b/dev/tests/integration/testsuite/Magento/Rss/Controller/CatalogTest.php
index 1c65ad9656b..b20f0c47fbe 100644
--- a/dev/tests/integration/testsuite/Magento/Rss/Controller/CatalogTest.php
+++ b/dev/tests/integration/testsuite/Magento/Rss/Controller/CatalogTest.php
@@ -85,6 +85,7 @@ class CatalogTest extends \Magento\TestFramework\TestCase\AbstractController
/**
* @dataProvider authorizationFailedDataProvider
+ * @magentoAppArea adminhtml
*/
public function testAuthorizationFailed($action)
{
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php
index b815f224dc4..7b9ea090d7e 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/CreateTest.php
@@ -97,6 +97,7 @@ class CreateTest extends \Magento\Backend\Utility\Controller
/**
* @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoAppArea adminhtml
*/
public function testIndexAction()
{
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Bestsellers/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Bestsellers/CollectionTest.php
index e5d8d2acc02..e96f2ff69b9 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Bestsellers/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Bestsellers/CollectionTest.php
@@ -50,7 +50,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
{
$expectedResult = array(1 => 2);
$actualResult = array();
- /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+ /** @var \Magento\Reports\Model\Item $reportItem */
foreach ($this->_collection->getItems() as $reportItem) {
$actualResult[$reportItem->getData('product_id')] = $reportItem->getData('qty_ordered');
}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Invoiced/Collection/InvoicedTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Invoiced/Collection/InvoicedTest.php
index 6f708abc830..8c9d0fe7d68 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Invoiced/Collection/InvoicedTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Invoiced/Collection/InvoicedTest.php
@@ -52,7 +52,7 @@ class InvoicedTest extends \PHPUnit_Framework_TestCase
array('orders_count' => 1, 'orders_invoiced' => 1),
);
$actualResult = array();
- /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+ /** @var \Magento\Reports\Model\Item $reportItem */
foreach ($this->_collection->getItems() as $reportItem) {
$actualResult[] = array(
'orders_count' => $reportItem->getData('orders_count'),
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Invoiced/Collection/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Invoiced/Collection/OrderTest.php
index 68c026af8bf..cfd74e3f251 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Invoiced/Collection/OrderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Invoiced/Collection/OrderTest.php
@@ -52,7 +52,7 @@ class OrderTest extends \PHPUnit_Framework_TestCase
array('orders_count' => 1, 'orders_invoiced' => 1),
);
$actualResult = array();
- /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+ /** @var \Magento\Reports\Model\Item $reportItem */
foreach ($this->_collection->getItems() as $reportItem) {
$actualResult[] = array(
'orders_count' => $reportItem->getData('orders_count'),
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Order/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Order/CollectionTest.php
index 27255c07b1c..20df0848a27 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Order/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Order/CollectionTest.php
@@ -52,7 +52,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
array('orders_count' => 1, 'total_qty_ordered' => 2, 'total_qty_invoiced' => 2),
);
$actualResult = array();
- /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+ /** @var \Magento\Reports\Model\Item $reportItem */
foreach ($this->_collection->getItems() as $reportItem) {
$actualResult[] = array_intersect_key($reportItem->getData(), $expectedResult[0]);
}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Refunded/Collection/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Refunded/Collection/OrderTest.php
index 83dc8a3cd12..a235c1019e6 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Refunded/Collection/OrderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Refunded/Collection/OrderTest.php
@@ -57,7 +57,7 @@ class OrderTest extends \PHPUnit_Framework_TestCase
),
);
$actualResult = array();
- /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+ /** @var \Magento\Reports\Model\Item $reportItem */
foreach ($this->_collection->getItems() as $reportItem) {
$actualResult[] = array_intersect_key($reportItem->getData(), $expectedResult[0]);
}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Refunded/Collection/RefundedTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Refunded/Collection/RefundedTest.php
index 8a6b1b7b708..f2e94502186 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Refunded/Collection/RefundedTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Refunded/Collection/RefundedTest.php
@@ -57,7 +57,7 @@ class RefundedTest extends \PHPUnit_Framework_TestCase
),
);
$actualResult = array();
- /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+ /** @var \Magento\Reports\Model\Item $reportItem */
foreach ($this->_collection->getItems() as $reportItem) {
$actualResult[] = array_intersect_key($reportItem->getData(), $expectedResult[0]);
}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Shipping/Collection/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Shipping/Collection/OrderTest.php
index b3891565224..865b37dc685 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Shipping/Collection/OrderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Shipping/Collection/OrderTest.php
@@ -56,7 +56,7 @@ class OrderTest extends \PHPUnit_Framework_TestCase
),
);
$actualResult = array();
- /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+ /** @var \Magento\Reports\Model\Item $reportItem */
foreach ($this->_collection->getItems() as $reportItem) {
$actualResult[] = array_intersect_key($reportItem->getData(), $expectedResult[0]);
}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Shipping/Collection/ShipmentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Shipping/Collection/ShipmentTest.php
index b9c1c160264..2cb998a6c05 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Shipping/Collection/ShipmentTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/Report/Shipping/Collection/ShipmentTest.php
@@ -56,7 +56,7 @@ class ShipmentTest extends \PHPUnit_Framework_TestCase
),
);
$actualResult = array();
- /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+ /** @var \Magento\Reports\Model\Item $reportItem */
foreach ($this->_collection->getItems() as $reportItem) {
$actualResult[] = array_intersect_key($reportItem->getData(), $expectedResult[0]);
}
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Resource/Report/CollectionTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Resource/Report/CollectionTest.php
index 4b4c1db0835..fe3ece45992 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Resource/Report/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Resource/Report/CollectionTest.php
@@ -55,7 +55,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
),
);
$actualResult = array();
- /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+ /** @var \Magento\Reports\Model\Item $reportItem */
foreach ($this->_collection->getItems() as $reportItem) {
$actualResult[] = array_intersect_key($reportItem->getData(), $expectedResult[0]);
}
diff --git a/dev/tests/integration/testsuite/Magento/Sitemap/Helper/DataTest.php b/dev/tests/integration/testsuite/Magento/Sitemap/Helper/DataTest.php
index c4fa96c57b9..42238147942 100644
--- a/dev/tests/integration/testsuite/Magento/Sitemap/Helper/DataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sitemap/Helper/DataTest.php
@@ -47,7 +47,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
{
$this->assertEquals(
50000,
- $this->_helper->getMaximumLinesNumber(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+ $this->_helper->getMaximumLinesNumber(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
);
$this->assertEquals(
10,
@@ -61,7 +61,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
public function testGetMaximumFileSize()
{
$this->assertEquals(
- 10485760, $this->_helper->getMaximumFileSize(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+ 10485760, $this->_helper->getMaximumFileSize(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
);
$this->assertEquals(
1024,
@@ -75,7 +75,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
public function testGetCategoryChangefreq()
{
$this->assertEquals(
- 'daily', $this->_helper->getCategoryChangefreq(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+ 'daily', $this->_helper->getCategoryChangefreq(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
);
$this->assertEquals(
'montly', $this->_helper->getCategoryChangefreq(\Magento\Core\Model\AppInterface::DISTRO_STORE_ID)
@@ -88,7 +88,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
public function testGetProductChangefreq()
{
$this->assertEquals(
- 'daily', $this->_helper->getProductChangefreq(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+ 'daily', $this->_helper->getProductChangefreq(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
);
$this->assertEquals(
'montly', $this->_helper->getProductChangefreq(\Magento\Core\Model\AppInterface::DISTRO_STORE_ID)
@@ -102,7 +102,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
{
$this->assertEquals(
'daily',
- $this->_helper->getPageChangefreq(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+ $this->_helper->getPageChangefreq(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
);
$this->assertEquals(
'montly',
@@ -115,7 +115,10 @@ class DataTest extends \PHPUnit_Framework_TestCase
*/
public function testGetCategoryPriority()
{
- $this->assertEquals(0.5, $this->_helper->getCategoryPriority(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID));
+ $this->assertEquals(
+ 0.5,
+ $this->_helper->getCategoryPriority(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
+ );
$this->assertEquals(
100,
$this->_helper->getCategoryPriority(\Magento\Core\Model\AppInterface::DISTRO_STORE_ID)
@@ -127,7 +130,10 @@ class DataTest extends \PHPUnit_Framework_TestCase
*/
public function testGetProductPriority()
{
- $this->assertEquals(1, $this->_helper->getProductPriority(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID));
+ $this->assertEquals(
+ 1,
+ $this->_helper->getProductPriority(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
+ );
$this->assertEquals(100, $this->_helper->getProductPriority(\Magento\Core\Model\AppInterface::DISTRO_STORE_ID));
}
@@ -136,7 +142,10 @@ class DataTest extends \PHPUnit_Framework_TestCase
*/
public function testGetPagePriority()
{
- $this->assertEquals(0.25, $this->_helper->getPagePriority(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID));
+ $this->assertEquals(
+ 0.25,
+ $this->_helper->getPagePriority(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
+ );
$this->assertEquals(100, $this->_helper->getPagePriority(\Magento\Core\Model\AppInterface::DISTRO_STORE_ID));
}
@@ -147,7 +156,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
{
$this->assertEquals(
0,
- $this->_helper->getEnableSubmissionRobots(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+ $this->_helper->getEnableSubmissionRobots(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
);
$this->assertEquals(
1, $this->_helper->getEnableSubmissionRobots(\Magento\Core\Model\AppInterface::DISTRO_STORE_ID)
@@ -160,7 +169,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
public function testGetProductImageIncludePolicy()
{
$this->assertEquals(
- 'all', $this->_helper->getProductImageIncludePolicy(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID)
+ 'all', $this->_helper->getProductImageIncludePolicy(\Magento\Core\Model\Store::DEFAULT_STORE_ID)
);
$this->assertEquals(
'base', $this->_helper->getProductImageIncludePolicy(\Magento\Core\Model\AppInterface::DISTRO_STORE_ID)
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/Resource/Report/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/Resource/Report/CollectionTest.php
index 02a81decdb1..f89df7a918f 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/Resource/Report/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/Resource/Report/CollectionTest.php
@@ -57,7 +57,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
),
);
$actualResult = array();
- /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+ /** @var \Magento\Reports\Model\Item $reportItem */
foreach ($this->_collection->getItems() as $reportItem) {
$actualResult[] = array_intersect_key($reportItem->getData(), $expectedResult[0]);
}
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Payment/MethodsTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Payment/MethodsTest.php
index ad6e00c2b1c..437a66a7e32 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Payment/MethodsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Payment/MethodsTest.php
@@ -66,7 +66,7 @@ class MethodsTest extends \PHPUnit_Framework_TestCase
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->get('Magento\Core\Model\StoreManagerInterface')
->getStore()
- ->setId(\Magento\Core\Model\AppInterface::ADMIN_STORE_ID);
+ ->setId(\Magento\Core\Model\Store::DEFAULT_STORE_ID);
$block->setArea('adminhtml');
$this->assertFileExists($block->getTemplateFile(), $message);
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php
index 42cd9dcbfb8..5781111f437 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php
@@ -49,8 +49,9 @@ class LayoutFilesTest extends \PHPUnit_Framework_TestCase
/**
* @dataProvider layoutTypesDataProvider
*/
- public function testLayoutTypes($layout)
+ public function testLayoutTypes($area, $layout)
{
+ \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\App')->loadArea($area);
$layout = simplexml_load_file(
$layout,
'Magento\View\Layout\Element'
@@ -79,7 +80,15 @@ class LayoutFilesTest extends \PHPUnit_Framework_TestCase
*/
public function layoutTypesDataProvider()
{
- return \Magento\TestFramework\Utility\Files::init()->getLayoutFiles();
+ $areas = array('adminhtml', 'frontend', 'install', 'email');
+ $data = array();
+ foreach ($areas as $area) {
+ $layoutFiles = \Magento\TestFramework\Utility\Files::init()->getLayoutFiles(array('area' => $area), false);
+ foreach ($layoutFiles as $layoutFile) {
+ $data[] = array($area, $layoutFile);
+ }
+ }
+ return $data;
}
/**
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Theme/ViewFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Theme/ViewFilesTest.php
index fb5e3c023b9..d8cbb573f38 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Theme/ViewFilesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Theme/ViewFilesTest.php
@@ -45,7 +45,6 @@ class ViewFilesTest extends \Magento\TestFramework\TestCase\AbstractIntegrity
* @throws \PHPUnit_Framework_AssertionFailedError|Exception
*/
function ($area, $themeId, $file) {
- $this->_markTestIncompleteDueToBug($area, $file);
try {
$params = array('area' => $area, 'themeId' => $themeId);
$viewFile = \Magento\TestFramework\Helper\Bootstrap::getObjectmanager()
@@ -84,21 +83,6 @@ class ViewFilesTest extends \Magento\TestFramework\TestCase\AbstractIntegrity
);
}
- /**
- * This dummy method was introduced to circumvent cyclomatic complexity check
- *
- * @param string $area
- * @param string $file
- */
- protected function _markTestIncompleteDueToBug($area, $file)
- {
- if ($area === 'frontend' && in_array($file, array('js/selectivizr-min.js', 'css/styles.css'))
- || $area === 'adminhtml' && in_array($file, array('mui/reset.css'))
- ) {
- $this->markTestIncomplete('MAGETWO-9806, MAGETWO-12325');
- }
- }
-
/**
* Analyze path to a file in CSS url() directive and add the original CSS-file relative path to it
*
diff --git a/dev/tests/integration/testsuite/Magento/User/Helper/DataTest.php b/dev/tests/integration/testsuite/Magento/User/Helper/DataTest.php
index c48ae2c58c2..2a8d3503fa8 100644
--- a/dev/tests/integration/testsuite/Magento/User/Helper/DataTest.php
+++ b/dev/tests/integration/testsuite/Magento/User/Helper/DataTest.php
@@ -60,13 +60,13 @@ class DataTest extends \PHPUnit_Framework_TestCase
*/
public function testGetResetPasswordLinkExpirationPeriod()
{
- /** @var $configModel \Magento\Core\Model\Config */
- $configModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\Config');
+ /** @var $configModel \Magento\Backend\App\ConfigInterface */
+ $configModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ ->get('Magento\Backend\App\ConfigInterface');
$this->assertEquals(
1,
(int) $configModel->getValue(
- \Magento\User\Helper\Data::XML_PATH_ADMIN_RESET_PASSWORD_LINK_EXPIRATION_PERIOD,
- 'default'
+ \Magento\User\Helper\Data::XML_PATH_ADMIN_RESET_PASSWORD_LINK_EXPIRATION_PERIOD
));
}
}
diff --git a/dev/tests/integration/testsuite/Magento/User/Model/Resource/Role/Grid/CollectionTest.php b/dev/tests/integration/testsuite/Magento/User/Model/Resource/Role/Grid/CollectionTest.php
index cbca65c9e56..43ec9413f9b 100644
--- a/dev/tests/integration/testsuite/Magento/User/Model/Resource/Role/Grid/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/User/Model/Resource/Role/Grid/CollectionTest.php
@@ -49,7 +49,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
),
);
$actualResult = array();
- /** @var \Magento\Adminhtml\Model\Report\Item $reportItem */
+ /** @var \Magento\Reports\Model\Item $reportItem */
foreach ($this->_collection->getItems() as $reportItem) {
$actualResult[] = array_intersect_key($reportItem->getData(), $expectedResult[0]);
}
diff --git a/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php b/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
index 62868e97866..31d3da30607 100644
--- a/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
+++ b/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
@@ -173,15 +173,15 @@ class UserTest extends \PHPUnit_Framework_TestCase
public function testSendPasswordResetConfirmationEmail()
{
- /** @var $storeConfig \Magento\Core\Model\Store\Config */
- $storeConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->get('Magento\Core\Model\Store\Config');
+ /** @var $config \Magento\Backend\App\ConfigInterface */
+ $config = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+ ->get('Magento\Backend\App\ConfigInterface');
$mailer = $this->getMock('Magento\Email\Model\Template\Mailer', array(), array(
$this->getMock('Magento\Email\Model\TemplateFactory', array(), array(), '', false)
));
$mailer->expects($this->once())
->method('setTemplateId')
- ->with($storeConfig->getConfig(\Magento\User\Model\User::XML_PATH_FORGOT_EMAIL_TEMPLATE));
+ ->with($config->getValue(\Magento\User\Model\User::XML_PATH_FORGOT_EMAIL_TEMPLATE));
$mailer->expects($this->once())
->method('send');
$this->_model->setMailer($mailer);
@@ -205,7 +205,7 @@ class UserTest extends \PHPUnit_Framework_TestCase
/**
* @magentoAppIsolation enabled
- * @magentoConfigFixture current_store admin/security/use_case_sensitive_login 1
+ * @magentoAdminConfigFixture admin/security/use_case_sensitive_login 1
*/
public function testAuthenticate()
{
diff --git a/dev/tests/integration/testsuite/Magento/User/_files/dummy_user.php b/dev/tests/integration/testsuite/Magento/User/_files/dummy_user.php
index c2b28c7998a..f316aa6387f 100644
--- a/dev/tests/integration/testsuite/Magento/User/_files/dummy_user.php
+++ b/dev/tests/integration/testsuite/Magento/User/_files/dummy_user.php
@@ -28,6 +28,8 @@
/**
* Create dummy user
*/
+\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\App')
+ ->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
$user = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
->create('Magento\User\Model\User');
$user->setFirstname('Dummy')
diff --git a/dev/tests/integration/testsuite/Magento/View/Block/AbstractBlockTest.php b/dev/tests/integration/testsuite/Magento/View/Block/AbstractBlockTest.php
index efdbf9b14ac..2e4fdaeff2a 100644
--- a/dev/tests/integration/testsuite/Magento/View/Block/AbstractBlockTest.php
+++ b/dev/tests/integration/testsuite/Magento/View/Block/AbstractBlockTest.php
@@ -72,7 +72,7 @@ class AbstractBlockTest extends \PHPUnit_Framework_TestCase
$cssUrl = $this->_block->getViewFileUrl('css/wrong.css', array(
'area' => 'frontend',
- 'theme' => 'magento_demo',
+ 'theme' => 'magento_plushe',
'locale' => 'en_US'
));
$this->assertStringMatchesFormat('%s/css/wrong.css', $cssUrl);
diff --git a/dev/tests/integration/testsuite/Magento/View/Block/_files/frontend/magento_demo/css/wrong.css b/dev/tests/integration/testsuite/Magento/View/Block/_files/frontend/magento_plushe/css/wrong.css
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/View/Block/_files/frontend/magento_demo/css/wrong.css
rename to dev/tests/integration/testsuite/Magento/View/Block/_files/frontend/magento_plushe/css/wrong.css
diff --git a/dev/tests/integration/testsuite/Magento/View/Layout/ElementTest.php b/dev/tests/integration/testsuite/Magento/View/Layout/ElementTest.php
index 8f2561f7af5..f9919e167c7 100644
--- a/dev/tests/integration/testsuite/Magento/View/Layout/ElementTest.php
+++ b/dev/tests/integration/testsuite/Magento/View/Layout/ElementTest.php
@@ -51,7 +51,7 @@ class ElementTest extends \PHPUnit_Framework_TestCase
$this->_model->prepare();
$this->assertEquals('root', (string)$blockNode->attributes()->parent);
- $this->assertEquals('Magento\Adminhtml\Block\Page\Head', (string)$blockNode->attributes()->class);
+ $this->assertEquals('Magento\Backend\Block\Page\Head', (string)$blockNode->attributes()->class);
$this->assertEquals('head', (string)$actionNode->attributes()->block);
}
}
diff --git a/dev/tests/integration/testsuite/Magento/View/Layout/_files/_layout_update.xml b/dev/tests/integration/testsuite/Magento/View/Layout/_files/_layout_update.xml
index 79ef0cc3b40..072d3a23fba 100644
--- a/dev/tests/integration/testsuite/Magento/View/Layout/_files/_layout_update.xml
+++ b/dev/tests/integration/testsuite/Magento/View/Layout/_files/_layout_update.xml
@@ -27,8 +27,8 @@
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <block class="Magento\Adminhtml\Block\Page" name="root" output="1" template="page.phtml">
- <block class="Magento\Adminhtml\Block\Page\Head" name="head" as="head" template="page/head.phtml">
+ <block class="Magento\Backend\Block\Page" name="root" output="1" template="page.phtml">
+ <block class="Magento\Backend\Block\Page\Head" name="head" as="head" template="page/head.phtml">
<action method="setTitle">
<argument translate="true" name="title" xsi:type="string">Magento Admin</argument>
</action>
@@ -49,7 +49,7 @@
</block>
<block class="Magento\View\Block\Html\Calendar" name="head.calendar" as="calendar" template="page/js/calendar.phtml"/>
</block>
- <block class="Magento\Adminhtml\Block\Page\Header" name="header" as="header"/>
+ <block class="Magento\Backend\Block\Page\Header" name="header" as="header"/>
<block class="Magento\Backend\Block\Menu" name="menu" as="menu"/>
<block class="Magento\View\Block\Messages" name="messages" as="messages"/>
<block class="Magento\View\Block\Text" as="no_name"/>
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php
index e91dfb2f41b..161a3aaac44 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php
@@ -27,7 +27,7 @@
namespace Magento\Widget\Model\Config;
/**
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_disabled.php
+ * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_disabled.php
* @magentoAppArea adminhtml
*/
class DataTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
index 688480e6f4e..92601066521 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
@@ -23,7 +23,7 @@ namespace Magento\Widget\Model\Config;
*
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- * @magentoDataFixture Magento/Adminhtml/controllers/_files/cache/all_types_disabled.php
+ * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_disabled.php
*/
class ReaderTest extends \PHPUnit_Framework_TestCase
{
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 6ab959f223f..7d5bd951ecd 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/ConfigTest.php
@@ -26,6 +26,9 @@
*/
namespace Magento\Widget\Model\Widget;
+/**
+ * @magentoAppArea adminhtml
+ */
class ConfigTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -46,10 +49,8 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
*/
public function testGetPluginSettings()
{
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\App')
- ->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\DesignInterface')
- ->setDesignTheme('magento_basic');
+ ->setDesignTheme('magento_backend');
$config = new \Magento\Object();
$settings = $this->_model->getPluginSettings($config);
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/InstanceTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/InstanceTest.php
index a506788d31b..96fec5f9530 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/InstanceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/InstanceTest.php
@@ -130,7 +130,7 @@ class InstanceTest extends \PHPUnit_Framework_TestCase
);
$model->setData('widget_parameters', $params);
$this->assertEquals('', $model->generateLayoutUpdateXml('content'));
- $model->setId('test_id')->setPackageTheme('magento_demo');
+ $model->setId('test_id')->setPackageTheme('magento_plushe');
$result = $model->generateLayoutUpdateXml('content');
$this->assertContains('<referenceContainer name="content">', $result);
$this->assertContains('<block class="' . $model->getType() . '"', $result);
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/WidgetTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/WidgetTest.php
index c2e4f87bb72..dd06f01af15 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/WidgetTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/WidgetTest.php
@@ -68,9 +68,9 @@ class WidgetTest extends \PHPUnit_Framework_TestCase
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Core\Model\App')
->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\View\DesignInterface')
- ->setDesignTheme('magento_basic');
+ ->setDesignTheme('magento_backend');
$expectedPubFile = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\App\Dir')
- ->getDir(\Magento\App\Dir::STATIC_VIEW) . "/adminhtml/magento_basic/en_US/{$expectedFile}";
+ ->getDir(\Magento\App\Dir::STATIC_VIEW) . "/adminhtml/magento_backend/en_US/{$expectedFile}";
if (file_exists($expectedPubFile)) {
unlink($expectedPubFile);
}
@@ -122,7 +122,7 @@ class WidgetTest extends \PHPUnit_Framework_TestCase
);
$expectedFile = dirname(__DIR__)
- . '/_files/design/adminhtml/magento_basic/Magento_Catalog/images/product_widget_new.gif';
+ . '/_files/design/adminhtml/magento_backend/Magento_Catalog/images/product_widget_new.gif';
$this->assertFileEquals($expectedFile, $actualFile);
}
}
diff --git a/dev/tests/performance/benchmark_logs_merge.php b/dev/tests/performance/benchmark_logs_merge.php
new file mode 100644
index 00000000000..f2ccbdd17e8
--- /dev/null
+++ b/dev/tests/performance/benchmark_logs_merge.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 performance_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)
+ */
+
+$magentoBaseDir = realpath(__DIR__ . '/../../../');
+require_once $magentoBaseDir. '/lib/Zend/Console/Getopt.php';
+
+$shell = new Zend_Console_Getopt(array(
+ 'xml=s' => 'xml',
+ 'csv=s' => 'csv',
+ 'logs=s' => 'logs'
+));
+
+$args = $shell->getOptions();
+if (empty($args)) {
+ echo $shell->getUsageMessage();
+ exit(1);
+}
+
+$xmlUrl = $shell->getOption('xml');
+$scvUrl = $shell->getOption('csv');
+$newLogsUrl = $shell->getOption('logs');
+
+if (!file_exists($xmlUrl)) {
+ echo 'xml does not exist';
+ exit(1);
+}
+
+if (!file_exists($scvUrl)) {
+ echo 'csv does not exist';
+ exit(1);
+}
+
+$xml = simplexml_load_file($xmlUrl);
+$scv = readCsv($scvUrl);
+
+foreach ($xml as $key => $value) {
+ unset($value->httpSample);
+ unset($value->assertionResult);
+}
+
+foreach ($scv as $key => $value) {
+ $httpSample = $xml->addChild('httpSample');
+
+ $httpSample->addAttribute('t', $value[1]);
+ $httpSample->addAttribute('lt', $value[1]);
+ $httpSample->addAttribute('ts', $value[0]);
+ $httpSample->addAttribute('s', 'true');
+ $httpSample->addAttribute('lb', $value[2]);
+ $httpSample->addAttribute('rc', '200');
+ $httpSample->addAttribute('rm', 'OK');
+ $httpSample->addAttribute('tn', $value[2]);
+}
+
+$xml->asXML($newLogsUrl);
+
+function readCsv($csvFile)
+{
+ $fileHandle = fopen($csvFile, 'r');
+ $lineOfText = array();
+ while (!feof($fileHandle) ) {
+ $lineOfText[] = fgetcsv($fileHandle, 1024);
+ }
+ fclose($fileHandle);
+ return $lineOfText;
+}
diff --git a/dev/tests/performance/framework/Magento/TestFramework/Application.php b/dev/tests/performance/framework/Magento/TestFramework/Application.php
index d2d65f029d0..2c85ec361e6 100644
--- a/dev/tests/performance/framework/Magento/TestFramework/Application.php
+++ b/dev/tests/performance/framework/Magento/TestFramework/Application.php
@@ -206,7 +206,6 @@ class Application
{
/** @var $app \Magento\Core\Model\App */
$this->_application = $this->getObjectManager()->get('Magento\Core\Model\App');
- $this->getObjectManager()->get('Magento\App\State')->setAreaCode(self::AREA_CODE);
$this->getObjectManager()->configure(
$this->getObjectManager()->get('Magento\App\ObjectManager\ConfigLoader')->load(self::AREA_CODE)
);
@@ -285,6 +284,7 @@ class Application
if (!$this->_objectManager) {
$locatorFactory = new \Magento\App\ObjectManagerFactory();
$this->_objectManager = $locatorFactory->create(BP, $_SERVER);
+ $this->_objectManager->get('Magento\App\State')->setAreaCode(self::AREA_CODE);
}
return $this->_objectManager;
}
diff --git a/dev/tests/performance/testsuite/add_to_cart.jmx b/dev/tests/performance/testsuite/add_to_cart.jmx
index fdafdaad4a7..b2e928a763d 100644
--- a/dev/tests/performance/testsuite/add_to_cart.jmx
+++ b/dev/tests/performance/testsuite/add_to_cart.jmx
@@ -110,7 +110,7 @@
<RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract "product_name"" enabled="true">
<stringProp name="RegexExtractor.useHeaders">false</stringProp>
<stringProp name="RegexExtractor.refname">product_name</stringProp>
- <stringProp name="RegexExtractor.regex"><h1>(.+?)</h1></stringProp>
+ <stringProp name="RegexExtractor.regex"><h1.*>(.+?)</span></h1></stringProp>
<stringProp name="RegexExtractor.template">$1$</stringProp>
<stringProp name="RegexExtractor.default">FAIL</stringProp>
<stringProp name="RegexExtractor.match_number"></stringProp>
diff --git a/dev/tests/performance/testsuite/advanced_search.jmx b/dev/tests/performance/testsuite/advanced_search.jmx
index b7d20f74fe8..73d58b41a30 100644
--- a/dev/tests/performance/testsuite/advanced_search.jmx
+++ b/dev/tests/performance/testsuite/advanced_search.jmx
@@ -106,7 +106,7 @@
<hashTree>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assertion: Header Presence" enabled="true">
<collectionProp name="Asserion.test_strings">
- <stringProp name="-462078532"><h1>Catalog Advanced Search</h1></stringProp>
+ <stringProp name="-462078532">Advanced Search</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
<boolProp name="Assertion.assume_success">false</boolProp>
@@ -189,11 +189,13 @@
<hashTree/>
<XPathAssertion guiclass="XPathAssertionGui" testclass="XPathAssertion" testname="Assertion: Product Found" enabled="true">
<boolProp name="XPath.negate">false</boolProp>
- <stringProp name="XPath.xpath">//h2[@class="product-name"]/a[@title="${search_parameter1}" and text()="${search_parameter1}"]</stringProp>
+ <stringProp name="XPath.xpath">//img[@class="photo image"]</stringProp>
<boolProp name="XPath.validate">false</boolProp>
<boolProp name="XPath.whitespace">false</boolProp>
- <boolProp name="XPath.tolerant">false</boolProp>
+ <boolProp name="XPath.tolerant">true</boolProp>
<boolProp name="XPath.namespace">false</boolProp>
+ <boolProp name="XPath.show_warnings">true</boolProp>
+ <boolProp name="XPath.report_errors">true</boolProp>
</XPathAssertion>
<hashTree/>
</hashTree>
diff --git a/dev/tests/performance/testsuite/backend.jmx b/dev/tests/performance/testsuite/backend.jmx
index 9d58951369c..24fefc71f86 100644
--- a/dev/tests/performance/testsuite/backend.jmx
+++ b/dev/tests/performance/testsuite/backend.jmx
@@ -112,7 +112,7 @@
<stringProp name="HTTPSampler.response_timeout"></stringProp>
<stringProp name="HTTPSampler.protocol"></stringProp>
<stringProp name="HTTPSampler.contentEncoding"></stringProp>
- <stringProp name="HTTPSampler.path">${ADMIN_PATH}admin/catalog_product/</stringProp>
+ <stringProp name="HTTPSampler.path">${ADMIN_PATH}catalog/product/</stringProp>
<stringProp name="HTTPSampler.method">GET</stringProp>
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -144,7 +144,7 @@
<stringProp name="HTTPSampler.response_timeout"></stringProp>
<stringProp name="HTTPSampler.protocol"></stringProp>
<stringProp name="HTTPSampler.contentEncoding">UTF8</stringProp>
- <stringProp name="HTTPSampler.path">${ADMIN_PATH}admin/customer/</stringProp>
+ <stringProp name="HTTPSampler.path">${ADMIN_PATH}customer/</stringProp>
<stringProp name="HTTPSampler.method">GET</stringProp>
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -176,7 +176,7 @@
<stringProp name="HTTPSampler.response_timeout"></stringProp>
<stringProp name="HTTPSampler.protocol"></stringProp>
<stringProp name="HTTPSampler.contentEncoding">UTF8</stringProp>
- <stringProp name="HTTPSampler.path">${ADMIN_PATH}admin/sales_order/</stringProp>
+ <stringProp name="HTTPSampler.path">${ADMIN_PATH}sales/order/</stringProp>
<stringProp name="HTTPSampler.method">GET</stringProp>
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>
diff --git a/dev/tests/performance/testsuite/checkout.jmx b/dev/tests/performance/testsuite/checkout.jmx
index 79a9f510984..c4d3938033d 100644
--- a/dev/tests/performance/testsuite/checkout.jmx
+++ b/dev/tests/performance/testsuite/checkout.jmx
@@ -94,7 +94,7 @@
<stringProp name="HTTPSampler.response_timeout"></stringProp>
<stringProp name="HTTPSampler.protocol">http</stringProp>
<stringProp name="HTTPSampler.contentEncoding"></stringProp>
- <stringProp name="HTTPSampler.path">${ADMIN_PATH}admin/sales_order/</stringProp>
+ <stringProp name="HTTPSampler.path">${ADMIN_PATH}sales/order/</stringProp>
<stringProp name="HTTPSampler.method">GET</stringProp>
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -198,7 +198,7 @@
<RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Extract product name" enabled="true">
<stringProp name="RegexExtractor.useHeaders">false</stringProp>
<stringProp name="RegexExtractor.refname">product_name</stringProp>
- <stringProp name="RegexExtractor.regex"><h1>(.+?)</h1></stringProp>
+ <stringProp name="RegexExtractor.regex"><h1 class="title"><span class="base">(.+?)</span></h1></stringProp>
<stringProp name="RegexExtractor.template">$1$</stringProp>
<stringProp name="RegexExtractor.default"></stringProp>
<stringProp name="RegexExtractor.match_number">1</stringProp>
@@ -292,7 +292,7 @@
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Assert success" enabled="true">
<collectionProp name="Asserion.test_strings">
<stringProp name="2058954891">${product_name}</stringProp>
- <stringProp name="1157735154">class="button btn-proceed-checkout btn-checkout"</stringProp>
+ <stringProp name="837394321">class="action primary checkout"</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
<boolProp name="Assertion.assume_success">false</boolProp>
diff --git a/dev/tests/performance/testsuite/product_edit.jmx b/dev/tests/performance/testsuite/product_edit.jmx
index 5520ce62331..963f479c6fc 100644
--- a/dev/tests/performance/testsuite/product_edit.jmx
+++ b/dev/tests/performance/testsuite/product_edit.jmx
@@ -124,7 +124,7 @@
<stringProp name="HTTPSampler.response_timeout"></stringProp>
<stringProp name="HTTPSampler.protocol">http</stringProp>
<stringProp name="HTTPSampler.contentEncoding"></stringProp>
- <stringProp name="HTTPSampler.path">${ADMIN_PATH}admin/catalog_product/grid/product_filter/${grid_product_filter}/</stringProp>
+ <stringProp name="HTTPSampler.path">${ADMIN_PATH}catalog/product/grid/product_filter/${grid_product_filter}/</stringProp>
<stringProp name="HTTPSampler.method">GET</stringProp>
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>
@@ -187,7 +187,7 @@ vars.put("grid_product_filter", gridProductFilter);</stringProp>
<stringProp name="HTTPSampler.response_timeout"></stringProp>
<stringProp name="HTTPSampler.protocol">http</stringProp>
<stringProp name="HTTPSampler.contentEncoding"></stringProp>
- <stringProp name="HTTPSampler.path">${ADMIN_PATH}admin/catalog_product/edit/id/${product_id}/</stringProp>
+ <stringProp name="HTTPSampler.path">${ADMIN_PATH}catalog/product/edit/id/${product_id}/</stringProp>
<stringProp name="HTTPSampler.method">GET</stringProp>
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>
diff --git a/dev/tests/performance/testsuite/quick_search.jmx b/dev/tests/performance/testsuite/quick_search.jmx
index 123c81fc6e0..363cc6cae63 100644
--- a/dev/tests/performance/testsuite/quick_search.jmx
+++ b/dev/tests/performance/testsuite/quick_search.jmx
@@ -137,8 +137,7 @@
<hashTree/>
<ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
<collectionProp name="Asserion.test_strings">
- <stringProp name="-887183200">Search results for '${search_query}'</stringProp>
- <stringProp name="1258932845">View as:</stringProp>
+ <stringProp name="-887183200">Search results for: '${search_query}'</stringProp>
</collectionProp>
<stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
<boolProp name="Assertion.assume_success">false</boolProp>
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
index 26896dc7bc2..01efd8b50d3 100644
--- 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
@@ -28,72 +28,20 @@
return array(
// Blocks
'Block/Admin',
- 'Block/Backup',
- 'Block/Cache',
- 'Block/Denied',
- 'Block/Html',
- 'Block/Media',
- 'Block/Messages',
- 'Block/Newsletter',
- 'Block/Page',
- 'Block/Report',
- 'Block/Review',
- 'Block/Shipping',
- 'Block/Sitemap',
- 'Block/Template',
- 'Block/Text',
'Block/Urlrewrite',
'Block/Widget',
// Controllers
- 'Controller/Newsletter',
- 'Controller/Report',
'Controller/Urlrewrite',
// Helpers
'Helper/Addresses',
'Helper/Media',
- 'Helper/Data',
'Helper/Js',
// Models
- '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/email',
- 'view/adminhtml/images',
- 'view/adminhtml/media',
- 'view/adminhtml/newsletter',
- 'view/adminhtml/page',
- 'view/adminhtml/report',
- 'view/adminhtml/review',
- 'view/adminhtml/store',
- 'view/adminhtml/urlrewrite',
- 'view/adminhtml/widget',
-
// Layouts
- 'layout/adminhtml_cache',
- 'layout/adminhtml_denied',
- 'layout/adminhtml_newsletter',
- 'layout/adminhtml_noroute',
- 'layout/adminhtml_report',
'layout/adminhtml_urlrewrite',
- 'layout/default',
- 'layout/editor',
- 'layout/empty',
- 'layout/formkey',
- 'layout/newsletter',
- 'layout/overlay_popup',
- 'layout/popup',
- 'layout/preview',
- 'layout/report_sales',
);
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 4babc7a6336..3d18ba84872 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
@@ -1478,4 +1478,216 @@ return array(
array('Magento\Core\Helper\AbstractHelper', 'Magento\App\Helper\AbstractHelper'),
array('Magento\Core\Helper\Context', 'Magento\App\Helper\Context'),
array('Magento\Core\Block\Template\Context', 'Magento\View\Block\Template\Context'),
+ array(
+ 'Magento\Adminhtml\Controller\Report\AbstractReport',
+ 'Magento\Reports\Controller\Adminhtml\AbstractReport'
+ ),
+ array(
+ 'Magento\Adminhtml\Controller\Report\Customer',
+ 'Magento\Reports\Controller\Adminhtml\Customer'
+ ),
+ array(
+ 'Magento\Adminhtml\Controller\Report\Product',
+ 'Magento\Reports\Controller\Adminhtml\Product'
+ ),
+ array(
+ 'Magento\Adminhtml\Controller\Report\Review',
+ 'Magento\Reports\Controller\Adminhtml\Review'
+ ),
+ array(
+ 'Magento\Adminhtml\Controller\Report\Sales',
+ 'Magento\Reports\Controller\Adminhtml\Sales'
+ ),
+ array(
+ 'Magento\Adminhtml\Controller\Report\Shopcart',
+ 'Magento\Reports\Controller\Adminhtml\Shopcart'
+ ),
+ array(
+ 'Magento\Adminhtml\Controller\Report\Statistics',
+ 'Magento\Reports\Controller\Adminhtml\Statistics'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Config\Form\Field\MtdStart',
+ 'Magento\Reports\Block\Adminhtml\Config\Form\Field\MtdStart'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Config\Form\Field\YtdStart',
+ 'Magento\Reports\Block\Adminhtml\Config\Form\Field\YtdStart'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Filter\Form',
+ 'Magento\Reports\Block\Adminhtml\Filter\Form'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Grid\AbstractGrid',
+ 'Magento\Reports\Block\Adminhtml\Grid\AbstractGrid'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Blanknumber',
+ 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Blanknumber'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Currency',
+ 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Customer',
+ 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Customer'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Grid\Column\Renderer\Product',
+ 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Product'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Grid\Shopcart',
+ 'Magento\Reports\Block\Adminhtml\Grid\Shopcart'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Product\Downloads\Grid',
+ 'Magento\Reports\Block\Adminhtml\Product\Downloads\Grid'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Product\Downloads\Renderer\Purchases',
+ 'Magento\Reports\Block\Adminhtml\Product\Downloads\Renderer\Purchases'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Product\Downloads',
+ 'Magento\Reports\Block\Adminhtml\Product\Downloads'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Product\Grid',
+ 'Magento\Reports\Block\Adminhtml\Product\Grid'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Product\Lowstock\Grid',
+ 'Magento\Reports\Block\Adminhtml\Product\Lowstock\Grid'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Product\Lowstock',
+ 'Magento\Reports\Block\Adminhtml\Product\Lowstock'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Product\Viewed\Grid',
+ 'Magento\Reports\Block\Adminhtml\Product\Viewed\Grid'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Product\Viewed',
+ 'Magento\Reports\Block\Adminhtml\Product\Viewed'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Product',
+ 'Magento\Reports\Block\Adminhtml\Product'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Review\Customer',
+ 'Magento\Reports\Block\Adminhtml\Review\Customer'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Review\Detail\Grid',
+ 'Magento\Reports\Block\Adminhtml\Review\Detail\Grid'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Review\Detail',
+ 'Magento\Reports\Block\Adminhtml\Review\Detail'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Review\Product',
+ 'Magento\Reports\Block\Adminhtml\Review\Product'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Sales\Bestsellers\Grid',
+ 'Magento\Reports\Block\Adminhtml\Sales\Bestsellers\Grid'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Sales\Bestsellers',
+ 'Magento\Reports\Block\Adminhtml\Sales\Bestsellers'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Sales\Coupons\Grid',
+ 'Magento\Reports\Block\Adminhtml\Sales\Coupons\Grid'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Sales\Coupons',
+ 'Magento\Reports\Block\Adminhtml\Sales\Coupons'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Sales\Grid\Column\Renderer\Date',
+ 'Magento\Reports\Block\Adminhtml\Sales\Grid\Column\Renderer\Date'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Sales\Invoiced\Grid',
+ 'Magento\Reports\Block\Adminhtml\Sales\Invoiced\Grid'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Sales\Invoiced',
+ 'Magento\Reports\Block\Adminhtml\Sales\Invoiced'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Sales\Refunded\Grid',
+ 'Magento\Reports\Block\Adminhtml\Sales\Refunded\Grid'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Sales\Refunded',
+ 'Magento\Reports\Block\Adminhtml\Sales\Refunded'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Sales\Sales\Grid',
+ 'Magento\Reports\Block\Adminhtml\Sales\Sales\Grid'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Sales\Sales',
+ 'Magento\Reports\Block\Adminhtml\Sales\Sales'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Sales\Shipping\Grid',
+ 'Magento\Reports\Block\Adminhtml\Sales\Shipping\Grid'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Sales\Shipping',
+ 'Magento\Reports\Block\Adminhtml\Sales\Shipping'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Sales\Tax\Grid',
+ 'Magento\Reports\Block\Adminhtml\Sales\Tax\Grid'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Sales\Tax',
+ 'Magento\Reports\Block\Adminhtml\Sales\Tax'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Search',
+ 'Magento\Reports\Block\Adminhtml\Search'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Shopcart\Abandoned\Grid',
+ 'Magento\Reports\Block\Adminhtml\Shopcart\Abandoned\Grid'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Shopcart\Abandoned',
+ 'Magento\Reports\Block\Adminhtml\Shopcart\Abandoned'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Shopcart\Customer\Grid',
+ 'Magento\Reports\Block\Adminhtml\Shopcart\Customer\Grid'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Shopcart\Customer',
+ 'Magento\Reports\Block\Adminhtml\Shopcart\Customer'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Shopcart\Product\Grid',
+ 'Magento\Reports\Block\Adminhtml\Shopcart\Product\Grid'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Shopcart\Product',
+ 'Magento\Reports\Block\Adminhtml\Shopcart\Product'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Wishlist\Grid',
+ 'Magento\Reports\Block\Adminhtml\Wishlist\Grid'
+ ),
+ array(
+ 'Magento\Adminhtml\Block\Report\Wishlist',
+ 'Magento\Reports\Block\Adminhtml\Wishlist'
+ ),
);
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
index 2ad87198adc..48ea702498f 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
@@ -26,6 +26,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
return array(
+ array('ADMIN_STORE_ID', 'Magento\Core\Model\AppInterface'),
array('BACKORDERS_BELOW'),
array('BACKORDERS_YES'),
array('CACHE_TAG', 'Magento\Api\Model\Config', 'Magento_Api_Model_Cache_Type::CACHE_TAG'),
@@ -76,6 +77,7 @@ return array(
array('DEFAULT_THEME_NAME', 'Magento\Core\Model\Design\PackageInterface'),
array('DEFAULT_THEME_NAME', 'Magento\Core\Model\Design\Package'),
array('DEFAULT_TIMEZONE', 'Magento\Core\Model\Locale', 'Magento_Core_Model_LocaleInterface::DEFAULT_TIMEZONE'),
+ array('DEFAULT_STORE_ID', 'Magento\Catalog\Model\AbstractModel', 'Magento\Core\Model\Store::DEFAULT_STORE_ID'),
array('DEFAULT_VALUE_TABLE_PREFIX'),
array('ENTITY_PRODUCT', 'Magento\Review\Model\Review'),
array('EXCEPTION_CODE_IS_GROUPED_PRODUCT'),
@@ -98,9 +100,9 @@ return array(
'Magento\Core\Model\Layout\Merge',
'Magento_Core_Model_Cache_Type_Layout::CACHE_TAG'
),
- array('LOCALE_CACHE_KEY', 'Magento\Adminhtml\Block\Page\Footer'),
- array('LOCALE_CACHE_LIFETIME', 'Magento\Adminhtml\Block\Page\Footer'),
- array('LOCALE_CACHE_TAG', 'Magento\Adminhtml\Block\Page\Footer'),
+ array('LOCALE_CACHE_KEY', 'Magento\Backend\Block\Page\Footer'),
+ array('LOCALE_CACHE_LIFETIME', 'Magento\Backend\Block\Page\Footer'),
+ array('LOCALE_CACHE_TAG', 'Magento\Backend\Block\Page\Footer'),
array('PATH_PREFIX_CUSTOMIZATION', 'Magento\Core\Model\Theme'),
array('PATH_PREFIX_CUSTOMIZED', 'Magento\Core\Model\Theme\Files'),
array('PUBLIC_BASE_THEME_DIR', 'Magento\Core\Model\Design\PackageInterface'),
@@ -392,4 +394,5 @@ return array(
array('XML_PATH_IMAGE_TYPES', 'Magento\Adminhtml\Block\Catalog\Product\Frontend\Product\Watermark'),
array('XML_PATH_WEBHOOK', 'Magento\Webhook\Model\Source\Hook'),
array('XML_PATH_SUBSCRIPTIONS', 'Magento\Webhook\Model\Subscription\Config'),
+ array('PAYMENT_INFO_TRANSPORT_SHIPPING_OVERRIDEN', 'Magento\Paypal\Model\Express\Checkout'),
);
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 8f3c6dbc791..70d71d1ad1b 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
@@ -168,7 +168,7 @@ return array(
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'),
+ array('_sendUploadResponse', 'Magento\Newsletter\Controller\Adminhtml\Subscriber'),
array('_setAttribteValue'),
array('_shouldSkipProcessUpdates', 'Magento\Core\Model\App'),
array('_sort', 'Magento\Backend\Model\Config\Structure\Converter'),
@@ -329,7 +329,7 @@ return array(
array('getCache', 'Magento\Core\Model\Config'),
array('getCacheBetaTypes'),
array('getCacheControls', 'Magento\PageCache\Helper\Data', 'Magento\PageCache\Model\CacheControlFactory'),
- array('getChangeLocaleUrl', 'Magento\Adminhtml\Block\Page\Footer'),
+ array('getChangeLocaleUrl', 'Magento\Backend\Block\Page\Footer'),
array('getCheckoutMehod', 'Magento\Checkout\Model\Type\Onepage'),
array('getChildGroup', '', 'Magento_Core_Block_AbstractBlock::getGroupChildNames()'),
array('getConfig', 'Magento\Captcha\Helper\Data'),
@@ -341,10 +341,11 @@ return array(
array('getConfigDataModel', 'Magento\Core\Model\Config'),
array('getConnectionTypeInstance', 'Magento\App\Resource'),
array('getContainers', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'),
+ array('getCurrentUrl', 'Magento\Core\Helper\Url', 'Magento\Core\Model\Url'),
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()'),
+ array('getDataMaxSizeInBytes', 'Magento\Backend\Block\Media\Uploader', 'Magento_File_Size::getMaxFileSize()'),
array('getDbAdapter', 'Magento\App\Cache'),
array('getDbAdapter', 'Magento\App\Cache\Proxy'),
array('getDbAdapter', 'Magento\App\CacheInterface'),
@@ -400,7 +401,7 @@ return array(
array('getItemRendererInfo', 'Magento\Checkout\Block\Cart\AbstractCart'),
array('getKeyList', 'Magento\DB\Adapter\Pdo\Mysql'),
array('getLanguages', 'Magento\Install\Block\Begin'),
- array('getLanguageSelect', 'Magento\Adminhtml\Block\Page\Footer'),
+ array('getLanguageSelect', 'Magento\Backend\Block\Page\Footer'),
array('getLayoutFilename', '', 'getFilename'),
array('getLifeTime', 'Magento\Core\Model\Resource\Session'),
array('getLocaleBaseDir', 'Magento\Core\Model\Design\Package'),
@@ -447,7 +448,7 @@ return array(
array('getPathFromArray', '', 'direct usage of /'),
array('getPathVars', 'Magento\Core\Model\Config'),
array('getParentProductIds', 'Magento\Catalog\Model\Resource\Product'),
- array('getPostMaxSize', 'Magento\Adminhtml\Block\Media\Uploader', 'Magento_File_Size::getPostMaxSize()'),
+ array('getPostMaxSize', 'Magento\Backend\Block\Media\Uploader', 'Magento_File_Size::getPostMaxSize()'),
array('getPriceFormatted', 'Magento\Customer\Block\Adminhtml\Edit\Tab\View\Sales'),
array('getPrices', 'Magento\Bundle\Model\Product\Price'),
array('getPricesDependingOnTax', 'Magento\Bundle\Model\Product\Price'),
@@ -462,7 +463,7 @@ return array(
array('getQuoteItem', 'Magento\Catalog\Model\Product\Option\Type\DefaultType'),
array('getQuoteItemOption', 'Magento\Catalog\Model\Product\Option\Type\DefaultType'),
array('getQuoteOrdersHtml', 'Magento\GoogleAnalytics\Block\Ga'),
- array('getRefererParamName', 'Magento\Adminhtml\Block\Page\Footer'),
+ array('getRefererParamName', 'Magento\Backend\Block\Page\Footer'),
array('getRelativePath', 'Magento\Core\Model\Theme\Files'),
array('getRemoveItemUrl', 'Magento\Wishlist\Block\Customer\Sidebar'),
array('getReorderUrl', 'Magento\Sales\Block\Order\Info'),
@@ -545,8 +546,8 @@ return array(
array('getUnprocessedEventsCollection', 'Magento\Index\Model\Process',
'Magento_Index_Model_EventRepository::getUnprocessed()'
),
- array('getUploadMaxSize', 'Magento\Adminhtml\Block\Media\Uploader', 'Magento_File_Size::getUploadMaxSize()'),
- array('getUrlForReferer', 'Magento\Adminhtml\Block\Page\Footer'),
+ array('getUploadMaxSize', 'Magento\Backend\Block\Media\Uploader', 'Magento_File_Size::getUploadMaxSize()'),
+ array('getUrlForReferer', 'Magento\Backend\Block\Page\Footer'),
array('getUseCacheFilename', 'Magento\Core\Model\App'),
array('getValidator', 'Magento\SalesRule\Model\Observer'),
array('getValidatorData', 'Magento\Core\Model\Session\AbstractSession', 'use _getSessionEnvironment method'),
@@ -582,6 +583,7 @@ return array(
array('initSpecified', 'Magento\Core\Model\App'),
array('insertProductPrice', 'Magento\Catalog\Model\Resource\Product\Attribute\Backend\Tierprice'),
array('isAbsolutePath'),
+ array('isAdmin', 'Magento\Core\Model\Store'),
array('isAllowedGuestCheckout', 'Magento\Sales\Model\Quote'),
array('isAutomaticCleaningAvailable', 'Magento\Cache\Backend\Eaccelerator'),
array('isCheckoutAvailable', 'Magento\Checkout\Model\Type\Multishipping'),
@@ -867,7 +869,7 @@ return array(
array('turnOnReadCommittedMode', 'Magento\Backup\Model\Resource\Db'),
array('turnOnSerializableMode', 'Magento\Backup\Model\Resource\Db', 'prepareTransactionIsolationLevel'),
array('_getResourceModel', '\Magento\Webapi\Model\Source\Acl\Role', '$this->_resource'),
- array('_getSession', '\Magento\Adminhtml\Model\Giftmessage\Save', '$this->_session'),
+ array('_getSession', '\Magento\GiftMessage\Model\Save', '$this->_session'),
array('_initRequest', '\Magento\Core\Model\App'),
array('run', '\Magento\Core\Model\App'),
array('_initFrontController', '\Magento\Core\Model\App'),
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml
index b62dfb5e8c8..15aeb9671d3 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml
@@ -43,11 +43,18 @@
<word>secure_base_url}}js/</word>
<word>secure_base_url}}skin/</word>
<word>secure_base_url}}media/</word>
+ <!-- typos -->
+ <word>overriden</word>
+ <word>retrive</word>
+ <word>retreive</word>
</words>
<whitelist>
<item>
<path>CHANGELOG.md</path>
</item>
+ <item>
+ <path>CHANGELOG_CE.md</path>
+ </item>
<item>
<path>app/code/Magento/User/data/user_setup/data-upgrade-1.6.1.1-1.6.1.2.php</path>
<word>xmlconnect</word>
@@ -71,5 +78,9 @@
<item>
<path>lib/Zend</path>
</item>
+ <item>
+ <path>dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php</path>
+ <word>overriden</word>
+ </item>
</whitelist>
</config>
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
index 862f6c19e67..0f95fbd175f 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -141,7 +141,6 @@ class LiveCodeTest extends \PHPUnit_Framework_TestCase
public function testCopyPaste()
{
- $this->markTestSkipped('Skipped');
$reportFile = self::$_reportDir . '/phpcpd_report.xml';
$copyPasteDetector = new \Magento\TestFramework\CodingStandard\Tool\CopyPasteDetector($reportFile);
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 b5112146f16..639bd9da5ad 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
@@ -57,12 +57,16 @@ Magento/GiftMessage/Block/Adminhtml/Sales/Order
Magento/ImportExport/Model
Magento/Index/Model/Process
Magento/Install/Block/Db
+Magento/Newsletter/Block/Adminhtml/Template/Preview
+Magento/Newsletter/Block/Adminhtml/Queue/Preview
Magento/Payment/Block/Form
Magento/Payment/Model/Method
Magento/Payment/Model/Config
Magento/ProductAlert/Model
Magento/Rating/Model
+Magento/Reports/Block/Adminhtml
Magento/Reports/Block/Product/Widget
+Magento/Reports/Controller/Adminhtml/Report
Magento/Reports/Model/Resource/Helper
Magento/Reports/Model/Resource
Magento/Review/Block
@@ -74,6 +78,7 @@ Magento/Sales/Model/Quote/Address/Total
Magento/Sales/Model/Resource/Report/Order
Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab
Magento/Shipping/Model/Carrier
+Magento/Sitemap/Block/Adminhtml/Edit
Magento/CatalogRule/Model
Magento/Tax/Block/Checkout
Magento/Tax/Model/Sales/Pdf
@@ -100,5 +105,6 @@ Magento/Tax/Model/Sales/Total/Quote/Nominal
Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit
Magento/User/Block/User/Edit
var/generation
+Magento/Newsletter/Block/Adminhtml/Template/Grid/Renderer
Magento/Newsletter/Model/Template/Filter
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 b3f11828c12..5d24c7f740b 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
@@ -17,7 +17,7 @@ app/code/Magento/Catalog/Block/Adminhtml/Product/Options/Ajax.php
# Formatter intorduces long line
app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Design.php
# Formatter intorduces long line
-app/code/Magento/Adminhtml/Block/Page/System/Config/Robots/Reset.php
+app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
# Formatter intorduces long line
app/code/Magento/Backend/Block/System/Store/Edit.php
# Not magento code
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 5a9165dfe78..556cf1b6365 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,15 +2,12 @@
# Glob patterns are supported
#
app/bootstrap.php
-app/code/Magento/Adminhtml/Model/Observer.php
app/code/Magento/Adminhtml/Block/Urlrewrite
-app/code/Magento/Adminhtml/Block/Page/System/Config/Robots/Reset.php
-app/code/Magento/Adminhtml/Controller/Report/Customer.php
-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/Backend/Block/Page/System/Config/Robots/Reset.php
app/code/Magento/Backend/Block/System/Store/Edit
app/code/Magento/Backend/Block/System/Store/Edit.php
+app/code/Magento/Backend/Model/Observer.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
@@ -109,6 +106,8 @@ app/code/Magento/PageCache/Model/CacheControlFactory.php
app/code/Magento/ProductAlert/Block/Product/View
app/code/Magento/Reports/Block/Adminhtml/Customer
app/code/Magento/Reports/Block/Adminhtml/Product
+app/code/Magento/Reports/Controller/Adminhtml/Report/Customer.php
+app/code/Magento/Reports/Controller/Adminhtml/Report/Product.php
app/code/Magento/Reports/Model/Plugin
app/code/Magento/Reports/Model/Resource/Accounts
app/code/Magento/Reports/Model/Resource/Customer
diff --git a/dev/tests/unit/testsuite/Magento/Authorizenet/Helper/BackendTest.php b/dev/tests/unit/testsuite/Magento/Authorizenet/Helper/BackendTest.php
new file mode 100644
index 00000000000..2f6dd2156a8
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Authorizenet/Helper/BackendTest.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\Authorizenet\Helper;
+
+class BackendTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var Backend
+ */
+ protected $_model;
+
+ /**
+ * @var \Magento\Backend\Model\Url|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_urlBuilder;
+
+ /**
+ * @var \Magento\Sales\Model\OrderFactory|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_orderFactory;
+
+ protected function setUp()
+ {
+ $this->_urlBuilder = $this->getMock('Magento\Backend\Model\Url', array('getUrl'), array(), '', false);
+ $this->_orderFactory = $this->getMock('Magento\Sales\Model\OrderFactory', array('create'), array(), '', false);
+ $this->_model = new Backend(
+ $this->getMock('Magento\App\Helper\Context', array(), array(), '', false),
+ $this->getMock('Magento\Core\Model\StoreManager', array(), array(), '', false),
+ $this->_orderFactory,
+ $this->_urlBuilder
+ );
+ }
+
+ public function testGetPlaceOrderAdminUrl()
+ {
+ $this->_urlBuilder->expects($this->once())
+ ->method('getUrl')
+ ->with($this->equalTo('*/authorizenet_directpost_payment/place'), $this->equalTo(array()))
+ ->will($this->returnValue('some value'));
+ $this->assertEquals('some value', $this->_model->getPlaceOrderAdminUrl());
+ }
+
+ public function testGetSuccessOrderUrl()
+ {
+ $order = $this->getMock(
+ 'Magento\Sales\Model\Order',
+ array('loadByIncrementId', 'getId', '__wakeup'),
+ array(),
+ '',
+ false
+ );
+ $order->expects($this->once())
+ ->method('loadByIncrementId')
+ ->with('invoice number')
+ ->will($this->returnSelf());
+ $order->expects($this->once())->method('getId')->will($this->returnValue('order id'));
+ $this->_orderFactory->expects($this->once())->method('create')->will($this->returnValue($order));
+ $this->_urlBuilder->expects($this->once())
+ ->method('getUrl')
+ ->with($this->equalTo('sales/order/view'), $this->equalTo(array('order_id' => 'order id')))
+ ->will($this->returnValue('some value'));
+ $this->assertEquals(
+ 'some value',
+ $this->_model->getSuccessOrderUrl(array('x_invoice_num' => 'invoice number', 'some param'))
+ );
+ }
+
+ public function testGetRedirectIframeUrl()
+ {
+ $params = array('some params');
+ $this->_urlBuilder->expects($this->once())
+ ->method('getUrl')
+ ->with($this->equalTo('adminhtml/authorizenet_directpost_payment/redirect'), $this->equalTo($params))
+ ->will($this->returnValue('some value'));
+ $this->assertEquals('some value', $this->_model->getRedirectIframeUrl($params));
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/App/Action/Plugin/StoreTest.php b/dev/tests/unit/testsuite/Magento/Backend/App/Action/Plugin/StoreTest.php
deleted file mode 100644
index fc155abfa77..00000000000
--- a/dev/tests/unit/testsuite/Magento/Backend/App/Action/Plugin/StoreTest.php
+++ /dev/null
@@ -1,39 +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\Backend\App\Action\Plugin;
-
-class StoreTest extends \PHPUnit_Framework_TestCase
-{
-
- public function testAroundDispatch()
- {
- $storeManagerMock = $this->getMock('Magento\Core\Model\StoreManagerInterface', array(), array(), '', false);
- $invocationChainMock = $this->getMock('Magento\Code\Plugin\InvocationChain', array(), array(), '', false);
- $plugin = new \Magento\Backend\App\Action\Plugin\Store($storeManagerMock);
- $storeManagerMock->expects($this->once())->method('setCurrentStore')->with('admin');
- $invocationChainMock->expects($this->once())->method('proceed')
- ->with(array())->will($this->returnValue('expected'));
- $this->assertEquals('expected', $plugin->aroundDispatch(array(), $invocationChainMock));
- }
-}
\ No newline at end of file
diff --git a/dev/tests/unit/testsuite/Magento/Backend/App/Area/FrontNameResolverTest.php b/dev/tests/unit/testsuite/Magento/Backend/App/Area/FrontNameResolverTest.php
index 3ddc6eb5cb6..f7bfd89fb96 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/App/Area/FrontNameResolverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/App/Area/FrontNameResolverTest.php
@@ -42,24 +42,23 @@ class FrontNameResolverTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->_configMock
- = $this->getMock('\Magento\Core\Model\ConfigInterface');
+ $this->_configMock = $this->getMock('\Magento\Backend\App\Config', array(), array(), '', false);
$this->_model = new \Magento\Backend\App\Area\FrontNameResolver($this->_configMock, $this->_defaultFrontName);
}
public function testIfCustomPathUsed()
{
$this->_configMock->expects($this->at(0))
- ->method('getValue')->with('admin/url/use_custom_path', 'default')->will($this->returnValue(true));
+ ->method('getValue')->with('admin/url/use_custom_path')->will($this->returnValue(true));
$this->_configMock->expects($this->at(1))
- ->method('getValue')->with('admin/url/custom_path', 'default')->will($this->returnValue('expectedValue'));
+ ->method('getValue')->with('admin/url/custom_path')->will($this->returnValue('expectedValue'));
$this->assertEquals('expectedValue', $this->_model->getFrontName());
}
public function testIfCustomPathNotUsed()
{
- $this->_configMock->expects($this->once())->
- method('getValue')->with('admin/url/use_custom_path', 'default')->will($this->returnValue(false));
+ $this->_configMock->expects($this->once())
+ ->method('getValue')->with('admin/url/use_custom_path')->will($this->returnValue(false));
$this->assertEquals($this->_defaultFrontName, $this->_model->getFrontName());
}
-}
\ No newline at end of file
+}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/App/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Backend/App/ConfigTest.php
new file mode 100644
index 00000000000..5f30134fbc1
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Backend/App/ConfigTest.php
@@ -0,0 +1,135 @@
+<?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\App;
+
+class ConfigTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Core\Model\Config\SectionPool|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $sectionPool;
+
+ /**
+ * @var Config
+ */
+ protected $model;
+
+ protected function setUp()
+ {
+ $this->sectionPool = $this->getMock(
+ 'Magento\Core\Model\Config\SectionPool',
+ array('getSection', 'clean'),
+ array(),
+ '',
+ false
+ );
+ $this->model = new Config($this->sectionPool);
+ }
+
+ public function testGetValue()
+ {
+ $expectedValue = 'some value';
+ $path = 'some path';
+ $configData = $this->getConfigDataMock('getValue');
+ $configData
+ ->expects($this->once())
+ ->method('getValue')
+ ->with($this->equalTo($path))
+ ->will($this->returnValue($expectedValue));
+ $this->sectionPool
+ ->expects($this->once())
+ ->method('getSection')
+ ->with($this->equalTo('default'), $this->isNull())
+ ->will($this->returnValue($configData));
+ $this->assertEquals($expectedValue, $this->model->getValue($path));
+ }
+
+ public function testSetValue()
+ {
+ $value = 'some value';
+ $path = 'some path';
+ $configData = $this->getConfigDataMock('setValue');
+ $configData
+ ->expects($this->once())
+ ->method('setValue')
+ ->with($this->equalTo($path), $this->equalTo($value));
+ $this->sectionPool
+ ->expects($this->once())
+ ->method('getSection')
+ ->with($this->equalTo('default'), $this->isNull())
+ ->will($this->returnValue($configData));
+ $this->model->setValue($path, $value);
+ }
+
+ public function testReinit()
+ {
+ $this->sectionPool->expects($this->once())->method('clean');
+ $this->model->reinit();
+ }
+
+ /**
+ * @param mixed $configValue
+ * @param bool $expectedResult
+ * @dataProvider getFlagDataProvider
+ */
+ public function testGetFlag($configValue, $expectedResult)
+ {
+ $path = 'some path';
+ $configData = $this->getConfigDataMock('getValue');
+ $configData
+ ->expects($this->once())
+ ->method('getValue')
+ ->with($this->equalTo($path))
+ ->will($this->returnValue($configValue));
+ $this->sectionPool
+ ->expects($this->once())
+ ->method('getSection')
+ ->with($this->equalTo('default'), $this->isNull())
+ ->will($this->returnValue($configData));
+ $this->assertEquals($expectedResult, $this->model->getFlag($path));
+ }
+
+ public function getFlagDataProvider()
+ {
+ return array(
+ array(0, false),
+ array(true, true),
+ array('0', false),
+ array('', false),
+ array('some string', true),
+ array(1, true),
+ );
+ }
+
+ /**
+ * Get ConfigData mock
+ *
+ * @param $mockedMethod
+ * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Core\Model\Config\Data
+ */
+ protected function getConfigDataMock($mockedMethod)
+ {
+ return $this->getMock('Magento\Core\Model\Config\Data', array($mockedMethod), array(), '', false);
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/Page/System/Config/Robots/ResetTest.php b/dev/tests/unit/testsuite/Magento/Backend/Block/Page/System/Config/Robots/ResetTest.php
similarity index 88%
rename from dev/tests/unit/testsuite/Magento/Adminhtml/Block/Page/System/Config/Robots/ResetTest.php
rename to dev/tests/unit/testsuite/Magento/Backend/Block/Page/System/Config/Robots/ResetTest.php
index 73fdb3df357..896de7ab771 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/Page/System/Config/Robots/ResetTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Block/Page/System/Config/Robots/ResetTest.php
@@ -26,14 +26,14 @@
*/
/**
- * Test class for \Magento\Adminhtml\Block\Page\System\Config\Robots\Reset
+ * Test class for \Magento\Backend\Block\Page\System\Config\Robots\Reset
*/
-namespace Magento\Adminhtml\Block\Page\System\Config\Robots;
+namespace Magento\Backend\Block\Page\System\Config\Robots;
class ResetTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Adminhtml\Block\Page\System\Config\Robots\Reset
+ * @var \Magento\Backend\Block\Page\System\Config\Robots\Reset
*/
private $_resetRobotsBlock;
@@ -51,7 +51,7 @@ class ResetTest extends \PHPUnit_Framework_TestCase
);
$this->_resetRobotsBlock = $objectManagerHelper->getObject(
- 'Magento\Adminhtml\Block\Page\System\Config\Robots\Reset',
+ 'Magento\Backend\Block\Page\System\Config\Robots\Reset',
array(
'pageRobots' => $this->_mockRobotsHelper,
'coreData' => $this->getMock('Magento\Core\Helper\Data', array(), array(), '', false),
@@ -74,7 +74,7 @@ class ResetTest extends \PHPUnit_Framework_TestCase
}
/**
- * @covers \Magento\Adminhtml\Block\Page\System\Config\Robots\Reset::getRobotsDefaultCustomInstructions
+ * @covers \Magento\Backend\Block\Page\System\Config\Robots\Reset::getRobotsDefaultCustomInstructions
*/
public function testGetRobotsDefaultCustomInstructions()
{
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/UrlrewriteTest.php b/dev/tests/unit/testsuite/Magento/Backend/Block/UrlrewriteTest.php
similarity index 98%
rename from dev/tests/unit/testsuite/Magento/Adminhtml/Block/UrlrewriteTest.php
rename to dev/tests/unit/testsuite/Magento/Backend/Block/UrlrewriteTest.php
index b8494c86996..cf4d341dae5 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/Block/UrlrewriteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Block/UrlrewriteTest.php
@@ -25,7 +25,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 UrlrewriteTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/Controller/CacheTest.php b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
similarity index 98%
rename from dev/tests/unit/testsuite/Magento/Adminhtml/Controller/CacheTest.php
rename to dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
index abbc61af1f7..5415075f031 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/Controller/CacheTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
@@ -22,7 +22,7 @@
* @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 CacheTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/DashboardTest.php b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
similarity index 99%
rename from dev/tests/unit/testsuite/Magento/Adminhtml/DashboardTest.php
rename to dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.php
index 94b45cfe92e..7eb9583cfab 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/DashboardTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/DashboardTest.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;
+namespace Magento\Backend\Controller\Adminhtml;
class DashboardTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/CookieTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/CookieTest.php
new file mode 100644
index 00000000000..e6df4f5b43c
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/CookieTest.php
@@ -0,0 +1,44 @@
+<?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_Backend
+ * @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\Backend\Model;
+
+class CookieTest extends \PHPUnit_Framework_TestCase
+{
+ public function testIsSecure()
+ {
+ $request = $this->getMock('Magento\App\Request\Http', array('isSecure'), array(), '', false);
+ $request->expects($this->once())->method('isSecure')->will($this->returnValue('some value'));
+
+ $response = $this->getMockForAbstractClass('Magento\App\ResponseInterface');
+ $coreStoreConfig = $this->getMock('Magento\Core\Model\Store\Config', null, array(), '', false);
+ $storeManager = $this->getMockForAbstractClass('Magento\Core\Model\StoreManagerInterface');
+
+ $model = new Cookie($request, $response, $coreStoreConfig, $storeManager);
+ $this->assertEquals('some value', $model->isSecure());
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Translate/Inline/ConfigFactoryTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Translate/Inline/ConfigFactoryTest.php
new file mode 100644
index 00000000000..f792461ad4e
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Translate/Inline/ConfigFactoryTest.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\Backend\Model\Translate\Inline;
+
+class ConfigFactoryTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @param string|null $area
+ * @param null|string $appStateArea
+ * @param string $expectedName
+ * @dataProvider createDataProvider
+ */
+ public function testCreate($area, $appStateArea, $expectedName)
+ {
+ $result = 'result';
+ $objectManager = $this->getMockForAbstractClass('Magento\ObjectManager');
+ $objectManager
+ ->expects($this->once())
+ ->method('create')
+ ->with($this->equalTo($expectedName))
+ ->will($this->returnValue($result));
+ $factory = new ConfigFactory($objectManager, $this->getAppState($appStateArea));
+ $this->assertEquals($result, $factory->create($area));
+ }
+
+ public function createDataProvider()
+ {
+ return array(
+ array(null, 'some area', 'Magento\Core\Model\Translate\Inline\Config'),
+ array(
+ null,
+ \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE,
+ 'Magento\Backend\Model\Translate\Inline\Config'
+ ),
+ array('some area', null, 'Magento\Core\Model\Translate\Inline\Config'),
+ array(
+ \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE,
+ null,
+ 'Magento\Backend\Model\Translate\Inline\Config'
+ ),
+ );
+ }
+
+ /**
+ * Get mock of app state
+ *
+ * @param null|string $area
+ * @return \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected function getAppState($area)
+ {
+ $appState = $this->getMock('Magento\App\State', array('getAreaCode'), array(), '', false);
+ if (isset($area)) {
+ $appState->expects($this->once())->method('getAreaCode')->will($this->returnValue($area));
+ } else {
+ $appState->expects($this->never())->method('getAreaCode');
+ }
+ return $appState;
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Translate/Inline/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Translate/Inline/ConfigTest.php
new file mode 100644
index 00000000000..dee00f0808f
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Translate/Inline/ConfigTest.php
@@ -0,0 +1,40 @@
+<?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\Model\Translate\Inline;
+
+class ConfigTest extends \PHPUnit_Framework_TestCase
+{
+ public function testIsActive()
+ {
+ $result = 'result';
+ $backendConfig = $this->getMockForAbstractClass('Magento\Backend\App\ConfigInterface');
+ $backendConfig
+ ->expects($this->once())
+ ->method('getFlag')
+ ->with($this->equalTo('dev/translate_inline/active_admin'))
+ ->will($this->returnValue($result));
+ $config = new Config($backendConfig);
+ $this->assertEquals($result, $config->isActive('any'));
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Captcha/Helper/Adminhtml/DataTest.php b/dev/tests/unit/testsuite/Magento/Captcha/Helper/Adminhtml/DataTest.php
new file mode 100644
index 00000000000..fc8a7412c47
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Captcha/Helper/Adminhtml/DataTest.php
@@ -0,0 +1,74 @@
+<?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_Captcha
+ * @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\Captcha\Helper\Adminhtml;
+
+class DataTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Captcha\Helper\Adminhtml\Data|PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_model;
+
+ /**
+ * setUp
+ */
+ protected function setUp()
+ {
+ $backendConfig = $this->getMockBuilder('Magento\Backend\App\ConfigInterface')
+ ->disableOriginalConstructor()
+ ->setMethods(array('getValue', 'setValue', 'reinit', 'getFlag'))
+ ->getMock();
+ $backendConfig->expects($this->any())
+ ->method('getValue')
+ ->with('admin/captcha/qwe')
+ ->will($this->returnValue('1'));
+
+ $this->_model = new \Magento\Captcha\Helper\Adminhtml\Data(
+ $this->getMock('Magento\App\Helper\Context', array(), array(), '', false),
+ $this->getMock('Magento\App\Dir', array(), array(), '', false),
+ $this->getMock('Magento\Core\Model\StoreManager', array(), array(), '', false),
+ $this->getMock('Magento\Core\Model\Config', array(), array(), '', false),
+ $this->getMock('Magento\Filesystem', array(), array(), '', false),
+ $this->getMock('Magento\Captcha\Model\CaptchaFactory', array(), array(), '', false),
+ $backendConfig
+ );
+ }
+
+ public function testGetConfig()
+ {
+ $this->assertEquals('1', $this->_model->getConfig('qwe'));
+ }
+
+ /**
+ * @covers \Magento\Captcha\Helper\Adminhtml\Data::_getWebsiteCode
+ */
+ public function testGetWebsiteId()
+ {
+ $this->assertStringEndsWith('/admin/', $this->_model->getImgDir());
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php
index d71f39ff8fb..9b2ffd345e8 100644
--- a/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php
@@ -72,10 +72,6 @@ class DataTest extends \PHPUnit_Framework_TestCase
public function testGetCaptcha()
{
$store = $this->_getStoreStub();
- $store->expects($this->once())
- ->method('isAdmin')
- ->will($this->returnValue(false));
-
$store->expects($this->once())
->method('getConfig')
->with('customer/captcha/type')
@@ -103,10 +99,6 @@ class DataTest extends \PHPUnit_Framework_TestCase
public function testGetConfigNode()
{
$store = $this->_getStoreStub();
- $store->expects($this->once())
- ->method('isAdmin')
- ->will($this->returnValue(false));
-
$store->expects($this->once())
->method('getConfig')
->with('customer/captcha/enable')
diff --git a/dev/tests/unit/testsuite/Magento/Captcha/Model/CronTest.php b/dev/tests/unit/testsuite/Magento/Captcha/Model/CronTest.php
new file mode 100644
index 00000000000..9a81ea99ed5
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Captcha/Model/CronTest.php
@@ -0,0 +1,162 @@
+<?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_Captcha
+ * @copyright Copyright (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\Captcha\Model;
+
+/**
+ * Class \Magento\Captcha\Model\CronTest
+ */
+class CronTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * CAPTCHA helper
+ *
+ * @var \Magento\Captcha\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_helper;
+
+ /**
+ * CAPTCHA helper
+ *
+ * @var \Magento\Captcha\Helper\Adminhtml\Data|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_adminHelper;
+
+ /**
+ * @var \Magento\Filesystem|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_filesystem;
+
+ /**
+ * @var \Magento\Core\Model\StoreManager|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_storeManager;
+
+ /**
+ * @var \Magento\Captcha\Model\Cron
+ */
+ protected $_model;
+
+ /**
+ * @var int
+ */
+ public static $currentTime;
+
+ /**
+ * Create mocks and model
+ */
+ public function setUp()
+ {
+ $this->_helper = $this->getMock('Magento\Captcha\Helper\Data', array(), array(), '', false);
+ $this->_adminHelper = $this->getMock('Magento\Captcha\Helper\Adminhtml\Data', array(), array(), '', false);
+ $this->_filesystem = $this->getMock('Magento\Filesystem', array(), array(), '', false);
+ $this->_storeManager = $this->getMock('Magento\Core\Model\StoreManager', array(), array(), '', false);
+
+ $this->_model = new \Magento\Captcha\Model\Cron(
+ $this->getMock('Magento\Captcha\Model\Resource\LogFactory', array(), array(), '', false),
+ $this->_helper,
+ $this->_adminHelper,
+ $this->_filesystem,
+ $this->_storeManager
+ );
+ }
+
+ /**
+ * @dataProvider getExpiredImages
+ */
+ public function testDeleteExpiredImages($website, $isFile, $filename, $mTime, $timeout, $mustDelete)
+ {
+ $this->_storeManager->expects($this->once())
+ ->method('getWebsites')
+ ->will($this->returnValue(isset($website) ? array($website) : array()));
+ if (isset($website)) {
+ $this->_helper->expects($this->once())
+ ->method('getConfig')
+ ->with(
+ $this->equalTo('timeout'),
+ new \PHPUnit_Framework_Constraint_IsIdentical($website->getDefaultStore())
+ )
+ ->will($this->returnValue($timeout));
+ } else {
+ $this->_helper->expects($this->never())->method('getConfig');
+ }
+ $this->_adminHelper->expects($this->once())
+ ->method('getConfig')
+ ->with(
+ $this->equalTo('timeout'),
+ new \PHPUnit_Framework_Constraint_IsNull()
+ )
+ ->will($this->returnValue($timeout));
+
+ $timesToCall = isset($website) ? 2 : 1;
+ $this->_filesystem->expects($this->exactly($timesToCall))
+ ->method('getNestedKeys')
+ ->will($this->returnValue(array($filename)));
+ $this->_filesystem->expects($this->exactly($timesToCall))->method('isFile')->will($this->returnValue($isFile));
+ $this->_filesystem->expects($this->any())->method('getMTime')->will($this->returnValue($mTime));
+ if ($mustDelete) {
+ $this->_filesystem->expects($this->exactly($timesToCall))->method('delete')->with($filename);
+ } else {
+ $this->_filesystem->expects($this->never())->method('delete');
+ }
+ $this->_model->deleteExpiredImages();
+ }
+
+ /**
+ * @return array
+ */
+ public function getExpiredImages()
+ {
+ $website = $this->getMock(
+ 'Magento\Core\Model\Website',
+ array('__wakeup', 'getDefaultStore'),
+ array(),
+ '',
+ false
+ );
+ $store = $this->getMock('Magento\Core\Model\Store', array('__wakeup'), array(), '', false);
+ $website->expects($this->any())->method('getDefaultStore')->will($this->returnValue($store));
+ $time = time();
+ return array(
+ array(null, true, 'test.png', 50, ($time - 60) / 60, true),
+ array($website, false, 'test.png', 50, ($time - 60) / 60, false),
+ array($website, true, 'test.jpg', 50, ($time - 60) / 60, false),
+ array($website, true, 'test.png', 50, ($time - 20) / 60, false)
+ );
+ }
+}
+
+/**
+ * Fix current time
+ *
+ * @return int
+ */
+function time()
+{
+ if (!isset(CronTest::$currentTime)) {
+ CronTest::$currentTime = \time();
+ }
+ return CronTest::$currentTime;
+}
diff --git a/dev/tests/unit/testsuite/Magento/Captcha/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Captcha/Model/ObserverTest.php
index 7eb623229d4..a1177ceb625 100644
--- a/dev/tests/unit/testsuite/Magento/Captcha/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Captcha/Model/ObserverTest.php
@@ -78,6 +78,16 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
*/
protected $_actionFlag;
+ /**
+ * @var \Magento\Core\Helper\Data
+ */
+ protected $_coreData;
+
+ /**
+ * @var \Magento\Customer\Helper\Data
+ */
+ protected $_customerData;
+
protected function setUp()
{
$this->_objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
@@ -93,7 +103,6 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
$this->_customerData = $this->getMock('Magento\Customer\Helper\Data', array(), array(), '', false);
$this->_helper = $this->getMock('Magento\Captcha\Helper\Data', array(), array(), '', false);
$this->_urlManager = $this->getMock('Magento\Core\Model\Url', array(), array(), '', false);
- $this->_filesystem = $this->getMock('Magento\Filesystem', array(), array(), '', false);
$this->_actionFlag = $this->getMock('Magento\App\ActionFlag', array(), array(), '', false);
$this->_observer = $this->_objectManager->getObject(
'Magento\Captcha\Model\Observer',
@@ -105,7 +114,6 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
'customerData' => $this->_customerData,
'helper' => $this->_helper,
'urlManager' => $this->_urlManager,
- 'filesystem' => $this->_filesystem,
'actionFlag' => $this->_actionFlag
)
);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/ValueTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/ValueTest.php
index c4192571c7b..dd4d096265c 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/ValueTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/ValueTest.php
@@ -41,7 +41,7 @@ class ValueTest extends \PHPUnit_Framework_TestCase
*/
public static $valueTitleData = array(
'id' => 2,
- 'store_id' => \Magento\Catalog\Model\AbstractModel::DEFAULT_STORE_ID,
+ 'store_id' => \Magento\Core\Model\Store::DEFAULT_STORE_ID,
'scope' => array('title' => 1)
);
@@ -72,4 +72,4 @@ class ValueTest extends \PHPUnit_Framework_TestCase
$this->_object->saveValueTitles($object);
}
-}
\ No newline at end of file
+}
diff --git a/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Adminhtml/Stock/ItemTest.php b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Adminhtml/Stock/ItemTest.php
new file mode 100644
index 00000000000..251662537eb
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Adminhtml/Stock/ItemTest.php
@@ -0,0 +1,85 @@
+<?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\CatalogInventory\Model\Adminhtml\Stock;
+
+class ItemTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\CatalogInventory\Model\Adminhtml\Stock\Item|PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_model;
+
+ /**
+ * setUp
+ */
+ protected function setUp()
+ {
+ $resourceMock = $this->getMock(
+ 'Magento\Core\Model\Resource\AbstractResource',
+ array('_construct', '_getReadAdapter', '_getWriteAdapter', 'getIdFieldName'),
+ array(), '', false
+ );
+
+ $this->_model = new \Magento\CatalogInventory\Model\Adminhtml\Stock\Item(
+ $this->getMock('Magento\Customer\Model\Session', array(), array(), '', false),
+ $this->getMock('Magento\Index\Model\Indexer', array(), array(), '', false),
+ $this->getMock('Magento\CatalogInventory\Model\Stock\Status', array(), array(), '', false),
+ $this->getMock('Magento\Core\Model\Context', array(), array(), '', false),
+ $this->getMock('Magento\Core\Model\Registry', array(), array(), '', false),
+ $this->getMock('Magento\CatalogInventory\Helper\Data', array(), array(), '', false),
+ $this->getMock('Magento\CatalogInventory\Helper\Minsaleqty', array(), array(), '', false),
+ $this->getMock('Magento\Core\Model\Store\Config', array(), array(), '', false),
+ $this->getMock('Magento\Core\Model\StoreManagerInterface', array(), array(), '', false),
+ $this->getMock('Magento\Core\Model\LocaleInterface', array(), array(), '', false),
+ $this->getMock('Magento\Math\Division', array(), array(), '', false),
+ $resourceMock,
+ $this->getMock('Magento\Data\Collection\Db', array(), array(), '', false),
+ array()
+ );
+ }
+
+ public function testGetCustomerGroupId()
+ {
+ $this->_model->setCustomerGroupId(null);
+ $this->assertEquals(32000, $this->_model->getCustomerGroupId());
+ $this->_model->setCustomerGroupId(2);
+ $this->assertEquals(2, $this->_model->getCustomerGroupId());
+ }
+
+ public function testIsQtyCheckApplicable()
+ {
+ $this->assertTrue($this->_model->checkQty(1.0));
+ }
+
+ public function testCheckQuoteItemQty()
+ {
+ $this->_model->setData('manage_stock', 1);
+ $this->_model->setData('is_in_stock', 1);
+ $this->_model->setProductName('qwerty');
+ $this->_model->setData('backorders', 3);
+ $result = $this->_model->checkQuoteItemQty(1, 1);
+ $this->assertEquals('We don\'t have as many "qwerty" as you requested.', $result->getMessage());
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Centinel/Model/ServiceTest.php b/dev/tests/unit/testsuite/Magento/Centinel/Model/ServiceTest.php
new file mode 100644
index 00000000000..218a78ad7f6
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Centinel/Model/ServiceTest.php
@@ -0,0 +1,52 @@
+<?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)
+ */
+
+/**
+ * Test class for \Magento\Centinel\Model\Service
+ */
+namespace Magento\Centinel\Model;
+
+class ServiceTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @covers \Magento\Centinel\Model\Service::getAuthenticationStartUrl
+ * @covers \Magento\Centinel\Model\Service::_getUrl
+ */
+ public function testGetAuthenticationStartUrl()
+ {
+ $url = $this->getMock('Magento\Core\Model\Url', array('getUrl'), array(), '', false);
+ $url->expects($this->once())
+ ->method('getUrl')
+ ->with($this->equalTo('url_prefix/authenticationstart'))
+ ->will($this->returnValue('some value'));
+
+ $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
+ /** @var Service $model */
+ $model = $helper->getObject(
+ 'Magento\Centinel\Model\Service',
+ array('url' => $url, 'urlPrefix' => 'url_prefix/')
+ );
+ $this->assertEquals('some value', $model->getAuthenticationStartUrl());
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Core/App/Area/Request/PathInfoProcessorTest.php b/dev/tests/unit/testsuite/Magento/Core/App/Area/Request/PathInfoProcessorTest.php
index 54b429dca10..67662c38622 100644
--- a/dev/tests/unit/testsuite/Magento/Core/App/Area/Request/PathInfoProcessorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/App/Area/Request/PathInfoProcessorTest.php
@@ -59,7 +59,7 @@ class PathInfoProcessorTest extends \PHPUnit_Framework_TestCase
{
$store = $this->getMock('\Magento\Core\Model\Store', array(), array(), '', false);
$this->_storeManagerMock
- ->expects($this->once())->method('getStores')->with(true, true)
+ ->expects($this->once())->method('getStores')->with(false, true)
->will($this->returnValue(array('storeCode' => $store)));
$store->expects($this->once())->method('isUseStoreInUrl')->will($this->returnValue(true));
$this->_requestMock
@@ -73,7 +73,7 @@ class PathInfoProcessorTest extends \PHPUnit_Framework_TestCase
{
$store = $this->getMock('\Magento\Core\Model\Store', array(), array(), '', false);
$this->_storeManagerMock
- ->expects($this->once())->method('getStores')->with(true, true)
+ ->expects($this->once())->method('getStores')->with(false, true)
->will($this->returnValue(array('storeCode' => $store)));
$store->expects($this->once())->method('isUseStoreInUrl')->will($this->returnValue(true));
$this->_requestMock
@@ -88,7 +88,7 @@ class PathInfoProcessorTest extends \PHPUnit_Framework_TestCase
$path = '/0/node_one/';
$store = $this->getMock('\Magento\Core\Model\Store', array(), array(), '', false);
$this->_storeManagerMock
- ->expects($this->once())->method('getStores')->with(true, true)
+ ->expects($this->once())->method('getStores')->with(false, true)
->will($this->returnValue(array('0' => $store)));
$store->expects($this->once())->method('isUseStoreInUrl')->will($this->returnValue(true));
$this->_requestMock
@@ -102,10 +102,10 @@ class PathInfoProcessorTest extends \PHPUnit_Framework_TestCase
{
$store = $this->getMock('\Magento\Core\Model\Store', array(), array(), '', false);
$this->_storeManagerMock
- ->expects($this->once())->method('getStores')->with(true, true)
+ ->expects($this->once())->method('getStores')->with(false, true)
->will($this->returnValue(array('0' => $store)));
$store->expects($this->never())->method('isUseStoreInUrl');
$this->_requestMock->expects($this->never())->method('isDirectAccessFrontendName');
$this->assertEquals($this->_pathInfo, $this->_model->process($this->_requestMock, $this->_pathInfo));
}
-}
\ No newline at end of file
+}
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 88df23167e2..658d07f0148 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
@@ -34,32 +34,37 @@ class MergeTest extends \PHPUnit_Framework_TestCase
/**
* @var \Magento\Core\Model\Layout\Merge
*/
- private $_model;
+ protected $_model;
/**
* @var \PHPUnit_Framework_MockObject_MockObject
*/
- private $_resource;
+ protected $_resource;
/**
* @var \PHPUnit_Framework_MockObject_MockObject
*/
- private $_appState;
+ protected $_appState;
/**
* @var \PHPUnit_Framework_MockObject_MockObject
*/
- private $_cache;
+ protected $_cache;
/**
* @var \PHPUnit_Framework_MockObject_MockObject
*/
- private $_theme;
+ protected $_theme;
/**
* @var \PHPUnit_Framework_MockObject_MockObject
*/
- private $_store;
+ protected $_store;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_logger;
protected function setUp()
{
@@ -81,6 +86,8 @@ class MergeTest extends \PHPUnit_Framework_TestCase
$this->_appState = $this->getMock('Magento\App\State', array(), array(), '', false);
+ $this->_logger = $this->getMock('Magento\Logger', array('log'), array(), '', false);
+
$this->_cache = $this->getMockForAbstractClass('Magento\Cache\FrontendInterface');
$this->_theme = $this->getMock('Magento\Core\Model\Theme', array(), array(), '', false, false);
@@ -97,6 +104,7 @@ class MergeTest extends \PHPUnit_Framework_TestCase
'appState' => $this->_appState,
'cache' => $this->_cache,
'theme' => $this->_theme,
+ 'logger' => $this->_logger
));
}
@@ -233,6 +241,11 @@ class MergeTest extends \PHPUnit_Framework_TestCase
public function testGetFileLayoutUpdatesXml()
{
+ $errorString = "Theme layout update file '" . __DIR__ . "/_files/layout/file_wrong.xml' is not valid.";
+ $this->_logger->expects($this->atLeastOnce())
+ ->method('log')
+ ->with($this->stringStartsWith($errorString), \Zend_Log::ERR, \Magento\Logger::LOGGER_SYSTEM);
+
$actualXml = $this->_model->getFileLayoutUpdatesXml();
$this->assertXmlStringEqualsXmlFile(__DIR__ . '/_files/merged.xml', $actualXml->asNiceXml());
}
diff --git a/dev/tests/unit/testsuite/Magento/Adminhtml/Model/LayoutUpdate/ValidatorTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/Update/ValidatorTest.php
similarity index 89%
rename from dev/tests/unit/testsuite/Magento/Adminhtml/Model/LayoutUpdate/ValidatorTest.php
rename to dev/tests/unit/testsuite/Magento/Core/Model/Layout/Update/ValidatorTest.php
index 31c776f5af8..3172fc1f43c 100644
--- a/dev/tests/unit/testsuite/Magento/Adminhtml/Model/LayoutUpdate/ValidatorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/Update/ValidatorTest.php
@@ -25,7 +25,7 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Adminhtml\Model\LayoutUpdate;
+namespace Magento\Core\Model\Layout\Update;
class ValidatorTest extends \PHPUnit_Framework_TestCase
{
@@ -42,7 +42,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
/**
* @param string $layoutUpdate
* @param boolean $isSchemaValid
- * @return \Magento\Adminhtml\Model\LayoutUpdate\Validator
+ * @return \Magento\Core\Model\Layout\Update\Validator
*/
protected function _createValidator($layoutUpdate, $isSchemaValid = true)
{
@@ -75,7 +75,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
: $this->throwException(new \Magento\Config\Dom\ValidationException($exceptionMessage))
);
- $model = $this->_objectHelper->getObject('Magento\Adminhtml\Model\LayoutUpdate\Validator', array(
+ $model = $this->_objectHelper->getObject('Magento\Core\Model\Layout\Update\Validator', array(
'modulesReader' => $modulesReader,
'domConfigFactory' => $domConfigFactory,
));
@@ -96,7 +96,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(
$model->isValid(
$layoutUpdate,
- \Magento\Adminhtml\Model\LayoutUpdate\Validator::LAYOUT_SCHEMA_SINGLE_HANDLE,
+ \Magento\Core\Model\Layout\Update\Validator::LAYOUT_SCHEMA_SINGLE_HANDLE,
false
),
$expectedResult
@@ -112,7 +112,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
return array(
array('test', true, true, array()),
array('test', false, false, array(
- \Magento\Adminhtml\Model\LayoutUpdate\Validator::XML_INVALID =>
+ \Magento\Core\Model\Layout\Update\Validator::XML_INVALID =>
'Please correct the XML data and try again. validation exception'
)),
);
@@ -130,7 +130,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(
$model->isValid(
$layoutUpdate,
- \Magento\Adminhtml\Model\LayoutUpdate\Validator::LAYOUT_SCHEMA_SINGLE_HANDLE,
+ \Magento\Core\Model\Layout\Update\Validator::LAYOUT_SCHEMA_SINGLE_HANDLE,
true
),
$expectedResult
@@ -181,11 +181,11 @@ XML;
XML;
return array(
array($insecureHelper, false, array(
- \Magento\Adminhtml\Model\LayoutUpdate\Validator::HELPER_ARGUMENT_TYPE =>
+ \Magento\Core\Model\Layout\Update\Validator::HELPER_ARGUMENT_TYPE =>
'Helper arguments should not be used in custom layout updates.'
)),
array($insecureUpdater, false, array(
- \Magento\Adminhtml\Model\LayoutUpdate\Validator::UPDATER_MODEL =>
+ \Magento\Core\Model\Layout\Update\Validator::UPDATER_MODEL =>
'Updater model should not be used in custom layout updates.'
)),
array($secureLayout, true, array()),
diff --git a/app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_view_type_grouped.xml b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/file_wrong.xml
similarity index 92%
rename from app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_view_type_grouped.xml
rename to dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/file_wrong.xml
index 6ee5a363ead..3105a760eb0 100644
--- a/app/design/frontend/magento_plushe/Magento_Catalog/layout/catalog_product_view_type_grouped.xml
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/file_wrong.xml
@@ -23,5 +23,5 @@
* @license 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>
+<layout>
+ <container name="content" as="content" label="Main Content Area"/>
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Theme/ThemeProviderTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Theme/ThemeProviderTest.php
index 3d41fa5f102..06f0ad3c060 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Theme/ThemeProviderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Theme/ThemeProviderTest.php
@@ -28,7 +28,7 @@ class ThemeProviderTest extends \PHPUnit_Framework_TestCase
{
public function testGetByFullPath()
{
- $path = 'frontend/magento_fixed_width';
+ $path = 'frontend/magento_plushe';
$collectionFactory = $this->getMock(
'Magento\Core\Model\Resource\Theme\CollectionFactory', array('create'), array(), '', false
);
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Translate/Inline/ConfigFactoryTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Translate/Inline/ConfigFactoryTest.php
new file mode 100644
index 00000000000..53a26037dd6
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Translate/Inline/ConfigFactoryTest.php
@@ -0,0 +1,43 @@
+<?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\Translate\Inline;
+
+class ConfigFactoryTest extends \PHPUnit_Framework_TestCase
+{
+ public function testCreate()
+ {
+ $result = 'result';
+ $objectManager = $this->getMockForAbstractClass('Magento\ObjectManager');
+ $objectManager
+ ->expects($this->once())
+ ->method('create')
+ ->with($this->equalTo('Magento\Core\Model\Translate\Inline\Config'))
+ ->will($this->returnValue($result));
+ $factory = new ConfigFactory($objectManager);
+ $this->assertEquals($result, $factory->create('any'));
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Translate/Inline/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Translate/Inline/ConfigTest.php
new file mode 100644
index 00000000000..c11ebee310e
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Translate/Inline/ConfigTest.php
@@ -0,0 +1,44 @@
+<?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\Translate\Inline;
+
+class ConfigTest extends \PHPUnit_Framework_TestCase
+{
+ public function testIsActive()
+ {
+ $store = 'some store';
+ $result = 'result';
+ $coreStoreConfig = $this->getMock('Magento\Core\Model\Store\Config', array(), array(), '', false);
+ $coreStoreConfig
+ ->expects($this->once())
+ ->method('getConfigFlag')
+ ->with($this->equalTo('dev/translate_inline/active'), $this->equalTo($store))
+ ->will($this->returnValue($result));
+ $config = new Config($coreStoreConfig);
+ $this->assertEquals($result, $config->isActive($store));
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/UrlTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/UrlTest.php
index 93c822b6d85..d441a51ab29 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/UrlTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/UrlTest.php
@@ -37,21 +37,15 @@ class UrlTest extends \PHPUnit_Framework_TestCase
*/
protected $_model;
-
- protected $_sessionMock;
+ /**
+ * @var \Magento\TestFramework\Helper\ObjectManager
+ */
+ protected $_objectManager;
protected function setUp()
{
- $this->_sessionMock = $this->getMock('Magento\Core\Model\Session\AbstractSession', array(), array(), '', false);
- $this->_model = new \Magento\Core\Model\Url(
- $this->getMock('\Magento\App\Route\ConfigInterface'),
- $this->getMock('Magento\App\Request\Http', array(), array(), '', false),
- $this->getMock('Magento\Core\Model\Url\SecurityInfoInterface'),
- $this->getMock('Magento\Core\Model\Store\Config', array(), array(), '', false),
- $this->getMock('Magento\Core\Model\App', array(), array(), '', false, false),
- $this->getMock('Magento\Core\Model\StoreManager', array(), array(), '', false, false),
- $this->getMock('Magento\Core\Model\Session', array(), array(), '', false, false)
- );
+ $this->_objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $this->_model = $this->_objectManager->getObject('\Magento\Core\Model\Url');
}
public function testSetRoutePath()
@@ -119,4 +113,35 @@ class UrlTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('v1', $this->_model->getRouteParam('p1'));
$this->assertEquals('v2', $this->_model->getRouteParam('p2'));
}
+
+ /**
+ * @param $port mixed
+ * @param $url string
+ * @dataProvider getCurrentUrlProvider
+ */
+ public function testGetCurrentUrl($port, $url)
+ {
+ $methods = array('getServer', 'getScheme', 'getHttpHost', 'getModuleName', 'setModuleName',
+ 'getActionName', 'setActionName', 'getParam');
+ $requestMock = $this->getMock('\Magento\App\RequestInterface', $methods);
+ $requestMock->expects($this->at(0))->method('getServer')->with('SERVER_PORT')
+ ->will($this->returnValue($port));
+ $requestMock->expects($this->at(1))->method('getServer')->with('REQUEST_URI')
+ ->will($this->returnValue('/fancy_uri'));
+ $requestMock->expects($this->once())->method('getScheme')->will($this->returnValue('http'));
+ $requestMock->expects($this->once())->method('getHttpHost')->will($this->returnValue('example.com'));
+
+ /** @var \Magento\Core\Model\Url $model */
+ $model = $this->_objectManager->getObject('Magento\Core\Model\Url', array('request' => $requestMock));
+ $this->assertEquals($url, $model->getCurrentUrl());
+ }
+
+ public function getCurrentUrlProvider()
+ {
+ return array(
+ 'without_port' => array('', 'http://example.com/fancy_uri'),
+ 'default_port' => array(80, 'http://example.com/fancy_uri'),
+ 'custom_port' => array(8080, 'http://example.com:8080/fancy_uri')
+ );
+ }
}
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Backend/CustomerTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Backend/CustomerTest.php
new file mode 100644
index 00000000000..b8b30d10fa1
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Backend/CustomerTest.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Unit test for customer adminhtml model
+ *
+ * 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)
+ */
+
+/**
+ * Test class for \Magento\Customer\Model\Backend\Customer testing
+ */
+namespace Magento\Customer\Model\Backend;
+
+class CustomerTest extends \PHPUnit_Framework_TestCase
+{
+ /** @var \Magento\Core\Model\StoreManager|\PHPUnit_Framework_MockObject_MockObject */
+ protected $_storeManager;
+
+ /** @var \Magento\Customer\Model\Backend\Customer */
+ protected $_model;
+
+ /**
+ * Create model
+ */
+ protected function setUp()
+ {
+ $this->_storeManager = $this->getMock('Magento\Core\Model\StoreManager', array(), array(), '', false);
+ $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $this->_model = $helper->getObject('Magento\Customer\Model\Backend\Customer', array(
+ 'storeManager' => $this->_storeManager
+ )
+ );
+ }
+
+ /**
+ * @dataProvider getStoreDataProvider
+ * @param $websiteId
+ * @param $websiteStoreId
+ * @param $storeId
+ * @param $result
+ */
+ public function testGetStoreId($websiteId, $websiteStoreId, $storeId, $result)
+ {
+ if ($websiteId * 1) {
+ $this->_model->setWebsiteId($websiteId);
+ $website = new \Magento\Object(array('store_ids' => array($websiteStoreId)));
+ $this->_storeManager->expects($this->once())->method('getWebsite')->will($this->returnValue($website));
+ } else {
+ $this->_model->setStoreId($storeId);
+ $this->_storeManager->expects($this->never())->method('getWebsite');
+ }
+ $this->assertEquals($result, $this->_model->getStoreId());
+ }
+
+ /**
+ * Data provider for testGetStoreId
+ * @return array
+ */
+ public function getStoreDataProvider()
+ {
+ return array(
+ array(1, 10, 5, 10),
+ array(0, 10, 5, 5)
+ );
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/EditTest.php b/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/EditTest.php
index ae60231f57b..2bdad813ea6 100644
--- a/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/EditTest.php
+++ b/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/EditTest.php
@@ -75,7 +75,7 @@ class EditTest extends \PHPUnit_Framework_TestCase
$objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
$this->_registryMock = $this->getMock('Magento\Core\Model\Registry', array(), array(), '', false, false);
$layoutMock = $this->getMock('Magento\Core\Model\Layout', array(), array(), '', false, false);
- $helperMock = $this->getMock('Magento\Adminhtml\Helper\Data', array(), array(), '', false, false);
+ $helperMock = $this->getMock('Magento\Backend\Helper\Data', array(), array(), '', false, false);
$menuConfigMock = $this->getMock('Magento\Backend\Model\Menu\Config', array(), array(), '', false, false);
$menuMock = $this->getMock('Magento\Backend\Model\Menu', array(), array(), '', false, false);
$menuItemMock = $this->getMock('Magento\Backend\Model\Menu\Item', array(), array(), '', false, false);
diff --git a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/Eav/Customer/AddressTest.php b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/Eav/Customer/AddressTest.php
index 9d9ebe7840f..c1f6deee445 100644
--- a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/Eav/Customer/AddressTest.php
+++ b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/Eav/Customer/AddressTest.php
@@ -40,8 +40,8 @@ class AddressTest extends \PHPUnit_Framework_TestCase
* @var array
*/
protected $_websites = array(
- \Magento\Core\Model\AppInterface::ADMIN_STORE_ID => 'admin',
- 1 => 'website1',
+ \Magento\Core\Model\Store::DEFAULT_STORE_ID => 'admin',
+ 1 => 'website1',
);
/**
@@ -204,7 +204,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
unset($websites[0]);
}
foreach ($this->_websites as $id => $code) {
- if (!$withDefault && $id == \Magento\Core\Model\AppInterface::ADMIN_STORE_ID) {
+ if (!$withDefault && $id == \Magento\Core\Model\Store::DEFAULT_STORE_ID) {
continue;
}
$websiteData = array(
diff --git a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/Eav/CustomerTest.php b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/Eav/CustomerTest.php
index 9fa1451d3c6..43950382192 100644
--- a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/Eav/CustomerTest.php
+++ b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Export/Entity/Eav/CustomerTest.php
@@ -41,8 +41,8 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
* @var array
*/
protected $_websites = array(
- \Magento\Core\Model\AppInterface::ADMIN_STORE_ID => 'admin',
- 1 => 'website1',
+ \Magento\Core\Model\Store::DEFAULT_STORE_ID => 'admin',
+ 1 => 'website1',
);
/**
@@ -168,7 +168,7 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
unset($websites[0]);
}
foreach ($this->_websites as $id => $code) {
- if (!$withDefault && $id == \Magento\Core\Model\AppInterface::ADMIN_STORE_ID) {
+ if (!$withDefault && $id == \Magento\Core\Model\Store::DEFAULT_STORE_ID) {
continue;
}
$websiteData = array(
diff --git a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/Eav/Customer/AddressTest.php b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/Eav/Customer/AddressTest.php
index 1ec10a17795..ce66279843c 100644
--- a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/Eav/Customer/AddressTest.php
+++ b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/Eav/Customer/AddressTest.php
@@ -339,7 +339,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
unset($websites[0]);
}
foreach ($this->_websites as $id => $code) {
- if (!$withDefault && $id == \Magento\Core\Model\AppInterface::ADMIN_STORE_ID) {
+ if (!$withDefault && $id == \Magento\Core\Model\Store::DEFAULT_STORE_ID) {
continue;
}
$websiteData = array(
diff --git a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/ProductTest.php b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/ProductTest.php
new file mode 100644
index 00000000000..42c109aadb0
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/ProductTest.php
@@ -0,0 +1,237 @@
+<?php
+/**
+ * Test class for \Magento\ImportExport\Model\Import\Entity\Product
+ *
+ * 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_ImportExport
+ * @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\ImportExport\Model\Import\Entity;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ProductTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * Abstract import entity eav model
+ *
+ * @var \Magento\ImportExport\Model\Import\Entity\AbstractEav
+ */
+ protected $_model;
+
+ /**
+ * @var \Magento\Eav\Model\Config|PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_eavConfig;
+
+ /**
+ * @var \Magento\ImportExport\Model\Import\Entity\Product\OptionFactory|PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_optionFactory;
+
+ /**
+ * @var \Magento\ImportExport\Model\Import\Entity\Product\Option|PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_optionModel;
+
+ /**
+ * @var \Magento\Core\Model\StoreManager
+ */
+ protected $_storeManager;
+
+ /**
+ * @var \Magento\Eav\Model\Resource\Entity\Attribute\Set\CollectionFactory
+ */
+ protected $_setColFactory;
+
+ /**
+ * @var \Magento\Eav\Model\Resource\Entity\Attribute\Set\Collection
+ */
+ protected $_setCol;
+
+ /**
+ * @var \Magento\ImportExport\Model\Import\Config
+ */
+ protected $_importConfig;
+
+ /**
+ * @var \Magento\Catalog\Model\Resource\Category\CollectionFactory
+ */
+ protected $_categoryColFactory;
+
+ /**
+ * @var \Magento\Catalog\Model\Resource\Category\Collection
+ */
+ protected $_categoryCol;
+
+ /**
+ * @var \Magento\Catalog\Model\ProductFactory
+ */
+ protected $_productFactory;
+
+ /**
+ * @var \Magento\Catalog\Model\Product
+ */
+ protected $_product;
+
+ /**
+ * @var \Magento\Customer\Model\Resource\Group\CollectionFactory
+ */
+ protected $_groupColFactory;
+
+ protected function setUp()
+ {
+ $this->_eavConfig = $this->getMock('Magento\Eav\Model\Config', array('getEntityType', 'getEntityTypeId'),
+ array(), '', false);
+
+ $this->_eavConfig->expects($this->atLeastOnce())->method('getEntityType')
+ ->with($this->equalTo('catalog_product'))
+ ->will($this->returnSelf());
+ $this->_eavConfig->expects($this->atLeastOnce())->method('getEntityTypeId')
+ ->will($this->returnValue('1'));
+
+ $this->_optionModel = $this->getMock('\Magento\ImportExport\Model\Import\Entity\Product\Option',
+ array(), array(), '', false);
+ $this->_optionFactory = $this->getMock('\Magento\ImportExport\Model\Import\Entity\Product\OptionFactory',
+ array('create'), array(), '', false);
+ $this->_optionFactory->expects($this->atLeastOnce())->method('create')
+ ->will($this->returnValue($this->_optionModel));
+
+ $this->_storeManager = $this->getMock('\Magento\Core\Model\StoreManager',
+ array('getWebsites', 'getStores'), array(), '', false);
+
+ $this->_storeManager->expects($this->atLeastOnce())->method('getWebsites')->will($this->returnValue(array()));
+ $this->_storeManager->expects($this->atLeastOnce())->method('getStores')->will($this->returnValue(array()));
+
+ $this->_setCol = $this->getMock('\Magento\Eav\Model\Resource\Entity\Attribute\Set\Collection',
+ array('setEntityTypeFilter'), array(), '', false);
+ $this->_setCol->expects($this->atLeastOnce())->method('setEntityTypeFilter')->with($this->equalTo('1'))
+ ->will($this->returnValue(array()));
+
+ $this->_setColFactory = $this->getMock('\Magento\Eav\Model\Resource\Entity\Attribute\Set\CollectionFactory',
+ array('create'), array(), '', false);
+ $this->_setColFactory->expects($this->atLeastOnce())->method('create')
+ ->will($this->returnValue($this->_setCol));
+
+ $this->_importConfig = $this->getMock('\Magento\ImportExport\Model\Import\Config',
+ array('getProductTypes'), array(), '', false);
+ $this->_importConfig->expects($this->atLeastOnce())->method('getProductTypes')
+ ->will($this->returnValue(array()));
+
+ $this->_categoryCol = $this->getMock('\Magento\Catalog\Model\Resource\Category\Collection',
+ array('addNameToResult'), array(), '', false);
+ $this->_categoryCol->expects($this->atLeastOnce())->method('addNameToResult')
+ ->will($this->returnValue(array()));
+
+ $this->_categoryColFactory = $this->getMock('\Magento\Catalog\Model\Resource\Category\CollectionFactory',
+ array('create'), array(), '', false);
+ $this->_categoryColFactory->expects($this->atLeastOnce())->method('create')
+ ->will($this->returnValue($this->_categoryCol));
+
+ $this->_product = $this->getMock('\Magento\Catalog\Model\Product',
+ array('getProductEntitiesInfo', '__wakeup'), array(), '', false);
+ $this->_product->expects($this->atLeastOnce())->method('getProductEntitiesInfo')
+ ->with($this->equalTo(array('entity_id', 'type_id', 'attribute_set_id', 'sku')))
+ ->will($this->returnValue(array()));
+
+ $this->_productFactory = $this->getMock('\Magento\Catalog\Model\ProductFactory',
+ array('create'), array(), '', false);
+ $this->_productFactory->expects($this->atLeastOnce())->method('create')
+ ->will($this->returnValue($this->_product));
+
+ $this->_groupColFactory = $this->getMock('\Magento\Customer\Model\Resource\Group\CollectionFactory',
+ array('create'), array(), '', false);
+ $this->_groupColFactory->expects($this->atLeastOnce())->method('create')
+ ->will($this->returnValue(array()));
+
+ $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+ $this->_model = $objectManager->getObject('\Magento\ImportExport\Model\Import\Entity\Product', array(
+ 'config' => $this->_eavConfig,
+ 'optionFactory' => $this->_optionFactory,
+ 'storeManager' => $this->_storeManager,
+ 'setColFactory' => $this->_setColFactory,
+ 'importConfig' => $this->_importConfig,
+ 'categoryColFactory' => $this->_categoryColFactory,
+ 'productFactory' => $this->_productFactory,
+ 'groupColFactory' => $this->_groupColFactory
+ ));
+ }
+
+ protected function tearDown()
+ {
+ unset($this->_model);
+ }
+
+ /**
+ * @param array $data
+ * @param array $expected
+ * @dataProvider isMediaValidDataProvider
+ */
+ public function testIsMediaValid($data, $expected)
+ {
+ $method = new \ReflectionMethod('\Magento\ImportExport\Model\Import\Entity\Product', '_isMediaValid');
+ $method->setAccessible(true);
+
+ $this->assertEquals($expected['method_return'], $method->invoke($this->_model, $data, 1));
+
+ $errors = new \ReflectionProperty('\Magento\ImportExport\Model\Import\Entity\Product', '_errors');
+ $errors->setAccessible(true);
+ $this->assertEquals($expected['_errors'], $errors->getValue($this->_model));
+
+ $invalidRows = new \ReflectionProperty('\Magento\ImportExport\Model\Import\Entity\Product', '_invalidRows');
+ $invalidRows->setAccessible(true);
+ $this->assertEquals($expected['_invalidRows'], $invalidRows->getValue($this->_model));
+
+ $errorsCount = new \ReflectionProperty('\Magento\ImportExport\Model\Import\Entity\Product', '_errorsCount');
+ $errorsCount->setAccessible(true);
+ $this->assertEquals($expected['_errorsCount'], $errorsCount->getValue($this->_model));
+ }
+
+ /**
+ * @return array
+ */
+ public function isMediaValidDataProvider()
+ {
+ return array(
+ 'valid' => array(
+ array('_media_image' => 1, '_media_attribute_id' => 1),
+ array('method_return' => true, '_errors' => array(), '_invalidRows' => array(), '_errorsCount' => 0),
+ ),
+ 'valid2' => array(
+ array('_media_attribute_id' => 1),
+ array('method_return' => true, '_errors' => array(), '_invalidRows' => array(), '_errorsCount' => 0),
+ ),
+ 'invalid' => array(
+ array('_media_image' => 1),
+ array(
+ 'method_return' => false,
+ '_errors' => array('mediaDataIsIncomplete' => array(array(2, null))),
+ '_invalidRows' => array(1 => 1),
+ '_errorsCount' => 1
+ ),
+ ),
+ );
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Items/GridTest.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Items/GridTest.php
index 8cf7e95d063..02b0fe44410 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Items/GridTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Items/GridTest.php
@@ -69,7 +69,7 @@ class GridTest extends \PHPUnit_Framework_TestCase
->setMethods(array('methods'))
->getMock();
- $giftMessageSave = $this->getMockBuilder('Magento\Adminhtml\Model\Giftmessage\Save')
+ $giftMessageSave = $this->getMockBuilder('Magento\GiftMessage\Model\Save')
->disableOriginalConstructor()
->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php
index 3a3713c08ef..63d6c3fa1e0 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php
@@ -206,7 +206,7 @@ class CustomizationTest extends \PHPUnit_Framework_TestCase
*/
protected function _getAssignedTheme()
{
- return new \Magento\Object(array('id' => 1, 'theme_path' => 'magento_demo'));
+ return new \Magento\Object(array('id' => 1, 'theme_path' => 'magento_plushe'));
}
/**
diff --git a/dev/tests/unit/testsuite/Magento/View/Design/Theme/FlyweightFactoryTest.php b/dev/tests/unit/testsuite/Magento/View/Design/Theme/FlyweightFactoryTest.php
index 71f70fa788a..371075dd3b9 100644
--- a/dev/tests/unit/testsuite/Magento/View/Design/Theme/FlyweightFactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/View/Design/Theme/FlyweightFactoryTest.php
@@ -69,7 +69,7 @@ class FlyweightFactoryTest extends \PHPUnit_Framework_TestCase
*/
public function testCreateByPath()
{
- $path = 'frontend/magento_fixed_width';
+ $path = 'frontend/magento_plushe';
$themeId = 7;
$theme = $this->getMock('Magento\Core\Model\Theme', array(), array(), '', false);
$theme->expects($this->exactly(3))
@@ -82,7 +82,7 @@ class FlyweightFactoryTest extends \PHPUnit_Framework_TestCase
$this->themeProviderMock->expects($this->once())
->method('getThemeByFullPath')
- ->with('frontend/frontend/magento_fixed_width')
+ ->with('frontend/frontend/magento_plushe')
->will($this->returnValue($theme));
$this->assertSame($theme, $this->factory->create($path));
diff --git a/downloader/app/Magento/Downloader/Controller.php b/downloader/app/Magento/Downloader/Controller.php
index b7db3018a37..f6b48772f67 100755
--- a/downloader/app/Magento/Downloader/Controller.php
+++ b/downloader/app/Magento/Downloader/Controller.php
@@ -1036,7 +1036,7 @@ final class Controller
->get('Magento\Core\Model\Registry')
->register('backup_manager', $backupManager);
- if ($type != \Magento\Backup\Helper\Data::TYPE_DB) {
+ if ($type != \Magento\Backup\Factory::TYPE_DB) {
$backupManager->setRootDir(\Mage::getBaseDir())
->addIgnorePaths($this->_getBackupIgnorePaths());
}
@@ -1059,10 +1059,10 @@ final class Controller
protected function _getExtensionType($type)
{
$extensionType = array(
- \Magento\Backup\Helper\Data::TYPE_SYSTEM_SNAPSHOT => 'tgz',
- \Magento\Backup\Helper\Data::TYPE_SNAPSHOT_WITHOUT_MEDIA => 'tgz',
- \Magento\Backup\Helper\Data::TYPE_MEDIA => 'tgz',
- \Magento\Backup\Helper\Data::TYPE_DB => 'gz'
+ \Magento\Backup\Factory::TYPE_SYSTEM_SNAPSHOT => 'tgz',
+ \Magento\Backup\Factory::TYPE_SNAPSHOT_WITHOUT_MEDIA => 'tgz',
+ \Magento\Backup\Factory::TYPE_MEDIA => 'tgz',
+ \Magento\Backup\Factory::TYPE_DB => 'gz'
);
return $extensionType[$type];
@@ -1092,10 +1092,10 @@ final class Controller
protected function _getBackupTypeByCode($code)
{
$typeMap = array(
- 1 => \Magento\Backup\Helper\Data::TYPE_DB,
- 2 => \Magento\Backup\Helper\Data::TYPE_SYSTEM_SNAPSHOT,
- 3 => \Magento\Backup\Helper\Data::TYPE_SNAPSHOT_WITHOUT_MEDIA,
- 4 => \Magento\Backup\Helper\Data::TYPE_MEDIA
+ 1 => \Magento\Backup\Factory::TYPE_DB,
+ 2 => \Magento\Backup\Factory::TYPE_SYSTEM_SNAPSHOT,
+ 3 => \Magento\Backup\Factory::TYPE_SNAPSHOT_WITHOUT_MEDIA,
+ 4 => \Magento\Backup\Factory::TYPE_MEDIA
);
if (!isset($typeMap[$code])) {
@@ -1114,10 +1114,10 @@ final class Controller
protected function _getCreateBackupSuccessMessageByType($type)
{
$messagesMap = array(
- \Magento\Backup\Helper\Data::TYPE_SYSTEM_SNAPSHOT => 'System backup has been created',
- \Magento\Backup\Helper\Data::TYPE_SNAPSHOT_WITHOUT_MEDIA => 'System (excluding Media) backup has been created',
- \Magento\Backup\Helper\Data::TYPE_MEDIA => 'Database and media backup has been created',
- \Magento\Backup\Helper\Data::TYPE_DB => 'Database backup has been created'
+ \Magento\Backup\Factory::TYPE_SYSTEM_SNAPSHOT => 'System backup has been created',
+ \Magento\Backup\Factory::TYPE_SNAPSHOT_WITHOUT_MEDIA => 'System (excluding Media) backup has been created',
+ \Magento\Backup\Factory::TYPE_MEDIA => 'Database and media backup has been created',
+ \Magento\Backup\Factory::TYPE_DB => 'Database backup has been created'
);
if (!isset($messagesMap[$type])) {
diff --git a/downloader/app/Magento/Downloader/Model/Config/AbstractConfig.php b/downloader/app/Magento/Downloader/Model/Config/AbstractConfig.php
index cf25c0b4888..9ea95e6b2fe 100644
--- a/downloader/app/Magento/Downloader/Model/Config/AbstractConfig.php
+++ b/downloader/app/Magento/Downloader/Model/Config/AbstractConfig.php
@@ -36,7 +36,7 @@ namespace Magento\Downloader\Model\Config;
class AbstractConfig extends \Magento\Downloader\Model
{
/**
- * Retrive file name
+ * Retrieve file name
*
* @return string
*/
diff --git a/downloader/app/Magento/Downloader/Model/Connect.php b/downloader/app/Magento/Downloader/Model/Connect.php
index 2f9d6838d78..76db951fd63 100644
--- a/downloader/app/Magento/Downloader/Model/Connect.php
+++ b/downloader/app/Magento/Downloader/Model/Connect.php
@@ -39,7 +39,7 @@ include_once "Magento/Connect.php";
class Connect extends \Magento\Downloader\Model
{
/**
- * Retrive object of \Magento\Downloader\Connect
+ * Retrieve object of \Magento\Downloader\Connect
*
* @return \Magento\Downloader\Connect
*/
diff --git a/downloader/lib/Magento/Backup/Snapshot.php b/downloader/lib/Magento/Backup/Snapshot.php
index 0e2e9bc66ca..e08ca513690 100755
--- a/downloader/lib/Magento/Backup/Snapshot.php
+++ b/downloader/lib/Magento/Backup/Snapshot.php
@@ -133,7 +133,7 @@ class Snapshot extends \Magento\Backup\Filesystem
*/
protected function _createDbBackupInstance()
{
- return $this->_backupFactory->create(\Magento\Backup\Helper\Data::TYPE_DB)
+ return $this->_backupFactory->create(\Magento\Backup\Factory::TYPE_DB)
->setBackupExtension('gz')
->setTime($this->getTime())
->setBackupsDir($this->_dirs->getDir('var'))
diff --git a/downloader/lib/Magento/Connect/Package.php b/downloader/lib/Magento/Connect/Package.php
index 87adef51207..d17d65354a5 100644
--- a/downloader/lib/Magento/Connect/Package.php
+++ b/downloader/lib/Magento/Connect/Package.php
@@ -1112,7 +1112,7 @@ END;
/**
* Validate package. Errors can be
- * retreived by calling getErrors();
+ * retrieved by calling getErrors();
*
* @return bool
*/
diff --git a/downloader/lib/Magento/System/Ftp.php b/downloader/lib/Magento/System/Ftp.php
index b96dcc5fd27..7911fb26137 100755
--- a/downloader/lib/Magento/System/Ftp.php
+++ b/downloader/lib/Magento/System/Ftp.php
@@ -59,7 +59,7 @@ class Ftp
/**
* ftp_mkdir wrapper
*
- * @param sting $name
+ * @param string $name
* @return unknown_type
*/
public function mdkir($name)
diff --git a/lib/Magento/App/Cache.php b/lib/Magento/App/Cache.php
index 9ea02998024..970773d4d3a 100644
--- a/lib/Magento/App/Cache.php
+++ b/lib/Magento/App/Cache.php
@@ -26,7 +26,7 @@
/**
* System cache model
- * support id and tags preffix support,
+ * support id and tags prefix support,
*/
namespace Magento\App;
diff --git a/lib/Magento/App/Dir.php b/lib/Magento/App/Dir.php
index f9ad9d74171..3e68f380adc 100644
--- a/lib/Magento/App/Dir.php
+++ b/lib/Magento/App/Dir.php
@@ -3,7 +3,7 @@
* Application file system directories dictionary
*
* Provides information about what directories are available in the application
- * Serves as customizaiton point to specify different directories or add own
+ * Serves as customization point to specify different directories or add own
*
* Magento
*
diff --git a/lib/Magento/App/Request/Http.php b/lib/Magento/App/Request/Http.php
index 59d99a944d7..c22adc7edc8 100644
--- a/lib/Magento/App/Request/Http.php
+++ b/lib/Magento/App/Request/Http.php
@@ -52,7 +52,7 @@ class Http extends \Zend_Controller_Request_Http implements \Magento\App\Request
protected $_controllerModule = null;
/**
- * Streight request flag.
+ * Straight request flag.
* If flag is determined no additional logic is applicable
*
* @var $_isStraight bool
diff --git a/lib/Magento/Backup/Factory.php b/lib/Magento/Backup/Factory.php
index 4001ecf1d80..084b2d8683b 100644
--- a/lib/Magento/Backup/Factory.php
+++ b/lib/Magento/Backup/Factory.php
@@ -34,12 +34,37 @@ class Factory
*/
private $_objectManager;
+ /**
+ * Backup type constant for database backup
+ */
+ const TYPE_DB = 'db';
+
+ /**
+ * Backup type constant for filesystem backup
+ */
+ const TYPE_FILESYSTEM = 'filesystem';
+
+ /**
+ * Backup type constant for full system backup(database + filesystem)
+ */
+ const TYPE_SYSTEM_SNAPSHOT = 'snapshot';
+
+ /**
+ * Backup type constant for media and database backup
+ */
+ const TYPE_MEDIA = 'media';
+
+ /**
+ * Backup type constant for full system backup excluding media folder
+ */
+ const TYPE_SNAPSHOT_WITHOUT_MEDIA = 'nomedia';
+
/**
* List of supported a backup types
*
* @var array
*/
- private $_allowedTypes = array('db', 'snapshot', 'filesystem', 'media', 'nomedia');
+ protected $_allowedTypes;
/**
* @param \Magento\ObjectManager $objectManager
@@ -47,6 +72,13 @@ class Factory
public function __construct(\Magento\ObjectManager $objectManager)
{
$this->_objectManager = $objectManager;
+ $this->_allowedTypes = array(
+ self::TYPE_DB,
+ self::TYPE_FILESYSTEM,
+ self::TYPE_SYSTEM_SNAPSHOT,
+ self::TYPE_MEDIA,
+ self::TYPE_SNAPSHOT_WITHOUT_MEDIA,
+ );
}
/**
diff --git a/lib/Magento/Backup/Snapshot.php b/lib/Magento/Backup/Snapshot.php
index 3a3e8bfaf6e..9b55053a542 100644
--- a/lib/Magento/Backup/Snapshot.php
+++ b/lib/Magento/Backup/Snapshot.php
@@ -133,7 +133,7 @@ class Snapshot extends \Magento\Backup\Filesystem
*/
protected function _createDbBackupInstance()
{
- return $this->_backupFactory->create(\Magento\Backup\Helper\Data::TYPE_DB)
+ return $this->_backupFactory->create(\Magento\Backup\Factory::TYPE_DB)
->setBackupExtension('gz')
->setTime($this->getTime())
->setBackupsDir($this->_dirs->getDir('var'))
diff --git a/lib/Magento/Config/Dom.php b/lib/Magento/Config/Dom.php
index febd9a6dce5..f52689dbeb6 100644
--- a/lib/Magento/Config/Dom.php
+++ b/lib/Magento/Config/Dom.php
@@ -137,7 +137,7 @@ class Dom
}
/* override node value */
if ($this->_isTextNode($node)) {
- /* skip the case when the matched node has children, otherwise they get overriden */
+ /* skip the case when the matched node has children, otherwise they get overridden */
if (!$matchedNode->hasChildNodes() || $this->_isTextNode($matchedNode)) {
$matchedNode->nodeValue = $node->childNodes->item(0)->nodeValue;
}
diff --git a/lib/Magento/Connect/Package.php b/lib/Magento/Connect/Package.php
index b148b368253..c01fb071df6 100644
--- a/lib/Magento/Connect/Package.php
+++ b/lib/Magento/Connect/Package.php
@@ -1291,7 +1291,7 @@ END;
/**
* Validate package. Errors can be
- * retreived by calling getErrors();
+ * retrieved by calling getErrors();
*
* @return bool
*/
diff --git a/lib/Magento/Connect/Rest.php b/lib/Magento/Connect/Rest.php
index fedf0e4b0e7..ac1f08b16b9 100644
--- a/lib/Magento/Connect/Rest.php
+++ b/lib/Magento/Connect/Rest.php
@@ -89,7 +89,7 @@ class Rest
* Set channel info
*
* @param string $uri
- * @param sting $name
+ * @param string $name
*/
public function setChannel($uri)
{
@@ -219,15 +219,15 @@ class Rest
}
$return = $output;
}
-
+
$out = array();
foreach($return as $name=>$package) {
$stabilities = array_map(array($this, 'shortStateToLong'), array_keys($package));
- $versions = array_map('trim', array_values($package));
+ $versions = array_map('trim', array_values($package));
$package = array_combine($versions, $stabilities);
ksort($package);
$out[$name] = $package;
- }
+ }
return $out;
}
@@ -337,8 +337,8 @@ class Rest
}
}
}
-
-
+
+
$out = $this->loadChannelUri($package."/".$version."/".$package."-".$version.".".self::EXT);
$statusCode = $this->getLoader()->getStatus();
@@ -355,12 +355,12 @@ class Rest
}
protected $states = array('b'=>'beta', 'd'=>'dev', 's'=>'stable', 'a'=>'alpha');
-
+
public function shortStateToLong($s)
{
return isset($this->states[$s]) ? $this->states[$s] : 'dev';
}
-
-
+
+
}
diff --git a/lib/Magento/Connect/Singleconfig.php b/lib/Magento/Connect/Singleconfig.php
index 633e6141e39..f1f371796a3 100644
--- a/lib/Magento/Connect/Singleconfig.php
+++ b/lib/Magento/Connect/Singleconfig.php
@@ -93,7 +93,7 @@ class Singleconfig
}
public function formatUri($uri)
- {
+ {
$uri = rtrim($uri, "/");
$uri = str_replace("http://", '', $uri);
$uri = str_replace("ftp://", '', $uri);
@@ -593,7 +593,7 @@ class Singleconfig
/**
* Get package
- * @param sting $chanName
+ * @param string $chanName
* @param string $package
* @return void
*/
@@ -652,9 +652,9 @@ class Singleconfig
} elseif(version_compare($min1, $min2, ">=") && version_compare($max1, $max2, "<=")) {
return true;
} elseif(version_compare($min1, $min2, "<=") && version_compare($max1, $max2, ">=")) {
- return true;
+ return true;
}
- return false;
+ return false;
}
/**
@@ -792,8 +792,8 @@ class Singleconfig
}
$deps = $package[self::K_PACK_DEPS];
if($this->specifiedInDependencyList($deps, $chanName, $packageName)) {
- $out[] = array('channel'=>$channel, 'name' =>$package['name'], 'version'=>$package['version']);
- }
+ $out[] = array('channel'=>$channel, 'name' =>$package['name'], 'version'=>$package['version']);
+ }
}
}
return $out;
@@ -825,7 +825,7 @@ class Singleconfig
}
-
+
/**
* Check if package conflicts with installed packages
* Returns:
diff --git a/lib/Magento/Data/Collection.php b/lib/Magento/Data/Collection.php
index 5ab084b7fcb..375fce45cdd 100644
--- a/lib/Magento/Data/Collection.php
+++ b/lib/Magento/Data/Collection.php
@@ -116,14 +116,14 @@ class Collection implements \IteratorAggregate, \Countable, \Magento\Core\Model\
protected $_flags = array();
/**
- * @var \Magento\Core\Model\EntityFactory
+ * @var \Magento\Data\Collection\EntityFactoryInterface
*/
protected $_entityFactory;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Data\Collection\EntityFactoryInterface $entityFactory
*/
- public function __construct(\Magento\Core\Model\EntityFactory $entityFactory)
+ public function __construct(\Magento\Data\Collection\EntityFactoryInterface $entityFactory)
{
$this->_entityFactory = $entityFactory;
}
diff --git a/lib/Magento/Data/Collection/Db.php b/lib/Magento/Data/Collection/Db.php
index a5bfd5a985a..14ef48df1de 100644
--- a/lib/Magento/Data/Collection/Db.php
+++ b/lib/Magento/Data/Collection/Db.php
@@ -104,13 +104,13 @@ class Db extends \Magento\Data\Collection
/**
* @param \Magento\Logger $logger
* @param \Magento\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Data\Collection\EntityFactoryInterface $entityFactory
* @param null $conn
*/
public function __construct(
\Magento\Logger $logger,
\Magento\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
- \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\Data\Collection\EntityFactoryInterface $entityFactory,
$conn = null
) {
parent::__construct($entityFactory);
diff --git a/app/code/Magento/Adminhtml/Block/Messages.php b/lib/Magento/Data/Collection/EntityFactoryInterface.php
similarity index 76%
rename from app/code/Magento/Adminhtml/Block/Messages.php
rename to lib/Magento/Data/Collection/EntityFactoryInterface.php
index 93896f840b8..046daa40d53 100644
--- a/app/code/Magento/Adminhtml/Block/Messages.php
+++ b/lib/Magento/Data/Collection/EntityFactoryInterface.php
@@ -19,21 +19,22 @@
* needs please refer to http://www.magentocommerce.com for more information.
*
* @category Magento
- * @package Magento_Adminhtml
+ * @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\Collection;
-/**
- * Adminhtml messages block
- *
- * @category Magento
- * @package Magento_Adminhtml
- * @author Magento Core Team <core@magentocommerce.com>
- */
-namespace Magento\Adminhtml\Block;
-
-class Messages extends \Magento\View\Block\Messages
+interface EntityFactoryInterface
{
+
+ /**
+ * Create new object instance
+ *
+ * @param string $type
+ * @param array $arguments
+ * @return mixed
+ */
+ public function create($type, array $arguments = array());
}
diff --git a/app/code/Magento/Backend/App/Action/Plugin/Store.php b/lib/Magento/Data/Form/Element/CollectionFactory.php
similarity index 59%
rename from app/code/Magento/Backend/App/Action/Plugin/Store.php
rename to lib/Magento/Data/Form/Element/CollectionFactory.php
index 25d991069eb..6b4b8dfc681 100644
--- a/app/code/Magento/Backend/App/Action/Plugin/Store.php
+++ b/lib/Magento/Data/Form/Element/CollectionFactory.php
@@ -1,6 +1,5 @@
<?php
/**
- *
* Magento
*
* NOTICE OF LICENSE
@@ -19,35 +18,38 @@
* 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\Backend\App\Action\Plugin;
+namespace Magento\Data\Form\Element;
-class Store
+class CollectionFactory
{
/**
- * @var \Magento\Core\Model\StoreManagerInterface
+ * @var \Magento\ObjectManager
*/
- protected $_storeManager;
+ protected $_objectManager;
+
/**
- * @param \Magento\Core\Model\StoreManagerInterface $storeManager
+ * @param \Magento\ObjectManager $objectManager
*/
- public function __construct(\Magento\Core\Model\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\ObjectManager $objectManager)
{
- $this->_storeManager = $storeManager;
+ $this->_objectManager = $objectManager;
}
/**
- * @param array $arguments
- * @param \Magento\Code\Plugin\InvocationChain $invocationChain
- * @return array
+ * Create collection factory with specified parameters
+ *
+ * @param array $data
+ * @return \Magento\Data\Form\Element\Collection
*/
- public function aroundDispatch(array $arguments, \Magento\Code\Plugin\InvocationChain $invocationChain)
+ public function create(array $data = array())
{
- $this->_storeManager->setCurrentStore('admin');
- return $invocationChain->proceed($arguments);
+ return $this->_objectManager->create('Magento\Data\Form\Element\Collection', $data);
}
-}
\ No newline at end of file
+}
diff --git a/lib/Magento/Filter/Object.php b/lib/Magento/Filter/Object.php
index 9a573010f4a..db52fb3edbd 100644
--- a/lib/Magento/Filter/Object.php
+++ b/lib/Magento/Filter/Object.php
@@ -35,14 +35,14 @@ class Object extends \Zend_Filter
protected $_columnFilters = array();
/**
- * @var \Magento\Core\Model\EntityFactory
+ * @var \Magento\Data\Collection\EntityFactoryInterface
*/
protected $_entityFactory;
/**
- * @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\Data\Collection\EntityFactoryInterface $entityFactory
*/
- public function __construct(\Magento\Core\Model\EntityFactory $entityFactory)
+ public function __construct(\Magento\Data\Collection\EntityFactoryInterface $entityFactory)
{
$this->_entityFactory = $entityFactory;
}
diff --git a/lib/Magento/Filter/Template/Tokenizer/AbstractTokenizer.php b/lib/Magento/Filter/Template/Tokenizer/AbstractTokenizer.php
index 866a67ecdca..74ba14747d3 100644
--- a/lib/Magento/Filter/Template/Tokenizer/AbstractTokenizer.php
+++ b/lib/Magento/Filter/Template/Tokenizer/AbstractTokenizer.php
@@ -61,7 +61,7 @@ abstract class AbstractTokenizer
}
/**
- * Move current index to previus char.
+ * Move current index to previous char.
*
* If index out of bounds returns false
*
diff --git a/lib/Magento/Gdata/Gshopping/Content.php b/lib/Magento/Gdata/Gshopping/Content.php
index 61cf6b93de2..8c5de7a4d56 100644
--- a/lib/Magento/Gdata/Gshopping/Content.php
+++ b/lib/Magento/Gdata/Gshopping/Content.php
@@ -94,7 +94,7 @@ class Content extends \Zend_Gdata
}
/**
- * Retreive entry object
+ * Retrieve entry object
*
* @param mixed $location The location for the feed, as a URL or Query
* @return \Magento\Gdata\Gshopping\Entry
diff --git a/lib/Magento/HTTP/Adapter/Curl.php b/lib/Magento/HTTP/Adapter/Curl.php
index cd2ba0499b4..adfa32cb182 100644
--- a/lib/Magento/HTTP/Adapter/Curl.php
+++ b/lib/Magento/HTTP/Adapter/Curl.php
@@ -206,6 +206,9 @@ class Curl implements \Zend_Http_Client_Adapter_Interface
$response = trim($response[1]);
}
+ // CUrl will handle chunked data but leave the header.
+ $response = preg_replace('/Transfer-Encoding:\s+chunked\r?\n/i', '', $response);
+
return $response;
}
diff --git a/lib/Magento/Image/Adapter/Gd2.php b/lib/Magento/Image/Adapter/Gd2.php
index 51601f7755f..3104e2df3e1 100644
--- a/lib/Magento/Image/Adapter/Gd2.php
+++ b/lib/Magento/Image/Adapter/Gd2.php
@@ -499,9 +499,9 @@ class Gd2 extends \Magento\Image\Adapter\AbstractAdapter
}
/**
- * Checks required dependecies
+ * Checks required dependencies
*
- * @throws \Exception if some of dependecies are missing
+ * @throws \Exception if some of dependencies are missing
*/
public function checkDependencies()
{
diff --git a/lib/Magento/Image/Adapter/ImageMagick.php b/lib/Magento/Image/Adapter/ImageMagick.php
index 356c0965938..971f57f19a6 100644
--- a/lib/Magento/Image/Adapter/ImageMagick.php
+++ b/lib/Magento/Image/Adapter/ImageMagick.php
@@ -357,9 +357,9 @@ class ImageMagick extends \Magento\Image\Adapter\AbstractAdapter
}
/**
- * Checks required dependecies
+ * Checks required dependencies
*
- * @throws \Exception if some of dependecies are missing
+ * @throws \Exception if some of dependencies are missing
*/
public function checkDependencies()
{
diff --git a/lib/Magento/Oauth/ConsumerInterface.php b/lib/Magento/Oauth/ConsumerInterface.php
index abb0688cb20..bb1f61b3923 100644
--- a/lib/Magento/Oauth/ConsumerInterface.php
+++ b/lib/Magento/Oauth/ConsumerInterface.php
@@ -37,7 +37,7 @@ interface ConsumerInterface
* Validate consumer data (e.g. Key and Secret length).
*
* @return bool - True if the consumer data is valid.
- * @throws \Magento\Core\Exception|\Exception - Throws exception for validation errors.
+ * @throws \Exception
*/
public function validate();
diff --git a/lib/Magento/Phrase/Renderer/Translate.php b/lib/Magento/Phrase/Renderer/Translate.php
index 5f79905f298..6fc9e306138 100644
--- a/lib/Magento/Phrase/Renderer/Translate.php
+++ b/lib/Magento/Phrase/Renderer/Translate.php
@@ -30,16 +30,16 @@ class Translate implements \Magento\Phrase\RendererInterface
/**
* Basic object for translation
*
- * @var \Magento\Core\Model\Translate
+ * @var \Magento\TranslateInterface
*/
protected $_translator;
/**
* Renderer construct
*
- * @param \Magento\Core\Model\Translate $translator
+ * @param \Magento\TranslateInterface $translator
*/
- public function __construct(\Magento\Core\Model\Translate $translator)
+ public function __construct(\Magento\TranslateInterface $translator)
{
$this->_translator = $translator;
}
diff --git a/lib/Magento/UrlInterface.php b/lib/Magento/UrlInterface.php
index 5c2bcd94cf8..dd9b064fab6 100644
--- a/lib/Magento/UrlInterface.php
+++ b/lib/Magento/UrlInterface.php
@@ -142,6 +142,13 @@ interface UrlInterface
*/
public function getBaseUrl($params = array());
+ /**
+ * Retrieve current url with port number (if not default used)
+ *
+ * @return string
+ */
+ public function getCurrentUrl();
+
/**
* Set Route Parameters
*
diff --git a/lib/Magento/Validator/Composite/VarienObject.php b/lib/Magento/Validator/Composite/VarienObject.php
index 8739212103c..d5afa30fa68 100644
--- a/lib/Magento/Validator/Composite/VarienObject.php
+++ b/lib/Magento/Validator/Composite/VarienObject.php
@@ -75,7 +75,7 @@ class VarienObject implements \Zend_Validate_Interface
* @param \Magento\Object $entity
* @return bool
*
- * @throws \Magento\Core\Exception
+ * @throws \Exception
*/
public function isValid($entity)
{
diff --git a/lib/Magento/View/Block/Template.php b/lib/Magento/View/Block/Template.php
index eab884d1be9..794b77253cc 100644
--- a/lib/Magento/View/Block/Template.php
+++ b/lib/Magento/View/Block/Template.php
@@ -183,7 +183,6 @@ class Template extends AbstractBlock
/**
* Get design area
*
- * @deprecated
* @return string
*/
public function getArea()
diff --git a/lib/Magento/View/DesignInterface.php b/lib/Magento/View/DesignInterface.php
index d5cb26b8c11..c717fd6326c 100644
--- a/lib/Magento/View/DesignInterface.php
+++ b/lib/Magento/View/DesignInterface.php
@@ -46,7 +46,6 @@ interface DesignInterface
/**
* Retrieve package area
*
- * @deprecated
* @return string
*/
public function getArea();
diff --git a/lib/PEAR/SOAP/WSDL.php b/lib/PEAR/SOAP/WSDL.php
index 1fafd342795..9f6ab774d87 100644
--- a/lib/PEAR/SOAP/WSDL.php
+++ b/lib/PEAR/SOAP/WSDL.php
@@ -1022,7 +1022,7 @@ class SOAP_WSDL_Cache extends SOAP_Base
}
/**
- * Retrieves a file from cache if it exists, otherwise retreive from net,
+ * Retrieves a file from cache if it exists, otherwise retrieve from net,
* add to cache, and return from cache.
*
* @param string URL to WSDL
diff --git a/lib/Zend/Currency.php b/lib/Zend/Currency.php
index 668ab704f63..622039178c7 100644
--- a/lib/Zend/Currency.php
+++ b/lib/Zend/Currency.php
@@ -533,7 +533,7 @@ class Zend_Currency
}
/**
- * Sets a new locale for data retreivement
+ * Sets a new locale for data retrievement
* Example: 'de_XX' will be set to 'de' because 'de_XX' does not exist
* 'xx_YY' will be set to 'root' because 'xx' does not exist
*
diff --git a/lib/Zend/Db/Select.php b/lib/Zend/Db/Select.php
index 601259e9e21..43fff9d3c22 100644
--- a/lib/Zend/Db/Select.php
+++ b/lib/Zend/Db/Select.php
@@ -654,7 +654,7 @@ class Zend_Db_Select
}
/**
- * Get part of the structured information for the currect query.
+ * Get part of the structured information for the current query.
*
* @param string $part
* @return mixed
diff --git a/lib/Zend/Filter/Inflector.php b/lib/Zend/Filter/Inflector.php
index d0210298348..ac42a55b4f0 100644
--- a/lib/Zend/Filter/Inflector.php
+++ b/lib/Zend/Filter/Inflector.php
@@ -101,7 +101,7 @@ class Zend_Filter_Inflector implements Zend_Filter_Interface
}
/**
- * Retreive PluginLoader
+ * Retrieve PluginLoader
*
* @return Zend_Loader_PluginLoader_Interface
*/
diff --git a/lib/Zend/Gdata/App.php b/lib/Zend/Gdata/App.php
index dac7e01ecb9..fc5a0c7d741 100644
--- a/lib/Zend/Gdata/App.php
+++ b/lib/Zend/Gdata/App.php
@@ -1131,7 +1131,7 @@ class Zend_Gdata_App
* Retrieve next set of results based on a given feed.
*
* @param Zend_Gdata_App_Feed $feed The feed from which to
- * retreive the next set of results.
+ * retrieve the next set of results.
* @param string $className (optional) The class of feed to be returned.
* If null, the next feed (if found) will be the same class as
* the feed that was given as the first argument.
@@ -1158,7 +1158,7 @@ class Zend_Gdata_App
* Retrieve previous set of results based on a given feed.
*
* @param Zend_Gdata_App_Feed $feed The feed from which to
- * retreive the previous set of results.
+ * retrieve the previous set of results.
* @param string $className (optional) The class of feed to be returned.
* If null, the previous feed (if found) will be the same class as
* the feed that was given as the first argument.
diff --git a/lib/Zend/Gdata/Calendar.php b/lib/Zend/Gdata/Calendar.php
index ce144891a12..ce20957699c 100644
--- a/lib/Zend/Gdata/Calendar.php
+++ b/lib/Zend/Gdata/Calendar.php
@@ -90,7 +90,7 @@ class Zend_Gdata_Calendar extends Zend_Gdata
}
/**
- * Retreive feed object
+ * Retrieve feed object
*
* @param mixed $location The location for the feed, as a URL or Query
* @return Zend_Gdata_Calendar_EventFeed
@@ -108,7 +108,7 @@ class Zend_Gdata_Calendar extends Zend_Gdata
}
/**
- * Retreive entry object
+ * Retrieve entry object
*
* @return Zend_Gdata_Calendar_EventEntry
*/
@@ -139,7 +139,7 @@ class Zend_Gdata_Calendar extends Zend_Gdata
}
/**
- * Retreive entryobject
+ * Retrieve entry object
*
* @return Zend_Gdata_Calendar_ListEntry
*/
diff --git a/lib/Zend/Gdata/Docs.php b/lib/Zend/Gdata/Docs.php
index 8376045b351..a6a2e71c224 100755
--- a/lib/Zend/Gdata/Docs.php
+++ b/lib/Zend/Gdata/Docs.php
@@ -113,7 +113,7 @@ class Zend_Gdata_Docs extends Zend_Gdata
}
/**
- * Retreive feed object containing entries for the user's documents.
+ * Retrieve feed object containing entries for the user's documents.
*
* @param mixed $location The location for the feed, as a URL or Query
* @return Zend_Gdata_Docs_DocumentListFeed
@@ -131,7 +131,7 @@ class Zend_Gdata_Docs extends Zend_Gdata
}
/**
- * Retreive entry object representing a single document.
+ * Retrieve entry object representing a single document.
*
* @param mixed $location The location for the entry, as a URL or Query
* @return Zend_Gdata_Docs_DocumentListEntry
@@ -151,7 +151,7 @@ class Zend_Gdata_Docs extends Zend_Gdata
}
/**
- * Retreive entry object representing a single document.
+ * Retrieve entry object representing a single document.
*
* This method builds the URL where this item is stored using the type
* and the id of the document.
@@ -168,7 +168,7 @@ class Zend_Gdata_Docs extends Zend_Gdata
}
/**
- * Retreive entry object for the desired word processing document.
+ * Retrieve entry object for the desired word processing document.
*
* @param string $id The URL id for the document. Example:
* dcmg89gw_62hfjj8m
@@ -178,7 +178,7 @@ class Zend_Gdata_Docs extends Zend_Gdata
}
/**
- * Retreive entry object for the desired spreadsheet.
+ * Retrieve entry object for the desired spreadsheet.
*
* @param string $id The URL id for the document. Example:
* pKq0CzjiF3YmGd0AIlHKqeg
@@ -188,7 +188,7 @@ class Zend_Gdata_Docs extends Zend_Gdata
}
/**
- * Retreive entry object for the desired presentation.
+ * Retrieve entry object for the desired presentation.
*
* @param string $id The URL id for the document. Example:
* dcmg89gw_21gtrjcn
@@ -265,7 +265,7 @@ class Zend_Gdata_Docs extends Zend_Gdata
* the appropriate type doesn't exist yet.
*/
public function createFolder($folderName, $folderResourceId=null) {
- $category = new Zend_Gdata_App_Extension_Category(self::DOCUMENTS_CATEGORY_TERM,
+ $category = new Zend_Gdata_App_Extension_Category(self::DOCUMENTS_CATEGORY_TERM,
self::DOCUMENTS_CATEGORY_SCHEMA);
$title = new Zend_Gdata_App_Extension_Title($folderName);
$entry = new Zend_Gdata_Entry();
diff --git a/lib/Zend/Gdata/Gapps.php b/lib/Zend/Gdata/Gapps.php
index 4c0887062ad..bc2061e2464 100644
--- a/lib/Zend/Gdata/Gapps.php
+++ b/lib/Zend/Gdata/Gapps.php
@@ -370,7 +370,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
}
/**
- * Retreive NicknameFeed object containing multiple NicknameEntry objects.
+ * Retrieve NicknameFeed object containing multiple NicknameEntry objects.
*
* @param mixed $location (optional) The location for the feed, as a URL
* or Query.
@@ -392,7 +392,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
}
/**
- * Retreive GroupFeed object containing multiple GroupEntry
+ * Retrieve GroupFeed object containing multiple GroupEntry
* objects.
*
* @param mixed $location (optional) The location for the feed, as a URL
@@ -416,7 +416,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
}
/**
- * Retreive MemberFeed object containing multiple MemberEntry
+ * Retrieve MemberFeed object containing multiple MemberEntry
* objects.
*
* @param mixed $location (optional) The location for the feed, as a URL
@@ -441,7 +441,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
}
/**
- * Retreive OwnerFeed object containing multiple OwnerEntry
+ * Retrieve OwnerFeed object containing multiple OwnerEntry
* objects.
*
* @param mixed $location (optional) The location for the feed, as a URL
@@ -466,7 +466,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
}
/**
- * Retreive EmailListFeed object containing multiple EmailListEntry
+ * Retrieve EmailListFeed object containing multiple EmailListEntry
* objects.
*
* @param mixed $location (optional) The location for the feed, as a URL
@@ -489,7 +489,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
}
/**
- * Retreive EmailListRecipientFeed object containing multiple
+ * Retrieve EmailListRecipientFeed object containing multiple
* EmailListRecipientEntry objects.
*
* @param mixed $location The location for the feed, as a URL or Query.
@@ -513,7 +513,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
}
/**
- * Retreive a single UserEntry object.
+ * Retrieve a single UserEntry object.
*
* @param mixed $location The location for the feed, as a URL or Query.
* @return Zend_Gdata_Gapps_UserEntry
@@ -536,7 +536,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
}
/**
- * Retreive a single NicknameEntry object.
+ * Retrieve a single NicknameEntry object.
*
* @param mixed $location The location for the feed, as a URL or Query.
* @return Zend_Gdata_Gapps_NicknameEntry
@@ -559,7 +559,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
}
/**
- * Retreive a single GroupEntry object.
+ * Retrieve a single GroupEntry object.
*
* @param mixed $location The location for the feed, as a URL or Query.
* @return Zend_Gdata_Gapps_GroupEntry
@@ -582,7 +582,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
}
/**
- * Retreive a single MemberEntry object.
+ * Retrieve a single MemberEntry object.
*
* @param mixed $location The location for the feed, as a URL or Query.
* @return Zend_Gdata_Gapps_MemberEntry
@@ -605,7 +605,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
}
/**
- * Retreive a single OwnerEntry object.
+ * Retrieve a single OwnerEntry object.
*
* @param mixed $location The location for the feed, as a URL or Query.
* @return Zend_Gdata_Gapps_OwnerEntry
@@ -628,7 +628,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
}
/**
- * Retreive a single EmailListEntry object.
+ * Retrieve a single EmailListEntry object.
*
* @param mixed $location The location for the feed, as a URL or Query.
* @return Zend_Gdata_Gapps_EmailListEntry
@@ -651,7 +651,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
}
/**
- * Retreive a single EmailListRecipientEntry object.
+ * Retrieve a single EmailListRecipientEntry object.
*
* @param mixed $location The location for the feed, as a URL or Query.
* @return Zend_Gdata_Gapps_EmailListRecipientEntry
@@ -1178,7 +1178,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
{
$i = 0;
$group = $this->newGroupEntry();
-
+
$properties[$i] = $this->newProperty();
$properties[$i]->name = 'groupId';
$properties[$i]->value = $groupId;
@@ -1200,8 +1200,8 @@ class Zend_Gdata_Gapps extends Zend_Gdata
$properties[$i]->name = 'emailPermission';
$properties[$i]->value = $emailPermission;
$i++;
- }
-
+ }
+
$group->property = $properties;
return $this->insertGroup($group);
@@ -1240,7 +1240,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
* @return Zend_Gdata_Gapps_GroupFeed Collection of Zend_Gdata_GroupEntry objects
* representing all groups apart of the domain.
*/
- public function retrieveAllGroups()
+ public function retrieveAllGroups()
{
return $this->retrieveAllEntriesForFeed($this->retrievePageOfGroups());
}
@@ -1257,7 +1257,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
$this->delete($uri);
}
-
+
/**
* Check to see if a member id or group id is a member of group
*
@@ -1269,7 +1269,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
{
$uri = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/';
$uri .= $this->getDomain() . '/' . $groupId . '/member/' . $memberId;
-
+
//if the enitiy is not a member, an exception is thrown
try {
$results = $this->get($uri);
@@ -1353,7 +1353,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
$uri = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/';
$uri .= $this->getDomain() . '/' . $groupId . '/owner';
-
+
return $this->insertOwner($owner, $uri);
}
@@ -1383,9 +1383,9 @@ class Zend_Gdata_Gapps extends Zend_Gdata
{
$uri = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/';
$uri .= $this->getDomain() . '/' . $groupId . '/owner/' . $email;
-
+
//if the enitiy is not an owner of the group, an exception is thrown
- try {
+ try {
$results = $this->get($uri);
} catch (Exception $e) {
$results = false;
@@ -1427,7 +1427,7 @@ class Zend_Gdata_Gapps extends Zend_Gdata
{
$i = 0;
$group = $this->newGroupEntry();
-
+
$properties[$i] = $this->newProperty();
$properties[$i]->name = 'groupId';
$properties[$i]->value = $groupId;
@@ -1453,20 +1453,20 @@ class Zend_Gdata_Gapps extends Zend_Gdata
$properties[$i]->value = $emailPermission;
$i++;
}
-
+
$group->property = $properties;
$uri = self::APPS_BASE_FEED_URI . self::APPS_GROUP_PATH . '/';
$uri .= $this->getDomain() . '/' . $groupId;
- return $this->updateEntry($group, $uri, 'Zend_Gdata_Gapps_GroupEntry');
+ return $this->updateEntry($group, $uri, 'Zend_Gdata_Gapps_GroupEntry');
}
/**
* Retrieve all of the groups that a user is a member of
*
* @param string $memberId Member username
- * @param bool $directOnly (Optional) If true, members with direct association
+ * @param bool $directOnly (Optional) If true, members with direct association
* only will be considered
* @return Zend_Gdata_Gapps_GroupFeed Collection of Zend_Gdata_GroupEntry
* objects representing all groups member is apart of in the domain.
diff --git a/lib/Zend/Gdata/Gbase.php b/lib/Zend/Gdata/Gbase.php
index 4af5ea7b34e..6b776670abf 100644
--- a/lib/Zend/Gdata/Gbase.php
+++ b/lib/Zend/Gdata/Gbase.php
@@ -108,7 +108,7 @@ class Zend_Gdata_Gbase extends Zend_Gdata
}
/**
- * Retreive feed object
+ * Retrieve feed object
*
* @param mixed $location The location for the feed, as a URL or Query
* @return Zend_Gdata_Gbase_ItemFeed
@@ -126,7 +126,7 @@ class Zend_Gdata_Gbase extends Zend_Gdata
}
/**
- * Retreive entry object
+ * Retrieve entry object
*
* @param mixed $location The location for the feed, as a URL or Query
* @return Zend_Gdata_Gbase_ItemEntry
diff --git a/lib/Zend/Gdata/Photos.php b/lib/Zend/Gdata/Photos.php
index 342f262be2a..764455bd7f5 100755
--- a/lib/Zend/Gdata/Photos.php
+++ b/lib/Zend/Gdata/Photos.php
@@ -176,7 +176,7 @@ class Zend_Gdata_Photos extends Zend_Gdata
}
/**
- * Retreive AlbumFeed object containing multiple PhotoEntry or TagEntry
+ * Retrieve AlbumFeed object containing multiple PhotoEntry or TagEntry
* objects.
*
* @param mixed $location (optional) The location for the feed, as a URL or Query.
@@ -202,7 +202,7 @@ class Zend_Gdata_Photos extends Zend_Gdata
}
/**
- * Retreive PhotoFeed object containing comments and tags associated
+ * Retrieve PhotoFeed object containing comments and tags associated
* with a given photo.
*
* @param mixed $location (optional) The location for the feed, as a URL
@@ -230,7 +230,7 @@ class Zend_Gdata_Photos extends Zend_Gdata
}
/**
- * Retreive a single UserEntry object.
+ * Retrieve a single UserEntry object.
*
* @param mixed $location The location for the feed, as a URL or Query.
* @return Zend_Gdata_Photos_UserEntry
@@ -255,7 +255,7 @@ class Zend_Gdata_Photos extends Zend_Gdata
}
/**
- * Retreive a single AlbumEntry object.
+ * Retrieve a single AlbumEntry object.
*
* @param mixed $location The location for the feed, as a URL or Query.
* @return Zend_Gdata_Photos_AlbumEntry
@@ -280,7 +280,7 @@ class Zend_Gdata_Photos extends Zend_Gdata
}
/**
- * Retreive a single PhotoEntry object.
+ * Retrieve a single PhotoEntry object.
*
* @param mixed $location The location for the feed, as a URL or Query.
* @return Zend_Gdata_Photos_PhotoEntry
@@ -305,7 +305,7 @@ class Zend_Gdata_Photos extends Zend_Gdata
}
/**
- * Retreive a single TagEntry object.
+ * Retrieve a single TagEntry object.
*
* @param mixed $location The location for the feed, as a URL or Query.
* @return Zend_Gdata_Photos_TagEntry
@@ -330,7 +330,7 @@ class Zend_Gdata_Photos extends Zend_Gdata
}
/**
- * Retreive a single CommentEntry object.
+ * Retrieve a single CommentEntry object.
*
* @param mixed $location The location for the feed, as a URL or Query.
* @return Zend_Gdata_Photos_CommentEntry
diff --git a/lib/Zend/Mail/Protocol/Pop3.php b/lib/Zend/Mail/Protocol/Pop3.php
index fa39c6e50a2..c269a91f687 100644
--- a/lib/Zend/Mail/Protocol/Pop3.php
+++ b/lib/Zend/Mail/Protocol/Pop3.php
@@ -416,7 +416,7 @@ class Zend_Mail_Protocol_Pop3
* @return string message
* @throws Zend_Mail_Protocol_Exception
*/
- public function retrive($msgno)
+ public function retrieve($msgno)
{
return $this->retrieve($msgno);
}
diff --git a/lib/Zend/OpenId/Consumer.php b/lib/Zend/OpenId/Consumer.php
index 21ed1d15afc..da298da2172 100644
--- a/lib/Zend/OpenId/Consumer.php
+++ b/lib/Zend/OpenId/Consumer.php
@@ -433,7 +433,7 @@ class Zend_OpenId_Consumer
}
/**
- * Retrive assiciation information for given $url from internal cahce or
+ * Retrieve association information for given $url from internal cache or
* external storage
*
* @param string $url OpenID server url
diff --git a/lib/Zend/Pdf.php b/lib/Zend/Pdf.php
index dff58ab9329..75d84941e88 100644
--- a/lib/Zend/Pdf.php
+++ b/lib/Zend/Pdf.php
@@ -389,7 +389,7 @@ class Zend_Pdf
}
/**
- * Retrive number of revisions.
+ * Retrieve number of revisions.
*
* @return integer
*/
diff --git a/lib/Zend/Pdf/ElementFactory.php b/lib/Zend/Pdf/ElementFactory.php
index 94abf120583..e03ccfe6bc2 100644
--- a/lib/Zend/Pdf/ElementFactory.php
+++ b/lib/Zend/Pdf/ElementFactory.php
@@ -271,7 +271,7 @@ class Zend_Pdf_ElementFactory implements Zend_Pdf_ElementFactory_Interface
}
/**
- * Retrive object enumeration shift.
+ * Retrieve object enumeration shift.
*
* @param Zend_Pdf_ElementFactory_Interface $factory
* @return integer
diff --git a/lib/Zend/Pdf/ElementFactory/Interface.php b/lib/Zend/Pdf/ElementFactory/Interface.php
index e9b65a5ee4b..b92727cf55b 100644
--- a/lib/Zend/Pdf/ElementFactory/Interface.php
+++ b/lib/Zend/Pdf/ElementFactory/Interface.php
@@ -96,7 +96,7 @@ interface Zend_Pdf_ElementFactory_Interface
public function cleanEnumerationShiftCache();
/**
- * Retrive object enumeration shift.
+ * Retrieve object enumeration shift.
*
* @param Zend_Pdf_ElementFactory_Interface $factory
* @return integer
diff --git a/lib/Zend/Pdf/ElementFactory/Proxy.php b/lib/Zend/Pdf/ElementFactory/Proxy.php
index 3645c8e656e..9fa4e933f20 100644
--- a/lib/Zend/Pdf/ElementFactory/Proxy.php
+++ b/lib/Zend/Pdf/ElementFactory/Proxy.php
@@ -151,7 +151,7 @@ class Zend_Pdf_ElementFactory_Proxy implements Zend_Pdf_ElementFactory_Interface
}
/**
- * Retrive object enumeration shift.
+ * Retrieve object enumeration shift.
*
* @param Zend_Pdf_ElementFactory_Interface $factory
* @return integer
diff --git a/lib/Zend/Pdf/Page.php b/lib/Zend/Pdf/Page.php
index e0667dc1efc..65ff09d88dd 100644
--- a/lib/Zend/Pdf/Page.php
+++ b/lib/Zend/Pdf/Page.php
@@ -526,7 +526,7 @@ class Zend_Pdf_Page extends Zend_Pdf_Canvas_Abstract
}
/**
- * Retrive PDF file reference to the page
+ * Retrieve PDF file reference to the page
*
* @internal
* @return Zend_Pdf_Element_Dictionary
diff --git a/lib/Zend/Search/Lucene.php b/lib/Zend/Search/Lucene.php
index 89abb77f325..b6e17a32dc2 100644
--- a/lib/Zend/Search/Lucene.php
+++ b/lib/Zend/Search/Lucene.php
@@ -1307,7 +1307,7 @@ class Zend_Search_Lucene implements Zend_Search_Lucene_Interface
/**
- * Retrive similarity used by index reader
+ * Retrieve similarity used by index reader
*
* @return Zend_Search_Lucene_Search_Similarity
*/
@@ -1523,7 +1523,7 @@ class Zend_Search_Lucene implements Zend_Search_Lucene_Interface
}
/**
- * Skip terms stream up to the specified term preffix.
+ * Skip terms stream up to the specified term prefix.
*
* Prefix contains fully specified field info and portion of searched term
*
diff --git a/lib/Zend/Search/Lucene/Index/SegmentInfo.php b/lib/Zend/Search/Lucene/Index/SegmentInfo.php
index 6367e45c5f7..361860de143 100644
--- a/lib/Zend/Search/Lucene/Index/SegmentInfo.php
+++ b/lib/Zend/Search/Lucene/Index/SegmentInfo.php
@@ -1861,7 +1861,7 @@ class Zend_Search_Lucene_Index_SegmentInfo implements Zend_Search_Lucene_Index_T
/**
- * Skip terms stream up to the specified term preffix.
+ * Skip terms stream up to the specified term prefix.
*
* Prefix contains fully specified field info and portion of searched term
*
diff --git a/lib/Zend/Search/Lucene/Index/SegmentWriter.php b/lib/Zend/Search/Lucene/Index/SegmentWriter.php
index 910fa0003ed..1da16283ceb 100644
--- a/lib/Zend/Search/Lucene/Index/SegmentWriter.php
+++ b/lib/Zend/Search/Lucene/Index/SegmentWriter.php
@@ -402,7 +402,7 @@ abstract class Zend_Search_Lucene_Index_SegmentWriter
$this->_tiiFile->writeInt(self::$maxSkipLevels);
/** Dump dictionary header */
- $this->_tiiFile->writeVInt(0); // preffix length
+ $this->_tiiFile->writeVInt(0); // prefix length
$this->_tiiFile->writeString(''); // suffix
$this->_tiiFile->writeInt((int)0xFFFFFFFF); // field number
$this->_tiiFile->writeByte((int)0x0F);
@@ -548,12 +548,12 @@ abstract class Zend_Search_Lucene_Index_SegmentWriter
$prefixBytes += $charBytes;
}
- // Write preffix length
+ // Write prefix length
$dicFile->writeVInt($prefixChars);
// Write suffix
$dicFile->writeString(substr($term->text, $prefixBytes));
} else {
- // Write preffix length
+ // Write prefix length
$dicFile->writeVInt(0);
// Write suffix
$dicFile->writeString($term->text);
diff --git a/lib/Zend/Search/Lucene/Index/TermsStream/Interface.php b/lib/Zend/Search/Lucene/Index/TermsStream/Interface.php
index 64d246c3088..c9f0a6b3e93 100644
--- a/lib/Zend/Search/Lucene/Index/TermsStream/Interface.php
+++ b/lib/Zend/Search/Lucene/Index/TermsStream/Interface.php
@@ -35,7 +35,7 @@ interface Zend_Search_Lucene_Index_TermsStream_Interface
public function resetTermsStream();
/**
- * Skip terms stream up to the specified term preffix.
+ * Skip terms stream up to the specified term prefix.
*
* Prefix contains fully specified field info and portion of searched term
*
diff --git a/lib/Zend/Search/Lucene/Interface.php b/lib/Zend/Search/Lucene/Interface.php
index 8dafe97340c..a91e3f6e890 100644
--- a/lib/Zend/Search/Lucene/Interface.php
+++ b/lib/Zend/Search/Lucene/Interface.php
@@ -336,7 +336,7 @@ interface Zend_Search_Lucene_Interface extends Zend_Search_Lucene_Index_TermsStr
public function docFreq(Zend_Search_Lucene_Index_Term $term);
/**
- * Retrive similarity used by index reader
+ * Retrieve similarity used by index reader
*
* @return Zend_Search_Lucene_Search_Similarity
*/
diff --git a/lib/Zend/Search/Lucene/MultiSearcher.php b/lib/Zend/Search/Lucene/MultiSearcher.php
index 698fd05b4f4..3e14e0b6c18 100644
--- a/lib/Zend/Search/Lucene/MultiSearcher.php
+++ b/lib/Zend/Search/Lucene/MultiSearcher.php
@@ -691,7 +691,7 @@ class Zend_Search_Lucene_Interface_MultiSearcher implements Zend_Search_Lucene_I
}
/**
- * Retrive similarity used by index reader
+ * Retrieve similarity used by index reader
*
* @return Zend_Search_Lucene_Search_Similarity
* @throws Zend_Search_Lucene_Exception
@@ -895,7 +895,7 @@ class Zend_Search_Lucene_Interface_MultiSearcher implements Zend_Search_Lucene_I
}
/**
- * Skip terms stream up to specified term preffix.
+ * Skip terms stream up to specified term prefix.
*
* Prefix contains fully specified field info and portion of searched term
*
diff --git a/lib/Zend/Search/Lucene/Proxy.php b/lib/Zend/Search/Lucene/Proxy.php
index 1ba38ff1054..5c1d8d6ae26 100644
--- a/lib/Zend/Search/Lucene/Proxy.php
+++ b/lib/Zend/Search/Lucene/Proxy.php
@@ -447,7 +447,7 @@ class Zend_Search_Lucene_Proxy implements Zend_Search_Lucene_Interface
}
/**
- * Retrive similarity used by index reader
+ * Retrieve similarity used by index reader
*
* @return Zend_Search_Lucene_Search_Similarity
*/
@@ -538,7 +538,7 @@ class Zend_Search_Lucene_Proxy implements Zend_Search_Lucene_Interface
}
/**
- * Skip terms stream up to specified term preffix.
+ * Skip terms stream up to specified term prefix.
*
* Prefix contains fully specified field info and portion of searched term
*
diff --git a/lib/Zend/Search/Lucene/TermStreamsPriorityQueue.php b/lib/Zend/Search/Lucene/TermStreamsPriorityQueue.php
index 2800a4b25b1..638b3c6b745 100644
--- a/lib/Zend/Search/Lucene/TermStreamsPriorityQueue.php
+++ b/lib/Zend/Search/Lucene/TermStreamsPriorityQueue.php
@@ -90,7 +90,7 @@ class Zend_Search_Lucene_TermStreamsPriorityQueue implements Zend_Search_Lucene_
}
/**
- * Skip terms stream up to the specified term preffix.
+ * Skip terms stream up to the specified term prefix.
*
* Prefix contains fully specified field info and portion of searched term
*
diff --git a/lib/Zend/Service/Delicious/PostList.php b/lib/Zend/Service/Delicious/PostList.php
index 66a41e222bf..2646f797f00 100644
--- a/lib/Zend/Service/Delicious/PostList.php
+++ b/lib/Zend/Service/Delicious/PostList.php
@@ -23,7 +23,7 @@
/**
- * List of posts retrived from the del.icio.us web service
+ * List of posts retrieved from the del.icio.us web service
*
* @category Zend
* @package Zend_Service
diff --git a/lib/Zend/Tool/Project/Context/Filesystem/Abstract.php b/lib/Zend/Tool/Project/Context/Filesystem/Abstract.php
index 97671bb45bd..a3b8261e82d 100644
--- a/lib/Zend/Tool/Project/Context/Filesystem/Abstract.php
+++ b/lib/Zend/Tool/Project/Context/Filesystem/Abstract.php
@@ -157,9 +157,9 @@ abstract class Zend_Tool_Project_Context_Filesystem_Abstract implements Zend_Too
/**
* delete()
*
- * Delete this resouce/context
+ * Delete this resource/context
*
*/
abstract public function delete();
-}
\ No newline at end of file
+}
diff --git a/lib/Zend/View/Helper/Placeholder/Container/Standalone.php b/lib/Zend/View/Helper/Placeholder/Container/Standalone.php
index 0f61b2387b3..3f5391039c6 100644
--- a/lib/Zend/View/Helper/Placeholder/Container/Standalone.php
+++ b/lib/Zend/View/Helper/Placeholder/Container/Standalone.php
@@ -54,7 +54,7 @@ abstract class Zend_View_Helper_Placeholder_Container_Standalone extends Zend_Vi
/**
* Flag wheter to automatically escape output, must also be
- * enforced in the child class if __toString/toString is overriden
+ * enforced in the child class if __toString/toString is overridden
* @var book
*/
protected $_autoEscape = true;
diff --git a/lib/flex/varien/varien/upload/Uploader.as b/lib/flex/varien/varien/upload/Uploader.as
index d6b8707c60f..273dc1c4d0c 100644
--- a/lib/flex/varien/varien/upload/Uploader.as
+++ b/lib/flex/varien/varien/upload/Uploader.as
@@ -37,60 +37,60 @@ package varien.upload
import flash.net.URLRequest;
import flash.net.URLRequestMethod;
import flash.net.URLVariables;
-
+
import mx.core.IMXMLObject;
import mx.utils.ObjectUtil;
-
-
- /**
+
+
+ /**
* @eventType varien.upload.UploaderEvent.OPEN
*/
[Event(name='open', type='varien.upload.UploaderEvent')]
-
- /**
+
+ /**
* @eventType varien.upload.UploaderEvent.RESET
*/
[Event(name='reset', type='varien.upload.UploaderEvent')]
-
- /**
+
+ /**
* @eventType varien.upload.UploaderEvent.REMOVE
*/
- [Event(name='remove', type='varien.upload.UploaderEvent')]
-
- /**
+ [Event(name='remove', type='varien.upload.UploaderEvent')]
+
+ /**
* @eventType varien.upload.UploaderEvent.PROGRESS
*/
[Event(name='progress', type='varien.upload.UploaderEvent')]
-
- /**
+
+ /**
* @eventType varien.upload.UploaderEvent.ERROR
*/
[Event(name='error', type='varien.upload.UploaderEvent')]
-
- /**
+
+ /**
* @eventType varien.upload.UploaderEvent.SELECT
*/
[Event(name='select', type='varien.upload.UploaderEvent')]
-
- /**
+
+ /**
* @eventType varien.upload.UploaderEvent.COMPLETE
*/
[Event(name='complete', type='varien.upload.UploaderEvent')]
-
- /**
+
+ /**
* @eventType varien.upload.UploaderEvent.CANCEL
*/
[Event(name='cancel', type='varien.upload.UploaderEvent')]
-
+
public class Uploader extends EventDispatcher implements IMXMLObject
- {
+ {
public var document:Object;
-
+
public var id:String;
-
+
public var useTypeFilter:Boolean;
-
- protected var _fileList:FileReferenceList;
+
+ protected var _fileList:FileReferenceList;
protected var _typeFilters:Object;
protected var _config:Object;
protected var _files:Object;
@@ -102,7 +102,7 @@ package varien.upload
public static const FILE_COMPLETE:String = 'complete';
public static const FILE_FULL_COMPLETE:String = 'full_complete';
public static const FILE_ERROR:String = 'error';
-
+
public static const ERROR_ZERO_SIZE:Number = 1;
public static const ERROR_HTTP:Number = 2;
public static const ERROR_IO:Number = 3;
@@ -111,13 +111,13 @@ package varien.upload
/**
* Constructor
- *
+ *
* @param config configuration of uploader
*/
public function Uploader(config:Object=null)
{
super();
- _fileList = new FileReferenceList();
+ _fileList = new FileReferenceList();
_files = {};
_typeFilters = {};
_config = {};
@@ -125,10 +125,10 @@ package varien.upload
_laterUploadStack = [];
_fileList.addEventListener(Event.SELECT, _handleSelect);
}
-
+
/**
* Implementing of IMXMLObject
- *
+ *
* @see IMXMLObject
*/
public function initialized(document:Object, id:String):void
@@ -136,7 +136,7 @@ package varien.upload
this.document = document;
this.id = id;
}
-
+
/**
* Browse files for upload
*/
@@ -144,62 +144,62 @@ package varien.upload
{
_fileList.browse(useTypeFilter ? getTypeFiltersArray() : null);
}
-
+
/**
* Add file filter for uploader
- *
+ *
* @param filterId filter unique id
* @param filterLabel label that will be showed in dialog box
* @param fileTypes array of file filter masks
*/
public function addTypeFilter(filterId:String, filterLabel:String, fileTypes:Array):void
{
- _typeFilters[filterId] = new FileFilter(filterLabel, fileTypes.join(';'));
+ _typeFilters[filterId] = new FileFilter(filterLabel, fileTypes.join(';'));
}
-
+
/**
- * Retrive file filters as array
+ * Retrieve file filters as array
*/
public function getTypeFiltersArray():Array
{
var filters:Array = new Array();
- for each (var typeFilter:FileFilter in _typeFilters) {
+ for each (var typeFilter:FileFilter in _typeFilters) {
filters.push(typeFilter);
}
return filters;
}
-
+
/**
- * Retrive file filters as object
+ * Retrieve file filters as object
*/
public function getTypeFilters():Object
{
return _typeFilters;
}
-
+
/**
- * Retrive file filter with specified id
- *
+ * Retrieve file filter with specified id
+ *
* @param filterId filter unique id
*/
public function getTypeFilter(filterId:String):FileFilter
{
return hasTypeFilter(filterId) ? _typeFilters[filterId] : null;
}
-
+
/**
* Check if filter with specified id exists
- *
+ *
* @param filterId filter unique id
*/
public function hasTypeFilter(filterId:String):Boolean
{
return (_typeFilters[filterId] is FileFilter);
}
-
+
/**
* Remove type filter with specified id
- *
+ *
* @param filterId filter unique id
*/
public function removeTypeFilter(filterId:String):void
@@ -208,33 +208,33 @@ package varien.upload
delete _typeFilters[filterId];
}
}
-
+
/**
* Upload configuration property
- *
+ *
* For example:
* uploadObject.config = {
* url: 'http://myhost.com/fileUpload.php',
* params: {test:1},
* file_field: 'file'
- * };
+ * };
*/
-
+
public function set config(value:Object):void
{
for (var property:String in value) {
_config[property] = value[property];
}
}
-
+
public function get config():Object
{
return _config;
}
-
+
/**
- * Retrive file info with specified id
- *
+ * Retrieve file info with specified id
+ *
* @param id file id
*/
public function getFileInfo(id:String):Object
@@ -243,45 +243,45 @@ package varien.upload
if (file) {
return _collectFileInfo(id);
}
- return null;
+ return null;
}
-
+
/**
- * Retrive file info for all files as array
- */
+ * Retrieve file info for all files as array
+ */
public function get filesInfo():Array
{
var result:Array = [];
- for (var id:String in _files) {
+ for (var id:String in _files) {
result.push(_collectFileInfo(id));
}
return result;
}
-
+
/**
* Removes file info for file with specified id
*/
public function removeFiles():void
- {
+ {
for (var id:String in _files) {
delete _files[id];
}
_createEvent(UploaderEvent.REMOVE_ALL);
}
-
+
/**
* Removes file info for file with specified id
- *
+ *
* @param id file id
*/
public function removeFile(id:String):void
- {
+ {
if(_files[id]) {
delete _files[id];
}
_createEvent(UploaderEvent.REMOVE);
}
-
+
/**
* Start uploading of files
*/
@@ -289,16 +289,16 @@ package varien.upload
{
if (config) {
for(var id:String in _files) {
- if(_files[id].status == Uploader.FILE_NEW
- ||
- (_files[id].status == Uploader.FILE_ERROR
+ if(_files[id].status == Uploader.FILE_NEW
+ ||
+ (_files[id].status == Uploader.FILE_ERROR
&& _files[id].errorCode!=Uploader.ERROR_ZERO_SIZE)) {
_uploadOneFile(id);
}
}
}
}
-
+
protected function _uploadOneFile(id:String):void
{
var request:URLRequest = new URLRequest(config.url);
@@ -309,34 +309,34 @@ package varien.upload
request.data[property] = config.params[property];
}
}
-
+
var file:FileReference = _files[id].file as FileReference;
-
+
file.addEventListener(
ProgressEvent.PROGRESS,
_handleProgress
);
-
+
file.addEventListener(
DataEvent.UPLOAD_COMPLETE_DATA,
_handleComplete
);
-
+
file.addEventListener(
Event.COMPLETE,
_handlePartialComplete
);
-
+
file.addEventListener(
- IOErrorEvent.IO_ERROR,
+ IOErrorEvent.IO_ERROR,
_handleIOError
);
-
+
file.addEventListener(
SecurityErrorEvent.SECURITY_ERROR,
_handleSecurityError
);
-
+
file.addEventListener(
HTTPStatusEvent.HTTP_STATUS,
_handleHttpStatus
@@ -345,10 +345,10 @@ package varien.upload
_files[id].uploadTry ++;
file.upload(request, config.file_field);
}
-
+
/**
* Collects file info from FileReference object with specified id
- *
+ *
* @param id file id
*/
protected function _collectFileInfo(id:String):Object
@@ -359,7 +359,7 @@ package varien.upload
try {
info.size = _files[id].file.size;
} catch (exception:IOError) {
- info.size = 0;
+ info.size = 0;
}
info.creator = _files[id].file.creator;
info.status = _files[id].status;
@@ -370,20 +370,20 @@ package varien.upload
info.response = _files[id].response;
return info;
}
-
+
/**
* Generates unique file id
- *
+ *
* @param file FileReference
*/
protected function _uniqueFileId(file:FileReference):String
- {
+ {
return 'file_' + uint(_counter++).toString();
}
-
+
/**
- * Retrive file reference by id
- *
+ * Retrieve file reference by id
+ *
* @param id file id
*/
protected function _getFileById(id:String):FileReference
@@ -393,25 +393,25 @@ package varien.upload
}
return null;
}
-
+
/**
- * Retrive file id by reference
- *
+ * Retrieve file id by reference
+ *
* @param file FileReference
*/
protected function _getIdByFile(file:FileReference):String
{
- for (var id:String in _files) {
+ for (var id:String in _files) {
if(_files[id].file===file) {
return id;
}
- }
+ }
return null;
}
-
+
/**
* Create and dispatch UploadEvent with specified type
- *
+ *
* @param eventType type of UploadEvent
*/
protected function _createEvent(eventType:String, fileId:String=null):void
@@ -424,54 +424,54 @@ package varien.upload
}
dispatchEvent(event);
}
-
+
/**
* Property indicates that all passed for upload file uploaded successfully
*/
public function get allComplete():Boolean
{
for (var id:String in _files) {
- if (_files[id].status == Uploader.FILE_PROGRESS
+ if (_files[id].status == Uploader.FILE_PROGRESS
|| _files[id].status == Uploader.FILE_COMPLETE) {
return false;
}
- }
-
+ }
+
return true;
}
-
+
/**
* Property indicates that all passed for upload file has IO Error
* This problem only on servers with self-signed sertificates.
*/
public function get allIOError():Boolean
- {
+ {
for (var id:String in _files) {
- if (_files[id].status == Uploader.FILE_PROGRESS
+ if (_files[id].status == Uploader.FILE_PROGRESS
&& _laterUploadStack.indexOf(id)===-1) {
return false;
- }
+ }
}
-
+
return true;
}
-
+
protected function _handleSelect(event:Event):void
- {
+ {
for each (var file:FileReference in _fileList.fileList) {
// Try to catch bad files
var badFile:Boolean = false;
- var zeroSize:Boolean = false;
+ var zeroSize:Boolean = false;
try {
file.size;
- }
+ }
catch (exception:IllegalOperationError) {
badFile = true;
}
catch (exception:IOError) { // If file size == 0
zeroSize = true;
}
-
+
if(!badFile) {
var id:String = _uniqueFileId(file);
_files[id] = {status:Uploader.FILE_NEW, file:file, uploadTry:0};
@@ -484,7 +484,7 @@ package varien.upload
}
_createEvent(UploaderEvent.SELECT);
}
-
+
protected function _handleProgress(event:ProgressEvent):void
{
var id:String = _getIdByFile(event.target as FileReference);
@@ -493,24 +493,24 @@ package varien.upload
}
_createEvent(UploaderEvent.PROGRESS, id);
}
-
+
protected function _handleComplete(event:DataEvent):void
{
var id:String = _getIdByFile(event.target as FileReference);
- if (_files[id]) {
+ if (_files[id]) {
_files[id].status = Uploader.FILE_FULL_COMPLETE;
_files[id].progress = {total: _files[id].size, loaded: _files[id].size};
_files[id].response = event.data;
_files[id].http = 200;
}
-
+
_uploadFromLaterStack();
_createEvent(UploaderEvent.PROGRESS, id);
if (allComplete) {
_createEvent(UploaderEvent.COMPLETE);
- }
+ }
}
-
+
protected function _handlePartialComplete(event:Event):void
{
var id:String = _getIdByFile(event.target as FileReference);
@@ -520,11 +520,11 @@ package varien.upload
}
_createEvent(UploaderEvent.PROGRESS, id);
}
-
+
protected function _handleIOError(event:IOErrorEvent):void
{
var id:String = _getIdByFile(event.target as FileReference);
- if(_files[id]) {
+ if(_files[id]) {
if(_files[id].status != Uploader.FILE_ERROR){
if (_files[id].uploadTry > 1) {
_files[id].status = Uploader.FILE_ERROR;
@@ -535,14 +535,14 @@ package varien.upload
_laterUploadStack.push(id);
if (allIOError) {
_markAsSSLError();
- }
+ }
return;
}
}
}
_createEvent(UploaderEvent.ERROR, id);
}
-
+
protected function _markAsSSLError():void
{
for (var id:String in _files) {
@@ -554,64 +554,64 @@ package varien.upload
}
}
}
-
+
protected function _uploadFromLaterStack():void
{
if (_laterUploadStack.length > 0) {
_uploadOneFile(_laterUploadStack.shift());
}
}
-
- protected function _resetFileHandlers(id:String):void
+
+ protected function _resetFileHandlers(id:String):void
{
var file:FileReference = (_files[id].file as FileReference);
-
+
file.removeEventListener(
ProgressEvent.PROGRESS,
_handleProgress
);
-
+
file.removeEventListener(
DataEvent.UPLOAD_COMPLETE_DATA,
_handleComplete
);
-
+
file.removeEventListener(
Event.COMPLETE,
_handlePartialComplete
);
-
+
file.removeEventListener(
- IOErrorEvent.IO_ERROR,
+ IOErrorEvent.IO_ERROR,
_handleIOError
);
-
+
file.removeEventListener(
SecurityErrorEvent.SECURITY_ERROR,
_handleSecurityError
);
-
+
file.removeEventListener(
HTTPStatusEvent.HTTP_STATUS,
_handleHttpStatus
);
}
-
+
protected function _handleSecurityError(event:SecurityErrorEvent):void
{
var id:String = _getIdByFile(event.target as FileReference);
- if (_files[id]) {
+ if (_files[id]) {
_files[id].status = Uploader.FILE_ERROR;
_files[id].error = 'Security Error';
_files[id].errorCode = Uploader.ERROR_SECURITY;
}
_createEvent(UploaderEvent.ERROR, id);
}
-
+
protected function _handleHttpStatus(event:HTTPStatusEvent):void
{
var id:String = _getIdByFile(event.target as FileReference);
- if (_files[id]) {
+ if (_files[id]) {
if (_files[id].status != Uploader.FILE_ERROR){
_files[id].status = Uploader.FILE_ERROR;
_files[id].error = 'Http Status Error';
@@ -621,7 +621,7 @@ package varien.upload
}
_createEvent(UploaderEvent.ERROR, id);
}
-
+
}
-
+
}
diff --git a/lib/phpseclib/Net/SSH2.php b/lib/phpseclib/Net/SSH2.php
index 93a5905e9e5..9b474aa925f 100644
--- a/lib/phpseclib/Net/SSH2.php
+++ b/lib/phpseclib/Net/SSH2.php
@@ -112,7 +112,7 @@ define('NET_SSH2_MASK_LOGIN', 0x00000002);
* RFC4254 refers not to client and server channels but rather to sender and recipient channels. we don't refer
* to them in that way because RFC4254 toggles the meaning. the client sends a SSH_MSG_CHANNEL_OPEN message with
* a sender channel and the server sends a SSH_MSG_CHANNEL_OPEN_CONFIRMATION in response, with a sender and a
- * recepient channel. at first glance, you might conclude that SSH_MSG_CHANNEL_OPEN_CONFIRMATION's sender channel
+ * recipient channel. at first glance, you might conclude that SSH_MSG_CHANNEL_OPEN_CONFIRMATION's sender channel
* would be the same thing as SSH_MSG_CHANNEL_OPEN's sender channel, but it's not, per this snipet:
* The 'recipient channel' is the channel number given in the original
* open request, and 'sender channel' is the channel number allocated by
@@ -926,25 +926,25 @@ class Net_SSH2 {
}
switch ($kex_algorithms[$i]) {
- // see http://tools.ietf.org/html/rfc2409#section-6.2 and
+ // see http://tools.ietf.org/html/rfc2409#section-6.2 and
// http://tools.ietf.org/html/rfc2412, appendex E
case 'diffie-hellman-group1-sha1':
- $p = pack('H256', 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
- '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
- '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
+ $p = pack('H256', 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
+ '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
+ '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381FFFFFFFFFFFFFFFF');
$keyLength = $keyLength < 160 ? $keyLength : 160;
$hash = 'sha1';
break;
// see http://tools.ietf.org/html/rfc3526#section-3
case 'diffie-hellman-group14-sha1':
- $p = pack('H512', 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
- '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
- '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
- 'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF05' .
- '98DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB' .
- '9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' .
- 'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718' .
+ $p = pack('H512', 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
+ '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
+ '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
+ 'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF05' .
+ '98DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB' .
+ '9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' .
+ 'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718' .
'3995497CEA956AE515D2261898FA051015728E5A8AACAA68FFFFFFFFFFFFFFFF');
$keyLength = $keyLength < 160 ? $keyLength : 160;
$hash = 'sha1';
@@ -1438,7 +1438,7 @@ class Net_SSH2 {
}
// RFC4254 defines the (client) window size as "bytes the other party can send before it must wait for the window to
- // be adjusted". 0x7FFFFFFF is, at 4GB, the max size. technically, it should probably be decremented, but,
+ // be adjusted". 0x7FFFFFFF is, at 4GB, the max size. technically, it should probably be decremented, but,
// honestly, if you're transfering more than 4GB, you probably shouldn't be using phpseclib, anyway.
// see http://tools.ietf.org/html/rfc4254#section-5.2 for more info
$this->window_size_client_to_server[NET_SSH2_CHANNEL_EXEC] = 0x7FFFFFFF;
@@ -1467,7 +1467,7 @@ class Net_SSH2 {
// neither will your script.
// although, in theory, the size of SSH_MSG_CHANNEL_REQUEST could exceed the maximum packet size established by
- // SSH_MSG_CHANNEL_OPEN_CONFIRMATION, RFC4254#section-5.1 states that the "maximum packet size" refers to the
+ // SSH_MSG_CHANNEL_OPEN_CONFIRMATION, RFC4254#section-5.1 states that the "maximum packet size" refers to the
// "maximum size of an individual data packet". ie. SSH_MSG_CHANNEL_DATA. RFC4254#section-5.2 corroborates.
$packet = pack('CNNa*CNa*',
NET_SSH2_MSG_CHANNEL_REQUEST, $this->server_channels[NET_SSH2_CHANNEL_EXEC], strlen('exec'), 'exec', 1, strlen($command), $command);
@@ -1730,7 +1730,7 @@ class Net_SSH2 {
case NET_SSH2_MSG_CHANNEL_DATA:
if ($client_channel == NET_SSH2_CHANNEL_EXEC) {
// SCP requires null packets, such as this, be sent. further, in the case of the ssh.com SSH server
- // this actually seems to make things twice as fast. more to the point, the message right after
+ // this actually seems to make things twice as fast. more to the point, the message right after
// SSH_MSG_CHANNEL_DATA (usually SSH_MSG_IGNORE) won't block for as long as it would have otherwise.
// in OpenSSH it slows things down but only by a couple thousandths of a second.
$this->_send_channel_packet($client_channel, chr(0));
diff --git a/pub/lib/extjs/ext-all-debug.js b/pub/lib/extjs/ext-all-debug.js
index 070f8e8b797..df06b46f615 100644
--- a/pub/lib/extjs/ext-all-debug.js
+++ b/pub/lib/extjs/ext-all-debug.js
@@ -21209,7 +21209,7 @@ Ext.extend(Ext.form.TriggerField, Ext.form.TextField, {
beforeBlur : Ext.emptyFn,
// private
- // This should be overriden by any subclass that needs to check whether or not the field can be blurred.
+ // This should be overridden by any subclass that needs to check whether or not the field can be blurred.
validateBlur : function(e, t){
return true;
},
diff --git a/pub/lib/extjs/package/form/form-debug.js b/pub/lib/extjs/package/form/form-debug.js
index 6f6cc05fc6f..dbe3f224354 100644
--- a/pub/lib/extjs/package/form/form-debug.js
+++ b/pub/lib/extjs/package/form/form-debug.js
@@ -2,7 +2,7 @@
* Ext JS Library 1.1 Beta 1
* Copyright(c) 2006-2007, Ext JS, LLC.
* licensing@extjs.com
- *
+ *
* http://www.extjs.com/license
*/
@@ -12,30 +12,30 @@ Ext.form.Field = function(config){
};
Ext.extend(Ext.form.Field, Ext.BoxComponent, {
-
+
invalidClass : "x-form-invalid",
-
+
invalidText : "The value in this field is invalid",
-
+
focusClass : "x-form-focus",
-
+
validationEvent : "keyup",
-
+
validateOnBlur : true,
-
+
validationDelay : 250,
-
+
defaultAutoCreate : {tag: "input", type: "text", size: "20", autocomplete: "off"},
-
+
fieldClass: "x-form-field",
-
+
msgTarget: 'qtip',
-
+
msgFx : 'normal',
-
-
-
+
+
+
inputType : undefined,
// private
@@ -44,34 +44,34 @@ Ext.extend(Ext.form.Field, Ext.BoxComponent, {
// private
hasFocus : false,
-
+
value : undefined,
initComponent : function(){
Ext.form.Field.superclass.initComponent.call(this);
this.addEvents({
-
+
focus : true,
-
+
blur : true,
-
+
specialkey : true,
-
+
change : true,
-
+
invalid : true,
-
+
valid : true
});
},
-
+
getName: function(){
return this.rendered && this.el.dom.name ? this.el.dom.name : (this.hiddenName || '');
},
-
+
applyTo : function(target){
this.allowDomMove = false;
this.el = Ext.get(target);
@@ -119,7 +119,7 @@ Ext.extend(Ext.form.Field, Ext.BoxComponent, {
}
},
-
+
isDirty : function() {
if(this.disabled) {
return false;
@@ -140,7 +140,7 @@ Ext.extend(Ext.form.Field, Ext.BoxComponent, {
}
},
-
+
reset : function(){
this.setValue(this.originalValue);
this.clearInvalid();
@@ -180,7 +180,7 @@ Ext.extend(Ext.form.Field, Ext.BoxComponent, {
this.fireEvent("blur", this);
},
-
+
isValid : function(preventMark){
if(this.disabled){
return true;
@@ -192,7 +192,7 @@ Ext.extend(Ext.form.Field, Ext.BoxComponent, {
return v;
},
-
+
validate : function(){
if(this.disabled || this.validateValue(this.getRawValue())){
this.clearInvalid();
@@ -207,7 +207,7 @@ Ext.extend(Ext.form.Field, Ext.BoxComponent, {
return true;
},
-
+
markInvalid : function(msg){
if(!this.rendered || this.preventMark){ // not rendered
return;
@@ -255,7 +255,7 @@ Ext.extend(Ext.form.Field, Ext.BoxComponent, {
this.errorIcon.alignTo(this.el, 'tl-tr', [2, 0]);
},
-
+
clearInvalid : function(){
if(!this.rendered || this.preventMark){ // not rendered
return;
@@ -288,12 +288,12 @@ Ext.extend(Ext.form.Field, Ext.BoxComponent, {
this.fireEvent('valid', this);
},
-
+
getRawValue : function(){
return this.el.getValue();
},
-
+
getValue : function(){
var v = this.el.getValue();
if(v == this.emptyText || v === undefined){
@@ -302,12 +302,12 @@ Ext.extend(Ext.form.Field, Ext.BoxComponent, {
return v;
},
-
+
setRawValue : function(v){
return this.el.dom.value = (v === null || v === undefined ? '' : v);
},
-
+
setValue : function(v){
this.value = v;
if(this.rendered){
@@ -387,47 +387,47 @@ Ext.form.Field.msgFx = {
Ext.form.TextField = function(config){
Ext.form.TextField.superclass.constructor.call(this, config);
this.addEvents({
-
+
autosize : true
});
};
Ext.extend(Ext.form.TextField, Ext.form.Field, {
-
+
grow : false,
-
+
growMin : 30,
-
+
growMax : 800,
-
+
vtype : null,
-
+
maskRe : null,
-
+
disableKeyFilter : false,
-
+
allowBlank : true,
-
+
minLength : 0,
-
+
maxLength : Number.MAX_VALUE,
-
+
minLengthText : "The minimum length for this field is {0}",
-
+
maxLengthText : "The maximum length for this field is {0}",
-
+
selectOnFocus : false,
-
+
blankText : "This field is required",
-
+
validator : null,
-
+
regex : null,
-
+
regexText : "",
-
+
emptyText : null,
-
+
emptyClass : 'x-form-empty-field',
// private
@@ -469,7 +469,7 @@ Ext.extend(Ext.form.TextField, Ext.form.Field, {
}
},
-
+
reset : function(){
Ext.form.TextField.superclass.reset.call(this);
this.applyEmptyText();
@@ -522,7 +522,7 @@ Ext.extend(Ext.form.TextField, Ext.form.Field, {
Ext.form.TextField.superclass.setValue.apply(this, arguments);
},
-
+
validateValue : function(value){
if(value.length < 1 || value === this.emptyText){ // if it's blank
if(this.allowBlank){
@@ -562,7 +562,7 @@ Ext.extend(Ext.form.TextField, Ext.form.Field, {
return true;
},
-
+
selectText : function(start, end){
var v = this.getRawValue();
if(v.length > 0){
@@ -580,7 +580,7 @@ Ext.extend(Ext.form.TextField, Ext.form.Field, {
}
},
-
+
autoSize : function(){
if(!this.grow || !this.rendered){
return;
@@ -604,17 +604,17 @@ Ext.form.TriggerField = function(config){
};
Ext.extend(Ext.form.TriggerField, Ext.form.TextField, {
-
+
// private
defaultAutoCreate : {tag: "input", type: "text", size: "16", autocomplete: "off"},
-
+
hideTrigger:false,
-
-
-
-
+
+
+
+
autoSize: Ext.emptyFn,
monitorTab : true,
@@ -720,10 +720,10 @@ Ext.extend(Ext.form.TriggerField, Ext.form.TextField, {
Ext.form.TriggerField.superclass.onBlur.call(this);
},
- beforeBlur : Ext.emptyFn,
+ beforeBlur : Ext.emptyFn,
// private
- // This should be overriden by any subclass that needs to check whether or not the field can be blurred.
+ // This should be overridden by any subclass that needs to check whether or not the field can be blurred.
validateBlur : function(e, t){
return true;
},
@@ -755,7 +755,7 @@ Ext.extend(Ext.form.TriggerField, Ext.form.TextField, {
this.wrap.dom.style.display = 'none';
},
-
+
onTriggerClick : Ext.emptyFn
});
@@ -819,11 +819,11 @@ Ext.form.TextArea = function(config){
};
Ext.extend(Ext.form.TextArea, Ext.form.TextField, {
-
+
growMin : 60,
-
+
growMax: 1000,
-
+
preventScrollbars: false,
// private
@@ -861,7 +861,7 @@ Ext.extend(Ext.form.TextArea, Ext.form.TextField, {
}
},
-
+
autoSize : function(){
if(!this.grow || !this.textSizeEl){
return;
@@ -899,25 +899,25 @@ Ext.form.NumberField = function(config){
};
Ext.extend(Ext.form.NumberField, Ext.form.TextField, {
-
+
fieldClass: "x-form-field x-form-num-field",
-
+
allowDecimals : true,
-
+
decimalSeparator : ".",
-
+
decimalPrecision : 2,
-
+
allowNegative : true,
-
+
minValue : Number.NEGATIVE_INFINITY,
-
+
maxValue : Number.MAX_VALUE,
-
+
minText : "The minimum value for this field is {0}",
-
+
maxText : "The maximum value for this field is {0}",
-
+
nanText : "{0} is not a valid number",
// private
@@ -1013,31 +1013,31 @@ Ext.form.DateField = function(config){
};
Ext.extend(Ext.form.DateField, Ext.form.TriggerField, {
-
+
format : "m/d/y",
-
+
altFormats : "m/d/Y|m-d-y|m-d-Y|m/d|m-d|md|mdy|mdY|d",
-
+
disabledDays : null,
-
+
disabledDaysText : "Disabled",
-
+
disabledDates : null,
-
+
disabledDatesText : "Disabled",
-
+
minValue : null,
-
+
maxValue : null,
-
+
minText : "The date in this field must be after {0}",
-
+
maxText : "The date in this field must be before {0}",
-
+
invalidText : "{0} is not a valid date - it must be in the format {1}",
-
+
triggerClass : 'x-form-date-trigger',
-
+
// private
defaultAutoCreate : {tag: "input", type: "text", size: "10", autocomplete: "off"},
@@ -1089,12 +1089,12 @@ Ext.extend(Ext.form.DateField, Ext.form.TriggerField, {
return !this.menu || !this.menu.isVisible();
},
-
+
getValue : function(){
return this.parseDate(Ext.form.DateField.superclass.getValue.call(this)) || "";
},
-
+
setValue : function(date){
Ext.form.DateField.superclass.setValue.call(this, this.formatDate(this.parseDate(date)));
},
@@ -1177,24 +1177,24 @@ Ext.extend(Ext.form.DateField, Ext.form.TriggerField, {
Ext.form.Checkbox = function(config){
Ext.form.Checkbox.superclass.constructor.call(this, config);
this.addEvents({
-
+
check : true
});
};
Ext.extend(Ext.form.Checkbox, Ext.form.Field, {
-
+
focusClass : "x-form-check-focus",
-
+
fieldClass: "x-form-field",
-
+
checked: false,
// private
defaultAutoCreate : { tag: "input", type: 'checkbox', autocomplete: "off"},
-
+
boxLabel : undefined,
-
+
//
onResize : function(){
Ext.form.Checkbox.superclass.onResize.apply(this, arguments);
@@ -1209,7 +1209,7 @@ Ext.extend(Ext.form.Checkbox, Ext.form.Field, {
this.el.on("change", this.onClick, this);
},
-
+
getResizeEl : function(){
return this.wrap;
},
@@ -1236,7 +1236,7 @@ Ext.extend(Ext.form.Checkbox, Ext.form.Field, {
// private
initValue : Ext.emptyFn,
-
+
getValue : function(){
if(this.rendered){
return this.el.dom.checked;
@@ -1250,7 +1250,7 @@ Ext.extend(Ext.form.Checkbox, Ext.form.Field, {
}
},
-
+
setValue : function(v){
this.checked = (v === true || v === 'true' || v == '1');
if(this.el && this.el.dom){
@@ -1266,7 +1266,7 @@ Ext.form.Radio = function(){
Ext.extend(Ext.form.Radio, Ext.form.Checkbox, {
inputType: 'radio',
-
+
getGroupValue : function(){
return this.el.up('form').child('input[name='+this.el.dom.name+']:checked', true).value;
}
@@ -1275,15 +1275,15 @@ Ext.extend(Ext.form.Radio, Ext.form.Checkbox, {
Ext.form.ComboBox = function(config){
Ext.form.ComboBox.superclass.constructor.call(this, config);
this.addEvents({
-
+
'expand' : true,
-
+
'collapse' : true,
-
+
'beforeselect' : true,
-
+
'select' : true,
-
+
'beforequery': true
});
if(this.transform){
@@ -1333,65 +1333,65 @@ Ext.form.ComboBox = function(config){
};
Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
-
-
-
+
+
+
// private
defaultAutoCreate : {tag: "input", type: "text", size: "24", autocomplete: "off"},
-
+
listWidth: undefined,
-
+
displayField: undefined,
-
+
valueField: undefined,
-
+
hiddenName: undefined,
-
+
listClass: '',
-
+
selectedClass: 'x-combo-selected',
-
+
triggerClass : 'x-form-arrow-trigger',
-
+
shadow:'sides',
-
+
listAlign: 'tl-bl?',
-
+
maxHeight: 300,
-
+
triggerAction: 'query',
-
+
minChars : 4,
-
+
typeAhead: false,
-
+
queryDelay: 500,
-
+
pageSize: 0,
-
+
selectOnFocus:false,
-
+
queryParam: 'query',
-
+
loadingText: 'Loading...',
-
+
resizable: false,
-
+
handleHeight : 8,
-
+
editable: true,
-
+
allQuery: '',
-
+
mode: 'remote',
-
+
minListWidth : 70,
-
+
forceSelection:false,
-
+
typeAheadDelay : 250,
-
+
valueNotFoundText : undefined,
// private
@@ -1561,7 +1561,7 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
}
},
-
+
setEditable : function(value){
if(value == this.editable){
return;
@@ -1639,7 +1639,7 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
}
},
-
+
getValue : function(){
if(this.valueField){
return typeof this.value != 'undefined' ? this.value : '';
@@ -1648,7 +1648,7 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
}
},
-
+
clearValue : function(){
if(this.hiddenField){
this.hiddenField.value = '';
@@ -1657,7 +1657,7 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
this.lastSelectionText = '';
},
-
+
setValue : function(v){
var text = v;
if(this.valueField){
@@ -1736,12 +1736,12 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
this.collapse();
},
-
+
isExpanded : function(){
return this.list.isVisible();
},
-
+
selectByValue : function(v, scrollIntoView){
if(v !== undefined && v !== null){
var r = this.findRecord(this.valueField || this.displayField, v);
@@ -1753,7 +1753,7 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
return false;
},
-
+
select : function(index, scrollIntoView){
this.selectedIndex = index;
this.view.select(index);
@@ -1799,7 +1799,7 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
// private
validateBlur : function(){
- return !this.list || !this.list.isVisible();
+ return !this.list || !this.list.isVisible();
},
// private
@@ -1816,7 +1816,7 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
}
},
-
+
doQuery : function(q, forceAll){
if(q === undefined || q === null){
q = '';
@@ -1852,7 +1852,7 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
}
}else{
this.selectedIndex = -1;
- this.onLoad();
+ this.onLoad();
}
}
},
@@ -1868,7 +1868,7 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
return p;
},
-
+
collapse : function(){
if(!this.isExpanded()){
return;
@@ -1885,7 +1885,7 @@ Ext.extend(Ext.form.ComboBox, Ext.form.TriggerField, {
}
},
-
+
expand : function(){
if(this.isExpanded() || !this.hasFocus){
return;
@@ -1921,31 +1921,31 @@ Ext.Editor = function(field, config){
Ext.Editor.superclass.constructor.call(this, config);
this.field = field;
this.addEvents({
-
+
"beforestartedit" : true,
-
+
"startedit" : true,
-
+
"beforecomplete" : true,
-
+
"complete" : true,
-
+
"specialkey" : true
});
};
Ext.extend(Ext.Editor, Ext.Component, {
-
-
-
-
-
+
+
+
+
+
value : "",
-
+
alignment: "c-c?",
-
+
shadow : "frame",
-
+
constrain : false,
// private
@@ -2013,7 +2013,7 @@ Ext.extend(Ext.Editor, Ext.Component, {
this.show();
},
-
+
setSize : function(w, h){
this.field.setSize(w, h);
if(this.el){
@@ -2021,12 +2021,12 @@ Ext.extend(Ext.Editor, Ext.Component, {
}
},
-
+
realign : function(){
this.el.alignTo(this.boundEl, this.alignment);
},
-
+
completeEdit : function(remainVisible){
if(!this.editing){
return;
@@ -2075,7 +2075,7 @@ Ext.extend(Ext.Editor, Ext.Component, {
}
},
-
+
cancelEdit : function(remainVisible){
if(this.editing){
this.setValue(this.startValue);
@@ -2111,12 +2111,12 @@ Ext.extend(Ext.Editor, Ext.Component, {
}
},
-
+
setValue : function(v){
this.field.setValue(v);
},
-
+
getValue : function(){
return this.field.getValue();
}
@@ -2124,16 +2124,16 @@ Ext.extend(Ext.Editor, Ext.Component, {
Ext.form.BasicForm = function(el, config){
Ext.apply(this, config);
-
+
this.items = new Ext.util.MixedCollection(false, function(o){
return o.id || (o.id = Ext.id());
});
this.addEvents({
-
+
beforeaction: true,
-
+
actionfailed : true,
-
+
actioncomplete : true
});
if(el){
@@ -2143,22 +2143,22 @@ Ext.form.BasicForm = function(el, config){
};
Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
timeout: 30,
// private
activeAction : null,
-
+
trackResetOnLoad : false,
-
+
waitMsgTarget : undefined,
// private
@@ -2174,7 +2174,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
e.stopEvent();
},
-
+
isValid : function(){
var valid = true;
this.items.each(function(f){
@@ -2185,7 +2185,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
return valid;
},
-
+
isDirty : function(){
var dirty = false;
this.items.each(function(f){
@@ -2197,7 +2197,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
return dirty;
},
-
+
doAction : function(action, options){
if(typeof action == 'string'){
action = new Ext.form.Action.ACTION_TYPES[action](this, options);
@@ -2209,19 +2209,19 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
return this;
},
-
+
submit : function(options){
this.doAction('submit', options);
return this;
},
-
+
load : function(options){
this.doAction('load', options);
return this;
},
-
+
updateRecord : function(record){
record.beginEdit();
var fs = record.fields;
@@ -2235,7 +2235,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
return this;
},
-
+
loadRecord : function(record){
this.setValues(record.data);
return this;
@@ -2282,7 +2282,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
}
},
-
+
findField : function(id){
var field = this.items.get(id);
if(!field){
@@ -2297,7 +2297,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
},
-
+
markInvalid : function(errors){
if(errors instanceof Array){
for(var i = 0, len = errors.length; i < len; i++){
@@ -2318,7 +2318,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
return this;
},
-
+
setValues : function(values){
if(values instanceof Array){ // array of objects
for(var i = 0, len = values.length; i < len; i++){
@@ -2345,7 +2345,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
return this;
},
-
+
getValues : function(asString){
var fs = Ext.lib.Ajax.serializeForm(this.el.dom);
if(asString === true){
@@ -2354,7 +2354,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
return Ext.urlDecode(fs);
},
-
+
clearInvalid : function(){
this.items.each(function(f){
f.clearInvalid();
@@ -2362,7 +2362,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
return this;
},
-
+
reset : function(){
this.items.each(function(f){
f.reset();
@@ -2370,20 +2370,20 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
return this;
},
-
+
add : function(){
this.items.addAll(Array.prototype.slice.call(arguments, 0));
return this;
},
-
+
remove : function(field){
this.items.remove(field);
return this;
},
-
+
render : function(){
this.items.each(function(f){
if(f.isFormField && !f.rendered && document.getElementById(f.id)){ // if the element exists
@@ -2393,7 +2393,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
return this;
},
-
+
applyToFields : function(o){
this.items.each(function(f){
Ext.apply(f, o);
@@ -2401,7 +2401,7 @@ Ext.extend(Ext.form.BasicForm, Ext.util.Observable, {
return this;
},
-
+
applyIfToFields : function(o){
this.items.each(function(f){
Ext.applyIf(f, o);
@@ -2422,33 +2422,33 @@ Ext.form.Form = function(config){
}, config));
}
this.active = this.root;
-
+
this.buttons = [];
this.addEvents({
-
+
clientvalidation: true
});
};
Ext.extend(Ext.form.Form, Ext.form.BasicForm, {
-
-
-
+
+
+
buttonAlign:'center',
-
+
minButtonWidth:75,
-
+
labelAlign:'left',
-
+
monitorValid : false,
-
+
monitorPoll : 200,
-
+
column : function(c){
var col = new Ext.form.Column(c);
this.start(col);
@@ -2459,7 +2459,7 @@ Ext.extend(Ext.form.Form, Ext.form.BasicForm, {
return col;
},
-
+
fieldset : function(c){
var fs = new Ext.form.FieldSet(c);
this.start(fs);
@@ -2470,7 +2470,7 @@ Ext.extend(Ext.form.Form, Ext.form.BasicForm, {
return fs;
},
-
+
container : function(c){
var l = new Ext.form.Layout(c);
this.start(l);
@@ -2481,7 +2481,7 @@ Ext.extend(Ext.form.Form, Ext.form.BasicForm, {
return l;
},
-
+
start : function(c){
// cascade label info
Ext.applyIf(c, {'labelAlign': this.active.labelAlign, 'labelWidth': this.active.labelWidth, 'itemCls': this.active.itemCls});
@@ -2491,7 +2491,7 @@ Ext.extend(Ext.form.Form, Ext.form.BasicForm, {
return this;
},
-
+
end : function(){
if(this.active == this.root){
return this;
@@ -2500,7 +2500,7 @@ Ext.extend(Ext.form.Form, Ext.form.BasicForm, {
return this;
},
-
+
add : function(){
this.active.stack.push.apply(this.active.stack, arguments);
var r = [];
@@ -2515,7 +2515,7 @@ Ext.extend(Ext.form.Form, Ext.form.BasicForm, {
return this;
},
-
+
render : function(ct){
ct = Ext.get(ct);
var o = this.autoCreate || {
@@ -2551,7 +2551,7 @@ Ext.extend(Ext.form.Form, Ext.form.BasicForm, {
return this;
},
-
+
addButton : function(config, handler, scope){
var bc = {
handler: handler,
@@ -2569,7 +2569,7 @@ Ext.extend(Ext.form.Form, Ext.form.BasicForm, {
return btn;
},
-
+
startMonitoring : function(){
if(!this.bound){
this.bound = true;
@@ -2581,7 +2581,7 @@ Ext.extend(Ext.form.Form, Ext.form.BasicForm, {
}
},
-
+
stopMonitoring : function(){
this.bound = false;
},
@@ -2815,15 +2815,15 @@ Ext.form.Layout = function(config){
};
Ext.extend(Ext.form.Layout, Ext.Component, {
-
-
-
-
-
+
+
+
+
+
clear : true,
-
+
labelSeparator : ':',
-
+
hideLabels : false,
// private
@@ -2907,8 +2907,8 @@ Ext.form.Column = function(config){
};
Ext.extend(Ext.form.Column, Ext.form.Layout, {
-
-
+
+
// private
defaultAutoCreate : {tag: 'div', cls: 'x-form-ct x-form-column'},
@@ -2928,8 +2928,8 @@ Ext.form.FieldSet = function(config){
};
Ext.extend(Ext.form.FieldSet, Ext.form.Layout, {
-
-
+
+
// private
defaultAutoCreate : {tag: 'fieldset', cn: {tag:'legend'}},
@@ -2959,38 +2959,38 @@ Ext.form.VTypes = function(){
// All these messages and functions are configurable
return {
-
+
'email' : function(v){
return email.test(v);
},
-
+
'emailText' : 'This field should be an e-mail address in the format "user@domain.com"',
-
+
'emailMask' : /[a-z0-9_\.\-@]/i,
-
+
'url' : function(v){
return url.test(v);
},
-
+
'urlText' : 'This field should be a URL in the format "http:/'+'/www.domain.com"',
-
-
+
+
'alpha' : function(v){
return alpha.test(v);
},
-
+
'alphaText' : 'This field should only contain letters and _',
-
+
'alphaMask' : /[a-z_]/i,
-
+
'alphanum' : function(v){
return alphanum.test(v);
},
-
+
'alphanumText' : 'This field should only contain letters, numbers and _',
-
+
'alphanumMask' : /[a-z0-9_]/i
};
}();
diff --git a/pub/lib/jquery/jquery-ui.js b/pub/lib/jquery/jquery-ui.js
index 3cda3683de1..d556f0d7f60 100644
--- a/pub/lib/jquery/jquery-ui.js
+++ b/pub/lib/jquery/jquery-ui.js
@@ -1017,7 +1017,7 @@ $.widget("ui.mouse", {
return this.mouseDelayMet;
},
- // These are placeholder methods, to be overriden by extending plugin
+ // These are placeholder methods, to be overridden by extending plugin
_mouseStart: function(event) {},
_mouseDrag: function(event) {},
_mouseStop: function(event) {},
diff --git a/pub/lib/lib/flex.js b/pub/lib/lib/flex.js
index 72aeabe0b21..cebbf59c974 100644
--- a/pub/lib/lib/flex.js
+++ b/pub/lib/lib/flex.js
@@ -214,7 +214,7 @@ Flex.Object = Class.create({
/**
* Set object attribute for generation of html tags
*
- * @param Sting name
+ * @param String name
* @param Object value
* @return void
*/
@@ -224,9 +224,9 @@ Flex.Object = Class.create({
}
},
/**
- * Retrive object attribute value used for generation in html tags
+ * Retrieve object attribute value used for generation in html tags
*
- * @param Sting name
+ * @param String name
* @return Object
*/
getAttribute : function( name ) {
diff --git a/pub/lib/mage/validation.js b/pub/lib/mage/validation.js
index 72571905ea6..f9ac9a0da79 100644
--- a/pub/lib/mage/validation.js
+++ b/pub/lib/mage/validation.js
@@ -956,7 +956,7 @@
],
"validate-cc-type": [
/**
- * Validate credit card number is for the currect credit card type
+ * Validate credit card number is for the correct credit card type
* @param value - credit card number
* @param element - element contains credit card number
* @param params - selector for credit card type
diff --git a/pub/lib/prototype/tooltip_manager.js b/pub/lib/prototype/tooltip_manager.js
index 65e6106034c..4c562c71b6e 100644
--- a/pub/lib/prototype/tooltip_manager.js
+++ b/pub/lib/prototype/tooltip_manager.js
@@ -1,17 +1,17 @@
// Singleton class TooltipWindow
// This class works with special className. The tooltip content could be in your HTML page as an hidden element or
-// can be retreive by an AJAX call.
+// can be retrieve by an AJAX call.
//
// To work, You just need to set two class name on elements that should show tooltips
// - One to say to TooltipManager that this element must have a tooltip ('tooltip' by default)
// - Another to indicate how to find the tooltip content
// It could be html_XXXX if tootltip content is somewhere hidden in your page, XXX must be DOM ID of this hidden element
-// It could be ajax_XXXX if tootltip content must be find by an ajax request, XXX will be the string send as id parameter to your server.
+// It could be ajax_XXXX if tootltip content must be find by an ajax request, XXX will be the string send as id parameter to your server.
// Check samples/tooltips/tooltip.html to see how it works
//
TooltipManager = {
options: {cssClassName: 'tooltip', delayOver: 200, delayOut: 1000, shiftX: 10, shiftY: 10,
- className: 'alphacube', width: 200, height: null,
+ className: 'alphacube', width: 200, height: null,
draggable: false, minimizable: false, maximizable: false, showEffect: Element.show, hideEffect: Element.hide},
ajaxInfo: null,
elements: null,
@@ -20,21 +20,21 @@ TooltipManager = {
// Init tooltip manager
// parameters:
- // - cssClassName (string) : CSS class name where tooltip should be shown.
- // - ajaxOptions (hash) : Ajax options for ajax tooltip.
- // For examples {url: "/tooltip/get.php", options: {method: 'get'}}
+ // - cssClassName (string) : CSS class name where tooltip should be shown.
+ // - ajaxOptions (hash) : Ajax options for ajax tooltip.
+ // For examples {url: "/tooltip/get.php", options: {method: 'get'}}
// see Ajax.Request documentation for details
//- tooltipOptions (hash) : available keys
// - delayOver: int in ms (default 10) delay before showing tooltip
// - delayOut: int in ms (default 1000) delay before hidding tooltip
- // - shiftX: int in pixels (default 10) left shift of the tooltip window
- // - shiftY: int in pixels (default 10) top shift of the tooltip window
+ // - shiftX: int in pixels (default 10) left shift of the tooltip window
+ // - shiftY: int in pixels (default 10) top shift of the tooltip window
// and All window options like showEffect: Element.show, hideEffect: Element.hide to remove animation
// default: {className: 'alphacube', width: 200, height: null, draggable: false, minimizable: false, maximizable: false}
-
+
init: function(cssClassName, ajaxInfo, tooltipOptions) {
TooltipManager.options = Object.extend(TooltipManager.options, tooltipOptions || {});
-
+
cssClassName = TooltipManager.options.cssClassName || "tooltip";
TooltipManager.ajaxInfo = ajaxInfo;
TooltipManager.elements = $$("." + cssClassName);
@@ -53,66 +53,66 @@ TooltipManager = {
});
Windows.addObserver(this);
},
-
+
addHTML: function(element, tooltipElement) {
element = $(element);
tooltipElement = $(tooltipElement);
element.tooltipElement = tooltipElement;
-
+
element.observe("mouseover", TooltipManager._mouseOver);
element.observe("mouseout", TooltipManager._mouseOut);
},
-
+
addAjax: function(element, ajaxInfo) {
element = $(element);
element.ajaxInfo = ajaxInfo;
element.observe("mouseover", TooltipManager._mouseOver);
- element.observe("mouseout", TooltipManager._mouseOut);
+ element.observe("mouseout", TooltipManager._mouseOut);
},
-
+
addURL: function(element, url, width, height) {
element = $(element);
element.url = url;
element.frameWidth = width;
element.frameHeight = height;
element.observe("mouseover", TooltipManager._mouseOver);
- element.observe("mouseout", TooltipManager._mouseOut);
+ element.observe("mouseout", TooltipManager._mouseOut);
},
-
+
close: function() {
if (TooltipManager.tooltipWindow)
TooltipManager.tooltipWindow.hide();
},
-
+
preloadImages: function(path, images, extension) {
if (!extension)
extension = ".gif";
-
+
//preload images
$A(images).each(function(i) {
- var image = new Image();
- image.src= path + "/" + i + extension;
+ var image = new Image();
+ image.src= path + "/" + i + extension;
});
},
-
+
_showTooltip: function(element) {
if (this.element == element)
return;
// Get original element
- while (element && (!element.tooltipElement && !element.ajaxInfo && !element.url))
+ while (element && (!element.tooltipElement && !element.ajaxInfo && !element.url))
element = element.parentNode;
this.element = element;
-
+
TooltipManager.showTimer = null;
if (TooltipManager.hideTimer)
clearTimeout(TooltipManager.hideTimer);
-
+
var position = Position.cumulativeOffset(element);
var dimension = element.getDimensions();
if (! this.tooltipWindow)
this.tooltipWindow = new Window("__tooltip__", TooltipManager.options);
-
+
this.tooltipWindow.hide();
this.tooltipWindow.setLocation(position[1] + dimension.height + TooltipManager.options.shiftY, position[0] + TooltipManager.options.shiftX);
@@ -127,7 +127,7 @@ TooltipManager = {
if (element.ajaxInfo) {
var p = element.ajaxInfo.options.parameters;
var saveParam = p;
-
+
// Set by CSS
if (element.ajaxId) {
if (p)
@@ -138,8 +138,8 @@ TooltipManager = {
element.ajaxInfo.options.parameters = p || "";
this.tooltipWindow.setHTMLContent("");
this.tooltipWindow.setAjaxContent(element.ajaxInfo.url, element.ajaxInfo.options);
- element.ajaxInfo.options.parameters = saveParam;
- }
+ element.ajaxInfo.options.parameters = saveParam;
+ }
// URL content
else if (element.url) {
this.tooltipWindow.setURL(element.url);
@@ -158,22 +158,22 @@ TooltipManager = {
this.tooltipWindow.toFront();
}
},
-
+
_hideTooltip: function(element) {
if (this.tooltipWindow) {
this.tooltipWindow.hide();
this.element = null;
}
},
-
+
_mouseOver: function (event) {
var element = Event.element(event);
- if (TooltipManager.showTimer)
+ if (TooltipManager.showTimer)
clearTimeout(TooltipManager.showTimer);
-
+
TooltipManager.showTimer = setTimeout(function() {TooltipManager._showTooltip(element)}, TooltipManager.options.delayOver)
},
-
+
_mouseOut: function(event) {
var element = Event.element(event);
if (TooltipManager.showTimer) {
@@ -184,37 +184,37 @@ TooltipManager = {
if (TooltipManager.tooltipWindow)
TooltipManager.hideTimer = setTimeout(function() {TooltipManager._hideTooltip(element)}, TooltipManager.options.delayOut)
},
-
+
_tooltipOver: function(event, element) {
if (TooltipManager.hideTimer) {
clearTimeout(TooltipManager.hideTimer);
TooltipManager.hideTimer = null;
}
},
-
+
_tooltipOut: function(event, element) {
if (TooltipManager.hideTimer == null)
TooltipManager.hideTimer = setTimeout(function() {TooltipManager._hideTooltip(element)}, TooltipManager.options.delayOut)
},
-
+
_getInfo: function(element) {
// Find html_ for static content
var id = element.className.split(' ').detect(function(name) {return name.indexOf("html_") == 0});
var ajax = true;
if (id)
ajax = false;
- else
+ else
// Find ajax_ for ajax content
id = element.className.split(' ').detect(function(name) {return name.indexOf("ajax_") == 0});
-
+
id = id.substr(id.indexOf('_')+1, id.length)
return id ? {ajax: ajax, id: id} : null;
},
-
+
onBeforeShow: function(eventName, win) {
var top = parseFloat(win.getLocation().top);
var dim = win.element.getDimensions();
-
+
if (top + dim.height > TooltipManager._getScrollTop() + TooltipManager._getPageHeight()) {
var position = Position.cumulativeOffset(this.element);
@@ -226,7 +226,7 @@ TooltipManager = {
_getPageWidth: function(){
return window.innerWidth || document.documentElement.clientWidth || 0;
},
-
+
_getPageHeight: function(){
return window.innerHeight || document.documentElement.clientHeight || 0;
},
@@ -237,5 +237,5 @@ TooltipManager = {
_getScrollLeft: function(){
return document.documentElement.scrollLeft || window.pageXOffset || 0;
- }
+ }
};
diff --git a/pub/lib/tiny_mce/classes/Editor.js b/pub/lib/tiny_mce/classes/Editor.js
index 844ce1837c2..6ea9b2386e9 100644
--- a/pub/lib/tiny_mce/classes/Editor.js
+++ b/pub/lib/tiny_mce/classes/Editor.js
@@ -23,20 +23,20 @@
* @example
* // Add a class to all paragraphs in the editor.
* tinyMCE.activeEditor.dom.addClass(tinyMCE.activeEditor.dom.select('p'), 'someclass');
- *
+ *
* // Gets the current editors selection as text
* tinyMCE.activeEditor.selection.getContent({format : 'text'});
- *
+ *
* // Creates a new editor instance
* var ed = new tinymce.Editor('textareaid', {
* some_setting : 1
* });
- *
+ *
* // Select each item the user clicks on
* ed.onClick.add(function(ed, e) {
* ed.selection.select(e.target);
* });
- *
+ *
* ed.render();
*/
tinymce.create('tinymce.Editor', {
@@ -53,7 +53,7 @@
var t = this;
/**
- * Editor instance id, normally the same as the div/textarea that was replaced.
+ * Editor instance id, normally the same as the div/textarea that was replaced.
*
* @property id
* @type String
@@ -65,7 +65,7 @@
t.queryValueCommands = {};
/**
- * State to force the editor to return false on a isDirty call.
+ * State to force the editor to return false on a isDirty call.
*
* @property isNotDirty
* @type Boolean
@@ -834,7 +834,7 @@
* @example
* // Get relative URL from the location of document_base_url
* tinyMCE.activeEditor.documentBaseURI.toRelative('/somedir/somefile.htm');
- *
+ *
* // Get absolute URL from the location of document_base_url
* tinyMCE.activeEditor.documentBaseURI.toAbsolute('somefile.htm');
*/
@@ -850,7 +850,7 @@
* @example
* // Get relative URL from the location of the API
* tinyMCE.activeEditor.baseURI.toRelative('/somedir/somefile.htm');
- *
+ *
* // Get absolute URL from the location of the API
* tinyMCE.activeEditor.baseURI.toAbsolute('somefile.htm');
*/
@@ -861,7 +861,7 @@
*
* @property contentCSS
* @type Array
- */
+ */
t.contentCSS = [];
// Call setup
@@ -890,7 +890,7 @@
if (!t.getElement())
return;
- // Is a iPad/iPhone and not on iOS5, then skip initialization. We need to sniff
+ // Is a iPad/iPhone and not on iOS5, then skip initialization. We need to sniff
// here since the browser says it has contentEditable support but there is no visible
// caret We will remove this check ones Apple implements full contentEditable support
if (tinymce.isIDevice && !tinymce.isIOS5)
@@ -908,7 +908,7 @@
* @example
* // Shows an alert message
* tinyMCE.activeEditor.windowManager.alert('Hello world!');
- *
+ *
* // Opens a new dialog with the file.htm file and the size 320x240
* // It also adds a custom parameter this can be retrieved by using tinyMCEPopup.getWindowArg inside the dialog.
* tinyMCE.activeEditor.windowManager.open({
@@ -992,7 +992,7 @@
var defaultSettings = {prefix:'plugins/', resource: dep, suffix:'/editor_plugin' + tinymce.suffix + '.js'};
var dep = PluginManager.createUrl(defaultSettings, dep);
PluginManager.load(dep.resource, dep);
-
+
});
} else {
// Skip safari plugin, since it is removed as of 3.3b1
@@ -1029,7 +1029,7 @@
s.aria_label = s.aria_label || DOM.getAttrib(e, 'aria-label', t.getLang('aria.rich_text_area'));
/**
- * Reference to the theme instance that was used to generate the UI.
+ * Reference to the theme instance that was used to generate the UI.
*
* @property theme
* @type tinymce.Theme
@@ -1061,7 +1061,7 @@
}
}
}
-
+
// Create all plugins
each(explode(s.plugins.replace(/\-/g, '')), initPlugin);
@@ -1218,7 +1218,7 @@
// Create iframe
// TODO: ACC add the appropriate description on this.
- n = DOM.add(o.iframeContainer, 'iframe', {
+ n = DOM.add(o.iframeContainer, 'iframe', {
id : t.id + "_ifr",
src : u || 'javascript:""', // Workaround for HTTPS warning in IE6/7
frameBorder : '0',
@@ -1311,12 +1311,12 @@
if (!t.settings.allow_html_in_named_anchor) {
t.parser.addAttributeFilter('name', function(nodes, name) {
var i = nodes.length, sibling, prevSibling, parent, node;
-
+
while (i--) {
node = nodes[i];
if (node.name === 'a' && node.firstChild) {
parent = node.parent;
-
+
// Move children after current node
sibling = node.lastChild;
do {
@@ -1339,7 +1339,7 @@
internalName = 'data-mce-' + name;
// Add internal attribute if we need to we don't on a refresh of the document
- if (!node.attributes.map[internalName]) {
+ if (!node.attributes.map[internalName]) {
if (name === "style")
node.attr(internalName, dom.serializeStyle(dom.parseStyle(value), node.name));
else
@@ -1497,7 +1497,7 @@
t.formatter.register(t.settings.formats);
/**
- * Undo manager instance, responsible for handling undo levels.
+ * Undo manager instance, responsible for handling undo levels.
*
* @property undoManager
* @type tinymce.UndoManager
@@ -1649,7 +1649,7 @@
if (o.set)
o.content = t.execCallback('cleanup_callback', 'insert_to_editor', o.content, o);
- if (o.get)
+ if (o.get)
o.content = t.execCallback('cleanup_callback', 'get_from_editor', o.content, o);
});
}
@@ -1951,7 +1951,7 @@
*
* @method getLang
* @param {String} n Name/key to get from the language pack.
- * @param {String} dv Optional default value to retrive.
+ * @param {String} dv Optional default value to retrieve.
*/
getLang : function(n, dv) {
return tinymce.i18n[(this.settings.language || 'en') + '.' + n] || (is(dv) ? dv : '{#' + n + '}');
@@ -1961,14 +1961,14 @@
* Returns a configuration parameter by name.
*
* @method getParam
- * @param {String} n Configruation parameter to retrive.
+ * @param {String} n Configruation parameter to retrieve.
* @param {String} dv Optional default value to return.
* @param {String} ty Optional type parameter.
* @return {String} Configuration parameter value or default value.
* @example
* // Returns a specific config value from the currently active editor
* var someval = tinyMCE.activeEditor.getParam('myvalue');
- *
+ *
* // Returns a specific config value from a specific editor instance by id
* var someval2 = tinyMCE.get('my_editor').getParam('myvalue');
*/
@@ -2043,9 +2043,9 @@
* // an alert box with the selected contents as plain text.
* tinyMCE.init({
* ...
- *
+ *
* theme_advanced_buttons1 : 'example,..'
- *
+ *
* setup : function(ed) {
* // Register example button
* ed.addButton('example', {
@@ -2077,7 +2077,7 @@
* // Adds a custom command that later can be executed using execCommand
* tinyMCE.init({
* ...
- *
+ *
* setup : function(ed) {
* // Register example command
* ed.addCommand('mycommand', function(ui, v) {
@@ -2395,10 +2395,10 @@
* @example
* // Show progress for the active editor
* tinyMCE.activeEditor.setProgressState(true);
- *
+ *
* // Hide progress for the active editor
* tinyMCE.activeEditor.setProgressState(false);
- *
+ *
* // Show progress after 3 seconds
* tinyMCE.activeEditor.setProgressState(true, 3000);
*/
@@ -2500,13 +2500,13 @@
* @example
* // Sets the HTML contents of the activeEditor editor
* tinyMCE.activeEditor.setContent('<span>some</span> html');
- *
+ *
* // Sets the raw contents of the activeEditor editor
* tinyMCE.activeEditor.setContent('<span>some</span> html', {format : 'raw'});
- *
+ *
* // Sets the content of a specific editor (my_editor in this example)
* tinyMCE.get('my_editor').setContent(data);
- *
+ *
* // Sets the bbcode contents of the activeEditor editor if the bbcode plugin was added
* tinyMCE.activeEditor.setContent('[b]some[/b] html', {format : 'bbcode'});
*/
@@ -2570,10 +2570,10 @@
* @example
* // Get the HTML contents of the currently active editor
* console.debug(tinyMCE.activeEditor.getContent());
- *
+ *
* // Get the raw contents of the currently active editor
* tinyMCE.activeEditor.getContent({format : 'raw'});
- *
+ *
* // Get content of a specific editor:
* tinyMCE.get('content id').getContent()
*/
@@ -2995,7 +2995,7 @@
while (n && n.nodeType && n.nodeType != 1 && n.parentNode)
n = n.parentNode;
-
+
// Is the cursor at the beginning of a blockquote?
if (n && n.parentNode && n.parentNode.tagName === 'BLOCKQUOTE' && n.parentNode.firstChild == n && offset == 0) {
// Remove the blockquote
@@ -3009,7 +3009,7 @@
ed.selection.collapse(false);
}
});
-
+
// Add reset handler
diff --git a/pub/lib/tiny_mce/classes/Formatter.js b/pub/lib/tiny_mce/classes/Formatter.js
index 4ef132393ed..0cbca75ec50 100644
--- a/pub/lib/tiny_mce/classes/Formatter.js
+++ b/pub/lib/tiny_mce/classes/Formatter.js
@@ -65,8 +65,8 @@
* Returns the format by name or all formats if no name is specified.
*
* @method get
- * @param {String} name Optional name to retrive by.
- * @return {Array/Object} Array/Object with all registred formats or a specific format.
+ * @param {String} name Optional name to retrieve by.
+ * @return {Array/Object} Array/Object with all registered formats or a specific format.
*/
function get(name) {
return name ? formats[name] : formats;
@@ -229,10 +229,10 @@
return rng;
}
-
+
function applyStyleToList(node, bookmark, wrapElm, newWrappers, process){
var nodes = [], listIndex = -1, list, startIndex = -1, endIndex = -1, currentWrapElm;
-
+
// find the index of the first child list.
each(node.childNodes, function(n, index) {
if (n.nodeName === "UL" || n.nodeName === "OL") {
@@ -241,7 +241,7 @@
return false;
}
});
-
+
// get the index of the bookmarks
each(node.childNodes, function(n, index) {
if (n.nodeName === "SPAN" && dom.getAttrib(n, "data-mce-type") == "bookmark") {
@@ -252,29 +252,29 @@
}
}
});
-
+
// if the selection spans across an embedded list, or there isn't an embedded list - handle processing normally
if (listIndex <= 0 || (startIndex < listIndex && endIndex > listIndex)) {
each(tinymce.grep(node.childNodes), process);
return 0;
} else {
currentWrapElm = wrapElm.cloneNode(FALSE);
-
+
// create a list of the nodes on the same side of the list as the selection
each(tinymce.grep(node.childNodes), function(n, index) {
if ((startIndex < listIndex && index < listIndex) || (startIndex > listIndex && index > listIndex)) {
- nodes.push(n);
+ nodes.push(n);
n.parentNode.removeChild(n);
}
});
-
+
// insert the wrapping element either before or after the list.
if (startIndex < listIndex) {
node.insertBefore(currentWrapElm, list);
} else if (startIndex > listIndex) {
node.insertBefore(currentWrapElm, list.nextSibling);
}
-
+
// add the new nodes to the list.
newWrappers.push(currentWrapElm);
@@ -285,7 +285,7 @@
return currentWrapElm;
}
};
-
+
function applyRngStyle(rng, bookmark, node_specific) {
var newWrappers = [], wrapName, wrapElm;
@@ -1797,7 +1797,7 @@
return true;
};
-
+
// Returns any parent caret container element
function getParentCaretContainer(node) {
while (node) {
@@ -1855,7 +1855,7 @@
selection.setRng(rng);
}
};
-
+
// Applies formatting to the caret postion
function applyCaretFormat() {
var rng, caretContainer, textNode, offset, bookmark, container, text;
diff --git a/pub/lib/tiny_mce/classes/Popup.js b/pub/lib/tiny_mce/classes/Popup.js
index 0537c7c7174..5667fc248ce 100644
--- a/pub/lib/tiny_mce/classes/Popup.js
+++ b/pub/lib/tiny_mce/classes/Popup.js
@@ -56,7 +56,7 @@ tinyMCEPopup = {
* tinyMCEPopup.onInit.add(function(ed) {
* alert(ed.selection.getContent());
* });
- *
+ *
* // Executes the init method on page load in some object using the SomeObject scope
* tinyMCEPopup.onInit.add(SomeObject.init, SomeObject);
*/
@@ -86,7 +86,7 @@ tinyMCEPopup = {
* Returns a window argument/parameter by name.
*
* @method getWindowArg
- * @param {String} n Name of the window argument to retrive.
+ * @param {String} n Name of the window argument to retrieve.
* @param {String} dv Optional default value to return.
* @return {String} Argument value or default value if it wasn't found.
*/
@@ -100,7 +100,7 @@ tinyMCEPopup = {
* Returns a editor parameter/config option value.
*
* @method getParam
- * @param {String} n Name of the editor config option to retrive.
+ * @param {String} n Name of the editor config option to retrieve.
* @param {String} dv Optional default value to return.
* @return {String} Parameter value or default value if it wasn't found.
*/
@@ -297,7 +297,7 @@ tinyMCEPopup = {
close();
},
- // Internal functions
+ // Internal functions
_restoreSelection : function() {
var e = window.event.srcElement;
diff --git a/pub/lib/tiny_mce/classes/WindowManager.js b/pub/lib/tiny_mce/classes/WindowManager.js
index fac072600f7..e80de4e80da 100644
--- a/pub/lib/tiny_mce/classes/WindowManager.js
+++ b/pub/lib/tiny_mce/classes/WindowManager.js
@@ -25,10 +25,10 @@
* }, {
* custom_param : 1
* });
- *
+ *
* // Displays an alert box using the active editors window manager instance
* tinyMCE.activeEditor.windowManager.alert('Hello world!');
- *
+ *
* // Displays an confirm box and an alert message will be displayed depending on what you choose in the confirm
* tinyMCE.activeEditor.windowManager.confirm("Do you want to do something", function(s) {
* if (s)
@@ -60,19 +60,19 @@
*
* @method open
* @param {Object} s Optional name/value settings collection contains things like width/height/url etc.
- * @option {String} title Window title.
- * @option {String} file URL of the file to open in the window.
- * @option {Number} width Width in pixels.
- * @option {Number} height Height in pixels.
- * @option {Boolean} resizable Specifies whether the popup window is resizable or not.
- * @option {Boolean} maximizable Specifies whether the popup window has a "maximize" button and can get maximized or not.
- * @option {Boolean} inline Specifies whether to display in-line (set to 1 or true for in-line display; requires inlinepopups plugin).
- * @option {String/Boolean} popup_css Optional CSS to use in the popup. Set to false to remove the default one.
- * @option {Boolean} translate_i18n Specifies whether translation should occur or not of i18 key strings. Default is true.
- * @option {String/bool} close_previous Specifies whether a previously opened popup window is to be closed or not (like when calling the file browser window over the advlink popup).
- * @option {String/bool} scrollbars Specifies whether the popup window can have scrollbars if required (i.e. content larger than the popup size specified).
- * @param {Object} p Optional parameters/arguments collection can be used by the dialogs to retrive custom parameters.
- * @option {String} plugin_url url to plugin if opening plugin window that calls tinyMCEPopup.requireLangPack() and needs access to the plugin language js files
+ * @option {String} title Window title.
+ * @option {String} file URL of the file to open in the window.
+ * @option {Number} width Width in pixels.
+ * @option {Number} height Height in pixels.
+ * @option {Boolean} resizable Specifies whether the popup window is resizable or not.
+ * @option {Boolean} maximizable Specifies whether the popup window has a "maximize" button and can get maximized or not.
+ * @option {Boolean} inline Specifies whether to display in-line (set to 1 or true for in-line display; requires inlinepopups plugin).
+ * @option {String/Boolean} popup_css Optional CSS to use in the popup. Set to false to remove the default one.
+ * @option {Boolean} translate_i18n Specifies whether translation should occur or not of i18 key strings. Default is true.
+ * @option {String/bool} close_previous Specifies whether a previously opened popup window is to be closed or not (like when calling the file browser window over the advlink popup).
+ * @option {String/bool} scrollbars Specifies whether the popup window can have scrollbars if required (i.e. content larger than the popup size specified).
+ * @param {Object} p Optional parameters/arguments collection can be used by the dialogs to retrieve custom parameters.
+ * @option {String} plugin_url url to plugin if opening plugin window that calls tinyMCEPopup.requireLangPack() and needs access to the plugin language js files
*/
open : function(s, p) {
var t = this, f = '', x, y, mo = t.editor.settings.dialog_type == 'modal', w, sw, sh, vp = tinymce.DOM.getViewPort(), u;
@@ -228,4 +228,4 @@
return tinymce.DOM.decode(s).replace(/\\n/g, '\n');
}
});
-}(tinymce));
\ No newline at end of file
+}(tinymce));
diff --git a/pub/lib/tiny_mce/classes/adapter/jquery/adapter.js b/pub/lib/tiny_mce/classes/adapter/jquery/adapter.js
index adae9dc7dbe..1fceed4f3e8 100644
--- a/pub/lib/tiny_mce/classes/adapter/jquery/adapter.js
+++ b/pub/lib/tiny_mce/classes/adapter/jquery/adapter.js
@@ -42,7 +42,7 @@
function attr(name, value) {
var self = this;
- // Update/retrive data-mce- attribute variants
+ // Update/retrieve data-mce- attribute variants
if (attrRegExp.test(name)) {
if (value !== undefined) {
// Use TinyMCE behavior when setting the specifc attributes
diff --git a/pub/lib/tiny_mce/classes/ui/Container.js b/pub/lib/tiny_mce/classes/ui/Container.js
index aff916a6044..de47b4018c3 100644
--- a/pub/lib/tiny_mce/classes/ui/Container.js
+++ b/pub/lib/tiny_mce/classes/ui/Container.js
@@ -56,7 +56,7 @@ tinymce.create('tinymce.ui.Container:tinymce.ui.Control', {
* Returns a control by id from the containers collection.
*
* @method get
- * @param {String} n Id for the control to retrive.
+ * @param {String} n Id for the control to retrieve.
* @return {tinymce.ui.Control} Control instance by the specified name or undefined if it wasn't found.
*/
get : function(n) {
diff --git a/pub/lib/tiny_mce/classes/util/Cookie.js b/pub/lib/tiny_mce/classes/util/Cookie.js
index 4004df20db6..82ca92cba4e 100644
--- a/pub/lib/tiny_mce/classes/util/Cookie.js
+++ b/pub/lib/tiny_mce/classes/util/Cookie.js
@@ -19,10 +19,10 @@
* @example
* // Gets a cookie from the browser
* console.debug(tinymce.util.Cookie.get('mycookie'));
- *
+ *
* // Gets a hash table cookie from the browser and takes out the x parameter from it
* console.debug(tinymce.util.Cookie.getHash('mycookie').x);
- *
+ *
* // Sets a hash table cookie to the browser
* tinymce.util.Cookie.setHash({x : '1', y : '2'});
*/
@@ -73,7 +73,7 @@
* Gets the raw data of a cookie by name.
*
* @method get
- * @param {String} n Name of cookie to retrive.
+ * @param {String} n Name of cookie to retrieve.
* @return {String} Cookie data string.
*/
get : function(n) {
diff --git a/pub/lib/tiny_mce/classes/xml/Parser.js b/pub/lib/tiny_mce/classes/xml/Parser.js
index 49030e94a63..e29965513ae 100644
--- a/pub/lib/tiny_mce/classes/xml/Parser.js
+++ b/pub/lib/tiny_mce/classes/xml/Parser.js
@@ -105,7 +105,7 @@
/**
* Returns all string contents of a element concated together.
*
- * @param {XMLNode} el XML element to retrive text from.
+ * @param {XMLNode} el XML element to retrieve text from.
* @return {string} XML element text contents.
*/
getText : function(el) {
diff --git a/pub/lib/tiny_mce/tiny_mce_jquery_src.js b/pub/lib/tiny_mce/tiny_mce_jquery_src.js
index 41f42c1986c..af86a86669a 100644
--- a/pub/lib/tiny_mce/tiny_mce_jquery_src.js
+++ b/pub/lib/tiny_mce/tiny_mce_jquery_src.js
@@ -33,7 +33,7 @@
t.isAir = /adobeair/i.test(ua);
t.isIDevice = /(iPad|iPhone)/.test(ua);
-
+
t.isIOS5 = t.isIDevice && ua.match(/AppleWebKit\/(\d*)/)[1]>=534;
// TinyMCE .NET webcontrol might be setting the values for TinyMCE
@@ -474,7 +474,7 @@
function attr(name, value) {
var self = this;
- // Update/retrive data-mce- attribute variants
+ // Update/retrieve data-mce- attribute variants
if (attrRegExp.test(name)) {
if (value !== undefined) {
// Use TinyMCE behavior when setting the specifc attributes
@@ -922,7 +922,7 @@ tinymce.create('tinymce.util.Dispatcher', {
return o;
},
-
+
toAbsolute : function(u, nh) {
var u = new tinymce.util.URI(u, {base_uri : this});
@@ -1832,7 +1832,7 @@ tinymce.html.Styles = function(settings, schema) {
if (name === 'font-weight' && value === '700')
value = 'bold';
else if (name === 'color' || name === 'background-color') // Lowercase colors like RED
- value = value.toLowerCase();
+ value = value.toLowerCase();
// Convert RGB colors to HEX
value = value.replace(rgbRegExp, toHex);
@@ -1957,8 +1957,8 @@ tinymce.html.Styles = function(settings, schema) {
};
// Build a lookup table for block elements both lowercase and uppercase
- blockElementsMap = 'h1,h2,h3,h4,h5,h6,hr,p,div,address,pre,form,table,tbody,thead,tfoot,' +
- 'th,tr,td,li,ol,ul,caption,blockquote,center,dl,dt,dd,dir,fieldset,' +
+ blockElementsMap = 'h1,h2,h3,h4,h5,h6,hr,p,div,address,pre,form,table,tbody,thead,tfoot,' +
+ 'th,tr,td,li,ol,ul,caption,blockquote,center,dl,dt,dd,dir,fieldset,' +
'noscript,menu,isindex,samp,header,footer,article,section,hgroup';
blockElementsMap = makeMap(blockElementsMap, ',', makeMap(blockElementsMap.toUpperCase()));
@@ -1996,89 +1996,89 @@ tinymce.html.Styles = function(settings, schema) {
C : 'onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup',
B : 'lang|xml:lang|dir',
A : 'id|class|style|title'
- }, 'script[id|charset|type|language|src|defer|xml:space][]' +
- 'style[B|id|type|media|title|xml:space][]' +
- 'object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]' +
- 'param[id|name|value|valuetype|type][]' +
- 'p[E|align][#|S]' +
- 'a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]' +
- 'br[A|clear][]' +
- 'span[E][#|S]' +
- 'bdo[A|C|B][#|S]' +
- 'applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]' +
- 'h1[E|align][#|S]' +
- 'img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]' +
- 'map[B|C|A|name][X|form|Q|area]' +
- 'h2[E|align][#|S]' +
- 'iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]' +
- 'h3[E|align][#|S]' +
- 'tt[E][#|S]' +
- 'i[E][#|S]' +
- 'b[E][#|S]' +
- 'u[E][#|S]' +
- 's[E][#|S]' +
- 'strike[E][#|S]' +
- 'big[E][#|S]' +
- 'small[E][#|S]' +
- 'font[A|B|size|color|face][#|S]' +
- 'basefont[id|size|color|face][]' +
- 'em[E][#|S]' +
- 'strong[E][#|S]' +
- 'dfn[E][#|S]' +
- 'code[E][#|S]' +
- 'q[E|cite][#|S]' +
- 'samp[E][#|S]' +
- 'kbd[E][#|S]' +
- 'var[E][#|S]' +
- 'cite[E][#|S]' +
- 'abbr[E][#|S]' +
- 'acronym[E][#|S]' +
- 'sub[E][#|S]' +
- 'sup[E][#|S]' +
- 'input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]' +
- 'select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]' +
- 'optgroup[E|disabled|label][option]' +
- 'option[E|selected|disabled|label|value][]' +
- 'textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]' +
- 'label[E|for|accesskey|onfocus|onblur][#|S]' +
- 'button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]' +
- 'h4[E|align][#|S]' +
- 'ins[E|cite|datetime][#|Y]' +
- 'h5[E|align][#|S]' +
- 'del[E|cite|datetime][#|Y]' +
- 'h6[E|align][#|S]' +
- 'div[E|align][#|Y]' +
- 'ul[E|type|compact][li]' +
- 'li[E|type|value][#|Y]' +
- 'ol[E|type|compact|start][li]' +
- 'dl[E|compact][dt|dd]' +
- 'dt[E][#|S]' +
- 'dd[E][#|Y]' +
- 'menu[E|compact][li]' +
- 'dir[E|compact][li]' +
- 'pre[E|width|xml:space][#|ZA]' +
- 'hr[E|align|noshade|size|width][]' +
- 'blockquote[E|cite][#|Y]' +
- 'address[E][#|S|p]' +
- 'center[E][#|Y]' +
- 'noframes[E][#|Y]' +
- 'isindex[A|B|prompt][]' +
- 'fieldset[E][#|legend|Y]' +
- 'legend[E|accesskey|align][#|S]' +
- 'table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]' +
- 'caption[E|align][#|S]' +
- 'col[ZG][]' +
- 'colgroup[ZG][col]' +
- 'thead[ZF][tr]' +
- 'tr[ZF|bgcolor][th|td]' +
- 'th[E|ZE][#|Y]' +
- 'form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]' +
- 'noscript[E][#|Y]' +
- 'td[E|ZE][#|Y]' +
- 'tfoot[ZF][tr]' +
- 'tbody[ZF][tr]' +
- 'area[E|D|shape|coords|href|nohref|alt|target][]' +
- 'base[id|href|target][]' +
+ }, 'script[id|charset|type|language|src|defer|xml:space][]' +
+ 'style[B|id|type|media|title|xml:space][]' +
+ 'object[E|declare|classid|codebase|data|type|codetype|archive|standby|width|height|usemap|name|tabindex|align|border|hspace|vspace][#|param|Y]' +
+ 'param[id|name|value|valuetype|type][]' +
+ 'p[E|align][#|S]' +
+ 'a[E|D|charset|type|name|href|hreflang|rel|rev|shape|coords|target][#|Z]' +
+ 'br[A|clear][]' +
+ 'span[E][#|S]' +
+ 'bdo[A|C|B][#|S]' +
+ 'applet[A|codebase|archive|code|object|alt|name|width|height|align|hspace|vspace][#|param|Y]' +
+ 'h1[E|align][#|S]' +
+ 'img[E|src|alt|name|longdesc|width|height|usemap|ismap|align|border|hspace|vspace][]' +
+ 'map[B|C|A|name][X|form|Q|area]' +
+ 'h2[E|align][#|S]' +
+ 'iframe[A|longdesc|name|src|frameborder|marginwidth|marginheight|scrolling|align|width|height][#|Y]' +
+ 'h3[E|align][#|S]' +
+ 'tt[E][#|S]' +
+ 'i[E][#|S]' +
+ 'b[E][#|S]' +
+ 'u[E][#|S]' +
+ 's[E][#|S]' +
+ 'strike[E][#|S]' +
+ 'big[E][#|S]' +
+ 'small[E][#|S]' +
+ 'font[A|B|size|color|face][#|S]' +
+ 'basefont[id|size|color|face][]' +
+ 'em[E][#|S]' +
+ 'strong[E][#|S]' +
+ 'dfn[E][#|S]' +
+ 'code[E][#|S]' +
+ 'q[E|cite][#|S]' +
+ 'samp[E][#|S]' +
+ 'kbd[E][#|S]' +
+ 'var[E][#|S]' +
+ 'cite[E][#|S]' +
+ 'abbr[E][#|S]' +
+ 'acronym[E][#|S]' +
+ 'sub[E][#|S]' +
+ 'sup[E][#|S]' +
+ 'input[E|D|type|name|value|checked|disabled|readonly|size|maxlength|src|alt|usemap|onselect|onchange|accept|align][]' +
+ 'select[E|name|size|multiple|disabled|tabindex|onfocus|onblur|onchange][optgroup|option]' +
+ 'optgroup[E|disabled|label][option]' +
+ 'option[E|selected|disabled|label|value][]' +
+ 'textarea[E|D|name|rows|cols|disabled|readonly|onselect|onchange][]' +
+ 'label[E|for|accesskey|onfocus|onblur][#|S]' +
+ 'button[E|D|name|value|type|disabled][#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]' +
+ 'h4[E|align][#|S]' +
+ 'ins[E|cite|datetime][#|Y]' +
+ 'h5[E|align][#|S]' +
+ 'del[E|cite|datetime][#|Y]' +
+ 'h6[E|align][#|S]' +
+ 'div[E|align][#|Y]' +
+ 'ul[E|type|compact][li]' +
+ 'li[E|type|value][#|Y]' +
+ 'ol[E|type|compact|start][li]' +
+ 'dl[E|compact][dt|dd]' +
+ 'dt[E][#|S]' +
+ 'dd[E][#|Y]' +
+ 'menu[E|compact][li]' +
+ 'dir[E|compact][li]' +
+ 'pre[E|width|xml:space][#|ZA]' +
+ 'hr[E|align|noshade|size|width][]' +
+ 'blockquote[E|cite][#|Y]' +
+ 'address[E][#|S|p]' +
+ 'center[E][#|Y]' +
+ 'noframes[E][#|Y]' +
+ 'isindex[A|B|prompt][]' +
+ 'fieldset[E][#|legend|Y]' +
+ 'legend[E|accesskey|align][#|S]' +
+ 'table[E|summary|width|border|frame|rules|cellspacing|cellpadding|align|bgcolor][caption|col|colgroup|thead|tfoot|tbody|tr]' +
+ 'caption[E|align][#|S]' +
+ 'col[ZG][]' +
+ 'colgroup[ZG][col]' +
+ 'thead[ZF][tr]' +
+ 'tr[ZF|bgcolor][th|td]' +
+ 'th[E|ZE][#|Y]' +
+ 'form[E|action|method|name|enctype|onsubmit|onreset|accept|accept-charset|target][#|X|R|Q]' +
+ 'noscript[E][#|Y]' +
+ 'td[E|ZE][#|Y]' +
+ 'tfoot[ZF][tr]' +
+ 'tbody[ZF][tr]' +
+ 'area[E|D|shape|coords|href|nohref|alt|target][]' +
+ 'base[id|href|target][]' +
'body[E|onload|onunload|background|bgcolor|text|link|vlink|alink][#|Y]'
);
@@ -2474,7 +2474,7 @@ tinymce.html.Styles = function(settings, schema) {
pos = stack.length;
while (pos--) {
if (stack[pos].name === name)
- break;
+ break;
}
// Found parent
@@ -3331,7 +3331,7 @@ tinymce.html.Styles = function(settings, schema) {
doctype: function(text) {
var newNode;
-
+
newNode = node.append(createNode('#doctype', 10));
newNode.value = text;
removeWhitespaceBefore(node);
@@ -3533,7 +3533,7 @@ tinymce.html.Styles = function(settings, schema) {
// Found a non BR element
if (prevName !== "br")
break;
-
+
// Found another br it's a <br><br> structure then don't remove anything
if (prevName === 'br') {
node = null;
@@ -3830,7 +3830,7 @@ tinymce.html.Writer = function(settings) {
keep_values : false,
hex_colors : 1
}, s);
-
+
t.schema = s.schema;
t.styles = new tinymce.html.Styles({
url_converter : s.url_converter,
@@ -4086,7 +4086,7 @@ tinymce.html.Writer = function(settings) {
case 'float':
isIE ? s.styleFloat = v : s.cssFloat = v;
break;
-
+
default:
s[na] = v || '';
}
@@ -5164,17 +5164,17 @@ tinymce.html.Writer = function(settings) {
// Check START_TO_START
if (h === 0)
return _compareBoundaryPoints(sc, so, rsc, rso);
-
+
// Check START_TO_END
if (h === 1)
return _compareBoundaryPoints(ec, eo, rsc, rso);
-
+
// Check END_TO_END
if (h === 2)
return _compareBoundaryPoints(ec, eo, rec, reo);
-
+
// Check END_TO_START
- if (h === 3)
+ if (h === 3)
return _compareBoundaryPoints(sc, so, rec, reo);
};
@@ -5267,7 +5267,7 @@ tinymce.html.Writer = function(settings) {
function _compareBoundaryPoints(containerA, offsetA, containerB, offsetB) {
var c, offsetC, n, cmnRoot, childA, childB;
-
+
// In the first case the boundary-points have the same container. A is before B
// if its offset is less than the offset of B, A is equal to B if its offset is
// equal to the offset of B, and A is after B if its offset is greater than the
@@ -6053,7 +6053,7 @@ tinymce.html.Writer = function(settings) {
return node;
};
-
+
function setBookmarkEndPoint(start) {
var endPoint = bookmark[start ? 'start' : 'end'], moveLeft, moveRng, undef;
@@ -6472,9 +6472,9 @@ tinymce.html.Writer = function(settings) {
el = dom.get(t.id);
tinymce.each(
- ('getPos,getRect,getParent,add,setStyle,getStyle,setStyles,' +
- 'setAttrib,setAttribs,getAttrib,addClass,removeClass,' +
- 'hasClass,getOuterHTML,setOuterHTML,remove,show,hide,' +
+ ('getPos,getRect,getParent,add,setStyle,getStyle,setStyles,' +
+ 'setAttrib,setAttribs,getAttrib,addClass,removeClass,' +
+ 'hasClass,getOuterHTML,setOuterHTML,remove,show,hide,' +
'isHidden,setHTML,get').split(/,/)
, function(k) {
t[k] = function() {
@@ -7187,7 +7187,7 @@ tinymce.html.Writer = function(settings) {
setRng : function(r) {
var s, t = this;
-
+
if (!t.tridentSel) {
s = t.getSel();
@@ -7247,7 +7247,7 @@ tinymce.html.Writer = function(settings) {
}
// If the anchor node is a element instead of a text node then return this element
- //if (tinymce.isWebKit && sel.anchorNode && sel.anchorNode.nodeType == 1)
+ //if (tinymce.isWebKit && sel.anchorNode && sel.anchorNode.nodeType == 1)
// return sel.anchorNode.childNodes[sel.anchorOffset];
// Handle cases where the selection is immediately wrapped around a node and return that node instead of it's parent.
@@ -7372,7 +7372,7 @@ tinymce.html.Writer = function(settings) {
// Normalize the end points
normalizeEndPoint(true);
-
+
if (rng.collapsed)
normalizeEndPoint();
@@ -7753,7 +7753,7 @@ tinymce.html.Writer = function(settings) {
callback();
};
-
+
function error() {
// Report the error so it's easier for people to spot loading errors
if (typeof(console) !== "undefined" && console.log)
@@ -7789,7 +7789,7 @@ tinymce.html.Writer = function(settings) {
done();
},
-
+
error : error
});
@@ -8064,7 +8064,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
// Find common ancestor and end points
ancestor = dom.findCommonAncestor(startContainer, endContainer);
-
+
// Process left side
for (node = startContainer; node; node = node.parentNode) {
if (node === endContainer)
@@ -8189,17 +8189,17 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
itemFocussed = function(evt) {
focussedId = evt.target.id;
};
-
+
itemBlurred = function(evt) {
dom.setAttrib(evt.target.id, 'tabindex', '-1');
};
-
+
rootFocussed = function(evt) {
var item = dom.get(focussedId);
dom.setAttrib(item, 'tabindex', '0');
item.focus();
};
-
+
t.focus = function() {
dom.get(focussedId).focus();
};
@@ -8216,7 +8216,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
items = dom = root = t.focus = itemFocussed = itemBlurred = rootKeydown = rootFocussed = null;
t.destroy = function() {};
};
-
+
t.moveFocus = function(dir, evt) {
var idx = -1, controls = t.controls, newFocus;
@@ -8236,7 +8236,7 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
} else if (idx >= items.length) {
idx = 0;
}
-
+
newFocus = items[idx];
dom.setAttrib(focussedId, 'tabindex', '-1');
dom.setAttrib(newFocus.id, 'tabindex', '0');
@@ -8249,19 +8249,19 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
if (evt)
Event.cancel(evt);
};
-
+
rootKeydown = function(evt) {
var DOM_VK_LEFT = 37, DOM_VK_RIGHT = 39, DOM_VK_UP = 38, DOM_VK_DOWN = 40, DOM_VK_ESCAPE = 27, DOM_VK_ENTER = 14, DOM_VK_RETURN = 13, DOM_VK_SPACE = 32;
-
+
switch (evt.keyCode) {
case DOM_VK_LEFT:
if (enableLeftRight) t.moveFocus(-1);
break;
-
+
case DOM_VK_RIGHT:
if (enableLeftRight) t.moveFocus(1);
break;
-
+
case DOM_VK_UP:
if (enableUpDown) t.moveFocus(-1);
break;
@@ -8306,14 +8306,14 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
dom.setAttrib(item.id, 'tabindex', tabindex);
dom.bind(dom.get(item.id), 'focus', itemFocussed);
});
-
+
// Setup initial state for root element.
if (items[0]){
focussedId = items[0].id;
}
dom.setAttrib(root, 'tabindex', '-1');
-
+
// Setup listeners for root element.
dom.bind(dom.get(root), 'focus', rootFocussed);
dom.bind(dom.get(root), 'keydown', rootKeydown);
@@ -8337,14 +8337,14 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {
this.active = 0;
this.editor = editor;
},
-
+
setAriaProperty : function(property, value) {
var element = DOM.get(this.id + '_aria') || DOM.get(this.id);
if (element) {
DOM.setAttrib(element, 'aria-' + property, !!value);
}
},
-
+
focus : function() {
DOM.get(this.id).focus();
},
@@ -8479,7 +8479,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
postRender : function() {
var t = this;
-
+
t.parent();
// Set pending state
@@ -8624,7 +8624,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
return m;
},
-
+
focus : function() {
var t = this;
if (t.keyboardNav) {
@@ -8754,13 +8754,13 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
}
});
}
-
+
Event.add(co, 'keydown', t._keyHandler, t);
t.onShowMenu.dispatch(t);
- if (s.keyboard_focus) {
- t._setupKeyboardNav();
+ if (s.keyboard_focus) {
+ t._setupKeyboardNav();
}
},
@@ -8855,7 +8855,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
// Internal functions
_setupKeyboardNav : function(){
- var contextMenu, menuItems, t=this;
+ var contextMenu, menuItems, t=this;
contextMenu = DOM.select('#menu_' + t.id)[0];
menuItems = DOM.select('a[role=option]', 'menu_' + t.id);
menuItems.splice(0,0,contextMenu);
@@ -8957,7 +8957,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
else
h += '<span class="mceIcon ' + s['class'] + '"></span>' + (l ? '<span class="' + cp + 'Label">' + l + '</span>' : '');
- h += '<span class="mceVoiceLabel mceIconOnly" style="display: none;" id="' + this.id + '_voice">' + s.title + '</span>';
+ h += '<span class="mceVoiceLabel mceIconOnly" style="display: none;" id="' + this.id + '_voice">' + s.title + '</span>';
h += '</a>';
return h;
},
@@ -9073,7 +9073,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
var h = '', t = this, s = t.settings, cp = t.classPrefix;
h = '<span role="listbox" aria-haspopup="true" aria-labelledby="' + t.id +'_voiceDesc" aria-describedby="' + t.id + '_voiceDesc"><table role="presentation" tabindex="0" id="' + t.id + '" cellpadding="0" cellspacing="0" class="' + cp + ' ' + cp + 'Enabled' + (s['class'] ? (' ' + s['class']) : '') + '"><tbody><tr>';
- h += '<td>' + DOM.createHTML('span', {id: t.id + '_voiceDesc', 'class': 'voiceLabel', style:'display:none;'}, t.settings.title);
+ h += '<td>' + DOM.createHTML('span', {id: t.id + '_voiceDesc', 'class': 'voiceLabel', style:'display:none;'}, t.settings.title);
h += DOM.createHTML('a', {id : t.id + '_text', tabindex : -1, href : 'javascript:;', 'class' : 'mceText', onclick : "return false;", onmousedown : 'return false;'}, DOM.encode(t.settings.title)) + '</td>';
h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', tabindex : -1, href : 'javascript:;', 'class' : 'mceOpen', onclick : "return false;", onmousedown : 'return false;'}, '<span><span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span></span>') + '</td>';
h += '</tr></tbody></table></span>';
@@ -9381,7 +9381,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
if (tinymce.isWebKit && (e.keyCode==37 ||e.keyCode==39)) {
return Event.prevent(e);
}
-
+
if (e.keyCode == 13 || e.keyCode == 32) {
onChange(e);
return Event.cancel(e);
@@ -9507,7 +9507,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
h1 += DOM.createHTML('span', {'class': 'mceVoiceLabel mceIconOnly', id: t.id + '_voice', style: 'display:none;'}, s.title);
h += '<td >' + DOM.createHTML('a', {role: 'button', id : t.id + '_action', tabindex: '-1', href : 'javascript:;', 'class' : 'mceAction ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';
-
+
h1 = DOM.createHTML('span', {'class' : 'mceOpen ' + s['class']}, '<span style="display:none;" class="mceIconOnly" aria-hidden="true">\u25BC</span>');
h += '<td >' + DOM.createHTML('a', {role: 'button', id : t.id + '_open', tabindex: '-1', href : 'javascript:;', 'class' : 'mceOpen ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';
@@ -9707,7 +9707,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
}
DOM.addClass(m, 'mceColorSplitMenu');
-
+
new tinymce.ui.KeyboardNavigation({
root: t.id + '_menu',
items: DOM.select('a', t.id + '_menu'),
@@ -9739,7 +9739,7 @@ tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
this.hideMenu();
this.settings.onselect(c);
},
-
+
displayColor : function(c) {
var t = this;
@@ -9785,12 +9785,12 @@ tinymce.create('tinymce.ui.ToolbarGroup:tinymce.ui.Container', {
return h.join('');
},
-
+
focus : function() {
var t = this;
dom.get(t.id).focus();
},
-
+
postRender : function() {
var t = this, items = [];
@@ -9815,7 +9815,7 @@ tinymce.create('tinymce.ui.ToolbarGroup:tinymce.ui.Container', {
excludeFromTabOrder: !t.settings.tab_focus_toolbar
});
},
-
+
destroy : function() {
var self = this;
@@ -9947,7 +9947,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
addComponents: function(pluginName, scripts) {
var pluginUrl = this.urls[pluginName];
tinymce.each(scripts, function(script){
- tinymce.ScriptLoader.add(pluginUrl+"/"+script);
+ tinymce.ScriptLoader.add(pluginUrl+"/"+script);
});
},
@@ -10138,7 +10138,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
// All done
if (l == co)
- execCallback(s, 'oninit');
+ execCallback(s, 'oninit');
});
}
});
@@ -10495,7 +10495,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
if (!t.getElement())
return;
- // Is a iPad/iPhone and not on iOS5, then skip initialization. We need to sniff
+ // Is a iPad/iPhone and not on iOS5, then skip initialization. We need to sniff
// here since the browser says it has contentEditable support but there is no visible
// caret We will remove this check ones Apple implements full contentEditable support
if (tinymce.isIDevice && !tinymce.isIOS5)
@@ -10578,7 +10578,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
var defaultSettings = {prefix:'plugins/', resource: dep, suffix:'/editor_plugin' + tinymce.suffix + '.js'};
var dep = PluginManager.createUrl(defaultSettings, dep);
PluginManager.load(dep.resource, dep);
-
+
});
} else {
// Skip safari plugin, since it is removed as of 3.3b1
@@ -10631,7 +10631,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
}
}
}
-
+
// Create all plugins
each(explode(s.plugins.replace(/\-/g, '')), initPlugin);
@@ -10770,7 +10770,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
// Create iframe
// TODO: ACC add the appropriate description on this.
- n = DOM.add(o.iframeContainer, 'iframe', {
+ n = DOM.add(o.iframeContainer, 'iframe', {
id : t.id + "_ifr",
src : u || 'javascript:""', // Workaround for HTTPS warning in IE6/7
frameBorder : '0',
@@ -10835,12 +10835,12 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
if (!t.settings.allow_html_in_named_anchor) {
t.parser.addAttributeFilter('name', function(nodes, name) {
var i = nodes.length, sibling, prevSibling, parent, node;
-
+
while (i--) {
node = nodes[i];
if (node.name === 'a' && node.firstChild) {
parent = node.parent;
-
+
// Move children after current node
sibling = node.lastChild;
do {
@@ -10863,7 +10863,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
internalName = 'data-mce-' + name;
// Add internal attribute if we need to we don't on a refresh of the document
- if (!node.attributes.map[internalName]) {
+ if (!node.attributes.map[internalName]) {
if (name === "style")
node.attr(internalName, dom.serializeStyle(dom.parseStyle(value), node.name));
else
@@ -11134,7 +11134,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
if (o.set)
o.content = t.execCallback('cleanup_callback', 'insert_to_editor', o.content, o);
- if (o.get)
+ if (o.get)
o.content = t.execCallback('cleanup_callback', 'get_from_editor', o.content, o);
});
}
@@ -12009,7 +12009,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
while (n && n.nodeType && n.nodeType != 1 && n.parentNode)
n = n.parentNode;
-
+
// Is the cursor at the beginning of a blockquote?
if (n && n.parentNode && n.parentNode.tagName === 'BLOCKQUOTE' && n.parentNode.firstChild == n && offset == 0) {
// Remove the blockquote
@@ -12023,7 +12023,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
ed.selection.collapse(false);
}
});
-
+
// Add reset handler
@@ -12749,7 +12749,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
// Remove existing links if there could be child links or that the href isn't specified
if (!anchor || !value.href) {
formatter.remove('link');
- }
+ }
// Apply new link to selection
if (value.href) {
@@ -13476,7 +13476,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
} else
e.innerHTML = isOpera ? '\u00a0' : '<br />'; // Extra space for Opera so that the caret can move there
};
-
+
// Padd empty blocks
if (dom.isEmpty(bef))
appendStyles(bef, sn);
@@ -13918,16 +13918,16 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
return t.add(c);
},
-
+
createToolbarGroup : function(id, s, cc) {
var c, t = this, cls;
id = t.prefix + id;
cls = cc || this._cls.toolbarGroup || tinymce.ui.ToolbarGroup;
c = new cls(id, s, t.editor);
-
+
if (t.get(id))
return null;
-
+
return t.add(c);
},
@@ -13940,7 +13940,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
setControlType : function(n, c) {
return this._cls[n.toLowerCase()] = c;
},
-
+
destroy : function() {
each(this.controls, function(c) {
c.destroy();
@@ -14241,10 +14241,10 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
return rng;
}
-
+
function applyStyleToList(node, bookmark, wrapElm, newWrappers, process){
var nodes = [], listIndex = -1, list, startIndex = -1, endIndex = -1, currentWrapElm;
-
+
// find the index of the first child list.
each(node.childNodes, function(n, index) {
if (n.nodeName === "UL" || n.nodeName === "OL") {
@@ -14253,7 +14253,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
return false;
}
});
-
+
// get the index of the bookmarks
each(node.childNodes, function(n, index) {
if (n.nodeName === "SPAN" && dom.getAttrib(n, "data-mce-type") == "bookmark") {
@@ -14264,29 +14264,29 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
}
}
});
-
+
// if the selection spans across an embedded list, or there isn't an embedded list - handle processing normally
if (listIndex <= 0 || (startIndex < listIndex && endIndex > listIndex)) {
each(tinymce.grep(node.childNodes), process);
return 0;
} else {
currentWrapElm = wrapElm.cloneNode(FALSE);
-
+
// create a list of the nodes on the same side of the list as the selection
each(tinymce.grep(node.childNodes), function(n, index) {
if ((startIndex < listIndex && index < listIndex) || (startIndex > listIndex && index > listIndex)) {
- nodes.push(n);
+ nodes.push(n);
n.parentNode.removeChild(n);
}
});
-
+
// insert the wrapping element either before or after the list.
if (startIndex < listIndex) {
node.insertBefore(currentWrapElm, list);
} else if (startIndex > listIndex) {
node.insertBefore(currentWrapElm, list.nextSibling);
}
-
+
// add the new nodes to the list.
newWrappers.push(currentWrapElm);
@@ -14297,7 +14297,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
return currentWrapElm;
}
};
-
+
function applyRngStyle(rng, bookmark, node_specific) {
var newWrappers = [], wrapName, wrapElm;
@@ -15626,7 +15626,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
return true;
};
-
+
// Returns any parent caret container element
function getParentCaretContainer(node) {
while (node) {
@@ -15684,7 +15684,7 @@ tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
selection.setRng(rng);
}
};
-
+
// Applies formatting to the caret postion
function applyCaretFormat() {
var rng, caretContainer, textNode, offset, bookmark, container, text;
--
GitLab